@code-yeongyu/senpi-codemode 2026.9.5 → 2026.9.6

package/CHANGELOG.md

@@ -12,6 +12,51 @@
 
 ### Removed
 
+## [2026.9.6] - 2026-09-06
+
+### Breaking Changes
+
+### Added
+
+### Changed
+
+- The Bun eval description now tells the model to shell out through `Bun.$` or `Bun.spawn` and never `Bun.spawnSync`, because a synchronous child blocks the worker and a stop or timeout then loses every variable.
+- JavaScript eval cells now interrupt cooperatively: `stop` and kernel timeouts first ask the worker to settle the cell (pending bridge `tool.*` calls are rejected, `Bun.spawn` children are killed) and keep the worker VM and its globals when the cell settles within a 2 s grace; only an unsettled cell restarts the worker.
+
+### Fixed
+
+- `eval({ action: "stop" })` no longer hangs when the JavaScript worker is blocked in a synchronous call such as `Bun.spawnSync`: worker termination is bounded by a 3 s deadline, a fresh worker replaces the blocked one, and the cell output names the blocked synchronous call.
+- `Bun.$` commands run from a JavaScript cell no longer inherit the TUI's terminal as stdin (a stdin reader such as `cat`, an ssh or git credential prompt, or a keychain prompt blocked the cell forever); the shell wrapper isolates stdin while a cell is active without changing output, exit codes, `cwd`, `env`, or explicit stdin redirects.
+- Stop results and detached-cell completion notifications report the real interrupt outcome (variables preserved, worker restarted, or outcome unknown) instead of a hardcoded per-language note.
+
+### Removed
+
+## [2026.9.5-3] - 2026-09-05
+
+### Breaking Changes
+
+### Added
+
+### Changed
+
+### Fixed
+
+### Removed
+
+## [2026.9.5-2] - 2026-09-05
+
+### Breaking Changes
+
+### Added
+
+### Changed
+
+- The GPT eval dialect now routes a wait or a long run through `tool.monitor` inside the cell (the subscription line precedes the detach note, and the `## Tool Guidelines` line says so when `monitor` is reachable), so a GPT model no longer reads "long cells detach" as the way to wait on a `--watch`.
+
+### Fixed
+
+### Removed
+
 ## [2026.9.5] - 2026-09-05
 
 ### Breaking Changes

package/README.md

@@ -166,10 +166,26 @@ when the call had no summary), clearing as soon as the last detached cell settle
 
 Use `eval({ action: "peek", cell_id })` for its state and buffered output, or
 `eval({ action: "stop", cell_id })` to cancel it. Python stop interrupts the
