@code-yeongyu/senpi 2026.7.30 → 2026.7.31-2

package/dist/core/extensions/builtin/terminal/monitor-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"monitor-registry.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-registry.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TerminalRuntimeSession } from \"./runtime-session.ts\";\nimport { describeExit } from \"./tools/spawn.ts\";\n\nexport interface MonitorLineEvent {\n\treadonly type: \"line\";\n\treadonly id: string;\n\treadonly description: string;\n\treadonly line: string;\n}\n\nexport interface MonitorSummaryEvent {\n\treadonly type: \"summary\";\n\treadonly id: string;\n\treadonly description: string;\n\treadonly summary: string;\n}\n\nexport type MonitorEvent = MonitorLineEvent | MonitorSummaryEvent;\n\nexport type MonitorRearmResult = \"rearmed\" | \"not_paused\" | \"not_found\";\n\nexport interface MonitorSnapshotEntry {\n\treadonly id: string;\n\treadonly description: string;\n\treadonly paused: boolean;\n}\n\nexport interface MonitorRegistryOptions {\n\t/** Observes every registry transition (register/pause/rearm/settle/dispose) with the live snapshot. */\n\treadonly onChange?: (snapshot: readonly MonitorSnapshotEntry[]) => void;\n}\n\nexport interface RegisterMonitorOptions {\n\treadonly id: string;\n\treadonly description: string;\n\treadonly runtime: TerminalRuntimeSession;\n\treadonly filter?: RegExp;\n}\n\ninterface MonitorRecord {\n\treadonly id: string;\n\treadonly description: string;\n\treadonly runtime: TerminalRuntimeSession;\n\treadonly filter: RegExp | undefined;\n\tlineBuffer: string;\n\tpaused: boolean;\n\tsettled: boolean;\n\tunsubscribeOutput: (() => void) | undefined;\n\tunsubscribeExit: (() => void) | undefined;\n}\n\n/**\n * Tracks active monitor sessions alongside the terminal manager's existing bash-id registry.\n * Output is deliberately retained only by TerminalRuntimeSession's bounded history; this\n * registry holds at most one unfinished line for each live monitor.\n */\nexport class MonitorRegistry {\n\treadonly #records = new Map<string, MonitorRecord>();\n\treadonly #emit: (event: MonitorEvent) => void;\n\treadonly #onChange: ((snapshot: readonly MonitorSnapshotEntry[]) => void) | undefined;\n\n\tconstructor(emit: (event: MonitorEvent) => void, options?: MonitorRegistryOptions) {\n\t\tthis.#emit = emit;\n\t\tthis.#onChange = options?.onChange;\n\t}\n\n\tsnapshot(): readonly MonitorSnapshotEntry[] {\n\t\treturn [...this.#records.values()].map((record) => ({\n\t\t\tid: record.id,\n\t\t\tdescription: record.description,\n\t\t\tpaused: record.paused,\n\t\t}));\n\t}\n\n\tregister(options: RegisterMonitorOptions): void {\n\t\tconst record: MonitorRecord = {\n\t\t\tid: options.id,\n\t\t\tdescription: options.description,\n\t\t\truntime: options.runtime,\n\t\t\tfilter: options.filter,\n\t\t\tlineBuffer: \"\",\n\t\t\tpaused: false,\n\t\t\tsettled: false,\n\t\t\tunsubscribeOutput: undefined,\n\t\t\tunsubscribeExit: undefined,\n\t\t};\n\t\tthis.#records.set(record.id, record);\n\t\tthis.#notifyChange();\n\n\t\t// Runtime output is already bounded. Read what was produced before monitor registration,\n\t\t// then subscribe synchronously so a fast watcher cannot lose its first line.\n\t\tthis.#consume(record, record.runtime.fullOutput());\n\t\trecord.unsubscribeOutput = record.runtime.onOutput((chunk) => this.#consume(record, chunk));\n\t\trecord.unsubscribeExit = record.runtime.session.onExit(() => this.#settle(record));\n\t\tif (record.runtime.exited) this.#settle(record);\n\t}\n\n\tpauseAll(): string[] {\n\t\tconst paused: string[] = [];\n\t\tfor (const record of this.#records.values()) {\n\t\t\tif (record.paused) continue;\n\t\t\trecord.paused = true;\n\t\t\tpaused.push(record.id);\n\t\t}\n\t\tif (paused.length > 0) this.#notifyChange();\n\t\treturn paused;\n\t}\n\n\trearm(id: string): MonitorRearmResult {\n\t\tconst record = this.#records.get(id);\n\t\tif (!record) return \"not_found\";\n\t\tif (!record.paused) return \"not_paused\";\n\t\trecord.paused = false;\n\t\tthis.#notifyChange();\n\t\treturn \"rearmed\";\n\t}\n\n\tdispose(): void {\n\t\tfor (const record of this.#records.values()) this.#disposeRecord(record);\n\t\tthis.#records.clear();\n\t\tthis.#notifyChange();\n\t}\n\n\t#notifyChange(): void {\n\t\tthis.#onChange?.(this.snapshot());\n\t}\n\n\t#consume(record: MonitorRecord, chunk: string): void {\n\t\tif (record.settled || chunk.length === 0) return;\n\t\tlet remaining = record.lineBuffer + chunk;\n\t\tfor (;;) {\n\t\t\tconst newline = remaining.indexOf(\"\\n\");\n\t\t\tif (newline < 0) break;\n\t\t\tconst rawLine = remaining.slice(0, newline);\n\t\t\tremaining = remaining.slice(newline + 1);\n\t\t\tconst line = rawLine.endsWith(\"\\r\") ? rawLine.slice(0, -1) : rawLine;\n\t\t\tif (record.paused || (record.filter && !record.filter.test(line))) continue;\n\t\t\tthis.#emit({ type: \"line\", id: record.id, description: record.description, line });\n\t\t}\n\t\trecord.lineBuffer = remaining;\n\t}\n\n\t#settle(record: MonitorRecord): void {\n\t\tif (record.settled) return;\n\t\trecord.settled = true;\n\t\trecord.unsubscribeOutput?.();\n\t\trecord.unsubscribeExit?.();\n\t\tthis.#records.delete(record.id);\n\t\tthis.#notifyChange();\n\t\tconst status = describeExit(record.runtime) ?? \"exited\";\n\t\tconst code = record.runtime.exitResult?.exitCode;\n\t\tconst codeText = code === null || code === undefined ? \"\" : ` (exit code ${code})`;\n\t\tthis.#emit({\n\t\t\ttype: \"summary\",\n\t\t\tid: record.id,\n\t\t\tdescription: record.description,\n\t\t\tsummary: `watcher ${status}${codeText}`,\n\t\t});\n\t}\n\n\t#disposeRecord(record: MonitorRecord): void {\n\t\trecord.settled = true;\n\t\trecord.unsubscribeOutput?.();\n\t\trecord.unsubscribeExit?.();\n\t}\n}\n"]}
+{"version":3,"file":"monitor-registry.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-registry.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TerminalRuntimeSession } from \"./runtime-session.ts\";\nimport { describeExit } from \"./tools/spawn.ts\";\n\nexport interface MonitorLineEvent {\n\treadonly type: \"line\";\n\treadonly id: string;\n\treadonly description: string;\n\treadonly line: string;\n}\n\nexport interface MonitorSummaryEvent {\n\treadonly type: \"summary\";\n\treadonly id: string;\n\treadonly description: string;\n\treadonly summary: string;\n}\n\nexport type MonitorEvent = MonitorLineEvent | MonitorSummaryEvent;\n\nexport type MonitorRearmResult = \"rearmed\" | \"not_paused\" | \"not_found\";\n\nexport interface MonitorSnapshotEntry {\n\treadonly id: string;\n\treadonly description: string;\n\treadonly paused: boolean;\n\t/** Epoch milliseconds when the watch registered; feeds the footer's live elapsed label. */\n\treadonly startedAtMs: number;\n}\n\nexport interface MonitorRegistryOptions {\n\t/** Observes every registry transition (register/pause/rearm/settle/dispose) with the live snapshot. */\n\treadonly onChange?: (snapshot: readonly MonitorSnapshotEntry[]) => void;\n}\n\nexport interface RegisterMonitorOptions {\n\treadonly id: string;\n\treadonly description: string;\n\treadonly runtime: TerminalRuntimeSession;\n\treadonly filter?: RegExp;\n}\n\ninterface MonitorRecord {\n\treadonly id: string;\n\treadonly description: string;\n\treadonly startedAtMs: number;\n\treadonly runtime: TerminalRuntimeSession;\n\treadonly filter: RegExp | undefined;\n\tlineBuffer: string;\n\tpaused: boolean;\n\tsettled: boolean;\n\tunsubscribeOutput: (() => void) | undefined;\n\tunsubscribeExit: (() => void) | undefined;\n}\n\n/**\n * Tracks active monitor sessions alongside the terminal manager's existing bash-id registry.\n * Output is deliberately retained only by TerminalRuntimeSession's bounded history; this\n * registry holds at most one unfinished line for each live monitor.\n */\nexport class MonitorRegistry {\n\treadonly #records = new Map<string, MonitorRecord>();\n\treadonly #emit: (event: MonitorEvent) => void;\n\treadonly #onChange: ((snapshot: readonly MonitorSnapshotEntry[]) => void) | undefined;\n\n\tconstructor(emit: (event: MonitorEvent) => void, options?: MonitorRegistryOptions) {\n\t\tthis.#emit = emit;\n\t\tthis.#onChange = options?.onChange;\n\t}\n\n\tsnapshot(): readonly MonitorSnapshotEntry[] {\n\t\treturn [...this.#records.values()].map((record) => ({\n\t\t\tid: record.id,\n\t\t\tdescription: record.description,\n\t\t\tpaused: record.paused,\n\t\t\tstartedAtMs: record.startedAtMs,\n\t\t}));\n\t}\n\n\tregister(options: RegisterMonitorOptions): void {\n\t\tconst record: MonitorRecord = {\n\t\t\tid: options.id,\n\t\t\tdescription: options.description,\n\t\t\tstartedAtMs: Date.now(),\n\t\t\truntime: options.runtime,\n\t\t\tfilter: options.filter,\n\t\t\tlineBuffer: \"\",\n\t\t\tpaused: false,\n\t\t\tsettled: false,\n\t\t\tunsubscribeOutput: undefined,\n\t\t\tunsubscribeExit: undefined,\n\t\t};\n\t\tthis.#records.set(record.id, record);\n\t\tthis.#notifyChange();\n\n\t\t// Runtime output is already bounded. Read what was produced before monitor registration,\n\t\t// then subscribe synchronously so a fast watcher cannot lose its first line.\n\t\tthis.#consume(record, record.runtime.fullOutput());\n\t\trecord.unsubscribeOutput = record.runtime.onOutput((chunk) => this.#consume(record, chunk));\n\t\trecord.unsubscribeExit = record.runtime.session.onExit(() => this.#settle(record));\n\t\tif (record.runtime.exited) this.#settle(record);\n\t}\n\n\tpauseAll(): string[] {\n\t\tconst paused: string[] = [];\n\t\tfor (const record of this.#records.values()) {\n\t\t\tif (record.paused) continue;\n\t\t\trecord.paused = true;\n\t\t\tpaused.push(record.id);\n\t\t}\n\t\tif (paused.length > 0) this.#notifyChange();\n\t\treturn paused;\n\t}\n\n\trearm(id: string): MonitorRearmResult {\n\t\tconst record = this.#records.get(id);\n\t\tif (!record) return \"not_found\";\n\t\tif (!record.paused) return \"not_paused\";\n\t\trecord.paused = false;\n\t\tthis.#notifyChange();\n\t\treturn \"rearmed\";\n\t}\n\n\tdispose(): void {\n\t\tfor (const record of this.#records.values()) this.#disposeRecord(record);\n\t\tthis.#records.clear();\n\t\tthis.#notifyChange();\n\t}\n\n\t#notifyChange(): void {\n\t\tthis.#onChange?.(this.snapshot());\n\t}\n\n\t#consume(record: MonitorRecord, chunk: string): void {\n\t\tif (record.settled || chunk.length === 0) return;\n\t\tlet remaining = record.lineBuffer + chunk;\n\t\tfor (;;) {\n\t\t\tconst newline = remaining.indexOf(\"\\n\");\n\t\t\tif (newline < 0) break;\n\t\t\tconst rawLine = remaining.slice(0, newline);\n\t\t\tremaining = remaining.slice(newline + 1);\n\t\t\tconst line = rawLine.endsWith(\"\\r\") ? rawLine.slice(0, -1) : rawLine;\n\t\t\tif (record.paused || (record.filter && !record.filter.test(line))) continue;\n\t\t\tthis.#emit({ type: \"line\", id: record.id, description: record.description, line });\n\t\t}\n\t\trecord.lineBuffer = remaining;\n\t}\n\n\t#settle(record: MonitorRecord): void {\n\t\tif (record.settled) return;\n\t\trecord.settled = true;\n\t\trecord.unsubscribeOutput?.();\n\t\trecord.unsubscribeExit?.();\n\t\tthis.#records.delete(record.id);\n\t\tthis.#notifyChange();\n\t\tconst status = describeExit(record.runtime) ?? \"exited\";\n\t\tconst code = record.runtime.exitResult?.exitCode;\n\t\tconst codeText = code === null || code === undefined ? \"\" : ` (exit code ${code})`;\n\t\tthis.#emit({\n\t\t\ttype: \"summary\",\n\t\t\tid: record.id,\n\t\t\tdescription: record.description,\n\t\t\tsummary: `watcher ${status}${codeText}`,\n\t\t});\n\t}\n\n\t#disposeRecord(record: MonitorRecord): void {\n\t\trecord.settled = true;\n\t\trecord.unsubscribeOutput?.();\n\t\trecord.unsubscribeExit?.();\n\t}\n}\n"]}

