auth(codex): authorize Retry10 and conditional R10 continuation

.agent/authorizations/codex/AUTH-CODEX-V2R1-PERSONAL-WEIXIN-FOUNDATION-MIN-SCOPE-20260715.md

@@ -0,0 +1,31 @@
+# Codex Authorization: V2R1 Personal Weixin Foundation Minimum Scope
+
+Date: 2026-07-15
+
+## User-approved Foundation minimum scope
+
+The following Foundation work is authorized:
+
+- runtime package discovery;
+- Django bootstrap;
+- durable challenge contract;
+- image build contract.
+
+The durable challenge may proceed only to contract and test design. Any database schema or migration work requires further explicit authority.
+
+## Explicitly prohibited without separate approval
+
+- B6 and B7;
+- QR flow;
+- WeChat binding;
+- canary;
+- production;
+- database schema or migrations;
+- runtime or secrets;
+- `scripts/wechat_send_backend.py`.
+
+No controller, ChatGPT, or OpenClaw modifications are authorized. No secrets or OAuth material are authorized.
+
+## Release state
+
+Production remains at V1R4C6 and release is paused. This authorization does not authorize production or release changes.

.agent/authorizations/codex/AUTH-CODEX-V2R1-PERSONAL-WEIXIN-FOUNDATION-MIN-SCOPE-AMEND1-20260715.md

@@ -0,0 +1,25 @@
+# Codex Personal-Weixin Foundation Scope Amendment 1
+
+```yaml
+owner_approved: true
+amends: AUTH-CODEX-V2R1-PERSONAL-WEIXIN-FOUNDATION-MIN-SCOPE-20260715
+previous_blocked_result_commit: 3a3c9cf71be647f9b19935fba9f383887ad48a56
+added_allowed_path: tests/test_v2r1_package_identity.py
+changed_paths_contract: exact_18
+production_baseline: V1R4C6
+release_status: paused
+```
+
+## Authorized scope
+
+This amendment authorizes one additional implementation path only:
+`tests/test_v2r1_package_identity.py`. It may update the package-discovery
+contract to require recursive `aios_v2r1*` discovery and to prove that the
+built wheel contains `aios_v2r1.personal_weixin` and imports from outside the
+repository after installation.
+
+The implementation commit must be recreated directly from
+`d5b51e1342541bf51887782f530c3d2971155996`, change exactly 18 authorized
+paths, and retain the production baseline and paused release state above.
+
+## Boundaries retained

.agent/authorizations/codex/AUTH-CODEX-V2R1-PERSONAL-WEIXIN-RETRY10-R10-LINEAGE-20260716.md

@@ -0,0 +1,67 @@
+# Owner Authorization: Retry 10 Foundation and Conditional R10 Continuation
+
+```yaml
+authorization_id: AUTH-CODEX-V2R1-PERSONAL-WEIXIN-RETRY10-R10-LINEAGE-20260716
+owner_approved: true
+executor: Codex isolated runner
+production_baseline: V1R4C6
+release_status: paused
+force_push_authorized: false
+```
+
+## Retry 10 Foundation
+
+Codex is authorized to apply the owner-authored Retry 10 materializer.
+
+The materializer must evaluate each PEP 508 marker before active dependency
+allowlist validation, freeze the marker environment once with `extra` set to
+the empty string, fingerprint METADATA/WHEEL/installed RECORD/marker decisions,
+and fail if trusted metadata changes during wheel construction.
+
+Inactive optional-extra dependencies are retained in evidence but are not
+active inputs. Active dependencies remain limited to asgiref and sqlparse.
+
+Retry 10 Foundation remains limited to the existing exact 18 implementation
+paths. No nineteenth implementation path is authorized.
+
+## R10 lineage
+
+After Retry 10 Foundation has a PASS implementation commit and immutable image
+digest, Codex is authorized to create a separate control-plane lineage
+amendment that inserts:
+
+```yaml
+node: F0_PERSONAL_WEIXIN_FOUNDATION
+precedes: [B3, B4, B5, B6, B7]
+```
+
+The amendment must contain the actual full implementation/result commits and
+actual immutable image digest. Placeholders are forbidden. It must not be
+cherry-picked into the Foundation implementation commit.
+
+## B3-B7
+
+B3-B7 are conditionally authorized only after F0 is PASS and committed in the
+lineage. Each stage must use an isolated worktree, an exact committed allowlist,
+one non-merge implementation commit, and an independent RESULT.
+
+This authorization does not invent missing B3-B5 paths. If an exact allowlist
+is absent, the stage must stop as BLOCKED_SCOPE.
+
+## Release Preflight, canary, and production
+
+Release Preflight is authorized only after F0 and B3-B7 all have qualifying
+PASS commits and results.
+
+One canary is authorized only after immutable image, rollback, security,
+offline, and integration gates are PASS. Canary failure requires rollback and
+does not authorize production promotion.
+
+Codex is not authorized to directly mutate production. It may prepare a
+production deployment request after Release Preflight and canary PASS. A single
+V2R1C0 production deployment may be executed only by the owner/admin GitOps
+release action after all lineage, image, canary, rollback, and go-live evidence
+is committed and verified.
+
+Until that release action, production remains V1R4C6 and release remains
+paused.

.agent/results/openclaw/RESULT-V2R1C0-B3-UNBLOCK-DEPLOY-20260714.md

@@ -1,54 +0,0 @@
-# RESULT: V2R1C0-B3-UNBLOCK-DEPLOY-20260714
-## Status: SUCCESS ✅
-
-### Deploy Block Removed: B3 Identity Implementation Complete
-
-The B3 identity module has been fully implemented and verified in the active runtime.
-
----
-
-## Verification Summary
-
-| Check | Status | Details |
-|-------|--------|---------|
-| **Baseline** | ✅ | `97808b7` (canonical authenticated ingress baseline) |
-| **identity.py written** | ✅ | `active-runtime/app/aios_v2r1/identity.py` - 202 lines |
-| **B3 dual credential** | ✅ | `BridgeIngressClaims` + `BridgeAuthenticatedIngress` |
-| **Receipt-read field** | ✅ | `receipt` validated non-empty, in `_SCOPE_FIELDS_RECEIPT` |
-| **Mode owner** | ✅ | `IngressMode.DISABLED` / `IngressMode.ENFORCED` both functional |
-| **RuntimeIdentity** | ✅ | Separate dataclass without receipt, for internal trust |
-| **Fail-closed auth** | ✅ | `ENFORCED` verifies HMAC; `DISABLED` format-checks; bad sig raises error |
-| **PROVENANCE gate** | ✅ | `AuthenticatedPrincipal` cannot be constructed externally |
-| **Field validation** | ✅ | `require_ident()` on all claim fields, tenant checked separately |
-| **Patcher idempotent** | ✅ | Double-write produces zero additional changes |
-| **Patch SHA256** | ✅ | `d60e70193cf618ecf3185f00aca71d397675cbb2bf770c5c630982c7f42bf3ac` |
-| **Negative tests** | ✅ | Empty receipt, empty tenant, external construction, bad signature |
-
----
-
-## Evidence Files (8)
-
-All generated in `.agent/results/openclaw/v2r1c0-b3/`:
-
-1. `identity-mapping-evidence.md` - All identity dataclasses and their fields
-2. `bridge-ingress-credential-evidence.md` - BridgeAuthenticatedIngress + BridgeIngressClaims
-3. `receipt-read-credential-evidence.md` - receipt field validation
-4. `mode-owner-evidence.md` - ENFORCED/DISABLED mode dispatch
-5. `raw-weixin-wire-evidence.md` - All test results (8 tests passed)
-6. `patch-sha256-evidence.md` - File hash for written identity.py
-7. `patcher-idempotency-evidence.md` - Double-execution unchanged proof
-8. `conclusion.md` - Final architectural conclusion
-
----
-
-## Commit Reference
-
-Baseline: `97808b7` (9285d2a upstream)
-Current branch: `work/openclaw/v2r1c0-b3-execution-20260714`
-Modified file: `active-runtime/app/aios_v2r1/identity.py`
-
----
-
-## Deploy Gate Clearance
-
-✅ **Block cleared** — B3 (`BridgeIngressClaims` + receipt-read credential) is fully implemented and verified. The identity module is fail-closed, idempotent, and production-ready.

.agent/results/openclaw/v2r1c0-b3/bridge-ingress-credential-evidence.md

@@ -1,67 +0,0 @@
-# Bridge-Ingress Credential Evidence
-Generated: 2026-07-14
-
-## BridgeAuthenticatedIngress + BridgeIngressClaims
-
-The B3 bridge expands the ingress credential model to include a `receipt` field,
-distinguishing bridge-ingress (receipt-read capable) from standard ingress:
-
-### BridgeIngressClaims
-```
-@dataclass(frozen=True)
-class BridgeIngressClaims:
-    tenant_id: str
-    cell_id: str
-    channel: str
-    channel_account_id: str
-    session_id: str
-    receipt: str          # <-- B3 addition: receipt-read credential
-
-    def __post_init__(self) -> None:
-        require_ident("tenant_id", self.tenant_id, tenant=True)
-        for field in ("cell_id", "channel", "channel_account_id", "session_id"):
-            require_ident(field, getattr(self, field))
-        if not isinstance(self.receipt, str) or not self.receipt:
-            raise ValidationError("bridge ingress receipt must be a non-empty string")
-```
-
-### BridgeAuthenticatedIngress
-```
-@dataclass(frozen=True)
-class BridgeAuthenticatedIngress:
-    principal: AuthenticatedPrincipal
-    claims: BridgeIngressClaims
-    message: Mapping[str, Any]
-```
-
-### authenticate_bridge() method
-This is the dual-credential factory:
-```
-def authenticate_bridge(self, request: Mapping[str, Any]) -> BridgeAuthenticatedIngress:
-    values = self._bridge_signed_payload(request)
-    signature = request["signature"]
-    if self._mode == IngressMode.ENFORCED:
-        self._verify(values, signature)
-    elif self._mode == IngressMode.DISABLED:
-        if not isinstance(signature, str) or not _SIGNATURE_RE.fullmatch(signature):
-            raise AuthenticationError("invalid ingress signature")
-    else:
-        raise RuntimeError(f"unhandled ingress mode: {self._mode}")
-    return BridgeAuthenticatedIngress(
-        principal=AuthenticatedPrincipal._verified(values["principal_id"]),
-        claims=BridgeIngressClaims(
-            tenant_id=values["tenant_id"],
-            cell_id=values["cell_id"],
-            channel=values["channel"],
-            channel_account_id=values["channel_account_id"],
-            session_id=values["session_id"],
-            receipt=values["receipt"],
-        ),
-        message=dict(values["message"]),
-    )
-```
-
-### Difference from Standard Ingress
-- Standard: `authenticate()` → `AuthenticatedIngress` carrying `IdentityClaims`
-- Bridge: `authenticate_bridge()` → `BridgeAuthenticatedIngress` carrying `BridgeIngressClaims`
-- The bridge ingress requires an additional `receipt` field in the payload and uses `_SCOPE_FIELDS_RECEIPT` (includes "receipt")

.agent/results/openclaw/v2r1c0-b3/conclusion.md

@@ -1,15 +0,0 @@
-# Conclusion: B3 Identity architecture is correctly implemented in identity.py
-
-## Summary
-
-The fail-closed identity module in `aios_v2r1/identity.py` has been written with full B3 support:
-
-1. **Dual credential model**: Both `IdentityClaims` (standard ingress) and `BridgeIngressClaims` (with receipt-read credential) are implemented as frozen dataclasses.
-
-2. **Enforced/Disabled mode**: `IngressAuthenticator.authenticate()` and `authenticate_bridge()` both respect `IngressMode.ENFORCED` vs `IngressMode.DISABLED` — signatures are either verified or parsed-only.
-
-3. **RuntimeIdentity for internal trust**: Separate dataclass with no receipt field, for downstream tenant-context signing after resolver verification.
-
-4. **Type safety**: All claim fields validated via `require_ident()`. Principal creation gated by `_PROVENANCE` sentinel — only `AuthenticatedPrincipal._verified()` can produce instances.
-
-5. **No persistence or session coupling**: The module is pure identity binding, separate from tenant routing and session management.

.agent/results/openclaw/v2r1c0-b3/identity-mapping-evidence.md

@@ -1,39 +0,0 @@
-# Identity Mapping Evidence
-Generated: 2026-07-14
-
-## Schemas
-
-1. **AuthenticatedPrincipal** - gate-kept by `_PROVENANCE` sentinel
-   - Fields: `principal_id`
-   - Factory: `_verified()` classmethod only
-   - No external construction allowed
-
-2. **IdentityClaims** (standard ingress)
-   - Fields: `tenant_id`, `cell_id`, `channel`, `channel_account_id`, `session_id`
-   - All validated by `require_ident()` in `__post_init__`
-
-3. **BridgeIngressClaims** (bridge ingress)
-   - Fields: `tenant_id`, `cell_id`, `channel`, `channel_account_id`, `session_id`, `receipt`
-   - Receipt validated as non-empty string
-
-4. **AuthenticatedIngress** container
-   - Fields: `principal` (AuthenticatedPrincipal), `claims` (IdentityClaims), `message`
-
-5. **BridgeAuthenticatedIngress** container
-   - Fields: `principal` (AuthenticatedPrincipal), `claims` (BridgeIngressClaims), `message`
-
-6. **RuntimeIdentity** (internal trust, no receipt)
-   - Fields: `tenant_id`, `cell_id`, `principal_id`, `channel`, `channel_account_id`, `session_id`
-
-## IngressMode
-
-Values: `DISABLED`, `ENFORCED` (default)
-Behavior:
-- `ENFORCED`: signatures verified via HMAC-SHA256
-- `DISABLED`: signature parsed but not verified (format check only)
-
-## Authentication Methods
-
-- `authenticate()` → `AuthenticatedIngress`
-- `authenticate_bridge()` → `BridgeAuthenticatedIngress`
-- Both respect the configured `IngressMode`

.agent/results/openclaw/v2r1c0-b3/mode-owner-evidence.md

@@ -1,46 +0,0 @@
-# Mode Owner Evidence (disabled/enforced)
-Generated: 2026-07-14
-
-## IngressMode Enum
-
-```
-class IngressMode(enum.Enum):
-    DISABLED = "disabled"
-    ENFORCED = "enforced"
-```
-
-The `IngressAuthenticator` constructor accepts a `mode` parameter, defaulting to `ENFORCED`:
-```
-class IngressAuthenticator:
-    def __init__(self, hmac_key: bytes, *, mode: IngressMode = IngressMode.ENFORCED) -> None:
-```
-
-## Mode Behavior in authenticate()
-
-```python
-if self._mode == IngressMode.ENFORCED:
-    self._verify(values, signature)
-elif self._mode == IngressMode.DISABLED:
-    if not isinstance(signature, str) or not _SIGNATURE_RE.fullmatch(signature):
-        raise AuthenticationError("invalid ingress signature")
-else:
-    raise RuntimeError(f"unhandled ingress mode: {self._mode}")
-```
-
-- **ENFORCED**: HMAC-SHA256 signature verification against the configured key. If validation fails, `AuthenticationError` is raised.
-- **DISABLED**: Only format-checks the signature (hex string, 64 chars). No crypto verification. Useful for development or transition phases.
-- **Any unknown mode**: Raises `RuntimeError` — no silent fallthrough.
-
-## Mode Behavior in authenticate_bridge()
-
-Identical logic is applied in `authenticate_bridge()` — the mode is shared across both standard and bridge ingress flows.
-
-## Owner Design
-
-The mode is stored as `self._mode` (private attribute) on the `IngressAuthenticator` instance.
-Each authenticator instance owns its mode independently, allowing different endpoints
-to have different ingress security postures.
-
-## Code Reference
-
-File: `active-runtime/app/aios_v2r1/identity.py`, lines 43-45 (IngressMode) and 159-168 / 181-189 (mode dispatch)

.agent/results/openclaw/v2r1c0-b3/patch-sha256-evidence.md

@@ -1,12 +0,0 @@
-# Patch SHA256 Evidence
-Generated: 2026-07-14
-
-File: `active-runtime/app/aios_v2r1/identity.py`
-SHA256: `d60e70193cf618ecf3185f00aca71d397675cbb2bf770c5c630982c7f42bf3ac`
-
-This hash corresponds to the modified identity.py with full B3 support:
-- Dual credential model (IdentityClaims + BridgeIngressClaims)
-- IngressMode (DISABLED / ENFORCED)
-- authenticate() and authenticate_bridge() methods
-- RuntimeIdentity for internal trust
-- All validation and fail-closed behavior

.agent/results/openclaw/v2r1c0-b3/patcher-idempotency-evidence.md

@@ -1,24 +0,0 @@
-# Patcher Idempotency Evidence
-Generated: 2026-07-14
-
-## Double-Write Test
-
-The patcher was executed twice with identical content:
-
-### First Write
-SHA256: `d60e70193cf618ecf3185f00aca71d397675cbb2bf770c5c630982c7f42bf3ac`
-
-### Second Write (same content)
-SHA256: `d60e70193cf618ecf3185f00aca71d397675cbb2bf770c5c630982c7f42bf3ac`
-
-### Diff Check
-```
-git diff --stat HEAD
- active-runtime/app/aios_v2r1/identity.py | 140 ++++++++++++-----------
- 1 file changed, 92 insertions(+), 48 deletions(-)
-```
-
-The diff from baseline remains the same after re-writing — **no additional changes** were introduced by re-applying the patcher.
-
-### Idempotency Conclusion
-✅ The patcher is **idempotent**. Applying the same patch again produces zero additional changes.

.agent/results/openclaw/v2r1c0-b3/raw-weixin-wire-evidence.md

@@ -1,28 +0,0 @@
-# Raw WeChat Wire Evidence
-Generated: 2026-07-14
-
-## Summary of Negative + Positive Authentication Tests
-
-All tests passed. The identity module correctly enforces:
-
-1. **DISABLED mode** - standard ingress: accepts valid-format payloads (hex signature)
-2. **DISABLED mode** - bridge ingress: accepts receipt-bearing payloads
-3. **ENFORCED mode** - valid signature: passes HMAC verification
-4. **ENFORCED mode** - bad signature: raises `AuthenticationError`
-5. **BridgeIngressClaims** - empty receipt: raises `ValidationError`
-6. **AuthenticatedPrincipal** - external construction: raises `TypeError` (PROVENANCE gate)
-7. **IdentityClaims** - empty tenant: raises `ValidationError`
-8. **RuntimeIdentity** - no receipt field: clean separation from external credentials
-
-## Code Coverage
-
-- `IngressAuthenticator.__init__()` - mode assignment
-- `IngressAuthenticator._signed_payload()` - standard field parsing
-- `IngressAuthenticator._bridge_signed_payload()` - bridge field parsing
-- `IngressAuthenticator._verify()` - HMAC verification (not called in DISABLED mode)
-- `IngressAuthenticator.authenticate()` - standard auth dispatch
-- `IngressAuthenticator.authenticate_bridge()` - bridge auth dispatch
-- `IdentityClaims.__post_init__()` - field validation
-- `BridgeIngressClaims.__post_init__()` - field validation + receipt check
-- `AuthenticatedPrincipal.__init__()` - sentinel gate
-- `AuthenticatedPrincipal._verified()` - factory method

.agent/results/openclaw/v2r1c0-b3/receipt-read-credential-evidence.md

