@caupulican/pi-adaptative 0.85.4 → 0.85.8

package/dist/core/process-matrix/runtime.d.ts

@@ -25,7 +25,19 @@
 import type { AgentIdentityContract } from "../orchestration/contracts.ts";
 import type { ResolvedProcessMatrixSettings } from "../settings-manager.ts";
 import type { ResumablePayload } from "./codes.ts";
+import { listEntries, readEntry, removeEntryIfUnchanged, writeEntry, writeEntryIfUnchanged, writeEntryIfUnchangedSync } from "./store.ts";
 export { getOrchestrationAgentId, getParentPid, getParentSessionId, getProcessTaskRef, PI_ORCHESTRATION_AGENT_ID_ENV, PI_PARENT_PID_ENV, PI_PARENT_SESSION_ENV, PI_TASK_REF_ENV, } from "../process-identity.ts";
+/** Storage boundary for the process-matrix coordinator. Runtime state transitions depend on this
+ * port, while the filesystem adapter remains the single production implementation. */
+export interface ProcessMatrixStorePort {
+    listEntries: typeof listEntries;
+    readEntry: typeof readEntry;
+    removeEntryIfUnchanged: typeof removeEntryIfUnchanged;
+    writeEntry: typeof writeEntry;
+    writeEntryIfUnchanged: typeof writeEntryIfUnchanged;
+    writeEntryIfUnchangedSync: typeof writeEntryIfUnchangedSync;
+}
+export declare const localProcessMatrixStore: ProcessMatrixStorePort;
 export interface ProcessMatrixRuntimeConfig {
     agentDir: string;
     /** Canonical logical identity for this process and any exact-session resume. */
@@ -43,7 +55,7 @@ export interface ProcessMatrixRuntimeConfig {
     promptConfirm: (message: string) => Promise<boolean>;
     /** Cooperative self-exit -- called by a worker once wound down (grace expiry or a
      * master-granted cleanup directive). Never called for the master's own lifecycle. */
-    requestExit: () => void;
+    requestExit: () => Promise<void>;
     /** Stable goal/task identity. Automatic recovery requires an exact match. */
     taskRef?: string;
     taskSummary?: string;
@@ -52,6 +64,8 @@ export interface ProcessMatrixRuntimeConfig {
     /** Starts a replacement OS process for a dead resumable worker. Completion is an event-driven
      * terminal signal; worker product remains in its persisted session/artifacts. */
     resumeWorker?: (payload: ResumablePayload) => Promise<ResumeWorkerLaunchOutcome>;
+    /** Injectable only at the storage boundary; defaults to the atomic local filesystem adapter. */
+    store?: ProcessMatrixStorePort;
 }
 export type ResumeWorkerLaunchOutcome = {
     started: true;

package/dist/core/process-matrix/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/core/process-matrix/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAE5E,OAAO,KAAK,EAAsB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAyBvE,OAAO,EACN,uBAAuB,EACvB,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,6BAA6B,EAC7B,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,GACf,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,gFAAgF;IAChF,KAAK,EAAE,qBAAqB,CAAC;IAC7B,qFAAqF;IACrF,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,6BAA6B,CAAC;IACxC,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,4FAA4F;IAC5F,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,wDAAwD;IACxD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,yFAAyF;IACzF,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD;yFACqF;IACrF,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0FAA0F;IAC1F,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;qFACiF;IACjF,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,yBAAyB,CAAC,CAAC;CACjF;AAED,MAAM,MAAM,yBAAyB,GAClC;IACA,OAAO,EAAE,IAAI,CAAC;IACd,4FAA4F;IAC5F,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CAC3E,GACD;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC,MAAM,WAAW,0BAA0B;IAC1C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC7B;AAGD,eAAO,MAAM,qCAAqC,QAAwB,CAAC;AAoB3E;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC9C,MAAM,EAAE,0BAA0B,GAChC,OAAO,CAAC,0BAA0B,CAAC,CAerC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/core/process-matrix/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAE5E,OAAO,KAAK,EAAsB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAEN,WAAW,EACX,SAAS,EACT,sBAAsB,EACtB,UAAU,EACV,qBAAqB,EACrB,yBAAyB,EACzB,MAAM,YAAY,CAAC;AAgBpB,OAAO,EACN,uBAAuB,EACvB,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,6BAA6B,EAC7B,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,GACf,MAAM,wBAAwB,CAAC;AAEhC;sFACsF;AACtF,MAAM,WAAW,sBAAsB;IACtC,WAAW,EAAE,OAAO,WAAW,CAAC;IAChC,SAAS,EAAE,OAAO,SAAS,CAAC;IAC5B,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IACpD,yBAAyB,EAAE,OAAO,yBAAyB,CAAC;CAC5D;AAED,eAAO,MAAM,uBAAuB,EAAE,sBAOpC,CAAC;AAEH,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,gFAAgF;IAChF,KAAK,EAAE,qBAAqB,CAAC;IAC7B,qFAAqF;IACrF,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,6BAA6B,CAAC;IACxC,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,4FAA4F;IAC5F,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,wDAAwD;IACxD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,yFAAyF;IACzF,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD;yFACqF;IACrF,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0FAA0F;IAC1F,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;qFACiF;IACjF,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACjF,gGAAgG;IAChG,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAC/B;AAED,MAAM,MAAM,yBAAyB,GAClC;IACA,OAAO,EAAE,IAAI,CAAC;IACd,4FAA4F;IAC5F,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CAC3E,GACD;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC,MAAM,WAAW,0BAA0B;IAC1C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC7B;AAGD,eAAO,MAAM,qCAAqC,QAAwB,CAAC;AAwB3E;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC9C,MAAM,EAAE,0BAA0B,GAChC,OAAO,CAAC,0BAA0B,CAAC,CAerC"}

package/dist/core/process-matrix/runtime.js

@@ -29,8 +29,19 @@ import { getBoundWorktreeLaneKey } from "../worktree-sync/runtime.js";
 import { buildEntryId, listEntries, readEntry, removeEntryIfUnchanged, writeEntry, writeEntryIfUnchanged, writeEntryIfUnchangedSync, } from "./store.js";
 import { applyAdoption, applyHeartbeat, beginWindDown, buildMasterEntry, buildWorkerEntry, detectOrphanedWorkers, markClosed, markResumable, markTerminal, markTerminalNotificationDelivered, pollWorkerDirective, reconcileMatrix, } from "./supervisor.js";
 export { getOrchestrationAgentId, getParentPid, getParentSessionId, getProcessTaskRef, PI_ORCHESTRATION_AGENT_ID_ENV, PI_PARENT_PID_ENV, PI_PARENT_SESSION_ENV, PI_TASK_REF_ENV, } from "../process-identity.js";
+export const localProcessMatrixStore = Object.freeze({
+    listEntries,
+    readEntry,
+    removeEntryIfUnchanged,
+    writeEntry,
+    writeEntryIfUnchanged,
+    writeEntryIfUnchangedSync,
+});
 const NOOP_HANDLE = { stop: () => { } };
 export const PROCESS_MATRIX_RESUMABLE_RETENTION_MS = 30 * 24 * 60 * 60_000;
+function resolveProcessMatrixStore(config) {
+    return config.store ?? localProcessMatrixStore;
+}
 function describeError(error) {
     return error instanceof Error ? error.message : String(error);
 }
@@ -74,6 +85,7 @@ export async function startProcessMatrixRuntime(config) {
 // Master branch
 // ---------------------------------------------------------------------------
 async function startMasterBranch(config, now) {
+    const store = resolveProcessMatrixStore(config);
     let entry = buildMasterEntry({
         agent: config.agent,
         pid: process.pid,
@@ -81,7 +93,7 @@ async function startMasterBranch(config, now) {
         now: nowIso(now),
     });
     try {
-        await writeEntry(config.agentDir, entry);
+        await store.writeEntry(config.agentDir, entry);
     }
     catch (error) {
         config.onDiagnostic?.(`process-matrix: failed to register master entry: ${describeError(error)}`);
@@ -95,7 +107,8 @@ async function startMasterBranch(config, now) {
             return;
         const expected = entry;
         const next = applyHeartbeat(expected, nowIso(now));
-        heartbeatTask = writeEntryIfUnchanged(config.agentDir, expected.entryId, expected, next)
+        heartbeatTask = store
+            .writeEntryIfUnchanged(config.agentDir, expected.entryId, expected, next)
             .then((written) => {
             if (written) {
                 entry = next;
@@ -122,7 +135,7 @@ async function startMasterBranch(config, now) {
             return;
         try {
             const closed = markClosed(entry, nowIso(now));
-            if (writeEntryIfUnchangedSync(config.agentDir, entry, closed))
+            if (store.writeEntryIfUnchangedSync(config.agentDir, entry, closed))
                 entry = closed;
         }
         catch {
@@ -144,7 +157,7 @@ async function startMasterBranch(config, now) {
             await heartbeatTask;
             if (ownsEntry) {
                 const closed = markClosed(entry, nowIso(now));
-                if (await writeEntryIfUnchanged(config.agentDir, entry.entryId, entry, closed))
+                if (await store.writeEntryIfUnchanged(config.agentDir, entry.entryId, entry, closed))
                     entry = closed;
             }
             await maintenance;
@@ -152,9 +165,10 @@ async function startMasterBranch(config, now) {
     };
 }
 async function reconcileAndRunOrphanScan(config, now, signal) {
+    const store = resolveProcessMatrixStore(config);
     let entries;
     try {
-        entries = await listEntries(config.agentDir);
+        entries = await store.listEntries(config.agentDir);
     }
     catch (error) {
         config.onDiagnostic?.(`process-matrix: reconciliation failed to list entries: ${describeError(error)}`);
@@ -172,13 +186,13 @@ async function reconcileAndRunOrphanScan(config, now, signal) {
     const [prunedOutcomes, recoveredOutcomes] = await Promise.all([
         Promise.all(reconciled.prunedEntryIds.map((entryId) => {
             const original = originalByEntryId.get(entryId);
-            return original ? removeEntryIfUnchanged(config.agentDir, original) : false;
+            return original ? store.removeEntryIfUnchanged(config.agentDir, original) : false;
         })),
         Promise.all(reconciled.kept
             .filter((entry) => recoveredEntryIdSet.has(entry.entryId))
             .map((entry) => {
             const original = originalByEntryId.get(entry.entryId);
-            return original ? writeEntryIfUnchanged(config.agentDir, entry.entryId, original, entry) : false;
+            return original ? store.writeEntryIfUnchanged(config.agentDir, entry.entryId, original, entry) : false;
         })),
     ]);
     if (signal.aborted)
@@ -191,13 +205,14 @@ async function reconcileAndRunOrphanScan(config, now, signal) {
     if (prunedCount > 0) {
         config.onDiagnostic?.(`process-matrix: pruned ${prunedCount} terminal or expired entr${prunedCount === 1 ? "y" : "ies"}`);
     }
-    const currentEntries = await listEntries(config.agentDir);
+    const currentEntries = await store.listEntries(config.agentDir);
     await deliverTerminalNotifications(config, currentEntries, now, signal);
     if (signal.aborted)
         return;
     await runOrphanScan(config, currentEntries, now, signal);
 }
 async function deliverTerminalNotifications(config, entries, now, signal) {
+    const store = resolveProcessMatrixStore(config);
     for (const entry of entries) {
         if (signal.aborted ||
             entry.status !== "closed" ||
@@ -216,7 +231,7 @@ async function deliverTerminalNotifications(config, entries, now, signal) {
         }
         try {
             const delivered = markTerminalNotificationDelivered(entry, nowIso(now));
-            if (!(await writeEntryIfUnchanged(config.agentDir, entry.entryId, entry, delivered))) {
+            if (!(await store.writeEntryIfUnchanged(config.agentDir, entry.entryId, entry, delivered))) {
                 config.onDiagnostic?.(`process-matrix: terminal handoff changed before acknowledgement for ${entry.entryId}`);
             }
         }
@@ -230,6 +245,7 @@ function formatTerminalNotification(entry) {
     return `process-matrix: resumed agent ${entry.agent.agentId} reached a terminal process state (code ${terminal?.code ?? "none"}, signal ${terminal?.signal ?? "none"}). Inspect its persisted result before continuing.`;
 }
 async function runOrphanScan(config, entries, now, signal) {
+    const store = resolveProcessMatrixStore(config);
     const orphans = detectOrphanedWorkers(entries, {
         isPidAlive: config.isProcessAlive,
         ownSessionId: config.agent.resumeContext.sessionId,
@@ -279,7 +295,7 @@ async function runOrphanScan(config, entries, now, signal) {
             continue;
         const windingDown = beginWindDown(orphan, "user_cleanup", nowIso(now));
         try {
-            if (!(await writeEntryIfUnchanged(config.agentDir, orphan.entryId, orphan, windingDown))) {
+            if (!(await store.writeEntryIfUnchanged(config.agentDir, orphan.entryId, orphan, windingDown))) {
                 config.onDiagnostic?.(`process-matrix: cleanup skipped because ${orphan.entryId} changed`);
             }
         }
@@ -306,6 +322,7 @@ function reportOwnerGatedOrphan(config, orphan, reason) {
     config.onDiagnostic?.(`process-matrix: found owner-gated orphan ${orphan.entryId} (${reason}; report-only, non-interactive; nothing written, nothing killed)`);
 }
 async function adoptLiveOrphan(config, orphan, signal) {
+    const store = resolveProcessMatrixStore(config);
     if (signal.aborted)
         return;
     const adopted = applyAdoption(orphan, {
@@ -313,16 +330,17 @@ async function adoptLiveOrphan(config, orphan, signal) {
         parentSessionId: config.agent.resumeContext.sessionId,
     });
     try {
-        if (!(await writeEntryIfUnchanged(config.agentDir, orphan.entryId, orphan, adopted)))
+        if (!(await store.writeEntryIfUnchanged(config.agentDir, orphan.entryId, orphan, adopted)))
             return;
         if (signal.aborted)
-            await writeEntryIfUnchanged(config.agentDir, orphan.entryId, adopted, orphan);
+            await store.writeEntryIfUnchanged(config.agentDir, orphan.entryId, adopted, orphan);
     }
     catch (error) {
         config.onDiagnostic?.(`process-matrix: failed to write adoption for ${orphan.entryId}: ${describeError(error)}`);
     }
 }
 async function resumeDeadOrphan(config, orphan, signal) {
+    const store = resolveProcessMatrixStore(config);
     if (signal.aborted)
         return;
     const payload = orphan.resumable;
@@ -336,15 +354,15 @@ async function resumeDeadOrphan(config, orphan, signal) {
     });
     let launched;
     try {
-        if (!(await writeEntryIfUnchanged(config.agentDir, orphan.entryId, orphan, claimed)))
+        if (!(await store.writeEntryIfUnchanged(config.agentDir, orphan.entryId, orphan, claimed)))
             return;
         if (signal.aborted) {
-            await writeEntryIfUnchanged(config.agentDir, orphan.entryId, claimed, orphan);
+            await store.writeEntryIfUnchanged(config.agentDir, orphan.entryId, claimed, orphan);
             return;
         }
         const launchOutcome = await config.resumeWorker(payload);
         if (!launchOutcome.started) {
-            await writeEntryIfUnchanged(config.agentDir, orphan.entryId, claimed, orphan);
+            await store.writeEntryIfUnchanged(config.agentDir, orphan.entryId, claimed, orphan);
             config.onDiagnostic?.(`process-matrix: failed to resume ${orphan.entryId}: ${launchOutcome.reason}`);
             return;
         }
@@ -352,7 +370,7 @@ async function resumeDeadOrphan(config, orphan, signal) {
     }
     catch (error) {
         try {
-            await writeEntryIfUnchanged(config.agentDir, orphan.entryId, claimed, orphan);
+            await store.writeEntryIfUnchanged(config.agentDir, orphan.entryId, claimed, orphan);
         }
         catch {
             // The original resumable record remains the intended recovery state.
@@ -366,7 +384,7 @@ async function resumeDeadOrphan(config, orphan, signal) {
             // Bridge the interval before the replacement can self-register. Without its real PID here, a
             // restarted master can mistake this live replacement for the original dead process and spawn
             // a duplicate.
-            await writeEntryIfUnchanged(config.agentDir, claimed.entryId, claimed, launchedEntry);
+            await store.writeEntryIfUnchanged(config.agentDir, claimed.entryId, claimed, launchedEntry);
         }
         catch (error) {
             config.onDiagnostic?.(`process-matrix: failed to record resumed worker pid for ${orphan.entryId}: ${describeError(error)}`);
@@ -380,19 +398,20 @@ async function resumeDeadOrphan(config, orphan, signal) {
     });
 }
 async function persistResumedWorkerTerminal(config, claimed, preLaunchClaim, result, lifetime) {
+    const store = resolveProcessMatrixStore(config);
     try {
         const observedAt = new Date().toISOString();
         const terminal = markTerminal(claimed, result, observedAt);
-        if (await writeEntryIfUnchanged(config.agentDir, claimed.entryId, claimed, terminal)) {
+        if (await store.writeEntryIfUnchanged(config.agentDir, claimed.entryId, claimed, terminal)) {
             if (lifetime.aborted)
                 return;
             await notifyResumedWorkerTerminal(config, terminal, lifetime);
             return;
         }
-        const selfRegistered = await readEntry(config.agentDir, claimed.entryId);
+        const selfRegistered = await store.readEntry(config.agentDir, claimed.entryId);
         if (selfRegistered?.pid === claimed.pid) {
             const registeredTerminal = markTerminal(selfRegistered, result, observedAt);
-            if (await writeEntryIfUnchanged(config.agentDir, claimed.entryId, selfRegistered, registeredTerminal)) {
+            if (await store.writeEntryIfUnchanged(config.agentDir, claimed.entryId, selfRegistered, registeredTerminal)) {
                 if (lifetime.aborted)
                     return;
                 await notifyResumedWorkerTerminal(config, registeredTerminal, lifetime);
@@ -403,13 +422,13 @@ async function persistResumedWorkerTerminal(config, claimed, preLaunchClaim, res
         // untouched pre-launch claim proves no newer process has taken this logical entry. Upgrade it
         // to the actual exited process before persisting its terminal handoff.
         const fallbackTerminal = markTerminal({ ...preLaunchClaim, pid: claimed.pid }, result, observedAt);
-        if (await writeEntryIfUnchanged(config.agentDir, claimed.entryId, preLaunchClaim, fallbackTerminal)) {
+        if (await store.writeEntryIfUnchanged(config.agentDir, claimed.entryId, preLaunchClaim, fallbackTerminal)) {
             if (lifetime.aborted)
                 return;
             await notifyResumedWorkerTerminal(config, fallbackTerminal, lifetime);
             return;
         }
-        if (await writeEntryIfUnchanged(config.agentDir, claimed.entryId, undefined, terminal)) {
+        if (await store.writeEntryIfUnchanged(config.agentDir, claimed.entryId, undefined, terminal)) {
             if (lifetime.aborted)
                 return;
             await notifyResumedWorkerTerminal(config, terminal, lifetime);
@@ -422,6 +441,7 @@ async function persistResumedWorkerTerminal(config, claimed, preLaunchClaim, res
     }
 }
 async function notifyResumedWorkerTerminal(config, terminal, lifetime) {
+    const store = resolveProcessMatrixStore(config);
     if (lifetime.aborted)
         return;
     try {
@@ -429,7 +449,7 @@ async function notifyResumedWorkerTerminal(config, terminal, lifetime) {
         if (lifetime.aborted)
             return;
         const delivered = markTerminalNotificationDelivered(terminal, new Date().toISOString());
-        if (!(await writeEntryIfUnchanged(config.agentDir, terminal.entryId, terminal, delivered))) {
+        if (!(await store.writeEntryIfUnchanged(config.agentDir, terminal.entryId, terminal, delivered))) {
             config.onDiagnostic?.(`process-matrix: terminal handoff changed before acknowledgement for ${terminal.entryId}`);
         }
     }
@@ -441,6 +461,7 @@ async function notifyResumedWorkerTerminal(config, terminal, lifetime) {
 // Worker branch
 // ---------------------------------------------------------------------------
 async function startWorkerBranch(config, initialParentPid, now) {
+    const store = resolveProcessMatrixStore(config);
     const parentSessionId = getParentSessionId();
     const taskRef = (getProcessTaskRef() ?? config.taskRef)?.trim().slice(0, 512) || undefined;
     const taskSummary = config.taskSummary?.trim().slice(0, 2_000) || undefined;
@@ -460,7 +481,7 @@ async function startWorkerBranch(config, initialParentPid, now) {
         ...(taskSummary !== undefined ? { taskSummary } : {}),
     });
     try {
-        await writeEntry(config.agentDir, entry);
+        await store.writeEntry(config.agentDir, entry);
     }
     catch (error) {
         config.onDiagnostic?.(`process-matrix: failed to register worker entry: ${describeError(error)}`);
@@ -478,7 +499,7 @@ async function startWorkerBranch(config, initialParentPid, now) {
             return;
         try {
             const terminal = markTerminal(entry, { code, signal: null }, nowIso(now));
-            if (writeEntryIfUnchangedSync(config.agentDir, entry, terminal))
+            if (store.writeEntryIfUnchangedSync(config.agentDir, entry, terminal))
                 entry = terminal;
         }
         catch {
@@ -501,11 +522,11 @@ async function startWorkerBranch(config, initialParentPid, now) {
                 const expected = entry;
                 const terminal = markTerminal(expected, { code: null, signal: null }, nowIso(now));
                 try {
-                    if (await writeEntryIfUnchanged(config.agentDir, expected.entryId, expected, terminal)) {
+                    if (await store.writeEntryIfUnchanged(config.agentDir, expected.entryId, expected, terminal)) {
                         entry = terminal;
                         break;
                     }
-                    const current = await readEntry(config.agentDir, expected.entryId);
+                    const current = await store.readEntry(config.agentDir, expected.entryId);
                     if (current?.pid !== process.pid || current.startedAt !== generationStartedAt) {
                         config.onDiagnostic?.("process-matrix: worker entry ownership moved to a newer process generation");
                         break;
@@ -526,11 +547,11 @@ async function startWorkerBranch(config, initialParentPid, now) {
     };
     const persist = async (expected, next, failureContext) => {
         try {
-            if (await writeEntryIfUnchanged(config.agentDir, expected.entryId, expected, next)) {
+            if (await store.writeEntryIfUnchanged(config.agentDir, expected.entryId, expected, next)) {
                 entry = next;
                 return true;
             }
-            const current = await readEntry(config.agentDir, expected.entryId);
+            const current = await store.readEntry(config.agentDir, expected.entryId);
             if (current?.pid === process.pid)
                 entry = current;
             else {
@@ -553,7 +574,7 @@ async function startWorkerBranch(config, initialParentPid, now) {
         preserveResumableOnExit = false;
         emitRuntimeNotice(config, "process-matrix: the parent session requested a cooperative cleanup. Winding down.");
         await stop();
-        config.requestExit();
+        await config.requestExit();
     };
     const startHealthyWatch = () => {
         timer = setInterval(() => {
@@ -572,7 +593,7 @@ async function startWorkerBranch(config, initialParentPid, now) {
         // PID to a durable identity and proves that that exact session is still heartbeating.
         if (!currentParentSessionId || !config.isProcessAlive(currentParentPid))
             return false;
-        const parent = await readEntry(config.agentDir, buildEntryId("master", currentParentSessionId));
+        const parent = await store.readEntry(config.agentDir, buildEntryId("master", currentParentSessionId));
         if (!parent || parent.role !== "master" || parent.agent.resumeContext.sessionId !== currentParentSessionId)
             return false;
         if (parent.pid !== currentParentPid || parent.status !== "running")
@@ -589,7 +610,7 @@ async function startWorkerBranch(config, initialParentPid, now) {
             return;
         }
         // Still healthy: also poll for a master-initiated cooperative-cleanup directive.
-        const fresh = await readEntry(config.agentDir, entry.entryId);
+        const fresh = await store.readEntry(config.agentDir, entry.entryId);
         if (!fresh)
             return;
         const directive = pollWorkerDirective(fresh, currentParentPid, { isPidAlive: config.isProcessAlive });
@@ -630,7 +651,7 @@ async function startWorkerBranch(config, initialParentPid, now) {
     const graceTick = async (graceDeadline) => {
         if (stopped)
             return;
-        const fresh = await readEntry(config.agentDir, entry.entryId);
+        const fresh = await store.readEntry(config.agentDir, entry.entryId);
         if (fresh) {
             const directive = pollWorkerDirective(fresh, currentParentPid, { isPidAlive: config.isProcessAlive });
             if (directive.code === "adopt" && fresh.parentSessionId) {
@@ -656,7 +677,7 @@ async function startWorkerBranch(config, initialParentPid, now) {
         }
         if (now() >= graceDeadline) {
             await stop();
-            config.requestExit();
+            await config.requestExit();
         }
     };
     startHealthyWatch();