@code-yeongyu/senpi 2026.9.24-3 → 2026.9.25

package/dist/core/extensions/builtin/terminal/restore-session.js

@@ -0,0 +1,238 @@
+/**
+ * A session's persistence lifecycle across process restarts: take the per-session lease, restore
+ * the persisted monitors on a detached promise (session_start never waits on a grace window), and
+ * deliver ONE decided digest through a slot that holds it until a model is bound. A live foreign
+ * holder defers everything: the footer says who holds the monitors, and a lease keeper takes the
+ * session over the moment that process exits, running the same restore exactly once. Monitors
+ * created while waiting are queued and reach the manifest after the takeover.
+ */
+import { existsSync } from "node:fs";
+import { encodedSessionId } from "../../../session-sidecar-store.js";
+import { createRestartableCommandHandler } from "./durable-command.js";
+import { createCheckpointedFileRestoreHandler } from "./durable-file.js";
+import { createLeaseKeeper } from "./lease-keeper.js";
+import { acquireTerminalLease, releaseTerminalLease, retireLeaseToken, } from "./manifest-lease.js";
+import { removeMonitorStateDir, terminalStateDir } from "./monitor-state-dir.js";
+import { ownProcessStartedAtMs, processBootAtMs } from "./process-identity.js";
+import { reapplyPersistedMute, restoreTerminalState } from "./restore.js";
+import { buildRestoreDigest, createDigestSlot, deliverRestoreDigest } from "./restore-digest.js";
+import { createTerminalManifestStore, TerminalManifestWriter } from "./terminal-manifest.js";
+import { sweepTerminalStateDir } from "./terminal-state-gc.js";
+import { bindTerminalManifestWriter, unbindTerminalManifestWriter } from "./tools/monitor.js";
+export const RESTORE_STATUS_KEY = "terminal-restore";
+const errorText = (error) => (error instanceof Error ? error.message : String(error));
+/** Test-only timing overrides; production uses the modules' own defaults. */
+export const restoreSessionTestHooks = {};
+const decisions = new Map();
+function armDecision(sessionKey) {
+    let resolve = () => { };
+    const promise = new Promise((settle) => {
+        resolve = settle;
+    });
+    decisions.set(sessionKey, { promise, resolve });
+    return resolve;
+}
+/** Settles once this session's current generation has decided its restore (or had nothing to decide). */
+export function whenRestoreDecided(sessionKey) {
+    return decisions.get(sessionKey)?.promise ?? Promise.resolve();
+}
+export function flushRestoreDigest(pi, state) {
+    state.digestSlot.flush((message) => {
+        // terminal.notify "off" keeps the model channel silent; the user still sees the digest.
+        if (state.settings.notify !== "off")
+            return deliverRestoreDigest(pi, state.ctx, message);
+        state.ctx?.ui?.notify?.(message.content, "info");
+        return true;
+    });
+}
+function emptyDigest() {
+    return {
+        restored: 0,
+        lost: 0,
+        expired: 0,
+        muted: 0,
+        completed: 0,
+        attachedElsewhere: 0,
+        storeError: false,
+        results: [],
+        backgroundSessions: [],
+        downtimeMs: 0,
+    };
+}
+function restoreHandlers(state, toolCtx, bundle) {
+    const writer = state.manifestWriter;
+    if (writer === null)
+        throw new Error("restore handlers need the bound manifest writer");
+    const registry = bundle.monitors;
+    const adopting = (handler) => async (monitor, context) => {
+        const result = await handler(monitor, context);
+        // Only a LIVE entry is re-adopted, so the next persist keeps it and drops the rest.
+        if (result.outcome === "restored" || result.outcome === "muted") {
+            writer.adoptRestored(result.runtime === undefined ? monitor : { ...monitor, runtime: result.runtime });
+            registry.adoptFireWindow(monitor.monitorId, monitor.fireWindow);
+        }
+        return result;
+    };
+    let freshFileRuntimeId;
+    const checkpointedFile = createCheckpointedFileRestoreHandler({
+        registry,
+        writer,
+        bindMonitorId: (monitorId, runtimeId) => {
+            freshFileRuntimeId = runtimeId;
+            bundle.manager.bindMonitorId(monitorId, runtimeId);
+        },
+    });
+    return {
+        "restartable-command": adopting(createRestartableCommandHandler({
+            ctx: toolCtx,
+            registry,
+            ...(restoreSessionTestHooks.graceMs !== undefined ? { graceMs: restoreSessionTestHooks.graceMs } : {}),
+        })),
+        "checkpointed-file": adopting(async (monitor, context) => {
+            freshFileRuntimeId = undefined;
+            const result = await checkpointedFile(monitor, context);
+            if (result.outcome !== "restored" || freshFileRuntimeId === undefined)
+                return result;
+            return { ...result, outcome: reapplyPersistedMute(registry, monitor, freshFileRuntimeId) };
+        }),
+    };
+}
+/** Non-reload session_start (and a reload that does not hold the lease): take ownership or wait for it. */
+export async function startPersistence({ pi, state, toolCtx, sessionKey }) {
+    state.generation += 1;
+    state.digestSlot = createDigestSlot();
+    const decided = armDecision(sessionKey);
+    const ctx = state.ctx;
+    const dir = terminalStateDir(ctx);
+    const sessionManager = ctx?.sessionManager;
+    if (dir === undefined || sessionManager === undefined)
+        return decided();
+    const encoded = encodedSessionId(sessionKey);
+    const generation = state.generation;
+    const own = async (lease) => {
+        ctx?.ui?.setStatus?.(RESTORE_STATUS_KEY, undefined);
+        state.lease = { path: lease.path, pid: lease.pid, token: lease.token };
+        const writer = new TerminalManifestWriter({ session: sessionManager });
+        state.manifestWriter = writer;
+        state.recordedBackgroundIds.clear();
+        const bundle = state.bundle;
+        let restoredFromReadableManifest = false;
+        if (bundle !== null && existsSync(writer.store.filePath)) {
+            let digest;
+            try {
+                digest = await restoreTerminalState({
+                    manifest: writer.store,
+                    handlers: restoreHandlers(state, toolCtx, bundle),
+                    sessionFile: sessionManager.getSessionFile?.(),
+                    processStartedAtMs: ownProcessStartedAtMs(),
+                });
+            }
+            catch (error) {
+                // A restore that throws (an unreadable transcript, a kill error on a confirmed orphan)
+                // still decides: the session hears it failed, and the lease stays bound for shutdown.
+                ctx?.ui?.notify?.(`Terminal restore failed: ${errorText(error)}`, "warning");
+                digest = { ...emptyDigest(), storeError: true };
+            }
+            // A watch that did not come back never runs again: its baseline dir goes with it.
+            await Promise.all(digest.results
+                .filter((result) => result.outcome === "lost" || result.outcome === "expired" || result.outcome === "completed")
+                .map((result) => removeMonitorStateDir(dir, result.monitorId)));
+            if (generation !== state.generation)
+                return;
+            restoredFromReadableManifest = !digest.storeError;
+            if (digest.storeError || digest.results.length > 0 || digest.backgroundSessions.length > 0) {
+                state.digestSlot.set(buildRestoreDigest(digest, { generation, outcome: "decided" }));
+            }
+        }
+        // Bound AFTER the restore read the file: draining queued specs writes the manifest.
+        bindTerminalManifestWriter(sessionKey, writer);
+        // A corrupt manifest is left as it was (fail closed); a readable one is rewritten to the truth.
+        if (restoredFromReadableManifest)
+            await writer.persistRestored();
+        state.ensurePersistence = null;
+        const self = { pid: process.pid, bootAtMs: processBootAtMs(), processStartedAtMs: ownProcessStartedAtMs() };
+        // Housekeeping only: a failed sweep leaves the files for the next start to reclaim.
+        void sweepTerminalStateDir(dir, { self, keep: new Set([`${encoded}.lease`, `${encoded}.json`]) }).catch(() => undefined);
+        flushRestoreDigest(pi, state);
+        decided();
+    };
+    const wait = (holder) => {
+        ctx?.ui?.setStatus?.(RESTORE_STATUS_KEY, holder === null ? "monitors waiting for the session lease" : `monitors held by pid ${holder.pid}`);
+        state.digestSlot.set(buildRestoreDigest(emptyDigest(), {
+            generation,
+            outcome: "deferred",
+            ...(holder === null ? {} : { holderPid: holder.pid }),
+        }));
+        state.keeper?.stop();
+        state.keeper = createLeaseKeeper({
+            dir,
+            encodedSessionId: encoded,
+            ...(restoreSessionTestHooks.keeperIntervalMs !== undefined
+                ? { intervalMs: restoreSessionTestHooks.keeperIntervalMs }
+                : {}),
+            onTakeover: (lease) => {
+                state.restoreInFlight = own(lease);
+                return state.restoreInFlight;
+            },
+            onError: (error) => {
+                const waiting = state.keeper?.state === "waiting";
+                ctx?.ui?.notify?.(`Terminal lease ${waiting ? "check failed, still waiting" : "takeover failed"}: ${errorText(error)}`, "warning");
+            },
+        });
+        state.keeper.start(holder);
+    };
+    const acquire = async () => {
+        // The lease kept changing (or the dir failed): never leave the session undecided; the keeper retries.
+        const lease = await acquireTerminalLease({ dir, encodedSessionId: encoded }).catch((error) => {
+            ctx?.ui?.notify?.(`Terminal lease not acquired yet, retrying: ${errorText(error)}`, "warning");
+            return null;
+        });
+        if (lease === null)
+            return wait(null);
+        if (lease.acquired) {
+            state.restoreInFlight = own(lease);
+            return;
+        }
+        wait(lease.holder);
+    };
+    if (existsSync(createTerminalManifestStore(sessionManager).filePath))
+        return acquire();
+    // Nothing to restore: the lease and the recorder wait for the first real registration.
+    decided();
+    let binding = null;
+    state.ensurePersistence = () => {
+        binding ??= acquire().then(() => state.restoreInFlight);
+        return binding;
+    };
+}
+/** session_shutdown (not reload): stop waiting, finish any restore, suspend and flush, release. */
+export async function stopPersistence(state, sessionKey) {
+    const keeper = state.keeper;
+    keeper?.stop();
+    state.keeper = null;
+    // A tick in flight may still be acquiring (then releases) or taking over (then restores).
+    await keeper?.settled();
+    const lease = state.lease;
+    state.lease = null;
+    if (lease !== null)
+        retireLeaseToken(lease.token);
+    await state.restoreInFlight;
+    const writer = state.manifestWriter;
+    if (writer && state.bundle)
+        await writer.observeMonitorState(state.bundle.monitors.snapshot());
+    detachPersistence(state, sessionKey);
+    if (writer)
+        await writer.recordShutdown();
+    if (lease !== null)
+        await releaseTerminalLease(lease);
+    decisions.get(sessionKey)?.resolve();
+}
+/** Detach the manifest recorder without writing (a reload keeps live state instead). */
+export function detachPersistence(state, sessionKey) {
+    state.manifestWriter = null;
+    state.ensurePersistence = null;
+    state.recordedBackgroundIds.clear();
+    if (sessionKey !== undefined)
+        unbindTerminalManifestWriter(sessionKey);
+}
+//# sourceMappingURL=restore-session.js.map

