@code-yeongyu/senpi-codemode 2026.10.6 → 2026.10.8

package/src/index.ts

@@ -1,4 +1,3 @@
-import * as os from "node:os";
 import type { ExtensionContext } from "@code-yeongyu/senpi";
 import type { AgentExecuteTool } from "./bridges/agent-bridge.ts";
 import type { EvalSchemaToolInfo } from "./bridges/schema-bridge.ts";
@@ -14,18 +13,22 @@ import {
 import { EvalNotifier } from "./extension/eval-notifier.ts";
 import { EVAL_CELLS_STATUS_KEY } from "./extension/eval-status.ts";
 import { EvalStatusTicker } from "./extension/eval-status-ticker.ts";
+import { hostLine, modelIdFrom } from "./extension/host-facts.ts";
 import { activeKernelPreludes, kernelPreludeDocsKey, promptKernelPreludes } from "./extension/kernel-preludes.ts";
+import { registerRemovedToolHints } from "./extension/removed-tool-hints.ts";
 import {
 	createExecuteTool,
 	createRuntime,
 	enabledLanguagesFrom,
 	type SessionRuntime,
 } from "./extension/runtime-factory.ts";
-import { jsRuntimeInfo, jsRuntimeLabel } from "./extension/runtime-info.ts";
+import { jsRuntimeInfo } from "./extension/runtime-info.ts";
 import type { CodemodeSessionManager, CreateCodemodeSessionManagerOptions } from "./extension/session-manager.ts";
 import { SessionManagerProxy } from "./extension/session-manager-proxy.ts";
 import { activeBunSkillPath, registerBunSkillContribution } from "./extension/skill-contribution.ts";
+import { StartRecovery, withStartRecovery } from "./extension/start-recovery.ts";
 import { WAKE_SOURCE_STATE_EVENT, type WakeSourceState } from "./extension/wake-source-state.ts";
+import { HandleRegistry } from "./handles/handle-registry.ts";
 import type { KernelToolsCapability } from "./kernels/js/kernel-tools-types.ts";
 import { EvalDetachedCellManager, type EvalDetachedCellStatusEntry } from "./tool/detached-cell-manager.ts";
 import {
@@ -36,12 +39,9 @@ import {
 import { createEvalTool } from "./tool/eval-tool.ts";
 import { renderEvalCall, renderEvalResult } from "./tool/render.ts";
 
-const SESSION_LIFECYCLE_EVENTS = [
-	"session_start",
-	"session_shutdown",
-	"session_before_switch",
-	"session_before_fork",
-] as const;
+// session_before_switch / session_before_fork are veto points another extension can cancel, so they never
+// tear the runtime down; a switch or fork that goes ahead emits session_shutdown before the old session ends.
+const SESSION_LIFECYCLE_EVENTS = ["session_start", "session_shutdown"] as const;
 
 type SessionLifecycleEvent = (typeof SESSION_LIFECYCLE_EVENTS)[number];
 
@@ -93,6 +93,7 @@ export default function senpiCodemode(pi: CodemodeExtensionAPI, options: SenpiCo
 	let activeModelId: string | undefined;
 	let activeContext: ExtensionContext | undefined;
 	let activeCells: EvalDetachedCellManager | undefined;
+	let activeHandles: HandleRegistry | undefined;
 	let promptPreludeDocs = "";
 	const notifier = new EvalNotifier({
 		sendMessage: (message, notifyOptions) => pi.sendMessage(message, notifyOptions),
@@ -122,10 +123,12 @@ export default function senpiCodemode(pi: CodemodeExtensionAPI, options: SenpiCo
 		pi.rpc?.emit(WAKE_SOURCE_STATE_EVENT, state);
 		pi.events?.emit(WAKE_SOURCE_STATE_EVENT, state);
 	};
+	const recovery = new StartRecovery(async (event, ctx) => await startSession(event, ctx));
 	const registerEvalForRuntime = (
 		runtime: SessionRuntime,
 		modelId: string | undefined,
 		cellManager: EvalDetachedCellManager,
+		handles: HandleRegistry,
 	): void => {
 		const onCellSettled = (payload: EvalExecutionEventPayload): void => {
 			if (activeCells !== cellManager) return;
@@ -140,93 +143,104 @@ export default function senpiCodemode(pi: CodemodeExtensionAPI, options: SenpiCo
 		const preludes = promptKernelPreludes(pi);
 		promptPreludeDocs = kernelPreludeDocsKey(preludes);
 		pi.registerTool(
-			createEvalTool({
-				enabledLanguages: runtime.enabledLanguages,
-				kernelManager: manager,
-				cellTimeoutSeconds: runtime.settings.cellTimeoutSeconds,
-				foregroundWindowSeconds: resolveForegroundWindowSeconds(runtime.settings),
-				runBudgetSeconds: resolveRunBudgetSeconds(runtime.settings),
-				hardLimitSeconds: resolveHardLimitSeconds(runtime.settings),
-				executeTool: runtime.executeTool,
-				listTools: () => pi.getAllTools(),
-				complete,
-				settings: runtime.settings,
-				artifactsDir: runtime.artifactsDir,
-				cellManager,
-				executionTracker: manager,
-				onCellSettled,
-				renderers,
-				monitor,
-				spawns: runtime.spawns,
-				spawnDefaultAgent: runtime.settings.taskTools.task,
-				hostLine: hostLine(),
-				runtimes: runtime.runtimes,
-				kernelPreludes: () => activeKernelPreludes(pi),
-				promptKernelPreludes: preludes,
-				...(bunSkillPath === undefined ? {} : { bunSkillPath }),
-				...(modelId === undefined ? {} : { modelId }),
-			}),
+			withStartRecovery(
+				recovery,
+				createEvalTool({
+					enabledLanguages: runtime.enabledLanguages,
+					kernelManager: manager,
+					cellTimeoutSeconds: runtime.settings.cellTimeoutSeconds,
+					foregroundWindowSeconds: resolveForegroundWindowSeconds(runtime.settings),
+					runBudgetSeconds: resolveRunBudgetSeconds(runtime.settings),
+					hardLimitSeconds: resolveHardLimitSeconds(runtime.settings),
+					executeTool: runtime.executeTool,
+					listTools: () => pi.getAllTools(),
+					complete,
+					settings: runtime.settings,
+					artifactsDir: runtime.artifactsDir,
+					cellManager,
+					handles,
+					executionTracker: manager,
+					onCellSettled,
+					renderers,
+					monitor,
+					spawns: runtime.spawns,
+					spawnDefaultAgent: runtime.settings.taskTools.task,
+					hostLine: hostLine(),
+					runtimes: runtime.runtimes,
+					kernelPreludes: () => activeKernelPreludes(pi),
+					promptKernelPreludes: preludes,
+					...(bunSkillPath === undefined ? {} : { bunSkillPath }),
+					...(modelId === undefined ? {} : { modelId }),
+				}),
+			),
 		);
 	};
 	const dropRuntime = async (): Promise<void> => {
 		const cells = activeCells;
+		const handles = activeHandles;
 		activeRuntime = undefined;
 		activeModelId = undefined;
 		activeCells = undefined;
+		activeHandles = undefined;
 		statusTicker.stop();
+		// Fail every saved handle closed before the kernels go: a late wait() must never reach a successor generation.
+		handles?.dispose();
 		await cells?.dispose();
 		activeContext = undefined;
 		await manager.dispose();
 	};
 	pi.registerTool(
-		createEvalTool({
-			enabledLanguages: { py: true, js: true, rb: true, jl: true },
-			kernelManager: manager,
-			cellTimeoutSeconds: defaultCodemodeSettings.cellTimeoutSeconds,
-			foregroundWindowSeconds: resolveForegroundWindowSeconds(defaultCodemodeSettings),
-			runBudgetSeconds: resolveRunBudgetSeconds(defaultCodemodeSettings),
-			hardLimitSeconds: resolveHardLimitSeconds(defaultCodemodeSettings),
-			executeTool: createExecuteTool(pi),
-			listTools: () => pi.getAllTools(),
-			complete,
-			settings: defaultCodemodeSettings,
-			cellManager: new EvalDetachedCellManager({
-				notifier,
-				maxDetachedCells: resolveMaxDetachedCells(defaultCodemodeSettings),
-				retainedResultsBytes: resolveRetainedResultsBytes(defaultCodemodeSettings),
-				hardLimitSeconds: resolveHardLimitSeconds(defaultCodemodeSettings),
+		withStartRecovery(
+			recovery,
+			createEvalTool({
+				enabledLanguages: { py: true, js: true, rb: true, jl: true },
+				kernelManager: manager,
+				cellTimeoutSeconds: defaultCodemodeSettings.cellTimeoutSeconds,
+				foregroundWindowSeconds: resolveForegroundWindowSeconds(defaultCodemodeSettings),
 				runBudgetSeconds: resolveRunBudgetSeconds(defaultCodemodeSettings),
-				onStatusChange: showDetachedCells,
-				onWakeSourceState: emitWakeSourceState,
-				...(options.now === undefined ? {} : { now: options.now }),
+				hardLimitSeconds: resolveHardLimitSeconds(defaultCodemodeSettings),
+				executeTool: createExecuteTool(pi),
+				listTools: () => pi.getAllTools(),
+				complete,
+				settings: defaultCodemodeSettings,
+				cellManager: new EvalDetachedCellManager({
+					notifier,
+					maxDetachedCells: resolveMaxDetachedCells(defaultCodemodeSettings),
+					retainedResultsBytes: resolveRetainedResultsBytes(defaultCodemodeSettings),
+					hardLimitSeconds: resolveHardLimitSeconds(defaultCodemodeSettings),
+					runBudgetSeconds: resolveRunBudgetSeconds(defaultCodemodeSettings),
+					onStatusChange: showDetachedCells,
+					onWakeSourceState: emitWakeSourceState,
+					...(options.now === undefined ? {} : { now: options.now }),
+				}),
+				executionTracker: manager,
+				renderers,
+				// The baseline tool is registered before extensions such as monitor load.
+				monitor: false,
+				hostLine: hostLine(),
+				runtimes: { js: jsRuntimeInfo() },
+				...(bunSkillPath === undefined ? {} : { bunSkillPath }),
 			}),
-			executionTracker: manager,
-			renderers,
-			// The baseline tool is registered before extensions such as monitor load.
-			monitor: false,
-			hostLine: hostLine(),
-			runtimes: { js: jsRuntimeInfo() },
-			...(bunSkillPath === undefined ? {} : { bunSkillPath }),
-		}),
-	);
-	pi.registerRemovedToolHint(
-		"exec",
-		'exec was removed; use eval({ language: "js", code }) instead. Long eval cells detach on their own and notify when complete.',
-	);
-	pi.registerRemovedToolHint(
-		"wait",
-		'wait was removed; detached eval cells notify when complete. Use eval({ action: "peek"|"stop", cell_id }) to inspect or stop one.',
+		),
 	);
+	registerRemovedToolHints(pi);
 	registerBunSkillContribution(pi);
 
-	pi.on("session_start", async (event, ctx) => {
+	const startSession = async (event: unknown, ctx: ExtensionContext): Promise<void> => {
 		const previousCells = activeCells;
+		const previousHandles = activeHandles;
 		activeCells = undefined;
+		activeHandles = undefined;
+		previousHandles?.dispose();
 		await previousCells?.dispose();
 		const generation = manager.beginReplacement();
-		const runtime = await createRuntime(pi, ctx, event, complete, options);
+		const handles = new HandleRegistry({ ownerSessionId: ctx.sessionManager.getSessionId() });
+		const runtime = await createRuntime(pi, ctx, event, complete, options, handles);
 		const replaced = await manager.replace(generation, runtime.manager);
-		if (!replaced) return;
+		if (!replaced) {
+			handles.dispose();
+			return;
+		}
 		notifier.reset();
 		activeContext = ctx;
 		const cellManager = new EvalDetachedCellManager({
@@ -242,15 +256,18 @@ export default function senpiCodemode(pi: CodemodeExtensionAPI, options: SenpiCo
 			...(options.now === undefined ? {} : { now: options.now }),
 		});
 		activeCells = cellManager;
+		activeHandles = handles;
 		// The goal builtin clears its per-session counts at session_start; re-publish our snapshot.
 		cellManager.publishWakeSourceState();
 		activeRuntime = runtime;
 		activeModelId = ctx.model?.id;
-		registerEvalForRuntime(runtime, activeModelId, cellManager);
+		registerEvalForRuntime(runtime, activeModelId, cellManager, handles);
+	};
+	pi.on("session_start", async (event, ctx) => await recovery.runStart(event, ctx));
+	pi.on("session_shutdown", async () => {
+		recovery.sessionEnded();
+		await dropRuntime();
 	});
-	pi.on("session_shutdown", async () => dropRuntime());
-	pi.on("session_before_switch", async () => dropRuntime());
-	pi.on("session_before_fork", async () => dropRuntime());
 	pi.on("model_select", async (event, ctx) => {
 		activeContext = ctx;
 		const runtime = activeRuntime;
@@ -259,33 +276,21 @@ export default function senpiCodemode(pi: CodemodeExtensionAPI, options: SenpiCo
 		if (modelId === undefined || modelId === activeModelId) return;
 		activeModelId = modelId;
 		const cellManager = activeCells;
-		if (cellManager === undefined) return;
-		registerEvalForRuntime(runtime, modelId, cellManager);
+		const handles = activeHandles;
+		if (cellManager === undefined || handles === undefined) return;
+		registerEvalForRuntime(runtime, modelId, cellManager, handles);
 	});
 	// Tool activation has no event of its own; the next turn re-documents a changed contribution set.
 	pi.on("turn_start", async () => {
 		const runtime = activeRuntime;
 		const cellManager = activeCells;
-		if (runtime === undefined || cellManager === undefined) return;
+		const handles = activeHandles;
+		if (runtime === undefined || cellManager === undefined || handles === undefined) return;
 		if (kernelPreludeDocsKey(promptKernelPreludes(pi)) === promptPreludeDocs) return;
-		registerEvalForRuntime(runtime, activeModelId, cellManager);
+		registerEvalForRuntime(runtime, activeModelId, cellManager, handles);
 	});
 }
 
-function hostLine(): string {
-	const cpu = os.cpus()[0]?.model?.trim();
-	return [`${os.platform()} ${os.arch()}`, cpu, `${os.availableParallelism()} cores`, jsRuntimeLabel()]
-		.filter((part): part is string => !!part)
-		.join(" \u00b7 ");
-}
-
-function modelIdFrom(event: unknown): string | undefined {
-	if (typeof event !== "object" || event === null || !("model" in event)) return undefined;
-	const model = event.model;
-	if (typeof model !== "object" || model === null || !("id" in model)) return undefined;
-	return typeof model.id === "string" ? model.id : undefined;
-}
-
 export {
 	KERNEL_TOOLS_CAPABILITIES,
 	KERNEL_TOOLS_UNSUPPORTED,

package/src/kernels/jl/handles.jl

@@ -0,0 +1,124 @@
+# In-cell wait()/handle() over the host's handle capability. Mirrors src/bridge/reserved.ts.
+# `Main.wait` is never defined here: `Base.wait` gains methods for the handle types, so `wait(::Task)` for
+# `@async` users keeps working.
+const SENPI_RESERVED_WAIT_TOOL = "__wait__"
+const SENPI_RESERVED_HANDLE_STATUS_TOOL = "__handle_status__"
+const SENPI_RESERVED_HANDLE_OUTPUT_TOOL = "__handle_output__"
+const SENPI_RESERVED_HANDLE_SEND_TOOL = "__handle_send__"
+const SENPI_RESERVED_HANDLE_CANCEL_TOOL = "__handle_cancel__"
+const SENPI_HANDLE_KINDS = ("agent", "completion", "workpool")
+const SENPI_WAIT_MODES = ("all", "any", "settled")
+const SENPI_WAIT_SOCKET_GRACE_SECONDS = 30
+const SENPI_HANDLE_USAGE = "handle() expects an agent(...; handle=true) record, a workpool, a completion handle, or a saved {kind, id, run_epoch} reference"
+
+struct SenpiHandleControl
+    ref::Dict{String, Any}
+end
+
+# The legacy record's fields behave as a Dict; `control` and `ref` are properties, never keys.
+struct SenpiHandle <: AbstractDict{String, Any}
+    fields::Dict{String, Any}
+    ref::Dict{String, Any}
+end
+
+Base.iterate(handle::SenpiHandle, state...) = iterate(getfield(handle, :fields), state...)
+Base.length(handle::SenpiHandle) = length(getfield(handle, :fields))
+Base.get(handle::SenpiHandle, key, default) = get(getfield(handle, :fields), key, default)
+Base.getindex(handle::SenpiHandle, key) = getfield(handle, :fields)[key]
+Base.haskey(handle::SenpiHandle, key) = haskey(getfield(handle, :fields), key)
+Base.keys(handle::SenpiHandle) = keys(getfield(handle, :fields))
+Base.values(handle::SenpiHandle) = values(getfield(handle, :fields))
+
+function Base.getproperty(handle::SenpiHandle, name::Symbol)
+    name === :ref && return copy(getfield(handle, :ref))
+    name === :control && return SenpiHandleControl(copy(getfield(handle, :ref)))
+    fields = getfield(handle, :fields)
+    key = string(name)
+    haskey(fields, key) && return fields[key]
+    getfield(handle, name)
+end
+
+Base.propertynames(handle::SenpiHandle) = (Symbol.(collect(keys(getfield(handle, :fields))))..., :control, :ref)
+
+function senpi_handle_ref(value)
+    value isa SenpiHandle && return copy(getfield(value, :ref))
+    value isa SenpiWorkpool && return Dict{String, Any}("kind" => "workpool", "id" => getfield(value, :pool_id), "run_epoch" => 0)
+    value isa AbstractDict || error(SENPI_HANDLE_USAGE)
+    record = Dict{String, Any}(string(key) => item for (key, item) in value)
+    pool_id = get(record, "pool_id", nothing)
+    pool_id isa AbstractString && return Dict{String, Any}("kind" => "workpool", "id" => string(pool_id), "run_epoch" => 0)
+    kind = get(record, "kind", nothing)
+    if !(kind in SENPI_HANDLE_KINDS)
+        handle_uri = get(record, "handle", nothing)
+        scheme = handle_uri isa AbstractString ? first(split(handle_uri, "://"; limit=2)) : nothing
+        kind = scheme in SENPI_HANDLE_KINDS ? scheme : nothing
+    end
+    identity = get(record, "id", get(record, "task_id", nothing))
+    (kind === nothing || !(identity isa AbstractString) || isempty(identity)) && error(SENPI_HANDLE_USAGE)
+    run_epoch = get(record, "run_epoch", kind == "workpool" ? 0 : nothing)
+    (run_epoch isa Integer && !(run_epoch isa Bool) && run_epoch >= 0) || error(SENPI_HANDLE_USAGE * "; run_epoch must be a non-negative integer")
+    Dict{String, Any}("kind" => string(kind), "id" => string(identity), "run_epoch" => Int(run_epoch))
+end
+
+function senpi_handle_call(tool_name::String, arguments)
+    senpi_with_bridge_timeout_pause(() -> senpi_call_tool(tool_name, arguments))
+end
+
+# A long-lived request bounded by the explicit timeout (plus grace for the host's reply) or else only by the
+# cell's own end; an interrupt from the host (cancel, the cell's hard limit) closes the socket and so the
+# host-side subscription.
+function senpi_wait_post(arguments, timeout)
+    read_timeout = timeout === nothing ? nothing : Float64(timeout) + SENPI_WAIT_SOCKET_GRACE_SECONDS
+    payload = Dict("callId" => "jl-" * string(time_ns()), "toolName" => SENPI_RESERVED_WAIT_TOOL, "args" => arguments)
+    senpi_with_bridge_timeout_pause(() -> senpi_bridge_request("/call", payload; read_timeout=read_timeout))
+end
+
+function senpi_wait(handles; timeout=nothing, mode="all")
+    items = handles === nothing ? Any[] : handles isa AbstractVector || handles isa Tuple ? collect(handles) : Any[handles]
+    if timeout !== nothing
+        (timeout isa Real && !(timeout isa Bool) && isfinite(timeout) && timeout >= 0) || error("wait() timeout must be a finite number of seconds >= 0")
+    end
+    string(mode) in SENPI_WAIT_MODES || error("wait() mode must be \"all\", \"any\" or \"settled\"")
+    arguments = Dict{String, Any}("refs" => [senpi_handle_ref(item) for item in items], "mode" => string(mode))
+    timeout === nothing || (arguments["timeout"] = timeout)
+    senpi_wait_post(arguments, timeout)
+end
+
+function Base.getproperty(control::SenpiHandleControl, name::Symbol)
+    ref = getfield(control, :ref)
+    name === :ref && return copy(ref)
+    name === :status && return () -> senpi_handle_call(SENPI_RESERVED_HANDLE_STATUS_TOOL, Dict("ref" => ref))
+    if name === :output
+        return (; format="raw", offset=nothing, limit=nothing) -> begin
+            arguments = Dict{String, Any}("ref" => ref, "format" => string(format))
+            offset === nothing || (arguments["offset"] = offset)
+            limit === nothing || (arguments["limit"] = limit)
+            senpi_handle_call(SENPI_RESERVED_HANDLE_OUTPUT_TOOL, arguments)
+        end
+    end
+    name === :send && return message -> senpi_handle_call(SENPI_RESERVED_HANDLE_SEND_TOOL, Dict("ref" => ref, "message" => string(message)))
+    name === :cancel && return () -> senpi_handle_call(SENPI_RESERVED_HANDLE_CANCEL_TOOL, Dict("ref" => ref))
+    name === :wait && return (; timeout=nothing) -> senpi_wait([ref]; timeout=timeout, mode="all")[1]
+    getfield(control, name)
+end
+
+Base.propertynames(::SenpiHandleControl) = (:status, :output, :send, :cancel, :wait, :ref)
+Base.show(io::IO, control::SenpiHandleControl) = Base.print(io, "<handle.control ", getfield(control, :ref)["kind"], "://", getfield(control, :ref)["id"], "@", getfield(control, :ref)["run_epoch"], ">")
+
+function senpi_handle_view(value)
+    ref = senpi_handle_ref(value)
+    fields = Dict{String, Any}()
+    if value isa AbstractDict
+        for (key, item) in value
+            item isa Function || (fields[string(key)] = item)
+        end
+    end
+    get!(fields, "id", ref["id"])
+    get!(fields, "run_epoch", ref["run_epoch"])
+    get!(fields, "handle", ref["kind"] * "://" * ref["id"])
+    SenpiHandle(fields, ref)
+end
+
+# Block until the handles settle; never cancels work. See tool_schema("eval:wait").
+Base.wait(handle::SenpiHandle; timeout=nothing, mode="all") = senpi_wait([handle]; timeout=timeout, mode=mode)
+Base.wait(handles::AbstractVector{<:SenpiHandle}; timeout=nothing, mode="all") = senpi_wait(handles; timeout=timeout, mode=mode)

package/src/kernels/jl/prelude.jl

@@ -226,6 +226,14 @@ function workpool(agent::AbstractDict, name::AbstractString; mode=nothing)
     throw(SenpiBridgeError("Host did not return a workpool identity", "workpool_unavailable"))
 end
 
+include("handles.jl")
+
+# Rich view of an agent record, workpool, completion handle or saved reference; see tool_schema("eval:helpers").
+# The barrier is `Base.wait` on the view types (never a `Main.wait`): wait(handle(node)) or wait([handle(a), handle(b)]).
+function handle(value)
+    senpi_handle_view(value)
+end
+
 function completion(prompt::AbstractString; model="default", system=nothing, schema=nothing, kwargs...)
     options = Dict{String, Any}("model" => model)
     system !== nothing && (options["system"] = system)
@@ -234,6 +242,7 @@ function completion(prompt::AbstractString; model="default", system=nothing, sch
         options[string(key)] = value
     end
     response = senpi_with_bridge_timeout_pause(() -> senpi_completion(string(prompt), options))
+    get(options, "handle", false) === true && return handle(response)
     response isa AbstractDict || return response
     haskey(response, "value") && return response["value"]
     get(response, "text", response)

package/src/kernels/jl/runner.jl

@@ -224,12 +224,15 @@ function senpi_http_body(response::AbstractString)
     String(output)
 end
 
-function senpi_bridge_request(path::String, payload)
+# `read_timeout` (seconds) bounds only the long-lived `wait()` request; ordinary calls read until the host closes.
+function senpi_bridge_request(path::String, payload; read_timeout=nothing)
     port = get(senpi_connection, "port", nothing)
     token = get(senpi_connection, "token", nothing)
     port isa Integer && token isa AbstractString || error("Julia tool bridge is not initialized")
     body = senpi_json(payload)
     socket = connect(ip"127.0.0.1", port)
+    timed_out = Ref(false)
+    timer = read_timeout === nothing ? nothing : Timer(_ -> (timed_out[] = true; close(socket)), Float64(read_timeout))
     try
         request = join([
             "POST " * path * " HTTP/1.1",
@@ -244,12 +247,14 @@ function senpi_bridge_request(path::String, payload)
         Base.write(socket, request)
         flush(socket)
         response = Base.read(socket, String)
+        timed_out[] && throw(SenpiBridgeError("bridge request timed out after $(read_timeout)s", "bridge_timeout"))
         parsed = senpi_json_parse(senpi_http_body(response))
         parsed isa AbstractDict || error("Bridge returned invalid JSON")
         get(parsed, "ok", false) === true && return get(parsed, "value", nothing)
         failure = get(parsed, "error", parsed)
         throw(SenpiBridgeError(failure isa AbstractDict ? string(get(failure, "message", failure)) : string(failure), failure isa AbstractDict ? get(failure, "code", nothing) : nothing))
     finally
+        timer === nothing || close(timer)
         close(socket)
     end
 end

package/src/kernels/js/handles.js

@@ -0,0 +1,93 @@
+// In-cell `wait()` / `handle()` over the host's handle capability. Mirrors src/bridge/reserved.ts; this
+// worker asset cannot import TypeScript. Every call rides the ordinary bridge-call path (`callTool`), so
+// the run budget pauses while the cell is parked and the hard limit still applies.
+const RESERVED_WAIT_TOOL = "__wait__";
+const RESERVED_HANDLE_STATUS_TOOL = "__handle_status__";
+const RESERVED_HANDLE_OUTPUT_TOOL = "__handle_output__";
+const RESERVED_HANDLE_SEND_TOOL = "__handle_send__";
+const RESERVED_HANDLE_CANCEL_TOOL = "__handle_cancel__";
+const KINDS = new Set(["agent", "completion", "workpool"]);
+const WAIT_MODES = new Set(["all", "any", "settled"]);
+const USAGE = "handle() expects an agent(..., {handle: true}) record, a workpool, a completion handle, or a saved {kind, id, run_epoch} reference";
+
+export function createHandleHelpers(callTool) {
+	const wait = async (handles, options) => {
+		const list = Array.isArray(handles) ? handles : handles === undefined || handles === null ? [] : [handles];
+		const refs = list.map(toHandleRef);
+		const { timeout, mode } = waitOptions(options);
+		return await callTool(RESERVED_WAIT_TOOL, {
+			refs,
+			...(timeout === undefined ? {} : { timeout }),
+			...(mode === undefined ? {} : { mode }),
+		});
+	};
+	const handle = value => {
+		const ref = toHandleRef(value);
+		const view = Object.create(Object.prototype);
+		if (isPlainObject(value)) {
+			for (const [key, field] of Object.entries(value)) {
+				if (typeof field !== "function") view[key] = field;
+			}
+		}
+		if (!Object.hasOwn(view, "id")) view.id = ref.id;
+		if (!Object.hasOwn(view, "run_epoch")) view.run_epoch = ref.run_epoch;
+		if (!Object.hasOwn(view, "handle")) view.handle = `${ref.kind}://${ref.id}`;
+		const control = Object.freeze({
+			status: async () => await callTool(RESERVED_HANDLE_STATUS_TOOL, { ref }),
+			output: async (opts = {}) => await callTool(RESERVED_HANDLE_OUTPUT_TOOL, { ref, ...outputOptions(opts) }),
+			send: async message => await callTool(RESERVED_HANDLE_SEND_TOOL, { ref, message: String(message) }),
+			cancel: async () => await callTool(RESERVED_HANDLE_CANCEL_TOOL, { ref }),
+			wait: async (opts = {}) => (await wait([ref], { ...waitOptions(opts), mode: "all" }))[0],
+		});
+		Object.defineProperty(view, "ref", { value: Object.freeze({ ...ref }), enumerable: false });
+		Object.defineProperty(view, "control", { value: control, enumerable: false });
+		return view;
+	};
+	return { wait, handle };
+}
+
+/** Accepts legacy agent records, handle() views, completion handles, workpools and saved refs. */
+export function toHandleRef(value) {
+	if (!isPlainObject(value)) throw new TypeError(USAGE);
+	if (isPlainObject(value.ref) && KINDS.has(value.ref.kind)) return toHandleRef(value.ref);
+	if (typeof value.pool_id === "string") return { kind: "workpool", id: value.pool_id, run_epoch: 0 };
+	const kind = KINDS.has(value.kind) ? value.kind : kindFromHandle(value.handle);
+	const id = value.id ?? value.task_id;
+	if (kind === undefined || typeof id !== "string" || id.length === 0) throw new TypeError(USAGE);
+	const run_epoch = value.run_epoch ?? (kind === "workpool" ? 0 : undefined);
+	if (!Number.isInteger(run_epoch) || run_epoch < 0) throw new TypeError(`${USAGE}; run_epoch must be a non-negative integer`);
+	return { kind, id, run_epoch };
+}
+
+function kindFromHandle(handle) {
+	if (typeof handle !== "string") return undefined;
+	const scheme = handle.split("://")[0];
+	return KINDS.has(scheme) ? scheme : undefined;
+}
+
+function waitOptions(options) {
+	if (options === undefined || options === null) return {};
+	if (!isPlainObject(options)) throw new TypeError("wait() accepts { timeout, mode }");
+	for (const key of Object.keys(options)) {
+		if (key !== "timeout" && key !== "mode") throw new TypeError("wait() accepts { timeout, mode }");
+	}
+	const { timeout, mode } = options;
+	if (timeout !== undefined && timeout !== null && (typeof timeout !== "number" || !Number.isFinite(timeout) || timeout < 0)) {
+		throw new TypeError("wait() timeout must be a finite number of seconds >= 0");
+	}
+	if (mode !== undefined && mode !== null && !WAIT_MODES.has(mode)) throw new TypeError('wait() mode must be "all", "any" or "settled"');
+	return { ...(timeout === undefined || timeout === null ? {} : { timeout }), ...(mode === undefined || mode === null ? {} : { mode }) };
+}
+
+function outputOptions(options) {
+	if (!isPlainObject(options)) throw new TypeError("control.output() accepts { format, offset, limit }");
+	const picked = {};
+	for (const key of ["format", "offset", "limit"]) {
+		if (options[key] !== undefined && options[key] !== null) picked[key] = options[key];
+	}
+	return picked;
+}
+
+function isPlainObject(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}

package/src/kernels/js/kernel-tools-define.d.ts

@@ -2,9 +2,15 @@ export type KernelToolFunction = {
 	readonly name: string;
 };
 
+export type KernelToolNamespaceRegistry = {
+	readonly defined?: () => string[];
+	readonly undefine?: (name: unknown) => boolean;
+};
+
 export function createToolNamespace(
 	define: (fn: KernelToolFunction, metadata?: unknown) => unknown,
 	callHost: (name: string, args: unknown) => Promise<unknown>,
+	registry?: KernelToolNamespaceRegistry,
 ): ((fn: KernelToolFunction, metadata?: unknown) => unknown) & {
 	readonly [name: string]: (args?: unknown) => Promise<unknown>;
 };

package/src/kernels/js/kernel-tools-define.js

@@ -1,4 +1,4 @@
-export function createToolNamespace(define, callHost) {
+export function createToolNamespace(define, callHost, registry = {}) {
 	const registrar = function tool(fn, metadata) {
 		return define(fn, metadata);
 	};
@@ -6,6 +6,8 @@ export function createToolNamespace(define, callHost) {
 		get(target, prop) {
 			if (typeof prop !== "string") return undefined;
 			if (prop in Function.prototype || prop === "arguments" || prop === "caller") return target[prop];
+			if (prop === "defined" && registry.defined) return () => registry.defined();
+			if (prop === "undefine" && registry.undefine) return (name) => registry.undefine(name);
 			return async (args) => await callHost(prop, args ?? {});
 		},
 	});

package/src/kernels/js/kernel-tools-errors.js

@@ -8,6 +8,8 @@ export const KERNEL_TOOL_ERROR_CODES = Object.freeze([
 	"kernel_tool_failed",
 	"kernel_tool_recursion",
 	"kernel_tool_host_denied",
+	"kernel_tool_cancelled",
+	"kernel_tool_loop_mismatch",
 ]);
 
 export class KernelToolError extends Error {

package/src/kernels/js/kernel-tools-errors.ts

@@ -8,6 +8,8 @@ export const KERNEL_TOOL_ERROR_CODES = [
 	"kernel_tool_failed",
 	"kernel_tool_recursion",
 	"kernel_tool_host_denied",
+	"kernel_tool_cancelled",
+	"kernel_tool_loop_mismatch",
 ] as const;
 
 export type KernelToolErrorCode = (typeof KERNEL_TOOL_ERROR_CODES)[number];

package/src/kernels/js/kernel-tools-registry.d.ts

@@ -22,6 +22,8 @@ export function createKernelToolRegistry(options?: KernelToolRegistryOptions): {
 		},
 		signal?: AbortSignal,
 	): Promise<unknown>;
+	defined(): string[];
+	undefine(name: unknown): boolean;
 	bumpGeneration(): number;
 	setCollisionNames(hostToolNames?: readonly string[], foreignLanguageNames?: readonly string[]): void;
 };