@code-yeongyu/senpi 2026.9.24-3 → 2026.9.25

package/dist/core/extensions/builtin/terminal/durable-file.js

@@ -42,10 +42,14 @@ const DEFAULT_RESTORED_WATCH_MS = 300_000;
  */
 export function createCheckpointedFileRestoreHandler(deps) {
     const now = deps.now ?? Date.now;
-    return async (monitor) => {
+    return async (monitor, context) => {
         if (monitor.runtimeKind !== "file" || monitor.path === undefined || monitor.cwd === undefined) {
             return lost(`monitor ${monitor.monitorId} is not a restorable file watch`);
         }
+        const ephemeral = monitor.durabilityClass === "ephemeral";
+        if (ephemeral && context.remainingMs === undefined) {
+            return lost(`monitor ${monitor.monitorId} has no time left on its deadline`);
+        }
         const saved = monitor.lastCheckpoint;
         if (saved === null)
             return lost(`monitor ${monitor.monitorId} has no checkpoint to compare against`);
@@ -63,14 +67,17 @@ export function createCheckpointedFileRestoreHandler(deps) {
         }
         let runtimeId;
         try {
+            const startedAt = now();
+            // An ephemeral watch resumes with only the time it had left; a durable one has no deadline.
+            const lifetime = ephemeral && context.remainingMs !== undefined
+                ? { persistent: false, deadlineMs: startedAt + context.remainingMs, timeoutMs: context.remainingMs }
+                : { persistent: true, deadlineMs: null, timeoutMs: remainingMs(monitor, startedAt) };
             const registered = await deps.registry.registerFile({
                 description: monitor.description,
                 path: monitor.path,
                 monitorId: monitor.monitorId,
-                persistent: true,
-                deadlineMs: null,
+                ...lifetime,
                 event: monitor.event ?? "create",
-                timeoutMs: remainingMs(monitor, now()),
                 cwd: monitor.cwd,
                 // Preserve the parent approved at permission time: registerFile re-checks it.
                 ...(monitor.approvedParent !== undefined ? { approvedParent: monitor.approvedParent } : {}),

package/dist/core/extensions/builtin/terminal/durable-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"durable-file.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/durable-file.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The `checkpointed-file` durability class: the restore handler that makes a persistent file\n * watch survive a restart. On create the monitor tool persists the registry's own identity\n * tuple (dev/ino/size/mtimeMs/digest/present) as the manifest checkpoint; here that checkpoint\n * is compared ONCE against the file as it is now, and any change that happened while the process\n * was gone is reported as EXACTLY ONE line through the registry's normal event sink — so the\n * notifier's coalescing and wake budget apply to it exactly as they do to a live watch event.\n *\n * `digest` is load-bearing: without it a same-size, same-mtime rewrite is invisible across a restart.\n */\n\nimport { stat } from \"node:fs/promises\";\nimport { resolve } from \"node:path\";\nimport type { MonitorRegistry } from \"./monitor-registry.ts\";\nimport type { RestoreHandler, RestoreHandlerResult } from \"./restore.ts\";\nimport type { ManifestMonitor, TerminalManifestCheckpoint, TerminalManifestWriter } from \"./terminal-manifest.ts\";\n\n/**\n * What a detached change is reported as. `null` means the file is byte-identical to the checkpoint;\n * `\"gone\"` means it existed at checkpoint time and does not now, which is not restorable.\n */\nexport type DetachedChange = \"created\" | \"replaced\" | \"modified\" | \"gone\" | null;\n\n/** Only what the handler needs, so a caller can hand it a narrower registry/writer. */\nexport interface CheckpointedFileRestoreDeps {\n\treadonly registry: Pick<MonitorRegistry, \"registerFile\" | \"fileCheckpoint\" | \"emitFileLine\" | \"stopFile\">;\n\t/** Optional: the durable checkpoint is re-persisted through the writer when one is bound. */\n\treadonly writer?: Pick<TerminalManifestWriter, \"scheduleCheckpoint\">;\n\t/** Optional: re-bind the stable `mon_` id to its fresh runtime id so kill_bash keeps resolving it. */\n\treadonly bindMonitorId?: (monitorId: string, runtimeId: string) => void;\n\treadonly now?: () => number;\n}\n\n/** The live tuple `registry.fileCheckpoint` returns; identical in shape to the persisted checkpoint. */\ntype LiveCheckpoint = NonNullable<ReturnType<MonitorRegistry[\"fileCheckpoint\"]>>;\n\n/**\n * The single comparison, run once per restore. `created` and `replaced` outrank `modified`:\n * an absent→present transition or a new dev/ino is a stronger statement about the same file.\n */\nexport function classifyDetachedChange(saved: TerminalManifestCheckpoint, live: LiveCheckpoint): DetachedChange {\n\tif (!saved.present) return live.present ? \"created\" : null;\n\tif (!live.present) return \"gone\";\n\tif (live.dev !== saved.dev || live.ino !== saved.ino) return \"replaced\";\n\tif (live.mtimeMs !== saved.mtimeMs || live.size !== saved.size || live.digest !== saved.digest) return \"modified\";\n\treturn null;\n}\n\nfunction lost(reason: string): RestoreHandlerResult {\n\treturn { outcome: \"lost\", reason };\n}\n\n/** Remaining lifetime of a durable watch; a watch with no recorded expiry keeps its default window. */\nfunction remainingMs(monitor: ManifestMonitor, now: number): number {\n\tif (monitor.expiresAt === null) return DEFAULT_RESTORED_WATCH_MS;\n\treturn Math.max(1, monitor.expiresAt - now);\n}\n\nconst DEFAULT_RESTORED_WATCH_MS = 300_000;\n\n/**\n * Build the `checkpointed-file` restore handler. It re-registers the watch under its original\n * `mon_` id and approved parent (so the permission decision still holds), then reports at most\n * one detached-change line. Returns `lost` when the path is gone or unreadable, `restored` otherwise.\n */\nexport function createCheckpointedFileRestoreHandler(deps: CheckpointedFileRestoreDeps): RestoreHandler {\n\tconst now = deps.now ?? Date.now;\n\treturn async (monitor: ManifestMonitor): Promise<RestoreHandlerResult> => {\n\t\tif (monitor.runtimeKind !== \"file\" || monitor.path === undefined || monitor.cwd === undefined) {\n\t\t\treturn lost(`monitor ${monitor.monitorId} is not a restorable file watch`);\n\t\t}\n\t\tconst saved = monitor.lastCheckpoint;\n\t\tif (saved === null) return lost(`monitor ${monitor.monitorId} has no checkpoint to compare against`);\n\t\t// A watch whose file existed at checkpoint time but is gone or unreadable now cannot be\n\t\t// resumed; probe BEFORE re-registering so a lost restore never leaves a live watch behind.\n\t\tif (saved.present) {\n\t\t\ttry {\n\t\t\t\tconst target = await stat(resolve(monitor.cwd, monitor.path));\n\t\t\t\tif (!target.isFile()) return lost(`watched path is no longer a regular file: ${monitor.path}`);\n\t\t\t} catch (error) {\n\t\t\t\treturn lost(`watched path is gone: ${monitor.path} (${error instanceof Error ? error.message : error})`);\n\t\t\t}\n\t\t}\n\n\t\tlet runtimeId: string;\n\t\ttry {\n\t\t\tconst registered = await deps.registry.registerFile({\n\t\t\t\tdescription: monitor.description,\n\t\t\t\tpath: monitor.path,\n\t\t\t\tmonitorId: monitor.monitorId,\n\t\t\t\tpersistent: true,\n\t\t\t\tdeadlineMs: null,\n\t\t\t\tevent: monitor.event ?? \"create\",\n\t\t\t\ttimeoutMs: remainingMs(monitor, now()),\n\t\t\t\tcwd: monitor.cwd,\n\t\t\t\t// Preserve the parent approved at permission time: registerFile re-checks it.\n\t\t\t\t...(monitor.approvedParent !== undefined ? { approvedParent: monitor.approvedParent } : {}),\n\t\t\t\t// The persisted deadline rides through verbatim; a restore never extends it.\n\t\t\t\t...(monitor.expiresAt !== null ? { expiresAt: monitor.expiresAt } : {}),\n\t\t\t});\n\t\t\truntimeId = registered.id;\n\t\t} catch (error) {\n\t\t\treturn lost(`cannot re-watch ${monitor.path}: ${error instanceof Error ? error.message : String(error)}`);\n\t\t}\n\n\t\tconst live = deps.registry.fileCheckpoint(runtimeId);\n\t\tif (live === undefined) return lost(`monitor ${monitor.monitorId} settled before its checkpoint was compared`);\n\n\t\tconst change = classifyDetachedChange(saved, live);\n\t\tif (change === \"gone\") {\n\t\t\t// Lost the race with a deletion between the probe and re-registration: report lost, not a\n\t\t\t// change, and settle the watch just registered so a lost restore leaves nothing behind.\n\t\t\tawait deps.registry.stopFile(runtimeId);\n\t\t\treturn lost(`watched path is gone: ${monitor.path}`);\n\t\t}\n\n\t\tdeps.bindMonitorId?.(monitor.monitorId, runtimeId);\n\t\tif (change !== null) deps.registry.emitFileLine(runtimeId, `changed while detached: ${change} ${monitor.path}`);\n\t\t// Re-checkpoint on every restore: after `replaced` this is the new identity, and otherwise\n\t\t// it re-states the tuple the next restart compares against.\n\t\tdeps.writer?.scheduleCheckpoint(monitor.monitorId, live);\n\t\treturn { outcome: \"restored\" };\n\t};\n}\n"]}
+{"version":3,"file":"durable-file.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/durable-file.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The `checkpointed-file` durability class: the restore handler that makes a persistent file\n * watch survive a restart. On create the monitor tool persists the registry's own identity\n * tuple (dev/ino/size/mtimeMs/digest/present) as the manifest checkpoint; here that checkpoint\n * is compared ONCE against the file as it is now, and any change that happened while the process\n * was gone is reported as EXACTLY ONE line through the registry's normal event sink — so the\n * notifier's coalescing and wake budget apply to it exactly as they do to a live watch event.\n *\n * `digest` is load-bearing: without it a same-size, same-mtime rewrite is invisible across a restart.\n */\n\nimport { stat } from \"node:fs/promises\";\nimport { resolve } from \"node:path\";\nimport type { MonitorRegistry } from \"./monitor-registry.ts\";\nimport type { RestoreContext, RestoreHandler, RestoreHandlerResult } from \"./restore.ts\";\nimport type { ManifestMonitor, TerminalManifestCheckpoint, TerminalManifestWriter } from \"./terminal-manifest.ts\";\n\n/**\n * What a detached change is reported as. `null` means the file is byte-identical to the checkpoint;\n * `\"gone\"` means it existed at checkpoint time and does not now, which is not restorable.\n */\nexport type DetachedChange = \"created\" | \"replaced\" | \"modified\" | \"gone\" | null;\n\n/** Only what the handler needs, so a caller can hand it a narrower registry/writer. */\nexport interface CheckpointedFileRestoreDeps {\n\treadonly registry: Pick<MonitorRegistry, \"registerFile\" | \"fileCheckpoint\" | \"emitFileLine\" | \"stopFile\">;\n\t/** Optional: the durable checkpoint is re-persisted through the writer when one is bound. */\n\treadonly writer?: Pick<TerminalManifestWriter, \"scheduleCheckpoint\">;\n\t/** Optional: re-bind the stable `mon_` id to its fresh runtime id so kill_bash keeps resolving it. */\n\treadonly bindMonitorId?: (monitorId: string, runtimeId: string) => void;\n\treadonly now?: () => number;\n}\n\n/** The live tuple `registry.fileCheckpoint` returns; identical in shape to the persisted checkpoint. */\ntype LiveCheckpoint = NonNullable<ReturnType<MonitorRegistry[\"fileCheckpoint\"]>>;\n\n/**\n * The single comparison, run once per restore. `created` and `replaced` outrank `modified`:\n * an absent→present transition or a new dev/ino is a stronger statement about the same file.\n */\nexport function classifyDetachedChange(saved: TerminalManifestCheckpoint, live: LiveCheckpoint): DetachedChange {\n\tif (!saved.present) return live.present ? \"created\" : null;\n\tif (!live.present) return \"gone\";\n\tif (live.dev !== saved.dev || live.ino !== saved.ino) return \"replaced\";\n\tif (live.mtimeMs !== saved.mtimeMs || live.size !== saved.size || live.digest !== saved.digest) return \"modified\";\n\treturn null;\n}\n\nfunction lost(reason: string): RestoreHandlerResult {\n\treturn { outcome: \"lost\", reason };\n}\n\n/** Remaining lifetime of a durable watch; a watch with no recorded expiry keeps its default window. */\nfunction remainingMs(monitor: ManifestMonitor, now: number): number {\n\tif (monitor.expiresAt === null) return DEFAULT_RESTORED_WATCH_MS;\n\treturn Math.max(1, monitor.expiresAt - now);\n}\n\nconst DEFAULT_RESTORED_WATCH_MS = 300_000;\n\n/**\n * Build the `checkpointed-file` restore handler. It re-registers the watch under its original\n * `mon_` id and approved parent (so the permission decision still holds), then reports at most\n * one detached-change line. Returns `lost` when the path is gone or unreadable, `restored` otherwise.\n */\nexport function createCheckpointedFileRestoreHandler(deps: CheckpointedFileRestoreDeps): RestoreHandler {\n\tconst now = deps.now ?? Date.now;\n\treturn async (monitor: ManifestMonitor, context: RestoreContext): Promise<RestoreHandlerResult> => {\n\t\tif (monitor.runtimeKind !== \"file\" || monitor.path === undefined || monitor.cwd === undefined) {\n\t\t\treturn lost(`monitor ${monitor.monitorId} is not a restorable file watch`);\n\t\t}\n\t\tconst ephemeral = monitor.durabilityClass === \"ephemeral\";\n\t\tif (ephemeral && context.remainingMs === undefined) {\n\t\t\treturn lost(`monitor ${monitor.monitorId} has no time left on its deadline`);\n\t\t}\n\t\tconst saved = monitor.lastCheckpoint;\n\t\tif (saved === null) return lost(`monitor ${monitor.monitorId} has no checkpoint to compare against`);\n\t\t// A watch whose file existed at checkpoint time but is gone or unreadable now cannot be\n\t\t// resumed; probe BEFORE re-registering so a lost restore never leaves a live watch behind.\n\t\tif (saved.present) {\n\t\t\ttry {\n\t\t\t\tconst target = await stat(resolve(monitor.cwd, monitor.path));\n\t\t\t\tif (!target.isFile()) return lost(`watched path is no longer a regular file: ${monitor.path}`);\n\t\t\t} catch (error) {\n\t\t\t\treturn lost(`watched path is gone: ${monitor.path} (${error instanceof Error ? error.message : error})`);\n\t\t\t}\n\t\t}\n\n\t\tlet runtimeId: string;\n\t\ttry {\n\t\t\tconst startedAt = now();\n\t\t\t// An ephemeral watch resumes with only the time it had left; a durable one has no deadline.\n\t\t\tconst lifetime =\n\t\t\t\tephemeral && context.remainingMs !== undefined\n\t\t\t\t\t? { persistent: false, deadlineMs: startedAt + context.remainingMs, timeoutMs: context.remainingMs }\n\t\t\t\t\t: { persistent: true, deadlineMs: null, timeoutMs: remainingMs(monitor, startedAt) };\n\t\t\tconst registered = await deps.registry.registerFile({\n\t\t\t\tdescription: monitor.description,\n\t\t\t\tpath: monitor.path,\n\t\t\t\tmonitorId: monitor.monitorId,\n\t\t\t\t...lifetime,\n\t\t\t\tevent: monitor.event ?? \"create\",\n\t\t\t\tcwd: monitor.cwd,\n\t\t\t\t// Preserve the parent approved at permission time: registerFile re-checks it.\n\t\t\t\t...(monitor.approvedParent !== undefined ? { approvedParent: monitor.approvedParent } : {}),\n\t\t\t\t// The persisted deadline rides through verbatim; a restore never extends it.\n\t\t\t\t...(monitor.expiresAt !== null ? { expiresAt: monitor.expiresAt } : {}),\n\t\t\t});\n\t\t\truntimeId = registered.id;\n\t\t} catch (error) {\n\t\t\treturn lost(`cannot re-watch ${monitor.path}: ${error instanceof Error ? error.message : String(error)}`);\n\t\t}\n\n\t\tconst live = deps.registry.fileCheckpoint(runtimeId);\n\t\tif (live === undefined) return lost(`monitor ${monitor.monitorId} settled before its checkpoint was compared`);\n\n\t\tconst change = classifyDetachedChange(saved, live);\n\t\tif (change === \"gone\") {\n\t\t\t// Lost the race with a deletion between the probe and re-registration: report lost, not a\n\t\t\t// change, and settle the watch just registered so a lost restore leaves nothing behind.\n\t\t\tawait deps.registry.stopFile(runtimeId);\n\t\t\treturn lost(`watched path is gone: ${monitor.path}`);\n\t\t}\n\n\t\tdeps.bindMonitorId?.(monitor.monitorId, runtimeId);\n\t\tif (change !== null) deps.registry.emitFileLine(runtimeId, `changed while detached: ${change} ${monitor.path}`);\n\t\t// Re-checkpoint on every restore: after `replaced` this is the new identity, and otherwise\n\t\t// it re-states the tuple the next restart compares against.\n\t\tdeps.writer?.scheduleCheckpoint(monitor.monitorId, live);\n\t\treturn { outcome: \"restored\" };\n\t};\n}\n"]}

package/dist/core/extensions/builtin/terminal/extension-state.d.ts

@@ -0,0 +1,26 @@
+/** The terminal extension's per-generation state, the bundle event sinks it binds, and the tool context over it. */
+import type { ExtensionAPI, ExtensionContext } from "../../types.ts";
+import type { MonitorNotifier } from "./monitor-notify.ts";
+import type { MonitorStatusTicker } from "./monitor-status-ticker.ts";
+import type { TerminalNotifier } from "./notify.ts";
+import type { PersistenceState } from "./restore-session.ts";
+import { type TerminalEventSinks, TerminalSessionBundle } from "./session-bundle.ts";
+import type { ResolvedTerminalSettings } from "./settings.ts";
+import type { TerminalToolContext } from "./tools/context.ts";
+export interface TerminalExtensionState extends PersistenceState {
+    settings: ResolvedTerminalSettings;
+    notifier: TerminalNotifier | null;
+    monitorNotifier: MonitorNotifier | null;
+    statusTicker: MonitorStatusTicker;
+    shellPath: string | undefined;
+    steppedAside: boolean;
+    noticeShown: boolean;
+    parked: boolean;
+}
+/** Tests and SDK callers may hand partial contexts without a session manager. */
+export declare function sessionKeyOf(ctx: ExtensionContext | undefined): string | undefined;
+export declare function createBundle(state: TerminalExtensionState): TerminalSessionBundle;
+/** Sinks read the live instance state at call time, so notifier swaps need no re-bind. */
+export declare function bundleSinks(pi: ExtensionAPI, state: TerminalExtensionState): TerminalEventSinks;
+export declare function buildToolContext(pi: ExtensionAPI, state: TerminalExtensionState): TerminalToolContext;
+//# sourceMappingURL=extension-state.d.ts.map

package/dist/core/extensions/builtin/terminal/extension-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extension-state.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/extension-state.ts"],"names":[],"mappings":"AAAA,oHAAoH;AAGpH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAMrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,KAAK,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC/D,QAAQ,EAAE,wBAAwB,CAAC;IACnC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,YAAY,EAAE,mBAAmB,CAAC;IAClC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;CAChB;AAED,iFAAiF;AACjF,wBAAgB,YAAY,CAAC,GAAG,EAAE,gBAAgB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAElF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,qBAAqB,CAKjF;AAED,0FAA0F;AAC1F,wBAAgB,WAAW,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,sBAAsB,GAAG,kBAAkB,CA+E/F;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,sBAAsB,GAAG,mBAAmB,CAgDrG"}

package/dist/core/extensions/builtin/terminal/extension-state.js

@@ -0,0 +1,151 @@
+/** The terminal extension's per-generation state, the bundle event sinks it binds, and the tool context over it. */
+import { getShellEnv } from "../../../../utils/shell.js";
+import { TERMINAL_MONITOR_ENDED_EVENT, TERMINAL_MONITOR_STATE_EVENT, WAKE_SOURCE_STATE_EVENT, } from "../monitor-state-event.js";
+import { removeMonitorStateDir, terminalStateDir } from "./monitor-state-dir.js";
+import { TerminalSessionBundle } from "./session-bundle.js";
+/** Tests and SDK callers may hand partial contexts without a session manager. */
+export function sessionKeyOf(ctx) {
+    return ctx?.sessionManager?.getSessionId?.();
+}
+export function createBundle(state) {
+    return new TerminalSessionBundle({
+        maxSessions: state.settings.maxSessions,
+        scrollback: state.settings.scrollback,
+    });
+}
+/** Sinks read the live instance state at call time, so notifier swaps need no re-bind. */
+export function bundleSinks(pi, state) {
+    return {
+        onMonitorEvent: (event) => state.monitorNotifier?.notifyEvent(event),
+        onMonitorEnded: (event) => {
+            pi.events?.emit(TERMINAL_MONITOR_ENDED_EVENT, event);
+            pi.rpc?.emit(TERMINAL_MONITOR_ENDED_EVENT, event);
+            // A watch that ended in this process (its command exited, it was killed or expired) never
+            // runs again, so its restore baseline goes. Disposal is a shutdown or reload: the watch is
+            // suspended, not ended, and a later restore still needs the dir.
+            if (event.reason === "disposed")
+                return;
+            const dir = terminalStateDir(state.ctx);
+            const monitorId = state.bundle?.manager.monitorIdOf(event.id);
+            if (dir === undefined || monitorId === undefined)
+                return;
+            removeMonitorStateDir(dir, monitorId).catch((error) => {
+                state.ctx?.ui?.notify?.(`Could not remove the state dir of ${monitorId}: ${error instanceof Error ? error.message : String(error)}`, "warning");
+            });
+        },
+        onMonitorState: (snapshot, transition = true) => {
+            if (!state.parked)
+                state.statusTicker.sync(snapshot);
+            const payload = {
+                activeCount: snapshot.length,
+                monitors: snapshot.map((entry) => ({
+                    id: entry.id,
+                    description: entry.description,
+                    paused: entry.paused,
+                    startedAtMs: entry.startedAtMs,
+                    command: entry.command,
+                    filter: entry.filter,
+                    persistent: entry.persistent,
+                    deadlineMs: entry.deadlineMs,
+                    fireCount: entry.fireCount,
+                    lastFiredAtMs: entry.lastFiredAtMs,
+                })),
+            };
+            pi.events?.emit(TERMINAL_MONITOR_STATE_EVENT, payload);
+            pi.rpc?.emit(TERMINAL_MONITOR_STATE_EVENT, payload);
+            if (!transition)
+                return;
+            pi.events?.emit(WAKE_SOURCE_STATE_EVENT, {
+                source: "terminal-monitors",
+                activeCount: snapshot.length,
+                monitors: snapshot.map((entry) => ({
+                    id: entry.id,
+                    description: entry.description,
+                    startedAtMs: entry.startedAtMs,
+                })),
+            });
+            if (state.manifestWriter)
+                void state.manifestWriter.observeMonitorState(snapshot);
+        },
+        onBackgroundState: (snapshot) => {
+            pi.events?.emit(WAKE_SOURCE_STATE_EVENT, {
+                source: "terminal-background-sessions",
+                activeCount: snapshot.length,
+                items: snapshot,
+            });
+            const record = () => {
+                const writer = state.manifestWriter;
+                if (!writer)
+                    return;
+                for (const entry of snapshot) {
+                    if (state.recordedBackgroundIds.has(entry.id))
+                        continue;
+                    state.recordedBackgroundIds.add(entry.id);
+                    const identity = state.bundle?.manager.get(entry.id)?.identity();
+                    void writer.recordBackgroundStart(entry.id, entry.description ?? entry.id, entry.startedAtMs, identity);
+                }
+            };
+            if (state.manifestWriter === null && state.ensurePersistence !== null && snapshot.length > 0) {
+                void state.ensurePersistence().then(record);
+                return;
+            }
+            record();
+        },
+        onBackgroundExit: (id, runtime) => {
+            state.recordedBackgroundIds.delete(id);
+            if (state.manifestWriter)
+                void state.manifestWriter.recordBackgroundExit(id);
+            state.notifier?.notifyCompletion(id, runtime);
+        },
+    };
+}
+export function buildToolContext(pi, state) {
+    const requireBundle = () => {
+        // Lazily create a bundle so the tools work even when invoked directly (e.g. via the
+        // SDK) before `session_start` initializes one. `session_start` replaces it with a
+        // settings-configured bundle and tears down any earlier one.
+        if (!state.bundle) {
+            state.bundle = createBundle(state);
+            state.bundle.monitors.setParked(state.parked);
+            state.bundle.bind(bundleSinks(pi, state));
+        }
+        return state.bundle;
+    };
+    return {
+        get manager() {
+            return requireBundle().manager;
+        },
+        get cwd() {
+            return state.ctx?.cwd ?? process.cwd();
+        },
+        get shellPath() {
+            return state.shellPath;
+        },
+        get defaultCols() {
+            return state.settings.defaultCols;
+        },
+        get defaultRows() {
+            return state.settings.defaultRows;
+        },
+        get timeoutAction() {
+            return state.settings.timeoutAction;
+        },
+        get monitorRegistry() {
+            return requireBundle().monitors;
+        },
+        getEnv: () => getShellEnv(),
+        getSessionContext: () => state.ctx,
+        // Exit listeners registered before a reload reach the post-reload owner through the
+        // shared bundle, so this must dispatch via the bundle, never the instance notifier.
+        onBackgroundStart: (id, description, startedAtMs) => {
+            state.bundle?.notifyBackgroundStart(id, description, startedAtMs);
+        },
+        onBackgroundExit: (id, runtime) => {
+            state.bundle?.notifyBackgroundExit(id, runtime);
+        },
+        onMonitorRearmed: (id) => state.monitorNotifier?.rearm(id),
+        onMonitorsResumed: (ids) => state.monitorNotifier?.resume(ids),
+        ensurePersistence: () => state.ensurePersistence?.() ?? Promise.resolve(),
+    };
+}
+//# sourceMappingURL=extension-state.js.map

package/dist/core/extensions/builtin/terminal/extension-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extension-state.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/extension-state.ts"],"names":[],"mappings":"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","sourcesContent":["/** The terminal extension's per-generation state, the bundle event sinks it binds, and the tool context over it. */\n\nimport { getShellEnv } from \"../../../../utils/shell.ts\";\nimport type { ExtensionAPI, ExtensionContext } from \"../../types.ts\";\nimport {\n\tTERMINAL_MONITOR_ENDED_EVENT,\n\tTERMINAL_MONITOR_STATE_EVENT,\n\tWAKE_SOURCE_STATE_EVENT,\n} from \"../monitor-state-event.ts\";\nimport type { MonitorNotifier } from \"./monitor-notify.ts\";\nimport { removeMonitorStateDir, terminalStateDir } from \"./monitor-state-dir.ts\";\nimport type { MonitorStatusTicker } from \"./monitor-status-ticker.ts\";\nimport type { TerminalNotifier } from \"./notify.ts\";\nimport type { PersistenceState } from \"./restore-session.ts\";\nimport type { TerminalRuntimeSession } from \"./runtime-session.ts\";\nimport { type TerminalEventSinks, TerminalSessionBundle } from \"./session-bundle.ts\";\nimport type { ResolvedTerminalSettings } from \"./settings.ts\";\nimport type { TerminalToolContext } from \"./tools/context.ts\";\n\nexport interface TerminalExtensionState extends PersistenceState {\n\tsettings: ResolvedTerminalSettings;\n\tnotifier: TerminalNotifier | null;\n\tmonitorNotifier: MonitorNotifier | null;\n\tstatusTicker: MonitorStatusTicker;\n\tshellPath: string | undefined;\n\tsteppedAside: boolean;\n\tnoticeShown: boolean;\n\tparked: boolean;\n}\n\n/** Tests and SDK callers may hand partial contexts without a session manager. */\nexport function sessionKeyOf(ctx: ExtensionContext | undefined): string | undefined {\n\treturn ctx?.sessionManager?.getSessionId?.();\n}\n\nexport function createBundle(state: TerminalExtensionState): TerminalSessionBundle {\n\treturn new TerminalSessionBundle({\n\t\tmaxSessions: state.settings.maxSessions,\n\t\tscrollback: state.settings.scrollback,\n\t});\n}\n\n/** Sinks read the live instance state at call time, so notifier swaps need no re-bind. */\nexport function bundleSinks(pi: ExtensionAPI, state: TerminalExtensionState): TerminalEventSinks {\n\treturn {\n\t\tonMonitorEvent: (event) => state.monitorNotifier?.notifyEvent(event),\n\t\tonMonitorEnded: (event) => {\n\t\t\tpi.events?.emit(TERMINAL_MONITOR_ENDED_EVENT, event);\n\t\t\tpi.rpc?.emit(TERMINAL_MONITOR_ENDED_EVENT, event);\n\t\t\t// A watch that ended in this process (its command exited, it was killed or expired) never\n\t\t\t// runs again, so its restore baseline goes. Disposal is a shutdown or reload: the watch is\n\t\t\t// suspended, not ended, and a later restore still needs the dir.\n\t\t\tif (event.reason === \"disposed\") return;\n\t\t\tconst dir = terminalStateDir(state.ctx);\n\t\t\tconst monitorId = state.bundle?.manager.monitorIdOf(event.id);\n\t\t\tif (dir === undefined || monitorId === undefined) return;\n\t\t\tremoveMonitorStateDir(dir, monitorId).catch((error: unknown) => {\n\t\t\t\tstate.ctx?.ui?.notify?.(\n\t\t\t\t\t`Could not remove the state dir of ${monitorId}: ${error instanceof Error ? error.message : String(error)}`,\n\t\t\t\t\t\"warning\",\n\t\t\t\t);\n\t\t\t});\n\t\t},\n\t\tonMonitorState: (snapshot, transition = true) => {\n\t\t\tif (!state.parked) state.statusTicker.sync(snapshot);\n\t\t\tconst payload = {\n\t\t\t\tactiveCount: snapshot.length,\n\t\t\t\tmonitors: snapshot.map((entry) => ({\n\t\t\t\t\tid: entry.id,\n\t\t\t\t\tdescription: entry.description,\n\t\t\t\t\tpaused: entry.paused,\n\t\t\t\t\tstartedAtMs: entry.startedAtMs,\n\t\t\t\t\tcommand: entry.command,\n\t\t\t\t\tfilter: entry.filter,\n\t\t\t\t\tpersistent: entry.persistent,\n\t\t\t\t\tdeadlineMs: entry.deadlineMs,\n\t\t\t\t\tfireCount: entry.fireCount,\n\t\t\t\t\tlastFiredAtMs: entry.lastFiredAtMs,\n\t\t\t\t})),\n\t\t\t};\n\t\t\tpi.events?.emit(TERMINAL_MONITOR_STATE_EVENT, payload);\n\t\t\tpi.rpc?.emit(TERMINAL_MONITOR_STATE_EVENT, payload);\n\t\t\tif (!transition) return;\n\t\t\tpi.events?.emit(WAKE_SOURCE_STATE_EVENT, {\n\t\t\t\tsource: \"terminal-monitors\",\n\t\t\t\tactiveCount: snapshot.length,\n\t\t\t\tmonitors: snapshot.map((entry) => ({\n\t\t\t\t\tid: entry.id,\n\t\t\t\t\tdescription: entry.description,\n\t\t\t\t\tstartedAtMs: entry.startedAtMs,\n\t\t\t\t})),\n\t\t\t});\n\t\t\tif (state.manifestWriter) void state.manifestWriter.observeMonitorState(snapshot);\n\t\t},\n\t\tonBackgroundState: (snapshot) => {\n\t\t\tpi.events?.emit(WAKE_SOURCE_STATE_EVENT, {\n\t\t\t\tsource: \"terminal-background-sessions\",\n\t\t\t\tactiveCount: snapshot.length,\n\t\t\t\titems: snapshot,\n\t\t\t});\n\t\t\tconst record = (): void => {\n\t\t\t\tconst writer = state.manifestWriter;\n\t\t\t\tif (!writer) return;\n\t\t\t\tfor (const entry of snapshot) {\n\t\t\t\t\tif (state.recordedBackgroundIds.has(entry.id)) continue;\n\t\t\t\t\tstate.recordedBackgroundIds.add(entry.id);\n\t\t\t\t\tconst identity = state.bundle?.manager.get(entry.id)?.identity();\n\t\t\t\t\tvoid writer.recordBackgroundStart(entry.id, entry.description ?? entry.id, entry.startedAtMs, identity);\n\t\t\t\t}\n\t\t\t};\n\t\t\tif (state.manifestWriter === null && state.ensurePersistence !== null && snapshot.length > 0) {\n\t\t\t\tvoid state.ensurePersistence().then(record);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\trecord();\n\t\t},\n\t\tonBackgroundExit: (id, runtime) => {\n\t\t\tstate.recordedBackgroundIds.delete(id);\n\t\t\tif (state.manifestWriter) void state.manifestWriter.recordBackgroundExit(id);\n\t\t\tstate.notifier?.notifyCompletion(id, runtime);\n\t\t},\n\t};\n}\n\nexport function buildToolContext(pi: ExtensionAPI, state: TerminalExtensionState): TerminalToolContext {\n\tconst requireBundle = (): TerminalSessionBundle => {\n\t\t// Lazily create a bundle so the tools work even when invoked directly (e.g. via the\n\t\t// SDK) before `session_start` initializes one. `session_start` replaces it with a\n\t\t// settings-configured bundle and tears down any earlier one.\n\t\tif (!state.bundle) {\n\t\t\tstate.bundle = createBundle(state);\n\t\t\tstate.bundle.monitors.setParked(state.parked);\n\t\t\tstate.bundle.bind(bundleSinks(pi, state));\n\t\t}\n\t\treturn state.bundle;\n\t};\n\treturn {\n\t\tget manager() {\n\t\t\treturn requireBundle().manager;\n\t\t},\n\t\tget cwd() {\n\t\t\treturn state.ctx?.cwd ?? process.cwd();\n\t\t},\n\t\tget shellPath() {\n\t\t\treturn state.shellPath;\n\t\t},\n\t\tget defaultCols() {\n\t\t\treturn state.settings.defaultCols;\n\t\t},\n\t\tget defaultRows() {\n\t\t\treturn state.settings.defaultRows;\n\t\t},\n\t\tget timeoutAction() {\n\t\t\treturn state.settings.timeoutAction;\n\t\t},\n\t\tget monitorRegistry() {\n\t\t\treturn requireBundle().monitors;\n\t\t},\n\t\tgetEnv: () => getShellEnv(),\n\t\tgetSessionContext: () => state.ctx,\n\t\t// Exit listeners registered before a reload reach the post-reload owner through the\n\t\t// shared bundle, so this must dispatch via the bundle, never the instance notifier.\n\t\tonBackgroundStart: (id: string, description: string, startedAtMs: number) => {\n\t\t\tstate.bundle?.notifyBackgroundStart(id, description, startedAtMs);\n\t\t},\n\t\tonBackgroundExit: (id: string, runtime: TerminalRuntimeSession) => {\n\t\t\tstate.bundle?.notifyBackgroundExit(id, runtime);\n\t\t},\n\t\tonMonitorRearmed: (id: string) => state.monitorNotifier?.rearm(id),\n\t\tonMonitorsResumed: (ids: readonly string[]) => state.monitorNotifier?.resume(ids),\n\t\tensurePersistence: () => state.ensurePersistence?.() ?? Promise.resolve(),\n\t};\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/extension.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,gBAAgB,CAAC;AAkYrE,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CA6JhE;eAEc,yBAAyB"}
+{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/extension.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,gBAAgB,CAAC;AA2DrE,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CA0KhE;eAEc,yBAAyB"}