@coralai/sps-cli 0.23.12 → 0.23.13

package/README.md

@@ -4,7 +4,7 @@
 
 > **中文文档**: See `README-CN.md` in the source repository for Chinese documentation.
 
-**v0.23.12**
+**v0.23.13**
 
 SPS (Smart Pipeline System) is a fully automated development pipeline CLI tool driven by AI Agents. From task card creation to code merging, the entire process runs unattended.
 
@@ -121,9 +121,9 @@ Planning -> Backlog -> Todo -> Inprogress -> Done
 | Todo -> Inprogress | ExecutionEngine | Assign Worker slot, build task context, launch AI Worker |
 | Inprogress -> Done | PostActions + MergeMutex | Detect Worker completion, serialize merge to target branch, release resources, clean up worktree |
 
-The Worker no longer executes `.sps/merge.sh` as the normal path. In `MR_MODE=none`, the Worker commits and pushes the feature branch, then SPS closeout performs a serialized merge. Final integration now runs inside a temporary detached merge worktree, which avoids `main already used by worktree` failures and keeps the user's main checkout untouched. `.sps/merge.sh` remains only as a manual fallback. See `docs/design/10-acp-worker-runtime-design.md` for the persistent Agent transport model, the full worker state breakdown, and the local same-user OAuth reuse boundary. See `docs/design/11-runtime-state-authority-and-recovery-redesign.md` for the follow-up redesign that demotes `state.json` / `acp-state.json` to projections and re-centers recovery around PM state plus worktree/git evidence.
+The Worker no longer executes `.sps/merge.sh` as the normal path. In `MR_MODE=none`, the Worker commits and pushes the feature branch, then SPS closeout performs a serialized merge. Final integration now runs inside a temporary detached merge worktree, which avoids `main already used by worktree` failures and keeps the user's main checkout untouched. `.sps/merge.sh` remains only as a manual fallback. See `docs/design/10-acp-worker-runtime-design.md` for the persistent Agent transport model, the full worker state breakdown, and the local same-user OAuth reuse boundary. See `docs/design/11-runtime-state-authority-and-recovery-redesign.md` for the redesign that demotes `state.json` / `acp-state.json` to projections and re-centers recovery around PM state plus worktree/git evidence. See `docs/design/12-unified-runtime-state-machine.md` for the next-step module cleanup plan that converges `Execution`, `Recovery`, `Monitor`, `Closeout`, and `PostActions` into one state machine authority plus a single runtime coordinator/write path.
 