package/dist/core/extensions/builtin/terminal/monitor-status-ticker.d.ts

@@ -0,0 +1,37 @@
+import type { MonitorSnapshotEntry } from "./monitor-registry.ts";
+/** Footer live-elapsed refresh cadence while at least one watch is active. */
+export declare const MONITOR_STATUS_TICK_INTERVAL_MS = 1000;
+/** Receives the freshly formatted footer status text (undefined clears the status). */
+export type MonitorStatusRender = (status: string | undefined) => void;
+export interface MonitorStatusTickerOptions {
+    readonly render: MonitorStatusRender;
+    /** Injectable clock for tests; defaults to Date.now. */
+    readonly now?: () => number;
+}
+/**
+ * Drives a once-per-second footer refresh while monitors are active so the
+ * "◉ watching … (Ns)" elapsed label advances live instead of freezing between
+ * registry transitions. Mirrors the goal builtin's GoalElapsedTicker: the
+ * interval is unref'd so it never keeps the process alive, and ticks that
+ * produce the already-rendered label are skipped.
+ */
+export declare class MonitorStatusTicker {
+    private readonly render;
+    private readonly now;
+    private intervalId;
+    private snapshot;
+    private lastRenderedStatus;
+    private hasRendered;
+    constructor(options: MonitorStatusTickerOptions);
+    get running(): boolean;
+    /**
+     * Point the ticker at the current monitor snapshot, render once immediately,
+     * and start the interval when watches are live (or stop it when none remain).
+     */
+    sync(snapshot: readonly MonitorSnapshotEntry[]): void;
+    /** Stop the interval and drop the retained snapshot. */
+    stop(): void;
+    private stopInterval;
+    private tick;
+}
+//# sourceMappingURL=monitor-status-ticker.d.ts.map

package/dist/core/extensions/builtin/terminal/monitor-status-ticker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"monitor-status-ticker.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-status-ticker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAGlE,8EAA8E;AAC9E,eAAO,MAAM,+BAA+B,OAAO,CAAC;AAEpD,uFAAuF;AACvF,MAAM,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;AAEvE,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IACrC,wDAAwD;IACxD,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CAC5B;AAED;;;;;;GAMG;AACH,qBAAa,mBAAmB;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,QAAQ,CAAuC;IACvD,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,WAAW,CAAS;IAE5B,YAAY,OAAO,EAAE,0BAA0B,EAG9C;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;;OAGG;IACH,IAAI,CAAC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,GAAG,IAAI,CAYpD;IAED,wDAAwD;IACxD,IAAI,IAAI,IAAI,CAKX;IAED,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,IAAI;CAOZ"}

package/dist/core/extensions/builtin/terminal/monitor-status-ticker.js

@@ -0,0 +1,61 @@
+import { formatMonitorStatus } from "./monitor-status.js";
+/** Footer live-elapsed refresh cadence while at least one watch is active. */
+export const MONITOR_STATUS_TICK_INTERVAL_MS = 1000;
+/**
+ * Drives a once-per-second footer refresh while monitors are active so the
+ * "◉ watching … (Ns)" elapsed label advances live instead of freezing between
+ * registry transitions. Mirrors the goal builtin's GoalElapsedTicker: the
+ * interval is unref'd so it never keeps the process alive, and ticks that
+ * produce the already-rendered label are skipped.
+ */
+export class MonitorStatusTicker {
+    constructor(options) {
+        this.snapshot = [];
+        this.hasRendered = false;
+        this.render = options.render;
+        this.now = options.now ?? Date.now;
+    }
+    get running() {
+        return this.intervalId !== undefined;
+    }
+    /**
+     * Point the ticker at the current monitor snapshot, render once immediately,
+     * and start the interval when watches are live (or stop it when none remain).
+     */
+    sync(snapshot) {
+        this.snapshot = snapshot;
+        this.hasRendered = false;
+        this.tick();
+        if (snapshot.length === 0) {
+            this.stopInterval();
+            return;
+        }
+        if (this.intervalId !== undefined)
+            return;
+        const handle = setInterval(() => this.tick(), MONITOR_STATUS_TICK_INTERVAL_MS);
+        handle.unref();
+        this.intervalId = handle;
+    }
+    /** Stop the interval and drop the retained snapshot. */
+    stop() {
+        this.stopInterval();
+        this.snapshot = [];
+        this.lastRenderedStatus = undefined;
+        this.hasRendered = false;
+    }
+    stopInterval() {
+        if (this.intervalId !== undefined) {
+            clearInterval(this.intervalId);
+            this.intervalId = undefined;
+        }
+    }
+    tick() {
+        const status = formatMonitorStatus(this.snapshot, this.now());
+        if (this.hasRendered && status === this.lastRenderedStatus)
+            return;
+        this.hasRendered = true;
+        this.lastRenderedStatus = status;
+        this.render(status);
+    }
+}
+//# sourceMappingURL=monitor-status-ticker.js.map