package/dist/core/extensions/builtin/terminal/restore-session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"restore-session.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/restore-session.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * A session's persistence lifecycle across process restarts: take the per-session lease, restore\n * the persisted monitors on a detached promise (session_start never waits on a grace window), and\n * deliver ONE decided digest through a slot that holds it until a model is bound. A live foreign\n * holder defers everything: the footer says who holds the monitors, and a lease keeper takes the\n * session over the moment that process exits, running the same restore exactly once. Monitors\n * created while waiting are queued and reach the manifest after the takeover.\n */\n\nimport { existsSync } from \"node:fs\";\nimport { encodedSessionId } from \"../../../session-sidecar-store.ts\";\nimport type { ExtensionAPI, ExtensionContext } from \"../../types.ts\";\nimport { createRestartableCommandHandler } from \"./durable-command.ts\";\nimport { createCheckpointedFileRestoreHandler } from \"./durable-file.ts\";\nimport { createLeaseKeeper, type LeaseKeeper } from \"./lease-keeper.ts\";\nimport {\n\ttype AcquireTerminalLeaseResult,\n\tacquireTerminalLease,\n\ttype LeaseHolder,\n\treleaseTerminalLease,\n\tretireLeaseToken,\n} from \"./manifest-lease.ts\";\nimport { removeMonitorStateDir, terminalStateDir } from \"./monitor-state-dir.ts\";\nimport { ownProcessStartedAtMs, processBootAtMs } from \"./process-identity.ts\";\nimport { type RestoreDigest, type RestoreHandler, reapplyPersistedMute, restoreTerminalState } from \"./restore.ts\";\nimport { buildRestoreDigest, createDigestSlot, type DigestSlot, deliverRestoreDigest } from \"./restore-digest.ts\";\nimport type { TerminalSessionBundle } from \"./session-bundle.ts\";\nimport { createTerminalManifestStore, TerminalManifestWriter } from \"./terminal-manifest.ts\";\nimport { sweepTerminalStateDir } from \"./terminal-state-gc.ts\";\nimport type { TerminalToolContext } from \"./tools/context.ts\";\nimport { bindTerminalManifestWriter, unbindTerminalManifestWriter } from \"./tools/monitor.ts\";\n\nexport const RESTORE_STATUS_KEY = \"terminal-restore\";\n\nconst errorText = (error: unknown): string => (error instanceof Error ? error.message : String(error));\n\n/** Test-only timing overrides; production uses the modules' own defaults. */\nexport const restoreSessionTestHooks: { keeperIntervalMs?: number; graceMs?: number } = {};\n\nexport interface PersistenceState {\n\tctx: ExtensionContext | undefined;\n\treadonly settings: { readonly notify: string };\n\tbundle: TerminalSessionBundle | null;\n\tlease: { path: string; pid: number; token: string } | null;\n\tmanifestWriter: TerminalManifestWriter | null;\n\tensurePersistence: (() => Promise<void>) | null;\n\trecordedBackgroundIds: Set<string>;\n\tkeeper: LeaseKeeper | null;\n\tdigestSlot: DigestSlot;\n\tgeneration: number;\n\trestoreInFlight: Promise<void>;\n}\n\nconst decisions = new Map<string, { promise: Promise<void>; resolve: () => void }>();\n\nfunction armDecision(sessionKey: string): () => void {\n\tlet resolve: () => void = () => {};\n\tconst promise = new Promise<void>((settle) => {\n\t\tresolve = settle;\n\t});\n\tdecisions.set(sessionKey, { promise, resolve });\n\treturn resolve;\n}\n\n/** Settles once this session's current generation has decided its restore (or had nothing to decide). */\nexport function whenRestoreDecided(sessionKey: string): Promise<void> {\n\treturn decisions.get(sessionKey)?.promise ?? Promise.resolve();\n}\n\nexport function flushRestoreDigest(pi: ExtensionAPI, state: PersistenceState): void {\n\tstate.digestSlot.flush((message) => {\n\t\t// terminal.notify \"off\" keeps the model channel silent; the user still sees the digest.\n\t\tif (state.settings.notify !== \"off\") return deliverRestoreDigest(pi, state.ctx, message);\n\t\tstate.ctx?.ui?.notify?.(message.content, \"info\");\n\t\treturn true;\n\t});\n}\n\nfunction emptyDigest(): RestoreDigest {\n\treturn {\n\t\trestored: 0,\n\t\tlost: 0,\n\t\texpired: 0,\n\t\tmuted: 0,\n\t\tcompleted: 0,\n\t\tattachedElsewhere: 0,\n\t\tstoreError: false,\n\t\tresults: [],\n\t\tbackgroundSessions: [],\n\t\tdowntimeMs: 0,\n\t};\n}\n\nfunction restoreHandlers(state: PersistenceState, toolCtx: TerminalToolContext, bundle: TerminalSessionBundle) {\n\tconst writer = state.manifestWriter;\n\tif (writer === null) throw new Error(\"restore handlers need the bound manifest writer\");\n\tconst registry = bundle.monitors;\n\tconst adopting =\n\t\t(handler: RestoreHandler): RestoreHandler =>\n\t\tasync (monitor, context) => {\n\t\t\tconst result = await handler(monitor, context);\n\t\t\t// Only a LIVE entry is re-adopted, so the next persist keeps it and drops the rest.\n\t\t\tif (result.outcome === \"restored\" || result.outcome === \"muted\") {\n\t\t\t\twriter.adoptRestored(result.runtime === undefined ? monitor : { ...monitor, runtime: result.runtime });\n\t\t\t\tregistry.adoptFireWindow(monitor.monitorId, monitor.fireWindow);\n\t\t\t}\n\t\t\treturn result;\n\t\t};\n\tlet freshFileRuntimeId: string | undefined;\n\tconst checkpointedFile = createCheckpointedFileRestoreHandler({\n\t\tregistry,\n\t\twriter,\n\t\tbindMonitorId: (monitorId, runtimeId) => {\n\t\t\tfreshFileRuntimeId = runtimeId;\n\t\t\tbundle.manager.bindMonitorId(monitorId, runtimeId);\n\t\t},\n\t});\n\treturn {\n\t\t\"restartable-command\": adopting(\n\t\t\tcreateRestartableCommandHandler({\n\t\t\t\tctx: toolCtx,\n\t\t\t\tregistry,\n\t\t\t\t...(restoreSessionTestHooks.graceMs !== undefined ? { graceMs: restoreSessionTestHooks.graceMs } : {}),\n\t\t\t}),\n\t\t),\n\t\t\"checkpointed-file\": adopting(async (monitor, context) => {\n\t\t\tfreshFileRuntimeId = undefined;\n\t\t\tconst result = await checkpointedFile(monitor, context);\n\t\t\tif (result.outcome !== \"restored\" || freshFileRuntimeId === undefined) return result;\n\t\t\treturn { ...result, outcome: reapplyPersistedMute(registry, monitor, freshFileRuntimeId) };\n\t\t}),\n\t};\n}\n\ninterface StartOptions {\n\treadonly pi: ExtensionAPI;\n\treadonly state: PersistenceState;\n\treadonly toolCtx: TerminalToolContext;\n\treadonly sessionKey: string;\n}\n\n/** Non-reload session_start (and a reload that does not hold the lease): take ownership or wait for it. */\nexport async function startPersistence({ pi, state, toolCtx, sessionKey }: StartOptions): Promise<void> {\n\tstate.generation += 1;\n\tstate.digestSlot = createDigestSlot();\n\tconst decided = armDecision(sessionKey);\n\tconst ctx = state.ctx;\n\tconst dir = terminalStateDir(ctx);\n\tconst sessionManager = ctx?.sessionManager;\n\tif (dir === undefined || sessionManager === undefined) return decided();\n\tconst encoded = encodedSessionId(sessionKey);\n\tconst generation = state.generation;\n\n\tconst own = async (lease: AcquireTerminalLeaseResult & { acquired: true }): Promise<void> => {\n\t\tctx?.ui?.setStatus?.(RESTORE_STATUS_KEY, undefined);\n\t\tstate.lease = { path: lease.path, pid: lease.pid, token: lease.token };\n\t\tconst writer = new TerminalManifestWriter({ session: sessionManager });\n\t\tstate.manifestWriter = writer;\n\t\tstate.recordedBackgroundIds.clear();\n\t\tconst bundle = state.bundle;\n\t\tlet restoredFromReadableManifest = false;\n\t\tif (bundle !== null && existsSync(writer.store.filePath)) {\n\t\t\tlet digest: RestoreDigest;\n\t\t\ttry {\n\t\t\t\tdigest = await restoreTerminalState({\n\t\t\t\t\tmanifest: writer.store,\n\t\t\t\t\thandlers: restoreHandlers(state, toolCtx, bundle),\n\t\t\t\t\tsessionFile: sessionManager.getSessionFile?.(),\n\t\t\t\t\tprocessStartedAtMs: ownProcessStartedAtMs(),\n\t\t\t\t});\n\t\t\t} catch (error) {\n\t\t\t\t// A restore that throws (an unreadable transcript, a kill error on a confirmed orphan)\n\t\t\t\t// still decides: the session hears it failed, and the lease stays bound for shutdown.\n\t\t\t\tctx?.ui?.notify?.(`Terminal restore failed: ${errorText(error)}`, \"warning\");\n\t\t\t\tdigest = { ...emptyDigest(), storeError: true };\n\t\t\t}\n\t\t\t// A watch that did not come back never runs again: its baseline dir goes with it.\n\t\t\tawait Promise.all(\n\t\t\t\tdigest.results\n\t\t\t\t\t.filter(\n\t\t\t\t\t\t(result) =>\n\t\t\t\t\t\t\tresult.outcome === \"lost\" || result.outcome === \"expired\" || result.outcome === \"completed\",\n\t\t\t\t\t)\n\t\t\t\t\t.map((result) => removeMonitorStateDir(dir, result.monitorId)),\n\t\t\t);\n\t\t\tif (generation !== state.generation) return;\n\t\t\trestoredFromReadableManifest = !digest.storeError;\n\t\t\tif (digest.storeError || digest.results.length > 0 || digest.backgroundSessions.length > 0) {\n\t\t\t\tstate.digestSlot.set(buildRestoreDigest(digest, { generation, outcome: \"decided\" }));\n\t\t\t}\n\t\t}\n\n\t\t// Bound AFTER the restore read the file: draining queued specs writes the manifest.\n\t\tbindTerminalManifestWriter(sessionKey, writer);\n\t\t// A corrupt manifest is left as it was (fail closed); a readable one is rewritten to the truth.\n\t\tif (restoredFromReadableManifest) await writer.persistRestored();\n\t\tstate.ensurePersistence = null;\n\t\tconst self = { pid: process.pid, bootAtMs: processBootAtMs(), processStartedAtMs: ownProcessStartedAtMs() };\n\t\t// Housekeeping only: a failed sweep leaves the files for the next start to reclaim.\n\t\tvoid sweepTerminalStateDir(dir, { self, keep: new Set([`${encoded}.lease`, `${encoded}.json`]) }).catch(\n\t\t\t() => undefined,\n\t\t);\n\t\tflushRestoreDigest(pi, state);\n\t\tdecided();\n\t};\n\n\tconst wait = (holder: LeaseHolder | null): void => {\n\t\tctx?.ui?.setStatus?.(\n\t\t\tRESTORE_STATUS_KEY,\n\t\t\tholder === null ? \"monitors waiting for the session lease\" : `monitors held by pid ${holder.pid}`,\n\t\t);\n\t\tstate.digestSlot.set(\n\t\t\tbuildRestoreDigest(emptyDigest(), {\n\t\t\t\tgeneration,\n\t\t\t\toutcome: \"deferred\",\n\t\t\t\t...(holder === null ? {} : { holderPid: holder.pid }),\n\t\t\t}),\n\t\t);\n\t\tstate.keeper?.stop();\n\t\tstate.keeper = createLeaseKeeper({\n\t\t\tdir,\n\t\t\tencodedSessionId: encoded,\n\t\t\t...(restoreSessionTestHooks.keeperIntervalMs !== undefined\n\t\t\t\t? { intervalMs: restoreSessionTestHooks.keeperIntervalMs }\n\t\t\t\t: {}),\n\t\t\tonTakeover: (lease) => {\n\t\t\t\tstate.restoreInFlight = own(lease);\n\t\t\t\treturn state.restoreInFlight;\n\t\t\t},\n\t\t\tonError: (error) => {\n\t\t\t\tconst waiting = state.keeper?.state === \"waiting\";\n\t\t\t\tctx?.ui?.notify?.(\n\t\t\t\t\t`Terminal lease ${waiting ? \"check failed, still waiting\" : \"takeover failed\"}: ${errorText(error)}`,\n\t\t\t\t\t\"warning\",\n\t\t\t\t);\n\t\t\t},\n\t\t});\n\t\tstate.keeper.start(holder);\n\t};\n\n\tconst acquire = async (): Promise<void> => {\n\t\t// The lease kept changing (or the dir failed): never leave the session undecided; the keeper retries.\n\t\tconst lease = await acquireTerminalLease({ dir, encodedSessionId: encoded }).catch((error: unknown) => {\n\t\t\tctx?.ui?.notify?.(`Terminal lease not acquired yet, retrying: ${errorText(error)}`, \"warning\");\n\t\t\treturn null;\n\t\t});\n\t\tif (lease === null) return wait(null);\n\t\tif (lease.acquired) {\n\t\t\tstate.restoreInFlight = own(lease);\n\t\t\treturn;\n\t\t}\n\t\twait(lease.holder);\n\t};\n\n\tif (existsSync(createTerminalManifestStore(sessionManager).filePath)) return acquire();\n\t// Nothing to restore: the lease and the recorder wait for the first real registration.\n\tdecided();\n\tlet binding: Promise<void> | null = null;\n\tstate.ensurePersistence = () => {\n\t\tbinding ??= acquire().then(() => state.restoreInFlight);\n\t\treturn binding;\n\t};\n}\n\n/** session_shutdown (not reload): stop waiting, finish any restore, suspend and flush, release. */\nexport async function stopPersistence(state: PersistenceState, sessionKey: string): Promise<void> {\n\tconst keeper = state.keeper;\n\tkeeper?.stop();\n\tstate.keeper = null;\n\t// A tick in flight may still be acquiring (then releases) or taking over (then restores).\n\tawait keeper?.settled();\n\tconst lease = state.lease;\n\tstate.lease = null;\n\tif (lease !== null) retireLeaseToken(lease.token);\n\tawait state.restoreInFlight;\n\tconst writer = state.manifestWriter;\n\tif (writer && state.bundle) await writer.observeMonitorState(state.bundle.monitors.snapshot());\n\tdetachPersistence(state, sessionKey);\n\tif (writer) await writer.recordShutdown();\n\tif (lease !== null) await releaseTerminalLease(lease);\n\tdecisions.get(sessionKey)?.resolve();\n}\n\n/** Detach the manifest recorder without writing (a reload keeps live state instead). */\nexport function detachPersistence(state: PersistenceState, sessionKey: string | undefined): void {\n\tstate.manifestWriter = null;\n\tstate.ensurePersistence = null;\n\tstate.recordedBackgroundIds.clear();\n\tif (sessionKey !== undefined) unbindTerminalManifestWriter(sessionKey);\n}\n"]}