-PTY transport now extends the same session/run model into the default CLI-backed worker path. When `WORKER_TRANSPORT=pty` or `WORKER_TRANSPORT=acp`, `sps tick` launches work through `sessionId/runId`, persists that state into `runtime/state.json` plus `runtime/acp-state.json`, and lets recovery/status/dashboard inspect the live session/run state. `PostActions` retry/conflict flows and `CloseoutEngine` autofix/conflict flows now resume the same session when possible and automatically rebuild a fresh persistent session when the original one is gone before a retry or merge-conflict follow-up run. v0.23.5 upgrades `node-pty` to a macOS-safe build, auto-restores missing execute permissions on `spawn-helper`, and auto-skips the benign Codex update notice during PTY boot so `ensureSession()` can reach `ready` on fresh launches instead of failing with `posix_spawnp failed`. v0.23.6 further fixes PTY run lifecycle tracking so newly submitted conflict-resolution runs no longer get marked `completed` during the first inspect cycle before the CLI actually leaves the prompt. v0.23.7 hardens `sps worker dashboard` itself by switching PTY/TUI panels from raw pane dumps to structured worker summaries, preventing Codex/Claude full-screen redraw artifacts from corrupting the dashboard layout while also counting PTY-backed active sessions correctly in the summary bar. v0.23.9 now validates persisted PTY sessions by PID before treating them as alive, which keeps `sps status`, `sps worker dashboard`, and `sps card dashboard` from showing dead workers as active after `sps tick` has already stopped. v0.23.10 closes the remaining state-drift loop without taking ordering authority away from Plane/Trello/Markdown: the PM backend remains the first principle for task order and human drag/drop edits, while SPS only reasserts `Todo` / `Inprogress` for cards still locally owned by a non-idle runtime slot. `MonitorEngine` now includes runtime-owned in-progress cards even when PM has drifted, and `sps card dashboard` fetches all cards in a single backend round-trip while sharing the same `active/merging/stale` worker buckets as `sps status` and `sps worker dashboard`, reducing self-inflicted Plane `429` spikes. v0.23.11 begins landing the state-authority redesign itself: `RuntimeCoordinator` can now build a PM + worktree + session-first runtime projection without persisting it, tick startup persists that projection before recovery, and all read-only views now consume a shared snapshot path instead of mutating `state.json` / `acp-state.json` during display refreshes. v0.23.12 then moves the execution path onto the same model: `Recovery` now restores tasks from `TaskLease + WorktreeEvidence` instead of old slot snapshots, and `ExecutionEngine` / `PostActions` / `MonitorEngine` now treat `lease.phase` and `lease.retryCount` as the authoritative runtime metadata while `activeCards` remains a derived projection for compatibility. The state file writers now also use unique temporary filenames so overlapping writes do not collide on a shared `.tmp` path. Codex has been verified on launch, recovery, direct merge, same-session resume, PTY conflict fallback, spawn-helper self-heal, immediate post-launch run-state inspection, summary-style dashboard rendering, cold-state liveness validation, runtime-owned PM reconciliation, read-only snapshot rendering, and lease-first recovery/execution flow; Claude still depends on host-side `claude auth login` before reaching `ready`.
+PTY transport now extends the same session/run model into the default CLI-backed worker path. When `WORKER_TRANSPORT=pty` or `WORKER_TRANSPORT=acp`, `sps tick` launches work through `sessionId/runId`, persists that state into `runtime/state.json` plus `runtime/acp-state.json`, and lets recovery/status/dashboard inspect the live session/run state. `PostActions` retry/conflict flows and `CloseoutEngine` autofix/conflict flows now resume the same session when possible and automatically rebuild a fresh persistent session when the original one is gone before a retry or merge-conflict follow-up run. v0.23.5 upgrades `node-pty` to a macOS-safe build, auto-restores missing execute permissions on `spawn-helper`, and auto-skips the benign Codex update notice during PTY boot so `ensureSession()` can reach `ready` on fresh launches instead of failing with `posix_spawnp failed`. v0.23.6 further fixes PTY run lifecycle tracking so newly submitted conflict-resolution runs no longer get marked `completed` during the first inspect cycle before the CLI actually leaves the prompt. v0.23.7 hardens `sps worker dashboard` itself by switching PTY/TUI panels from raw pane dumps to structured worker summaries, preventing Codex/Claude full-screen redraw artifacts from corrupting the dashboard layout while also counting PTY-backed active sessions correctly in the summary bar. v0.23.9 now validates persisted PTY sessions by PID before treating them as alive, which keeps `sps status`, `sps worker dashboard`, and `sps card dashboard` from showing dead workers as active after `sps tick` has already stopped. v0.23.10 closes the remaining state-drift loop without taking ordering authority away from Plane/Trello/Markdown: the PM backend remains the first principle for task order and human drag/drop edits, while SPS only reasserts `Todo` / `Inprogress` for cards still locally owned by a non-idle runtime slot. `MonitorEngine` now includes runtime-owned in-progress cards even when PM has drifted, and `sps card dashboard` fetches all cards in a single backend round-trip while sharing the same `active/merging/stale` worker buckets as `sps status` and `sps worker dashboard`, reducing self-inflicted Plane `429` spikes. v0.23.11 begins landing the state-authority redesign itself: `RuntimeCoordinator` can now build a PM + worktree + session-first runtime projection without persisting it, tick startup persists that projection before recovery, and all read-only views now consume a shared snapshot path instead of mutating `state.json` / `acp-state.json` during display refreshes. v0.23.12 then moves the execution path onto the same model: `Recovery` now restores tasks from `TaskLease + WorktreeEvidence` instead of old slot snapshots, and `ExecutionEngine` / `PostActions` / `MonitorEngine` now treat `lease.phase` and `lease.retryCount` as the authoritative runtime metadata while `activeCards` remains a derived projection for compatibility. v0.23.13 extends that cleanup into the remaining control loops: `MonitorEngine` now walks live leases instead of active slots for health, timeout, stale, waiting, and alignment checks; `CloseoutEngine` now releases completed tasks through `RuntimeStore.releaseTaskProjection()`; and `RuntimeStore` becomes the shared mutation surface for monitor/closeout cleanup instead of direct `state.json` rewrites. The state file writers now also use unique temporary filenames so overlapping writes do not collide on a shared `.tmp` path. Codex has been verified on launch, recovery, direct merge, same-session resume, PTY conflict fallback, spawn-helper self-heal, immediate post-launch run-state inspection, summary-style dashboard rendering, cold-state liveness validation, runtime-owned PM reconciliation, read-only snapshot rendering, and lease-first recovery/execution/monitor/closeout flow; Claude still depends on host-side `claude auth login` before reaching `ready`.
 
 ### MR_MODE=create (Optional)
 

package/dist/core/runtimeStore.d.ts

