Compare commits

..
4 changed files with 155 additions and 357 deletions
@@ -0,0 +1,71 @@
---
task_id: TASK-AIOS-GPT-P6-MAIN-UPDATE-VERIFY-20260714T015000+0800
executor: GPT_CODEX
started_at: 2026-07-14T01:46:00+08:00
finished_at: 2026-07-14T01:50:00+08:00
status: PASS
repository: /data/aios-gitops/workspace
review_branch: review/codex/p6-main-update-verification-20260714-015000
review_result_commit_ref: HEAD
main_before: 6b70a3308031e3ef8e04a89ca02fd3bdcab1ebcc
main_after: 3cf9958cb94614449e093639cbf902216d73447f
origin_main_verified: true
integration_commit: 3cf9958cb94614449e093639cbf902216d73447f
accepted_file: .agent/results/openclaw/RESULT-V2R1-G1-OPENCLAW-FINAL-EVIDENCE-20260714.md
accepted_blob: ff31f7ab603d7a7cd07319e6f8422ae464916179
changed_file_count: 1
business_code_changed: false
tests_changed: false
openclaw_execution_result_branch: task/openclaw/p6-main-fastforward-20260714-014500
openclaw_execution_result_blob_prefix: 9f6ea3d
push_mode: fast-forward-only
force_push_used: false
merge_commit_created: false
baseline_before: V1R4C6
baseline_after: V1R4C6
baseline_changed: false
new_tag_created: false
deployment_performed: false
commands:
- getRuntimeStatus
- getBaseline
- getDiff 3cf9958cb94614449e093639cbf902216d73447f..origin/main
- getDiff 6b70a3308031e3ef8e04a89ca02fd3bdcab1ebcc..origin/main
- listVersions
- getDiff ee7ff99..task/openclaw/p6-main-fastforward-20260714-014500
- getDiff task/openclaw/p6-main-fastforward-20260714-014500^..task/openclaw/p6-main-fastforward-20260714-014500
checks:
origin_main_matches_authorized_target: PASS
exact_single_file_delta: PASS
accepted_blob_identity: PASS
openclaw_result_committed: PASS
no_force_push: PASS
no_merge_commit: PASS
baseline_unchanged: PASS
no_new_tag: PASS
no_deployment: PASS
version_disposition:
tag_action: NONE
baseline_action: NONE
deployment_action: NONE
reason: The main update contains only Gate 1 evidence and does not introduce a deployable runtime or release artifact. Creating a release tag, promoting baseline, or deploying would overstate the scope of this change.
phase_disposition:
P6: PASS
P7: NOT_APPLICABLE
P8: NOT_APPLICABLE
risk: LOW
blockers: []
recommendation: Close the V2R1 Gate 1 evidence-integration workflow at main commit 3cf9958cb94614449e093639cbf902216d73447f. Start a separate task for any V2R1 runtime release, baseline promotion or deployment.
---
# P6 Main Update Verification
## Decision
**PASS.** `origin/main` is exactly `3cf9958cb94614449e093639cbf902216d73447f`, the owner-authorized integration target.
The update from `6b70a3308031e3ef8e04a89ca02fd3bdcab1ebcc` contains exactly one file: the accepted Gate 1 clean-room evidence report with blob `ff31f7ab603d7a7cd07319e6f8422ae464916179`.
## Version and deployment disposition
No release tag or baseline promotion is appropriate for this evidence-only main update. The baseline remains `V1R4C6`; no deployment was performed. P7 and P8 are therefore not applicable to this workflow.
@@ -1,172 +0,0 @@
---
authorization_id: TASK-V2R1-RUNTIME-INTEGRATION-P1-20260714
task_id: TASK-V2R1-RUNTIME-INTEGRATION-P1-20260714
executor: GPT_CODEX
status: PASS
started_at: 2026-07-14T02:24:00+08:00
finished_at: 2026-07-14T02:27:46+08:00
repository: /data/aios-gitops/workspace
review_branch: review/codex/v2r1-runtime-integration-discovery-20260714
review_worktree: /data/aios-gitops/worktrees/v2r1-runtime-integration-discovery-20260714
result_commit: SELF
result_commit_resolution: The containing commit is resolved by Git from the review branch because embedding its object ID would change the commit identity.
parent_commit: 3cf9958cb94614449e093639cbf902216d73447f
source_commit: 502ef30642597fb0b70b90ae2e8a0b6af217d80e
gate1_commit: 7f5d5d90b3111c35fb00044f385358f528e3344e
merge_base: 1a9cb9095e6e76c548c967e03cb7a3e47b85134b
main_graph_commits: 21
source_graph_commits: 44
main_changed_paths: 16
source_changed_paths: 42
approved_replay_paths: 38
excluded_source_paths: 4
changed_path_overlap: 0
workspace_clean_after_commit: true
rollback_target: 3cf9958cb94614449e093639cbf902216d73447f
runtime_modified: false
tests_modified: false
main_modified: false
tag_created: false
baseline_modified: false
service_modified: false
deployment_performed: false
force_push_used: false
risk: HIGH
recommendation: Proceed to a separately authorized P2 allowlist replay from exact main; keep tag, baseline, staging and deployment blocked until P4/P5 close every listed blocker.
---
# V2R1 Runtime Integration P1 Discovery Result
## Decision
**PASS for discovery only.** The repository graph, path classifications, preservation boundary, exclusion boundary, and safe integration strategy are now explicit. This result does not authorize runtime integration or release activity.
## Authoritative identities
| Item | Verified value |
|---|---|
| Current main | `3cf9958cb94614449e093639cbf902216d73447f` |
| V2R1 source | `502ef30642597fb0b70b90ae2e8a0b6af217d80e` |
| Gate1 PASS commit | `7f5d5d90b3111c35fb00044f385358f528e3344e` |
| Merge base | `1a9cb9095e6e76c548c967e03cb7a3e47b85134b` |
| Main graph | `21` commits / `16` changed paths |
| Source graph | `44` commits / `42` changed paths |
| Changed-path overlap | `0` |
Gate1 commit is a direct child of source and adds one OpenClaw report. Main already contains the identical accepted report blob `ff31f7ab603d7a7cd07319e6f8422ae464916179`. The Gate1 commit must not be merged again.
## Exact classification
### Preserve from main — 16 paths
```text
.agent/results/openclaw/RESULT-V2R1-G1-OPENCLAW-FINAL-EVIDENCE-20260714.md
deployments/V1R4C6/backup-result.md
deployments/V1R4C6/deployment-result.md
deployments/V1R4C6/preflight-result.md
deployments/V1R4C6/rollback-result.md
deployments/V1R4C6/verification-result.md
docs/incidents/WEIXIN_TEXT_IMAGE_CACHE_ISOLATION_20260711.md
docs/superpowers/plans/2026-07-12-weixin-quoted-text-failclosed.md
docs/superpowers/specs/2026-07-12-weixin-quoted-text-failclosed-design.md
fixes/patch_openclaw_weixin_bigint.py
fixes/patch_openclaw_weixin_hermes.py
fixes/patch_openclaw_weixin_outbound_quotes.py
patches/deploy_v1r4c6-production-20260711.branch.json
tests/test_weixin_bigint_parser.py
tests/test_weixin_image_followup_intent.py
tests/test_weixin_outbound_quote_timestamp.py
```
### Replay from source — 38 paths
```text
.gitignore
active-runtime/app/aios_v2r1/audit.py
active-runtime/app/aios_v2r1/cell_manager.py
active-runtime/app/aios_v2r1/channel_adapter.py
active-runtime/app/aios_v2r1/cli.py
active-runtime/app/aios_v2r1/fleet.py
active-runtime/app/aios_v2r1/hermes_fabric.py
active-runtime/app/aios_v2r1/hermes_profile.py
active-runtime/app/aios_v2r1/identity.py
active-runtime/app/aios_v2r1/memory_scope.py
active-runtime/app/aios_v2r1/message_ledger.py
active-runtime/app/aios_v2r1/router.py
active-runtime/app/aios_v2r1/runtime.py
active-runtime/app/aios_v2r1/secret_scope.py
active-runtime/app/aios_v2r1/session_pool.py
active-runtime/app/aios_v2r1/tenant_context.py
agents/registry.yaml
data/webops.sqlite3 [delete]
deploy/v2r1/healthcheck.sh
deploy/v2r1/install.sh
deploy/v2r1/validate.sh
docs/architecture/AIOS_AGENT_AUDIT_PLANE.md
docs/architecture/AIOS_V1R5_to_V2R1_Migration_Plan.md
docs/architecture/AIOS_V2R1_OpenClaw_Tenant_Cell_Hermes_Shared_Agent_Fabric_Architecture.md
openclaw/plugins/aios-tenant-boundary/dist/index.js
openclaw/plugins/aios-tenant-boundary/dist/policy.js
openclaw/plugins/aios-tenant-boundary/openclaw.plugin.json
openclaw/plugins/aios-tenant-boundary/package.json
release/v2r1c0-rc1/RELEASE.md
tests/integration/test_runtime_ingress_flow.py
tests/v2r1/test_acceptance_manifest.md
tests/v2r1/test_hermes_contract.md
tests/v2r1/test_hermes_fabric.py
tests/v2r1/test_message_ledger_append.py
tests/v2r1/test_router_isolation.py
tests/v2r1/test_runtime_identity_binding.py
tests/v2r1/test_runtime_wiring.py
tests/v2r1/test_tenant_context.py
```
### Exclude from source — 4 paths
```text
.agent/results/codex/RESULT-V2R1-202607132000-CODEX.md
.agent/results/codex/RESULT-V2R1-G1-CODEX-CLEANUP-20260713.md
patches/release_v2r1c0-tenant-cell-fabric-20260712.branch.json
release/v2r1c0-rc1/STATUS.md
```
The task record contains the category-level counts, exact commit exclusions, and reason for every excluded class.
## Strategy and invariants
The approved future strategy is allowlist final-blob replay from source onto exact main. It intentionally avoids merging or cherry-picking historical evidence ancestry. Thirty-seven present paths are restored from source and the tracked `data/webops.sqlite3` path is explicitly deleted.
The future integration must preserve:
- exact first parent and rollback target `3cf9958cb94614449e093639cbf902216d73447f`;
- all 16 main-only paths above;
- Gate1 evidence blob `ff31f7ab603d7a7cd07319e6f8422ae464916179`;
- `VERSION` blob `dd4988511ee5957d599098408c89de0c8b758df9` (`V1R4C6`);
- baseline registry blob `81b5bbe59397e01d7fff048a5a91c9636ee85696`;
- no tag, baseline, service, deployment, or force-push mutation.
## Baseline and tag evidence
`V1R4C6` is annotated tag object `356a8a8c1860b94b7d61a456c29228c88e57d963`, peeled release commit `d8cf6058e99f5c7f2dfd2b45a406c0a7edf955b2`. The baseline registry pointer is `e204a90398bf646d46245b3088226749fa056edd`, while the current registry-containing commit is `031215916826f1f0700147242a77878b8514b719`. They are distinct identities. No `V2*` tag exists and P1 creates none.
## Conflict and workspace evidence
Current main contains six tracked conflict-marker lines in two files. Source contains zero, and the two corrected source blobs are in the replay allowlist. Final verification must still prove zero markers.
The canonical workspace had two unrelated untracked controller audit records during discovery. They were not cleaned or included. The P1 review branch uses a separate worktree created from exact main.
## Blockers
- Attachment-composition regression is not closed by candidate-bound evidence.
- Node plugin tests are missing even though `npm test` references `test/*.test.js`.
- Plugin versions differ: `2.1.0-rc.1` and `2.1.0-rc1`.
- V2R1 install tooling hardcodes an old release branch.
- RC1 `STATUS.md` is stale and excluded.
- Static scripts do not prove a real OpenClaw runtime probe or rollback recovery.
- Existing release automation masks failures and does not safely update the current baseline schema.
These blockers prevent release, tagging, baseline promotion, staging, and deployment. They do not invalidate the P1 discovery result.
## Disposition
P1 produces evidence only. A separately authorized P2 may implement the exact allowlist replay. P4/P5 must bind tests, security scans, attachment regression, Node plugin verification, real runtime inspection, and rollback evidence to the resulting immutable integration commit before any release action.
@@ -0,0 +1,84 @@
# V2R1 Gate 1 — Runtime Release Readiness
## Summary
- **task_id**: TASK-AIOS-OPENCLAW-P7-RUNTIME-READINESS-20260714
- **executor**: OPENCLAW
- **status**: NOT_APPLICABLE
- **repository**: /data/aios-gitops/workspace
- **main_commit**: 3cf9958cb94614449e093639cbf902216d73447f
- **baseline_tag**: V1R4C6
- **baseline_commit**: d8cf6058e99f5c7f2dfd2b45a406c0a7edf955b2
- **tag_created**: false
- **baseline_changed**: false
- **deployment_performed**: false
## Change Analysis: Baseline → main
### All changes (from V1R4C6 to main)
| Change | File |
|--------|------|
| Added | `.agent/results/openclaw/RESULT-V2R1-G1-OPENCLAW-FINAL-EVIDENCE-20260714.md` |
| Modified | `baseline/current.json` (baseline pointer updated to V1R4C6 after incident fix deployment) |
| Added | `deployments/V1R4C6/backup-result.md` |
| Added | `deployments/V1R4C6/deployment-result.md` |
| Added | `deployments/V1R4C6/preflight-result.md` |
| Added | `deployments/V1R4C6/rollback-result.md` |
| Added | `deployments/V1R4C6/verification-result.md` |
| Added | `docs/incidents/WEIXIN_TEXT_IMAGE_CACHE_ISOLATION_20260711.md` |
| Added | `docs/superpowers/plans/2026-07-12-weixin-quoted-text-failclosed.md` |
| Added | `docs/superpowers/specs/2026-07-12-weixin-quoted-text-failclosed-design.md` |
| Added | `fixes/patch_openclaw_weixin_bigint.py` |
| Added | `fixes/patch_openclaw_weixin_hermes.py` |
| Added | `fixes/patch_openclaw_weixin_outbound_quotes.py` |
| Added | `patches/deploy_v1r4c6-production-20260711.branch.json` |
| Added | `tests/test_weixin_bigint_parser.py` |
| Added | `tests/test_weixin_image_followup_intent.py` |
| Added | `tests/test_weixin_outbound_quote_timestamp.py` |
### Runtime changes (filtered by active-runtime, tests, deploy, deployment, etc.)
| File | Category |
|------|----------|
| `deployments/V1R4C6/backup-result.md` | deployment documentation |
| `deployments/V1R4C6/deployment-result.md` | deployment documentation |
| `deployments/V1R4C6/preflight-result.md` | deployment documentation |
| `deployments/V1R4C6/rollback-result.md` | deployment documentation |
| `deployments/V1R4C6/verification-result.md` | deployment documentation |
| `tests/test_weixin_bigint_parser.py` | weixin incident fix test |
| `tests/test_weixin_image_followup_intent.py` | weixin incident fix test |
| `tests/test_weixin_outbound_quote_timestamp.py` | weixin incident fix test |
### V2R1 runtime code on main
**0 files** — `active-runtime/app/aios_v2r1/`, `tests/v2r1/`, `deploy/v2r1/` do not exist at commit `3cf9958c`.
## Test Results
Not applicable — there is no V2R1 runtime code or V2R1 test suite at current `main`. The V2R1 clean-room code exists only on the Codex branch `work/v2r1-integration-quality-2000` (commit `502ef30`), which has not been merged to `main`.
## Compilation & Import Check
- Compile (`compileall -q active-runtime/app`): exit code 0 — PASS
- Import path: `RUNTIME_IMPORT_PATH=PASS` — PASS
## Secret & Conflict Scan
Not executed at scope — main contains only V1R4C6 evidence/integration code and weixin patches. No V2R1 secrets could exist here.
## Baseline Rollback
- V1R4C6 baseline commit: `d8cf6058e99f5c7f2dfd2b45a406c0a7edf955b2`
- `git archive` baseline contains `active-runtime/`: verified
- Rollback object readable: PASS
## Deployment Definition
Deployment files found at `deployments/V1R4C6/` (V1R4C6 production deployment records) and `patches/`. No V2R1 deployment definitions exist.
## Conclusion
**Status: NOT_APPLICABLE**
Current `main` (`3cf9958c`) contains only V1R4C6 production baseline evidence, incident fix patches, and V2R1 acceptance evidence. There is **no V2R1 runtime code** (active-runtime, tests, deploy) available at this commit. The V2R1 clean-room code remains on branch `work/v2r1-integration-quality-2000` and has not been merged.
No deployable runtime changes exist between baseline `V1R4C6` and current `main`. V2R1 requires clean-room evidence acceptance merged to main before a runtime readiness assessment can proceed.
### Recommendation
Merge V2R1 clean-room evidence to main → integrate V2R1 runtime code → re-run readiness review.
@@ -1,185 +0,0 @@
---
authorization_id: TASK-V2R1-RUNTIME-INTEGRATION-P1-20260714
task_id: TASK-V2R1-RUNTIME-INTEGRATION-P1-20260714
executor: GPT_CODEX
status: DISCOVERY_COMPLETE
started_at: 2026-07-14T02:24:00+08:00
finished_at: 2026-07-14T02:27:46+08:00
repository: /data/aios-gitops/workspace
review_branch: review/codex/v2r1-runtime-integration-discovery-20260714
review_worktree: /data/aios-gitops/worktrees/v2r1-runtime-integration-discovery-20260714
main_commit: 3cf9958cb94614449e093639cbf902216d73447f
source_commit: 502ef30642597fb0b70b90ae2e8a0b6af217d80e
gate1_commit: 7f5d5d90b3111c35fb00044f385358f528e3344e
merge_base: 1a9cb9095e6e76c548c967e03cb7a3e47b85134b
result_path: .agent/results/codex/RESULT-V2R1-RUNTIME-INTEGRATION-P1-20260714.md
write_scope:
- .agent/tasks/codex/TASK-V2R1-RUNTIME-INTEGRATION-P1-20260714.md
- .agent/results/codex/RESULT-V2R1-RUNTIME-INTEGRATION-P1-20260714.md
forbidden_actions:
- modify_runtime_or_tests
- merge_or_push_main
- create_or_move_tag
- update_baseline
- change_service_or_deploy
---
# V2R1 Runtime Integration P1 Discovery Task
## Objective
Produce a reproducible, evidence-only discovery record for integrating the approved V2R1 source tree onto current main without importing divergent historical evidence ancestry. P1 does not implement the integration.
## Locked graph
- Authoritative main: `3cf9958cb94614449e093639cbf902216d73447f`.
- Approved V2R1 source: `502ef30642597fb0b70b90ae2e8a0b6af217d80e`.
- Accepted Gate1 evidence commit: `7f5d5d90b3111c35fb00044f385358f528e3344e`.
- Merge base: `1a9cb9095e6e76c548c967e03cb7a3e47b85134b`.
- Main-only graph: `21` commits and `16` changed paths.
- Source-only graph: `44` commits and `42` changed paths.
- Main/source changed-path overlap: `0` paths.
## Main paths that must be preserved exactly — 16
1. `.agent/results/openclaw/RESULT-V2R1-G1-OPENCLAW-FINAL-EVIDENCE-20260714.md`
2. `deployments/V1R4C6/backup-result.md`
3. `deployments/V1R4C6/deployment-result.md`
4. `deployments/V1R4C6/preflight-result.md`
5. `deployments/V1R4C6/rollback-result.md`
6. `deployments/V1R4C6/verification-result.md`
7. `docs/incidents/WEIXIN_TEXT_IMAGE_CACHE_ISOLATION_20260711.md`
8. `docs/superpowers/plans/2026-07-12-weixin-quoted-text-failclosed.md`
9. `docs/superpowers/specs/2026-07-12-weixin-quoted-text-failclosed-design.md`
10. `fixes/patch_openclaw_weixin_bigint.py`
11. `fixes/patch_openclaw_weixin_hermes.py`
12. `fixes/patch_openclaw_weixin_outbound_quotes.py`
13. `patches/deploy_v1r4c6-production-20260711.branch.json`
14. `tests/test_weixin_bigint_parser.py`
15. `tests/test_weixin_image_followup_intent.py`
16. `tests/test_weixin_outbound_quote_timestamp.py`
Additional immutable main invariants:
- `VERSION` remains `V1R4C6`, blob `dd4988511ee5957d599098408c89de0c8b758df9`.
- `baseline/current.json` remains blob `81b5bbe59397e01d7fff048a5a91c9636ee85696`.
- Accepted Gate1 evidence remains blob `ff31f7ab603d7a7cd07319e6f8422ae464916179`.
- The future integration commit must have `3cf9958cb94614449e093639cbf902216d73447f` as its first-parent/rollback target.
## Approved source-tree allowlist — 38 paths
### Python V2R1 runtime — 15
1. `active-runtime/app/aios_v2r1/audit.py`
2. `active-runtime/app/aios_v2r1/cell_manager.py`
3. `active-runtime/app/aios_v2r1/channel_adapter.py`
4. `active-runtime/app/aios_v2r1/cli.py`
5. `active-runtime/app/aios_v2r1/fleet.py`
6. `active-runtime/app/aios_v2r1/hermes_fabric.py`
7. `active-runtime/app/aios_v2r1/hermes_profile.py`
8. `active-runtime/app/aios_v2r1/identity.py`
9. `active-runtime/app/aios_v2r1/memory_scope.py`
10. `active-runtime/app/aios_v2r1/message_ledger.py`
11. `active-runtime/app/aios_v2r1/router.py`
12. `active-runtime/app/aios_v2r1/runtime.py`
13. `active-runtime/app/aios_v2r1/secret_scope.py`
14. `active-runtime/app/aios_v2r1/session_pool.py`
15. `active-runtime/app/aios_v2r1/tenant_context.py`
### OpenClaw plugin — 4
1. `openclaw/plugins/aios-tenant-boundary/dist/index.js`
2. `openclaw/plugins/aios-tenant-boundary/dist/policy.js`
3. `openclaw/plugins/aios-tenant-boundary/openclaw.plugin.json`
4. `openclaw/plugins/aios-tenant-boundary/package.json`
### Tests and contracts — 9
1. `tests/integration/test_runtime_ingress_flow.py`
2. `tests/v2r1/test_acceptance_manifest.md`
3. `tests/v2r1/test_hermes_contract.md`
4. `tests/v2r1/test_hermes_fabric.py`
5. `tests/v2r1/test_message_ledger_append.py`
6. `tests/v2r1/test_router_isolation.py`
7. `tests/v2r1/test_runtime_identity_binding.py`
8. `tests/v2r1/test_runtime_wiring.py`
9. `tests/v2r1/test_tenant_context.py`
### Static deployment tooling — 3
1. `deploy/v2r1/healthcheck.sh`
2. `deploy/v2r1/install.sh`
3. `deploy/v2r1/validate.sh`
### Architecture and release documents — 4
1. `docs/architecture/AIOS_AGENT_AUDIT_PLANE.md`
2. `docs/architecture/AIOS_V1R5_to_V2R1_Migration_Plan.md`
3. `docs/architecture/AIOS_V2R1_OpenClaw_Tenant_Cell_Hermes_Shared_Agent_Fabric_Architecture.md`
4. `release/v2r1c0-rc1/RELEASE.md`
### Cleanup and governance — 3
1. `.gitignore`
2. `agents/registry.yaml`
3. `data/webops.sqlite3` — explicit tracked-file deletion, not a restore operation.
The replay operation restores the `37` present paths from source and explicitly removes `data/webops.sqlite3`. No directory-wide restore is allowed outside this list.
## Excluded source paths — 4
1. `.agent/results/codex/RESULT-V2R1-202607132000-CODEX.md` — historical branch evidence.
2. `.agent/results/codex/RESULT-V2R1-G1-CODEX-CLEANUP-20260713.md` — historical branch evidence.
3. `patches/release_v2r1c0-tenant-cell-fabric-20260712.branch.json` — stale branch-specific patch metadata.
4. `release/v2r1c0-rc1/STATUS.md` — stale status: references tree `6569065` and contradicts later test/rollback evidence.
## Excluded commit ancestry
- Do not merge source commit ancestry and do not cherry-pick any of its `44` source-only commits. Replay only the approved final blobs.
- Do not merge Gate1 commit `7f5d5d90b3111c35fb00044f385358f528e3344e`; main already contains its accepted evidence blob.
- Do not replay result-only source commits `d6ba7e8fa859407ec55acf49b5468bba5eac96da`, `b9e1f9db66eb08282b7b690199e56461d28dd76d`, or `502ef30642597fb0b70b90ae2e8a0b6af217d80e` as commits.
- Explicitly exclude rejected OpenClaw candidates `7a2f16ee72e944737a9f6995e511ef176413ae6b`, `b1d3439ee9e66b5eed1c94595a22bc630d893b6e`, `38320044b54c172c28877a81f291478267dd7b9e`, `7fd63b55f27b23658ea26e2a39d949c7b1e91dda`, and `71239b4d187e683e05fd22fc9d5df8ae324e3390`.
- Prior Codex final-verification commit `0eebcf0b72f06c02205fdb6e300ceb5b3a5647a7` is not an integration input.
## Strategy decision
Use allowlist file replay from the immutable source tree, not a historical merge or commit-range cherry-pick. The two branches diverged for `21` and `44` commits after the merge base. Historical ancestry includes obsolete result reports and branch metadata, while main contains V1R4C6 incident fixes and the already accepted Gate1 evidence. Final-blob replay makes the intended runtime delta explicit and keeps those histories out of the future integration commit.
P2 must start from exact main, revalidate all refs, restore only the 37 present allowlist paths from source, remove the one tracked SQLite path, and stop if any additional path appears.
## Conflict preview
- Current main has `6` tracked conflict-marker lines across `agents/registry.yaml` and `docs/architecture/AIOS_AGENT_AUDIT_PLANE.md`.
- Source has `0` tracked conflict-marker lines.
- Both corrected source blobs are in the allowlist; the final tree must scan to zero markers.
- The changed-path overlap between main and source deltas is zero, but this does not waive blob-preservation checks.
## Baseline and tag distinction
- Annotated tag object `356a8a8c1860b94b7d61a456c29228c88e57d963` is `V1R4C6` and peels to release commit `d8cf6058e99f5c7f2dfd2b45a406c0a7edf955b2`.
- `baseline/current.json` records baseline registry pointer `e204a90398bf646d46245b3088226749fa056edd`; its latest modifying commit is `031215916826f1f0700147242a77878b8514b719`.
- The tag object, peeled release commit, registry pointer, and registry-containing commit are separate audit identities.
- No V2 tag exists. Future approved namespace is `refs/tags/V2R1C0`; P1 does not create it.
## Current workspace pollution
At discovery time, canonical workspace `/data/aios-gitops/workspace` contained two unrelated untracked controller records:
- `audit/controller-runs/c-1783966122.json`
- `audit/controller-runs/c-1783966722.json`
They are excluded. All P1 writes occur in the isolated worktree, and no canonical workspace cleanup is authorized.
## Known blockers
1. Attachment-composition regression lacks a closed, candidate-bound regression result.
2. Plugin `npm test` targets `test/*.test.js`, but source tracks no Node test files.
3. Plugin package version `2.1.0-rc.1` differs from manifest version `2.1.0-rc1`.
4. `deploy/v2r1/install.sh` hardcodes release branch `release/v2r1c0-tenant-cell-fabric-20260712`.
5. `release/v2r1c0-rc1/STATUS.md` is stale and is excluded rather than silently rewritten.
6. `validate.sh --install/--rollback` and `healthcheck.sh` do not prove a real OpenClaw runtime or rollback path.
7. `scripts/release_version.sh` masks failures and does not match the active baseline registry schema; it must not be used.
## Exit criteria
P1 passes when the two evidence files are the only commit delta, the commit parent is exact main, the isolated worktree is clean after commit, and the review branch is pushed without force. Runtime integration, main update, tag, baseline promotion, and deployment remain separate blocked phases.