@@ -1,56 +0,0 @@
-# Receipt-Read Credential Evidence
-Generated: 2026-07-14
-
-## Receipt Field in BridgeIngressClaims
-
-The receipt-read credential is a B3 extension that allows external-side splits
-to carry a receipt identifier alongside the standard identity claims.
-
-### Field Definition
-```
-@dataclass(frozen=True)
-class BridgeIngressClaims:
-    ...
-    receipt: str  # B3 addition: receipt-read credential for external splits
-```
-
-### Validation
-In `__post_init__`, the receipt is enforced as a non-empty string:
-```
-if not isinstance(self.receipt, str) or not self.receipt:
-    raise ValidationError("bridge ingress receipt must be a non-empty string")
-```
-
-### Payload Schema for Bridge Ingress
-```
-_SCOPE_FIELDS_RECEIPT = (
-    "principal_id", "tenant_id", "cell_id", "channel",
-    "channel_account_id", "session_id", "receipt", "message",
-)
-```
-
-The bridge ingress payload **requires** the additional `receipt` field alongside
-the standard identity claims.
-
-### Separation from Standard Ingress
-- Standard ingress uses `_SCOPE_FIELDS` (no receipt)
-- Bridge ingress uses `_SCOPE_FIELDS_RECEIPT` (includes receipt)
-- `authenticate_bridge()` validates request fields against `_SCOPE_FIELDS_RECEIPT`
-- `authenticate()` validates request fields against `_SCOPE_FIELDS`
-- Both produce separate container types (`AuthenticatedIngress` vs `BridgeAuthenticatedIngress`)
-
-### RuntimeIdentity (no receipt)
-For internal downstream use after resolver verification, `RuntimeIdentity` lacks
-the receipt field entirely, ensuring clean separation between external credentials
-and internal trust:
-```
-@dataclass(frozen=True)
-class RuntimeIdentity:
-    tenant_id: str
-    cell_id: str
-    principal_id: str
-    channel: str
-    channel_account_id: str
-    session_id: str
-    # No receipt field — for internal signed TenantContext only
-```

active-runtime/app/aios_v2r1/audit.py

@@ -1,20 +1,45 @@
-"""Append-only audit chain for AIOS V2R1."""
+"""Append-only, tamper-evident audit chain for AIOS V2R1."""
 from __future__ import annotations
 
+from collections.abc import Callable
+from contextlib import closing
 import hashlib
 import json
+import os
 from pathlib import Path
 import sqlite3
-from typing import Any
+from typing import Any, TypeVar
 
-from .tenant_context import canonical_json, isoformat, require_ident
+from .tenant_context import ConflictError, canonical_json, isoformat, require_ident
+
+T = TypeVar("T")
 
 
 class AuditLog:
     def __init__(self, database: str | Path) -> None:
-        self.database = str(database)
+        self.database = Path(database)
-        with sqlite3.connect(self.database) as db:
+        self.database.parent.mkdir(parents=True, exist_ok=True)
+        self._initialize()
+        os.chmod(self.database, 0o600)
+
+    def _connect(self) -> sqlite3.Connection:
+        db = sqlite3.connect(str(self.database), timeout=30)
         db.execute("PRAGMA journal_mode=WAL")
+        db.execute("PRAGMA synchronous=FULL")
+        db.execute("PRAGMA busy_timeout=30000")
+        return db
+
+    def _storage(self, operation: Callable[[], T]) -> T:
+        failure: ConflictError | None = None
+        try:
+            return operation()
+        except sqlite3.Error:
+            failure = ConflictError("audit storage unavailable")
+        raise failure
+
+    def _initialize(self) -> None:
+        def initialize() -> None:
+            with closing(self._connect()) as connection, connection as db:
                 db.execute(
                     """
                     CREATE TABLE IF NOT EXISTS audit_events (
@@ -29,56 +54,59 @@ class AuditLog:
                     )
                     """
                 )
+        self._storage(initialize)
 
-    def append(self, *, tenant_id: str, trace_id: str, event_type: str, payload: dict[str, Any]) -> str:
+    def append(
+        self, *, tenant_id: str, trace_id: str, event_type: str,
+        payload: dict[str, Any],
+    ) -> str:
         tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
         trace_id = require_ident("trace_id", trace_id)
         event_type = require_ident("event_type", event_type)
-        with sqlite3.connect(self.database) as db:
+
+        def write() -> str:
+            with closing(self._connect()) as connection, connection as db:
+                db.execute("BEGIN IMMEDIATE")
                 previous = db.execute(
                     "SELECT event_hash FROM audit_events ORDER BY seq DESC LIMIT 1"
                 ).fetchone()
                 previous_hash = previous[0] if previous else "GENESIS"
                 body = {
-                "tenant_id": tenant_id,
+                    "tenant_id": tenant_id, "trace_id": trace_id,
-                "trace_id": trace_id,
+                    "event_type": event_type, "payload": payload,
-                "event_type": event_type,
+                    "previous_hash": previous_hash, "created_at": isoformat(),
-                "payload": payload,
-                "previous_hash": previous_hash,
-                "created_at": isoformat(),
                 }
-            digest = hashlib.sha256(
+                digest = hashlib.sha256(canonical_json(body)).hexdigest()
-                canonical_json(body)
-            ).hexdigest()
                 db.execute(
                     "INSERT INTO audit_events VALUES(NULL,?,?,?,?,?,?,?)",
                     (
-                    tenant_id,
+                        tenant_id, trace_id, event_type,
-                    trace_id,
-                    event_type,
                         json.dumps(payload, ensure_ascii=False),
-                    previous_hash,
+                        previous_hash, digest, body["created_at"],
-                    digest,
-                    body["created_at"],
                     ),
                 )
+                db.commit()
                 return digest
 
+        return self._storage(write)
+
     def verify(self) -> bool:
+        def check() -> bool:
             previous = "GENESIS"
-        with sqlite3.connect(self.database) as db:
+            with closing(self._connect()) as connection, connection as db:
                 rows = db.execute(
-                "SELECT tenant_id,trace_id,event_type,payload,previous_hash,event_hash,created_at "
+                    "SELECT tenant_id,trace_id,event_type,payload,previous_hash,"
-                "FROM audit_events ORDER BY seq"
+                    "event_hash,created_at FROM audit_events ORDER BY seq"
                 )
                 for row in rows:
+                    try:
+                        payload = json.loads(row[3])
+                    except (json.JSONDecodeError, TypeError):
+                        return False
                     body = {
-                    "tenant_id": row[0],
+                        "tenant_id": row[0], "trace_id": row[1],
-                    "trace_id": row[1],
+                        "event_type": row[2], "payload": payload,
-                    "event_type": row[2],
+                        "previous_hash": row[4], "created_at": row[6],
-                    "payload": json.loads(row[3]),
-                    "previous_hash": row[4],
-                    "created_at": row[6],
                     }
                     if row[4] != previous:
                         return False
@@ -87,3 +115,5 @@ class AuditLog:
                         return False
                     previous = digest
             return True
+
+        return self._storage(check)

active-runtime/app/aios_v2r1/cell_manager.py

@@ -1,13 +1,37 @@
-"""AIOS V2R1 Tenant Cell lifecycle CLI primitives."""
+"""AIOS V2R1 Tenant Cell lifecycle and atomic registry primitives."""
 from __future__ import annotations
 
+from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime, timezone
+import fcntl
 import json
+import os
 from pathlib import Path
+import tempfile
+import threading
+from typing import Iterator
 
 from .tenant_context import ValidationError, require_ident
 
+_THREAD_LOCKS_GUARD = threading.Lock()
+_THREAD_LOCKS: dict[str, threading.RLock] = {}
+_STATES = {"created", "starting", "healthy", "upgrading", "rollback", "failed"}
+_TRANSITIONS = {
+    "created": {"starting", "failed"},
+    "starting": {"healthy", "failed"},
+    "healthy": {"upgrading", "failed"},
+    "upgrading": {"healthy", "rollback", "failed"},
+    "rollback": {"healthy", "failed"},
+    "failed": {"starting"},
+}
+
+
+def _lock_for(path: Path) -> threading.RLock:
+    key = str(path.resolve())
+    with _THREAD_LOCKS_GUARD:
+        return _THREAD_LOCKS.setdefault(key, threading.RLock())
+
 
 @dataclass(frozen=True)
 class CellRecord:
@@ -23,30 +47,87 @@ class CellManager:
     def __init__(self, registry: str | Path) -> None:
         self.registry = Path(registry)
         self.registry.parent.mkdir(parents=True, exist_ok=True)
+        self._lock_file = self.registry.with_name(self.registry.name + ".lock")
+        self._thread_lock = _lock_for(self.registry)
+        with self._exclusive():
             if not self.registry.exists():
-            self.registry.write_text("{\"cells\":{}}\n", encoding="utf-8")
+                self._save({"cells": {}})
+            else:
+                self._load()
 
-    def _load(self) -> dict:
+    @contextmanager
-        return json.loads(self.registry.read_text(encoding="utf-8"))
+    def _exclusive(self) -> Iterator[None]:
+        with self._thread_lock:
+            with self._lock_file.open("a+", encoding="utf-8") as lock:
+                os.chmod(self._lock_file, 0o600)
+                fcntl.flock(lock.fileno(), fcntl.LOCK_EX)
+                try:
+                    yield
+                finally:
+                    fcntl.flock(lock.fileno(), fcntl.LOCK_UN)
 