@@ -0,0 +1,44 @@
+import type { ProjectContext } from './context.js';
+import { type ActiveCardState, type RuntimeState, type TaskLease, type WorkerSlotState, type WorktreeEvidence } from './state.js';
+import type { ACPState, ACPSessionRecord } from '../models/acp.js';
+export interface TaskRuntimeView {
+    seq: string;
+    lease: TaskLease | null;
+    evidence: WorktreeEvidence | null;
+    activeCard: ActiveCardState | null;
+    slotName: string | null;
+    slot: WorkerSlotState | null;
+    session: ACPSessionRecord | null;
+}
+type RuntimePaths = Pick<ProjectContext, 'paths' | 'maxWorkers'>;
+export declare class RuntimeStore {
+    private readonly ctx;
+    constructor(ctx: RuntimePaths);
+    readState(): RuntimeState;
+    readACPState(): ACPState;
+    read(): {
+        state: RuntimeState;
+        acpState: ACPState;
+    };
+    updateState(updatedBy: string, mutator: (state: RuntimeState) => void): RuntimeState;
+    updateACPState(updatedBy: string, mutator: (acpState: ACPState) => void): ACPState;
+    updateRuntime(updatedBy: string, mutator: (state: RuntimeState, acpState: ACPState) => void): {
+        state: RuntimeState;
+        acpState: ACPState;
+    };
+    getTask(seq: string, state?: RuntimeState, acpState?: ACPState): TaskRuntimeView;
+    findSlotForTask(seq: string, state: RuntimeState): string | null;
+    findAvailableSlot(state: RuntimeState, options?: {
+        preferred?: string | null;
+        exclude?: Set<string>;
+    }): string | null;
+    clearWorkerSlot(state: RuntimeState, slotName: string): void;
+    releaseTaskProjection(state: RuntimeState, seq: string, options?: {
+        dropLease?: boolean;
+        phase?: TaskLease['phase'];
+        keepWorktree?: boolean;
+        pmStateObserved?: TaskLease['pmStateObserved'];
+    }): void;
+}
+export {};
+//# sourceMappingURL=runtimeStore.d.ts.map

package/dist/core/runtimeStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtimeStore.d.ts","sourceRoot":"","sources":["../../src/core/runtimeStore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEnE,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IACnC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC;CAClC;AAED,KAAK,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,YAAY,CAAC,CAAC;AAEjE,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,YAAY;IAE9C,SAAS,IAAI,YAAY;IAIzB,YAAY,IAAI,QAAQ;IAIxB,IAAI,IAAI;QAAE,KAAK,EAAE,YAAY,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAOnD,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,YAAY;IAOpF,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,GAAG,QAAQ;IAOlF,aAAa,CACX,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,KAAK,IAAI,GACzD;QAAE,KAAK,EAAE,YAAY,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAS9C,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,eAAe;IAuBhF,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI;IAShE,iBAAiB,CACf,KAAK,EAAE,YAAY,EACnB,OAAO,GAAE;QAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KAAO,GACjE,MAAM,GAAG,IAAI;IAgBhB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI5D,qBAAqB,CACnB,KAAK,EAAE,YAAY,EACnB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;QACP,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,KAAK,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,eAAe,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;KAC3C,GACL,IAAI;CA2BR"}

package/dist/core/runtimeStore.js

