@oh-my-pi/pi-coding-agent 16.1.13 → 16.1.15

package/src/subprocess/worker-runtime.ts

@@ -0,0 +1,277 @@
+import { createRequire } from "node:module";
+import * as path from "node:path";
+import type { ProgressInfo } from "@huggingface/transformers";
+import {
+	ensureRuntimeInstalled,
+	getTinyModelsCacheDir,
+	installRuntimeModuleResolver,
+	isCompiledBinary,
+	resolveRuntimeModule,
+} from "@oh-my-pi/pi-utils";
+import packageJson from "../../package.json" with { type: "json" };
+
+/**
+ * Child-side scaffolding shared by the ONNX inference worker bodies
+ * (`stt/asr-worker`, `tiny/worker`, `tts/tts-worker`). These are the helpers
+ * that run inside the spawned subprocess: error serialization, structured log
+ * and progress reporting over the worker's typed transport, side-runtime
+ * install (sharp stubbing + module-resolver patch), once-per-process runtime
+ * memoization, and the Transformers.js runtime loader. The parent/client-side
+ * complement lives in `worker-client.ts`.
+ *
+ * Each worker keeps its own strongly-typed transport / model-key / progress
+ * event; the structural {@link WorkerLogTransport} / {@link WorkerProgressTransport}
+ * interfaces below are the minimal shapes these helpers need, and every worker's
+ * concrete transport satisfies them.
+ */
+
+export const TRANSFORMERS_PACKAGE = "@huggingface/transformers";
+const COMPILED_TRANSFORMERS_VERSION = process.env.PI_TINY_TRANSFORMERS_VERSION;
+const sourceRequire = createRequire(import.meta.url);
+
+// ── Error serialization ─────────────────────────────────────────────
+
+export function errorText(error: unknown): string {
+	return error instanceof Error ? (error.stack ?? error.message) : String(error);
+}
+
+export function errorMessage(error: unknown): string {
+	return error instanceof Error ? error.message : String(error);
+}
+
+// ── Structured logging ──────────────────────────────────────────────
+
+export type WorkerLogLevel = "debug" | "warn" | "error";
+
+/** Minimal transport surface a worker exposes for forwarding log lines. */
+export interface WorkerLogTransport {
+	send(message: { type: "log"; level: WorkerLogLevel; msg: string; meta?: Record<string, unknown> }): void;
+}
+
+export function sendLog(
+	transport: WorkerLogTransport,
+	level: WorkerLogLevel,
+	msg: string,
+	meta?: Record<string, unknown>,
+): void {
+	transport.send({ type: "log", level, msg, meta });
+}
+
+// ── Progress reporting ──────────────────────────────────────────────
+
+/**
+ * Generic worker progress event. Each worker's protocol declares an identical
+ * shape with its own `modelKey` type; this is the parameterized version the
+ * shared helpers emit, structurally assignable to each protocol's event.
+ */
+export interface WorkerProgressEvent<K> {
+	modelKey: K;
+	status: "initiate" | "download" | "progress" | "progress_total" | "done" | "ready" | "error";
+	name?: string;
+	file?: string;
+	progress?: number;
+	loaded?: number;
+	total?: number;
+	files?: Record<string, { loaded: number; total: number }>;
+	task?: string;
+	model?: string;
+}
+
+/** Minimal transport surface a worker exposes for emitting progress events. */
+export interface WorkerProgressTransport<K> {
+	send(message: { type: "progress"; id: string; event: WorkerProgressEvent<K> }): void;
+}
+
+/** Map a Transformers.js {@link ProgressInfo} onto the worker progress event. */
+function toProgressEvent<K>(modelKey: K, info: ProgressInfo): WorkerProgressEvent<K> {
+	if (info.status === "ready") {
+		return { modelKey, status: info.status, task: info.task, model: info.model };
+	}
+	if (info.status === "progress_total") {
+		return {
+			modelKey,
+			status: info.status,
+			name: info.name,
+			progress: info.progress,
+			loaded: info.loaded,
+			total: info.total,
+			files: info.files,
+		};
+	}
+	if (info.status === "progress") {
+		return {
+			modelKey,
+			status: info.status,
+			name: info.name,
+			file: info.file,
+			progress: info.progress,
+			loaded: info.loaded,
+			total: info.total,
+		};
+	}
+	return { modelKey, status: info.status, name: info.name, file: info.file };
+}
+
+export function sendProgress<K>(
+	transport: WorkerProgressTransport<K>,
+	id: string,
+	modelKey: K,
+	info: ProgressInfo,
+): void {
+	transport.send({ type: "progress", id, event: toProgressEvent(modelKey, info) });
+}
+
+// ── Model cache ─────────────────────────────────────────────────────
+
+/**
+ * If a model is already warming/warm in `cache`, replay a `ready` progress
+ * event for this request once it resolves and return the cached promise so the
+ * caller can short-circuit; otherwise return `undefined`.
+ */
+export function replayCachedReady<K, M>(
+	cache: Map<K, Promise<M>>,
+	modelKey: K,
+	transport: WorkerProgressTransport<K>,
+	requestId: string,
+	task: string,
+	model: string,
+): Promise<M> | undefined {
+	const cached = cache.get(modelKey);
+	if (!cached) return undefined;
+	void cached
+		.then(() => {
+			transport.send({ type: "progress", id: requestId, event: { modelKey, status: "ready", task, model } });
+		})
+		.catch(() => undefined);
+	return cached;
+}
+
+// ── Side-runtime install scaffolding ────────────────────────────────
+
+/**
+ * Stub `sharp` (the speech/text pipelines are not image codecs, so the native
+ * image dependency is dead weight) and patch the module resolver so a side
+ * runtime's bare requires resolve against its own `node_modules`. Returns the
+ * runtime's `node_modules` directory.
+ */
+export async function installSharpStubResolver(runtimeDir: string): Promise<string> {
+	const nodeModules = path.join(runtimeDir, "node_modules");
+	const sharpStub = path.join(runtimeDir, "omp-sharp-stub.cjs");
+	await Bun.write(sharpStub, "module.exports = {};\n");
+	installRuntimeModuleResolver({ runtimeNodeModules: nodeModules, stubs: { sharp: sharpStub } });
+	return nodeModules;
+}
+
+/**
+ * Prepare a freshly-installed compiled runtime for loading and return the
+ * absolute entrypoint of `packageName` to `require`.
+ */
+async function prepareCompiledRuntime(runtimeDir: string, packageName: string): Promise<string> {
+	const nodeModules = await installSharpStubResolver(runtimeDir);
+	const entry = resolveRuntimeModule(nodeModules, packageName);
+	if (!entry) throw new Error(`Unable to resolve ${packageName} in compiled runtime at ${nodeModules}`);
+	return entry;
+}
+
+// ── Transformers version resolution ─────────────────────────────────
+
+function resolveTransformersVersionSpec(): string {
+	const manifest = packageJson as {
+		optionalDependencies?: Record<string, string>;
+		dependencies?: Record<string, string>;
+	};
+	const versionSpec =
+		manifest.optionalDependencies?.[TRANSFORMERS_PACKAGE] ?? manifest.dependencies?.[TRANSFORMERS_PACKAGE];
+	if (!versionSpec) throw new Error(`${TRANSFORMERS_PACKAGE} is missing from package.json optionalDependencies`);
+	if (!versionSpec.startsWith("catalog:")) return versionSpec;
+	if (COMPILED_TRANSFORMERS_VERSION) return COMPILED_TRANSFORMERS_VERSION;
+	const installed = sourceRequire(`${TRANSFORMERS_PACKAGE}/package.json`) as { version: string };
+	return installed.version;
+}
+
+let cachedTransformersVersionSpec: string | undefined;
+
+/**
+ * Lazily resolve (and memoize) the transformers version spec. In the `catalog:`
+ * case {@link resolveTransformersVersionSpec} `require`s the installed
+ * `@huggingface/transformers/package.json`, so it is only ever touched on the
+ * compiled-binary runtime-install path — loading a worker (smoke-test ping,
+ * online path) never triggers the transformers resolve/install dance.
+ */
+export function getTransformersVersionSpec(): string {
+	cachedTransformersVersionSpec ??= resolveTransformersVersionSpec();
+	return cachedTransformersVersionSpec;
+}
+
+// ── Transformers runtime loader ─────────────────────────────────────
+
+/** The subset of the Transformers.js module surface {@link configureTransformers} touches. */
+interface ConfigurableTransformers {
+	env: { cacheDir?: string; allowLocalModels?: boolean; logLevel?: unknown };
+	LogLevel: { ERROR: unknown };
+}
+
+function configureTransformers<T extends ConfigurableTransformers>(transformers: T): T {
+	transformers.env.cacheDir = getTinyModelsCacheDir();
+	transformers.env.allowLocalModels = false;
+	transformers.env.logLevel = transformers.LogLevel.ERROR;
+	return transformers;
+}
+
+/**
+ * Memoize an async runtime load so it runs at most once per process, clearing
+ * the cache on failure so a later call can retry. Each worker holds one
+ * instance per runtime it loads.
+ */
+export class MemoizedRuntime<T> {
+	#promise: Promise<T> | null = null;
+
+	load(build: () => Promise<T>): Promise<T> {
+		if (this.#promise) return this.#promise;
+		const promise = build().catch(error => {
+			this.#promise = null;
+			throw error;
+		});
+		this.#promise = promise;
+		return promise;
+	}
+}
+
+/**
+ * Load the `@huggingface/transformers` runtime into `holder` (memoized): from
+ * the ambient install when running from source, or from a version-keyed side
+ * runtime (resolved lazily at `runtimeDir()`) when running as a compiled binary.
+ * The result is cast to the caller's concrete runtime type `T`.
+ */
+export function loadTransformersRuntime<T extends ConfigurableTransformers, K>(
+	holder: MemoizedRuntime<T>,
+	transport: WorkerProgressTransport<K>,
+	requestId: string,
+	modelKey: K,
+	runtimeDir: () => string,
+): Promise<T> {
+	return holder.load(async () => {
+		if (!isCompiledBinary()) return configureTransformers(sourceRequire(TRANSFORMERS_PACKAGE) as T);
+		const installedDir = await ensureRuntimeInstalled({
+			runtimeDir: runtimeDir(),
+			install: {
+				dependencies: { [TRANSFORMERS_PACKAGE]: getTransformersVersionSpec() },
+				trustedDependencies: ["onnxruntime-node"],
+			},
+			probePackage: TRANSFORMERS_PACKAGE,
+			onPhase: phase =>
+				transport.send({
+					type: "progress",
+					id: requestId,
+					event: {
+						modelKey,
+						status: phase,
+						name: `${TRANSFORMERS_PACKAGE}@${getTransformersVersionSpec()}`,
+					},
+				}),
+		});
+		const entry = await prepareCompiledRuntime(installedDir, TRANSFORMERS_PACKAGE);
+		const require_ = createRequire(entry);
+		return configureTransformers(require_(entry) as T);
+	});
+}

package/src/task/executor.ts

@@ -41,7 +41,8 @@ import type { AuthStorage } from "../session/auth-storage";
 import { SKILL_PROMPT_MESSAGE_TYPE, USER_INTERRUPT_LABEL } from "../session/messages";
 import { SessionManager } from "../session/session-manager";
 import { truncateTail } from "../session/streaming-output";
-import type { ContextFileEntry } from "../tools";
+import type { ContextFileEntry, ToolSession } from "../tools";
+import { resolveEvalBackends } from "../tools/eval-backends";
 import { isIrcEnabled } from "../tools/irc";
 import { normalizeSchema } from "../tools/jtd-to-json-schema";
 import {
@@ -1790,10 +1791,9 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		toolNames = [...toolNames, "irc"];
 	}
 	if (toolNames?.includes("exec")) {
-		const allowEvalPy = settings.get("eval.py") ?? true;
-		const allowEvalJs = settings.get("eval.js") ?? true;
+		const backends = resolveEvalBackends({ settings } as ToolSession);
 		const expanded = toolNames.filter(name => name !== "exec");
-		if (allowEvalPy || allowEvalJs) expanded.push("eval");
+		if (backends.python || backends.js || backends.ruby || backends.julia) expanded.push("eval");
 		expanded.push("bash");
 		toolNames = Array.from(new Set(expanded));
 	}

package/src/tiny/title-client.ts

@@ -1,7 +1,18 @@
-import * as path from "node:path";
-import { $env, isBunTestRuntime, isCompiledBinary, logger, workerHostEntry } from "@oh-my-pi/pi-utils";
-import type { Subprocess } from "bun";
+import { $env, logger } from "@oh-my-pi/pi-utils";
 import { settings } from "../config/settings";
+import {
+	createUnavailableWorker,
+	createWorkerHandle,
+	createWorkerSubprocess,
+	logWorkerMessage,
+	resolveWorkerSpawnCmd,
+	SMOKE_TEST_TIMEOUT_MS,
+	type SpawnedSubprocess,
+	smokeTestWorker,
+	spawnWorkerOrUnavailable,
+	type WorkerHandle,
+	workerEnvFromParent,
+} from "../subprocess/worker-client";
 import { safeSend } from "../utils/ipc";
 import { tinyModelDeviceSettingToEnv } from "./device";
 import { tinyModelDtypeSettingToEnv } from "./dtype";
@@ -15,21 +26,6 @@ import {
 } from "./models";
 import type { TinyTitleProgressEvent, TinyTitleWorkerInbound, TinyTitleWorkerOutbound } from "./title-protocol";
 
-/**
- * Abstraction over the tiny-model subprocess. Modelled as a worker interface
- * so existing callers (titles, memory completions, downloads) compose the
- * same way; the runtime implementation is a Bun child process so
- * `onnxruntime-node`'s NAPI finalizer never runs inside the main agent
- * address space — that destructor segfaults Bun on Windows during shutdown
- * (issue #1606).
- */
-interface WorkerHandle {
-	send(message: TinyTitleWorkerInbound): void;
-	onMessage(handler: (message: TinyTitleWorkerOutbound) => void): () => void;
-	onError(handler: (error: Error) => void): () => void;
-	terminate(): Promise<void>;
-}
-
 type PendingRequest =
 	| { kind: "generate"; modelKey: TinyTitleLocalModelKey; resolve: (title: string | null) => void }
 	| { kind: "complete"; modelKey: TinyMemoryLocalModelKey; resolve: (text: string | null) => void }
@@ -51,13 +47,6 @@ export interface TinyTitleGenerateOptions {
 	systemPrompt?: string;
 }
 
-// Cold-starting the worker subprocess from a compiled binary (decompress + module
-// graph load) is slow on contended CI runners — the macos-15-intel release smoke
-// blew past 5s while arm64/linux/win passed. The probe only needs to prove the
-// worker spawns and ponges at all (a dead worker never ponges regardless), so a
-// generous bound removes the flake without weakening the check.
-const SMOKE_TEST_TIMEOUT_MS = 30_000;
-
 function normalizeTinyTitleGenerateOptions(
 	options: AbortSignal | TinyTitleGenerateOptions | undefined,
 ): TinyTitleGenerateOptions {
@@ -107,201 +96,66 @@ export function tinyWorkerEnvOverlay(
 }
 
 /**
- * Env handed to the tiny-model subprocess. The `PI_TINY_DEVICE` / `PI_TINY_DTYPE`
- * env vars win; otherwise the persisted `providers.tinyModelDevice` /
- * `providers.tinyModelDtype` settings are mapped onto those vars so the
- * subprocess's env-based resolution picks them up. Resolved once at spawn
- * (pipelines are cached for the lifetime of the subprocess).
+ * Env handed to the tiny-model subprocess — and reused verbatim by the STT and
+ * TTS workers, which share the same device/dtype resolution. The
+ * `PI_TINY_DEVICE` / `PI_TINY_DTYPE` env vars win; otherwise the persisted
+ * `providers.tinyModelDevice` / `providers.tinyModelDtype` settings are mapped
+ * onto those vars so the subprocess's env-based resolution picks them up.
+ * Resolved once at spawn (pipelines are cached for the lifetime of the
+ * subprocess).
  */
-function tinyWorkerEnv(): Record<string, string> {
-	const overlay = tinyWorkerEnvOverlay(
-		$env,
-		readTinyModelSetting("providers.tinyModelDevice"),
-		readTinyModelSetting("providers.tinyModelDtype"),
+export function tinyWorkerEnv(): Record<string, string> {
+	return workerEnvFromParent(
+		tinyWorkerEnvOverlay(
+			$env,
+			readTinyModelSetting("providers.tinyModelDevice"),
+			readTinyModelSetting("providers.tinyModelDtype"),
+		),
 	);
-	const base = $env as Record<string, string | undefined>;
-	const merged: Record<string, string> = {};
-	for (const key in base) {
-		const value = base[key];
-		if (typeof value === "string") merged[key] = value;
-	}
-	for (const key in overlay) merged[key] = overlay[key];
-	return merged;
-}
-interface TinyWorkerSpawnCommand {
-	cmd: string[];
-	cwd?: string;
-}
-
-/**
- * Resolve the command used to relaunch the agent CLI into tiny-worker mode.
- * In a compiled binary the entry point is the binary itself (no script arg).
- * Otherwise re-enter the declared worker-host entry (source cli.ts or
- * npm-bundle cli.js) with a cwd-relative script path — Bun's subprocess IPC
- * is more reliable that way than with an absolute `.ts` entry under
- * `bun test` — and fall back to this package's own `src/cli.ts` when no host
- * entry is declared (bun test, SDK embedding).
- */
-function tinyWorkerSpawnCmd(): TinyWorkerSpawnCommand {
-	if (isCompiledBinary()) return { cmd: [process.execPath, TINY_WORKER_ARG] };
-	const hostEntry = workerHostEntry();
-	if (hostEntry) {
-		return { cmd: [process.execPath, path.basename(hostEntry), TINY_WORKER_ARG], cwd: path.dirname(hostEntry) };
-	}
-	const packageRoot = path.resolve(import.meta.dir, "..", "..");
-	return { cmd: [process.execPath, "src/cli.ts", TINY_WORKER_ARG], cwd: packageRoot };
-}
-
-interface SpawnedSubprocess {
-	proc: Subprocess<"ignore", "ignore", "ignore">;
-	inbound: Set<(message: TinyTitleWorkerOutbound) => void>;
-	errors: Set<(error: Error) => void>;
-	/**
-	 * Flipped to `true` by {@link wrapSubprocess}'s `terminate()` right
-	 * before it SIGKILLs the child so `onExit` can distinguish the
-	 * expected hard-kill from a crash/OOM/external signal. Only the
-	 * latter is surfaced as a worker error.
-	 */
-	intentionalExit: { value: boolean };
 }
 
 /**
  * Spawn the tiny-model worker as a subprocess. Exported for tests and the
- * smoke probe; production callers go through {@link spawnTinyTitleWorker}
- * which wraps the result in a {@link WorkerHandle}.
+ * smoke probe; production callers go through {@link spawnTinyTitleWorker}.
  */
-export function createTinyTitleSubprocess(): SpawnedSubprocess {
-	const inbound = new Set<(message: TinyTitleWorkerOutbound) => void>();
-	const errors = new Set<(error: Error) => void>();
-	const intentionalExit = { value: false };
-	const spawnCommand = tinyWorkerSpawnCmd();
-	const proc = Bun.spawn({
-		cmd: spawnCommand.cmd,
-		cwd: spawnCommand.cwd,
+export function createTinyTitleSubprocess(): SpawnedSubprocess<TinyTitleWorkerOutbound> {
+	return createWorkerSubprocess<TinyTitleWorkerOutbound>({
+		spawnCommand: resolveWorkerSpawnCmd(TINY_WORKER_ARG),
 		env: tinyWorkerEnv(),
-		stdin: "ignore",
-		stdout: "ignore",
-		stderr: "ignore",
-		serialization: "advanced",
-		windowsHide: true,
-		// The worker is an implementation detail of the interactive TUI. Native
-		// model runtimes may print progress or decoded text directly; never let
-		// those bytes inherit the terminal and corrupt the chat scrollback.
-		ipc(message) {
-			for (const handler of inbound) handler(message as TinyTitleWorkerOutbound);
-		},
-		onExit(_proc, exitCode, signalCode) {
-			// Clean exit. The child only exits via SIGKILL in practice, but
-			// treat code 0 as a no-op for symmetry.
-			if (exitCode === 0) return;
-			// `exitCode === null` + non-null `signalCode` covers both the
-			// expected SIGKILL from `terminate()` AND external kills
-			// (SIGSEGV from a native crash, SIGKILL from the OOM killer, an
-			// operator `kill -9`, etc.). Swallow only the expected one;
-			// every other signal exit is a real worker death that must
-			// fault every in-flight request so callers don't await forever.
-			if (exitCode === null && intentionalExit.value) return;
-			const reason = exitCode !== null ? `code ${exitCode}` : `signal ${signalCode ?? "unknown"}`;
-			const err = new Error(`tiny model subprocess exited with ${reason}`);
-			for (const handler of errors) handler(err);
-		},
+		exitLabel: "tiny model subprocess",
 	});
-	// Don't keep the parent event loop alive on account of an idle worker; the
-	// agent dispose path calls `terminate()` explicitly when shutting down.
-	// Bun's test runner can starve IPC delivery for unref'd subprocesses, so
-	// keep it referenced only under tests that assert the ping/pong contract.
-	if (!isBunTestRuntime()) proc.unref();
-	return { proc, inbound, errors, intentionalExit };
 }
 
-function wrapSubprocess({ proc, inbound, errors, intentionalExit }: SpawnedSubprocess): WorkerHandle {
-	return {
-		send(message) {
-			safeSend(proc, message, "tiny-title");
-		},
-		onMessage(handler) {
-			inbound.add(handler);
-			return () => inbound.delete(handler);
-		},
-		onError(handler) {
-			errors.add(handler);
-			return () => errors.delete(handler);
-		},
-		async terminate() {
-			// SIGKILL: the whole point of the subprocess isolation is that the
-			// parent never runs `onnxruntime-node`'s NAPI finalizer. A polite
-			// SIGTERM lets the subprocess try to clean up, which is exactly the
-			// codepath that crashes Bun on Windows. Hard-kill instead — the
-			// model lives in process memory and the OS reclaims everything.
-			// Flip the intentional-exit flag *before* killing so `onExit` can
-			// tell this apart from a crash or external SIGKILL.
-			intentionalExit.value = true;
-			try {
-				proc.kill("SIGKILL");
-			} catch {
-				// Already gone.
-			}
-		},
-	};
-}
-
-function spawnInlineUnavailableWorker(error: unknown): WorkerHandle {
-	const listeners = new Set<(message: TinyTitleWorkerOutbound) => void>();
-	const errorMessage = error instanceof Error ? error.message : String(error);
-	const emit = (message: TinyTitleWorkerOutbound): void => {
-		for (const listener of listeners) listener(message);
-	};
-	return {
-		send(message) {
-			queueMicrotask(() => {
-				if (message.type === "ping") {
-					emit({ type: "pong", id: message.id });
-					return;
-				}
-				emit({ type: "error", id: message.id, error: errorMessage });
-			});
-		},
-		onMessage(handler) {
-			listeners.add(handler);
-			return () => listeners.delete(handler);
-		},
-		onError() {
-			return () => {};
-		},
-		async terminate() {
-			listeners.clear();
-		},
-	};
-}
-
-function spawnTinyTitleWorker(): WorkerHandle {
-	try {
-		return wrapSubprocess(createTinyTitleSubprocess());
-	} catch (error) {
-		logger.warn("Tiny title worker spawn failed; local titles disabled", {
-			error: error instanceof Error ? error.message : String(error),
-		});
-		return spawnInlineUnavailableWorker(error);
-	}
+function wrapSubprocess(
+	spawned: SpawnedSubprocess<TinyTitleWorkerOutbound>,
+): WorkerHandle<TinyTitleWorkerInbound, TinyTitleWorkerOutbound> {
+	const { proc } = spawned;
+	return createWorkerHandle<TinyTitleWorkerInbound, TinyTitleWorkerOutbound>(spawned, message =>
+		safeSend(proc, message, "tiny-title"),
+	);
 }
 
-function logWorkerMessage(message: Extract<TinyTitleWorkerOutbound, { type: "log" }>): void {
-	if (message.level === "debug") logger.debug(message.msg, message.meta);
-	else if (message.level === "warn") logger.warn(message.msg, message.meta);
-	else logger.error(message.msg, message.meta);
+function spawnTinyTitleWorker(): WorkerHandle<TinyTitleWorkerInbound, TinyTitleWorkerOutbound> {
+	return spawnWorkerOrUnavailable(
+		() => wrapSubprocess(createTinyTitleSubprocess()),
+		createUnavailableWorker<TinyTitleWorkerInbound, TinyTitleWorkerOutbound>,
+		"Tiny title worker spawn failed; local titles disabled",
+	);
 }
 
 export class TinyTitleClient {
-	#worker: WorkerHandle | null = null;
+	#worker: WorkerHandle<TinyTitleWorkerInbound, TinyTitleWorkerOutbound> | null = null;
 	#unsubscribeMessage: (() => void) | null = null;
 	#unsubscribeError: (() => void) | null = null;
 	#pending = new Map<string, PendingRequest>();
 	#failedModels = new Set<TinyLocalModelKey>();
 	#progressListeners = new Set<(event: TinyTitleProgressEvent) => void>();
 	#nextRequestId = 0;
-	#spawnWorker: () => WorkerHandle;
+	#spawnWorker: () => WorkerHandle<TinyTitleWorkerInbound, TinyTitleWorkerOutbound>;
 
-	constructor(spawnWorker: () => WorkerHandle = spawnTinyTitleWorker) {
+	constructor(
+		spawnWorker: () => WorkerHandle<TinyTitleWorkerInbound, TinyTitleWorkerOutbound> = spawnTinyTitleWorker,
+	) {
 		this.#spawnWorker = spawnWorker;
 	}
 
@@ -443,7 +297,7 @@ export class TinyTitleClient {
 		}
 	}
 
-	#ensureWorker(): WorkerHandle {
+	#ensureWorker(): WorkerHandle<TinyTitleWorkerInbound, TinyTitleWorkerOutbound> {
 		if (this.#worker) return this.#worker;
 		const worker = this.#spawnWorker();
 		this.#worker = worker;
@@ -520,25 +374,5 @@ export async function smokeTestTinyTitleWorker({
 }: {
 	timeoutMs?: number;
 } = {}): Promise<void> {
-	const handle = wrapSubprocess(createTinyTitleSubprocess());
-	const { promise, resolve, reject } = Promise.withResolvers<void>();
-	const timer = setTimeout(() => reject(new Error(`tiny title worker did not pong within ${timeoutMs}ms`)), timeoutMs);
-	const unsubscribeMessage = handle.onMessage(message => {
-		if (message.type === "pong") {
-			resolve();
-			return;
-		}
-		if (message.type === "log") return;
-		reject(new Error(`tiny title worker: expected pong, got ${JSON.stringify(message)}`));
-	});
-	const unsubscribeError = handle.onError(reject);
-	try {
-		handle.send({ type: "ping", id: "smoke" } satisfies TinyTitleWorkerInbound);
-		await promise;
-	} finally {
-		clearTimeout(timer);
-		unsubscribeMessage();
-		unsubscribeError();
-		await handle.terminate();
-	}
+	await smokeTestWorker(wrapSubprocess(createTinyTitleSubprocess()), "tiny title worker", timeoutMs);
 }