-existing kernel and preserves variables. JavaScript stop kills and restarts its
-worker, so JavaScript VM state is lost. Detached completion messages state when
-kernel variables are available to the next eval cell; oversized buffered output
-is written under the session local root and referenced as `local://…`.
+existing kernel and preserves variables. JavaScript stop is cooperative first:
+the worker rejects the cell's pending bridge `tool.*` calls and kills the
+`Bun.spawn` children it started, and a cell that settles within the 2 s grace
+keeps the worker and every global. Only a cell that stays unsettled (a
+never-resolving promise, an un-abortable `fetch`, a `Bun.$` command) costs the
+worker VM. A worker blocked in a synchronous call (`Bun.spawnSync`,
+`child_process.spawnSync`) cannot be stopped at all; after a 3 s termination
+deadline a fresh worker replaces it, the cell output gains a stderr line naming
+the blocked synchronous call, and the blocked call keeps running until it
+returns. Kernel-level timeouts follow the same path. Stop results and detached
+completion messages report the real outcome - variables preserved, worker
+restarted, or outcome unknown - never a per-language assumption; oversized
+buffered output is written under the session local root and referenced as
+`local://…`.
+
+Commands a cell runs through `Bun.$` never read the host's terminal: the worker
+thread shares the TUI's stdin, so the shell wrapper hands every template an
+empty pipe (`true | ( … )`) while a cell is active. Output, exit codes, `cwd`,
+`env`, and explicit `< ${input}` redirects are unchanged; `Bun.spawn` and
+`Bun.spawnSync` already default stdin to `/dev/null`.
 
 ## Output and artifacts
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/senpi-codemode",
-	"version": "2026.9.5",
+	"version": "2026.9.6",
 	"description": "Source-only senpi extension package for codemode evaluation tools",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -30,14 +30,14 @@
 	},
 	"dependencies": {
 		"@babel/parser": "8.0.4",
-		"@earendil-works/pi-ai": "npm:@code-yeongyu/senpi-ai@2026.9.5",
+		"@earendil-works/pi-ai": "npm:@code-yeongyu/senpi-ai@2026.9.6",
 		"typebox": "1.3.18"
 	},
 	"peerDependencies": {
-		"@code-yeongyu/senpi": "2026.9.5"
+		"@code-yeongyu/senpi": "2026.9.6"
 	},
 	"devDependencies": {
-		"@code-yeongyu/senpi": "2026.9.5"
+		"@code-yeongyu/senpi": "2026.9.6"
 	},
 	"keywords": [
 		"senpi",

package/src/bridge/reserved.ts

@@ -9,3 +9,5 @@ export const RESERVED_SCHEMA_TOOL = "__schema__" as const;
 export const TIMEOUT_PAUSE_OP = "timeout-pause" as const;
 /** Canonical oh-my-pi eval-timeout resume operation. */
 export const TIMEOUT_RESUME_OP = "timeout-resume" as const;
+/** Status op the JS worker emits the moment it receives `interrupt`; proves its event loop is not blocked. */
+export const INTERRUPT_ACK_OP = "interrupt-ack" as const;

package/src/kernels/js/context-manager.ts

@@ -1,9 +1,7 @@
-import { dirname, join } from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
 import type { HostToKernelMessage, KernelToHostMessage } from "../../bridge/protocol.ts";
+import { INTERRUPT_ACK_OP } from "../../bridge/reserved.ts";
 import type { KernelInterruptHandle } from "../../tool/types.ts";
-import { type CodemodeRuntimeAssetEnvironment, resolveCodemodeRuntimeAsset } from "../shared/runtime-asset.ts";
-import { createInlineWorker, type WorkerLike } from "./inline-worker.ts";
+import { abandonedWorkerNote, awaitCooperativeSettlement, type WorkerRetirement } from "./interrupt-bounds.ts";
 import {
 	assertJavaScriptKernelOpen,
 	type JavaScriptKernelMode,
@@ -12,31 +10,20 @@ import {
 	type ResultMessage,
 	type ToolCallMessage,
 } from "./kernel-contract.ts";
-import { type JavaScriptKernelOptions, LocalModuleLoader, localBridgeConnection } from "./local-module-loader.ts";
+import { type JavaScriptKernelOptions, LocalModuleLoader } from "./local-module-loader.ts";
 import { JavaScriptRunQueue, type PendingJavaScriptRun, stoppedResult } from "./run-queue.ts";
-import { bridgeError, spawnNodeWorker, WorkerStartupCancelledError, waitForReady } from "./worker-host.ts";
+import { bridgeError, WorkerStartupCancelledError } from "./worker-host.ts";
+import { WorkerSlot } from "./worker-slot.ts";
 
 export { JavaScriptKernelClosedError, type JavaScriptKernelMode, type JavaScriptRunInput } from "./kernel-contract.ts";
 export type { JavaScriptKernelOptions } from "./local-module-loader.ts";
-
-export interface JavaScriptWorkerEntryUrlOptions extends CodemodeRuntimeAssetEnvironment {
-	readonly localPath?: string;
-}
-
-export function resolveJsWorkerEntryUrl(options: JavaScriptWorkerEntryUrlOptions = {}): URL {
-	const localPath = options.localPath ?? join(dirname(fileURLToPath(import.meta.url)), "worker-entry.js");
-	return pathToFileURL(resolveCodemodeRuntimeAsset(localPath, join("kernels", "js", "worker-entry.js"), options));
-}
+export { type JavaScriptWorkerEntryUrlOptions, resolveJsWorkerEntryUrl } from "./worker-startup.ts";
 
 export class JavaScriptKernel {
 	readonly #options: JavaScriptKernelOptions;
 	readonly #moduleLoader: LocalModuleLoader;
-	#worker: WorkerLike | null = null;
-	#mode: JavaScriptKernelMode = "worker";
+	readonly #slot: WorkerSlot;
 	#lifecycle: LifecycleState = "open";
-	#ready: Promise<void> | null = null;
-	#startupAbort: AbortController | null = null;
-	#generation = 0;
 	#activation: Promise<void> | null = null;
 	#recovery: Promise<void> | null = null;
 	#closePromise: Promise<void> | null = null;
@@ -48,10 +35,15 @@ export class JavaScriptKernel {
 	constructor(options: JavaScriptKernelOptions) {
 		this.#options = options;
 		this.#moduleLoader = new LocalModuleLoader(options);
+		this.#slot = new WorkerSlot(options, {
+			isOpen: () => this.#lifecycle === "open",
+			onMessage: (message) => this.#handleMessage(message),
+			onCrash: (error) => this.#handleCrash(error),
+		});
 	}
 
 	get mode(): JavaScriptKernelMode {
-		return this.#mode;
+		return this.#slot.mode;
 	}
 
 	async run(input: JavaScriptRunInput): Promise<ResultMessage> {
@@ -64,13 +56,16 @@ export class JavaScriptKernel {
 	async interrupt(reason = "interrupted"): Promise<KernelInterruptHandle> {
 		assertJavaScriptKernelOpen(this.#lifecycle, "interrupt");
 		const active = this.#runs.active;
-		const target = this.#runs.takeInterruptTarget();
-		if (!target) return { stateRetained: Promise.resolve(true) };
-		if (target === active) this.#clearTimeout();
-		this.#runs.settle(target, stoppedResult(target.input.cellId, `JS cell interrupted: ${reason}`));
-		await this.#restartAfterStop();
-		// A restart always replaces the worker VM, so no user global survives.
-		return { stateRetained: Promise.resolve(false) };
+		if (!active) {
+			const queued = this.#runs.takeInterruptTarget();
+			if (!queued) return { stateRetained: Promise.resolve(true) };
+			this.#runs.settle(queued, stoppedResult(queued.input.cellId, `JS cell interrupted: ${reason}`));
+			await this.#restartAfterStop();
+			return { stateRetained: Promise.resolve(false) };
+		}
+		this.#clearTimeout();
+		const stop = await this.#stopActive(active, reason, `JS cell interrupted: ${reason}`);
+		return { stateRetained: Promise.resolve(stop.retained), ...(stop.note === undefined ? {} : { note: stop.note }) };
 	}
 
 	async reset(): Promise<void> {
@@ -82,7 +77,7 @@ export class JavaScriptKernel {
 	}
 
 	deliverToolReply(message: Extract<HostToKernelMessage, { type: "tool-reply" }>): void {
-		if (this.#lifecycle === "open") this.#worker?.postMessage(message);
+		if (this.#lifecycle === "open") this.#slot.postMessage(message);
 	}
 
 	async nextToolCall(): Promise<ToolCallMessage> {
@@ -93,7 +88,7 @@ export class JavaScriptKernel {
 
 	async close(): Promise<void> {
 		if (this.#closePromise) return await this.#closePromise;
-		this.#worker?.postMessage({ type: "close" });
+		this.#slot.postMessage({ type: "close" });
 		this.#lifecycle = "closing";
 		this.#runs.settleAll("JS kernel closed");
 		const recovery = this.#recovery;
@@ -129,92 +124,17 @@ export class JavaScriptKernel {
 
 	async #ensureReady(): Promise<void> {
 		assertJavaScriptKernelOpen(this.#lifecycle, "run");
-		if (!this.#ready) {
-			const generation = ++this.#generation;
-			const controller = new AbortController();
-			this.#startupAbort = controller;
-			const ready = this.#startWorker(generation, controller.signal);
-			this.#ready = ready;
-			void ready.then(
-				() => {
-					if (this.#ready === ready) this.#startupAbort = null;
-				},
-				() => {
-					if (this.#ready === ready) {
-						this.#ready = null;
-						this.#startupAbort = null;
-					}
-				},
-			);
-		}
-		return await this.#ready;
-	}
-
-	async #startWorker(generation: number, signal: AbortSignal): Promise<void> {
-		let worker = this.#spawnWorker();
-		this.#publishWorker(worker, generation);
-		try {
-			await this.#initializeWorker(worker, signal);
-			return;
-		} catch (error) {
-			if (!this.#isCurrent(worker, generation) || error instanceof WorkerStartupCancelledError) {
-				await worker.terminate();
-				throw new WorkerStartupCancelledError();
-			}
-			if (worker.mode === "inline") throw error;
-			this.#worker = null;
-			await worker.terminate();
-		}
-		if (this.#lifecycle !== "open" || generation !== this.#generation) throw new WorkerStartupCancelledError();
-		worker = createInlineWorker(this.#options.cwd, this.#options.parallelPoolWidth);
-		this.#publishWorker(worker, generation);
-		await this.#initializeWorker(worker, signal);
-	}
-
-	#spawnWorker(): WorkerLike {
-		try {
-			const url = this.#options.workerEntryUrl ?? resolveJsWorkerEntryUrl();
-			return spawnNodeWorker(url, this.#options.cwd, this.#options.parallelPoolWidth);
-		} catch (error) {
-			if (!(error instanceof Error)) throw error;
-			return createInlineWorker(this.#options.cwd, this.#options.parallelPoolWidth);
-		}
-	}
-
-	#publishWorker(worker: WorkerLike, generation: number): void {
-		if (this.#lifecycle !== "open" || generation !== this.#generation) throw new WorkerStartupCancelledError();
-		this.#worker = worker;
-		this.#mode = worker.mode;
-		worker.onMessage((message) => {
-			if (this.#isCurrent(worker, generation)) this.#handleMessage(message);
-		});
-		worker.onError((error) => {
-			if (this.#isCurrent(worker, generation)) this.#handleCrash(error);
-		});
-	}
-
-	async #initializeWorker(worker: WorkerLike, signal: AbortSignal): Promise<void> {
-		const ready = waitForReady(worker, signal);
-		worker.postMessage({
-			type: "init",
-			sessionId: this.#options.sessionId,
-			connection: localBridgeConnection(this.#options),
-		});
-		await ready;
-	}
-
-	#isCurrent(worker: WorkerLike, generation: number): boolean {
-		return this.#lifecycle === "open" && this.#worker === worker && this.#generation === generation;
+		await this.#slot.ensureReady();
 	}
 
 	#startNext(): void {
-		if (this.#lifecycle !== "open" || this.#runs.active || !this.#worker) return;
+		if (this.#lifecycle !== "open" || this.#runs.active || !this.#slot.present) return;
 		const next = this.#runs.startNext(performance.now());
 		if (!next) return;
 		if (next.input.timeoutMs) {
 			this.#timeout = setTimeout(() => void this.#timeoutActive(next), next.input.timeoutMs);
 		}
-		this.#worker.postMessage({
+		this.#slot.postMessage({
 			type: "run",
 			cellId: next.input.cellId,
 			code: this.#moduleLoader.prepareCell(next.input.code),
@@ -223,21 +143,46 @@ export class JavaScriptKernel {
 	}
 
 	async #timeoutActive(run: PendingJavaScriptRun): Promise<void> {
-		if (!this.#runs.releaseActive(run)) return;
+		if (this.#runs.active !== run || run.settled) return;
 		const durationMs = run.input.timeoutMs ?? 0;
-		this.#runs.settle(run, {
-			type: "result",
-			cellId: run.input.cellId,
-			ok: false,
-			error: { message: `JS cell timed out after ${durationMs}ms` },
+		await this.#stopActive(
+			run,
+			`timed out after ${durationMs}ms`,
+			`JS cell timed out after ${durationMs}ms`,
 			durationMs,
-		});
-		await this.#restartAfterStop();
+		);
+	}
+
+	/**
+	 * Asks the worker to settle the active cell cooperatively (rejecting its bridge calls and killing its
+	 * children); only a cell that stays unsettled past the grace costs the worker VM. Reports whether the
+	 * worker state survived and, when a blocked worker had to be abandoned, the note that explains it.
+	 */
+	async #stopActive(
+		run: PendingJavaScriptRun,
+		reason: string,
+		message: string,
+		durationMs = 0,
+	): Promise<{ readonly retained: boolean; readonly note?: string }> {
+		run.interruptResult = { type: "result", cellId: run.input.cellId, ok: false, error: { message }, durationMs };
+		run.interruptAck ??= Promise.withResolvers<void>();
+		this.#slot.postMessage({ type: "interrupt", reason });
+		if ((await awaitCooperativeSettlement(run)) === "settled") return { retained: run.settledByWorker };
+		if (!this.#runs.releaseActive(run)) return { retained: run.settledByWorker };
+		const retirement = await this.#terminate();
+		this.#runs.settle(run, run.interruptResult ?? stoppedResult(run.input.cellId, message));
+		void this.#recover(() => Promise.resolve());
+		return retirement === "abandoned" ? { retained: false, note: abandonedWorkerNote() } : { retained: false };
 	}
 
 	async #restartAfterStop(): Promise<void> {
+		await this.#recover(() => this.#terminate());
+	}
+
+	/** One recovery at a time: retire through `retire` (a no-op when the worker is already gone), then bring a fresh worker up. */
+	async #recover(retire: () => Promise<unknown>): Promise<void> {
 		if (this.#recovery) return await this.#recovery;
-		const recovery = this.#performRestartAfterStop();
+		const recovery = this.#performRecovery(retire);
 		this.#recovery = recovery;
 		try {
 			await recovery;
@@ -246,9 +191,9 @@ export class JavaScriptKernel {
 		}
 	}
 
-	async #performRestartAfterStop(): Promise<void> {
+	async #performRecovery(retire: () => Promise<unknown>): Promise<void> {
 		try {
-			await this.#terminate();
+			await retire();
 			if (this.#lifecycle !== "open") return;
 			await this.#ensureReady();
 			if (this.#lifecycle === "open") this.#startNext();
@@ -259,6 +204,10 @@ export class JavaScriptKernel {
 	}
 
 	#handleMessage(message: KernelToHostMessage): void {
+		if (message.type === "status" && message.event.op === INTERRUPT_ACK_OP) {
+			this.#runs.active?.interruptAck?.resolve();
+			return;
+		}
 		this.#options.onMessage?.(message);
 		this.#runs.active?.input.onMessage?.(message);
 		if (message.type === "tool-call") {
@@ -272,13 +221,14 @@ export class JavaScriptKernel {
 		if (!active || active.input.cellId !== message.cellId) return;
 		this.#clearTimeout();
 		this.#runs.releaseActive(active);
-		this.#runs.settle(active, message);
+		active.settledByWorker = true;
+		this.#runs.settle(active, active.interruptResult ?? message);
 		this.#startNext();
 	}
 
 	#handleCrash(error: Error): void {
 		const active = this.#runs.active;
-		if (!active && this.#startupAbort) return;
+		if (!active && this.#slot.startingUp) return;
 		this.#clearTimeout();
 		if (active) {
 			this.#runs.releaseActive(active);
@@ -298,14 +248,8 @@ export class JavaScriptKernel {
 		this.#timeout = null;
 	}
 
-	async #terminate(): Promise<void> {
+	async #terminate(): Promise<WorkerRetirement> {
 		this.#clearTimeout();
-		this.#generation += 1;
-		this.#startupAbort?.abort();
-		this.#startupAbort = null;
-		this.#ready = null;
-		const worker = this.#worker;
-		this.#worker = null;
-		if (worker) await worker.terminate();
+		return await this.#slot.retire();
 	}
 }

package/src/kernels/js/interrupt-bounds.ts

@@ -0,0 +1,66 @@
+import type { WorkerLike } from "./inline-worker.ts";
+import type { PendingJavaScriptRun } from "./run-queue.ts";
+
+/** How long the worker gets to acknowledge `interrupt`; silence means its event loop is blocked in synchronous code. */
+export const INTERRUPT_ACK_MS = 500;
+/** How long an acknowledged cell gets to settle before the VM is replaced. */
+export const JS_INTERRUPT_GRACE_MS = 2_000;
+/** How long `worker.terminate()` may take before the worker is abandoned as blocked in a synchronous call. */
+export const WORKER_TERMINATE_DEADLINE_MS = 3_000;
+
+export type CooperativeSettlement = "settled" | "unresponsive";
+export type WorkerRetirement = "terminated" | "abandoned";
+
+export interface CooperativeSettlementBounds {
+	readonly ackMs: number;
+	readonly graceMs: number;
+}
+
+const DEFAULT_SETTLEMENT_BOUNDS: CooperativeSettlementBounds = {
+	ackMs: INTERRUPT_ACK_MS,
+	graceMs: JS_INTERRUPT_GRACE_MS,
+};
+
+export async function awaitCooperativeSettlement(
+	run: PendingJavaScriptRun,
+	bounds = DEFAULT_SETTLEMENT_BOUNDS,
+): Promise<CooperativeSettlement> {
+	if (run.settled) return "settled";
+	const settled = run.settlement.then((): "settled" => "settled");
+	const acked = run.interruptAck?.promise.then((): "acked" => "acked") ?? Promise.resolve<"acked">("acked");
+	const first = await raceDeadline(Promise.race([settled, acked]), bounds.ackMs, "unresponsive");
+	if (first !== "acked") return first;
+	return await raceDeadline(settled, bounds.graceMs, "unresponsive");
+}
+
+export async function retireWorker(
+	worker: WorkerLike,
+	deadlineMs = WORKER_TERMINATE_DEADLINE_MS,
+): Promise<WorkerRetirement> {
+	const termination = worker.terminate().then((): WorkerRetirement => "terminated");
+	const outcome = await raceDeadline(termination, deadlineMs, "abandoned");
+	if (outcome === "abandoned") void termination.then(undefined, ignoreLateTerminationFailure);
+	return outcome;
+}
+
+export function abandonedWorkerNote(deadlineMs = WORKER_TERMINATE_DEADLINE_MS): string {
+	return `JavaScript worker did not stop within ${deadlineMs}ms: a synchronous call (for example Bun.spawnSync or child_process.spawnSync) is blocking it. A fresh worker replaced it; the blocked call keeps running until it returns.\n`;
+}
+
+async function raceDeadline<T extends string, Fallback extends string>(
+	operation: Promise<T>,
+	deadlineMs: number,
+	fallback: Fallback,
+): Promise<T | Fallback> {
+	let timer: ReturnType<typeof setTimeout> | undefined;
+	const deadline = new Promise<Fallback>((resolve) => {
+		timer = setTimeout(() => resolve(fallback), deadlineMs);
+	});
+	try {
+		return await Promise.race([operation, deadline]);
+	} finally {
+		if (timer !== undefined) clearTimeout(timer);
+	}
+}
+
+function ignoreLateTerminationFailure(): void {}

package/src/kernels/js/run-queue.ts

@@ -7,8 +7,13 @@ export interface PendingJavaScriptRun {
 	readonly input: JavaScriptRunInput;
 	readonly resolve: (message: ResultMessage) => void;
 	readonly reject: (error: Error) => void;
+	readonly settlement: Promise<ResultMessage>;
 	startedAtMs: number | null;
 	settled: boolean;
+	/** Host-composed result that wins over whatever the worker reports once an interrupt is in flight. */
+	interruptResult: ResultMessage | null;
+	interruptAck: PromiseWithResolvers<void> | null;
+	settledByWorker: boolean;
 }
 
 export class JavaScriptRunQueue {
@@ -24,9 +29,19 @@ export class JavaScriptRunQueue {
 	}
 
 	enqueue(input: JavaScriptRunInput): Promise<ResultMessage> {
-		return new Promise((resolve, reject) => {
-			this.#queue.push({ input, resolve, reject, startedAtMs: null, settled: false });
+		const { promise, resolve, reject } = Promise.withResolvers<ResultMessage>();
+		this.#queue.push({
+			input,
+			resolve,
+			reject,
+			settlement: promise,
+			startedAtMs: null,
+			settled: false,
+			interruptResult: null,
+			interruptAck: null,
+			settledByWorker: false,
 		});
+		return promise;
 	}
 
 	startNext(startedAtMs: number): PendingJavaScriptRun | null {
@@ -64,7 +79,7 @@ export class JavaScriptRunQueue {
 	settleAll(message: string): void {
 		const active = this.#active;
 		this.#active = null;
-		if (active) this.settle(active, stoppedResult(active.input.cellId, message));
+		if (active) this.settle(active, active.interruptResult ?? stoppedResult(active.input.cellId, message));
 		for (const queued of this.#queue.splice(0)) this.settle(queued, stoppedResult(queued.input.cellId, message));
 	}
 

package/src/kernels/js/worker-core.js

@@ -1,7 +1,11 @@
 import { JsWorkerRuntime } from "./worker-runtime.js";
 
+// Mirrors INTERRUPT_ACK_OP in src/bridge/reserved.ts (this worker file cannot import TypeScript).
+const INTERRUPT_ACK_OP = "interrupt-ack";
+
 export function createWorkerCore(transport, options) {
 	let runtime = null;
+	let activeCell = null;
 	const pendingTools = new Map();
 
 	function emit(message) {
@@ -14,6 +18,7 @@ export function createWorkerCore(transport, options) {
 			return;
 		}
 		const startedAtMs = performance.now();
+		activeCell = { cellId: message.cellId, interruption: null };
 		try {
 			const value = await runtime.run(message.code, message.cellId, {
 				emit,
@@ -22,16 +27,31 @@ export function createWorkerCore(transport, options) {
 			emit({ type: "result", cellId: message.cellId, ok: true, valueRepr: valueRepr(value), durationMs: durationMs(startedAtMs) });
 		} catch (error) {
 			emit({ type: "result", cellId: message.cellId, ok: false, error: bridgeError(error), durationMs: durationMs(startedAtMs) });
+		} finally {
+			activeCell = null;
 		}
 	}
 
 	async function callTool(toolName, args) {
+		if (activeCell?.interruption) throw activeCell.interruption;
 		const callId = `js-${crypto.randomUUID()}`;
 		const promise = new Promise((resolve, reject) => pendingTools.set(callId, { resolve, reject }));
 		emit({ type: "tool-call", callId, toolName, args });
 		return await promise;
 	}
 
+	function interruptCell(reason) {
+		if (!activeCell || !runtime) return;
+		emit({ type: "status", event: { op: INTERRUPT_ACK_OP, cellId: activeCell.cellId } });
+		const interruption = cellInterruptedError(reason);
+		activeCell.interruption = interruption;
+		for (const [callId, pending] of pendingTools) {
+			pendingTools.delete(callId);
+			pending.reject(interruption);
+		}
+		runtime.interrupt();
+	}
+
 	function onMessage(message) {
 		if (message.type === "init") {
 			runtime = new JsWorkerRuntime({
@@ -55,6 +75,10 @@ export function createWorkerCore(transport, options) {
 			else pending.reject(errorFromBridge(message.error));
 			return;
 		}
+		if (message.type === "interrupt") {
+			interruptCell(message.reason ?? "interrupted");
+			return;
+		}
 		if (message.type === "close") {
 			emit({ type: "closed" });
 			transport.close();
@@ -79,6 +103,12 @@ function valueRepr(value) {
 	return JSON.stringify(value);
 }
 
+function cellInterruptedError(reason) {
+	const error = new Error(`JS cell interrupted: ${reason}`);
+	error.name = "CellInterruptedError";
+	return error;
+}
+
 function bridgeError(error) {
 	if (error instanceof Error) {
 		return { name: error.name, message: error.message, stack: error.stack };

package/src/kernels/js/worker-runtime.js

@@ -16,6 +16,7 @@ export class JsWorkerRuntime {
 	#env = new Map();
 	#hooks = null;
 	#pendingDisplays = [];
+	#children = new Set();
 
 	constructor(options) {
 		this.#cwd = options.cwd;
@@ -41,10 +42,24 @@ export class JsWorkerRuntime {
 			return value;
 		} finally {
 			this.#pendingDisplays = [];
+			this.#children.clear();
 			this.#hooks = null;
 		}
 	}
 
+	interrupt() {
+		for (const child of this.#children) {
+			if (child.exitCode === null && child.signalCode === null) child.kill();
+		}
+	}
+
+	#trackChild(child) {
+		if (child === null || typeof child !== "object" || typeof child.kill !== "function") return;
+		this.#children.add(child);
+		const forget = () => this.#children.delete(child);
+		if (child.exited instanceof Promise) child.exited.then(forget, forget);
+	}
+
 	async #drainPendingDisplays() {
 		while (this.#pendingDisplays.length > 0) {
 			const pending = this.#pendingDisplays;
@@ -99,6 +114,7 @@ export class JsWorkerRuntime {
 		const restoreShellCapture = installShellCapture({
 			isActive: () => this.#hooks !== null,
 			emitText: (stream, data) => this.#emitText(stream, data),
+			onChild: (child) => this.#trackChild(child),
 		});
 		globalThis.__senpi_restore_console__ = () => {
 			console.log = originalLog;

package/src/kernels/js/worker-shell-capture.d.ts

@@ -2,9 +2,18 @@ export type ShellCaptureStream = "stdout" | "stderr";
 
 export type ShellCaptureRestore = () => void;
 
+export interface ShellCaptureChild {
+	readonly exitCode: number | null;
+	readonly signalCode: string | null;
+	readonly exited: Promise<number>;
+	kill(): void;
+}
+
 export interface ShellCaptureOptions {
 	readonly isActive: () => boolean;
 	readonly emitText: (stream: ShellCaptureStream, data: string) => void;
+	/** Receives every `Bun.spawn` child created while a cell is active so the runtime can kill it on interrupt. */
+	readonly onChild?: (child: ShellCaptureChild) => void;
 }
 
 export function installShellCapture(options: ShellCaptureOptions): ShellCaptureRestore;