@@ -0,0 +1,104 @@
+import { readACPState, writeACPState } from './acpState.js';
+import { createIdleWorkerSlot, readState, writeState, } from './state.js';
+export class RuntimeStore {
+    ctx;
+    constructor(ctx) {
+        this.ctx = ctx;
+    }
+    readState() {
+        return readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
+    }
+    readACPState() {
+        return readACPState(this.ctx.paths.acpStateFile);
+    }
+    read() {
+        return {
+            state: this.readState(),
+            acpState: this.readACPState(),
+        };
+    }
+    updateState(updatedBy, mutator) {
+        const state = this.readState();
+        mutator(state);
+        writeState(this.ctx.paths.stateFile, state, updatedBy);
+        return state;
+    }
+    updateACPState(updatedBy, mutator) {
+        const acpState = this.readACPState();
+        mutator(acpState);
+        writeACPState(this.ctx.paths.acpStateFile, acpState, updatedBy);
+        return acpState;
+    }
+    updateRuntime(updatedBy, mutator) {
+        const state = this.readState();
+        const acpState = this.readACPState();
+        mutator(state, acpState);
+        writeState(this.ctx.paths.stateFile, state, updatedBy);
+        writeACPState(this.ctx.paths.acpStateFile, acpState, updatedBy);
+        return { state, acpState };
+    }
+    getTask(seq, state, acpState) {
+        const runtimeState = state ?? this.readState();
+        const runtimeACP = acpState ?? this.readACPState();
+        const key = String(seq);
+        const lease = runtimeState.leases[key] || null;
+        const slotName = lease?.slot ||
+            Object.entries(runtimeState.workers).find(([, worker]) => worker.seq === parseInt(key, 10))?.[0] ||
+            null;
+        const slot = slotName ? runtimeState.workers[slotName] || null : null;
+        const session = slotName ? runtimeACP.sessions[slotName] || null : null;
+        return {
+            seq: key,
+            lease,
+            evidence: runtimeState.worktreeEvidence[key] || null,
+            activeCard: runtimeState.activeCards[key] || null,
+            slotName,
+            slot,
+            session,
+        };
+    }
+    findSlotForTask(seq, state) {
+        const key = String(seq);
+        return (state.leases[key]?.slot ||
+            Object.entries(state.workers).find(([, worker]) => worker.seq === parseInt(key, 10))?.[0] ||
+            null);
+    }
+    findAvailableSlot(state, options = {}) {
+        const exclude = options.exclude ?? new Set();
+        if (options.preferred) {
+            const preferred = state.workers[options.preferred];
+            if (preferred && preferred.status === 'idle' && !exclude.has(options.preferred)) {
+                return options.preferred;
+            }
+        }
+        return (Object.entries(state.workers).find(([slotName, worker]) => worker.status === 'idle' && !exclude.has(slotName))?.[0] || null);
+    }
+    clearWorkerSlot(state, slotName) {
+        state.workers[slotName] = createIdleWorkerSlot();
+    }
+    releaseTaskProjection(state, seq, options = {}) {
+        const slotName = this.findSlotForTask(seq, state);
+        if (slotName) {
+            this.clearWorkerSlot(state, slotName);
+        }
+        delete state.activeCards[seq];
+        if (options.dropLease) {
+            delete state.leases[seq];
+            return;
+        }
+        const lease = state.leases[seq];
+        if (!lease)
+            return;
+        lease.slot = null;
+        lease.sessionId = null;
+        lease.runId = null;
+        lease.phase = options.phase ?? 'suspended';
+        lease.pmStateObserved = options.pmStateObserved ?? lease.pmStateObserved;
+        if (!options.keepWorktree) {
+            lease.worktree = null;
+            lease.branch = null;
+        }
+        lease.lastTransitionAt = new Date().toISOString();
+    }
+}
+//# sourceMappingURL=runtimeStore.js.map

package/dist/core/runtimeStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtimeStore.js","sourceRoot":"","sources":["../../src/core/runtimeStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EACL,oBAAoB,EACpB,SAAS,EACT,UAAU,GAMX,MAAM,YAAY,CAAC;AAepB,MAAM,OAAO,YAAY;IACM;IAA7B,YAA6B,GAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;IAAG,CAAC;IAElD,SAAS;QACP,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAClE,CAAC;IAED,YAAY;QACV,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACnD,CAAC;IAED,IAAI;QACF,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE;YACvB,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE;SAC9B,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,SAAiB,EAAE,OAAsC;QACnE,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,CAAC;QACf,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,cAAc,CAAC,SAAiB,EAAE,OAAqC;QACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACrC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,aAAa,CACX,SAAiB,EACjB,OAA0D;QAE1D,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACrC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACzB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QAChE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,CAAC,GAAW,EAAE,KAAoB,EAAE,QAAmB;QAC5D,MAAM,YAAY,GAAG,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/C,MAAM,UAAU,GAAG,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACnD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACxB,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;QAC/C,MAAM,QAAQ,GACZ,KAAK,EAAE,IAAI;YACX,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAChG,IAAI,CAAC;QACP,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAExE,OAAO;YACL,GAAG,EAAE,GAAG;YACR,KAAK;YACL,QAAQ,EAAE,YAAY,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,IAAI;YACpD,UAAU,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,IAAI;YACjD,QAAQ;YACR,IAAI;YACJ,OAAO;SACR,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,GAAW,EAAE,KAAmB;QAC9C,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACxB,OAAO,CACL,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI;YACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACzF,IAAI,CACL,CAAC;IACJ,CAAC;IAED,iBAAiB,CACf,KAAmB,EACnB,UAAgE,EAAE;QAElE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,GAAG,EAAU,CAAC;QACrD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACnD,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAChF,OAAO,OAAO,CAAC,SAAS,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,OAAO,CACL,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAChC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAC3E,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CACf,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,KAAmB,EAAE,QAAgB;QACnD,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,oBAAoB,EAAE,CAAC;IACnD,CAAC;IAED,qBAAqB,CACnB,KAAmB,EACnB,GAAW,EACX,UAKI,EAAE;QAEN,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;QAED,OAAO,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAE9B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;QACvB,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;QACnB,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,WAAW,CAAC;QAC3C,KAAK,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,CAAC;QACzE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1B,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YACtB,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;QACtB,CAAC;QACD,KAAK,CAAC,gBAAgB,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACpD,CAAC;CACF"}