package/dist/core/extensions/builtin/terminal/monitor-status-ticker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"monitor-status-ticker.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-status-ticker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,8EAA8E;AAC9E,MAAM,CAAC,MAAM,+BAA+B,GAAG,IAAI,CAAC;AAWpD;;;;;;GAMG;AACH,MAAM,OAAO,mBAAmB;IAQ/B,YAAY,OAAmC;QAJvC,aAAQ,GAAoC,EAAE,CAAC;QAE/C,gBAAW,GAAG,KAAK,CAAC;QAG3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACpC,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,QAAyC;QAC7C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,OAAO;QACR,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS;YAAE,OAAO;QAC1C,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,+BAA+B,CAAC,CAAC;QAC/E,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;IAC1B,CAAC;IAED,wDAAwD;IACxD,IAAI;QACH,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;QACpC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC1B,CAAC;IAEO,YAAY;QACnB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACnC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC7B,CAAC;IACF,CAAC;IAEO,IAAI;QACX,MAAM,MAAM,GAAG,mBAAmB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC9D,IAAI,IAAI,CAAC,WAAW,IAAI,MAAM,KAAK,IAAI,CAAC,kBAAkB;YAAE,OAAO;QACnE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;CACD","sourcesContent":["import type { MonitorSnapshotEntry } from \"./monitor-registry.ts\";\nimport { formatMonitorStatus } from \"./monitor-status.ts\";\n\n/** Footer live-elapsed refresh cadence while at least one watch is active. */\nexport const MONITOR_STATUS_TICK_INTERVAL_MS = 1000;\n\n/** Receives the freshly formatted footer status text (undefined clears the status). */\nexport type MonitorStatusRender = (status: string | undefined) => void;\n\nexport interface MonitorStatusTickerOptions {\n\treadonly render: MonitorStatusRender;\n\t/** Injectable clock for tests; defaults to Date.now. */\n\treadonly now?: () => number;\n}\n\n/**\n * Drives a once-per-second footer refresh while monitors are active so the\n * \"◉ watching … (Ns)\" elapsed label advances live instead of freezing between\n * registry transitions. Mirrors the goal builtin's GoalElapsedTicker: the\n * interval is unref'd so it never keeps the process alive, and ticks that\n * produce the already-rendered label are skipped.\n */\nexport class MonitorStatusTicker {\n\tprivate readonly render: MonitorStatusRender;\n\tprivate readonly now: () => number;\n\tprivate intervalId: NodeJS.Timeout | undefined;\n\tprivate snapshot: readonly MonitorSnapshotEntry[] = [];\n\tprivate lastRenderedStatus: string | undefined;\n\tprivate hasRendered = false;\n\n\tconstructor(options: MonitorStatusTickerOptions) {\n\t\tthis.render = options.render;\n\t\tthis.now = options.now ?? Date.now;\n\t}\n\n\tget running(): boolean {\n\t\treturn this.intervalId !== undefined;\n\t}\n\n\t/**\n\t * Point the ticker at the current monitor snapshot, render once immediately,\n\t * and start the interval when watches are live (or stop it when none remain).\n\t */\n\tsync(snapshot: readonly MonitorSnapshotEntry[]): void {\n\t\tthis.snapshot = snapshot;\n\t\tthis.hasRendered = false;\n\t\tthis.tick();\n\t\tif (snapshot.length === 0) {\n\t\t\tthis.stopInterval();\n\t\t\treturn;\n\t\t}\n\t\tif (this.intervalId !== undefined) return;\n\t\tconst handle = setInterval(() => this.tick(), MONITOR_STATUS_TICK_INTERVAL_MS);\n\t\thandle.unref();\n\t\tthis.intervalId = handle;\n\t}\n\n\t/** Stop the interval and drop the retained snapshot. */\n\tstop(): void {\n\t\tthis.stopInterval();\n\t\tthis.snapshot = [];\n\t\tthis.lastRenderedStatus = undefined;\n\t\tthis.hasRendered = false;\n\t}\n\n\tprivate stopInterval(): void {\n\t\tif (this.intervalId !== undefined) {\n\t\t\tclearInterval(this.intervalId);\n\t\t\tthis.intervalId = undefined;\n\t\t}\n\t}\n\n\tprivate tick(): void {\n\t\tconst status = formatMonitorStatus(this.snapshot, this.now());\n\t\tif (this.hasRendered && status === this.lastRenderedStatus) return;\n\t\tthis.hasRendered = true;\n\t\tthis.lastRenderedStatus = status;\n\t\tthis.render(status);\n\t}\n}\n"]}

package/dist/core/extensions/builtin/terminal/monitor-status.d.ts

@@ -1,5 +1,13 @@
 import type { MonitorSnapshotEntry } from "./monitor-registry.ts";
 export declare const MONITOR_STATUS_KEY = "monitors";
+/**
+ * Goal-style compact elapsed label (`5s`, `3m`, `2h 30m`, `1d 2h 3m`). Mirrors
+ * `formatGoalElapsedSeconds` in the goal builtin; kept local so this builtin stays
+ * self-contained, matching the existing monitor/eval status-file duplication.
+ */
+export declare function formatElapsedSeconds(value: number): string;
+/** Whole seconds since the oldest watch registered; never negative when the clock moves backwards. */
+export declare function monitorElapsedSeconds(snapshot: readonly MonitorSnapshotEntry[], nowMs: number): number;
 /** Brief footer text for the active monitors; undefined clears the status. */
-export declare function formatMonitorStatus(snapshot: readonly MonitorSnapshotEntry[]): string | undefined;
+export declare function formatMonitorStatus(snapshot: readonly MonitorSnapshotEntry[], nowMs: number): string | undefined;
 //# sourceMappingURL=monitor-status.d.ts.map

package/dist/core/extensions/builtin/terminal/monitor-status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monitor-status.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,eAAO,MAAM,kBAAkB,aAAa,CAAC;AA2B7C,8EAA8E;AAC9E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,GAAG,MAAM,GAAG,SAAS,CAYjG"}
+{"version":3,"file":"monitor-status.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,eAAO,MAAM,kBAAkB,aAAa,CAAC;AA2B7C;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAc1D;AAED,sGAAsG;AACtG,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAKtG;AAED,8EAA8E;AAC9E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAahH"}

package/dist/core/extensions/builtin/terminal/monitor-status.js

@@ -23,12 +23,45 @@ function packDescriptions(names, budget) {
     const tail = names.length > 1 ? ` +${names.length - 1} more` : "";
     return truncateEnd(names[0] ?? "", Math.max(1, budget - tail.length)) + tail;
 }
+/**
+ * Goal-style compact elapsed label (`5s`, `3m`, `2h 30m`, `1d 2h 3m`). Mirrors
+ * `formatGoalElapsedSeconds` in the goal builtin; kept local so this builtin stays
+ * self-contained, matching the existing monitor/eval status-file duplication.
+ */
+export function formatElapsedSeconds(value) {
+    const seconds = Math.max(0, Math.trunc(value));
+    if (seconds < 60)
+        return `${seconds}s`;
+    const minutes = Math.trunc(seconds / 60);
+    if (minutes < 60)
+        return `${minutes}m`;
+    const hours = Math.trunc(minutes / 60);
+    const remainingMinutes = minutes % 60;
+    if (hours >= 24) {
+        const days = Math.trunc(hours / 24);
+        const remainingHours = hours % 24;
+        return `${days}d ${remainingHours}h ${remainingMinutes}m`;
+    }
+    if (remainingMinutes === 0)
+        return `${hours}h`;
+    return `${hours}h ${remainingMinutes}m`;
+}
+/** Whole seconds since the oldest watch registered; never negative when the clock moves backwards. */
+export function monitorElapsedSeconds(snapshot, nowMs) {
+    let oldest = Number.POSITIVE_INFINITY;
+    for (const entry of snapshot)
+        oldest = Math.min(oldest, entry.startedAtMs);
+    if (!Number.isFinite(oldest))
+        return 0;
+    return Math.max(0, Math.round((nowMs - oldest) / 1000));
+}
 /** Brief footer text for the active monitors; undefined clears the status. */