package/dist/core/extensions/builtin/terminal/restore.d.ts

@@ -1,27 +1,34 @@
 /**
- * The terminal manifest's read side and restore orchestrator: the strict fail-closed
- * parse every persisted manifest must survive, plus `restoreTerminalState`, which
- * replays the manifest after a restart. Each monitor is classified by its durability
- * class and handed to that class's handler; ephemeral monitors and background sessions
- * are always lost, and an expired watch never reaches its handler. Both durable
- * handler slots ship as stubs reporting `lost` — later phases plug the real ones in.
+ * The restore orchestrator: `restoreTerminalState` replays the manifest after a restart. Every
+ * monitor is classified up front (expired, ephemeral with or without time left, durable) and the
+ * durable and still-live ephemeral ones are handed to their kind's handler, all concurrently.
+ * The result carries per-monitor outcomes and reasons, background sessions told apart as still
+ * running or exited, and an upper bound on how long the session was detached.
  */
-import { InvalidSidecarStoreError, type SidecarStore, type SidecarStoreRef } from "../../../session-sidecar-store.ts";
-import { type ManifestMonitor, type TerminalManifest } from "./terminal-manifest.ts";
-export declare class InvalidTerminalManifestError extends InvalidSidecarStoreError {
-    constructor(message: string, options?: {
-        cause?: unknown;
-    });
-}
-/** Strict fail-closed domain parse; the sidecar store has already checked version and session. */
-export declare function parseTerminalManifest(raw: unknown, ref: SidecarStoreRef): TerminalManifest;
-export type RestoreOutcome = "restored" | "lost" | "muted" | "attachedElsewhere";
+import type { SidecarStore } from "../../../session-sidecar-store.ts";
+import type { ChildProcessIdentity } from "./process-identity.ts";
+import type { ManifestBackgroundSession, ManifestMonitor, TerminalManifest } from "./terminal-manifest.ts";
+export { InvalidTerminalManifestError, parseTerminalManifest } from "./terminal-manifest-parse.ts";
+export type RestoreOutcome = "restored" | "lost" | "muted" | "completed" | "attachedElsewhere";
 export interface RestoreHandlerResult {
     readonly outcome: RestoreOutcome;
-    /** Why a durable monitor could not be restored; diagnostic only, never part of the digest counts. */
+    /** Why a monitor could not come back (or what its restore did), shown per monitor in the digest. */
     readonly reason?: string;
+    /** The watcher a crash left running: killed before the respawn, or left alone when unverifiable. */
+    readonly orphan?: {
+        readonly pid: number;
+        readonly action: "killed" | "unverified";
+    };
+    /** The re-spawned process, so the manifest can find it after the next crash. */
+    readonly runtime?: ChildProcessIdentity;
 }
