Branch and PR integration map — 2026-07-26

[servathadi]

Purpose

Canonical coordination map for the current Mupot integration queue. This issue records branch ownership, PR dependencies, exact heads, merge gates, and cleanup decisions. It does not authorize a merge, deployment, credential use, or spend.

Snapshot source: GitHub + local git fetch --all --prune on 2026-07-26.

Ground truth

• origin/main: cc3d1d7879d690fbf81faeeb23f75508ff69112f
• Main CI and CodeQL: green at that exact head.
• Open PRs: 32 total; 5 clean, 9 dirty/conflicted, 18 unstable.
• Local /Users/hadi/Documents/mupot: main is 4 commits ahead and 380 commits behind origin/main, with uncommitted files. Do not pull, reset, or rebase this checkout until its work is preserved on a recovery branch/worktree.

Active integration lanes

Lane	Branch	PR	Exact head	State	Gate / next action
Production identity and drift	fix/443-commit-visibility-and-drift	#571	485df9b7e9d806e559314d6a69634a9a3455cbcd	Ready/CLEAN but review BLOCKED	Close false-clean paths: sanitize RELEASE_SHA, prevent dirty production identity, validate health tenant/ok, fix restore path and manual ref reporting. Re-gate exact new head.
DME GCP/GEO evidence	docs/dme-geo-gcp-foundation	#572	1a0ae225bb406a65f7a854386ef4f29a051cb20b	Ready/CLEAN but transitively blocked	Contains #571 commit. Rebase/split after #571 is corrected; docs must not bypass the deployment gate.
Hermes DME runtime prep	kasra/hermes-gke-dme	#569	e315b334e53a5e7fccea9e86b1ba30ab14877db3	Ready/CLEAN, prep only	Decide Cloud Run vs GKE and resolve overlap with deploy/kubernetes/agent-host/ before integration. No infrastructure was provisioned.
Viamar GEO project cell	feat/574-viamar-project-cell	#575	2c82a403c18b2f817604b60a0aa32278f49014cc	Draft/CLEAN	Keep draft. Resolve project UUID, immutable image digest, scoped identity, trusted egress, and separately authorize first live scan/spend.
Agent connection guided flow	feat/agent-connection-guided-flow	#538	9ede067cbd...	Draft/DIRTY	Rebase onto current main; verify which parts are already provided by merged #537 before continuing.
Agent connection owner wizard	feat/agent-connection-owner-wizard	#539	77f39df79e...	Draft/UNSTABLE	Stacked on #538. Do not review independently until #538 is rebased and green.
Routines remediation	cursor/task9-routines-cancellation-fence	#398	c8b147fcda...	CLEAN against non-main base	Decide whether to rebase/cherry-pick onto current main or close as superseded. It is not currently a main integration candidate.

Dependency map

main cc3d1d7
├── #571 production identity/drift (BLOCKED)
│   └── #572 DME GCP/GEO docs (contains #571; blocked until corrected)
├── #569 Hermes DME runtime prep (architecture decision required)
├── #575 Viamar GEO cell (draft; live gates unresolved)
└── merged #537 agent connection foundation
    └── #538 guided flow (dirty)
        └── #539 owner wizard (unstable)

Stale Cursor queue

PRs #472, #474, #476-#480, #482, #484, #493-#495, #498-#499, #508-#516, and #522-#523 are currently dirty or unstable against modern main. They must not be bulk-merged. For each: classify as superseded, extract one still-needed commit, or rebuild from current main; then close the rest.

Integration order