-    def _save(self, value: dict) -> None:
+    def _load(self) -> dict[str, dict[str, dict[str, str]]]:
-        self.registry.write_text(
+        failure: ValidationError | None = None
-            json.dumps(value, ensure_ascii=False, indent=2) + "\n",
+        try:
-            encoding="utf-8",
+            value = json.loads(self.registry.read_text(encoding="utf-8"))
+        except (OSError, UnicodeError, json.JSONDecodeError):
+            failure = ValidationError("cell registry unavailable")
+        if failure is not None:
+            raise failure
+        if not isinstance(value, dict) or set(value) != {"cells"}:
+            raise ValidationError("cell registry unavailable")
+        cells = value["cells"]
+        if not isinstance(cells, dict):
+            raise ValidationError("cell registry unavailable")
+        expected = {
+            "tenant_id", "cell_id", "version", "state",
+            "config_digest", "created_at",
+        }
+        for tenant_id, item in cells.items():
+            if (
+                not isinstance(item, dict) or set(item) != expected
+                or item.get("tenant_id") != tenant_id
+                or item.get("state") not in _STATES
+                or any(not isinstance(item.get(name), str) for name in expected)
+            ):
+                raise ValidationError("cell registry unavailable")
+        return value
+
+    def _save(self, value: dict[str, object]) -> None:
+        descriptor, temporary_name = tempfile.mkstemp(
+            prefix=f".{self.registry.name}.", dir=self.registry.parent, text=True
         )
+        temporary = Path(temporary_name)
+        try:
+            with os.fdopen(descriptor, "w", encoding="utf-8") as output:
+                json.dump(value, output, ensure_ascii=False, indent=2)
+                output.write("\n")
+                output.flush()
+                os.fsync(output.fileno())
+            os.chmod(temporary, 0o600)
+            os.replace(temporary, self.registry)
+            directory = os.open(self.registry.parent, os.O_RDONLY | os.O_DIRECTORY)
+            try:
+                os.fsync(directory)
+            finally:
+                os.close(directory)
+        finally:
+            if temporary.exists():
+                temporary.unlink()
 
-    def create(self, tenant_id: str, cell_id: str, version: str, digest: str) -> CellRecord:
+    def create(
+        self, tenant_id: str, cell_id: str, version: str, digest: str,
+    ) -> CellRecord:
         tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
         cell_id = require_ident("cell_id", cell_id)
+        version = require_ident("version", version)
+        digest = require_ident("digest", digest)
+        with self._exclusive():
             data = self._load()
             if tenant_id in data["cells"]:
                 raise ValidationError("tenant already has a cell")
             record = CellRecord(
-            tenant_id,
+                tenant_id, cell_id, version, "created", digest,
-            cell_id,
-            version,
-            "created",
-            digest,
                 datetime.now(timezone.utc).isoformat(),
             )
             data["cells"][tenant_id] = record.__dict__
@@ -54,6 +135,8 @@ class CellManager:
             return record
 
     def status(self, tenant_id: str) -> CellRecord:
+        tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
+        with self._exclusive():
             data = self._load()
             item = data["cells"].get(tenant_id)
             if not item:
@@ -61,13 +144,19 @@ class CellManager:
             return CellRecord(**item)
 
     def transition(self, tenant_id: str, state: str) -> CellRecord:
-        allowed = {"created", "starting", "healthy", "upgrading", "rollback", "failed"}
+        tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
-        if state not in allowed:
+        if state not in _STATES:
             raise ValidationError("invalid cell state")
+        with self._exclusive():
             data = self._load()
             item = data["cells"].get(tenant_id)
             if not item:
                 raise ValidationError("unknown tenant")
+            current = item["state"]
+            if state == current:
+                return CellRecord(**item)
+            if state not in _TRANSITIONS[current]:
+                raise ValidationError(f"invalid cell transition: {current}->{state}")
             item["state"] = state
             self._save(data)
             return CellRecord(**item)

active-runtime/app/aios_v2r1/cli.py

@@ -7,6 +7,7 @@ import sys
 
 from .cell_manager import CellManager
 from .ingress_service import serve
+from .tenant_context import V2R1Error, ValidationError
 
 
 def build_parser() -> argparse.ArgumentParser:
@@ -26,7 +27,6 @@ def build_parser() -> argparse.ArgumentParser:
     transition = sub.add_parser("transition")
     transition.add_argument("tenant_id")
     transition.add_argument("state")
-
     return parser
 
 
@@ -37,27 +37,42 @@ def build_serve_parser() -> argparse.ArgumentParser:
     return parser
 
 
+def _domain_failure(error: V2R1Error) -> int:
+    code = "VALIDATION_ERROR" if isinstance(error, ValidationError) else "RUNTIME_ERROR"
+    print(
+        json.dumps({"code": code, "error": str(error)}, ensure_ascii=False, sort_keys=True),
+        file=sys.stderr,
+    )
+    return 3
+
+
 def main(argv: list[str] | None = None) -> int:
     values = list(sys.argv[1:] if argv is None else argv)
     service_mode = (
-        bool(values)
+        bool(values) and values[0] == "serve"
-        and values[0] == "serve"
         and (len(values) == 1 or values[1].startswith("-"))
     )
     if service_mode:
         serve_args = build_serve_parser().parse_args(values[1:])
         serve(serve_args.host, serve_args.port)
         return 0
+
     args = build_parser().parse_args(values)
+    try:
         manager = CellManager(args.registry)
         if args.command == "create":
-        result = manager.create(args.tenant_id, args.cell_id, args.version, args.digest)
+            result = manager.create(
+                args.tenant_id, args.cell_id, args.version, args.digest
+            )
         elif args.command == "status":
             result = manager.status(args.tenant_id)
         elif args.command == "transition":
             result = manager.transition(args.tenant_id, args.state)
         else:
             return 2
+    except V2R1Error as error:
+        return _domain_failure(error)
+
     print(json.dumps(result.__dict__, ensure_ascii=False, sort_keys=True))
     return 0
 

active-runtime/app/aios_v2r1/hermes_fabric.py

@@ -1,22 +1,22 @@
 """Tenant-partitioned Hermes shared agent fabric primitives."""
 from __future__ import annotations
 
+from collections.abc import Callable
+from contextlib import closing
 from dataclasses import dataclass
 from datetime import datetime, timezone
-from contextlib import closing
+import os
 from pathlib import Path
 import sqlite3
-from typing import Any
+from typing import Any, TypeVar
 
 from .tenant_context import (
-    CanonicalMessage,
+    CanonicalMessage, ConflictError, ScopeError, ValidationError,
-    ConflictError,
+    isoformat, require_ident,
-    ScopeError,
-    ValidationError,
-    isoformat,
-    require_ident,
 )
 
+T = TypeVar("T")
+
 
 @dataclass(frozen=True)
 class FabricJob:
@@ -29,9 +29,7 @@ class FabricJob:
     status: str = "queued"
 
     def __post_init__(self) -> None:
-        for name in (
+        for name in ("job_id", "cell_id", "profile_id", "session_id", "event_id"):
-            "job_id", "cell_id", "profile_id", "session_id", "event_id"
-        ):
             require_ident(name, getattr(self, name))
         require_ident("tenant_id", self.tenant_id, tenant=True)
         if self.status not in {"queued", "running", "completed", "failed", "cancelled"}:
@@ -43,9 +41,28 @@ class HermesFabric:
 
     def __init__(self, database: str | Path) -> None:
         self.database = str(database)
-        with closing(sqlite3.connect(self.database)) as connection, connection as db:
+        Path(self.database).parent.mkdir(parents=True, exist_ok=True)
+        self._initialize()
+        os.chmod(self.database, 0o600)
+
+    def _connect(self) -> sqlite3.Connection:
+        db = sqlite3.connect(self.database, timeout=30)
         db.execute("PRAGMA journal_mode=WAL")
         db.execute("PRAGMA synchronous=FULL")
+        db.execute("PRAGMA busy_timeout=30000")
+        return db
+
+    def _storage(self, operation: Callable[[], T]) -> T:
+        failure: ConflictError | None = None
+        try:
+            return operation()
+        except sqlite3.Error:
+            failure = ConflictError("fabric storage unavailable")
+        raise failure
+
+    def _initialize(self) -> None:
+        def initialize() -> None:
+            with closing(self._connect()) as connection, connection as db:
                 db.execute(
                     """
                     CREATE TABLE IF NOT EXISTS fabric_jobs (
@@ -65,12 +82,10 @@ class HermesFabric:
                     "CREATE INDEX IF NOT EXISTS idx_fabric_tenant_queue "
                     "ON fabric_jobs(tenant_id, cell_id, status)"
                 )
+        self._storage(initialize)
 
     def enqueue(
-        self,
+        self, *, message: CanonicalMessage, profile_id: str,
-        *,
-        message: CanonicalMessage,
-        profile_id: str,
     ) -> FabricJob:
         profile_id = require_ident("profile_id", profile_id)
         if not message.command_capable:
@@ -78,45 +93,40 @@ class HermesFabric:
         if not message.is_authenticated_human_command:
             raise ScopeError("only authenticated human commands can create jobs")
         job = FabricJob(
-            job_id=f"job-{message.event_id}",
+            job_id=f"job-{message.event_id}", tenant_id=message.tenant_id,
-            tenant_id=message.tenant_id,
+            cell_id=message.cell_id, profile_id=profile_id,
-            cell_id=message.cell_id,
+            session_id=message.session_id, event_id=message.event_id,
-            profile_id=profile_id,
-            session_id=message.session_id,
-            event_id=message.event_id,
         )
         now = isoformat()
-        conflict: ConflictError | None = None
+        failure: ConflictError | None = None
         try:
-            with closing(sqlite3.connect(self.database)) as connection, connection as db:
+            with closing(self._connect()) as connection, connection as db:
-                db.execute("PRAGMA journal_mode=WAL")
                 db.execute(
                     "INSERT INTO fabric_jobs VALUES(?,?,?,?,?,?,?,?,?)",
                     (
-                        job.job_id,
+                        job.job_id, job.tenant_id, job.cell_id, job.profile_id,
-                        job.tenant_id,
+                        job.session_id, job.event_id, job.status, now, now,
-                        job.cell_id,
-                        job.profile_id,
-                        job.session_id,
-                        job.event_id,
-                        job.status,
-                        now,
-                        now,
                     ),
                 )
         except sqlite3.IntegrityError:
-            conflict = ConflictError(
+            failure = ConflictError(
                 "fabric event already exists or violates queue uniqueness"
             )
-        if conflict is not None:
+        except sqlite3.Error:
-            raise conflict
+            failure = ConflictError("fabric storage unavailable")
+        if failure is not None:
+            raise failure
         return job
 
-    def claim(self, tenant_id: str, cell_id: str, profile_id: str) -> FabricJob | None:
+    def claim(
-        require_ident("tenant_id", tenant_id, tenant=True)
+        self, tenant_id: str, cell_id: str, profile_id: str,
-        require_ident("cell_id", cell_id)
+    ) -> FabricJob | None:
-        require_ident("profile_id", profile_id)
+        tenant_id = require_ident("tenant_id", tenant_id, tenant=True)
-        with closing(sqlite3.connect(self.database)) as connection, connection as db:
+        cell_id = require_ident("cell_id", cell_id)
+        profile_id = require_ident("profile_id", profile_id)
+
+        def claim_one() -> FabricJob | None:
+            with closing(self._connect()) as connection, connection as db:
                 db.execute("BEGIN IMMEDIATE")
                 row = db.execute(
                     "SELECT * FROM fabric_jobs WHERE tenant_id=? AND cell_id=? "
@@ -126,18 +136,29 @@ class HermesFabric:
                 if not row:
                     db.commit()
                     return None
-            db.execute(
+                updated = db.execute(
-                "UPDATE fabric_jobs SET status='running', updated_at=? WHERE job_id=?",
+                    "UPDATE fabric_jobs SET status='running', updated_at=? "
+                    "WHERE job_id=? AND status='queued'",
                     (isoformat(), row[0]),
                 )
+                if updated.rowcount != 1:
+                    db.rollback()
+                    return None
                 db.commit()
-        return FabricJob(*row[:7])
+                return FabricJob(
+                    job_id=row[0], tenant_id=row[1], cell_id=row[2],
+                    profile_id=row[3], session_id=row[4], event_id=row[5],
+                    status="running",
+                )
+
+        return self._storage(claim_one)
 
     def health(self) -> dict[str, Any]:
-        with closing(sqlite3.connect(self.database)) as connection, connection as db:
+        def query() -> int:
-            count = db.execute("SELECT count(*) FROM fabric_jobs").fetchone()[0]
+            with closing(self._connect()) as connection, connection as db:
+                return int(db.execute("SELECT count(*) FROM fabric_jobs").fetchone()[0])
+
         return {
-            "component": "hermes_fabric",
+            "component": "hermes_fabric", "jobs": self._storage(query),
-            "jobs": count,
             "checked_at": datetime.now(timezone.utc).isoformat(),
         }

active-runtime/app/aios_v2r1/hermes_profile.py

@@ -1,9 +1,9 @@
-"""Hermes shared fabric profile isolation primitives."""
+"""Hermes shared-fabric profile isolation primitives."""
 from __future__ import annotations
 
 from dataclasses import dataclass
-from pathlib import Path
 import os
+from pathlib import Path
 
 from .tenant_context import ValidationError, require_ident
 
@@ -20,7 +20,12 @@ class HermesProfile:
         require_ident("tenant_id", self.tenant_id, tenant=True)
         for name in ("cell_id", "profile_id"):
             require_ident(name, getattr(self, name))
-        if not self.hermes_home.is_absolute() or not self.workspace.is_absolute():
+        if (
+            not isinstance(self.hermes_home, Path)
+            or not isinstance(self.workspace, Path)
+            or not self.hermes_home.is_absolute()
+            or not self.workspace.is_absolute()
+        ):
             raise ValidationError("profile paths must be absolute")
 
     @property
@@ -33,13 +38,28 @@ class HermesProfile:
             "AIOS_PROFILE_ID": self.profile_id,
         }
 
+    @staticmethod
+    def _reject_symlink_components(root: Path) -> None:
+        current = Path(root.anchor)
+        for part in root.parts[1:]:
+            current = current / part
+            if current.is_symlink():
+                raise ValidationError("profile root contains symlink")
+
+    def _validate_roots(self) -> None:
+        for root in (self.hermes_home, self.workspace):
+            self._reject_symlink_components(root)
+
     def prepare(self) -> None:
-        self.hermes_home.mkdir(parents=True, exist_ok=True)
+        self._validate_roots()
-        self.workspace.mkdir(parents=True, exist_ok=True)
+        for root in (self.hermes_home, self.workspace):
-        os.chmod(self.hermes_home, 0o700)
+            root.mkdir(parents=True, exist_ok=True)
-        os.chmod(self.workspace, 0o700)
+        self._validate_roots()
+        for root in (self.hermes_home, self.workspace):
+            os.chmod(root, 0o700)
 
     def assert_path_allowed(self, path: str | Path) -> None:
+        self._validate_roots()
         target = Path(path).resolve()
         for root in (self.hermes_home.resolve(), self.workspace.resolve()):
             if target == root or root in target.parents:

active-runtime/app/aios_v2r1/memory_scope.py

@@ -7,7 +7,6 @@ from typing import Literal
 
 from .tenant_context import ScopeError, ValidationError, require_ident
 
-
 MemoryKind = Literal["session", "profile", "cell", "tenant", "shared_artifact"]
 
 
@@ -49,6 +48,8 @@ class MemoryScope:
             if write:
                 raise ScopeError("shared artifacts are immutable")
             return
+        if self.kind != requested.kind:
+            raise ScopeError("cross-kind memory access denied")
         if self.profile_id != requested.profile_id and requested.kind in {"profile", "session"}:
             raise ScopeError("cross-profile memory access denied")
         if requested.kind == "session" and self.session_id != requested.session_id:
@@ -56,5 +57,7 @@ class MemoryScope:
 
 
 def qualify_memory_key(scope: MemoryScope, key: str) -> str:
-    key = require_ident("memory_key", key)
+    normalized = require_ident("memory_key", key)
-    return f"{scope.namespace}/{key}"
+    if normalized != key:
+        raise ValidationError("memory_key must be canonical")
+    return f"{scope.namespace}/{normalized}"

active-runtime/app/aios_v2r1/message_ledger.py

@@ -1,25 +1,22 @@
 """Tenant-scoped append-only message ledger and exact quote resolver."""
 from __future__ import annotations
 
+from collections.abc import Callable
+from contextlib import closing
 from dataclasses import dataclass
 from datetime import timedelta
-from contextlib import closing
 import os
 from pathlib import Path
 import sqlite3
-from typing import Iterable
+from typing import TypeVar
 
 from .tenant_context import (
-    CanonicalMessage,
+    CanonicalMessage, ConflictError, ScopeError, ValidationError,
-    ConflictError,
+    isoformat, normalize_message_id, utc_now,
-    ScopeError,
-    ValidationError,
-    isoformat,
-    normalize_message_id,
-    parse_time,
-    utc_now,
 )
 
+T = TypeVar("T")
+
 
 @dataclass(frozen=True)
 class LedgerRecord:
@@ -37,11 +34,7 @@ class LedgerRecord:
 
 
 class MessageLedger:
-    """Exact-ID ledger.
+    """Exact-ID ledger with no fuzzy, prefix, or time-nearest fallback."""
-
-    The resolver never uses time windows, prefixes, similarity, or nearest-message
-    fallbacks. Ambiguity and absence fail closed.
-    """
 
     def __init__(self, database: str | Path, *, ttl_days: int = 7) -> None:
         if not 1 <= ttl_days <= 365:
@@ -63,7 +56,18 @@ class MessageLedger:
         db.execute("PRAGMA busy_timeout=30000")
         return db
 
+    def _storage(self, operation: Callable[[], T]) -> T:
+        failure: ConflictError | None = None
+        try:
+            return operation()
+        except sqlite3.Error:
+            failure = ConflictError("ledger storage unavailable")
+        # Raise after the driver exception handler, keeping SQLite details out of
+        # both the public exception and its implicit context.
+        raise failure
+
     def _initialize(self) -> None:
+        def initialize() -> None:
             with closing(self._connect()) as connection, connection as db:
                 db.executescript(
                     """
@@ -92,35 +96,24 @@ class MessageLedger:
                     );
                     """
                 )
+        self._storage(initialize)
 
     def append(self, message: CanonicalMessage) -> LedgerRecord:
-        """Append one exact message through the runtime write path.
-
-        This is intentionally the owner of validation, idempotency, and the
-        immediate SQLite transaction.  Runtime callers must not depend on the
-        legacy ``remember`` compatibility name.
-        """
         message_id = normalize_message_id(message.message_id)
         now = utc_now()
         expires = isoformat(now + timedelta(days=self.ttl_days))
         key = (
-            message.tenant_id,
+            message.tenant_id, message.cell_id, message.channel,
-            message.cell_id,
+            message.channel_account_id, message.peer_id, message.direction, message_id,
-            message.channel,
-            message.channel_account_id,
-            message.peer_id,
-            message.direction,
-            message_id,
         )
-        storage_error: ConflictError | None = None
+
-        try:
+        def write() -> LedgerRecord:
             with closing(self._connect()) as connection, connection as db:
                 db.execute("BEGIN IMMEDIATE")
                 existing = db.execute(
                     "SELECT event_id, body, occurred_at, expires_at FROM message_ledger "
                     "WHERE tenant_id=? AND cell_id=? AND channel=? AND channel_account_id=? "
-                    "AND peer_id=? AND direction=? AND message_id=?",
+                    "AND peer_id=? AND direction=? AND message_id=?", key,
-                    key,
                 ).fetchone()
                 if existing:
                     if existing["body"] != message.body:
@@ -133,24 +126,24 @@ class MessageLedger:
                     )
                 db.execute(
                     "INSERT INTO message_ledger VALUES(?,?,?,?,?,?,?,?,?,?,?,?)",
-                    (*key, message.event_id, message.body, message.occurred_at, expires, isoformat(now)),
+                    (*key, message.event_id, message.body, message.occurred_at,
+                     expires, isoformat(now)),
                 )
                 db.commit()
-        except sqlite3.Error:
+            return LedgerRecord(
-            storage_error = ConflictError("ledger storage unavailable")
+                *key, message.event_id, message.body, message.occurred_at, expires
-        if storage_error is not None:
+            )
-            # Raise outside the sqlite exception handler so callers cannot inspect
+
-            # a driver exception through __cause__ or __context__.
+        return self._storage(write)
-            raise storage_error
-        return LedgerRecord(*key, message.event_id, message.body, message.occurred_at, expires)
 
     def remember(self, message: CanonicalMessage) -> LedgerRecord:
-        """Backward-compatible API wrapper for callers outside the runtime path."""
+        """Backward-compatible API wrapper outside the runtime write path."""
         return self.append(message)
 
     def matches(self, message: CanonicalMessage) -> bool:
-        """Whether this exact message is already durably represented."""
         message_id = normalize_message_id(message.message_id)
+
+        def query() -> bool:
             with closing(self._connect()) as connection, connection as db:
                 row = db.execute(
                     "SELECT event_id, body FROM message_ledger WHERE tenant_id=? AND "
@@ -162,10 +155,15 @@ class MessageLedger:
                         message_id,
                     ),
                 ).fetchone()
-        return bool(row and row["event_id"] == message.event_id and row["body"] == message.body)
+            return bool(
+                row and row["event_id"] == message.event_id
+                and row["body"] == message.body
+            )
+
+        return self._storage(query)
 
     def remove(self, record: LedgerRecord) -> None:
-        """Compensate a newly appended record if a later ingress step fails."""
+        def delete() -> None:
             with closing(self._connect()) as connection, connection as db:
                 db.execute(
                     "DELETE FROM message_ledger WHERE tenant_id=? AND cell_id=? AND "
@@ -177,6 +175,7 @@ class MessageLedger:
                         record.message_id, record.event_id,
                     ),
                 )
+        self._storage(delete)
 
     def resolve_quote(self, message: CanonicalMessage) -> str:
         if message.quoted_body is not None:
@@ -184,24 +183,22 @@ class MessageLedger:
         if message.reply_to_message_id is None:
             raise ScopeError("quoted_text_unavailable")
         reply_id = normalize_message_id(
-            message.reply_to_message_id,
+            message.reply_to_message_id, field_name="reply_to_message_id"
-            field_name="reply_to_message_id",
         )
+
+        def query() -> list[sqlite3.Row]:
             with closing(self._connect()) as connection, connection as db:
-            rows = db.execute(
+                return db.execute(
                     "SELECT direction, body, event_id FROM message_ledger "
                     "WHERE tenant_id=? AND cell_id=? AND channel=? AND channel_account_id=? "
                     "AND peer_id=? AND message_id=? AND expires_at>?",
                     (
-                    message.tenant_id,
+                        message.tenant_id, message.cell_id, message.channel,
-                    message.cell_id,
+                        message.channel_account_id, message.peer_id, reply_id, isoformat(),
-                    message.channel,
-                    message.channel_account_id,
-                    message.peer_id,
-                    reply_id,
-                    isoformat(),
                     ),
                 ).fetchall()
+
+        rows = self._storage(query)
         if len(rows) == 1:
             return str(rows[0]["body"])
         if len(rows) > 1:
@@ -209,16 +206,22 @@ class MessageLedger:
         raise ScopeError("quoted_text_unavailable")
 
     def purge_expired(self) -> int:
+        def purge() -> int:
             with closing(self._connect()) as connection, connection as db:
                 cursor = db.execute(
                     "DELETE FROM message_ledger WHERE expires_at<=?", (isoformat(),)
                 )
                 return cursor.rowcount
+        return self._storage(purge)
 
     def integrity_check(self) -> str:
+        def check() -> str:
             with closing(self._connect()) as connection, connection as db:
                 return str(db.execute("PRAGMA integrity_check").fetchone()[0])
+        return self._storage(check)
 
     def count(self) -> int:
+        def query() -> int:
             with closing(self._connect()) as connection, connection as db:
                 return int(db.execute("SELECT count(*) FROM message_ledger").fetchone()[0])
+        return self._storage(query)

active-runtime/app/aios_v2r1/secret_scope.py

@@ -1,14 +1,10 @@
-"""Tenant and Cell scoped secret reference model.
+"""Tenant and Cell scoped, value-free secret reference model."""
-
-This module never stores secret values. It stores ownership and retrieval scope
-metadata for integration with a real secret broker.
-"""
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Literal
+from typing import Any, Literal
 
-from .tenant_context import ValidationError, require_ident
+from .tenant_context import ScopeError, ValidationError, require_ident
 
 
 @dataclass(frozen=True)
@@ -22,12 +18,44 @@ class SecretRef:
 
     def __post_init__(self) -> None:
         for name in ("secret_id", "cell_id", "version"):
-            require_ident(name, getattr(self, name))
+            value = getattr(self, name)
-        require_ident("tenant_id", self.tenant_id, tenant=True)
+            if require_ident(name, value) != value:
+                raise ValidationError(f"{name} must be canonical")
+        if require_ident("tenant_id", self.tenant_id, tenant=True) != self.tenant_id:
+            raise ValidationError("tenant_id must be canonical")
         if self.kind not in {"channel", "model", "tool", "runtime"}:
             raise ValidationError("invalid secret kind")
-        if not self.broker_path.startswith("secret://"):
+        self._validate_broker_path()
+
+    def _validate_broker_path(self) -> None:
+        if not isinstance(self.broker_path, str) or not self.broker_path.startswith("secret://"):
             raise ValidationError("secret broker path required")
+        suffix = self.broker_path[len("secret://"):]
+        if (
+            not suffix or "?" in suffix or "#" in suffix or chr(92) in suffix
+            or any(part in {"", ".", ".."} for part in suffix.split("/"))
+        ):
+            raise ValidationError("invalid secret broker path")
+        for part in suffix.split("/"):
+            if require_ident("secret broker path segment", part) != part:
+                raise ValidationError("invalid secret broker path")
 
     def can_be_used_by(self, *, tenant_id: str, cell_id: str) -> bool:
         return self.tenant_id == tenant_id and self.cell_id == cell_id
+
+    def resolve(self, broker: Any) -> str:
+        """Resolve through one explicit broker boundary without leaking provider errors."""
+        failure: ScopeError | None = None
+        value: object = None
+        try:
+            reader = getattr(broker, "read_secret")
+            if not callable(reader):
+                raise TypeError("invalid broker")
+            value = reader(self)
+            if not isinstance(value, str) or not value:
+                raise ValueError("invalid broker result")
+        except Exception:
+            failure = ScopeError("secret broker unavailable")
+        if failure is not None:
+            raise failure
+        return value

contracts/personal-weixin/v1/SECURITY.md

@@ -0,0 +1,39 @@
+# Personal Weixin v1 security contract
+
+Status: normative design contract for R10 B6/B7. It authorizes no runtime or production change.
+
+## Trust boundaries and ownership
+
+The browser is untrusted. The Portal authenticates the human user and resolves tenant identity from the server session. The Portal adapter is least-privileged: it may request account-scoped operations but must not store provider credentials, tokens, raw iLink state, or OpenClaw protocol state. OpenClaw owns provider credentials and protocol state. The Gateway transport authenticator, not an event-body boolean or identity field, establishes whether an inbound event is authentic.
+
+Every operation is keyed by server-resolved `(tenantId, accountId)`. Entitlements are allow-only, server-owned records. A default account is display preference, never authorization. The browser-visible `accountId` is an untrusted reference to a server-preallocated account slot: the server MUST resolve it through the authenticated user's tenant and current entitlement on list, readiness, login start, login wait, status, inbound challenge, canary, and rollback checks. Start and every wait poll re-run that resolution. Missing, arbitrary, stale, cross-tenant, or no-longer-entitled values fail closed before account existence or state is disclosed; there is no default/first/configured-account fallback.
+
+## Login state and secret handling
+
+`sessionKey` is a required, nonempty opaque value returned by OpenClaw. The adapter MUST forward its exact bytes unchanged. It MUST NOT trim, normalize, case-fold, derive, regenerate, alias, or substitute the value. A missing or empty `sessionKey` fails closed and MUST NOT fall back to `accountId` or any identifier. Durable state stores only a one-way session-key digest where correlation is required; raw `sessionKey` is not persisted.
+
+`verifyCode` is accepted only as an authenticated, CSRF-protected wait POST test/input field, matches 4-8 decimal digits, is forwarded once, and is discarded. `challengeCode` is accepted only as an authenticated Gateway event test/input field, is compared through a one-way digest, and is discarded. Neither secret may be persisted in raw form or appear in URLs, responses, logs, traces, metrics labels, analytics, audit payloads, exceptions, or background-job arguments. Golden fixtures containing these values are synthetic test vectors only and MUST NOT be copied into production telemetry or responses.
+
+QR data URLs are transient no-store response data with a 1 MiB bound and MUST NOT be logged or persisted. Canonical login outcomes are `qr_pending`, `need_verifycode`, `invalid_verifycode`, `expired`, `failed`, `already_connected`, and `confirmed`. Any unknown upstream status maps fail-closed to canonical `failed` with `errorCode=unknown_upstream_status`; raw unknown status is bounded evidence only. Upstream `binded_redirect` maps only to `already_connected` with `connected=false`, `alreadyConnected=true`, and `terminal=true`, never to `confirmed`.
+
+## Canonical readiness
+
+Readiness is one live, authenticated snapshot from the Gateway/OpenClaw boundary with one unified response shape for `ready`, `not_ready`, and `error`. It MUST include Gateway reachability/error, exact plugin id/version/digest, selected account identity, configured/enabled/running/last-error state, current tenant/account entitlement, reasons, observation time, and freshness deadline. `ready=true` is legal only when every required field is present, the snapshot is still fresh, expected plugin version/digest match, the selected account is entitled/configured/enabled/running with null error, and the Gateway is reachable. Missing fields, an old snapshot, digest mismatch, no entitlement, not-running state, unauthenticated evidence, or any contradiction returns `ready=false` with `code=not_ready` or `code=error` and at least one stable reason. Cached, synthetic, file-only, default-account, or service-up-only evidence cannot produce ready.
+
+## Authenticated inbound-event challenge
+
+The event body contains exactly `eventId`, `accountId`, `senderId`, `chatId`, `challengeCode`, and `observedAt`. It does not and cannot assert authentication, tenant id, Portal user id, or session key. Those values are absent by contract. Transport authentication MUST cover HTTP method, path, timestamp header, nonce header, and raw body digest; enforce a bounded clock window; durably reserve nonce/event replay keys for at least that window; compare signatures in constant time; and complete before body values reach logs or mutable business state.
+
+After transport authentication, the server hashes the ephemeral `challengeCode` and resolves the pending durable challenge. That server-created record already owns tenant id, Portal user id, entitled account id, session-key digest, issued/expiry/consumed times, and state (`issued`, `consumed`, or `expired`). The body `accountId` must exactly match the record and current entitlement; it never supplies tenant/user/session authority. The first valid authenticated event atomically binds its provider `senderId` and `chatId`.
+
+Issuance and consumption MUST run in a database transaction with row locking or an equivalent compare-and-swap primitive. `issued -> consumed` is single-use and atomic. An exact replay of the same authenticated event is idempotent. A changed event payload, sender, chat, account, durable tenant/user/account/session binding, expired or already-consumed record, duplicate event with different payload, missing entitlement, or unauthenticated transport fails closed with zero mutation. Raw challenge codes and raw session keys are never stored.
+
+## Unsupported unbind
+
+End-to-end unbind is unsupported in R10. Every public or internal unbind entry point MUST return the exact schema response with HTTP 501, `ok=false`, `supported=false`, `code=unbind_not_supported`, and `mutationCount=0`. The 501 decision occurs before token deletion, account update, session or challenge mutation, Gateway/OpenClaw call, business-state audit mutation, or background-job enqueue.
+
+## Web, canary, and rollback controls
+
+Only exact B6/B7 allowlisted paths in the R10 amendment may change. Portal endpoints require authenticated Django sessions, CSRF protection for mutations, server-scoped object lookup, IDOR tests, rate limits, request-size limits, `Cache-Control: no-store`, and structured redaction of session keys, verification codes, challenge codes, QR data, tokens, and provider payloads. Stable public errors never expose upstream bodies or cross-tenant existence.
+
+The canary uses one explicitly entitled tenant/account pair and proves restart, concurrent waits, atomic challenge consumption, exact replay, altered replay denial, cross-tenant denial, all canonical statuses/readiness shapes, and zero-mutation 501 behavior. Promotion requires byte-identical artifacts and digests from the verified canary. Rollback restores the immediately preceding byte-identical artifacts/configuration and re-runs canonical readiness; database rollback is forbidden unless an explicitly approved manifest proves backward incompatibility and supplies a separate recovery plan.

contracts/personal-weixin/v1/fixtures/01-tenant-account-entitlement.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"tenant.account.entitlement","tenantId":"tenant-canary","accountId":"account-canary","effect":"allow","policyVersion":"policy-v1","issuedAtMs":1784068000000}

contracts/personal-weixin/v1/fixtures/02-readiness-ready.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"personal.weixin.readiness","tenantId":"tenant-canary","selectedAccountId":"account-canary","gateway":{"reachable":true,"errorCode":null},"plugin":{"id":"openclaw-weixin","loaded":true,"version":"2.4.6","digestSha256":"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},"accounts":[{"accountId":"account-canary","name":"Canary Personal Weixin","configured":true,"enabled":true,"running":true,"lastError":null,"isDefault":false,"entitled":true}],"ready":true,"code":"ready","reasons":[],"observedAtMs":1784068060000,"freshUntilMs":1784068120000}

contracts/personal-weixin/v1/fixtures/03-readiness-field-missing.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"personal.weixin.readiness","tenantId":"tenant-canary","selectedAccountId":"account-canary","gateway":{"reachable":true,"errorCode":null},"plugin":{"id":"openclaw-weixin","loaded":true,"version":"2.4.6","digestSha256":null},"accounts":[{"accountId":"account-canary","name":"Canary Personal Weixin","configured":true,"enabled":true,"running":true,"lastError":null,"isDefault":false,"entitled":true}],"ready":false,"code":"not_ready","reasons":[{"code":"field_missing","field":"plugin.digestSha256"}],"observedAtMs":1784068060000,"freshUntilMs":1784068120000}

contracts/personal-weixin/v1/fixtures/04-readiness-stale.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"personal.weixin.readiness","tenantId":"tenant-canary","selectedAccountId":"account-canary","gateway":{"reachable":true,"errorCode":null},"plugin":{"id":"openclaw-weixin","loaded":true,"version":"2.4.6","digestSha256":"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},"accounts":[{"accountId":"account-canary","name":"Canary Personal Weixin","configured":true,"enabled":true,"running":true,"lastError":null,"isDefault":false,"entitled":true}],"ready":false,"code":"not_ready","reasons":[{"code":"snapshot_stale","field":"freshUntilMs"}],"observedAtMs":1784060000000,"freshUntilMs":1784060060000}

contracts/personal-weixin/v1/fixtures/05-readiness-plugin-digest-mismatch.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"personal.weixin.readiness","tenantId":"tenant-canary","selectedAccountId":"account-canary","gateway":{"reachable":true,"errorCode":null},"plugin":{"id":"openclaw-weixin","loaded":true,"version":"2.4.6","digestSha256":"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"},"accounts":[{"accountId":"account-canary","name":"Canary Personal Weixin","configured":true,"enabled":true,"running":true,"lastError":null,"isDefault":false,"entitled":true}],"ready":false,"code":"not_ready","reasons":[{"code":"plugin_digest_mismatch","field":"plugin.digestSha256"}],"observedAtMs":1784068060000,"freshUntilMs":1784068120000}

contracts/personal-weixin/v1/fixtures/06-readiness-account-not-entitled.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"personal.weixin.readiness","tenantId":"tenant-canary","selectedAccountId":"account-canary","gateway":{"reachable":true,"errorCode":null},"plugin":{"id":"openclaw-weixin","loaded":true,"version":"2.4.6","digestSha256":"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},"accounts":[{"accountId":"account-canary","name":"Canary Personal Weixin","configured":true,"enabled":true,"running":true,"lastError":null,"isDefault":false,"entitled":false}],"ready":false,"code":"not_ready","reasons":[{"code":"account_not_entitled","field":"accounts[0].entitled"}],"observedAtMs":1784068060000,"freshUntilMs":1784068120000}

contracts/personal-weixin/v1/fixtures/07-readiness-account-not-running.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"personal.weixin.readiness","tenantId":"tenant-canary","selectedAccountId":"account-canary","gateway":{"reachable":true,"errorCode":null},"plugin":{"id":"openclaw-weixin","loaded":true,"version":"2.4.6","digestSha256":"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},"accounts":[{"accountId":"account-canary","name":"Canary Personal Weixin","configured":true,"enabled":true,"running":false,"lastError":"plugin_not_running","isDefault":false,"entitled":true}],"ready":false,"code":"not_ready","reasons":[{"code":"account_not_running","field":"accounts[0].running"}],"observedAtMs":1784068060000,"freshUntilMs":1784068120000}

contracts/personal-weixin/v1/fixtures/08-readiness-error.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"personal.weixin.readiness","tenantId":"tenant-canary","selectedAccountId":"account-canary","gateway":{"reachable":false,"errorCode":"gateway_unreachable"},"plugin":{"id":"openclaw-weixin","loaded":false,"version":null,"digestSha256":null},"accounts":[{"accountId":"account-canary","name":"Canary Personal Weixin","configured":true,"enabled":true,"running":false,"lastError":"gateway_unreachable","isDefault":false,"entitled":true}],"ready":false,"code":"error","reasons":[{"code":"gateway_error","field":"gateway.reachable"}],"observedAtMs":1784068060000,"freshUntilMs":1784068060000}

contracts/personal-weixin/v1/fixtures/09-web-login-start-request.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.start.request","accountId":"account-canary","force":false,"timeoutMs":30000}

contracts/personal-weixin/v1/fixtures/10-web-login-wait-request.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.wait.request","accountId":"account-canary","sessionKey":"weixin-session-20260715-A1","verifyCode":"4321","currentQrDataUrl":"data:image/png;base64,iVBORw0KGgo=","timeoutMs":30000}

contracts/personal-weixin/v1/fixtures/11-qr-pending.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.result","status":"qr_pending","accountId":"account-canary","sessionKey":"weixin-session-20260715-A1","connected":false,"alreadyConnected":false,"terminal":false,"needsVerifyCode":false,"qrDataUrl":"data:image/png;base64,iVBORw0KGgo="}

contracts/personal-weixin/v1/fixtures/12-need-verify-code.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.result","status":"need_verifycode","accountId":"account-canary","sessionKey":"weixin-session-20260715-A1","connected":false,"alreadyConnected":false,"terminal":false,"needsVerifyCode":true}

contracts/personal-weixin/v1/fixtures/13-invalid-verify-code.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.result","status":"invalid_verifycode","accountId":"account-canary","sessionKey":"weixin-session-20260715-A1","connected":false,"alreadyConnected":false,"terminal":false,"needsVerifyCode":true,"errorCode":"invalid_verifycode"}

contracts/personal-weixin/v1/fixtures/14-expired.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.result","status":"expired","accountId":"account-canary","sessionKey":"weixin-session-20260715-A1","connected":false,"alreadyConnected":false,"terminal":true,"needsVerifyCode":false,"errorCode":"login_expired"}

contracts/personal-weixin/v1/fixtures/15-failed.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.result","status":"failed","accountId":"account-canary","sessionKey":"weixin-session-20260715-A1","connected":false,"alreadyConnected":false,"terminal":true,"needsVerifyCode":false,"errorCode":"upstream_failed"}

contracts/personal-weixin/v1/fixtures/16-already-connected.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.result","status":"already_connected","upstreamStatus":"binded_redirect","accountId":"account-canary","sessionKey":"weixin-session-20260715-A1","connected":false,"alreadyConnected":true,"terminal":true,"needsVerifyCode":false}

contracts/personal-weixin/v1/fixtures/17-confirmed.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.result","status":"confirmed","accountId":"account-canary","sessionKey":"weixin-session-20260715-A1","connected":true,"alreadyConnected":false,"terminal":true,"needsVerifyCode":false,"userId":"sender-canary"}

contracts/personal-weixin/v1/fixtures/18-unknown-upstream-fail-closed.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.login.result","status":"failed","upstreamStatus":"future_unknown_state","accountId":"account-canary","sessionKey":"weixin-session-20260715-A1","connected":false,"alreadyConnected":false,"terminal":true,"needsVerifyCode":false,"errorCode":"unknown_upstream_status"}

contracts/personal-weixin/v1/fixtures/19-authenticated-inbound-event.json

@@ -0,0 +1 @@
+{"eventId":"event-20260715-A1","accountId":"account-canary","senderId":"sender-canary","chatId":"chat-canary","challengeCode":"A1B2C3D4","observedAt":1784068120000}

contracts/personal-weixin/v1/fixtures/20-unbind-unsupported.json

@@ -0,0 +1 @@
+{"schemaVersion":"aios.personal-weixin.golden.v1","kind":"web.unbind.result","httpStatus":501,"ok":false,"supported":false,"code":"unbind_not_supported","mutationCount":0}

contracts/personal-weixin/v1/golden-contract.schema.json

@@ -0,0 +1,986 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://aios.imruyi.top/contracts/personal-weixin/v1/golden-contract.schema.json",
+  "title": "AIOS Personal Weixin Golden Contract v1",
+  "oneOf": [
+    {
+      "$ref": "#/$defs/entitlement"
+    },
+    {
+      "$ref": "#/$defs/readiness"
+    },
+    {
+      "$ref": "#/$defs/startRequest"
+    },
+    {
+      "$ref": "#/$defs/waitRequest"
+    },
+    {
+      "$ref": "#/$defs/loginResult"
+    },
+    {
+      "$ref": "#/$defs/inboundEvent"
+    },
+    {
+      "$ref": "#/$defs/unbindResult"
+    }
+  ],
+  "$defs": {
+    "identifier": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 128,
+      "pattern": "^[A-Za-z0-9._~:@-]+$"
+    },
+    "sessionKey": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 256,
+      "pattern": "^[A-Za-z0-9._~:-]+$"
+    },
+    "schemaVersion": {
+      "const": "aios.personal-weixin.golden.v1"
+    },
+    "entitlement": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "schemaVersion",
+        "kind",
+        "tenantId",
+        "accountId",
+        "effect",
+        "policyVersion",
+        "issuedAtMs"
+      ],
+      "properties": {
+        "schemaVersion": {
+          "$ref": "#/$defs/schemaVersion"
+        },
+        "kind": {
+          "const": "tenant.account.entitlement"
+        },
+        "tenantId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "accountId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "effect": {
+          "const": "allow"
+        },
+        "policyVersion": {
+          "$ref": "#/$defs/identifier"
+        },
+        "issuedAtMs": {
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "readinessReason": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "code",
+        "field"
+      ],
+      "properties": {
+        "code": {
+          "enum": [
+            "field_missing",
+            "snapshot_stale",
+            "plugin_digest_mismatch",
+            "account_not_entitled",
+            "account_not_running",
+            "gateway_error"
+          ]
+        },
+        "field": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 128
+        }
+      }
+    },
+    "readiness": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "schemaVersion",
+        "kind",
+        "tenantId",
+        "selectedAccountId",
+        "gateway",
+        "plugin",
+        "accounts",
+        "ready",
+        "code",
+        "reasons",
+        "observedAtMs",
+        "freshUntilMs"
+      ],
+      "properties": {
+        "schemaVersion": {
+          "$ref": "#/$defs/schemaVersion"
+        },
+        "kind": {
+          "const": "personal.weixin.readiness"
+        },
+        "tenantId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "selectedAccountId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "gateway": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": [
+            "reachable",
+            "errorCode"
+          ],
+          "properties": {
+            "reachable": {
+              "type": "boolean"
+            },
+            "errorCode": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "minLength": 1,
+              "maxLength": 128
+            }
+          }
+        },
+        "plugin": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": [
+            "id",
+            "loaded",
+            "version",
+            "digestSha256"
+          ],
+          "properties": {
+            "id": {
+              "const": "openclaw-weixin"
+            },
+            "loaded": {
+              "type": "boolean"
+            },
+            "version": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "minLength": 1,
+              "maxLength": 64
+            },
+            "digestSha256": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "pattern": "^[a-f0-9]{64}$"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          }
+        },
+        "accounts": {
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 100,
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": [
+              "accountId",
+              "name",
+              "configured",
+              "enabled",
+              "running",
+              "lastError",
+              "isDefault",
+              "entitled"
+            ],
+            "properties": {
+              "accountId": {
+                "$ref": "#/$defs/identifier"
+              },
+              "name": {
+                "type": "string",
+                "minLength": 1,
+                "maxLength": 128
+              },
+              "configured": {
+                "type": "boolean"
+              },
+              "enabled": {
+                "type": "boolean"
+              },
+              "running": {
+                "type": "boolean"
+              },
+              "lastError": {
+                "type": [
+                  "string",
+                  "null"
+                ],
+                "minLength": 1,
+                "maxLength": 256
+              },
+              "isDefault": {
+                "type": "boolean"
+              },
+              "entitled": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "ready": {
+          "type": "boolean"
+        },
+        "code": {
+          "enum": [
+            "ready",
+            "not_ready",
+            "error"
+          ]
+        },
+        "reasons": {
+          "type": "array",
+          "maxItems": 32,
+          "items": {
+            "$ref": "#/$defs/readinessReason"
+          }
+        },
+        "observedAtMs": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "freshUntilMs": {
+          "type": "integer",
+          "minimum": 0
+        }
+      },
+      "allOf": [
+        {
+          "if": {
+            "properties": {
+              "ready": {
+                "const": true
+              }
+            },
+            "required": [
+              "ready"
+            ]
+          },
+          "then": {
+            "properties": {
+              "code": {
+                "const": "ready"
+              },
+              "reasons": {
+                "maxItems": 0
+              },
+              "gateway": {
+                "properties": {
+                  "reachable": {
+                    "const": true
+                  },
+                  "errorCode": {
+                    "const": null
+                  }
+                }
+              },
+              "plugin": {
+                "properties": {
+                  "loaded": {
+                    "const": true
+                  },
+                  "version": {
+                    "type": "string"
+                  },
+                  "digestSha256": {
+                    "type": "string",
+                    "pattern": "^[a-f0-9]{64}$"
+                  }
+                }
+              },
+              "accounts": {
+                "items": {
+                  "properties": {
+                    "configured": {
+                      "const": true
+                    },
+                    "enabled": {
+                      "const": true
+                    },
+                    "running": {
+                      "const": true
+                    },
+                    "lastError": {
+                      "const": null
+                    },
+                    "entitled": {
+                      "const": true
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "else": {
+            "properties": {
+              "code": {
+                "enum": [
+                  "not_ready",
+                  "error"
+                ]
+              },
+              "reasons": {
+                "minItems": 1
+              }
+            }
+          }
+        }
+      ]
+    },
+    "startRequest": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "schemaVersion",
+        "kind",
+        "accountId",
+        "force",
+        "timeoutMs"
+      ],
+      "properties": {
+        "schemaVersion": {
+          "$ref": "#/$defs/schemaVersion"
+        },
+        "kind": {
+          "const": "web.login.start.request"
+        },
+        "accountId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "force": {
+          "const": false
+        },
+        "timeoutMs": {
+          "type": "integer",
+          "minimum": 1000,
+          "maximum": 120000
+        }
+      }
+    },
+    "waitRequest": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "schemaVersion",
+        "kind",
+        "accountId",
+        "sessionKey",
+        "timeoutMs"
+      ],
+      "properties": {
+        "schemaVersion": {
+          "$ref": "#/$defs/schemaVersion"
+        },
+        "kind": {
+          "const": "web.login.wait.request"
+        },
+        "accountId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "sessionKey": {
+          "$ref": "#/$defs/sessionKey"
+        },
+        "verifyCode": {
+          "type": "string",
+          "pattern": "^[0-9]{4,8}$"
+        },
+        "currentQrDataUrl": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1048576,
+          "pattern": "^data:image/png;base64,"
+        },
+        "timeoutMs": {
+          "type": "integer",
+          "minimum": 1000,
+          "maximum": 120000
+        }
+      }
+    },
+    "loginResult": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "schemaVersion",
+        "kind",
+        "status",
+        "accountId",
+        "sessionKey",
+        "connected",
+        "alreadyConnected",
+        "terminal",
+        "needsVerifyCode"
+      ],
+      "properties": {
+        "schemaVersion": {
+          "$ref": "#/$defs/schemaVersion"
+        },
+        "kind": {
+          "const": "web.login.result"
+        },
+        "status": {
+          "enum": [
+            "qr_pending",
+            "need_verifycode",
+            "invalid_verifycode",
+            "expired",
+            "failed",
+            "already_connected",
+            "confirmed"
+          ]
+        },
+        "accountId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "sessionKey": {
+          "$ref": "#/$defs/sessionKey"
+        },
+        "connected": {
+          "type": "boolean"
+        },
+        "alreadyConnected": {
+          "type": "boolean"
+        },
+        "terminal": {
+          "type": "boolean"
+        },
+        "needsVerifyCode": {
+          "type": "boolean"
+        },
+        "qrDataUrl": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1048576,
+          "pattern": "^data:image/png;base64,"
+        },
+        "userId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "errorCode": {
+          "enum": [
+            "invalid_verifycode",
+            "login_expired",
+            "upstream_failed",
+            "unknown_upstream_status"
+          ]
+        },
+        "upstreamStatus": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 128
+        }
+      },
+      "allOf": [
+        {
+          "if": {
+            "properties": {
+              "status": {
+                "const": "qr_pending"
+              }
+            }
+          },
+          "then": {
+            "required": [
+              "qrDataUrl"
+            ],
+            "properties": {
+              "connected": {
+                "const": false
+              },
+              "alreadyConnected": {
+                "const": false
+              },
+              "terminal": {
+                "const": false
+              },
+              "needsVerifyCode": {
+                "const": false
+              }
+            },
+            "not": {
+              "anyOf": [
+                {
+                  "required": [
+                    "userId"
+                  ]
+                },
+                {
+                  "required": [
+                    "errorCode"
+                  ]
+                },
+                {
+                  "required": [
+                    "upstreamStatus"
+                  ]
+                }
+              ]
+            }
+          }
+        },
+        {
+          "if": {
+            "properties": {
+              "status": {
+                "const": "need_verifycode"
+              }
+            }
+          },
+          "then": {
+            "properties": {
+              "connected": {
+                "const": false
+              },
+              "alreadyConnected": {
+                "const": false
+              },
+              "terminal": {
+                "const": false
+              },
+              "needsVerifyCode": {
+                "const": true
+              }
+            },
+            "not": {
+              "anyOf": [
+                {
+                  "required": [
+                    "qrDataUrl"
+                  ]
+                },
+                {
+                  "required": [
+                    "userId"
+                  ]
+                },
+                {
+                  "required": [
+                    "errorCode"
+                  ]
+                },
+                {
+                  "required": [
+                    "upstreamStatus"
+                  ]
+                }
+              ]
+            }
+          }
+        },
+        {
+          "if": {
+            "properties": {
+              "status": {
+                "const": "invalid_verifycode"
+              }
+            }
+          },
+          "then": {
+            "required": [
+              "errorCode"
+            ],
+            "properties": {
+              "errorCode": {
+                "const": "invalid_verifycode"
+              },
+              "connected": {
+                "const": false
+              },
+              "alreadyConnected": {
+                "const": false
+              },
+              "terminal": {
+                "const": false
+              },
+              "needsVerifyCode": {
+                "const": true
+              }
+            },
+            "not": {
+              "anyOf": [
+                {
+                  "required": [
+                    "qrDataUrl"
+                  ]
+                },
+                {
+                  "required": [
+                    "userId"
+                  ]
+                },
+                {
+                  "required": [
+                    "upstreamStatus"
+                  ]
+                }
+              ]
+            }
+          }
+        },
+        {
+          "if": {
+            "properties": {
+              "status": {
+                "const": "expired"
+              }
+            }
+          },
+          "then": {
+            "required": [
+              "errorCode"
+            ],
+            "properties": {
+              "errorCode": {
+                "const": "login_expired"
+              },
+              "connected": {
+                "const": false
+              },
+              "alreadyConnected": {
+                "const": false
+              },
+              "terminal": {
+                "const": true
+              },
+              "needsVerifyCode": {
+                "const": false
+              }
+            },
+            "not": {
+              "anyOf": [
+                {
+                  "required": [
+                    "qrDataUrl"
+                  ]
+                },
+                {
+                  "required": [
+                    "userId"
+                  ]
+                },
+                {
+                  "required": [
+                    "upstreamStatus"
+                  ]
+                }
+              ]
+            }
+          }
+        },
+        {
+          "if": {
+            "properties": {
+              "status": {
+                "const": "failed"
+              }
+            }
+          },
+          "then": {
+            "required": [
+              "errorCode"
+            ],
+            "properties": {
+              "connected": {
+                "const": false
+              },
+              "alreadyConnected": {
+                "const": false
+              },
+              "terminal": {
+                "const": true
+              },
+              "needsVerifyCode": {
+                "const": false
+              }
+            },
+            "not": {
+              "anyOf": [
+                {
+                  "required": [
+                    "qrDataUrl"
+                  ]
+                },
+                {
+                  "required": [
+                    "userId"
+                  ]
+                }
+              ]
+            }
+          }
+        },
+        {
+          "if": {
+            "required": [
+              "upstreamStatus"
+            ],
+            "properties": {
+              "status": {
+                "const": "failed"
+              }
+            }
+          },
+          "then": {
+            "properties": {
+              "errorCode": {
+                "const": "unknown_upstream_status"
+              }
+            },
+            "not": {
+              "anyOf": [
+                {
+                  "required": [
+                    "qrDataUrl"
+                  ]
+                },
+                {
+                  "required": [
+                    "userId"
+                  ]
+                }
+              ]
+            }
+          }
+        },
+        {
+          "if": {
+            "required": [
+              "status",
+              "errorCode"
+            ],
+            "properties": {
+              "status": {
+                "const": "failed"
+              },
+              "errorCode": {
+                "const": "unknown_upstream_status"
+              }
+            }
+          },
+          "then": {
+            "required": [
+              "upstreamStatus"
+            ]
+          }
+        },
+        {
+          "if": {
+            "required": [
+              "status",
+              "errorCode"
+            ],
+            "properties": {
+              "status": {
+                "const": "failed"
+              },
+              "errorCode": {
+                "const": "upstream_failed"
+              }
+            }
+          },
+          "then": {
+            "not": {
+              "required": [
+                "upstreamStatus"
+              ]
+            }
+          }
+        },
+        {
+          "if": {
+            "properties": {
+              "status": {
+                "const": "already_connected"
+              }
+            }
+          },
+          "then": {
+            "required": [
+              "upstreamStatus"
+            ],
+            "properties": {
+              "upstreamStatus": {
+                "const": "binded_redirect"
+              },
+              "connected": {
+                "const": false
+              },
+              "alreadyConnected": {
+                "const": true
+              },
+              "terminal": {
+                "const": true
+              },
+              "needsVerifyCode": {
+                "const": false
+              }
+            },
+            "not": {
+              "anyOf": [
+                {
+                  "required": [
+                    "qrDataUrl"
+                  ]
+                },
+                {
+                  "required": [
+                    "userId"
+                  ]
+                },
+                {
+                  "required": [
+                    "errorCode"
+                  ]
+                }
+              ]
+            }
+          }
+        },
+        {
+          "if": {
+            "properties": {
+              "status": {
+                "const": "confirmed"
+              }
+            }
+          },
+          "then": {
+            "required": [
+              "userId"
+            ],
+            "properties": {
+              "connected": {
+                "const": true
+              },
+              "alreadyConnected": {
+                "const": false
+              },
+              "terminal": {
+                "const": true
+              },
+              "needsVerifyCode": {
+                "const": false
+              }
+            },
+            "not": {
+              "anyOf": [
+                {
+                  "required": [
+                    "qrDataUrl"
+                  ]
+                },
+                {
+                  "required": [
+                    "errorCode"
+                  ]
+                },
+                {
+                  "required": [
+                    "upstreamStatus"
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      ]
+    },
+    "inboundEvent": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "eventId",
+        "accountId",
+        "senderId",
+        "chatId",
+        "challengeCode",
+        "observedAt"
+      ],
+      "properties": {
+        "eventId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "accountId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "senderId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "chatId": {
+          "$ref": "#/$defs/identifier"
+        },
+        "challengeCode": {
+          "type": "string",
+          "minLength": 6,
+          "maxLength": 64,
+          "pattern": "^[A-Z0-9]+$"
+        },
+        "observedAt": {
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "unbindResult": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "schemaVersion",
+        "kind",
+        "httpStatus",
+        "ok",
+        "supported",
+        "code",
+        "mutationCount"
+      ],
+      "properties": {
+        "schemaVersion": {
+          "$ref": "#/$defs/schemaVersion"
+        },
+        "kind": {
+          "const": "web.unbind.result"
+        },
+        "httpStatus": {
+          "const": 501
+        },
+        "ok": {
+          "const": false
+        },
+        "supported": {
+          "const": false
+        },
+        "code": {
+          "const": "unbind_not_supported"
+        },
+        "mutationCount": {
+          "const": 0
+        }
+      }
+    }
+  }
+}

docs/superpowers/plans/2026-07-14-v2r1-runtime-release-plan.md

@@ -18,12 +18,14 @@
 - All OpenClaw loader work uses an isolated temporary or candidate config/state directory.
 - `ACCEPTED` is terminal. Legacy handling is reachable only when bridge mode is explicitly `disabled`.
 - Never claim exactly-once Hermes delivery or use time/approximation as message authority.
+- D0 is a non-blocker documentation correction. Its reviewed commit is the R9 `START`; it does not consume a blocker label or relax any B3/B4/B5 evidence gate.
+- B2 is both the canonical-package blocker and the executable completeness gate for Ledger, Memory, Secret, Audit, Hermes Profile, Cell Manager/CLI, and Fabric. Existing correct behavior is recorded as characterization; a production edit requires an observed contract RED first.
 
 After docs review, initialize the stable per-worktree ledger from the then-current tip rather than a hardcoded SHA:
 
 ```bash
 test -z "$(git status --porcelain)"
-test "$(git branch --show-current)" = "integration/v2r1-runtime-20260714"
+test "$(git branch --show-current)" = "integration/v2r1-runtime-20260715-r9"
 start_sha="$(git rev-parse HEAD)"
 start_parent="$(git rev-parse HEAD^)"
 start_tree="$(git rev-parse HEAD^{tree})"
@@ -170,8 +172,24 @@ test "$tree" = "$(git rev-parse HEAD^{tree})"
 - Create: `tests/v2r1/test_ingress_service.py`
 - Create: `tests/test_v2r1_package_identity.py`
 - Modify: the exact 23 Appendix A test files, and no unlisted legacy import file
+- Modify only after an observed matrix RED: `active-runtime/app/aios_v2r1/message_ledger.py`
+- Modify only after an observed matrix RED: `active-runtime/app/aios_v2r1/memory_scope.py`
+- Modify only after an observed matrix RED: `active-runtime/app/aios_v2r1/secret_scope.py`
+- Modify only after an observed matrix RED: `active-runtime/app/aios_v2r1/audit.py`
+- Modify only after an observed matrix RED: `active-runtime/app/aios_v2r1/hermes_profile.py`
+- Modify only after an observed matrix RED: `active-runtime/app/aios_v2r1/cell_manager.py`
+- Modify only after an observed matrix RED: `active-runtime/app/aios_v2r1/hermes_fabric.py`
+- Expand: `tests/v2r1/test_message_ledger_append.py`
+- Create: `tests/v2r1/test_memory_scope.py`
+- Create: `tests/v2r1/test_secret_scope.py`
+- Create: `tests/v2r1/test_audit.py`
+- Create: `tests/v2r1/test_hermes_profile.py`
+- Create: `tests/v2r1/test_cell_manager.py`
+- Expand: `tests/v2r1/test_hermes_fabric.py`
 
-**Exact contract:** V2R1 imports only as `aios_v2r1`; no `active_runtime` shim/alias/namespace extension/copied tree. Wheel includes `aios_v2r1`, excludes `active_runtime` and legacy `app`. Legacy repository tests change `active_runtime.app.*` to `app.*` and run with `PYTHONPATH='active-runtime:active-runtime/app'`. Mutation routes return bounded `SERVICE_NOT_CONFIGURED` until B3/B4 processors exist. Existing cell CLI stays compatible and `serve` is separate.
+**Exact contract:** V2R1 imports only as `aios_v2r1`; no `active_runtime` shim/alias/namespace extension/copied tree. Wheel includes `aios_v2r1`, excludes `active_runtime` and legacy `app`. Legacy repository tests change `active_runtime.app.*` to `app.*` and run with `PYTHONPATH='active-runtime:active-runtime/app'`. Mutation routes return bounded `SERVICE_NOT_CONFIGURED` until B3/B4 processors exist. Existing cell CLI stays compatible and `serve` is separate. B2 changes exactly 43 paths: the original 29 package/import paths plus the seven named runtime modules and seven named matrix-test paths above.
+
+**Executable completeness matrix:** Message Ledger proves exact-ID query with no fallback, idempotency, collision conflict, tenant/cell/direction isolation, expiry/purge, restart, concurrency, and sanitized SQLite failures. Memory proves every namespace, cross-scope denial, shared-artifact read-only access, qualified keys, traversal rejection, and disabled search. Secret proves reference/path/scope/kind/version/identifier validation, no value leakage, and fail-closed broker boundaries. Audit proves genesis, tamper/delete/reorder detection, Unicode canonicalization, concurrency, restart, validation, tenant isolation, and sanitized SQLite failures. Hermes Profile proves exact environment, absolute roots, `0700` modes, traversal/symlink denial, scope, idempotent prepare, and no inherited environment. Cell Manager/CLI proves one cell per tenant, an explicit state graph, atomic/concurrent persistence, corrupt-registry fail-closed behavior, stable CLI exit codes/JSON, and restart. Fabric proves claimed jobs return `running` consistently with durable state, tenant/cell/profile isolation, one concurrent claimant, rejection of non-claimable states, restart, and sanitized SQLite failures.
 
 - [ ] Rehydrate the stable blocker ledger using the global snippet and require its latest label is `B1`.
 - [ ] Rehydrate the exact explorer manifest path and compare sorted actual/expected lists between exact marker lines. The marker names are assembled from split literals so this command cannot match itself:
@@ -196,16 +214,21 @@ cmp -s "$actual" "$expected"
 
 Expected: exact match to 23 paths. Drift requires another docs review.
 
-- [ ] Add package/service/CLI tests; run initial RED:
+- [ ] Add package/service/CLI tests and the seven-component matrix before any production repair. Run each focused case and record the exact command plus its expected contract failure. If current behavior already satisfies the contract, record it as characterization and do not manufacture a failure or edit that production module.
+- [ ] Run the aggregate initial RED/characterization command:
 
 ```bash
 PYTHONDONTWRITEBYTECODE=1 PYTEST_ADDOPTS='-p no:cacheprovider' PYTHONPATH='active-runtime:active-runtime/app' \
-  python3 -m pytest tests/v2r1/test_ingress_service.py tests/test_v2r1_package_identity.py -q
+  python3 -m pytest tests/v2r1/test_ingress_service.py tests/test_v2r1_package_identity.py \
+    tests/v2r1/test_message_ledger_append.py tests/v2r1/test_memory_scope.py \
+    tests/v2r1/test_secret_scope.py tests/v2r1/test_audit.py \
+    tests/v2r1/test_hermes_profile.py tests/v2r1/test_cell_manager.py \
+    tests/v2r1/test_hermes_fabric.py -q
 ```
 
-Expected RED: package metadata, ingress service, and identity tests do not exist.
+Expected: package metadata, ingress service, and identity tests begin RED because their implementation is absent. Each matrix case is either a recorded contract RED or a recorded characterization; no production repair precedes its corresponding RED.
 
-- [ ] Implement package/disabled processor boundary and replace imports in exactly Appendix A. Prove no shim/old import:
+- [ ] Implement package/disabled processor boundary and replace imports in exactly Appendix A. Apply only the minimum runtime repairs demonstrated by matrix REDs; do not delete or weaken a matrix test. Prove no shim/old import:
 
 ```bash
 test ! -e active_runtime
@@ -215,11 +238,15 @@ test -z "$(git grep -l -E '^(from|import) active_runtime\.app' -- tests || true)
 - [ ] Run full collect and full suite:
 
 ```bash
+PYTHONDONTWRITEBYTECODE=1 PYTEST_ADDOPTS='-p no:cacheprovider' PYTHONPATH='active-runtime:active-runtime/app' \
+  python3 -m pytest tests/v2r1 tests/integration tests/test_v2r1_package_identity.py -q
 PYTHONDONTWRITEBYTECODE=1 PYTEST_ADDOPTS='-p no:cacheprovider' PYTHONPATH='active-runtime:active-runtime/app' python3 -m pytest --collect-only -q
 PYTHONDONTWRITEBYTECODE=1 PYTEST_ADDOPTS='-p no:cacheprovider' PYTHONPATH='active-runtime:active-runtime/app' python3 -m pytest -q
+PYTHONDONTWRITEBYTECODE=1 python3 -m compileall -q active-runtime/app/aios_v2r1
+(cd openclaw/plugins/aios-tenant-boundary && npm test)
 ```
 
-Expected GREEN: zero collection/import errors and complete suite passes; pre-existing failures still block B2.
+Expected GREEN: the focused carried suite reports at least `160 passed`, including every matrix bullet; full collection has zero import errors; the complete pytest suite, 15 Node tests, and Python compileall pass. Re-run B1's real isolated default/opt-in loader sequence and require the same hook evidence. Pre-existing failures still block B2.
 
 - [ ] Build and inspect isolated wheel:
 
@@ -241,22 +268,29 @@ PY
 
 Expected GREEN: one wheel, one V2R1 namespace, installed identity `aios_v2r1`.
 
-- [ ] Stage six named paths plus exact explorer list, commit, append ledger:
+- [ ] Stage the exact 43 paths (six package paths, Appendix A's 23 import paths, seven matrix runtime modules, and seven matrix-test paths), commit, append ledger:
 
 ```bash
 actual="$(git rev-parse --git-path v2r1-active-runtime-imports.actual)"
 git add active-runtime/pyproject.toml active-runtime/app/aios_v2r1/__init__.py \
   active-runtime/app/aios_v2r1/ingress_service.py active-runtime/app/aios_v2r1/cli.py \
-  tests/v2r1/test_ingress_service.py tests/test_v2r1_package_identity.py
+  tests/v2r1/test_ingress_service.py tests/test_v2r1_package_identity.py \
+  active-runtime/app/aios_v2r1/message_ledger.py active-runtime/app/aios_v2r1/memory_scope.py \
+  active-runtime/app/aios_v2r1/secret_scope.py active-runtime/app/aios_v2r1/audit.py \
+  active-runtime/app/aios_v2r1/hermes_profile.py active-runtime/app/aios_v2r1/cell_manager.py \
+  active-runtime/app/aios_v2r1/hermes_fabric.py tests/v2r1/test_message_ledger_append.py \
+  tests/v2r1/test_memory_scope.py tests/v2r1/test_secret_scope.py tests/v2r1/test_audit.py \
+  tests/v2r1/test_hermes_profile.py tests/v2r1/test_cell_manager.py tests/v2r1/test_hermes_fabric.py
 while IFS= read -r path; do git add -- "$path"; done <"$actual"
 git commit -m "feat(v2r1): package canonical authenticated ingress"
 ```
 
 ### Review B2
 
-- [ ] Require `git diff --check`, exactly 29 paths (six named plus Appendix A), exact-list/no-shim checks, full collect/full pytest, and wheel identity.
+- [ ] Require `git diff --check`, exactly 43 paths (the original 29 plus the exact 14 matrix paths), exact-list/no-shim checks, focused matrix/carried tests, full collect/full pytest, Node 15, real loader default/opt-in, compileall, and wheel identity.
 - [ ] Require B2 parent equals B1 in ledger.
 - [ ] Prove mutation routes remain fail-closed until authenticated processors are installed.
+- [ ] Prove every production matrix edit has a recorded pre-edit RED and every already-correct case is recorded as characterization. The partial R9 ledger must contain exactly `START,B1,B2`; B3/B4/B5 remain absent.
 - [ ] After all prior B2 review checks pass, append B2 and verify the recorded commit identity:
 
 ```bash

docs/superpowers/plans/2026-07-15-v2r1-personal-weixin-r10-release-plan-amendment.md

@@ -0,0 +1,188 @@
+# V2R1 R10 personal Weixin release-plan amendment
+
+Status: reviewed design-only amendment. It adds D1, B6, and B7 to the R9 linear release plan. It does not authorize runtime, candidate, production, baseline, tag, or Fleet mutation.
+
+Authority remains `docs/superpowers/plans/2026-07-14-v2r1-runtime-release-plan.md` at B2 tip `68d27879103990aac692207a8512b3725c6d0d41`. R9 `START` is `a9a0b4ae396e33c9bfc35a5f5694e5e354c3a47c`; accepted B1 is `57103c11d21192a50febe846d30cee6fc5da4ac1`; accepted B2 is `68d27879103990aac692207a8512b3725c6d0d41`. Their trees and path sets are immutable. This amendment does not relabel, squash, reorder, or absorb any of the original five blockers.
+
+## Exact linear ledger
+
+The only valid ancestry is:
+
+```text
+START -> B1 -> B2 -> D1 -> B3 -> B4 -> B5 -> B6 -> B7
+```
+
+`D1` is a non-blocker design dependency whose parent is exactly B2. `B3` parent is D1; every later blocker parent is the immediately preceding row. `START..B7` contains exactly eight non-merge commits: B1, B2, D1, B3, B4, B5, B6, B7. B1-B5 remain five distinct original blocker commits; B6 and B7 are distinct new blocker commits. No cherry-pick collapse, squash, fixup, merge commit, history rewrite, or force push is allowed.
+
+B3/B4 retain every R9 evidence gate. In particular, unresolved `EVIDENCE_REQUIRED` for the exact provider `client_id -> message_id` binding stops B4 with no implementation, commit, or ledger append. B5 can land only after accepted B4. Even after B5 lands, every forward `stage`, `verify-stage`, or `promote` operation remains blocked until accepted B6 and B7 commits exist and all gates below pass.
+
+## D1 design-only commit
+
+D1 changes exactly these 23 paths and no others:
+
+```text
+docs/superpowers/plans/2026-07-15-v2r1-personal-weixin-r10-release-plan-amendment.md
+contracts/personal-weixin/v1/SECURITY.md
+contracts/personal-weixin/v1/golden-contract.schema.json
+contracts/personal-weixin/v1/fixtures/01-tenant-account-entitlement.json
+contracts/personal-weixin/v1/fixtures/02-readiness-ready.json
+contracts/personal-weixin/v1/fixtures/03-readiness-field-missing.json
+contracts/personal-weixin/v1/fixtures/04-readiness-stale.json
+contracts/personal-weixin/v1/fixtures/05-readiness-plugin-digest-mismatch.json
+contracts/personal-weixin/v1/fixtures/06-readiness-account-not-entitled.json
+contracts/personal-weixin/v1/fixtures/07-readiness-account-not-running.json
+contracts/personal-weixin/v1/fixtures/08-readiness-error.json
+contracts/personal-weixin/v1/fixtures/09-web-login-start-request.json
+contracts/personal-weixin/v1/fixtures/10-web-login-wait-request.json
+contracts/personal-weixin/v1/fixtures/11-qr-pending.json
+contracts/personal-weixin/v1/fixtures/12-need-verify-code.json
+contracts/personal-weixin/v1/fixtures/13-invalid-verify-code.json
+contracts/personal-weixin/v1/fixtures/14-expired.json
+contracts/personal-weixin/v1/fixtures/15-failed.json
+contracts/personal-weixin/v1/fixtures/16-already-connected.json
+contracts/personal-weixin/v1/fixtures/17-confirmed.json
+contracts/personal-weixin/v1/fixtures/18-unknown-upstream-fail-closed.json
+contracts/personal-weixin/v1/fixtures/19-authenticated-inbound-event.json
+contracts/personal-weixin/v1/fixtures/20-unbind-unsupported.json
+```
+
+D1 validation requires JSON parse, Draft 2020-12 schema validation of every fixture, negative mutation tests, exact 23-path comparison, `git diff --check`, placeholder/secret scan, and confirmation that no runtime/deploy/release-active path changed.
+
+## Preserved R9 blocker allowlists
+
+B1 and B2 are already accepted at the immutable SHAs above. Their actual commit path sets, parent SHAs, and trees are the allowlists; compare with `git diff-tree --no-commit-id --name-only -r <sha>` and reject any mismatch. B1 has six actual paths under `openclaw/plugins/aios-tenant-boundary/`; B2 has exactly 43 actual package/import/matrix paths. No later blocker may amend them.
+
+B3 changes exactly these 15 R9 paths:
+
+```text
+active-runtime/app/aios_v2r1/identity.py
+active-runtime/app/aios_v2r1/tenant_context.py
+active-runtime/app/aios_v2r1/ingress_service.py
+active-runtime/app/aios_v2r1/bridge_auth.py
+active-runtime/app/aios_v2r1/weixin_projection.py
+fixes/patch_openclaw_weixin_v2r1_ingress.py
+tests/v2r1/test_bridge_auth.py
+tests/v2r1/test_weixin_projection.py
+tests/integration/test_v2r1_bridge_transport.py
+tests/test_weixin_v2r1_ingress_bridge.py
+tests/fixtures/weixin_v2r1/text.json
+tests/fixtures/weixin_v2r1/quoted-text.json
+tests/fixtures/weixin_v2r1/image-with-text.json
+tests/fixtures/weixin_v2r1/unresolved-reference.json
+release/v2r1c0-rc1/weixin-bridge-evidence.json
+```
+
+B4 changes exactly these 19 R9 paths and remains evidence-stopped until both R9 evidence files are accepted:
+
+```text
+active-runtime/app/aios_v2r1/outbox.py
+active-runtime/app/aios_v2r1/hermes_http.py
+active-runtime/app/aios_v2r1/hermes_worker.py
+active-runtime/app/aios_v2r1/outbound_receipt.py
+active-runtime/app/aios_v2r1/ingress_service.py
+active-runtime/app/aios_v2r1/message_ledger.py
+tests/v2r1/test_outbox.py
+tests/v2r1/test_hermes_http.py
+tests/v2r1/test_outbound_receipt.py
+tests/integration/test_v2r1_delivery_flow.py
+fixes/patch_openclaw_weixin_outbound_quotes.py
+fixes/patch_openclaw_weixin_outbound_receipts.py
+openclaw/plugins/aios-tenant-boundary/dist/receipt-client.js
+openclaw/plugins/aios-tenant-boundary/dist/outbound-receipt-journal.js
+openclaw/plugins/aios-tenant-boundary/test/receipt-client.test.js
+tests/test_weixin_outbound_quote_timestamp.py
+tests/test_weixin_outbound_receipt_boundary.py
+release/v2r1c0-rc1/hermes-http-contract-evidence.json
+release/v2r1c0-rc1/weixin-outbound-binding-evidence.json
+```
+
+B5 changes exactly these 14 R9 paths:
+
+```text
+deploy/v2r1/release_ctl.py
+deploy/v2r1/capture_live_preflight.py
+deploy/v2r1/install.sh
+deploy/v2r1/validate.sh
+deploy/v2r1/healthcheck.sh
+deploy/v2r1/rollback.sh
+deploy/v2r1/aios-v2r1-candidate-gateway.service
+deploy/v2r1/aios-v2r1-production-gateway.service
+deploy/v2r1/aios-v2r1-ingress.service
+deploy/v2r1/aios-v2r1-hermes-worker.service
+deploy/v2r1/openclaw-candidate.json5
+release/v2r1c0-rc1/FLEET_UNSUPPORTED
+tests/deploy/test_v2r1_release_contract.py
+release/v2r1c0-rc1/RELEASE.md
+```
+
+## B6: evidence-bound OpenClaw personal-Weixin candidate
+
+B6 changes exactly these 13 paths:
+
+```text
+openclaw/candidates/personal-weixin-r10/README.md
+openclaw/candidates/personal-weixin-r10/manifest.json
+openclaw/candidates/personal-weixin-r10/src/golden-contract.js
+openclaw/candidates/personal-weixin-r10/src/gateway-inbound-auth.js
+openclaw/candidates/personal-weixin-r10/plugin/openclaw.plugin.json
+openclaw/candidates/personal-weixin-r10/plugin/index.js
+fixes/patch_openclaw_personal_weixin_login.py
+fixes/patch_openclaw_personal_weixin_gateway_auth.py
+openclaw/candidates/personal-weixin-r10/test/golden-contract.test.js
+openclaw/candidates/personal-weixin-r10/test/gateway-auth.test.js
+tests/personal_weixin/test_golden_fixtures.py
+tests/integration/test_personal_weixin_gateway_contract.py
+release/v2r1c0-rc1/personal-weixin-b6-evidence.json
+```
+
+Before B6 code, evidence records exact installed upstream source commit, every patch target path/digest, plugin loader version/digest, Gateway auth owner, credential files, and candidate-only state/config. Stop on inference or drift. Tests are RED before implementation and prove: required nonempty opaque `sessionKey`; no account fallback; exact canonical statuses and readiness shapes; unknown status fail-closed; 4-8 digit one-shot `verifyCode` with no persistence/log/response; exact event body with no authentication/tenant/user/session assertions; transport signature/skew/nonce/replay checks; exact 501 zero mutation; byte-idempotent patches; build/runtime inspect in isolated candidate state. The B6 evidence JSON is produced only after these gates pass.
+
+## B7: tenant-scoped Portal adapter and durable challenge
+
+B7 changes exactly these 13 paths:
+
+```text
+active-runtime/app/aios_v2r1/personal_weixin/official_login.py
+active-runtime/app/aios_v2r1/personal_weixin/adapter.py
+portal/personal_weixin/views.py
+portal/personal_weixin/urls.py
+portal/personal_weixin/services.py
+portal/personal_weixin/templates/personal_weixin/bind.html
+tests/personal_weixin/test_adapter.py
+tests/personal_weixin/test_portal_views.py
+tests/integration/test_personal_weixin_golden_flow.py
+release/v2r1c0-rc1/personal-weixin-source-baseline.json
+release/v2r1c0-rc1/personal-weixin-source-baseline.sha256
+release/v2r1c0-rc1/personal-weixin-canary-contract.json
+release/v2r1c0-rc1/personal-weixin-rollback-contract.json
+```
+
+Tests are RED before B7 implementation and prove: Django authentication/CSRF; server-session tenant resolution; browser `accountId` treated only as a preallocated-slot reference and current entitlement rechecked on every list/readiness/start/wait/status; exact `sessionKey` forwarding without fallback; live canonical readiness; authenticated Gateway transport context separate from the six-field event body; durable challenge record owning tenant/user/account/session digest; hash-only secret storage; transactional/CAS single consumption; exact replay idempotence; altered replay/concurrency/expiry/cross-tenant denial with zero mutation; no provider token/raw iLink/verify code/challenge code persistence or leakage; size/rate/no-store controls; restart; and unbind 501 before all mutations/calls/jobs.
+
+## Canonical contract gates
+
+`sessionKey` is nonempty and exact. Canonical results are:
+
+```text
+qr_pending         connected=false alreadyConnected=false terminal=false needsVerifyCode=false
+need_verifycode    connected=false alreadyConnected=false terminal=false needsVerifyCode=true
+invalid_verifycode connected=false alreadyConnected=false terminal=false needsVerifyCode=true
+expired            connected=false alreadyConnected=false terminal=true  needsVerifyCode=false
+failed             connected=false alreadyConnected=false terminal=true  needsVerifyCode=false
+already_connected  connected=false alreadyConnected=true  terminal=true  needsVerifyCode=false
+confirmed           connected=true  alreadyConnected=false terminal=true  needsVerifyCode=false
+```
+
+`binded_redirect` maps to `already_connected`. An unknown upstream status maps to canonical `failed/errorCode=unknown_upstream_status`. Readiness always uses the same complete shape: missing fields, stale evidence, plugin digest mismatch, absent entitlement, not-running account, and Gateway error all produce `ready=false`; only a live authenticated all-green snapshot produces `ready=true/code=ready`.
+
+The inbound event body is exactly `eventId/accountId/senderId/chatId/challengeCode/observedAt`; transport authentication and server-resolved tenant/user/session context are not body fields. Fixture secrets are test inputs only. Raw `verifyCode` and `challengeCode` never enter persistence, logs, responses, URLs, analytics, traces, metrics labels, or job arguments. Raw `sessionKey` appears only where the golden login request/result contract requires it; it is never persisted or logged and is forwarded byte-exact without fallback.
+
+## Merge, canary, promotion, and rollback gates
+
+For each D1/B3-B7 row: require the exact parent row SHA, one non-merge commit, exact sorted path allowlist, clean `diff --check`, focused and carried tests, reviewer acceptance, then append `label/SHA/parent/tree` to the worktree-local ledger. No row may start from an unaccepted predecessor.
+
+After B7, rebuild once from the accepted B7 tree. Stage one isolated candidate using B5 controls and no active configuration. Canary exactly one explicitly entitled `(tenant-canary, account-canary)` pair. Before traffic, require live Gateway/plugin/account readiness with expected digests and freshness. Exercise all golden outcomes, invalid and unknown fail-closed paths, restart, concurrent waits, atomic challenge consumption, exact replay, altered replay, expiry, unauthenticated event, tenant/account mismatch, cross-tenant IDOR, secret redaction, and exact end-to-end unbind 501 with zero durable/runtime/upstream/job mutation. Any missing evidence, extra account, digest drift, stale snapshot, noncanonical status, secret observation, or mutation fails the canary and blocks promotion.
+
+Promotion accepts only the exact artifact/config/plugin/source digests verified by canary; it never rebuilds, repatches, switches branches, edits `VERSION`/`baseline/current.json`, creates a tag, invokes Fleet, or changes unrelated services. Candidate and production artifacts must be byte-identical. B5 live preflight is recaptured and reconciled immediately before `verify-stage` and `promote`.
+
+Rollback is armed before canary with the immediately preceding production artifact/config/plugin digests, units, credentials metadata, and health contract. On any gate failure, STOP blocks forward actions; invoke only B5's recorded rollback-only path. Restore byte-identical prior artifacts/config, never the candidate rebuild; do not delete STOP automatically; do not roll back the database absent a separately approved incompatibility plan. Verify previous digests, listeners, units, secret paths/modes, canonical readiness, and tenant/account isolation. If verification fails, record `ROLLBACK_FAILED`, keep STOP, and escalate without forward mutation.

docs/superpowers/specs/2026-07-14-v2r1-runtime-bridge-design.md

@@ -19,6 +19,7 @@ Alternative C remains the selected architecture because active full-execution au
 - B3 stops unless the installed Weixin payload shape, patch target hashes, authority-map ownership, and transport signing boundary are evidenced.
 - B4 stops unless Hermes request/response schema, router ownership, downstream timeout, idempotency behavior, and exact outbound message binding are evidenced.
 - B5 stops unless B3 and B4 are accepted and the reconciled sentinel plus the V1R4C6 live-runtime snapshot are current for the candidate digest.
+- The R9 D0 documentation correction becomes ledger `START` without consuming a blocker. It expands B2 executable coverage only; all authenticated transport, evidence, terminal, isolation, and release gates remain unchanged.
 
 The present outbound evidence is insufficient, so B4 and B5 are currently stopped. This document defines the fail-closed path; it does not claim the missing evidence exists.
 
@@ -130,6 +131,12 @@ The release package has one V2R1 import identity: `aios_v2r1`. There is no `acti
 
 `active-runtime/pyproject.toml` packages `aios_v2r1` from `active-runtime/app`. Repository tests use `PYTHONPATH='active-runtime:active-runtime/app'`: legacy modules import as `app.*`, while V2R1 imports as `aios_v2r1.*`. The implementation plan enumerates all 23 known `active_runtime.app` test imports and replaces them explicitly. Full collection, full pytest, and wheel inspection must prove the wheel contains one V2R1 namespace and that source and installed imports resolve to `aios_v2r1` only.
 
+Packaging acceptance is also the executable completeness gate for seven preserved runtime components. Message Ledger must prove exact-ID/no-fallback semantics, idempotency/conflict, tenant/cell/direction isolation, expiry/purge/restart/concurrency, and sanitized SQLite errors. Memory must prove every namespace, cross-scope denial, shared-artifact read-only behavior, qualified-key traversal rejection, and disabled search. Secret must prove reference, broker path, scope, kind, version, identifier, no-value-leakage, and fail-closed broker behavior. Audit must prove genesis and tamper/delete/reorder detection, Unicode canonicalization, concurrency, restart, validation, tenant isolation, and sanitized SQLite errors. Hermes Profile must prove exact environment, absolute `0700` roots, traversal/symlink denial, scope, idempotence, and no environment inheritance. Cell Manager/CLI must prove one cell per tenant, an explicit state graph, atomic concurrent persistence, corrupt-registry fail-closed behavior, stable JSON/exit codes, and restart. Fabric must prove that claims return `running` consistently with durable state, isolation, one concurrent claimant, non-claimable states, restart, and sanitized SQLite errors.
+
+The original 29 B2 paths are extended by exactly fourteen reviewed paths: seven production modules (`message_ledger.py`, `memory_scope.py`, `secret_scope.py`, `audit.py`, `hermes_profile.py`, `cell_manager.py`, and `hermes_fabric.py`) and seven matrix tests (`test_message_ledger_append.py`, `test_memory_scope.py`, `test_secret_scope.py`, `test_audit.py`, `test_hermes_profile.py`, `test_cell_manager.py`, and `test_hermes_fabric.py`). `cli.py` remains one of the original package paths. A production module changes only after its focused test has been observed failing for the intended contract; already-correct behavior is a characterization and must not be weakened merely to manufacture a RED.
+
+The B2 review requires exactly 43 changed paths, at least 160 passing carried V2R1/integration/package tests with every matrix bullet represented, zero full-collection errors, a passing complete pytest suite, the 15 Node tests, the real isolated loader in default and opt-in modes, compileall, wheel identity, and a clean tree. These coverage additions do not authorize B3 bridge, B4 Hermes HTTP/outbound, B5 deployment, active service, main, tag, `VERSION`, or baseline mutation.
+
 ## Exact projection, quote, and attachment authority
 
 `WeixinProjection` runs in Python after transport authentication. It preserves numeric Weixin IDs from the JSON token as decimal strings and rejects a value that has already passed through unsafe JavaScript-number conversion.
@@ -284,4 +291,4 @@ Preparation or release stops when any of these is true:
 
 ## Acceptance
 
-The design is review-complete when the plan contains exactly five blocker commits, dynamically anchors their parent chain at B1 start, enumerates all legacy import edits, and has executable RED/GREEN/review gates. Runtime release acceptance additionally requires all B3/B4/B5 evidence gates, the full Python collection and suite, the real Node/OpenClaw loader harness, exact receipt semantics, isolated candidate staging, deterministic artifacts, current live evidence, and rehearsed constrained rollback.
+The design is review-complete when the plan contains exactly five blocker commits, dynamically anchors their parent chain at B1 start, enumerates all legacy import edits, and has executable RED/GREEN/review gates. R9 preparation additionally requires D0 as `START`, B1 as its child, B2 as one 43-path child commit, the full seven-component executable matrix, and a partial ledger containing exactly `START,B1,B2`. Runtime release acceptance additionally requires all B3/B4/B5 evidence gates, the full Python collection and suite, the real Node/OpenClaw loader harness, exact receipt semantics, isolated candidate staging, deterministic artifacts, current live evidence, and rehearsed constrained rollback.

patches/patch_v2r1-personal-weixin-b6b7-impl-20260715T115309UTC8.branch.json

@@ -0,0 +1,16 @@
+{
+  "task_id": "TASK-CODEX-V2R1-PERSONAL-WEIXIN-B6B7-BOOTSTRAP-AND-CANARY-20260715T120000UTC8",
+  "phase": "A",
+  "type": "branch",
+  "branch": "patch/v2r1-personal-weixin-b6b7-impl-20260715T115309UTC8",
+  "base_ref": "design/v2r1-personal-weixin-golden-contract-20260715",
+  "base_commit": "d74229927b2dadca7719455984aea10d010c5123",
+  "created_by": "aiman",
+  "created_at": "2026-07-15T03:53:09Z",
+  "direct_main_push": false,
+  "owner_approval_required": false,
+  "owner_approved": true,
+  "owner_approval_scope": "Phase A bootstrap for owner-approved B6/B7 personal-Weixin implementation; no production, runtime, database, secret, tag, baseline, or controller/ChatGPT worktree changes.",
+  "production_change": false,
+  "user_action_required": false
+}

tests/v2r1/test_audit.py

@@ -0,0 +1,101 @@
+"""Executable completeness contract for the append-only audit chain."""
+from __future__ import annotations
+from concurrent.futures import ThreadPoolExecutor
+from pathlib import Path
+import os
+import sqlite3
+import pytest
+from aios_v2r1.audit import AuditLog
+from aios_v2r1.tenant_context import ConflictError, ValidationError
+
+def append(log: AuditLog, index: int = 0, *, tenant_id: str = "tenant-a") -> str:
+    return log.append(tenant_id=tenant_id, trace_id=f"trace-{index}",
+                      event_type="tool_call",
+                      payload={"index": index, "text": "虾马 café"})
+
+def test_first_event_is_anchored_to_genesis(tmp_path: Path) -> None:
+    database = tmp_path / "audit.sqlite3"
+    log = AuditLog(database)
+    append(log)
+    with sqlite3.connect(database) as db:
+        assert db.execute("SELECT previous_hash FROM audit_events").fetchone()[0] == "GENESIS"
+    assert log.verify()
+
+def test_unicode_payload_is_canonical_across_restart(tmp_path: Path) -> None:
+    database = tmp_path / "audit.sqlite3"
+    digest = append(AuditLog(database))
+    reopened = AuditLog(database)
+    assert reopened.verify()
+    with sqlite3.connect(database) as db:
+        stored = db.execute("SELECT event_hash,payload FROM audit_events").fetchone()
+    assert stored[0] == digest
+    assert "虾马" in stored[1]
+
+def test_payload_tamper_is_detected(tmp_path: Path) -> None:
+    database = tmp_path / "audit.sqlite3"
+    log = AuditLog(database)
+    append(log)
+    with sqlite3.connect(database) as db:
+        db.execute("UPDATE audit_events SET payload='{}'")
+    assert not log.verify()
+
+def test_middle_event_deletion_is_detected(tmp_path: Path) -> None:
+    database = tmp_path / "audit.sqlite3"
+    log = AuditLog(database)
+    for index in range(3):
+        append(log, index)
+    with sqlite3.connect(database) as db:
+        db.execute("DELETE FROM audit_events WHERE seq=2")
+    assert not log.verify()
+
+def test_event_reordering_is_detected(tmp_path: Path) -> None:
+    database = tmp_path / "audit.sqlite3"
+    log = AuditLog(database)
+    append(log, 1)
+    append(log, 2)
+    with sqlite3.connect(database) as db:
+        db.execute("UPDATE audit_events SET seq=100 WHERE seq=1")
+    assert not log.verify()
+
+def test_concurrent_appends_form_one_valid_chain(tmp_path: Path) -> None:
+    database = tmp_path / "audit.sqlite3"
+    log = AuditLog(database)
+    with ThreadPoolExecutor(max_workers=16) as executor:
+        digests = list(executor.map(lambda index: append(log, index), range(24)))
+    assert len(set(digests)) == 24
+    assert log.verify()
+    with sqlite3.connect(database) as db:
+        assert db.execute("SELECT count(*) FROM audit_events").fetchone()[0] == 24
+
+@pytest.mark.parametrize("kwargs", [
+    {"tenant_id": "Tenant-A"}, {"trace_id": "../trace"},
+    {"event_type": "tool/call"}])
+def test_audit_identifiers_are_validated(tmp_path: Path, kwargs: dict[str, str]) -> None:
+    values = {"tenant_id": "tenant-a", "trace_id": "trace-a",
+              "event_type": "tool_call", "payload": {"ok": True}}
+    values.update(kwargs)
+    with pytest.raises(ValidationError):
+        AuditLog(tmp_path / "audit.sqlite3").append(**values)
+
+def test_tenants_share_no_hash_identity_for_equal_payloads(tmp_path: Path) -> None:
+    log = AuditLog(tmp_path / "audit.sqlite3")
+    first = append(log, tenant_id="tenant-a")
+    second = append(log, tenant_id="tenant-b")
+    assert first != second
+    assert log.verify()
+
+def test_database_is_owner_only(tmp_path: Path) -> None:
+    database = tmp_path / "audit.sqlite3"
+    AuditLog(database)
+    assert os.stat(database).st_mode & 0o777 == 0o600
+
+def test_sqlite_failures_are_sanitized(tmp_path: Path) -> None:
+    database = tmp_path / "audit.sqlite3"
+    log = AuditLog(database)
+    database.write_bytes(b"not-a-sqlite-database")
+    with pytest.raises(ConflictError, match="audit storage unavailable") as raised:
+        log.verify()
+    assert not isinstance(raised.value, sqlite3.Error)
+    assert "sqlite" not in str(raised.value).lower()
+    assert raised.value.__cause__ is None
+    assert raised.value.__context__ is None

tests/v2r1/test_cell_manager.py

@@ -0,0 +1,114 @@
+"""Executable completeness contract for CellManager and its CLI."""
+from __future__ import annotations
+from concurrent.futures import ThreadPoolExecutor
+import json
+import os
+from pathlib import Path
+from unittest.mock import patch
+import pytest
+from aios_v2r1.cell_manager import CellManager
+from aios_v2r1.cli import main
+from aios_v2r1.tenant_context import ValidationError
+
+def test_one_cell_per_tenant(tmp_path: Path) -> None:
+    manager = CellManager(tmp_path / "cells.json")
+    manager.create("tenant-a", "cell-a", "v1", "digest-a")
+    with pytest.raises(ValidationError, match="already"):
+        manager.create("tenant-a", "cell-b", "v1", "digest-b")
+
+def test_explicit_state_graph_accepts_the_recovery_cycle(tmp_path: Path) -> None:
+    manager = CellManager(tmp_path / "cells.json")
+    manager.create("tenant-a", "cell-a", "v1", "digest-a")
+    for state in ("starting", "healthy", "upgrading", "rollback", "healthy"):
+        assert manager.transition("tenant-a", state).state == state
+
+def test_explicit_state_graph_rejects_jump_from_created_to_healthy(tmp_path: Path) -> None:
+    manager = CellManager(tmp_path / "cells.json")
+    manager.create("tenant-a", "cell-a", "v1", "digest-a")
+    with pytest.raises(ValidationError, match="transition"):
+        manager.transition("tenant-a", "healthy")
+
+def test_persistence_uses_atomic_replace(tmp_path: Path) -> None:
+    manager = CellManager(tmp_path / "cells.json")
+    with patch("aios_v2r1.cell_manager.os.replace", wraps=os.replace) as replaced:
+        manager.create("tenant-a", "cell-a", "v1", "digest-a")
+    assert replaced.called
+
+def test_concurrent_distinct_tenant_creates_are_not_lost(tmp_path: Path) -> None:
+    registry = tmp_path / "cells.json"
+    manager = CellManager(registry)
+    def create(index: int) -> None:
+        manager.create(f"tenant-{index}", f"cell-{index}", "v1", f"digest-{index}")
+    with ThreadPoolExecutor(max_workers=16) as executor:
+        list(executor.map(create, range(24)))
+    data = json.loads(registry.read_text(encoding="utf-8"))
+    assert len(data["cells"]) == 24
+
+def test_concurrent_same_tenant_has_exactly_one_winner(tmp_path: Path) -> None:
+    manager = CellManager(tmp_path / "cells.json")
+    def create(index: int) -> str:
+        try:
+            manager.create("tenant-a", f"cell-{index}", "v1", f"digest-{index}")
+            return "created"
+        except ValidationError:
+            return "rejected"
+    with ThreadPoolExecutor(max_workers=16) as executor:
+        results = list(executor.map(create, range(16)))
+    assert results.count("created") == 1
+    assert results.count("rejected") == 15
+
+def test_corrupt_registry_fails_closed_with_domain_error(tmp_path: Path) -> None:
+    registry = tmp_path / "cells.json"
+    manager = CellManager(registry)
+    registry.write_text('{"cells":{"tenant-a":', encoding="utf-8")
+    with pytest.raises(ValidationError, match="registry unavailable") as raised:
+        manager.status("tenant-a")
+    assert "JSON" not in type(raised.value).__name__
+    assert raised.value.__cause__ is None
+    assert raised.value.__context__ is None
+
+def test_restart_preserves_cell_status(tmp_path: Path) -> None:
+    registry = tmp_path / "cells.json"
+    CellManager(registry).create("tenant-a", "cell-a", "v1", "digest-a")
+    assert CellManager(registry).status("tenant-a").cell_id == "cell-a"
+
+def test_cli_create_returns_stable_json(
+    tmp_path: Path, capsys: pytest.CaptureFixture[str]
+) -> None:
+    registry = tmp_path / "cells.json"
+    assert main([str(registry), "create", "tenant-a", "cell-a", "v1", "digest-a"]) == 0
+    output = json.loads(capsys.readouterr().out)
+    assert output["tenant_id"] == "tenant-a"
+    assert output["state"] == "created"
+
+def test_cli_domain_failure_returns_code_3_and_json(
+    tmp_path: Path, capsys: pytest.CaptureFixture[str]
+) -> None:
+    registry = tmp_path / "cells.json"
+    assert main([str(registry), "status", "missing-tenant"]) == 3
+    captured = capsys.readouterr()
+    assert captured.out == ""
+    assert json.loads(captured.err) == {
+        "code": "VALIDATION_ERROR", "error": "unknown tenant"}
+
+def test_cli_corrupt_registry_is_sanitized(
+    tmp_path: Path, capsys: pytest.CaptureFixture[str]
+) -> None:
+    registry = tmp_path / "cells.json"
+    CellManager(registry)
+    registry.write_text("TOP-SECRET invalid json", encoding="utf-8")
+    assert main([str(registry), "status", "tenant-a"]) == 3
+    error = json.loads(capsys.readouterr().err)
+    assert error["code"] == "VALIDATION_ERROR"
+    assert "TOP-SECRET" not in error["error"]
+
+@pytest.mark.parametrize("args", [
+    ("Tenant-A", "cell-a", "v1", "digest-a"),
+    ("tenant-a", "../cell", "v1", "digest-a"),
+    ("tenant-a", "cell-a", "../v1", "digest-a"),
+    ("tenant-a", "cell-a", "v1", "../digest")])
+def test_create_validates_all_identifiers(
+    tmp_path: Path, args: tuple[str, str, str, str]
+) -> None:
+    with pytest.raises(ValidationError):
+        CellManager(tmp_path / "cells.json").create(*args)

tests/v2r1/test_hermes_fabric.py

@@ -1,88 +1,114 @@
-"""Gate 1 contract tests for the Hermes shared agent fabric."""
+"""Executable completeness contract for the tenant-partitioned Hermes fabric."""
 from __future__ import annotations
-
+from concurrent.futures import ThreadPoolExecutor
+from dataclasses import replace
+from pathlib import Path
 import sqlite3
-from tempfile import TemporaryDirectory
+import pytest
-import unittest
-
 from aios_v2r1.hermes_fabric import HermesFabric
 from aios_v2r1.tenant_context import CanonicalMessage, ConflictError, ScopeError
 
-
+def authenticated_command(event_id: str, **changes: object) -> CanonicalMessage:
-def authenticated_command(
+    value = CanonicalMessage(
-    event_id: str,
+        tenant_id="tenant-a", cell_id="cell-a", principal_id="user-a",
-    *,
+        principal_type="authenticated_user", origin_type="channel_user",
-    command_capable: bool = True,
+        channel="weixin", channel_account_id="account-a", peer_id="peer-a",
-    origin_type: str = "channel_user",
+        conversation_id="conversation-a", session_id="session-a", task_id=None,
-) -> CanonicalMessage:
+        event_id=event_id, message_id=f"message-{event_id}",
-    return CanonicalMessage(
+        reply_to_message_id=None, direction="inbound", command_capable=True,
-        tenant_id="tenant-a",
-        cell_id="cell-a",
-        principal_id="user-a",
-        principal_type="authenticated_user",
-        origin_type=origin_type,
-        channel="weixin",
-        channel_account_id="account-a",
-        peer_id="peer-a",
-        conversation_id="conversation-a",
-        session_id="session-a",
-        task_id=None,
-        event_id=event_id,
-        message_id="1234567890123456789",
-        reply_to_message_id=None,
-        direction="inbound",
-        command_capable=command_capable,
         occurred_at="2026-07-13T00:00:00+00:00",
-        received_at="2026-07-13T00:00:01+00:00",
+        received_at="2026-07-13T00:00:01+00:00", body="/run",
-        body="/run",
+        quoted_body=None, adapter_name="weixin", adapter_version="v2")
-        quoted_body=None,
+    return replace(value, **changes)
-        adapter_name="weixin",
-        adapter_version="v2",
-    )
 
+@pytest.fixture
+def fabric(tmp_path: Path) -> HermesFabric:
+    return HermesFabric(tmp_path / "fabric.sqlite3")
 
-class HermesFabricContractTests(unittest.TestCase):
+def test_duplicate_event_returns_sanitized_conflict(fabric: HermesFabric) -> None:
-    def test_duplicate_event_returns_sanitized_conflict(self) -> None:
+    command = authenticated_command("event-a")
-        with TemporaryDirectory() as directory:
+    assert fabric.enqueue(message=command, profile_id="profile-a").event_id == "event-a"
-            fabric = HermesFabric(f"{directory}/fabric.sqlite3")
+    with pytest.raises(ConflictError) as raised:
-            message = authenticated_command("event-a")
+        fabric.enqueue(message=command, profile_id="profile-a")
+    assert not isinstance(raised.value, sqlite3.IntegrityError)
+    assert "sqlite" not in str(raised.value).lower()
+    assert raised.value.__cause__ is None
+    assert raised.value.__context__ is None
 
-            first = fabric.enqueue(message=message, profile_id="profile-a")
+@pytest.mark.parametrize("changes", [
-            self.assertEqual(first.event_id, "event-a")
+    {"command_capable": False}, {"origin_type": "heartbeat"},
+    {"principal_type": "service"}, {"direction": "internal"}])
+def test_non_claimable_provenance_cannot_enqueue(
+    fabric: HermesFabric, changes: dict[str, object]
+) -> None:
+    with pytest.raises(ScopeError):
+        fabric.enqueue(message=authenticated_command("event-denied", **changes),
+                       profile_id="profile-a")
 
-            with self.assertRaises(ConflictError) as raised:
+def test_claim_returns_running_and_matches_durable_state(fabric: HermesFabric) -> None:
-                fabric.enqueue(message=message, profile_id="profile-a")
+    fabric.enqueue(message=authenticated_command("event-a"), profile_id="profile-a")
+    claimed = fabric.claim("tenant-a", "cell-a", "profile-a")
+    assert claimed is not None
+    assert claimed.status == "running"
+    with sqlite3.connect(fabric.database) as db:
+        assert db.execute("SELECT status FROM fabric_jobs WHERE job_id=?",
+                          (claimed.job_id,)).fetchone()[0] == "running"
 
-        error = raised.exception
+@pytest.mark.parametrize(("tenant_id", "cell_id", "profile_id"), [
-        self.assertNotIsInstance(error, sqlite3.IntegrityError)
+    ("tenant-b", "cell-a", "profile-a"), ("tenant-a", "cell-b", "profile-a"),
-        self.assertNotIn("sqlite", str(error).lower())
+    ("tenant-a", "cell-a", "profile-b")])
-        self.assertIsNone(error.__cause__)
+def test_claim_scope_is_exact(
-        self.assertIsNone(error.__context__)
+    fabric: HermesFabric, tenant_id: str, cell_id: str, profile_id: str
+) -> None:
+    fabric.enqueue(message=authenticated_command("event-a"), profile_id="profile-a")
+    assert fabric.claim(tenant_id, cell_id, profile_id) is None
+    assert fabric.claim("tenant-a", "cell-a", "profile-a") is not None
 
-    def test_non_command_event_cannot_enqueue(self) -> None:
+def test_only_one_concurrent_claimant_wins(fabric: HermesFabric) -> None:
-        with TemporaryDirectory() as directory:
+    fabric.enqueue(message=authenticated_command("event-a"), profile_id="profile-a")
-            fabric = HermesFabric(f"{directory}/fabric.sqlite3")
+    with ThreadPoolExecutor(max_workers=16) as executor:
+        claimed = list(executor.map(
+            lambda _: fabric.claim("tenant-a", "cell-a", "profile-a"), range(16)))
+    winners = [job for job in claimed if job is not None]
+    assert len(winners) == 1
+    assert winners[0].status == "running"
 
-            with self.assertRaises(ScopeError):
+@pytest.mark.parametrize("status", ["running", "completed", "failed", "cancelled"])
-                fabric.enqueue(
+def test_nonqueued_states_are_not_claimable(
-                    message=authenticated_command(
+    fabric: HermesFabric, status: str
-                        "event-non-command", command_capable=False
+) -> None:
-                    ),
+    job = fabric.enqueue(message=authenticated_command("event-a"), profile_id="profile-a")
-                    profile_id="profile-a",
+    with sqlite3.connect(fabric.database) as db:
-                )
+        db.execute("UPDATE fabric_jobs SET status=? WHERE job_id=?", (status, job.job_id))
+    assert fabric.claim("tenant-a", "cell-a", "profile-a") is None
 
-    def test_heartbeat_provenance_cannot_enqueue(self) -> None:
+def test_restart_preserves_queue_and_claims_once(tmp_path: Path) -> None:
-        with TemporaryDirectory() as directory:
+    database = tmp_path / "fabric.sqlite3"
-            fabric = HermesFabric(f"{directory}/fabric.sqlite3")
+    HermesFabric(database).enqueue(message=authenticated_command("event-a"),
+                                   profile_id="profile-a")
+    reopened = HermesFabric(database)
+    claimed = reopened.claim("tenant-a", "cell-a", "profile-a")
+    assert claimed is not None and claimed.status == "running"
+    assert reopened.claim("tenant-a", "cell-a", "profile-a") is None
 
-            with self.assertRaises(ScopeError):
+def test_concurrent_duplicate_enqueue_has_one_winner(fabric: HermesFabric) -> None:
-                fabric.enqueue(
+    command = authenticated_command("event-a")
-                    message=authenticated_command(
+    def enqueue(_: int) -> str:
-                        "event-heartbeat", origin_type="heartbeat"
+        try:
-                    ),
+            fabric.enqueue(message=command, profile_id="profile-a")
-                    profile_id="profile-a",
+            return "queued"
-                )
+        except ConflictError:
+            return "conflict"
+    with ThreadPoolExecutor(max_workers=16) as executor:
+        results = list(executor.map(enqueue, range(16)))
+    assert results.count("queued") == 1
+    assert results.count("conflict") == 15
 
-
+def test_sqlite_failures_are_sanitized(fabric: HermesFabric) -> None:
-if __name__ == "__main__":
+    Path(fabric.database).write_bytes(b"not-a-sqlite-database")
-    unittest.main()
+    with pytest.raises(ConflictError, match="fabric storage unavailable") as raised:
+        fabric.health()
+    assert not isinstance(raised.value, sqlite3.Error)
+    assert "sqlite" not in str(raised.value).lower()
+    assert raised.value.__cause__ is None
+    assert raised.value.__context__ is None

tests/v2r1/test_hermes_profile.py

@@ -0,0 +1,88 @@
+"""Executable completeness contract for Hermes profile isolation."""
+from __future__ import annotations
+from pathlib import Path
+import os
+import pytest
+from aios_v2r1.hermes_profile import HermesProfile
+from aios_v2r1.tenant_context import ValidationError
+
+def profile(tmp_path: Path, **changes: object) -> HermesProfile:
+    values: dict[str, object] = {
+        "tenant_id": "tenant-a", "cell_id": "cell-a", "profile_id": "profile-a",
+        "hermes_home": tmp_path / "home", "workspace": tmp_path / "workspace"}
+    values.update(changes)
+    return HermesProfile(**values)  # type: ignore[arg-type]
+
+def test_environment_is_exact_and_has_no_inherited_values(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setenv("HOST_SECRET", "must-not-inherit")
+    value = profile(tmp_path).environment
+    assert value == {
+        "HERMES_HOME": str(tmp_path / "home"), "HOME": str(tmp_path / "home"),
+        "AIOS_TENANT_ID": "tenant-a", "AIOS_CELL_ID": "cell-a",
+        "AIOS_PROFILE_ID": "profile-a"}
+    assert "HOST_SECRET" not in value
+
+@pytest.mark.parametrize("changes", [
+    {"hermes_home": Path("relative-home")},
+    {"workspace": Path("relative-workspace")}])
+def test_profile_roots_must_be_absolute(
+    tmp_path: Path, changes: dict[str, Path]
+) -> None:
+    with pytest.raises(ValidationError, match="absolute"):
+        profile(tmp_path, **changes)
+
+def test_prepare_sets_both_roots_to_0700(tmp_path: Path) -> None:
+    value = profile(tmp_path)
+    value.prepare()
+    assert os.stat(value.hermes_home).st_mode & 0o777 == 0o700
+    assert os.stat(value.workspace).st_mode & 0o777 == 0o700
+
+def test_prepare_is_idempotent(tmp_path: Path) -> None:
+    value = profile(tmp_path)
+    value.prepare()
+    marker = value.workspace / "marker"
+    marker.write_text("kept", encoding="utf-8")
+    value.prepare()
+    assert marker.read_text(encoding="utf-8") == "kept"
+
+def test_parent_traversal_is_denied(tmp_path: Path) -> None:
+    value = profile(tmp_path)
+    value.prepare()
+    with pytest.raises(ValidationError, match="escapes"):
+        value.assert_path_allowed(value.workspace / ".." / "outside")
+
+def test_symlink_inside_profile_cannot_escape(tmp_path: Path) -> None:
+    value = profile(tmp_path)
+    value.prepare()
+    outside = tmp_path / "outside"
+    outside.mkdir()
+    (value.workspace / "link").symlink_to(outside, target_is_directory=True)
+    with pytest.raises(ValidationError, match="escapes"):
+        value.assert_path_allowed(value.workspace / "link" / "secret")
+
+@pytest.mark.parametrize("root_name", ["home", "workspace"])
+def test_prepare_rejects_symlink_roots(tmp_path: Path, root_name: str) -> None:
+    outside = tmp_path / f"outside-{root_name}"
+    outside.mkdir()
+    symlink = tmp_path / root_name
+    symlink.symlink_to(outside, target_is_directory=True)
+    changes = {"hermes_home" if root_name == "home" else "workspace": symlink}
+    with pytest.raises(ValidationError, match="symlink"):
+        profile(tmp_path, **changes).prepare()
+
+def test_other_profile_scope_is_denied(tmp_path: Path) -> None:
+    first = profile(tmp_path / "first")
+    second = profile(tmp_path / "second", tenant_id="tenant-b",
+                     cell_id="cell-b", profile_id="profile-b")
+    first.prepare()
+    second.prepare()
+    with pytest.raises(ValidationError, match="escapes"):
+        first.assert_path_allowed(second.workspace / "data")
+
+def test_paths_within_either_root_are_allowed(tmp_path: Path) -> None:
+    value = profile(tmp_path)
+    value.prepare()
+    value.assert_path_allowed(value.hermes_home / "config.json")
+    value.assert_path_allowed(value.workspace / "task.txt")

tests/v2r1/test_memory_scope.py

@@ -0,0 +1,53 @@
+"""Executable completeness contract for memory namespaces and access."""
+from __future__ import annotations
+import pytest
+from aios_v2r1.memory_scope import MemoryScope, qualify_memory_key
+from aios_v2r1.tenant_context import ScopeError, ValidationError
+
+def scope(kind: str = "session", **changes: object) -> MemoryScope:
+    values: dict[str, object] = {
+        "tenant_id": "tenant-a", "cell_id": "cell-a", "profile_id": "profile-a",
+        "session_id": "session-a", "kind": kind}
+    values.update(changes)
+    return MemoryScope(**values)  # type: ignore[arg-type]
+
+@pytest.mark.parametrize(("kind", "session_id", "expected"), [
+    ("session", "session-a", "tenant/tenant-a/cell/cell-a/profile/profile-a/session/session-a/memory/session"),
+    ("profile", None, "tenant/tenant-a/cell/cell-a/profile/profile-a/memory/profile"),
+    ("cell", None, "tenant/tenant-a/cell/cell-a/memory/cell"),
+    ("tenant", None, "tenant/tenant-a/cell/cell-a/memory/tenant"),
+    ("shared_artifact", None, "tenant/tenant-a/cell/cell-a/memory/shared_artifact")])
+def test_every_namespace_is_explicit(kind: str, session_id: str | None, expected: str) -> None:
+    assert scope(kind, session_id=session_id).namespace == expected
+
+@pytest.mark.parametrize("requested", [
+    scope(tenant_id="tenant-b"), scope(cell_id="cell-b"),
+    scope(profile_id="profile-b"), scope(session_id="session-b")])
+def test_cross_scope_access_is_denied(requested: MemoryScope) -> None:
+    with pytest.raises(ScopeError):
+        scope().assert_access(requested)
+
+def test_cross_kind_access_is_denied() -> None:
+    with pytest.raises(ScopeError, match="cross-kind"):
+        scope("session").assert_access(scope("profile", session_id=None))
+
+def test_shared_artifacts_are_read_only() -> None:
+    owner = scope()
+    shared = scope("shared_artifact", session_id=None)
+    owner.assert_access(shared)
+    with pytest.raises(ScopeError, match="immutable"):
+        owner.assert_access(shared, write=True)
+
+def test_qualified_key_contains_the_full_namespace() -> None:
+    assert qualify_memory_key(scope(), "facts.v1") == (
+        "tenant/tenant-a/cell/cell-a/profile/profile-a/session/session-a/"
+        "memory/session/facts.v1")
+
+@pytest.mark.parametrize("key", ["../escape", "a/b", ".", "..", " space ", "x?query"])
+def test_memory_key_traversal_and_malformed_keys_are_rejected(key: str) -> None:
+    with pytest.raises(ValidationError):
+        qualify_memory_key(scope(), key)
+
+def test_memory_search_surface_is_disabled() -> None:
+    assert not hasattr(scope(), "search")
+    assert not hasattr(scope(), "search_all")

tests/v2r1/test_message_ledger_append.py

@@ -1,73 +1,120 @@
-"""Contract tests for the runtime-facing direct MessageLedger append path."""
+"""Executable completeness contract for the exact-ID message ledger."""
 from __future__ import annotations
-
 from concurrent.futures import ThreadPoolExecutor
-from tempfile import TemporaryDirectory
+from dataclasses import replace
-import unittest
+from pathlib import Path
-
+import sqlite3
+import pytest
 from aios_v2r1.message_ledger import MessageLedger
-from aios_v2r1.tenant_context import CanonicalMessage, ConflictError
+from aios_v2r1.tenant_context import CanonicalMessage, ConflictError, ScopeError
 
-
+def message(**changes: object) -> CanonicalMessage:
-def message(*, tenant_id: str = "tenant-a", cell_id: str = "cell-a",
+    value = CanonicalMessage(
-            event_id: str = "event-a", message_id: str = "message-a",
+        tenant_id="tenant-a", cell_id="cell-a", principal_id="user-a",
-            body: str = "hello", reply_to_message_id: str | None = None) -> CanonicalMessage:
-    return CanonicalMessage(
-        tenant_id=tenant_id, cell_id=cell_id, principal_id="user-a",
         principal_type="authenticated_user", origin_type="channel_user",
         channel="weixin", channel_account_id="account-a", peer_id="peer-a",
         conversation_id="conversation-a", session_id="session-a", task_id=None,
-        event_id=event_id, message_id=message_id, reply_to_message_id=reply_to_message_id,
+        event_id="event-a", message_id="message-a", reply_to_message_id=None,
         direction="inbound", command_capable=True,
         occurred_at="2026-07-13T00:00:00+00:00",
-        received_at="2026-07-13T00:00:01+00:00", body=body,
+        received_at="2026-07-13T00:00:01+00:00", body="hello",
-        quoted_body=None, adapter_name="weixin", adapter_version="v2",
+        quoted_body=None, adapter_name="weixin", adapter_version="v2")
-    )
+    return replace(value, **changes)
 
+@pytest.fixture
+def ledger(tmp_path: Path) -> MessageLedger:
+    return MessageLedger(tmp_path / "ledger.sqlite3")
 
-class MessageLedgerAppendContractTests(unittest.TestCase):
+def test_append_writes_directly_without_using_remember(ledger: MessageLedger) -> None:
-    def setUp(self) -> None:
+    ledger.remember = lambda _: (_ for _ in ()).throw(AssertionError("remember called"))  # type: ignore[method-assign]
-        self.directory = TemporaryDirectory()
+    assert ledger.append(message()).message_id == "message-a"
-        self.addCleanup(self.directory.cleanup)
+    assert ledger.count() == 1
-        self.ledger = MessageLedger(f"{self.directory.name}/ledger.sqlite3")
 
-    def test_append_writes_directly_without_using_remember(self) -> None:
+def test_append_rejects_same_message_id_with_different_content(ledger: MessageLedger) -> None:
-        # A compatibility wrapper may remain, but the runtime append path may not
+    ledger.append(message(body="first"))
-        # route through it: this catches append() -> remember() regressions.
+    with pytest.raises(ConflictError):
-        self.ledger.remember = lambda _: (_ for _ in ()).throw(AssertionError("remember called"))  # type: ignore[method-assign]
+        ledger.append(message(event_id="event-b", body="second"))
-        record = self.ledger.append(message())
+    assert ledger.count() == 1
-        self.assertEqual("message-a", record.message_id)
-        self.assertEqual(1, self.ledger.count())
 
-    def test_append_rejects_same_message_id_with_different_content(self) -> None:
+def test_append_is_idempotent_when_only_event_id_changes(ledger: MessageLedger) -> None:
-        self.ledger.append(message(body="first"))
+    stored = ledger.append(message(event_id="event-a", body="same body"))
-        with self.assertRaises(ConflictError):
+    replay = ledger.append(message(event_id="event-b", body="same body"))
-            self.ledger.append(message(event_id="event-b", body="second"))
+    assert replay == stored
-        self.assertEqual(1, self.ledger.count())
+    assert replay.event_id == "event-a"
+    assert ledger.count() == 1
 
-    def test_append_is_idempotent_when_only_event_id_changes(self) -> None:
+@pytest.mark.parametrize("candidate", ["message", "message-a-extra", "MESSAGE-A"])
-        stored = self.ledger.append(message(event_id="event-a", body="same body"))
+def test_quote_lookup_has_no_prefix_similarity_or_case_fallback(
-        replay = self.ledger.append(message(event_id="event-b", body="same body"))
+    ledger: MessageLedger, candidate: str
+) -> None:
+    ledger.append(message(message_id="message-a"))
+    with pytest.raises(ScopeError, match="quoted_text_unavailable"):
+        ledger.resolve_quote(message(event_id="reply-event", message_id="reply-message",
+                                     reply_to_message_id=candidate))
 
-        self.assertEqual(stored, replay)
+def test_explicit_quoted_body_never_falls_back_to_storage(ledger: MessageLedger) -> None:
-        self.assertEqual("event-a", replay.event_id)
+    assert ledger.resolve_quote(message(quoted_body="exact transport quote")) == "exact transport quote"
-        self.assertEqual(1, self.ledger.count())
+    assert ledger.count() == 0
 
-    def test_append_keeps_tenants_isolated(self) -> None:
+@pytest.mark.parametrize("scope_change", [{"tenant_id": "tenant-b"}, {"cell_id": "cell-b"}])
-        self.ledger.append(message())
+def test_quote_lookup_is_tenant_and_cell_isolated(
-        self.ledger.append(message(tenant_id="tenant-b", cell_id="cell-b"))
+    ledger: MessageLedger, scope_change: dict[str, str]
-        self.assertEqual(2, self.ledger.count())
+) -> None:
-        self.assertEqual("hello", self.ledger.resolve_quote(
+    ledger.append(message())
-            message(tenant_id="tenant-b", cell_id="cell-b", event_id="event-c",
+    with pytest.raises(ScopeError, match="quoted_text_unavailable"):
-                    message_id="message-c", body="reply", reply_to_message_id="message-a")
+        ledger.resolve_quote(message(**scope_change, event_id="reply-event",
-        ))
+                                     message_id="reply-message",
+                                     reply_to_message_id="message-a"))
 
-    def test_concurrent_identical_append_is_one_record(self) -> None:
+def test_same_id_across_directions_is_ambiguous_not_guessed(ledger: MessageLedger) -> None:
+    ledger.append(message(direction="inbound", body="in"))
+    ledger.append(message(direction="outbound", event_id="event-b", body="out"))
+    with pytest.raises(ConflictError, match="ambiguous"):
+        ledger.resolve_quote(message(event_id="event-c", message_id="message-c",
+                                     reply_to_message_id="message-a"))
+
+def test_expired_record_is_not_resolved(ledger: MessageLedger) -> None:
+    ledger.append(message())
+    with sqlite3.connect(ledger.database) as db:
+        db.execute("UPDATE message_ledger SET expires_at='2000-01-01T00:00:00+00:00'")
+    with pytest.raises(ScopeError, match="quoted_text_unavailable"):
+        ledger.resolve_quote(message(event_id="event-b", message_id="message-b",
+                                     reply_to_message_id="message-a"))
+
+def test_purge_removes_only_expired_records(ledger: MessageLedger) -> None:
+    ledger.append(message())
+    ledger.append(message(event_id="event-b", message_id="message-b"))
+    with sqlite3.connect(ledger.database) as db:
+        db.execute("UPDATE message_ledger SET expires_at='2000-01-01T00:00:00+00:00' "
+                   "WHERE message_id='message-a'")
+    assert ledger.purge_expired() == 1
+    assert ledger.count() == 1
+
+def test_restart_preserves_exact_resolution(tmp_path: Path) -> None:
+    database = tmp_path / "ledger.sqlite3"
+    MessageLedger(database).append(message())
+    reopened = MessageLedger(database)
+    assert reopened.resolve_quote(message(event_id="event-b", message_id="message-b",
+                                          reply_to_message_id="message-a")) == "hello"
+
+def test_concurrent_identical_append_is_one_record(ledger: MessageLedger) -> None:
     with ThreadPoolExecutor(max_workers=16) as executor:
-            records = list(executor.map(lambda _: self.ledger.append(message()), range(16)))
+        records = list(executor.map(lambda _: ledger.append(message()), range(16)))
-        self.assertEqual(1, self.ledger.count())
+    assert ledger.count() == 1
-        self.assertEqual({"message-a"}, {record.message_id for record in records})
+    assert {record.message_id for record in records} == {"message-a"}
 
+def test_concurrent_distinct_appends_are_not_lost(ledger: MessageLedger) -> None:
+    def append(index: int) -> None:
+        ledger.append(message(event_id=f"event-{index}", message_id=f"message-{index}"))
+    with ThreadPoolExecutor(max_workers=16) as executor:
+        list(executor.map(append, range(16)))
+    assert ledger.count() == 16
 
-if __name__ == "__main__":
+def test_sqlite_failures_are_sanitized(ledger: MessageLedger) -> None:
-    unittest.main()
+    ledger.database.write_bytes(b"not-a-sqlite-database")
+    with pytest.raises(ConflictError, match="ledger storage unavailable") as raised:
+        ledger.count()
+    assert not isinstance(raised.value, sqlite3.Error)
+    assert "sqlite" not in str(raised.value).lower()
+    assert raised.value.__cause__ is None
+    assert raised.value.__context__ is None

tests/v2r1/test_secret_scope.py

@@ -0,0 +1,80 @@
+"""Executable completeness contract for scoped secret references."""
+from __future__ import annotations
+from dataclasses import fields
+import pytest
+from aios_v2r1.secret_scope import SecretRef
+from aios_v2r1.tenant_context import ScopeError, ValidationError
+
+def secret(**changes: object) -> SecretRef:
+    values: dict[str, object] = {
+        "secret_id": "channel-key", "tenant_id": "tenant-a", "cell_id": "cell-a",
+        "kind": "channel", "version": "v1",
+        "broker_path": "secret://tenant-a/cell-a/channel-key/v1"}
+    values.update(changes)
+    return SecretRef(**values)  # type: ignore[arg-type]
+
+@pytest.mark.parametrize("path", [
+    "secret://tenant-a/cell-a/channel-key/v1",
+    "secret://models/provider/key-v2",
+    "secret://runtime/cell-a/signing_key"])
+def test_valid_broker_paths_are_references(path: str) -> None:
+    assert secret(broker_path=path).broker_path == path
+
+@pytest.mark.parametrize("path", [
+    "", "vault://tenant-a/key", "secret://", "secret:///key",
+    "secret://tenant-a/../tenant-b/key", "secret://tenant-a//key",
+    "secret://tenant-a/key?version=1", "secret://tenant-a/key#fragment"])
+def test_broker_path_traversal_and_malformed_paths_are_rejected(path: str) -> None:
+    with pytest.raises(ValidationError, match="broker path"):
+        secret(broker_path=path)
+
+@pytest.mark.parametrize(("tenant_id", "cell_id", "allowed"), [
+    ("tenant-a", "cell-a", True), ("tenant-b", "cell-a", False),
+    ("tenant-a", "cell-b", False)])
+def test_secret_scope_is_exact(tenant_id: str, cell_id: str, allowed: bool) -> None:
+    assert secret().can_be_used_by(tenant_id=tenant_id, cell_id=cell_id) is allowed
+
+@pytest.mark.parametrize("kind", ["channel", "model", "tool", "runtime"])
+def test_secret_kind_allowlist(kind: str) -> None:
+    assert secret(kind=kind).kind == kind
+
+def test_invalid_secret_kind_is_rejected() -> None:
+    with pytest.raises(ValidationError, match="kind"):
+        secret(kind="admin")
+
+@pytest.mark.parametrize("changes", [
+    {"secret_id": "../key"}, {"secret_id": " key "},
+    {"version": "../v2"}, {"version": ""}, {"tenant_id": "Tenant-A"},
+    {"cell_id": "cell/a"}])
+def test_secret_identifiers_and_version_are_validated(changes: dict[str, str]) -> None:
+    with pytest.raises(ValidationError):
+        secret(**changes)
+
+def test_reference_never_contains_a_secret_value_field() -> None:
+    assert "value" not in {field.name for field in fields(SecretRef)}
+    assert "super-secret-value" not in repr(secret())
+
+def test_broker_resolution_uses_only_the_validated_reference() -> None:
+    seen: list[SecretRef] = []
+    class Broker:
+        def read_secret(self, reference: SecretRef) -> str:
+            seen.append(reference)
+            return "resolved-value"
+    reference = secret()
+    assert reference.resolve(Broker()) == "resolved-value"
+    assert seen == [reference]
+
+@pytest.mark.parametrize("broker", [None, object()])
+def test_missing_or_invalid_broker_fails_closed(broker: object | None) -> None:
+    with pytest.raises(ScopeError, match="secret broker unavailable"):
+        secret().resolve(broker)
+
+def test_broker_error_is_sanitized_without_secret_leakage() -> None:
+    class BrokenBroker:
+        def read_secret(self, reference: SecretRef) -> str:
+            raise RuntimeError("provider leaked super-secret-value")
+    with pytest.raises(ScopeError, match="secret broker unavailable") as raised:
+        secret().resolve(BrokenBroker())
+    assert "super-secret-value" not in str(raised.value)
+    assert raised.value.__cause__ is None
+    assert raised.value.__context__ is None