@workerdeck/react 2.15.0 → 3.1.0

package/build/index.mjs

@@ -1,6 +1,6 @@
-import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from "react";
-import { DEFAULT_PRICING, ENGINE_CAPABILITIES, PEER_MENTION_SIGIL, PROMPT_SENTENCE_TAIL, PROTOCOL_VERSION, isPeerMentionBody, mergePricing, mergeUsage, orderUsageWindows, peerMentionKey, peerMentionSlug, sessionLabel } from "@workerdeck/protocol";
+import { useCallback, useEffect, useMemo, useReducer, useRef, useState, useSyncExternalStore } from "react";
 import { WorkerDeckError } from "@workerdeck/client";
+import { DEFAULT_PRICING, ENGINE_CAPABILITIES, PEER_MENTION_SIGIL, PROMPT_SENTENCE_TAIL, PROTOCOL_VERSION, errorMessage, isPeerMentionBody, mergePricing, mergeUsage, orderUsageWindows, peerMentionKey, peerMentionSlug, sessionLabel } from "@workerdeck/protocol";
 //#region src/lib/transcript.ts
 const initialTranscriptState = {
 	status: "starting",
@@ -94,13 +94,22 @@ function slashCommandText(text) {
 	const args = COMMAND_ARGS.exec(text)?.[1]?.trim();
 	return args ? `${name} ${args}` : name;
 }
-function upsert(items, item) {
-	const index = items.findIndex((existing) => existing.id === item.id && existing.kind === item.kind);
+function findLastIndexOf(items, kind, id) {
+	for (let index = items.length - 1; index >= 0; index--) {
+		const item = items[index];
+		if (item?.id === id && item.kind === kind) return index;
+	}
+	return -1;
+}
+function replaceAt(items, index, item) {
 	if (index === -1) return [...items, item];
 	const next = [...items];
 	next[index] = item;
 	return next;
 }
+function upsert(items, item) {
+	return replaceAt(items, items.findIndex((existing) => existing.id === item.id && existing.kind === item.kind), item);
+}
 function seedFromSessionInfo(state, info) {
 	const engine = info.engine ?? state.engine;
 	return {
@@ -372,21 +381,23 @@ function applyEvent(state, event) {
 			if (delta.type !== "content_block_delta") return base;
 			if (delta.delta?.type === "text_delta") {
 				const id = streamingTextId(event.parentToolUseId);
+				const index = findLastIndexOf(base.items, "assistant_text", id);
 				const item = {
 					kind: "assistant_text",
 					id,
-					text: (base.items.find((item) => item.kind === "assistant_text" && item.id === id)?.text ?? "") + (delta.delta.text ?? ""),
+					text: ((index === -1 ? void 0 : base.items[index])?.text ?? "") + (delta.delta.text ?? ""),
 					streaming: true,
 					parentToolUseId: event.parentToolUseId
 				};
 				return {
 					...base,
-					items: upsert(base.items, item)
+					items: replaceAt(base.items, index, item)
 				};
 			}
 			if (delta.delta?.type === "thinking_delta") {
 				const id = streamingThinkingId(event.parentToolUseId);
-				const text = (base.items.find((item) => item.kind === "thinking" && item.id === id)?.text ?? "") + (delta.delta.thinking ?? "");
+				const index = findLastIndexOf(base.items, "thinking", id);
+				const text = ((index === -1 ? void 0 : base.items[index])?.text ?? "") + (delta.delta.thinking ?? "");
 				if (text.trim() === "") return base;
 				const item = {
 					kind: "thinking",
@@ -396,7 +407,7 @@ function applyEvent(state, event) {
 				};
 				return {
 					...base,
-					items: upsert(base.items, item)
+					items: replaceAt(base.items, index, item)
 				};
 			}
 			return base;
@@ -697,8 +708,8 @@ function useClaudeSession(client, sessionId, options) {
 				text
 			});
 			return true;
-		} catch {
-			dispatch({
+		} catch (error) {
+			if (isNotFound(error)) dispatch({
 				type: "transcript_hydrate_shell",
 				shellId,
 				shell: void 0
@@ -707,8 +718,9 @@ function useClaudeSession(client, sessionId, options) {
 		}
 	}, [client, sessionId]);
 	const verifyShell = useCallback(async (shellId) => {
-		if (!sessionId || verifiedRef.current.has(shellId)) return false;
-		verifiedRef.current.add(shellId);
+		const verified = verifiedRef.current;
+		if (!sessionId || verified.has(shellId)) return false;
+		verified.add(shellId);
 		try {
 			const record = await client.getShell(sessionId, shellId);
 			dispatch({
@@ -717,12 +729,13 @@ function useClaudeSession(client, sessionId, options) {
 				shell: record
 			});
 			return true;
-		} catch {
-			dispatch({
+		} catch (error) {
+			if (isNotFound(error)) dispatch({
 				type: "transcript_hydrate_shell",
 				shellId,
 				shell: void 0
 			});
+			else verified.delete(shellId);
 			return false;
 		}
 	}, [client, sessionId]);
@@ -740,6 +753,31 @@ function useClaudeSession(client, sessionId, options) {
 			return false;
 		}
 	}, [client, sessionId]);
+	const setShellAgentWrite = useCallback(async (shellId, enabled) => {
+		if (!sessionId) return false;
+		try {
+			const record = await client.setShellAgentWrite(sessionId, shellId, enabled);
+			dispatch({
+				type: "transcript_hydrate_shell",
+				shellId,
+				shell: record
+			});
+			return true;
+		} catch {
+			return false;
+		}
+	}, [client, sessionId]);
+	const actions = useMemo(() => ({
+		send: (text, attachmentIds) => handleRef.current?.send(text, attachmentIds),
+		approve: (requestId, updatedInput) => handleRef.current?.approve(requestId, updatedInput),
+		deny: (requestId, message, interrupt) => handleRef.current?.deny(requestId, message, interrupt),
+		interrupt: () => handleRef.current?.interrupt(),
+		clearContext: () => handleRef.current?.clearContext(),
+		runShell: (command) => handleRef.current?.runShell(command),
+		setPermissionMode: (mode) => handleRef.current?.setPermissionMode(mode),
+		setModel: (model) => handleRef.current?.setModel(model),
+		closeSession: () => handleRef.current?.closeSession()
+	}), []);
 	return useMemo(() => ({
 		state,
 		connected,
@@ -751,20 +789,13 @@ function useClaudeSession(client, sessionId, options) {
 		models,
 		effectiveModel: state.model ?? state.defaultModel,
 		handle: handleState,
-		send: (text, attachmentIds) => handleRef.current?.send(text, attachmentIds),
-		approve: (requestId, updatedInput) => handleRef.current?.approve(requestId, updatedInput),
-		deny: (requestId, message, interrupt) => handleRef.current?.deny(requestId, message, interrupt),
-		interrupt: () => handleRef.current?.interrupt(),
-		clearContext: () => handleRef.current?.clearContext(),
-		runShell: (command) => handleRef.current?.runShell(command),
-		setPermissionMode: (mode) => handleRef.current?.setPermissionMode(mode),
-		setModel: (model) => handleRef.current?.setModel(model),
-		closeSession: () => handleRef.current?.closeSession(),
+		...actions,
 		reconnectNow,
 		loadFullResult,
 		loadShellOutput,
 		verifyShell,
-		killShell
+		killShell,
+		setShellAgentWrite
 	}), [
 		state,
 		connected,
@@ -775,13 +806,18 @@ function useClaudeSession(client, sessionId, options) {
 		pricing,
 		models,
 		handleState,
+		actions,
 		reconnectNow,
 		loadFullResult,
 		loadShellOutput,
 		verifyShell,
-		killShell
+		killShell,
+		setShellAgentWrite
 	]);
 }
+function isNotFound(error) {
+	return error instanceof WorkerDeckError && error.status === 404;
+}
 function useProfileModelFallback(client, sessionId, state) {
 	const [catalog, setCatalog] = useState([]);
 	const profile = state.session?.profile;
@@ -825,7 +861,7 @@ function clearProfileUsageCache() {
 const KEY = "workerdeck.drafts.v1";
 const MAX_DRAFTS = 20;
 let memory;
-function storage() {
+function storage$1() {
 	try {
 		return globalThis.localStorage;
 	} catch {
@@ -835,7 +871,7 @@ function storage() {
 function load() {
 	if (memory) return memory;
 	memory = {};
-	const raw = storage()?.getItem(KEY);
+	const raw = storage$1()?.getItem(KEY);
 	if (raw) try {
 		const parsed = JSON.parse(raw);
 		for (const [key, draft] of Object.entries(parsed)) if (typeof draft?.text === "string" && typeof draft.savedAt === "number") memory[key] = draft;
@@ -849,7 +885,7 @@ function persist(drafts) {
 		for (const [key] of entries.slice(MAX_DRAFTS)) delete drafts[key];
 	}
 	try {
-		storage()?.setItem(KEY, JSON.stringify(drafts));
+		storage$1()?.setItem(KEY, JSON.stringify(drafts));
 	} catch {}
 }
 function draftKey(client, sessionId) {
@@ -872,7 +908,7 @@ function writeDraft(key, text, now = Date.now()) {
 function clearDrafts() {
 	memory = {};
 	try {
-		storage()?.removeItem(KEY);
+		storage$1()?.removeItem(KEY);
 	} catch {}
 }
 //#endregion
@@ -935,7 +971,7 @@ function useAttachments(client, sessionId, { capabilities, engine }) {
 			} catch (e) {
 				patch(key, {
 					status: "failed",
-					error: e instanceof Error ? e.message : "Upload failed"
+					error: errorMessage(e, "Upload failed")
 				});
 			}
 		})();
@@ -1124,6 +1160,58 @@ function useAliveRef() {
 function isRouteUnsupported(e) {
 	return e instanceof WorkerDeckError && e.status === 404;
 }
+function useAsync(load, deps, { enabled = true, pollMs } = {}) {
+	const [data, setData] = useState();
+	const [error, setError] = useState();
+	const [loading, setLoading] = useState(enabled);
+	const generation = useRef(0);
+	const loadRef = useRef(load);
+	loadRef.current = load;
+	const run = useCallback(async () => {
+		const id = ++generation.current;
+		setLoading(true);
+		try {
+			const next = await loadRef.current();
+			if (id === generation.current) {
+				setData(() => next);
+				setError(void 0);
+			}
+		} catch (e) {
+			if (id === generation.current) setError(e);
+		} finally {
+			if (id === generation.current) setLoading(false);
+		}
+	}, []);
+	useEffect(() => {
+		setData(void 0);
+		setError(void 0);
+	}, deps);
+	useEffect(() => {
+		if (!enabled) {
+			generation.current++;
+			setLoading(false);
+			return;
+		}
+		run();
+		const timer = pollMs ? setInterval(() => void run(), pollMs) : void 0;
+		return () => {
+			generation.current++;
+			clearInterval(timer);
+		};
+	}, [
+		enabled,
+		pollMs,
+		run,
+		...deps
+	]);
+	return {
+		data,
+		error,
+		loading,
+		reload: run,
+		setData
+	};
+}
 //#endregion
 //#region src/lib/host-tree.ts
 function flattenHostTree(root, dirs, expanded) {
@@ -1271,7 +1359,7 @@ function useHostFileTree(client, cwd) {
 				setUnsupported(true);
 				return;
 			}
-			setError(e instanceof Error ? e.message : "Could not read that directory");
+			setError(errorMessage(e, "Could not read that directory"));
 		});
 	}, [client, unsupported]);
 	useEffect(() => {
@@ -1321,7 +1409,7 @@ function useHostFileTree(client, cwd) {
 }
 //#endregion
 //#region src/hooks/use-peer-sessions.ts
-const EMPTY = {
+const EMPTY$1 = {
 	available: false,
 	peers: [],
 	names: []
@@ -1354,7 +1442,7 @@ function usePeerSessions(client, sessionId, enabled = true) {
 		unsupported
 	]);
 	return useMemo(() => {
-		if (!enabled || unsupported || !sessions) return EMPTY;
+		if (!enabled || unsupported || !sessions) return EMPTY$1;
 		const peers = sessions.filter((info) => info.id !== sessionId).sort((a, b) => (b.lastActivityAt ?? b.createdAt) - (a.lastActivityAt ?? a.createdAt)).map((info) => ({
 			id: info.id,
 			slug: peerMentionSlug(info.title, info.id),
@@ -1408,6 +1496,111 @@ function useProjectIcons(rows, clientFor) {
 	return resolved;
 }
 //#endregion
+//#region src/lib/bookmark-store.ts
+const BOOKMARKS_STORAGE_KEY = "workerdeck.bookmarks.v1";
+const EMPTY = Object.freeze([]);
+const listeners = /* @__PURE__ */ new Set();
+let loaded;
+let detachStorageEvent;
+function storage() {
+	try {
+		return globalThis.localStorage ?? void 0;
+	} catch {
+		return;
+	}
+}
+function storageEvents() {
+	const target = globalThis.window;
+	return typeof target?.addEventListener === "function" ? target : void 0;
+}
+function readStored() {
+	try {
+		const raw = storage()?.getItem(BOOKMARKS_STORAGE_KEY);
+		if (raw == null) return {};
+		const parsed = JSON.parse(raw);
+		if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return {};
+		const map = {};
+		for (const [key, value] of Object.entries(parsed)) if (Array.isArray(value)) map[key] = value.filter((id) => typeof id === "string");
+		return map;
+	} catch {
+		return;
+	}
+}
+function sameIds(a, b) {
+	return a.length === b.length && a.every((id, index) => id === b[index]);
+}
+function adopt(next) {
+	const previous = loaded ?? {};
+	const merged = {};
+	for (const [key, ids] of Object.entries(next)) {
+		const held = previous[key];
+		merged[key] = held && sameIds(held, ids) ? held : ids;
+	}
+	loaded = merged;
+}
+function current() {
+	if (loaded === void 0) adopt(readStored() ?? {});
+	return loaded ?? {};
+}
+function notify() {
+	for (const listener of listeners) listener();
+}
+function bookmarksFor(sessionKey) {
+	return current()[sessionKey] ?? EMPTY;
+}
+function toggleBookmark(sessionKey, itemId) {
+	const base = readStored() ?? current();
+	const held = base[sessionKey] ?? EMPTY;
+	const ids = held.includes(itemId) ? held.filter((id) => id !== itemId) : [...held, itemId];
+	const next = {
+		...base,
+		[sessionKey]: ids
+	};
+	if (ids.length === 0) delete next[sessionKey];
+	try {
+		storage()?.setItem(BOOKMARKS_STORAGE_KEY, JSON.stringify(next));
+	} catch {}
+	adopt(next);
+	notify();
+}
+function onStorage(event) {
+	if (event.key !== null && event.key !== "workerdeck.bookmarks.v1") return;
+	const stored = readStored();
+	if (stored) {
+		adopt(stored);
+		notify();
+	}
+}
+function subscribeBookmarks(listener) {
+	listeners.add(listener);
+	const target = storageEvents();
+	if (listeners.size === 1 && target) {
+		target.addEventListener("storage", onStorage);
+		detachStorageEvent = () => target.removeEventListener("storage", onStorage);
+	}
+	return () => {
+		listeners.delete(listener);
+		if (listeners.size === 0) {
+			detachStorageEvent?.();
+			detachStorageEvent = void 0;
+		}
+	};
+}
+//#endregion
+//#region src/hooks/use-bookmarks.ts
+const NONE = Object.freeze([]);
+function useBookmarks(sessionKey) {
+	const read = useCallback(() => sessionKey ? bookmarksFor(sessionKey) : NONE, [sessionKey]);
+	const bookmarks = useSyncExternalStore(subscribeBookmarks, read, () => NONE);
+	const toggle = useCallback((itemId) => {
+		if (sessionKey) toggleBookmark(sessionKey, itemId);
+	}, [sessionKey]);
+	return useMemo(() => ({
+		bookmarks,
+		toggle
+	}), [bookmarks, toggle]);
+}
+//#endregion
 //#region src/hooks/use-draft.ts
 function useDraft(client, sessionId) {
 	const key = sessionId ? draftKey(client, sessionId) : void 0;
@@ -1477,37 +1670,11 @@ function useProfileUsage(client, profile, options = {}) {
 //#endregion
 //#region src/hooks/use-session-info.ts
 function useSessionInfo(client, sessionId) {
-	const [info, setInfo] = useState();
-	const [loading, setLoading] = useState(!!sessionId);
-	const [error, setError] = useState();
-	useEffect(() => {
-		if (!sessionId) {
-			setInfo(void 0);
-			setLoading(false);
-			setError(void 0);
-			return;
-		}
-		let cancelled = false;
-		setLoading(true);
-		setError(void 0);
-		setInfo(void 0);
-		client.getSession(sessionId).then((next) => {
-			if (cancelled) return;
-			setInfo(next);
-			setLoading(false);
-		}).catch((e) => {
-			if (cancelled) return;
-			setError(e instanceof Error ? e.message : "Session not found");
-			setLoading(false);
-		});
-		return () => {
-			cancelled = true;
-		};
-	}, [client, sessionId]);
+	const { data, error, loading } = useAsync(() => client.getSession(sessionId), [client, sessionId], { enabled: !!sessionId });
 	return {
-		info,
+		info: data,
 		loading,
-		error
+		error: error === void 0 ? void 0 : errorMessage(error, "Session not found")
 	};
 }
 //#endregion
@@ -1666,7 +1833,7 @@ function useOpenFiles(client) {
 				dispatch({
 					type: "failed",
 					path,
-					error: e instanceof Error ? e.message : "Could not read that file"
+					error: errorMessage(e, "Could not read that file")
 				});
 			});
 		}
@@ -1710,7 +1877,7 @@ function useOpenFiles(client) {
 			dispatch({
 				type: "failed",
 				path,
-				error: e instanceof Error ? e.message : "Could not re-read that file"
+				error: errorMessage(e, "Could not re-read that file")
 			});
 		});
 	}, [read]);
@@ -1737,7 +1904,7 @@ function useOpenFiles(client) {
 				type: "saveFailed",
 				path,
 				conflict,
-				error: conflict ? "This file changed on disk since you opened it." : e instanceof Error ? e.message : "Could not save that file"
+				error: conflict ? "This file changed on disk since you opened it." : errorMessage(e, "Could not save that file")
 			});
 		}
 	}, [client]);
@@ -1767,7 +1934,7 @@ function useOpenFiles(client) {
 			dispatch({
 				type: "saveFailed",
 				path,
-				error: e instanceof Error ? e.message : "Could not save that file"
+				error: errorMessage(e, "Could not save that file")
 			});
 		}
 	}, [client, write]);
@@ -1796,19 +1963,33 @@ function createToolCallHost(handle, options = {}) {
 	let enginePromise;
 	let disposed = false;
 	const track = (execution) => options.onExecution?.(execution);
-	const refuse = (frame, reason, error, startedAt) => {
-		handle.sendToolCallError(frame.executionId, reason, error);
-		track({
-			executionId: frame.executionId,
-			toolName: frame.toolName,
-			status: "failed",
-			reason,
-			startedAt,
-			endedAt: Date.now()
-		});
+	const settle = (frame, startedAt, outcome) => {
+		const { executionId, toolName } = frame;
+		if (outcome.ok) {
+			handle.sendToolCallResult(executionId, {
+				type: "json",
+				value: outcome.value
+			}, outcome.logs);
+			track({
+				executionId,
+				toolName,
+				status: "settled",
+				startedAt,
+				endedAt: Date.now()
+			});
+		} else {
+			handle.sendToolCallError(executionId, outcome.reason, outcome.error, outcome.logs);
+			track({
+				executionId,
+				toolName,
+				status: "failed",
+				reason: outcome.reason,
+				startedAt,
+				endedAt: Date.now()
+			});
+		}
 	};
-	const runClientTool = async (frame, handler) => {
-		const startedAt = Date.now();
+	const execute = async (frame, startedAt, work) => {
 		const controller = new AbortController();
 		inFlight.set(frame.executionId, controller);
 		track({
@@ -1817,116 +1998,94 @@ function createToolCallHost(handle, options = {}) {
 			status: "running",
 			startedAt
 		});
+		let outcome;
 		try {
-			const result = await handler(frame.input, {
-				executionId: frame.executionId,
-				signal: controller.signal
-			});
-			if (disposed || !inFlight.has(frame.executionId)) return;
-			if ("error" in result) {
-				handle.sendToolCallError(frame.executionId, result.reason ?? "client_error", result.error);
-				track({
-					executionId: frame.executionId,
-					toolName: frame.toolName,
-					status: "failed",
-					reason: result.reason ?? "client_error",
-					startedAt,
-					endedAt: Date.now()
-				});
-			} else {
-				handle.sendToolCallResult(frame.executionId, {
-					type: "json",
-					value: result.value
-				});
-				track({
-					executionId: frame.executionId,
-					toolName: frame.toolName,
-					status: "settled",
-					startedAt,
-					endedAt: Date.now()
-				});
-			}
+			outcome = await work(controller.signal);
 		} catch (error) {
-			if (disposed || !inFlight.has(frame.executionId)) return;
-			refuse(frame, "host_error", error instanceof Error ? error.message : String(error), startedAt);
+			outcome = {
+				ok: false,
+				reason: "host_error",
+				error: errorMessage(error)
+			};
+		}
+		try {
+			if (!disposed && inFlight.has(frame.executionId)) settle(frame, startedAt, outcome);
 		} finally {
 			inFlight.delete(frame.executionId);
 		}
 	};
+	const runClientTool = (frame, handler, startedAt) => execute(frame, startedAt, async (signal) => {
+		const result = await handler(frame.input, {
+			executionId: frame.executionId,
+			signal
+		});
+		return "error" in result ? {
+			ok: false,
+			reason: result.reason ?? "client_error",
+			error: result.error
+		} : {
+			ok: true,
+			value: result.value
+		};
+	});
+	const runScript = (frame, script, startedAt) => execute(frame, startedAt, async (signal) => {
+		const sandbox = await import("@workerdeck/sandbox");
+		const vfs = sandbox.createVfs(frame.vfsSeed);
+		const timeoutMs = Math.min(frame.limits?.timeoutMs ?? Number.POSITIVE_INFINITY, options.timeoutMs ?? 5e3);
+		const memoryLimitBytes = Math.min(frame.limits?.memoryLimitBytes ?? Number.POSITIVE_INFINITY, options.memoryLimitBytes ?? 67108864);
+		let result;
+		if (options.execute) result = await options.execute({
+			script,
+			vfs,
+			timeoutMs,
+			memoryLimitBytes,
+			signal
+		});
+		else {
+			enginePromise ??= (options.loadEngine ?? defaultLoadEngine)();
+			result = await sandbox.runScript(await enginePromise, {
+				script,
+				vfs,
+				timeoutMs,
+				memoryLimitBytes,
+				signal,
+				fetchText: options.fetchText
+			});
+		}
+		const logs = result.logs.map((l) => `[${l.level}] ${l.text}`);
+		return result.ok ? {
+			ok: true,
+			value: result.value,
+			logs
+		} : {
+			ok: false,
+			reason: result.reason,
+			error: result.error,
+			logs
+		};
+	});
 	const run = async (frame) => {
 		const startedAt = Date.now();
 		const clientHandler = options.clientTools?.[frame.toolName];
-		if (clientHandler) return runClientTool(frame, clientHandler);
+		if (clientHandler) return runClientTool(frame, clientHandler, startedAt);
 		if (!(options.tools ?? ["eval_script"]).includes(frame.toolName)) {
-			refuse(frame, "unsupported_tool", `this client does not execute '${frame.toolName}'`, startedAt);
+			settle(frame, startedAt, {
+				ok: false,
+				reason: "unsupported_tool",
+				error: `this client does not execute '${frame.toolName}'`
+			});
 			return;
 		}
 		const script = frame.input?.script;
 		if (typeof script !== "string") {
-			refuse(frame, "invalid_input", "expected a string `script` input", startedAt);
+			settle(frame, startedAt, {
+				ok: false,
+				reason: "invalid_input",
+				error: "expected a string `script` input"
+			});
 			return;
 		}
-		const controller = new AbortController();
-		inFlight.set(frame.executionId, controller);
-		track({
-			executionId: frame.executionId,
-			toolName: frame.toolName,
-			status: "running",
-			startedAt
-		});
-		try {
-			const sandbox = await import("@workerdeck/sandbox");
-			const vfs = sandbox.createVfs(frame.vfsSeed);
-			const timeoutMs = Math.min(frame.limits?.timeoutMs ?? Number.POSITIVE_INFINITY, options.timeoutMs ?? 5e3);
-			const memoryLimitBytes = Math.min(frame.limits?.memoryLimitBytes ?? Number.POSITIVE_INFINITY, options.memoryLimitBytes ?? 67108864);
-			const result = options.execute ? await options.execute({
-				script,
-				vfs,
-				timeoutMs,
-				memoryLimitBytes,
-				signal: controller.signal
-			}) : await (async () => {
-				enginePromise ??= (options.loadEngine ?? defaultLoadEngine)();
-				return sandbox.runScript(await enginePromise, {
-					script,
-					vfs,
-					timeoutMs,
-					memoryLimitBytes,
-					signal: controller.signal,
-					fetchText: options.fetchText
-				});
-			})();
-			if (disposed || !inFlight.has(frame.executionId)) return;
-			const logs = result.logs.map((l) => `[${l.level}] ${l.text}`);
-			if (result.ok) {
-				handle.sendToolCallResult(frame.executionId, {
-					type: "json",
-					value: result.value
-				}, logs);
-				track({
-					executionId: frame.executionId,
-					toolName: frame.toolName,
-					status: "settled",
-					startedAt,
-					endedAt: Date.now()
-				});
-			} else {
-				handle.sendToolCallError(frame.executionId, result.reason, result.error, logs);
-				track({
-					executionId: frame.executionId,
-					toolName: frame.toolName,
-					status: "failed",
-					reason: result.reason,
-					startedAt,
-					endedAt: Date.now()
-				});
-			}
-		} catch (error) {
-			if (disposed || !inFlight.has(frame.executionId)) return;
-			refuse(frame, "host_error", error instanceof Error ? error.message : String(error), startedAt);
-		} finally {
-			inFlight.delete(frame.executionId);
-		}
+		return runScript(frame, script, startedAt);
 	};
 	const offRequest = handle.on("toolCallRequest", (frame) => void run(frame));
 	const offCancel = handle.on("toolCallCanceled", ({ executionId, reason }) => {
@@ -2166,6 +2325,6 @@ function useShellTerminal(handle, shellId, options) {
 	]);
 }
 //#endregion
-export { REPLAY_HOLD_MAX_MS, ancestorsWithin, applyEvent, attachmentKind, clearDrafts, clearProfileUsageCache, clearTranscriptCache, createToolCallHost, currentText, flattenHostTree, hydrateShellOutput, hydrateShellRow, hydrateToolResult, initialOpenFilesState, initialReplayTarget, initialTranscriptState, isDirty, openFilesReducer, rateLimitWindows, recapLine, scanPromptTokens, seedFromSessionInfo, shellRowText, staleAttach, summarizeSince, useAttachments, useClaudeSession, useDraft, useHostFileRoots, useHostFileSearch, useHostFileTree, useOpenFiles, usePeerSessions, useProfileUsage, useProjectIcons, useSessionInfo, useShellTerminal, useToolCallHost };
+export { BOOKMARKS_STORAGE_KEY, REPLAY_HOLD_MAX_MS, ancestorsWithin, applyEvent, attachmentKind, clearDrafts, clearProfileUsageCache, clearTranscriptCache, createToolCallHost, currentText, flattenHostTree, hydrateShellOutput, hydrateShellRow, hydrateToolResult, initialOpenFilesState, initialReplayTarget, initialTranscriptState, isDirty, openFilesReducer, rateLimitWindows, recapLine, scanPromptTokens, seedFromSessionInfo, shellRowText, staleAttach, summarizeSince, useAsync, useAttachments, useBookmarks, useClaudeSession, useDraft, useHostFileRoots, useHostFileSearch, useHostFileTree, useOpenFiles, usePeerSessions, useProfileUsage, useProjectIcons, useSessionInfo, useShellTerminal, useToolCallHost };
 
 //# sourceMappingURL=index.mjs.map