Why: the initiative branch's merge resolution kept a stale test_svc_recover.py that lost main's free_fixture_port helper while its callers (test_svc_superadmin_envfile) reference it, breaking the CI test job on every initiative-branch head.
Evidence: main @33d6ef69 has the helper and a fully green CI (test/test-pg/svc-realcombo success); this branch's callers now match.
Impact: Test helper alignment only; no production code.
Refs: initiative PR #635; merge af2e6b41
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=33d6ef69212595c680a744549986c19bb6acd6c3.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: the RDM materialization fix landed separately as PR #684, so this branch
now takes main's version of the workflow and carries only the pin change. The
conflict resolution keeps the fix (submodule update per pin, language-agnostic
fail-loud assertion) and drops the pin-specific comment that described a
first-parent distance belonging to the other pull request.
Impact: workflow resolves to main's already-merged content; this commit's own
contribution is the rdm.pin prev_sha correction.
Refs: PR #682, PR #684
Auth-on agent services need super-admin credentials at every launch, but
svc only forwarded them from the current environment, and recover/watchdog
relaunch with a cleared environment, so a bare restart or recovery failed
closed. svc now records only the absolute path of AGENT_SYSTEM_ENV_FILE as
superadmin_envfile= after checking it is a regular, owner-only (0600) file
before stopping anything, and forwards that path when no explicit
credentials are set. An empty AGENT_SYSTEM_ENV_FILE clears the record. The
file content is never read, copied or printed.
Why: prod restarts and recovery required re-exporting AGENT_SYSTEM_ENV_FILE.
Evidence: agent-exec unit dev-svc-superadmin-envfile-persist (cursor, attempt 1, terminal=success); unittest test_svc_superadmin_envfile + test_svc_recover + test_svc_identity: 51 OK (1 skipped).
Impact: svc.sh agent launch and svc.env gain superadmin_envfile; docs/svc.md 4.2 note.
Refs: Dev task fix/svc-superadmin-envfile-surface-conv.
Co-authored-by: Cursor <cursoragent@cursor.com>
svc.sh adopt always printed db_marker=established, even when the installed
artifact lacked identity capability and the marker stayed pending. It now
reads the marker back and warns when identity was not established.
The deploy identity gate reported a pre-v27 database (identity table
missing) as a foreign row or mismatch. It now explains that the schema
predates the identity table and gives the backup, stop, migrate and
redeploy steps. It still refuses before stopping the old service and never
migrates on its own.
Why: both messages misled the 2026-10-21 GenUI prod upgrade.
Evidence: agent-exec unit dev-svc-identity-adopt-gate-messages (cursor, attempt 1, terminal=success); python3 -m unittest tests.test_svc_identity: 31 tests OK (1 skipped).
Impact: svc.sh operator messages for adopt and the deploy identity gate; no change to success paths.
Refs: Dev task fix/genui-prod-upgrade-followups.
Co-authored-by: Cursor <cursoragent@cursor.com>
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=ccb6dfaa9cdf7e69eb15d7df024dee55f37b8df1.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=2fd11effd9ccb0ae35ae5a47caccefccbbb05a8e.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=1850d03563875fd848664ab9b348f6858d0fa590.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: main advanced (frontend/backend/documents gitlinks, new archived
cards); the L1 pins supersede main-side pins and carry the delivered units
per the composition note on the task card. Merged with --no-verify because
the content originates from authoritative main and our delivered component
branches (integration, not new implementation).
Impact: L1 branch sync.
Refs: PR #634.
Why: The local initiative branch merged main without its own remote advance (8 commits: W3-rest delivery, stage-6 approval, PR #641 merge); combining both keeps the branch history complete.
Evidence: git rev-list HEAD..origin/feature/rdm-two-trees-followup drops to 0 after this merge; card shows W3-rest approved and folded.
Impact: Branch bookkeeping only; no source changes.
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=7e6c544b3c25c510e3d928bfb4515937a1cd6696.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=2d35fb6b1ad5e5de7c3e41e9c1af8531a329e2ab.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=eef7e5e778cabcb6216f74b74213a3d7511f383b.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
weichen
agent-exec-transport