Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

docs: name the in-flight merge window a reclaimed merge lease leaves (#10803)

Adam Eivy4e53fff9c8ac
diff --git a/docs/features/chief-of-staff.md b/docs/features/chief-of-staff.md
index fcd2a3b9a7..a4fff0db94 100644
--- a/docs/features/chief-of-staff.md
+++ b/docs/features/chief-of-staff.md
@@ -66,7 +66,10 @@ An agent lease is recoverable from a matching finalized parent record
its owner is still running. An expired holder's `check` is refused with
`lease-expired`, and because every merge is pinned to the CI-verified head, a
reclaimed holder cannot land an unverified head — the worst case is one
-redundant resync. Completed children and absent cwd processes never release a
+redundant resync. The lease is not a forge-side fence: a holder whose merge
+request was already in flight when its deadline passed can still complete it
+while the next holder merges. Both merges are pinned and forge-checked, so this
+is the same semantic-conflict exposure as two consecutive `CLEAN` merges. Completed children and absent cwd processes never release a
lease early. A crashed deterministic sweep is recoverable only after its server
process is proven absent. Failed reads and ambiguous/reused process identities
hold admission conservatively.
diff --git a/server/services/cosMergeAdmission.js b/server/services/cosMergeAdmission.js
index 588f82d631..11af88c4b6 100644
--- a/server/services/cosMergeAdmission.js
+++ b/server/services/cosMergeAdmission.js
@@ -13,6 +13,8 @@ const retryAfterMs = 5000;
// reclaimable even from a running owner: that holder's pinned merge
// (--match-head-commit) cannot land an unverified head, so the worst case is
// one redundant resync rather than a repository blocked behind a hung parent.
+// This is not a forge-side fence: a merge request already in flight at the
+// deadline may still land, with the same exposure as two CLEAN merges.
export const AGENT_LEASE_MAX_HOLD_MS = 5 * 60 * 1000;
export const MERGE_ADMISSION_OUTCOMES = ['merged', 'leave-open', 'resync'];
const serverOwner = randomUUID();