1. Preserve the divergent local checkout in a recovery branch/worktree.
2. Fix and exact-head re-gate fix(ops): stamp RELEASE_SHA on every deploy + detect prod drift (#443) #571.
3. Rebase/split docs(dme): GCP foundation + verified GEO capability #572 after fix(ops): stamp RELEASE_SHA on every deploy + detect prod drift (#443) #571's result.
4. Decide the runtime architecture for prep: Hermes for DME pot on GKE Autopilot (artifacts only, not provisioned) #569.
5. Rebase and narrow Agent connection verification and owner polling #538, then feat: add owner agent connection wizard #539.
6. Keep feat: add Viamar GEO scanner project cell #575 draft until its explicit live gates and owner authorization are satisfied.
7. Triage and close the stale Cursor queue.
8. Re-evaluate fix(routines): v0.25 Task 9–12 remediation package #398 against current project-routines behavior.

SOS coordination

Read-only request sent with correlation ID mupot-branch-pr-map-20260726 to SOS peers codex and hadi-codex-cli, requesting active branches, PRs, exact heads, blockers, and integration order. Structured ask was cross-tenant rejected; direct durable SOS delivery succeeded. Append the correlated peer report here when received.

[servathadi]

SOS Codex reconciliation receipt — 2026-07-26T22:31Z

Correlation: mupot-branch-pr-map-20260726

agent:codex independently confirmed the GitHub snapshot:

• origin/main: cc3d1d7879d690fbf81faeeb23f75508ff69112f
• 32 open PRs: 5 CLEAN, 9 DIRTY, 18 UNSTABLE; 3 drafts; 23 have failing checks.
• Primary checkout: 53369811cf1163634089bca8b193c92059ffb5d9, 4 ahead / 380 behind, 26 dirty entries. Not an integration base.
• Additional dirty worktrees: addon-framework-design (1 entry), inkwell-theme-adapter (4), cursor/task9-routines-cancellation-fence (1). Preserve before cleanup; do not reset.

Additional unmapped branch

• docs/google-agent-cell-microkernel
• Head: d16174a2ae54645d685436498b42a4f9fb37c5ee
• State: clean, two commits ahead of main, no PR.
• Intent: generic external agent-cell rail should precede Google/DME packages; feat: add Viamar GEO scanner project cell #575 remains vertical-slice evidence rather than the kernel contract.
• Next action: inspect exact diff and open a narrow documentation PR only if it does not duplicate current main or feat: add Viamar GEO scanner project cell #575.

Confirmed gates

• fix(ops): stamp RELEASE_SHA on every deploy + detect prod drift (#443) #571 remains exact-head BLOCKED despite green CI.
• docs(dme): GCP foundation + verified GEO capability #572 contains fix(ops): stamp RELEASE_SHA on every deploy + detect prod drift (#443) #571 as its first commit and must be split/refreshed after fix(ops): stamp RELEASE_SHA on every deploy + detect prod drift (#443) #571.
• prep: Hermes for DME pot on GKE Autopilot (artifacts only, not provisioned) #569 is artifact-only and still requires the Cloud Run vs GKE decision.
• feat: add Viamar GEO scanner project cell #575 remains draft and live-blocked on identity, digest, egress and explicit spend authority.
• Agent connection verification and owner polling #538 must precede feat: add owner agent connection wizard #539 after a current-main rebase.
• fix(routines): v0.25 Task 9–12 remediation package #398 is green only on codex/project-routines-v025@873df192219500934fcfe0d91bfdcaed65329d66, which is 25 ahead / 85 behind main and has no base-to-main PR.
• feat: secret-env taker — CF-custody env grants in mupot #515 fails both build and no-secrets; it must remain quarantined.

Agreed integration order

1. Create a clean worktree at exact remote main; preserve all dirty trees.
2. Correct and exact-head re-gate fix(ops): stamp RELEASE_SHA on every deploy + detect prod drift (#443) #571.
3. Refresh docs(dme): GCP foundation + verified GEO capability #572 to become docs-only after fix(ops): stamp RELEASE_SHA on every deploy + detect prod drift (#443) #571.
4. Decide and review prep: Hermes for DME pot on GKE Autopilot (artifacts only, not provisioned) #569 without provisioning.
5. Rebase/update feat: add Viamar GEO scanner project cell #575, complete product/security/operator review, then consider readiness.
6. Rebase/fix Agent connection verification and owner polling #538, merge it, then rebase/fix feat: add owner agent connection wizard #539.
7. Refresh the routines base, integrate fix(routines): v0.25 Task 9–12 remediation package #398 into one consolidated base-to-main PR.
8. Quarantine the remaining Cursor/BYOA/project-link queue; close superseded/probe slices and rebuild only still-needed work from current main.

No branch, PR, deployment, or credential was modified by the SOS audit.

[servathadi]

Work dispatch — 2026-07-26

Three bounded SOS assignments were sent. No merge, deployment, credential use, or spending authority was delegated.

Owner	Role	Request ID	SOS receipt	Deliverable
agent:kasra	#571 implementer	mupot-571-implementation-20260726	1785106770134-0	New #571 exact head closing all five false-clean paths, adversarial tests, receipts, residual risks, proof URL.
agent:codex	Independent exact-head reviewer	mupot-571-independent-gate-20260726	1785106778200-0	Independent PASS/BLOCK on Kasra's new exact SHA, with reproduced adversarial cases and CI/no-secrets evidence.
agent:kayhermes	Post-integration runtime verifier	mupot-postintegration-runtime-verification-20260726	1785106784292-0	Read-only checklist for correlated inbox round-trip, task/flight visibility, MCP control, recovery and production tenant+commit health identity.

Sequence is enforced: Kasra implements → Codex gates exact head → integration decision → KayHermes runtime verification. Hadi retains approval for production credentials, deployment and paid/live activation.

[servathadi]

PR #571 independent re-gate — BLOCK

Exact head: 25fb1b6ac1453a63c62231424395c32b5179b80d

Independent read-only review: full exact-head evidence on PR #571.

Two P1s remain:

1. publicHealth() exposes dirty/off-main stamps as commit:<sha>, clean:false, but checkPot() ignores clean and returns status:"current" when the commit matches. Reproduced directly with the exported decision function. A dirty main-based bundle therefore makes the scheduled report print ✓ current and exit clean.
2. Restore now uses the stamped wrapper, but first-party production paths still tell operators to run bare deploys: docs/production-runbook.md:74, docs/SELF-HOST.md:39,43,47,82, scripts/setup.sh:355,361, and scripts/README.md:132,134,141. Those can still yield commit:null or retain a stale stamp.

Repair matrix: duplicate RELEASE_SHA injection PASS; dirty/off-main PARTIAL/BLOCK; wrong-tenant/unhealthy PASS; requested restore path PASS; workflow_dispatch ref honesty PASS.

Fresh exact-head evidence: focused 5 files/67 tests PASS; full 262 files/4,342 tests PASS; TypeScript PASS; no-secrets PASS; Wrangler dry-run PASS; high-severity audit threshold PASS; diff-check PASS; CI run 30225056224 terminal SUCCESS at the exact SHA. No merge/deploy/mutation.

Re-gate on a new head after checkPot requires clean === true for current and every first-party real-deploy path uses the wrapper.