-export function formatMonitorStatus(snapshot) {
+export function formatMonitorStatus(snapshot, nowMs) {
     if (snapshot.length === 0)
         return undefined;
     const pausedCount = snapshot.filter((entry) => entry.paused).length;
-    const suffix = pausedCount === 0 ? "" : pausedCount === snapshot.length ? " (paused)" : ` (${pausedCount} paused)`;
+    const pausedPart = pausedCount === 0 ? "" : pausedCount === snapshot.length ? ", paused" : `, ${pausedCount} paused`;
+    const suffix = ` (${formatElapsedSeconds(monitorElapsedSeconds(snapshot, nowMs))}${pausedPart})`;
     if (snapshot.length === 1) {
         const head = `${WATCH_GLYPH} watching `;
         const description = truncateEnd(snapshot[0]?.description ?? "", MAX_STATUS_LENGTH - head.length - suffix.length);

package/dist/core/extensions/builtin/terminal/monitor-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"monitor-status.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-status.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,UAAU,CAAC;AAE7C,gFAAgF;AAChF,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,gGAAgG;AAChG,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,SAAS,WAAW,CAAC,IAAY,EAAE,GAAW;IAC7C,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,IAAI,CAAC;IACpC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAClD,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,KAAwB,EAAE,MAAc;IACjE,KAAK,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;QACjD,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;QACxC,MAAM,IAAI,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,WAAW,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,MAAM;YAAE,OAAO,MAAM,GAAG,IAAI,CAAC;IACjE,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAClE,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;AAC9E,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,mBAAmB,CAAC,QAAyC;IAC5E,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5C,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IACpE,MAAM,MAAM,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,WAAW,UAAU,CAAC;IACnH,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,GAAG,WAAW,YAAY,CAAC;QACxC,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,IAAI,EAAE,EAAE,iBAAiB,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QACjH,OAAO,IAAI,GAAG,WAAW,GAAG,MAAM,CAAC;IACpC,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,WAAW,aAAa,QAAQ,CAAC,MAAM,IAAI,CAAC;IAC5D,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACzD,OAAO,IAAI,GAAG,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AACjG,CAAC","sourcesContent":["import type { MonitorSnapshotEntry } from \"./monitor-registry.ts\";\n\nexport const MONITOR_STATUS_KEY = \"monitors\";\n\n/** The footer shares one status line with other extensions; keep this brief. */\nconst MAX_STATUS_LENGTH = 48;\n/** Marks the status as a live watch at a glance (same glyph family as the session selector). */\nconst WATCH_GLYPH = \"◉\";\n\nfunction truncateEnd(text: string, max: number): string {\n\tif (text.length <= max) return text;\n\treturn `${text.slice(0, Math.max(0, max - 1))}…`;\n}\n\n/**\n * Fits as many whole descriptions as possible into the budget, folding the rest\n * into a `+N more` counter so the monitor count is never truncated away.\n */\nfunction packDescriptions(names: readonly string[], budget: number): string {\n\tfor (let kept = names.length; kept >= 1; kept--) {\n\t\tconst hiddenCount = names.length - kept;\n\t\tconst tail = hiddenCount > 0 ? ` +${hiddenCount} more` : \"\";\n\t\tconst joined = names.slice(0, kept).join(\", \");\n\t\tif (joined.length + tail.length <= budget) return joined + tail;\n\t}\n\tconst tail = names.length > 1 ? ` +${names.length - 1} more` : \"\";\n\treturn truncateEnd(names[0] ?? \"\", Math.max(1, budget - tail.length)) + tail;\n}\n\n/** Brief footer text for the active monitors; undefined clears the status. */\nexport function formatMonitorStatus(snapshot: readonly MonitorSnapshotEntry[]): string | undefined {\n\tif (snapshot.length === 0) return undefined;\n\tconst pausedCount = snapshot.filter((entry) => entry.paused).length;\n\tconst suffix = pausedCount === 0 ? \"\" : pausedCount === snapshot.length ? \" (paused)\" : ` (${pausedCount} paused)`;\n\tif (snapshot.length === 1) {\n\t\tconst head = `${WATCH_GLYPH} watching `;\n\t\tconst description = truncateEnd(snapshot[0]?.description ?? \"\", MAX_STATUS_LENGTH - head.length - suffix.length);\n\t\treturn head + description + suffix;\n\t}\n\tconst head = `${WATCH_GLYPH} watching ${snapshot.length}: `;\n\tconst names = snapshot.map((entry) => entry.description);\n\treturn head + packDescriptions(names, MAX_STATUS_LENGTH - head.length - suffix.length) + suffix;\n}\n"]}
+{"version":3,"file":"monitor-status.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/terminal/monitor-status.ts"],"names":[],"mappings":"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","sourcesContent":["import type { MonitorSnapshotEntry } from \"./monitor-registry.ts\";\n\nexport const MONITOR_STATUS_KEY = \"monitors\";\n\n/** The footer shares one status line with other extensions; keep this brief. */\nconst MAX_STATUS_LENGTH = 48;\n/** Marks the status as a live watch at a glance (same glyph family as the session selector). */\nconst WATCH_GLYPH = \"◉\";\n\nfunction truncateEnd(text: string, max: number): string {\n\tif (text.length <= max) return text;\n\treturn `${text.slice(0, Math.max(0, max - 1))}…`;\n}\n\n/**\n * Fits as many whole descriptions as possible into the budget, folding the rest\n * into a `+N more` counter so the monitor count is never truncated away.\n */\nfunction packDescriptions(names: readonly string[], budget: number): string {\n\tfor (let kept = names.length; kept >= 1; kept--) {\n\t\tconst hiddenCount = names.length - kept;\n\t\tconst tail = hiddenCount > 0 ? ` +${hiddenCount} more` : \"\";\n\t\tconst joined = names.slice(0, kept).join(\", \");\n\t\tif (joined.length + tail.length <= budget) return joined + tail;\n\t}\n\tconst tail = names.length > 1 ? ` +${names.length - 1} more` : \"\";\n\treturn truncateEnd(names[0] ?? \"\", Math.max(1, budget - tail.length)) + tail;\n}\n\n/**\n * Goal-style compact elapsed label (`5s`, `3m`, `2h 30m`, `1d 2h 3m`). Mirrors\n * `formatGoalElapsedSeconds` in the goal builtin; kept local so this builtin stays\n * self-contained, matching the existing monitor/eval status-file duplication.\n */\nexport function formatElapsedSeconds(value: number): string {\n\tconst seconds = Math.max(0, Math.trunc(value));\n\tif (seconds < 60) return `${seconds}s`;\n\tconst minutes = Math.trunc(seconds / 60);\n\tif (minutes < 60) return `${minutes}m`;\n\tconst hours = Math.trunc(minutes / 60);\n\tconst remainingMinutes = minutes % 60;\n\tif (hours >= 24) {\n\t\tconst days = Math.trunc(hours / 24);\n\t\tconst remainingHours = hours % 24;\n\t\treturn `${days}d ${remainingHours}h ${remainingMinutes}m`;\n\t}\n\tif (remainingMinutes === 0) return `${hours}h`;\n\treturn `${hours}h ${remainingMinutes}m`;\n}\n\n/** Whole seconds since the oldest watch registered; never negative when the clock moves backwards. */\nexport function monitorElapsedSeconds(snapshot: readonly MonitorSnapshotEntry[], nowMs: number): number {\n\tlet oldest = Number.POSITIVE_INFINITY;\n\tfor (const entry of snapshot) oldest = Math.min(oldest, entry.startedAtMs);\n\tif (!Number.isFinite(oldest)) return 0;\n\treturn Math.max(0, Math.round((nowMs - oldest) / 1000));\n}\n\n/** Brief footer text for the active monitors; undefined clears the status. */\nexport function formatMonitorStatus(snapshot: readonly MonitorSnapshotEntry[], nowMs: number): string | undefined {\n\tif (snapshot.length === 0) return undefined;\n\tconst pausedCount = snapshot.filter((entry) => entry.paused).length;\n\tconst pausedPart = pausedCount === 0 ? \"\" : pausedCount === snapshot.length ? \", paused\" : `, ${pausedCount} paused`;\n\tconst suffix = ` (${formatElapsedSeconds(monitorElapsedSeconds(snapshot, nowMs))}${pausedPart})`;\n\tif (snapshot.length === 1) {\n\t\tconst head = `${WATCH_GLYPH} watching `;\n\t\tconst description = truncateEnd(snapshot[0]?.description ?? \"\", MAX_STATUS_LENGTH - head.length - suffix.length);\n\t\treturn head + description + suffix;\n\t}\n\tconst head = `${WATCH_GLYPH} watching ${snapshot.length}: `;\n\tconst names = snapshot.map((entry) => entry.description);\n\treturn head + packDescriptions(names, MAX_STATUS_LENGTH - head.length - suffix.length) + suffix;\n}\n"]}

package/dist/core/extensions/builtin/tool-pair-guard/sanitize-anthropic-payload.d.ts

@@ -1,3 +1,3 @@
-/** Removes orphan Anthropic tool_result blocks from provider payload messages. */
+/** Repairs Anthropic client tool_use/tool_result adjacency at the final provider boundary. */
 export declare function sanitizeAnthropicPayload(payload: unknown): unknown;
 //# sourceMappingURL=sanitize-anthropic-payload.d.ts.map

package/dist/core/extensions/builtin/tool-pair-guard/sanitize-anthropic-payload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitize-anthropic-payload.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/tool-pair-guard/sanitize-anthropic-payload.ts"],"names":[],"mappings":"AAiCA,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAuDlE"}
+{"version":3,"file":"sanitize-anthropic-payload.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/tool-pair-guard/sanitize-anthropic-payload.ts"],"names":[],"mappings":"AAsGA,8FAA8F;AAC9F,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAoDlE"}

