aios/reports/V2R2C1-mainline-convergence-diff-summary-20260809.md

V2R2C1 post-release mainline convergence diff summary

• task: TASK-P0-V2R2C1-POST-RELEASE-MAINLINE-CONVERGENCE-20260809
• repository: aios/aios
• main base: 2e8fa22989808a448065d1d76b5b18948774a637
• release target: 998d30304787e31e5ae607c0bd86b5edb2b0e5ad
• control-plane source: b781129bd5a8b53c05ab648361424d2800166ee4
• implementation integration head before this report commit: 2c6293160ed567a2098715edbb296741577c5bff
• branch: agent/v2r2c1-post-release-mainline-convergence-20260809

Logical governed commits

OID	Parent	Message
40b685d1c70c767c7a79a2b184348e58e3e319ae	2e8fa22989808a448065d1d76b5b18948774a637	feat(v2r2c1): converge durable control-plane core
5f616311bab38b0dac296ed8b0e69660e031a20e	40b685d1c70c767c7a79a2b184348e58e3e319ae	docs(v2r2c1): converge durable runtime and design sources
57780e316e320a5128cc2c9f12adbb19ae57aef5	5f616311bab38b0dac296ed8b0e69660e031a20e	feat(v2r2c1): integrate governed release overlay
e41b8d323a3e7a40440f5d32221f524074bea5fe	57780e316e320a5128cc2c9f12adbb19ae57aef5	feat(v2r2c1): wire governed release operations into durable bridge
b20cb8130e4c68267d5d85b02eed51cb8d4f41c0	e41b8d323a3e7a40440f5d32221f524074bea5fe	test: repair canonical pytest repository entrypoint
c6a1693efaede9dace9b929d884a09e162a02c89	b20cb8130e4c68267d5d85b02eed51cb8d4f41c0	test: make whole-suite collection deterministic
91f2ea0591787d3dbf8c2e27ab0460629d86900e	c6a1693efaede9dace9b929d884a09e162a02c89	test: preserve legacy suite imports under canonical collection
85897d3f6d708271dff16767265f9d14b2f29801	91f2ea0591787d3dbf8c2e27ab0460629d86900e	test: expose repository test helpers to canonical collection
f1110d24f30d8441f2df04e0774ee230b95c2e02	85897d3f6d708271dff16767265f9d14b2f29801	fix(v2r2c1): close slash-branch and suite contract regressions
c10d2a5dfcc394dde7a7022952d7b423725747a3	f1110d24f30d8441f2df04e0774ee230b95c2e02	test: align writer regression with durable idempotent replay
f969aedaf61501a866435c712be01ff2cfe43fb1	c10d2a5dfcc394dde7a7022952d7b423725747a3	feat(v2r2c1): source baseline authority for model-api staging
4ab70bfdb4d34aa9d1dabc4230a3367eaa93cc9b	f969aedaf61501a866435c712be01ff2cfe43fb1	feat(v2r2c1): add immutable model api staging runtime
7c4e86bfc1f39e643e672968d1fdedbd72ace56d	4ab70bfdb4d34aa9d1dabc4230a3367eaa93cc9b	fix(v2r2c1): avoid builder secret-scan false positives
7564363a30bfa7fa81ac5c7c545ec704984ec543	7c4e86bfc1f39e643e672968d1fdedbd72ace56d	fix(v2r2c1): isolate model api staging port
2c6293160ed567a2098715edbb296741577c5bff	7564363a30bfa7fa81ac5c7c545ec704984ec543	fix(v2r2c1): bind baseline authority and openapi staging path

Exact diff stat

active-runtime/app/aios_authority_git_executor.py  |   24 +
 active-runtime/app/aios_chatgpt_actions_api.py     |   48 +-
 active-runtime/app/aios_chatgpt_bridge_v2.py       |  167 ++++
 .../app/aios_chatgpt_bridge_v2_server.py           |  431 +++++++++
 active-runtime/app/aios_continuation_executor.py   |  594 ++++++++++++
 active-runtime/app/aios_continuation_lease.py      |    6 +
 active-runtime/app/aios_control_plane_snapshot.py  |   26 +
 active-runtime/app/aios_credential_broker.py       |   78 ++
 active-runtime/app/aios_gitea_publisher.py         |   93 ++
 active-runtime/app/aios_gitops_job_controller.py   |   16 +-
 .../app/aios_gitops_reconciliation_core.py         |   80 ++
 active-runtime/app/aios_governed_policy.py         |   59 ++
 active-runtime/app/aios_governed_task_bootstrap.py |   84 ++
 active-runtime/app/aios_model_api_staging.py       | 1022 ++++++++++++++++++++
 .../app/authorized_task_writer_provisioning.py     |    4 +-
 active-runtime/app/baseline_authority.py           |   84 ++
 active-runtime/app/governed_production_release.py  |  568 +++++++++++
 active-runtime/app/v2r2c1_production_adapter.py    |  135 +++
 .../systemd/aios-chatgpt-bridge-v2-staging.service |   23 +
 .../aios-gitops-model-api-v2r2c1-staging.service   |   51 +
 ...09-bridge-v2.1-durable-reconciliation-design.md |   15 +
 ...t-bridge-v2-control-plane-convergence-design.md |  150 +++
 pytest.ini                                         |    4 +
 scripts/build_v2r2c1_model_api_staging.py          |  145 +++
 .../aios_release_controller/manifest.py            |    4 +-
 .../test_v2r1c6_release_consistency.py             |    4 +-
 .../aios_v2_candidate/test_v2r1c6_release_ready.py |   16 +-
 tests/conftest.py                                  |   65 ++
 tests/test_bridge_v2_governed_http_bootstrap.py    |   90 ++
 tests/test_governed_local_writer.py                |    6 +-
 tests/test_model_api_immutable_staging.py          |   35 +
 31 files changed, 4108 insertions(+), 19 deletions(-)

Included durable source domains

• Bridge v2 adapter/server and governed HTTP contracts.
• Durable reconciliation core, continuation executor/lease, Authority Git CAS adapter, job controller compatibility.
• Gitea publisher/verifier, credential broker, governed policy, control-plane snapshot, release routing.
• Canonical pytest entrypoint/conftest and regression coverage.
• Source-controlled immutable model-api staging runtime, builder and systemd template.
• Selected design specifications required for durable mainline context.

Explicitly excluded

• main ref mutation or merge without Owner approval.
• Production service, Registry, Baseline body/sidecar, production tags and mutable /var/lib state.
• Installed /opt artifacts, temporary staging transition state and task-local receipts/credentials.
• Production cutover/restart, force push, history rewrite and plaintext secrets.

Verification

• pytest tests: 709 passed, 2 skipped, 154 subtests, 0 failed.
• Staging model-api: immutable OID/digest bound, port 18893, health/base/ver/OpenAPI readback PASS, restart recovery PASS.
• Authority/Gitea Git/Gitea API commit equality and commit visibility PASS.
• Production remains V2R2C1 and was not restarted or cut over.