-export type RestoreHandler = (monitor: ManifestMonitor) => RestoreHandlerResult | Promise<RestoreHandlerResult>;
+export interface RestoreContext {
+    /** Upper bound on how long the session was detached (never an exact gap). */
+    readonly downtimeMs: number;
+    /** Time left for an ephemeral watch whose deadline has not passed; undefined for durable ones. */
+    readonly remainingMs?: number;
+}
+export type RestoreHandler = (monitor: ManifestMonitor, context: RestoreContext) => RestoreHandlerResult | Promise<RestoreHandlerResult>;
 export interface RestoreHandlers {
     readonly "restartable-command": RestoreHandler;
     readonly "checkpointed-file": RestoreHandler;
@@ -37,20 +44,46 @@ export interface PersistedMuteRegistry {
  * runtime id only, so passing the persisted `mon_` id silently no-ops and the mute is lost.
  */
 export declare function reapplyPersistedMute(registry: PersistedMuteRegistry, monitor: Pick<ManifestMonitor, "deliveryPaused">, runtimeId: string): RestoreOutcome;
-/** Stub durability handlers: every durable monitor is reported lost until later phases land. */
+/** Stub handlers: every monitor is reported lost until a caller plugs the real ones in. */
 export declare const stubRestoreHandlers: RestoreHandlers;
+export type MonitorRestoreOutcome = RestoreOutcome | "expired";
+export interface MonitorRestoreResult {
+    readonly monitorId: string;
+    readonly description: string;
+    readonly kind: ManifestMonitor["runtimeKind"];
+    readonly outcome: MonitorRestoreOutcome;
+    readonly command?: string;
+    readonly path?: string;
+    readonly reason?: string;
+    readonly orphan?: RestoreHandlerResult["orphan"];
+}
+export interface BackgroundRestoreResult {
+    readonly id: string;
+    readonly command: string;
+    readonly outcome: "running" | "exited";
+    readonly pid?: number;
+}
 export interface RestoreDigest {
     restored: number;
     lost: number;
     expired: number;
     muted: number;
+    completed: number;
     attachedElsewhere: number;
     storeError: boolean;
+    readonly results: readonly MonitorRestoreResult[];
+    readonly backgroundSessions: readonly BackgroundRestoreResult[];
+    /** Upper bound on how long the session was detached; 0 when nothing was persisted. */
+    readonly downtimeMs: number;
 }
 export interface RestoreTerminalStateOptions {
     readonly manifest: SidecarStore<TerminalManifest>;
     readonly handlers?: Partial<RestoreHandlers>;
     readonly now?: () => number;
+    /** The session transcript; its last entry written before this process started bounds the downtime. */
+    readonly sessionFile?: string;
+    readonly processStartedAtMs?: number;
+    readonly isBackgroundAlive?: (session: ManifestBackgroundSession) => Promise<boolean>;
 }
 export declare function restoreTerminalState(options: RestoreTerminalStateOptions): Promise<RestoreDigest>;
 //# sourceMappingURL=restore.d.ts.map

package/dist/core/extensions/builtin/terminal/restore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restore.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/restore.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,wBAAwB,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACtH,OAAO,EAEN,KAAK,eAAe,EAEpB,KAAK,gBAAgB,EAErB,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,4BAA6B,SAAQ,wBAAwB;IACzE,YAAY,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,EAGzD;CACD;AAiGD,kGAAkG;AAClG,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,GAAG,gBAAgB,CAW1F;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,mBAAmB,CAAC;AAEjF,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,qGAAqG;IACrG,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,eAAe,KAAK,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEhH,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,qBAAqB,EAAE,cAAc,CAAC;IAC/C,QAAQ,CAAC,mBAAmB,EAAE,cAAc,CAAC;CAC7C;AAED,iFAAiF;AACjF,MAAM,WAAW,qBAAqB;IACrC,KAAK,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;CACxC;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CACnC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,gBAAgB,CAAC,EAChD,SAAS,EAAE,MAAM,GACf,cAAc,CAIhB;AAED,gGAAgG;AAChG,eAAO,MAAM,mBAAmB,EAAE,eAGjC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,2BAA2B;IAC3C,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAClD,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC7C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CAC5B;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,aAAa,CAAC,CAmCvG"}
+{"version":3,"file":"restore.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/restore.ts"],"names":[],"mappings":"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"}

package/dist/core/extensions/builtin/terminal/restore.js

@@ -1,124 +1,13 @@
 /**
- * The terminal manifest's read side and restore orchestrator: the strict fail-closed
- * parse every persisted manifest must survive, plus `restoreTerminalState`, which
- * replays the manifest after a restart. Each monitor is classified by its durability
- * class and handed to that class's handler; ephemeral monitors and background sessions
- * are always lost, and an expired watch never reaches its handler. Both durable
- * handler slots ship as stubs reporting `lost` — later phases plug the real ones in.
+ * The restore orchestrator: `restoreTerminalState` replays the manifest after a restart. Every
+ * monitor is classified up front (expired, ephemeral with or without time left, durable) and the
+ * durable and still-live ephemeral ones are handed to their kind's handler, all concurrently.
+ * The result carries per-monitor outcomes and reasons, background sessions told apart as still
+ * running or exited, and an upper bound on how long the session was detached.
  */
-import { InvalidSidecarStoreError } from "../../../session-sidecar-store.js";
-import { TERMINAL_MANIFEST_VERSION, } from "./terminal-manifest.js";
-export class InvalidTerminalManifestError extends InvalidSidecarStoreError {
-    constructor(message, options) {
-        super(message, options);
-        this.name = "InvalidTerminalManifestError";
-    }
-}
-const RUNTIME_KINDS = ["command", "file"];
-const DURABILITY_CLASSES = ["ephemeral", "restartable-command", "checkpointed-file"];
-const FILE_EVENTS = ["create", "modify"];
-const isStr = (value) => typeof value === "string" && value.length > 0;
-const isNum = (value) => typeof value === "number" && Number.isFinite(value);
-const isBool = (value) => typeof value === "boolean";
-const isObj = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-function invalid(message) {
-    throw new InvalidTerminalManifestError(`terminal manifest is invalid: ${message}`);
-}
-function str(raw, field) {
-    if (!isStr(raw[field]))
-        invalid(`field ${field} must be a non-empty string`);
-    return raw[field];
-}
-function num(raw, field) {
-    if (!isNum(raw[field]))
-        invalid(`field ${field} must be a finite number`);
-    return raw[field];
-}
-function digest(raw, field) {
-    if (typeof raw[field] !== "string")
-        invalid(`field ${field} must be a string`);
-    return raw[field];
-}
-function bool(raw, field) {
-    if (!isBool(raw[field]))
-        invalid(`field ${field} must be a boolean`);
-    return raw[field];
-}
-function opt(raw, field, required) {
-    return raw[field] === undefined ? undefined : required(raw, field);
-}
-function oneOf(values, raw, field) {
-    const value = raw[field];
-    if (typeof value !== "string" || !values.includes(value))
-        invalid(`field ${field} must be one of: ${values.join(", ")}`);
-    return value;
-}
-function checkpoint(raw) {
-    if (!isObj(raw))
-        invalid("field lastCheckpoint must be an object");
-    return {
-        dev: num(raw, "dev"),
-        ino: num(raw, "ino"),
-        size: num(raw, "size"),
-        mtimeMs: num(raw, "mtimeMs"),
-        // A checkpoint without a digest cannot detect a same-size, same-mtime rewrite, so the field is
-        // required — but an absent file legitimately checkpoints an empty digest, so "" is valid.
-        digest: digest(raw, "digest"),
-        present: bool(raw, "present"),
-    };
-}
-function fireWindow(raw) {
-    if (!isObj(raw))
-        invalid("field fireWindow must be an object");
-    return { startMs: num(raw, "startMs"), count: num(raw, "count") };
-}
-function parseMonitor(entry) {
-    if (!isObj(entry))
-        invalid("a monitor entry must be an object");
-    return {
-        monitorId: str(entry, "monitorId"),
-        sessionId: str(entry, "sessionId"),
-        description: str(entry, "description"),
-        runtimeKind: oneOf(RUNTIME_KINDS, entry, "runtimeKind"),
-        durabilityClass: oneOf(DURABILITY_CLASSES, entry, "durabilityClass"),
-        command: opt(entry, "command", str),
-        path: opt(entry, "path", str),
-        event: opt(entry, "event", (raw, field) => oneOf(FILE_EVENTS, raw, field)),
-        filter: opt(entry, "filter", str),
-        cwd: opt(entry, "cwd", str),
-        approvedParent: opt(entry, "approvedParent", str),
-        createdAt: num(entry, "createdAt"),
-        expiresAt: entry.expiresAt === undefined || entry.expiresAt === null ? null : num(entry, "expiresAt"),
-        persistent: bool(entry, "persistent"),
-        suspended: bool(entry, "suspended"),
-        lastCheckpoint: entry.lastCheckpoint === null ? null : checkpoint(entry.lastCheckpoint),
-        deliveryPaused: bool(entry, "deliveryPaused"),
-        // Unknown keys are ignored by this field-by-field parse, so a manifest written before
-        // `wakeCount` was dropped still reads back cleanly; no version bump is needed.
-        fireWindow: fireWindow(entry.fireWindow),
-    };
-}
-function parseBackgroundSession(entry) {
-    if (!isObj(entry))
-        invalid("a background session entry must be an object");
-    return { id: str(entry, "id"), command: str(entry, "command"), startedAtMs: num(entry, "startedAtMs") };
-}
-/** Strict fail-closed domain parse; the sidecar store has already checked version and session. */
-export function parseTerminalManifest(raw, ref) {
-    if (!isObj(raw))
-        invalid("the payload must be an object");
-    if (!Array.isArray(raw.monitors))
-        invalid("field monitors must be an array");
-    if (!Array.isArray(raw.backgroundSessions))
-        invalid("field backgroundSessions must be an array");
-    return {
-        version: TERMINAL_MANIFEST_VERSION,
-        sessionId: ref.sessionId,
-        monitors: raw.monitors.map(parseMonitor),
-        backgroundSessions: raw.backgroundSessions.map(parseBackgroundSession),
-        updatedAt: num(raw, "updatedAt"),
-    };
-}
+import { confirmOwner } from "./orphan-reaper.js";
+import { sessionActivityBeforeMs } from "./session-activity.js";
+export { InvalidTerminalManifestError, parseTerminalManifest } from "./terminal-manifest-parse.js";
 /**
  * Re-apply a persisted `deliveryPaused` mute to a freshly restored monitor and report the
  * outcome it contributes to the digest. The mute MUST be applied by the FRESH runtime id
@@ -131,47 +20,83 @@ export function reapplyPersistedMute(registry, monitor, runtimeId) {
     registry.pause([runtimeId]);
     return "muted";
 }
-/** Stub durability handlers: every durable monitor is reported lost until later phases land. */
+/** Stub handlers: every monitor is reported lost until a caller plugs the real ones in. */
 export const stubRestoreHandlers = {
-    "restartable-command": () => ({ outcome: "lost" }),
-    "checkpointed-file": () => ({ outcome: "lost" }),
+    "restartable-command": () => ({ outcome: "lost", reason: "no restore handler" }),
+    "checkpointed-file": () => ({ outcome: "lost", reason: "no restore handler" }),
 };
-export async function restoreTerminalState(options) {
-    const digest = {
+function emptyDigest() {
+    return {
         restored: 0,
         lost: 0,
         expired: 0,
         muted: 0,
+        completed: 0,
         attachedElsewhere: 0,
         storeError: false,
+        results: [],
+        backgroundSessions: [],
+        downtimeMs: 0,
     };
+}
+async function defaultBackgroundAlive(session) {
+    if (session.runtime === undefined)
+        return false;
+    return (await confirmOwner(session.runtime, undefined)) === "confirmed";
+}
+function resultFor(monitor, outcome, handled) {
+    return {
+        monitorId: monitor.monitorId,
+        description: monitor.description,
+        kind: monitor.runtimeKind,
+        outcome,
+        ...(monitor.command !== undefined ? { command: monitor.command } : {}),
+        ...(monitor.path !== undefined ? { path: monitor.path } : {}),
+        ...(handled?.reason !== undefined ? { reason: handled.reason } : {}),
+        ...(handled?.orphan !== undefined ? { orphan: handled.orphan } : {}),
+    };
+}
+export async function restoreTerminalState(options) {
     let state;
     try {
         state = await options.manifest.read();
     }
     catch {
         // Fail closed: a corrupt or foreign manifest restores nothing and reports the store error.
-        return { ...digest, storeError: true };
+        return { ...emptyDigest(), storeError: true };
     }
     if (state === null)
-        return digest;
+        return emptyDigest();
     const now = (options.now ?? Date.now)();
+    const lastSeen = Math.max(state.updatedAt, (await sessionActivityBeforeMs(options.sessionFile, options.processStartedAtMs ?? now)) ?? 0);
+    const downtimeMs = Math.max(0, now - lastSeen);
     const handlers = { ...stubRestoreHandlers, ...options.handlers };
-    for (const monitor of state.monitors) {
+    const results = await Promise.all(state.monitors.map(async (monitor) => {
         // At the deadline the entry is already expired: the handler must not see it at all.
-        if (monitor.expiresAt !== null && monitor.expiresAt <= now) {
-            digest.expired += 1;
-            continue;
-        }
+        if (monitor.expiresAt !== null && monitor.expiresAt <= now)
+            return resultFor(monitor, "expired");
         if (monitor.durabilityClass === "ephemeral") {
-            digest.lost += 1;
-            continue;
+            if (monitor.deadlineMs === undefined || monitor.deadlineMs <= now) {
+                return resultFor(monitor, "lost", { outcome: "lost", reason: "deadline passed while detached" });
+            }
+            const handler = monitor.runtimeKind === "file" ? handlers["checkpointed-file"] : handlers["restartable-command"];
+            const handled = await handler(monitor, { downtimeMs, remainingMs: monitor.deadlineMs - now });
+            return resultFor(monitor, handled.outcome, handled);
         }
-        const outcome = (await handlers[monitor.durabilityClass](monitor)).outcome;
-        digest[outcome] += 1;
-    }
-    // Background sessions carry no durable identity: every one of them is lost.
-    digest.lost += state.backgroundSessions.length;
+        const handled = await handlers[monitor.durabilityClass](monitor, { downtimeMs });
+        return resultFor(monitor, handled.outcome, handled);
+    }));
+    const isAlive = options.isBackgroundAlive ?? defaultBackgroundAlive;
+    const backgroundSessions = await Promise.all(state.backgroundSessions.map(async (session) => {
+        if (session.runtime !== undefined && (await isAlive(session))) {
+            return { id: session.id, command: session.command, outcome: "running", pid: session.runtime.pid };
+        }
+        return { id: session.id, command: session.command, outcome: "exited" };
+    }));
+    const digest = { ...emptyDigest(), results, backgroundSessions, downtimeMs };
+    for (const result of results)
+        digest[result.outcome] += 1;
+    digest.lost += backgroundSessions.length;
     return digest;
 }
 //# sourceMappingURL=restore.js.map