@code-yeongyu/senpi-codemode 2026.10.8 → 2026.10.10-2

package/src/environments/python-environments.ts

@@ -0,0 +1,85 @@
+import type { ResolvedCodemodeSettings } from "../config/settings.ts";
+import {
+	type EnvironmentMode,
+	type InstallReceipt,
+	installPythonPackages,
+	managedEnvironmentBase,
+	projectPythonBase,
+	pythonAbiTag,
+} from "./py-environment.ts";
+import { EnvironmentError } from "./py-installer.ts";
+import { readActiveRevisionSync } from "./revision-store.ts";
+
+export interface PythonEnvironmentsOptions {
+	readonly artifactsDir: string;
+	readonly cwd: string;
+	readonly interpreter: string;
+	readonly settings: Pick<ResolvedCodemodeSettings, "environments">;
+}
+
+export class PythonEnvironments {
+	readonly #options: PythonEnvironmentsOptions;
+	#mode: EnvironmentMode = "managed";
+	#currentBase: string | undefined;
+	#managedBase: Promise<string> | undefined;
+
+	constructor(options: PythonEnvironmentsOptions) {
+		this.#options = options;
+	}
+
+	get mode(): EnvironmentMode {
+		return this.#mode;
+	}
+
+	/**
+	 * The revision a Python cell imports from, read from the current mode's root each time a cell starts, so an
+	 * install by another session sharing the project root is seen. Undefined while nothing is installed there.
+	 */
+	get activeRoot(): string | undefined {
+		return this.#currentBase === undefined ? undefined : readActiveRevisionSync(this.#currentBase)?.dir;
+	}
+
+	async setMode(mode: EnvironmentMode): Promise<string> {
+		const base = await this.#base(mode);
+		this.#mode = mode;
+		this.#currentBase = base;
+		return base;
+	}
+
+	async install(
+		requirements: string,
+		signal: AbortSignal,
+		onOutput?: (stream: "stdout" | "stderr", data: string) => void,
+	): Promise<InstallReceipt> {
+		if (this.#options.settings.environments?.autoProvision === false) {
+			throw new EnvironmentError(
+				"environment_installer_unavailable",
+				"installs are turned off for this project (environments.autoProvision is false)",
+			);
+		}
+		const mode = this.#mode;
+		const base = await this.#base(mode);
+		const receipt = await installPythonPackages({
+			base,
+			mode,
+			interpreter: this.#options.interpreter,
+			requirements,
+			cwd: this.#options.cwd,
+			signal,
+			...(onOutput === undefined ? {} : { onOutput }),
+		});
+		if (this.#mode === mode) this.#currentBase = base;
+		return receipt;
+	}
+
+	#base(mode: EnvironmentMode): Promise<string> {
+		if (mode === "project") return Promise.resolve(projectPythonBase(this.#options.cwd));
+		const configured = this.#options.settings.environments?.managedRoot;
+		this.#managedBase ??= pythonAbiTag(this.#options.interpreter).then((abi) =>
+			configured === undefined
+				? managedEnvironmentBase(this.#options.artifactsDir, "py", abi)
+				: managedEnvironmentBase(configured, "py", abi),
+		);
+		return this.#managedBase;
+	}
+}

package/src/environments/revision-store.ts

@@ -1,7 +1,9 @@
 import { randomUUID } from "node:crypto";
-import { cp, mkdir, readdir, readFile, rename, rm, writeFile } from "node:fs/promises";
+import { readFileSync } from "node:fs";
+import { chmod, cp, mkdir, readdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { type LockWaitNotice, withRootLock } from "./install-lock.ts";
+import { assertLinkStaysInside, assertNoLinksBelow, recordedInstallSources } from "./no-links.ts";
 import { EnvironmentError } from "./py-installer.ts";
 
 const POINTER = "active";
@@ -12,11 +14,25 @@ export interface Revision {
 	readonly dir: string;
 }
 
+/** The same read, synchronous: the pointer is one short file, read when a Python cell starts running. */
+export function readActiveRevisionSync(base: string): Revision | undefined {
+	try {
+		return parsePointer(base, readFileSync(join(base, POINTER), "utf8"));
+	} catch (error) {
+		if (error instanceof Error && "code" in error && error.code === "ENOENT") return undefined;
+		throw error;
+	}
+}
+
+function parsePointer(base: string, text: string): Revision | undefined {
+	const name = text.trim();
+	const match = REVISION.exec(name);
+	return match?.[1] === undefined ? undefined : { number: Number(match[1]), dir: join(base, name) };
+}
+
 export async function readActiveRevision(base: string): Promise<Revision | undefined> {
 	try {
-		const name = (await readFile(join(base, POINTER), "utf8")).trim();
-		const match = REVISION.exec(name);
-		return match?.[1] === undefined ? undefined : { number: Number(match[1]), dir: join(base, name) };
+		return parsePointer(base, await readFile(join(base, POINTER), "utf8"));
 	} catch (error) {
 		if (error instanceof Error && "code" in error && error.code === "ENOENT") return undefined;
 		throw error;
@@ -35,7 +51,7 @@ export async function publishNextRevision(
 	signal?: AbortSignal,
 	onLockWait?: (notice: LockWaitNotice) => void,
 ): Promise<{ readonly revision: Revision; readonly previous: Revision | undefined }> {
-	await mkdir(base, { recursive: true });
+	await mkdirPrivate(base);
 	return withRootLock(
 		base,
 		async () => {
@@ -44,8 +60,18 @@ export async function publishNextRevision(
 			const staging = join(base, `.staging-rev-${number}-${process.pid}-${randomUUID()}`);
 			const dir = join(base, `rev-${number}`);
 			try {
-				if (previous === undefined) await mkdir(staging, { recursive: true });
-				else await cp(previous.dir, staging, { recursive: true, verbatimSymlinks: true });
+				if (previous === undefined) await mkdir(staging, { mode: 0o700 });
+				else {
+					await assertNoLinksBelow(base, previous.dir);
+					const sources = await recordedInstallSources(previous.dir);
+					await cp(previous.dir, staging, {
+						recursive: true,
+						verbatimSymlinks: true,
+						filter: async (source) => await assertLinkStaysInside(source, previous.dir, sources),
+					});
+				}
+				// Explicit, not left to the umask: a revision holds the user's installed packages and carried registry config.
+				await chmod(staging, 0o700);
 				await build(staging, previous);
 				signal?.throwIfAborted();
 				await renameRetrying(staging, dir);
@@ -93,3 +119,8 @@ async function highestRevision(base: string): Promise<number> {
 	}
 	return highest;
 }
+
+/** Creates `dir` and any missing parents private to the user (0700; the umask can only narrow it further). */
+export async function mkdirPrivate(dir: string): Promise<void> {
+	await mkdir(dir, { recursive: true, mode: 0o700 });
+}

package/src/extension/bridge-tool-call.ts

@@ -8,6 +8,8 @@ export interface BridgeToolCallRequest {
 	readonly toolName: string;
 	readonly args: unknown;
 	readonly callId: string;
+	/** The calling run's secret; absent for a call made outside any run (a plain thread), which gets no kernel tools. */
+	readonly cellToken?: string;
 	readonly signal: AbortSignal;
 }
 

package/src/extension/cell-kernel-tools.ts

@@ -0,0 +1,28 @@
+import { kernelToolsStorage } from "@code-yeongyu/senpi";
+import type { KernelToolsCapability } from "../kernels/js/kernel-tools-types.ts";
+
+/**
+ * Kernel-tools capabilities of the subprocess-kernel cells running right now, keyed by a secret minted per run and
+ * sent only to the kernel running that cell. Those kernels (py/rb/jl) reach the host over the bridge, outside the
+ * submitting cell's async context, so a bridge call carries its run's secret and runs inside that run's capability:
+ * the same `kernelToolsStorage` scope the JS worker path enters per host call (#1754).
+ */
+export class CellKernelTools {
+	readonly #byToken = new Map<string, KernelToolsCapability>();
+
+	/** Makes `capability` the kernel tools of calls carrying `token` until the returned release runs. */
+	bind(token: string, capability: KernelToolsCapability): () => void {
+		this.#byToken.set(token, capability);
+		return () => {
+			if (this.#byToken.get(token) === capability) this.#byToken.delete(token);
+		};
+	}
+
+	/** Runs `call` with the capability bound to `token`; an absent, unknown or released token gets none. */
+	async run<T>(token: string | undefined, call: () => Promise<T>): Promise<T> {
+		const capability = token === undefined ? undefined : this.#byToken.get(token);
+		return capability === undefined
+			? await kernelToolsStorage.exit(call)
+			: await kernelToolsStorage.run(capability, call);
+	}
+}

package/src/extension/kernel-replacement.ts

@@ -13,6 +13,7 @@ import type {
 	KernelInterruptHandle,
 	PendingCell,
 } from "../tool/types.ts";
+import { hasKernelTools, type KernelToolsMethods } from "./kernel-tools-probe.ts";
 
 export type StartKernel = (lifecycle: Required<KernelLifecycle>) => Promise<EvalKernel>;
 
@@ -50,10 +51,29 @@ export class ReplaceableKernel implements EvalKernel {
 	#closed = false;
 	#closeFailure: unknown;
 
+	// Present only when the instance has kernel tools, so a probe sees what it would see on the instance itself.
+	declare readonly describeKernelTools?: KernelToolsMethods["describeKernelTools"];
+	declare readonly invokeKernelTool?: KernelToolsMethods["invokeKernelTool"];
+
 	private constructor(language: EvalLanguage, start: StartKernel, first: EvalKernel) {
 		this.#language = language;
 		this.#start = start;
 		this.#kernel = first;
+		// Python is the one subprocess kernel with kernel tools; rb and jl only carry tools_unavailable stubs to hide.
+		if (language === "py" && hasKernelTools(first)) {
+			// Always the CURRENT instance: after a replacement the old definitions are gone with the old interpreter.
+			const tools: KernelToolsMethods = {
+				describeKernelTools: (names) => this.#currentTools().describeKernelTools(names),
+				invokeKernelTool: (request, options) => this.#currentTools().invokeKernelTool(request, options),
+			};
+			Object.assign(this, tools);
+		}
+	}
+
+	#currentTools(): KernelToolsMethods {
+		const current = this.#kernel;
+		if (!hasKernelTools(current)) throw new Error(`The ${this.#language} kernel has no kernel tools`);
+		return current;
 	}
 
 	/** Starts the first instance; one that cannot hand back its queue is returned as it is. */

package/src/extension/runtime-factory.ts

@@ -2,12 +2,15 @@ import { type ExtensionContext, withBundledBunCommands } from "@code-yeongyu/sen
 import type { AgentExecuteTool } from "../bridges/agent-bridge.ts";
 import type { EvalSchemaToolInfo } from "../bridges/schema-bridge.ts";
 import type { CompletionRequest, CompletionResult } from "../completion/handler.ts";
+import { withoutUntrustedInterpreter } from "../config/project-trust.ts";
 import {
 	type CodemodeSettings,
 	loadCodemodeSettings,
 	type ResolvedCodemodeSettings,
 	resolveEnabledLanguages,
 } from "../config/settings.ts";
+import { JsEnvironments } from "../environments/js-environments.ts";
+import { PythonEnvironments } from "../environments/python-environments.ts";
 import type { HandleRegistry } from "../handles/handle-registry.ts";
 import {
 	createInterpreterDetector,
@@ -47,6 +50,8 @@ export type SessionRuntime = {
 	readonly artifactsDir: string;
 	readonly executeTool: AgentExecuteTool;
 	readonly spawns: boolean;
+	readonly pythonEnvironments?: PythonEnvironments;
+	readonly jsEnvironments: JsEnvironments;
 };
 
 export async function createRuntime(
@@ -58,11 +63,23 @@ export async function createRuntime(
 	handles?: HandleRegistry,
 ): Promise<SessionRuntime> {
 	const loaded = await loadCodemodeSettings({ cwd: ctx.cwd });
+	const trusted = withoutUntrustedInterpreter(
+		loaded.settings,
+		loaded.source,
+		ctx.cwd,
+		typeof ctx.isProjectTrusted === "function" ? () => ctx.isProjectTrusted() : undefined,
+	);
 	const settings: ResolvedCodemodeSettings = {
-		...loaded.settings,
-		languages: resolveEnabledLanguages(loaded.settings),
+		...trusted.settings,
+		languages: resolveEnabledLanguages(trusted.settings),
 	};
 	const availability = await getInterpreterAvailability(settings, createInterpreterDetector());
+	const pyReason = availability.py.detected.ok ? undefined : availability.py.detected.reason;
+	reportSettingsProblems(ctx, [
+		...loaded.warnings,
+		...(trusted.warning === undefined ? [] : [trusted.warning]),
+		...(pyReason === undefined ? [] : [pyReason]),
+	]);
 	const enabledLanguages = enabledLanguagesFrom(settings, availability);
 	const artifacts = resolveSessionArtifactsDir(ctx.sessionManager.getSessionFile());
 	const activeTools = new Set(pi.getActiveTools());
@@ -96,9 +113,34 @@ export async function createRuntime(
 		artifactsDir: artifacts.dir,
 		executeTool,
 		spawns: activeTools.has(settings.taskTools.task),
+		jsEnvironments: new JsEnvironments({
+			artifactsDir: artifacts.dir,
+			cwd: ctx.cwd,
+			runtime: jsRuntimeInfo().name,
+			env: { ...process.env, ...sessionEnv },
+			settings,
+		}),
+		...(availability.py.detected.ok && enabledLanguages.py
+			? {
+					pythonEnvironments: new PythonEnvironments({
+						artifactsDir: artifacts.dir,
+						cwd: ctx.cwd,
+						interpreter: availability.py.detected.path,
+						settings,
+					}),
+				}
+			: {}),
 	};
 }
 
+/** Settings problems reach the user: a notice with a UI, otherwise stderr (print and RPC runs). */
+function reportSettingsProblems(ctx: ExtensionContext, problems: readonly string[]): void {
+	for (const problem of problems) {
+		if (ctx.hasUI) ctx.ui.notify(`[senpi-codemode] ${problem}`, "warning");
+		else console.error(`[senpi-codemode] ${problem}`);
+	}
+}
+
 export function createExecuteTool(pi: CodemodeRuntimeAPI, activeTools?: ReadonlySet<string>): AgentExecuteTool {
 	// A cell names tools directly and cannot run tool_search first, so eval opts in to
 	// lazy activation. Eligibility still belongs to the extension that registered the tool.

package/src/extension/session-manager-proxy.ts

@@ -1,6 +1,7 @@
 import type { ExtensionContext } from "@code-yeongyu/senpi";
 import type { KernelToHostMessage } from "../bridge/protocol.ts";
 import type { CompletionRequest, CompletionResult } from "../completion/handler.ts";
+import type { KernelToolsCapability } from "../kernels/js/kernel-tools-types.ts";
 import type { EvalKernel, EvalLanguage } from "../tool/types.ts";
 import {
 	CodemodeSessionDisposedError,
@@ -106,6 +107,11 @@ export class SessionManagerProxy implements CodemodeSessionManager, EvalExecutio
 		this.#current?.releaseKernelListener?.(language, onMessage);
 	}
 
+	bindCellKernelTools(token: string, capability: KernelToolsCapability): () => void {
+		// Bound to the generation that runs the cell: a later generation never serves that cell's host calls.
+		return this.#current?.bindCellKernelTools?.(token, capability) ?? (() => undefined);
+	}
+
 	async complete(request: CompletionRequest, ctx: ExtensionContext): Promise<CompletionResult> {
 		this.assertEvalExecutionAllowed();
 		const current = this.#current;

package/src/extension/session-manager.ts

@@ -3,14 +3,17 @@ import type { ExtensionContext } from "@code-yeongyu/senpi";
 import { type BridgeServerHandle, startBridgeServer } from "../bridge/http-server.ts";
 import type { KernelToHostMessage } from "../bridge/protocol.ts";
 import type { CompletionRequest, CompletionResult } from "../completion/handler.ts";
+import { resolveKernelToolsEnabled } from "../config/feature-settings.ts";
 import { resolveKernelMemoryThresholds } from "../config/memory-settings.ts";
 import { collectOrphanedChildren } from "../host-sdk.ts";
 import { JavaScriptKernel } from "../kernels/js/context-manager.ts";
-import type { KernelToolsDescribeResult } from "../kernels/js/kernel-tools-types.ts";
+import type { KernelToolsCapability, KernelToolsDescribeResult } from "../kernels/js/kernel-tools-types.ts";
+import type { SessionEnvironment } from "../kernels/session-env.ts";
 import type { KernelLifecycle } from "../kernels/shared/kernel-death.ts";
 import type { EvalKernel, EvalLanguage } from "../tool/types.ts";
 import { type BridgeDispatchContext, dispatchBridgeCompletion } from "./bridge-dispatch.ts";
 import { type BridgeToolCallRequest, routeBridgeToolCall } from "./bridge-tool-call.ts";
+import { CellKernelTools } from "./cell-kernel-tools.ts";
 import { parkWhenIdle } from "./idle-parking-kernel.ts";
 import {
 	javaScriptKernelMemory,
@@ -65,6 +68,7 @@ class DefaultCodemodeSessionManager implements CodemodeSessionManager {
 	readonly #registrations: SessionKernelRegistrations;
 	#kernelCreations = new Map<EvalLanguage, Promise<EvalKernel>>();
 	#onMessageRefs = new Map<EvalLanguage, (message: KernelToHostMessage) => void>();
+	readonly #cellKernelTools = new CellKernelTools();
 	#context: ExtensionContext | undefined;
 	#generation = 0;
 	#disposePromise: Promise<void> | undefined;
@@ -91,7 +95,13 @@ class DefaultCodemodeSessionManager implements CodemodeSessionManager {
 	}
 
 	async #call(request: BridgeToolCallRequest): Promise<unknown> {
-		return await routeBridgeToolCall(this.#options, request, this.#context?.evalHandleHost);
+		return await this.#cellKernelTools.run(request.cellToken, () =>
+			routeBridgeToolCall(this.#options, request, this.#context?.evalHandleHost),
+		);
+	}
+
+	bindCellKernelTools(token: string, capability: KernelToolsCapability): () => void {
+		return this.#cellKernelTools.bind(token, capability);
 	}
 
 	async getKernel(language: EvalLanguage, onMessage: (message: KernelToHostMessage) => void): Promise<EvalKernel> {
@@ -253,6 +263,7 @@ class DefaultCodemodeSessionManager implements CodemodeSessionManager {
 				foreignLanguageNames: () => this.#foreignKernelToolNames(),
 				memory: resolveKernelMemoryThresholds(this.#options.settings.memory),
 				collectOrphanedChildren,
+				...(resolveKernelToolsEnabled(this.#options.settings) ? {} : { kernelToolsEnabled: false }),
 				...(this.#options.sessionEnv ? { sessionEnv: this.#options.sessionEnv } : {}),
 				...(localRoots ? { localRoots: { ...localRoots } } : {}),
 				...(this.#options.artifactsDir ? { artifactsDir: this.#options.artifactsDir } : {}),
@@ -268,10 +279,14 @@ class DefaultCodemodeSessionManager implements CodemodeSessionManager {
 			...(localRoots ? { localRoots: { ...localRoots } } : {}),
 			...(this.#options.artifactsDir ? { artifactsDir: this.#options.artifactsDir } : {}),
 		};
+		// The Python prelude reads this when a cell defines an @tool; only a disabled setting adds it.
+		const sessionEnv: SessionEnvironment | undefined = resolveKernelToolsEnabled(this.#options.settings)
+			? this.#options.sessionEnv
+			: { ...this.#options.sessionEnv, SENPI_CODEMODE_KERNEL_TOOLS: "0" };
 		const shared = {
 			sessionId: this.#options.sessionId,
 			cwd: this.#options.cwd,
-			...(this.#options.sessionEnv ? { sessionEnv: this.#options.sessionEnv } : {}),
+			...(sessionEnv ? { sessionEnv } : {}),
 			connection,
 			onMessage,
 			...lifecycle,

package/src/index.ts

@@ -157,6 +157,8 @@ export default function senpiCodemode(pi: CodemodeExtensionAPI, options: SenpiCo
 					complete,
 					settings: runtime.settings,
 					artifactsDir: runtime.artifactsDir,
+					...(runtime.pythonEnvironments === undefined ? {} : { pythonEnvironments: runtime.pythonEnvironments }),
+					jsEnvironments: runtime.jsEnvironments,
 					cellManager,
 					handles,
 					executionTracker: manager,

package/src/interpreters/detect.ts

@@ -20,6 +20,8 @@ export interface InterpreterDetected {
 
 export interface InterpreterUnavailable {
 	readonly ok: false;
+	/** Why a configured interpreter could not be used; unset when detection simply found none. */
+	readonly reason?: string;
 }
 
 export type InterpreterDetection = InterpreterDetected | InterpreterUnavailable;
@@ -43,6 +45,8 @@ export interface CreateInterpreterDetectorOptions {
 
 export interface InterpreterDetector {
 	detect(language: CodemodeLanguage): Promise<InterpreterDetection>;
+	/** Probes exactly this executable (no PATH candidates, no splitting on spaces). */
+	detectExplicit(path: string): Promise<InterpreterDetection>;
 }
 
 export interface LanguageAvailability {
@@ -74,6 +78,9 @@ export function createInterpreterDetector(options: CreateInterpreterDetectorOpti
 			cache.set(language, pending);
 			return pending;
 		},
+		detectExplicit(path) {
+			return probeExplicit(path, probe);
+		},
 	};
 }
 
@@ -82,7 +89,7 @@ export async function getInterpreterAvailability(
 	detector: InterpreterDetector,
 ): Promise<InterpreterAvailability> {
 	return {
-		py: await availabilityFor("py", settings.languages.py, detector),
+		py: await pythonAvailability(settings, detector),
 		js: await availabilityFor("js", settings.languages.js, detector),
 		rb: await availabilityFor("rb", settings.languages.rb, detector),
 		jl: await availabilityFor("jl", settings.languages.jl, detector),
@@ -100,6 +107,32 @@ async function availabilityFor(
 	};
 }
 
+/** `languages.pyInterpreter`, when set, is the only interpreter Python uses; a path that does not answer makes Python unavailable. */
+async function pythonAvailability(
+	settings: CodemodeSettings,
+	detector: InterpreterDetector,
+): Promise<LanguageAvailability> {
+	const configured = settings.languages.pyInterpreter;
+	if (configured === undefined || !settings.languages.py)
+		return await availabilityFor("py", settings.languages.py, detector);
+	return { enabled: true, detected: await detector.detectExplicit(configured) };
+}
+
+async function probeExplicit(path: string, probe: ExecFileProbe): Promise<InterpreterDetection> {
+	const reason = (detail: string): InterpreterUnavailable => ({
+		ok: false,
+		reason: `languages.pyInterpreter "${path}" ${detail}; Python is unavailable in this session`,
+	});
+	try {
+		const result = await probe(path, ["--version"], { timeoutMs: probeTimeoutMs });
+		const version = parseVersion(`${result.stdout}\n${result.stderr}`);
+		if (version === null) return reason("did not report a Python version");
+		return { ok: true, path, version, resolvedPath: path };
+	} catch (error) {
+		return reason(`could not run (${error instanceof Error ? error.message.split("\n")[0] : String(error)})`);
+	}
+}
+
 async function detectUncached(
 	language: CodemodeLanguage,
 	hostPlatform: NodeJS.Platform,

package/src/kernels/jl/prelude.jl

@@ -210,9 +210,14 @@ function Base.getproperty(pool::SenpiWorkpool, name::Symbol)
     getfield(pool, name)
 end
 
-function workpool(agent::AbstractDict, name::AbstractString; mode=nothing)
+function workpool(agent::AbstractDict, name::AbstractString; mode=nothing, tools=nothing)
     args = Dict{String, Any}("op" => "create", "agent" => agent, "name" => name)
     mode !== nothing && (args["mode"] = mode)
+    if tools !== nothing
+        (tools isa AbstractVector && all(name -> name isa AbstractString, tools)) ||
+            throw(SenpiBridgeError("workpool(tools=...) takes a vector of tool names; got $(typeof(tools))", "invalid_tools"))
+        args["tools"] = collect(String, tools)
+    end
     result = senpi_workpool_call(args)
     details = get(result, "details", nothing)
     if details isa AbstractDict

package/src/kernels/js/cell-dispatch.ts

@@ -0,0 +1,44 @@
+import type { HostToKernelMessage } from "../../bridge/protocol.ts";
+import type { HostCellExecutor } from "../../tool/types.ts";
+import { inputAtStart } from "../shared/cell-source-at-start.ts";
+import { refusedEntry } from "./host-entries.ts";
+import {
+	type JavaScriptKernelOptions,
+	type JavaScriptRunInput,
+	resolveKernelToolNameSource,
+} from "./kernel-contract.ts";
+import type { LocalModuleLoader } from "./local-module-loader.ts";
+
+export type CellDispatch =
+	| { readonly kind: "host"; readonly host: HostCellExecutor }
+	| { readonly kind: "worker"; readonly frames: readonly HostToKernelMessage[] };
+
+/**
+ * Decides at the cell's turn how it runs: as a host entry (an install, or a turn-time refusal such as an unreadable
+ * `%load` file) or in the worker, with the frames the worker needs (the current kernel-tool names, then the cell).
+ */
+export function dispatchCell(
+	queued: JavaScriptRunInput,
+	loader: LocalModuleLoader,
+	options: Pick<JavaScriptKernelOptions, "hostToolNames" | "foreignLanguageNames">,
+): CellDispatch {
+	const input = inputAtStart(queued);
+	if ("refused" in input) return { kind: "host", host: refusedEntry(input.refused) };
+	if (input.host !== undefined) return { kind: "host", host: input.host };
+	return {
+		kind: "worker",
+		frames: [
+			{
+				type: "kernel-tools-names",
+				hostToolNames: resolveKernelToolNameSource(options.hostToolNames),
+				foreignLanguageNames: resolveKernelToolNameSource(options.foreignLanguageNames),
+			},
+			{
+				type: "run",
+				cellId: input.cellId,
+				code: loader.prepareCell(input.code, input.kernelPreludes, input.sourceFile, input.packageRoot?.()),
+				timeoutMs: input.timeoutMs,
+			},
+		],
+	};
+}

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

@@ -3,14 +3,15 @@ import { CHILD_LIFECYCLE_OP, INTERRUPT_ACK_OP } from "../../bridge/reserved.ts";
 import type { KernelInterruptHandle } from "../../tool/types.ts";
 import { KernelToolHostPump } from "../shared/kernel-tools-pump.ts";
 import { ActiveCellControl } from "./active-cell-control.ts";
-import { DEFAULT_INTERRUPT_BOUNDS, type WorkerRetirement } from "./interrupt-bounds.ts";
+import { dispatchCell } from "./cell-dispatch.ts";
+import { HostEntries } from "./host-entries.ts";
+import { DEFAULT_INTERRUPT_BOUNDS, JS_INTERRUPT_GRACE_MS, type WorkerRetirement } from "./interrupt-bounds.ts";
 import {
 	assertJavaScriptKernelOpen,
 	type JavaScriptKernelMode,
 	type JavaScriptRunInput,
 	type LifecycleState,
 	type ResultMessage,
-	resolveKernelToolNameSource,
 	type ToolCallMessage,
 } from "./kernel-contract.ts";
 import { type JavaScriptMemoryReading, KernelMemoryBridge } from "./kernel-memory-bridge.ts";
@@ -21,7 +22,7 @@ import type {
 	KernelToolsInvokeRequest,
 } from "./kernel-tools-types.ts";
 import { type JavaScriptKernelOptions, LocalModuleLoader } from "./local-module-loader.ts";
-import { JavaScriptRunQueue } from "./run-queue.ts";
+import { JavaScriptRunQueue, type PendingJavaScriptRun } from "./run-queue.ts";
 import { ToolCallQueue } from "./tool-call-queue.ts";
 import { WorkerChildren } from "./worker-children.ts";
 import { crashedResult } from "./worker-host.ts";
@@ -34,6 +35,15 @@ export type { JavaScriptKernelOptions } from "./local-module-loader.ts";
 export { type JavaScriptWorkerEntryUrlOptions, resolveJsWorkerEntryUrl } from "./worker-startup.ts";
 
 export class JavaScriptKernel {
+	readonly #hostEntries = new HostEntries<PendingJavaScriptRun>({
+		emit: (run, message) => (run.input.onMessage ?? this.#options.onMessage)?.(message),
+		settle: (run, result) => {
+			if (!this.#runs.releaseActive(run)) return;
+			this.#runs.settle(run, result);
+			this.#startNext();
+		},
+		durationMs: (run) => this.#runs.durationMs(run, performance.now()),
+	});
 	readonly #options: JavaScriptKernelOptions;
 	readonly #moduleLoader: LocalModuleLoader;
 	readonly #slot: WorkerSlot;
@@ -128,6 +138,7 @@ export class JavaScriptKernel {
 			const cancelled = this.cancelQueued(cellId, reason);
 			return { stateRetained: Promise.resolve(true), ...(cancelled ? {} : { note: "cell not found" }) };
 		}
+		if (active && this.#hostEntries.abort(active, reason)) return { stateRetained: Promise.resolve(true) };
 		if (!active) {
 			// A worker still stuck in startup is not a healthy idle worker: retiring it is the only recovery.
 			const wedgedInStartup = this.#slot.startingUp;
@@ -162,11 +173,14 @@ export class JavaScriptKernel {
 		if (this.#closePromise) return await this.#closePromise;
 		this.#slot.postMessage({ type: "close" });
 		this.#lifecycle = "closing";
+		const graceMs = this.#options.interruptBounds?.graceMs ?? JS_INTERRUPT_GRACE_MS;
+		const hostEntriesStopped = this.#hostEntries.stopAll("JS kernel closed", graceMs);
 		this.#runs.settleAll("JS kernel closed");
 		this.#kernelTools.rejectAll(kernelToolError("kernel_tool_stale", "JS kernel closed"));
 		this.#toolCalls.clear();
 		const recovery = this.#recovery.inFlight;
 		const closePromise = (async () => {
+			await hostEntriesStopped;
 			if (recovery) await recovery;
 			await this.#terminate();
 		})().finally(() => {
@@ -195,18 +209,13 @@ export class JavaScriptKernel {
 		if (this.#lifecycle !== "open" || this.#runs.active || !this.#slot.present) return;
 		const next = this.#runs.startNext(performance.now());
 		if (!next) return;
+		const dispatch = dispatchCell(next.input, this.#moduleLoader, this.#options);
+		if (dispatch.kind === "host") {
+			this.#hostEntries.start(next, dispatch.host);
+			return;
+		}
 		this.#activeCell.arm(next);
-		this.#slot.postMessage({
-			type: "kernel-tools-names",
-			hostToolNames: resolveKernelToolNameSource(this.#options.hostToolNames),
-			foreignLanguageNames: resolveKernelToolNameSource(this.#options.foreignLanguageNames),
-		});
-		this.#slot.postMessage({
-			type: "run",
-			cellId: next.input.cellId,
-			code: this.#moduleLoader.prepareCell(next.input.code, next.input.kernelPreludes),
-			timeoutMs: next.input.timeoutMs,
-		});
+		for (const frame of dispatch.frames) this.#slot.postMessage(frame);
 	}
 
 	async #restartAfterStop(): Promise<void> {
@@ -247,7 +256,8 @@ export class JavaScriptKernel {
 		this.#activeCell.disarm();
 		this.#kernelTools.rejectAll(kernelToolError("kernel_tool_stale", error.message));
 		this.#memory.workerLost(error);
-		if (active) {
+		// A crash mid-install stops the install (process group killed, nothing published); it settles itself once stopped.
+		if (active && !this.#hostEntries.abort(active, `JavaScript worker crashed: ${error.message}`)) {
 			this.#runs.releaseActive(active);
 			this.#runs.settle(
 				active,