package/dist/core/extensions/builtin/tool-pair-guard/sanitize-anthropic-payload.js

@@ -13,6 +13,7 @@ function isToolUseBlock(block) {
 function isToolResultBlock(block) {
     return block.type === "tool_result";
 }
+const SYNTHETIC_OUTPUT = "Tool output unavailable (interrupted before result)";
 function isMessageWithArrayContent(value, role) {
     if (!isObject(value) || value.role !== role || !Array.isArray(value.content))
         return false;
@@ -22,48 +23,106 @@ function isMessageWithArrayContent(value, role) {
     }
     return true;
 }
-/** Removes orphan Anthropic tool_result blocks from provider payload messages. */
-export function sanitizeAnthropicPayload(payload) {
-    if (!hasMessagesArray(payload))
-        return payload;
-    const toolUseIds = new Set();
-    for (const unknownMessage of payload.messages) {
-        if (!isMessageWithArrayContent(unknownMessage, "assistant"))
+function isUserMessageWithStringContent(value) {
+    return isObject(value) && value.role === "user" && typeof value.content === "string";
+}
+function getToolUseIds(message) {
+    const ids = [];
+    const seen = new Set();
+    for (const block of message.content) {
+        if (!isToolUseBlock(block) || block.id.length === 0 || seen.has(block.id))
+            continue;
+        seen.add(block.id);
+        ids.push(block.id);
+    }
+    return ids;
+}
+function syntheticToolResult(toolUseId) {
+    return {
+        type: "tool_result",
+        tool_use_id: toolUseId,
+        content: SYNTHETIC_OUTPUT,
+        is_error: true,
+    };
+}
+function sameBlocks(left, right) {
+    return left.length === right.length && left.every((block, index) => block === right[index]);
+}
+function repairFollowingUserMessage(message, expectedIds) {
+    const expected = new Set(expectedIds);
+    const found = new Set();
+    const results = [];
+    const ordinary = [];
+    for (const block of message.content) {
+        if (!isToolResultBlock(block)) {
+            ordinary.push(block);
             continue;
-        for (const unknownBlock of unknownMessage.content) {
-            if (isToolUseBlock(unknownBlock) && unknownBlock.id.length > 0)
-                toolUseIds.add(unknownBlock.id);
         }
+        const id = block.tool_use_id;
+        if (typeof id !== "string" || !expected.has(id) || found.has(id))
+            continue;
+        found.add(id);
+        results.push(block);
+    }
+    for (const id of expectedIds) {
+        if (!found.has(id))
+            results.push(syntheticToolResult(id));
     }
+    const content = [...results, ...ordinary];
+    if (sameBlocks(content, message.content))
+        return { message, changed: false };
+    return { message: { ...message, content }, changed: true };
+}
+function removeOrphanResults(message) {
+    const content = message.content.filter((block) => !isToolResultBlock(block));
+    if (content.length === message.content.length)
+        return { message, changed: false };
+    if (content.length === 0)
+        return { changed: true };
+    return { message: { ...message, content }, changed: true };
+}
+/** Repairs Anthropic client tool_use/tool_result adjacency at the final provider boundary. */
+export function sanitizeAnthropicPayload(payload) {
+    if (!hasMessagesArray(payload))
+        return payload;
     let changed = false;
     const sanitizedMessages = [];
-    for (const unknownMessage of payload.messages) {
-        if (!isMessageWithArrayContent(unknownMessage, "user")) {
+    for (let index = 0; index < payload.messages.length; index++) {
+        const unknownMessage = payload.messages[index];
+        if (isMessageWithArrayContent(unknownMessage, "assistant")) {
             sanitizedMessages.push(unknownMessage);
-            continue;
-        }
-        const originalContent = unknownMessage.content;
-        const nextContent = [];
-        let messageChanged = false;
-        for (const block of originalContent) {
-            if (!isToolResultBlock(block)) {
-                nextContent.push(block);
+            const expectedIds = getToolUseIds(unknownMessage);
+            if (expectedIds.length === 0)
+                continue;
+            const nextMessage = payload.messages[index + 1];
+            if (isMessageWithArrayContent(nextMessage, "user")) {
+                const repaired = repairFollowingUserMessage(nextMessage, expectedIds);
+                sanitizedMessages.push(repaired.message);
+                changed ||= repaired.changed;
+                index++;
                 continue;
             }
-            const toolUseId = block.tool_use_id;
-            if (typeof toolUseId !== "string" || toolUseId.length === 0 || !toolUseIds.has(toolUseId)) {
-                messageChanged = true;
+            if (isUserMessageWithStringContent(nextMessage)) {
+                sanitizedMessages.push({
+                    ...nextMessage,
+                    content: [...expectedIds.map(syntheticToolResult), { type: "text", text: nextMessage.content }],
+                });
+                changed = true;
+                index++;
                 continue;
             }
-            nextContent.push(block);
-        }
-        if (nextContent.length === 0) {
+            sanitizedMessages.push({
+                role: "user",
+                content: expectedIds.map(syntheticToolResult),
+            });
             changed = true;
             continue;
         }
-        if (messageChanged) {
-            changed = true;
-            sanitizedMessages.push({ ...unknownMessage, content: nextContent });
+        if (isMessageWithArrayContent(unknownMessage, "user")) {
+            const repaired = removeOrphanResults(unknownMessage);
+            if (repaired.message)
+                sanitizedMessages.push(repaired.message);
+            changed ||= repaired.changed;
             continue;
         }
         sanitizedMessages.push(unknownMessage);

package/dist/core/extensions/builtin/tool-pair-guard/sanitize-anthropic-payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"sanitize-anthropic-payload.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/tool-pair-guard/sanitize-anthropic-payload.ts"],"names":[],"mappings":"AAEA,SAAS,QAAQ,CAAC,KAAc;IAC/B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACpD,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACvC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IAC1C,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AAC1D,CAAC;AAED,SAAS,cAAc,CAAC,KAAwB;IAC/C,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,CAAC;AACnF,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAwB;IAClD,OAAO,KAAK,CAAC,IAAI,KAAK,aAAa,CAAC;AACrC,CAAC;AAED,SAAS,yBAAyB,CACjC,KAAc,EACd,IAA0B;IAE1B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3F,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;IAC/C,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,wBAAwB,CAAC,OAAgB;IACxD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IAE/C,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IACrC,KAAK,MAAM,cAAc,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC/C,IAAI,CAAC,yBAAyB,CAAC,cAAc,EAAE,WAAW,CAAC;YAAE,SAAS;QACtE,KAAK,MAAM,YAAY,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;YACnD,IAAI,cAAc,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC;gBAAE,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACjG,CAAC;IACF,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,iBAAiB,GAAc,EAAE,CAAC;IAExC,KAAK,MAAM,cAAc,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC/C,IAAI,CAAC,yBAAyB,CAAC,cAAc,EAAE,MAAM,CAAC,EAAE,CAAC;YACxD,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACvC,SAAS;QACV,CAAC;QAED,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC;QAC/C,MAAM,WAAW,GAAwB,EAAE,CAAC;QAC5C,IAAI,cAAc,GAAG,KAAK,CAAC;QAE3B,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;YACrC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/B,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACxB,SAAS;YACV,CAAC;YAED,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC;YACpC,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3F,cAAc,GAAG,IAAI,CAAC;gBACtB,SAAS;YACV,CAAC;YAED,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,GAAG,IAAI,CAAC;YACf,SAAS;QACV,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,iBAAiB,CAAC,IAAI,CAAC,EAAE,GAAG,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YACpE,SAAS;QACV,CAAC;QAED,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC;IAC7B,OAAO,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;AACpD,CAAC","sourcesContent":["import type { ContentBlockParam, MessageParam } from \"@anthropic-ai/sdk/resources/messages.js\";\n\nfunction isObject(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null;\n}\n\nfunction hasMessagesArray(value: unknown): value is { messages: unknown[] } {\n\treturn isObject(value) && Array.isArray(value.messages);\n}\n\nfunction isContentBlockParam(value: unknown): value is ContentBlockParam {\n\treturn isObject(value) && typeof value.type === \"string\";\n}\n\nfunction isToolUseBlock(block: ContentBlockParam): block is Extract<ContentBlockParam, { type: \"tool_use\" }> {\n\treturn block.type === \"tool_use\" && \"id\" in block && typeof block.id === \"string\";\n}\n\nfunction isToolResultBlock(block: ContentBlockParam): block is Extract<ContentBlockParam, { type: \"tool_result\" }> {\n\treturn block.type === \"tool_result\";\n}\n\nfunction isMessageWithArrayContent(\n\tvalue: unknown,\n\trole: MessageParam[\"role\"],\n): value is MessageParam & { content: ContentBlockParam[] } {\n\tif (!isObject(value) || value.role !== role || !Array.isArray(value.content)) return false;\n\tfor (const block of value.content) {\n\t\tif (!isContentBlockParam(block)) return false;\n\t}\n\treturn true;\n}\n\n/** Removes orphan Anthropic tool_result blocks from provider payload messages. */\nexport function sanitizeAnthropicPayload(payload: unknown): unknown {\n\tif (!hasMessagesArray(payload)) return payload;\n\n\tconst toolUseIds = new Set<string>();\n\tfor (const unknownMessage of payload.messages) {\n\t\tif (!isMessageWithArrayContent(unknownMessage, \"assistant\")) continue;\n\t\tfor (const unknownBlock of unknownMessage.content) {\n\t\t\tif (isToolUseBlock(unknownBlock) && unknownBlock.id.length > 0) toolUseIds.add(unknownBlock.id);\n\t\t}\n\t}\n\n\tlet changed = false;\n\tconst sanitizedMessages: unknown[] = [];\n\n\tfor (const unknownMessage of payload.messages) {\n\t\tif (!isMessageWithArrayContent(unknownMessage, \"user\")) {\n\t\t\tsanitizedMessages.push(unknownMessage);\n\t\t\tcontinue;\n\t\t}\n\n\t\tconst originalContent = unknownMessage.content;\n\t\tconst nextContent: ContentBlockParam[] = [];\n\t\tlet messageChanged = false;\n\n\t\tfor (const block of originalContent) {\n\t\t\tif (!isToolResultBlock(block)) {\n\t\t\t\tnextContent.push(block);\n\t\t\t\tcontinue;\n\t\t\t}\n\n\t\t\tconst toolUseId = block.tool_use_id;\n\t\t\tif (typeof toolUseId !== \"string\" || toolUseId.length === 0 || !toolUseIds.has(toolUseId)) {\n\t\t\t\tmessageChanged = true;\n\t\t\t\tcontinue;\n\t\t\t}\n\n\t\t\tnextContent.push(block);\n\t\t}\n\n\t\tif (nextContent.length === 0) {\n\t\t\tchanged = true;\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (messageChanged) {\n\t\t\tchanged = true;\n\t\t\tsanitizedMessages.push({ ...unknownMessage, content: nextContent });\n\t\t\tcontinue;\n\t\t}\n\n\t\tsanitizedMessages.push(unknownMessage);\n\t}\n\n\tif (!changed) return payload;\n\treturn { ...payload, messages: sanitizedMessages };\n}\n"]}
+{"version":3,"file":"sanitize-anthropic-payload.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/tool-pair-guard/sanitize-anthropic-payload.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ContentBlockParam, MessageParam } from \"@anthropic-ai/sdk/resources/messages.js\";\n\nfunction isObject(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null;\n}\n\nfunction hasMessagesArray(value: unknown): value is { messages: unknown[] } {\n\treturn isObject(value) && Array.isArray(value.messages);\n}\n\nfunction isContentBlockParam(value: unknown): value is ContentBlockParam {\n\treturn isObject(value) && typeof value.type === \"string\";\n}\n\nfunction isToolUseBlock(block: ContentBlockParam): block is Extract<ContentBlockParam, { type: \"tool_use\" }> {\n\treturn block.type === \"tool_use\" && \"id\" in block && typeof block.id === \"string\";\n}\n\nfunction isToolResultBlock(block: ContentBlockParam): block is Extract<ContentBlockParam, { type: \"tool_result\" }> {\n\treturn block.type === \"tool_result\";\n}\n\nconst SYNTHETIC_OUTPUT = \"Tool output unavailable (interrupted before result)\";\n\nfunction isMessageWithArrayContent<Role extends MessageParam[\"role\"]>(\n\tvalue: unknown,\n\trole: Role,\n): value is MessageParam & { role: Role; content: ContentBlockParam[] } {\n\tif (!isObject(value) || value.role !== role || !Array.isArray(value.content)) return false;\n\tfor (const block of value.content) {\n\t\tif (!isContentBlockParam(block)) return false;\n\t}\n\treturn true;\n}\n\nfunction isUserMessageWithStringContent(value: unknown): value is MessageParam & { role: \"user\"; content: string } {\n\treturn isObject(value) && value.role === \"user\" && typeof value.content === \"string\";\n}\n\nfunction getToolUseIds(message: MessageParam & { content: ContentBlockParam[] }): string[] {\n\tconst ids: string[] = [];\n\tconst seen = new Set<string>();\n\tfor (const block of message.content) {\n\t\tif (!isToolUseBlock(block) || block.id.length === 0 || seen.has(block.id)) continue;\n\t\tseen.add(block.id);\n\t\tids.push(block.id);\n\t}\n\treturn ids;\n}\n\nfunction syntheticToolResult(toolUseId: string): Extract<ContentBlockParam, { type: \"tool_result\" }> {\n\treturn {\n\t\ttype: \"tool_result\",\n\t\ttool_use_id: toolUseId,\n\t\tcontent: SYNTHETIC_OUTPUT,\n\t\tis_error: true,\n\t};\n}\n\nfunction sameBlocks(left: ContentBlockParam[], right: ContentBlockParam[]): boolean {\n\treturn left.length === right.length && left.every((block, index) => block === right[index]);\n}\n\nfunction repairFollowingUserMessage(\n\tmessage: MessageParam & { role: \"user\"; content: ContentBlockParam[] },\n\texpectedIds: string[],\n): { message: MessageParam; changed: boolean } {\n\tconst expected = new Set(expectedIds);\n\tconst found = new Set<string>();\n\tconst results: ContentBlockParam[] = [];\n\tconst ordinary: ContentBlockParam[] = [];\n\n\tfor (const block of message.content) {\n\t\tif (!isToolResultBlock(block)) {\n\t\t\tordinary.push(block);\n\t\t\tcontinue;\n\t\t}\n\t\tconst id = block.tool_use_id;\n\t\tif (typeof id !== \"string\" || !expected.has(id) || found.has(id)) continue;\n\t\tfound.add(id);\n\t\tresults.push(block);\n\t}\n\n\tfor (const id of expectedIds) {\n\t\tif (!found.has(id)) results.push(syntheticToolResult(id));\n\t}\n\n\tconst content = [...results, ...ordinary];\n\tif (sameBlocks(content, message.content)) return { message, changed: false };\n\treturn { message: { ...message, content }, changed: true };\n}\n\nfunction removeOrphanResults(message: MessageParam & { role: \"user\"; content: ContentBlockParam[] }): {\n\tmessage?: MessageParam;\n\tchanged: boolean;\n} {\n\tconst content = message.content.filter((block) => !isToolResultBlock(block));\n\tif (content.length === message.content.length) return { message, changed: false };\n\tif (content.length === 0) return { changed: true };\n\treturn { message: { ...message, content }, changed: true };\n}\n\n/** Repairs Anthropic client tool_use/tool_result adjacency at the final provider boundary. */\nexport function sanitizeAnthropicPayload(payload: unknown): unknown {\n\tif (!hasMessagesArray(payload)) return payload;\n\n\tlet changed = false;\n\tconst sanitizedMessages: unknown[] = [];\n\n\tfor (let index = 0; index < payload.messages.length; index++) {\n\t\tconst unknownMessage = payload.messages[index];\n\t\tif (isMessageWithArrayContent(unknownMessage, \"assistant\")) {\n\t\t\tsanitizedMessages.push(unknownMessage);\n\t\t\tconst expectedIds = getToolUseIds(unknownMessage);\n\t\t\tif (expectedIds.length === 0) continue;\n\n\t\t\tconst nextMessage = payload.messages[index + 1];\n\t\t\tif (isMessageWithArrayContent(nextMessage, \"user\")) {\n\t\t\t\tconst repaired = repairFollowingUserMessage(nextMessage, expectedIds);\n\t\t\t\tsanitizedMessages.push(repaired.message);\n\t\t\t\tchanged ||= repaired.changed;\n\t\t\t\tindex++;\n\t\t\t\tcontinue;\n\t\t\t}\n\n\t\t\tif (isUserMessageWithStringContent(nextMessage)) {\n\t\t\t\tsanitizedMessages.push({\n\t\t\t\t\t...nextMessage,\n\t\t\t\t\tcontent: [...expectedIds.map(syntheticToolResult), { type: \"text\", text: nextMessage.content }],\n\t\t\t\t});\n\t\t\t\tchanged = true;\n\t\t\t\tindex++;\n\t\t\t\tcontinue;\n\t\t\t}\n\n\t\t\tsanitizedMessages.push({\n\t\t\t\trole: \"user\",\n\t\t\t\tcontent: expectedIds.map(syntheticToolResult),\n\t\t\t});\n\t\t\tchanged = true;\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (isMessageWithArrayContent(unknownMessage, \"user\")) {\n\t\t\tconst repaired = removeOrphanResults(unknownMessage);\n\t\t\tif (repaired.message) sanitizedMessages.push(repaired.message);\n\t\t\tchanged ||= repaired.changed;\n\t\t\tcontinue;\n\t\t}\n\n\t\tsanitizedMessages.push(unknownMessage);\n\t}\n\n\tif (!changed) return payload;\n\treturn { ...payload, messages: sanitizedMessages };\n}\n"]}

package/dist/core/extensions/builtin/ttsr/builtin-rules.d.ts

@@ -0,0 +1,4 @@
+import type { TtsrRule } from "./types.ts";
+export declare const FABRICATED_UNAVAILABLE_TOOL_CALL_RULE_NAME = "fabricated-unavailable-tool-call";
+export declare const BUILTIN_TTSR_RULES: readonly TtsrRule[];
+//# sourceMappingURL=builtin-rules.d.ts.map

package/dist/core/extensions/builtin/ttsr/builtin-rules.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"builtin-rules.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/builtin-rules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,eAAO,MAAM,0CAA0C,qCAAqC,CAAC;AAE7F,eAAO,MAAM,kBAAkB,EAAE,SAAS,QAAQ,EAiBjD,CAAC"}

package/dist/core/extensions/builtin/ttsr/builtin-rules.js

@@ -0,0 +1,20 @@
+export const FABRICATED_UNAVAILABLE_TOOL_CALL_RULE_NAME = "fabricated-unavailable-tool-call";
+export const BUILTIN_TTSR_RULES = [
+    {
+        name: FABRICATED_UNAVAILABLE_TOOL_CALL_RULE_NAME,
+        content: [
+            "Your previous output imitated an unavailable historical tool call as inert text instead of taking action.",
+            "Redo the interrupted step now. Call your real tools that are actually available to you, such as edit or write for file changes.",
+            "Do not print or imitate unavailable-tool transcript envelopes.",
+        ].join("\n"),
+        description: "Interrupt fabricated unavailable-tool calls emitted as assistant text.",
+        condition: [
+            "(?i)<\\s*unavailable-tool-call\\b",
+            "(?i)\\[called\\s+tool\\s+[\"'][^\"'\\r\\n]+[\"']\\s+\\(no\\s+longer\\s+available\\s+in\\s+this\\s+session\\)",
+        ],
+        scope: { allowText: true, allowThinking: false, toolScopes: [] },
+        interruptMode: "always",
+        source: "builtin",
+    },
+];
+//# sourceMappingURL=builtin-rules.js.map

package/dist/core/extensions/builtin/ttsr/builtin-rules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"builtin-rules.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/builtin-rules.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,0CAA0C,GAAG,kCAAkC,CAAC;AAE7F,MAAM,CAAC,MAAM,kBAAkB,GAAwB;IACtD;QACC,IAAI,EAAE,0CAA0C;QAChD,OAAO,EAAE;YACR,2GAA2G;YAC3G,iIAAiI;YACjI,gEAAgE;SAChE,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,WAAW,EAAE,wEAAwE;QACrF,SAAS,EAAE;YACV,mCAAmC;YACnC,8GAA8G;SAC9G;QACD,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE;QAChE,aAAa,EAAE,QAAQ;QACvB,MAAM,EAAE,SAAS;KACjB;CACD,CAAC","sourcesContent":["import type { TtsrRule } from \"./types.ts\";\n\nexport const FABRICATED_UNAVAILABLE_TOOL_CALL_RULE_NAME = \"fabricated-unavailable-tool-call\";\n\nexport const BUILTIN_TTSR_RULES: readonly TtsrRule[] = [\n\t{\n\t\tname: FABRICATED_UNAVAILABLE_TOOL_CALL_RULE_NAME,\n\t\tcontent: [\n\t\t\t\"Your previous output imitated an unavailable historical tool call as inert text instead of taking action.\",\n\t\t\t\"Redo the interrupted step now. Call your real tools that are actually available to you, such as edit or write for file changes.\",\n\t\t\t\"Do not print or imitate unavailable-tool transcript envelopes.\",\n\t\t].join(\"\\n\"),\n\t\tdescription: \"Interrupt fabricated unavailable-tool calls emitted as assistant text.\",\n\t\tcondition: [\n\t\t\t\"(?i)<\\\\s*unavailable-tool-call\\\\b\",\n\t\t\t\"(?i)\\\\[called\\\\s+tool\\\\s+[\\\"'][^\\\"'\\\\r\\\\n]+[\\\"']\\\\s+\\\\(no\\\\s+longer\\\\s+available\\\\s+in\\\\s+this\\\\s+session\\\\)\",\n\t\t],\n\t\tscope: { allowText: true, allowThinking: false, toolScopes: [] },\n\t\tinterruptMode: \"always\",\n\t\tsource: \"builtin\",\n\t},\n];\n"]}

package/dist/core/extensions/builtin/ttsr/commands.js

@@ -23,6 +23,8 @@ export function registerTtsrCommands(pi, getState) {
     });
 }
 function formatTtsrStatus(state) {
+    const builtinRules = state.rules.filter((rule) => rule.source === "builtin");
+    const userRules = state.rules.filter((rule) => rule.source !== "builtin");
     return [
         "TTSR stream rules",
         "",
@@ -30,10 +32,13 @@ function formatTtsrStatus(state) {
         state.disabled ? "disabled (ttsr-disabled flag set)" : "enabled",
         "",
         "BUILTIN RULES",
+        "DETECTORS",
         ...BUILTIN_RULES.map(formatBuiltinRule),
+        "STREAM RULES",
+        ...(builtinRules.length === 0 ? ["(none)"] : builtinRules.map(formatBuiltinStreamRule)),
         "",
         "USER RULES",
-        ...formatUserRules(state.rules),
+        ...formatUserRules(userRules),
         "",
         "INJECTED",
         state.injectedRuleNames.length === 0 ? "(none)" : state.injectedRuleNames.join(", "),
@@ -46,6 +51,9 @@ function formatBuiltinRule(rule) {
         `(mode: ${rule.remediation.retryMode}, scope: ${rule.remediation.corruptionScope})`,
     ].join(" ");
 }
+function formatBuiltinStreamRule(rule) {
+    return `${rule.name} [stream rule, scope: ${formatScope(rule.scope)}]`;
+}
 function formatUserRules(rules) {
     if (rules.length === 0)
         return ["(none)"];

package/dist/core/extensions/builtin/ttsr/commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/commands.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExtensionAPI } from \"../../types.ts\";\nimport { COLLAPSE_RULE_NAME, CONTROL_LEAK_RULE_NAME } from \"./prompts.ts\";\nimport {\n\tCOLLAPSE_REMEDIATION,\n\tCONTROL_LEAK_REMEDIATION,\n\ttype RuleRemediation,\n\ttype TtsrRule,\n\ttype TtsrScope,\n} from \"./types.ts\";\n\nexport interface TtsrPublicState {\n\treadonly rules: readonly TtsrRule[];\n\treadonly injectedRuleNames: readonly string[];\n\treadonly disabled: boolean;\n}\n\ninterface BuiltinRuleStatus {\n\treadonly name: string;\n\treadonly detector: string;\n\treadonly remediation: RuleRemediation;\n\treadonly summary: string;\n}\n\nconst BUILTIN_RULES: readonly BuiltinRuleStatus[] = [\n\t{\n\t\tname: COLLAPSE_RULE_NAME,\n\t\tdetector: \"collapse\",\n\t\tremediation: COLLAPSE_REMEDIATION,\n\t\tsummary: \"abort the stream, truncate the garbage from history, inject a corrective nudge, then continue\",\n\t},\n\t{\n\t\tname: CONTROL_LEAK_RULE_NAME,\n\t\tdetector: \"control-leak\",\n\t\tremediation: CONTROL_LEAK_REMEDIATION,\n\t\tsummary: \"abort the stream, replace the generation with an error shell, then resample via bounded provider retry\",\n\t},\n];\n\nexport function registerTtsrCommands(pi: ExtensionAPI, getState: () => TtsrPublicState): void {\n\tpi.registerCommand(\"ttsr\", {\n\t\tdescription: \"Show TTSR stream-rule status: builtin detectors, user rules, injected rules.\",\n\t\thandler: async (_args, ctx) => {\n\t\t\tctx.ui.notify(formatTtsrStatus(getState()), \"info\");\n\t\t},\n\t});\n}\n\nfunction formatTtsrStatus(state: TtsrPublicState): string {\n\treturn [\n\t\t\"TTSR stream rules\",\n\t\t\"\",\n\t\t\"STATUS\",\n\t\tstate.disabled ? \"disabled (ttsr-disabled flag set)\" : \"enabled\",\n\t\t\"\",\n\t\t\"BUILTIN RULES\",\n\t\t...BUILTIN_RULES.map(formatBuiltinRule),\n\t\t\"\",\n\t\t\"USER RULES\",\n\t\t...formatUserRules(state.rules),\n\t\t\"\",\n\t\t\"INJECTED\",\n\t\tstate.injectedRuleNames.length === 0 ? \"(none)\" : state.injectedRuleNames.join(\", \"),\n\t].join(\"\\n\");\n}\n\nfunction formatBuiltinRule(rule: BuiltinRuleStatus): string {\n\treturn [\n\t\t`${rule.name} [detector: ${rule.detector}]`,\n\t\t`remediation: ${rule.summary}`,\n\t\t`(mode: ${rule.remediation.retryMode}, scope: ${rule.remediation.corruptionScope})`,\n\t].join(\" \");\n}\n\nfunction formatUserRules(rules: readonly TtsrRule[]): string[] {\n\tif (rules.length === 0) return [\"(none)\"];\n\treturn rules.map((rule) => `${rule.name} [${rule.source}, scope: ${formatScope(rule.scope)}]`);\n}\n\nfunction formatScope(scope: TtsrScope): string {\n\tconst parts: string[] = [];\n\tif (scope.allowText) parts.push(\"text\");\n\tif (scope.allowThinking) parts.push(\"thinking\");\n\tfor (const toolScope of scope.toolScopes) {\n\t\tparts.push(\n\t\t\ttoolScope.pathGlob === undefined\n\t\t\t\t? `tool:${toolScope.toolName}`\n\t\t\t\t: `tool:${toolScope.toolName}(${toolScope.pathGlob})`,\n\t\t);\n\t}\n\treturn parts.length === 0 ? \"none\" : parts.join(\"+\");\n}\n"]}
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/commands.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExtensionAPI } from \"../../types.ts\";\nimport { COLLAPSE_RULE_NAME, CONTROL_LEAK_RULE_NAME } from \"./prompts.ts\";\nimport {\n\tCOLLAPSE_REMEDIATION,\n\tCONTROL_LEAK_REMEDIATION,\n\ttype RuleRemediation,\n\ttype TtsrRule,\n\ttype TtsrScope,\n} from \"./types.ts\";\n\nexport interface TtsrPublicState {\n\treadonly rules: readonly TtsrRule[];\n\treadonly injectedRuleNames: readonly string[];\n\treadonly disabled: boolean;\n}\n\ninterface BuiltinRuleStatus {\n\treadonly name: string;\n\treadonly detector: string;\n\treadonly remediation: RuleRemediation;\n\treadonly summary: string;\n}\n\nconst BUILTIN_RULES: readonly BuiltinRuleStatus[] = [\n\t{\n\t\tname: COLLAPSE_RULE_NAME,\n\t\tdetector: \"collapse\",\n\t\tremediation: COLLAPSE_REMEDIATION,\n\t\tsummary: \"abort the stream, truncate the garbage from history, inject a corrective nudge, then continue\",\n\t},\n\t{\n\t\tname: CONTROL_LEAK_RULE_NAME,\n\t\tdetector: \"control-leak\",\n\t\tremediation: CONTROL_LEAK_REMEDIATION,\n\t\tsummary: \"abort the stream, replace the generation with an error shell, then resample via bounded provider retry\",\n\t},\n];\n\nexport function registerTtsrCommands(pi: ExtensionAPI, getState: () => TtsrPublicState): void {\n\tpi.registerCommand(\"ttsr\", {\n\t\tdescription: \"Show TTSR stream-rule status: builtin detectors, user rules, injected rules.\",\n\t\thandler: async (_args, ctx) => {\n\t\t\tctx.ui.notify(formatTtsrStatus(getState()), \"info\");\n\t\t},\n\t});\n}\n\nfunction formatTtsrStatus(state: TtsrPublicState): string {\n\tconst builtinRules = state.rules.filter((rule) => rule.source === \"builtin\");\n\tconst userRules = state.rules.filter((rule) => rule.source !== \"builtin\");\n\treturn [\n\t\t\"TTSR stream rules\",\n\t\t\"\",\n\t\t\"STATUS\",\n\t\tstate.disabled ? \"disabled (ttsr-disabled flag set)\" : \"enabled\",\n\t\t\"\",\n\t\t\"BUILTIN RULES\",\n\t\t\"DETECTORS\",\n\t\t...BUILTIN_RULES.map(formatBuiltinRule),\n\t\t\"STREAM RULES\",\n\t\t...(builtinRules.length === 0 ? [\"(none)\"] : builtinRules.map(formatBuiltinStreamRule)),\n\t\t\"\",\n\t\t\"USER RULES\",\n\t\t...formatUserRules(userRules),\n\t\t\"\",\n\t\t\"INJECTED\",\n\t\tstate.injectedRuleNames.length === 0 ? \"(none)\" : state.injectedRuleNames.join(\", \"),\n\t].join(\"\\n\");\n}\n\nfunction formatBuiltinRule(rule: BuiltinRuleStatus): string {\n\treturn [\n\t\t`${rule.name} [detector: ${rule.detector}]`,\n\t\t`remediation: ${rule.summary}`,\n\t\t`(mode: ${rule.remediation.retryMode}, scope: ${rule.remediation.corruptionScope})`,\n\t].join(\" \");\n}\n\nfunction formatBuiltinStreamRule(rule: TtsrRule): string {\n\treturn `${rule.name} [stream rule, scope: ${formatScope(rule.scope)}]`;\n}\n\nfunction formatUserRules(rules: readonly TtsrRule[]): string[] {\n\tif (rules.length === 0) return [\"(none)\"];\n\treturn rules.map((rule) => `${rule.name} [${rule.source}, scope: ${formatScope(rule.scope)}]`);\n}\n\nfunction formatScope(scope: TtsrScope): string {\n\tconst parts: string[] = [];\n\tif (scope.allowText) parts.push(\"text\");\n\tif (scope.allowThinking) parts.push(\"thinking\");\n\tfor (const toolScope of scope.toolScopes) {\n\t\tparts.push(\n\t\t\ttoolScope.pathGlob === undefined\n\t\t\t\t? `tool:${toolScope.toolName}`\n\t\t\t\t: `tool:${toolScope.toolName}(${toolScope.pathGlob})`,\n\t\t);\n\t}\n\treturn parts.length === 0 ? \"none\" : parts.join(\"+\");\n}\n"]}

package/dist/core/extensions/builtin/ttsr/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAwC,MAAM,gBAAgB,CAAC;AAmDzF,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CA4L5D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAwC,MAAM,gBAAgB,CAAC;AAoDzF,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CA6L5D"}

package/dist/core/extensions/builtin/ttsr/index.js

@@ -1,4 +1,5 @@
 import { getKeybindings } from "@earendil-works/pi-tui";
+import { BUILTIN_TTSR_RULES } from "./builtin-rules.js";
 import { registerTtsrCommands } from "./commands.js";
 import { claimAbort, createGenerationState, markUserCancelled } from "./coordinator.js";
 import { discoverTtsrRulesSync } from "./discovery.js";
@@ -88,6 +89,9 @@ export default function ttsrExtension(pi) {
             return Array.isArray(rules) ? rules.filter((rule) => typeof rule === "string") : [];
         });
         manager.restoreInjected(injectedNames);
+        for (const rule of BUILTIN_TTSR_RULES) {
+            manager.addRule(rule);
+        }
         const discovered = discoverTtsrRulesSync(ctx.cwd);
         for (const rule of discovered.rules) {
             manager.addRule(rule);
@@ -143,12 +147,9 @@ export default function ttsrExtension(pi) {
         const source = deltaEvent.type === "text_delta" ? "text" : "thinking";
         const streamKey = `${source}:${String(deltaEvent.contentIndex)}`;
         const outcome = watcher.handleDelta(source, streamKey, deltaEvent.delta, generation);
-        if (outcome.resolution !== null)
-            console.log("TTSRDBG claim pre:", genState.abortClaimed, genState.userCancelled);
         if (outcome.resolution !== null && claimAbort(genState, outcome.resolution)) {
             pendingRemediation = { resolution: outcome.resolution, streamKind: source };
             notify(ctx, outcome.resolution.owner);
-            console.log("TTSRDBG abort call");
             ctx.abort();
             return;
         }