package/dist/engines/CloseoutEngine.d.ts

@@ -27,6 +27,7 @@ export declare class CloseoutEngine {
     private notifier?;
     private agentRuntime;
     private log;
+    private runtimeStore;
     constructor(ctx: ProjectContext, taskBackend: TaskBackend, repoBackend: RepoBackend, workerProvider: WorkerProvider, notifier?: Notifier | undefined, agentRuntime?: AgentRuntime | null);
     tick(): Promise<CommandResult>;
     private processQaCard;

package/dist/engines/CloseoutEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloseoutEngine.d.ts","sourceRoot":"","sources":["../../src/engines/CloseoutEngine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,oBAAoB,CAAC;AAK/F;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAc;IAIvB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,YAAY;IARtB,OAAO,CAAC,GAAG,CAAS;gBAGV,GAAG,EAAE,cAAc,EACnB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,QAAQ,YAAA,EACnB,YAAY,GAAE,YAAY,GAAG,IAAW;IAK5C,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC;YAoEtB,aAAa;YAwEb,aAAa;YAqHb,eAAe;YA8Hf,YAAY;IAyC1B;;;;;;;;;;OAUG;YACW,cAAc;IAuI5B;;;;;OAKG;YACW,eAAe;IAoI7B;;;;;OAKG;YACW,gBAAgB;IA4C9B,OAAO,CAAC,eAAe;YAST,YAAY;YAMZ,YAAY;YASZ,WAAW;YASX,UAAU;YAYV,eAAe;IA+C7B,OAAO,CAAC,QAAQ;CAcjB"}
+{"version":3,"file":"CloseoutEngine.d.ts","sourceRoot":"","sources":["../../src/engines/CloseoutEngine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,oBAAoB,CAAC;AAK/F;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAc;IAKvB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,YAAY;IATtB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,YAAY,CAAe;gBAGzB,GAAG,EAAE,cAAc,EACnB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,QAAQ,YAAA,EACnB,YAAY,GAAE,YAAY,GAAG,IAAW;IAM5C,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC;YAoEtB,aAAa;YAwEb,aAAa;YAqHb,eAAe;YAkIf,YAAY;IAyC1B;;;;;;;;;;OAUG;YACW,cAAc;IAsH5B;;;;;OAKG;YACW,eAAe;IA0I7B;;;;;OAKG;YACW,gBAAgB;IA4C9B,OAAO,CAAC,eAAe;YAST,YAAY;YAMZ,YAAY;YASZ,WAAW;YASX,UAAU;YAYV,eAAe;IAyD7B,OAAO,CAAC,QAAQ;CAcjB"}

package/dist/engines/CloseoutEngine.js

@@ -1,4 +1,4 @@
-import { readState, writeState } from '../core/state.js';
+import { RuntimeStore } from '../core/runtimeStore.js';
 import { resolveWorktreePath } from '../core/paths.js';
 import { Logger } from '../core/logger.js';
 /**
@@ -23,6 +23,7 @@ export class CloseoutEngine {
     notifier;
     agentRuntime;
     log;
+    runtimeStore;
     constructor(ctx, taskBackend, repoBackend, workerProvider, notifier, agentRuntime = null) {
         this.ctx = ctx;
         this.taskBackend = taskBackend;
@@ -31,6 +32,7 @@ export class CloseoutEngine {
         this.notifier = notifier;
         this.agentRuntime = agentRuntime;
         this.log = new Logger('qa', ctx.projectName, ctx.paths.logsDir);
+        this.runtimeStore = new RuntimeStore(ctx);
     }
     async tick() {
         const actions = [];
@@ -274,37 +276,41 @@ export class CloseoutEngine {
         }
         const autofixAttempts = typeof meta.autofixAttempts === 'number' ? meta.autofixAttempts : 0;
         if (autofixAttempts < maxAttempts) {
-            // Try self-repair: find the worker session for this card
-            const state = readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
-            const slotEntry = Object.entries(state.workers).find(([, w]) => w.seq === parseInt(seq, 10) && w.tmuxSession);
-            if (slotEntry) {
-                const [slotName, slotState] = slotEntry;
-                const session = slotState.tmuxSession;
-                const isPrintMode = slotState.mode === 'print';
-                const isAcpMode = slotState.transport === 'acp' ||
+            // Try self-repair: prefer lease/worktree evidence, then reuse or rebuild a worker slot.
+            const state = this.runtimeStore.readState();
+            const runtime = this.runtimeStore.getTask(seq, state);
+            const slotName = runtime.slotName ||
+                this.runtimeStore.findAvailableSlot(state);
+            const slotState = slotName ? state.workers[slotName] || null : null;
+            const session = slotState?.tmuxSession || null;
+            const worktree = runtime.lease?.worktree || runtime.evidence?.worktree || slotState?.worktree || '';
+            const isPrintMode = slotState?.mode === 'print';
+            const isAcpMode = !!slotState &&
+                (slotState.transport === 'acp' ||
                     slotState.transport === 'pty' ||
                     slotState.mode === 'acp' ||
-                    slotState.mode === 'pty';
+                    slotState.mode === 'pty');
+            if (slotName && (session || (isAcpMode && this.agentRuntime && worktree))) {
                 try {
                     const fixPrompt = `CI pipeline has failed. Please review the CI logs, fix the issues, commit, and push. This is autofix attempt ${autofixAttempts + 1} of ${maxAttempts}.`;
                     if (isAcpMode && this.agentRuntime) {
-                        await this.resumeAcpWorker(slotName, seq, slotState.worktree || '', branchName, fixPrompt, 'active', 'closeout-autofix-resume');
+                        await this.resumeAcpWorker(slotName, seq, worktree, branchName, fixPrompt, 'active', 'closeout-autofix-resume');
                     }
                     else if (isPrintMode) {
                         // Print mode: spawn new process with --resume (process already exited)
-                        const resumeResult = await this.workerProvider.sendFix(session, fixPrompt, slotState.sessionId || undefined);
+                        const resumeResult = await this.workerProvider.sendFix(session, fixPrompt, slotState?.sessionId || undefined);
                         // Update state with new process info
                         if (resumeResult && typeof resumeResult === 'object' && 'pid' in resumeResult) {
-                            const freshState = readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
-                            if (freshState.workers[slotName]) {
-                                freshState.workers[slotName].pid = resumeResult.pid;
-                                freshState.workers[slotName].outputFile = resumeResult.outputFile;
-                                if (resumeResult.sessionId) {
-                                    freshState.workers[slotName].sessionId = resumeResult.sessionId;
+                            this.runtimeStore.updateState('closeout-autofix-resume', (freshState) => {
+                                if (freshState.workers[slotName]) {
+                                    freshState.workers[slotName].pid = resumeResult.pid;
+                                    freshState.workers[slotName].outputFile = resumeResult.outputFile;
+                                    if (resumeResult.sessionId) {
+                                        freshState.workers[slotName].sessionId = resumeResult.sessionId;
+                                    }
+                                    freshState.workers[slotName].exitCode = null;
                                 }
-                                freshState.workers[slotName].exitCode = null;
-                                writeState(this.ctx.paths.stateFile, freshState, 'closeout-autofix-resume');
-                            }
+                            });
                         }
                     }
                     else {
@@ -427,36 +433,17 @@ export class CloseoutEngine {
             errors.push(`release-claim: ${msg}`);
         }
         // Step 3: Release worker slot in state.json
-        const state = readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
-        const slotEntry = Object.entries(state.workers).find(([, w]) => w.seq === parseInt(seq, 10));
+        const state = this.runtimeStore.readState();
+        const runtime = this.runtimeStore.getTask(seq, state);
+        const slotEntry = runtime.slotName && runtime.slot ? [runtime.slotName, runtime.slot] : null;
         let sessionName = null;
         if (slotEntry) {
             const [slotName, slotState] = slotEntry;
             sessionName = slotState.tmuxSession;
             try {
-                state.workers[slotName] = {
-                    status: 'idle',
-                    seq: null,
-                    branch: null,
-                    worktree: null,
-                    tmuxSession: null,
-                    claimedAt: null,
-                    lastHeartbeat: null,
-                    mode: null,
-                    transport: null,
-                    agent: null,
-                    sessionId: null,
-                    runId: null,
-                    sessionState: null,
-                    remoteStatus: null,
-                    lastEventAt: null,
-                    pid: null,
-                    outputFile: null,
-                    exitCode: null,
-                };
-                delete state.activeCards[seq];
-                delete state.leases[seq];
-                writeState(this.ctx.paths.stateFile, state, 'closeout-release');
+                this.runtimeStore.updateState('closeout-release', (draft) => {
+                    this.runtimeStore.releaseTaskProjection(draft, seq, { dropLease: true });
+                });
                 this.log.ok(`seq ${seq}: Worker slot ${slotName} released`);
             }
             catch (err) {
@@ -468,11 +455,11 @@ export class CloseoutEngine {
         else {
             // No active slot found — already released (idempotency)
             // Still clean up activeCards entry if present
-            if (state.activeCards[seq]) {
-                delete state.activeCards[seq];
-                delete state.leases[seq];
+            if (state.activeCards[seq] || state.leases[seq]) {
                 try {
-                    writeState(this.ctx.paths.stateFile, state, 'closeout-release');
+                    this.runtimeStore.updateState('closeout-release', (draft) => {
+                        this.runtimeStore.releaseTaskProjection(draft, seq, { dropLease: true });
+                    });
                 }
                 catch {
                     // non-fatal
@@ -494,15 +481,18 @@ export class CloseoutEngine {
         }
         // Step 5: Mark worktree for cleanup (actual removal runs at end of tick)
         try {
-            const freshState = readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
+            const freshState = this.runtimeStore.readState();
             const branchName = this.buildBranchName(card);
-            const worktreePath = resolveWorktreePath(this.ctx.projectName, seq, this.ctx.config.WORKTREE_DIR);
+            const worktreePath = runtime.lease?.worktree ||
+                runtime.evidence?.worktree ||
+                resolveWorktreePath(this.ctx.projectName, seq, this.ctx.config.WORKTREE_DIR);
             const cleanup = freshState.worktreeCleanup ?? [];
             const alreadyMarked = cleanup.some((e) => e.branch === branchName);
             if (!alreadyMarked) {
                 cleanup.push({ branch: branchName, worktreePath, markedAt: new Date().toISOString() });
-                freshState.worktreeCleanup = cleanup;
-                writeState(this.ctx.paths.stateFile, freshState, 'closeout-worktree-mark');
+                this.runtimeStore.updateState('closeout-worktree-mark', (draft) => {
+                    draft.worktreeCleanup = cleanup;
+                });
             }
             this.log.ok(`seq ${seq}: Worktree marked for cleanup`);
         }
@@ -540,11 +530,11 @@ export class CloseoutEngine {
     async resolveConflict(card, actions) {
         const seq = card.seq;
         const branchName = this.buildBranchName(card);
-        const state = readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
+        const state = this.runtimeStore.readState();
+        const runtime = this.runtimeStore.getTask(seq, state);
         const baseBranch = this.ctx.mergeBranch;
         // Find worktree for this card
-        const slotEntry = Object.entries(state.workers).find(([, w]) => w.seq === parseInt(seq, 10));
-        const worktree = slotEntry?.[1]?.worktree;
+        const worktree = runtime.lease?.worktree || runtime.evidence?.worktree || runtime.slot?.worktree;
         if (!worktree) {
             this.log.warn(`seq ${seq}: No worktree found for conflict resolution`);
             return false;
@@ -576,19 +566,17 @@ export class CloseoutEngine {
             this.log.warn(`seq ${seq}: L1 rebase threw: ${msg}`);
         }
         // ── L2: Send to original worker ──────────────────────────────
-        if (!slotEntry)
-            return false;
-        const [slotName, slotState] = slotEntry;
-        const session = slotState.tmuxSession;
-        if (!session) {
-            this.log.warn(`seq ${seq}: No worker session for L2 conflict resolution`);
+        const slotName = runtime.slotName || this.runtimeStore.findAvailableSlot(state);
+        if (!slotName)
             return false;
-        }
-        const isPrintMode = slotState.mode === 'print';
-        const isAcpMode = slotState.transport === 'acp' ||
-            slotState.transport === 'pty' ||
-            slotState.mode === 'acp' ||
-            slotState.mode === 'pty';
+        const slotState = state.workers[slotName];
+        const session = slotState?.tmuxSession || null;
+        const isPrintMode = slotState?.mode === 'print';
+        const isAcpMode = !!slotState &&
+            (slotState.transport === 'acp' ||
+                slotState.transport === 'pty' ||
+                slotState.mode === 'acp' ||
+                slotState.mode === 'pty');
         try {
             if (isAcpMode && this.agentRuntime) {
                 await this.resumeAcpWorker(slotName, seq, worktree, branchName, [
@@ -598,24 +586,32 @@ export class CloseoutEngine {
                 ].join('\n'), 'resolving', 'closeout-conflict-resume');
             }
             else if (isPrintMode) {
+                if (!session) {
+                    this.log.warn(`seq ${seq}: No worker session for L2 conflict resolution`);
+                    return false;
+                }
                 // Print mode: spawn new process with --resume
                 this.log.info(`seq ${seq}: L2 — spawning conflict resolution via --resume`);
-                const resumeResult = await this.workerProvider.resolveConflict(session, worktree, branchName, slotState.sessionId || undefined);
+                const resumeResult = await this.workerProvider.resolveConflict(session, worktree, branchName, slotState?.sessionId || undefined);
                 // Update state with new process info
                 if (resumeResult && typeof resumeResult === 'object' && 'pid' in resumeResult) {
-                    const freshState = readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
-                    if (freshState.workers[slotName]) {
-                        freshState.workers[slotName].pid = resumeResult.pid;
-                        freshState.workers[slotName].outputFile = resumeResult.outputFile;
-                        if (resumeResult.sessionId) {
-                            freshState.workers[slotName].sessionId = resumeResult.sessionId;
+                    this.runtimeStore.updateState('closeout-conflict-resume', (freshState) => {
+                        if (freshState.workers[slotName]) {
+                            freshState.workers[slotName].pid = resumeResult.pid;
+                            freshState.workers[slotName].outputFile = resumeResult.outputFile;
+                            if (resumeResult.sessionId) {
+                                freshState.workers[slotName].sessionId = resumeResult.sessionId;
+                            }
+                            freshState.workers[slotName].exitCode = null;
                         }
-                        freshState.workers[slotName].exitCode = null;
-                        writeState(this.ctx.paths.stateFile, freshState, 'closeout-conflict-resume');
-                    }
+                    });
                 }
             }
             else {
+                if (!session) {
+                    this.log.warn(`seq ${seq}: No live worker session for interactive L2 conflict resolution`);
+                    return false;
+                }
                 // Interactive mode: send to live tmux session
                 const inspection = await this.workerProvider.inspect(session);
                 if (!inspection.alive) {
@@ -649,7 +645,7 @@ export class CloseoutEngine {
      * Each entry is processed independently — one failure does not block others.
      */
     async cleanupWorktrees(actions) {
-        const state = readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
+        const state = this.runtimeStore.readState();
         const queue = state.worktreeCleanup ?? [];
         if (queue.length === 0)
             return;
@@ -680,9 +676,9 @@ export class CloseoutEngine {
             }
         }
         // Update state with remaining entries
-        const freshState = readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
-        freshState.worktreeCleanup = remaining;
-        writeState(this.ctx.paths.stateFile, freshState, 'closeout-worktree-cleanup');
+        this.runtimeStore.updateState('closeout-worktree-cleanup', (freshState) => {
+            freshState.worktreeCleanup = remaining;
+        });
     }
     // ─── Helpers ───────────────────────────────────────────────────
     buildBranchName(card) {
@@ -740,27 +736,37 @@ export class CloseoutEngine {
             await this.agentRuntime.ensureSession(slotName, undefined, worktree);
             session = await this.agentRuntime.startRun(slotName, prompt, undefined, worktree);
         }
-        const state = readState(this.ctx.paths.stateFile, this.ctx.maxWorkers);
-        const slot = state.workers[slotName];
-        if (slot) {
-            slot.status = slotStatus;
-            slot.mode = this.ctx.config.WORKER_TRANSPORT === 'pty' ? 'pty' : 'acp';
-            slot.transport = this.ctx.config.WORKER_TRANSPORT === 'pty' ? 'pty' : 'acp';
-            slot.agent = session.tool;
-            slot.tmuxSession = session.sessionName;
-            slot.sessionId = session.sessionId;
-            slot.runId = session.currentRun?.runId || null;
-            slot.sessionState = session.sessionState;
-            slot.remoteStatus = session.currentRun?.status || null;
-            slot.lastEventAt = session.lastSeenAt;
-            slot.lastHeartbeat = new Date().toISOString();
-            slot.branch = slot.branch || branchName;
-            slot.worktree = slot.worktree || worktree;
-            slot.pid = null;
-            slot.outputFile = null;
-            slot.exitCode = null;
-        }
-        writeState(this.ctx.paths.stateFile, state, updatedBy);
+        this.runtimeStore.updateState(updatedBy, (state) => {
+            const slot = state.workers[slotName];
+            if (slot) {
+                slot.status = slotStatus;
+                slot.mode = this.ctx.config.WORKER_TRANSPORT === 'pty' ? 'pty' : 'acp';
+                slot.transport = this.ctx.config.WORKER_TRANSPORT === 'pty' ? 'pty' : 'acp';
+                slot.agent = session.tool;
+                slot.tmuxSession = session.sessionName;
+                slot.sessionId = session.sessionId;
+                slot.runId = session.currentRun?.runId || null;
+                slot.sessionState = session.sessionState;
+                slot.remoteStatus = session.currentRun?.status || null;
+                slot.lastEventAt = session.lastSeenAt;
+                slot.lastHeartbeat = new Date().toISOString();
+                slot.branch = slot.branch || branchName;
+                slot.worktree = slot.worktree || worktree;
+                slot.seq = parseInt(seq, 10);
+                slot.pid = null;
+                slot.outputFile = null;
+                slot.exitCode = null;
+            }
+            if (state.leases[seq]) {
+                state.leases[seq].slot = slotName;
+                state.leases[seq].branch = branchName;
+                state.leases[seq].worktree = worktree;
+                state.leases[seq].sessionId = session.sessionId;
+                state.leases[seq].runId = session.currentRun?.runId || null;
+                state.leases[seq].phase = slotStatus === 'resolving' ? 'resolving_conflict' : 'coding';
+                state.leases[seq].lastTransitionAt = new Date().toISOString();
+            }
+        });
     }
     logEvent(action, seq, result, meta) {
         this.log.event({