@oh-my-pi/pi-coding-agent 15.0.2 → 15.1.1

package/src/eval/py/kernel.ts

@@ -43,6 +43,11 @@ async function ensureRunnerScript(): Promise<string> {
 
 const SHUTDOWN_GRACE_MS = 1_000;
 const STARTUP_TIMEOUT_MS = 10_000;
+// How long to wait after SIGINT for the runner to emit `done`. If the cell is
+// stuck in code that ignores Python signals (e.g. a C extension holding the
+// GIL), we escalate to a full subprocess shutdown so the host queue unblocks
+// instead of hanging the session forever.
+const INTERRUPT_ESCALATION_MS = 2_000;
 
 export interface KernelExecuteOptions {
 	signal?: AbortSignal;
@@ -158,6 +163,7 @@ interface PendingExecution {
 	timedOut: boolean;
 	stdinRequested: boolean;
 	settled: boolean;
+	escalationTimer?: NodeJS.Timeout;
 }
 
 export class PythonKernel {
@@ -273,22 +279,41 @@ export class PythonKernel {
 			});
 		};
 
+		const requestCancel = () => {
+			if (pending.settled || pending.escalationTimer) return;
+			void this.interrupt();
+			const escalation = setTimeout(() => {
+				if (pending.settled) return;
+				logger.warn("Python runner did not respond to SIGINT; terminating subprocess", {
+					kernelId: this.id,
+				});
+				// `shutdown()` aborts pending executions immediately and escalates to
+				// SIGTERM/SIGKILL, so the host queue unblocks even if the runner is
+				// stuck in a non-interruptible state.
+				void this.shutdown();
+			}, INTERRUPT_ESCALATION_MS);
+			escalation.unref?.();
+			pending.escalationTimer = escalation;
+		};
+
 		const onAbort = () => {
 			pending.cancelled = true;
 			pending.timedOut = pending.timedOut || isTimeoutReason(options?.signal?.reason);
-			void this.interrupt();
+			requestCancel();
 		};
 		const timeoutId =
 			typeof options?.timeoutMs === "number" && options.timeoutMs > 0
 				? setTimeout(() => {
 						pending.timedOut = true;
 						pending.cancelled = true;
-						void this.interrupt();
+						requestCancel();
 					}, options.timeoutMs)
 				: undefined;
 
 		const cleanup = () => {
 			if (timeoutId) clearTimeout(timeoutId);
+			if (pending.escalationTimer) clearTimeout(pending.escalationTimer);
+			pending.escalationTimer = undefined;
 			options?.signal?.removeEventListener("abort", onAbort);
 		};
 

package/src/exa/factory.ts

@@ -1,7 +1,7 @@
 /**
  * Shared factory for creating Exa tools with consistent error handling and response formatting.
  */
-import type { TObject, TProperties } from "@sinclair/typebox";
+import type { TSchema } from "@oh-my-pi/pi-ai";
 import type { CustomTool } from "../extensibility/custom-tools/types";
 import { callExaTool, findApiKey, formatGenericResponse, formatSearchResults, isSearchResponse } from "./mcp-client";
 import type { ExaRenderDetails } from "./types";
@@ -11,7 +11,7 @@ export function createExaTool(
 	name: string,
 	label: string,
 	description: string,
-	parameters: TObject<TProperties>,
+	parameters: TSchema,
 	mcpToolName: string,
 	options?: {
 		/** When true, checks isSearchResponse and formats with formatSearchResults. Default: true */
@@ -19,7 +19,7 @@ export function createExaTool(
 		/** Transform params before passing to callExaTool */
 		transformParams?: (params: Record<string, unknown>) => Record<string, unknown>;
 	},
-): CustomTool<any, ExaRenderDetails> {
+): CustomTool<TSchema, ExaRenderDetails> {
 	const formatResponse = options?.formatResponse ?? true;
 	const transformParams = options?.transformParams;
 
@@ -32,7 +32,8 @@ export function createExaTool(
 			try {
 				const apiKey = findApiKey();
 				// Exa MCP endpoint is publicly accessible; API key is optional
-				const args = transformParams ? transformParams(params as Record<string, unknown>) : params;
+				const rawArgs = params as Record<string, unknown>;
+				const args = transformParams ? transformParams(rawArgs) : rawArgs;
 				const response = await callExaTool(mcpToolName, args, apiKey);
 
 				if (formatResponse && isSearchResponse(response)) {

package/src/exa/mcp-client.ts

@@ -1,5 +1,5 @@
+import type { TSchema } from "@oh-my-pi/pi-ai";
 import { $env, logger } from "@oh-my-pi/pi-utils";
-import type { TSchema } from "@sinclair/typebox";
 import type { CustomTool, CustomToolResult } from "../extensibility/custom-tools/types";
 import { callMCP } from "../mcp/json-rpc";
 import type {

package/src/exa/researcher.ts

@@ -3,7 +3,8 @@
  *
  * Async research tasks with polling for completion.
  */
-import { Type } from "@sinclair/typebox";
+import type { TSchema } from "@oh-my-pi/pi-ai";
+import * as z from "zod/v4";
 import type { CustomTool } from "../extensibility/custom-tools/types";
 import { createExaTool } from "./factory";
 import type { ExaRenderDetails } from "./types";
@@ -12,22 +13,10 @@ const researcherStartTool = createExaTool(
 	"exa_researcher_start",
 	"Start Deep Research",
 	"Start an asynchronous deep research task using Exa's researcher. Returns a task_id for polling completion.",
-	Type.Object({
-		query: Type.String({ description: "Research query to investigate" }),
-		depth: Type.Optional(
-			Type.Number({
-				description: "Research depth (1-5, default: 3)",
-				minimum: 1,
-				maximum: 5,
-			}),
-		),
-		breadth: Type.Optional(
-			Type.Number({
-				description: "Research breadth (1-5, default: 3)",
-				minimum: 1,
-				maximum: 5,
-			}),
-		),
+	z.object({
+		query: z.string().describe("Research query to investigate"),
+		depth: z.number().int().min(1).max(5).describe("Research depth (1-5, default: 3)").optional(),
+		breadth: z.number().int().min(1).max(5).describe("Research breadth (1-5, default: 3)").optional(),
 	}),
 	"deep_researcher_start",
 	{ formatResponse: false },
@@ -37,11 +26,11 @@ const researcherPollTool = createExaTool(
 	"exa_researcher_poll",
 	"Poll Research Status",
 	"Poll the status of an asynchronous research task. Returns status (pending|running|completed|failed) and result if completed.",
-	Type.Object({
-		task_id: Type.String({ description: "Task ID returned from exa_researcher_start" }),
+	z.object({
+		task_id: z.string().describe("Task ID returned from exa_researcher_start"),
 	}),
 	"deep_researcher_check",
 	{ formatResponse: false },
 );
 
-export const researcherTools: CustomTool<any, ExaRenderDetails>[] = [researcherStartTool, researcherPollTool];
+export const researcherTools: CustomTool<TSchema, ExaRenderDetails>[] = [researcherStartTool, researcherPollTool];

package/src/exa/search.ts

@@ -3,8 +3,8 @@
  *
  * Basic neural/keyword search, deep research, code search, and URL crawling.
  */
-import { StringEnum } from "@oh-my-pi/pi-ai";
-import { Type } from "@sinclair/typebox";
+import type { TSchema } from "@oh-my-pi/pi-ai";
+import * as z from "zod/v4";
 import type { CustomTool } from "../extensibility/custom-tools/types";
 import { createExaTool } from "./factory";
 import type { ExaRenderDetails } from "./types";
@@ -29,57 +29,31 @@ Parameters:
 - highlights: Include highlighted relevant snippets (default: false)
 - num_results: Maximum number of results to return (default: 10, max: 100)`,
 
-	Type.Object({
-		query: Type.String({ description: "Search query" }),
-		type: Type.Optional(
-			StringEnum(["keyword", "neural", "auto"], {
-				description: "Search type - neural (semantic), keyword (exact), or auto",
-			}),
-		),
-		include_domains: Type.Optional(
-			Type.Array(Type.String(), {
-				description: "Only include results from these domains",
-			}),
-		),
-		exclude_domains: Type.Optional(
-			Type.Array(Type.String(), {
-				description: "Exclude results from these domains",
-			}),
-		),
-		start_published_date: Type.Optional(
-			Type.String({
-				description: "Filter results published after this date (ISO 8601 format)",
-			}),
-		),
-		end_published_date: Type.Optional(
-			Type.String({
-				description: "Filter results published before this date (ISO 8601 format)",
-			}),
-		),
-		use_autoprompt: Type.Optional(
-			Type.Boolean({
-				description: "Let Exa optimize your query automatically (default: true)",
-			}),
-		),
-		text: Type.Optional(
-			Type.Boolean({
-				description: "Include page text content in results (costs more, default: false)",
-			}),
-		),
-		highlights: Type.Optional(
-			Type.Boolean({
-				description: "Include highlighted relevant snippets (default: false)",
-			}),
-		),
-		num_results: Type.Optional(
-			Type.Number({
-				description: "Maximum number of results to return (default: 10, max: 100)",
-				minimum: 1,
-				maximum: 100,
-			}),
-		),
+	z.object({
+		query: z.string().describe("Search query"),
+		type: z
+			.enum(["keyword", "neural", "auto"])
+			.describe("Search type - neural (semantic), keyword (exact), or auto")
+			.optional(),
+		include_domains: z.array(z.string()).describe("Only include results from these domains").optional(),
+		exclude_domains: z.array(z.string()).describe("Exclude results from these domains").optional(),
+		start_published_date: z
+			.string()
+			.describe("Filter results published after this date (ISO 8601 format)")
+			.optional(),
+		end_published_date: z.string().describe("Filter results published before this date (ISO 8601 format)").optional(),
+		use_autoprompt: z.boolean().describe("Let Exa optimize your query automatically (default: true)").optional(),
+		text: z.boolean().describe("Include page text content in results (costs more, default: false)").optional(),
+		highlights: z.boolean().describe("Include highlighted relevant snippets (default: false)").optional(),
+		num_results: z
+			.number()
+			.int()
+			.min(1)
+			.max(100)
+			.describe("Maximum number of results to return (default: 10, max: 100)")
+			.optional(),
 	}),
 	"web_search_exa",
 );
 
-export const searchTools: CustomTool<any, ExaRenderDetails>[] = [exaSearchTool];
+export const searchTools: CustomTool<TSchema, ExaRenderDetails>[] = [exaSearchTool];

package/src/exa/types.ts

@@ -3,7 +3,7 @@
  *
  * Types for the Exa MCP client and tool implementations.
  */
-import type { TSchema } from "@sinclair/typebox";
+import type { TSchema } from "@oh-my-pi/pi-ai";
 
 /** MCP endpoint URLs */
 export const EXA_MCP_URL = "https://mcp.exa.ai/mcp";

package/src/exa/websets.ts

@@ -3,7 +3,8 @@
  *
  * CRUD operations for websets, items, searches, enrichments, and monitoring.
  */
-import { type TObject, type TProperties, Type } from "@sinclair/typebox";
+import type { TSchema } from "@oh-my-pi/pi-ai";
+import * as z from "zod/v4";
 import type { CustomTool } from "../extensibility/custom-tools/types";
 import { callWebsetsTool, findApiKey } from "./mcp-client";
 import type { ExaRenderDetails } from "./types";
@@ -13,9 +14,9 @@ function createWebsetTool(
 	name: string,
 	label: string,
 	description: string,
-	parameters: TObject<TProperties>,
+	parameters: TSchema,
 	mcpToolName: string,
-): CustomTool<any, ExaRenderDetails> {
+): CustomTool<TSchema, ExaRenderDetails> {
 	return {
 		name,
 		label,
@@ -51,9 +52,9 @@ const websetCreateTool = createWebsetTool(
 	"webset_create",
 	"Create Webset",
 	"Create a new webset collection for organizing web content.",
-	Type.Object({
-		name: Type.String({ description: "Name of the webset" }),
-		description: Type.Optional(Type.String({ description: "Optional description" })),
+	z.object({
+		name: z.string().describe("Name of the webset"),
+		description: z.string().describe("Optional description").optional(),
 	}),
 	"create_webset",
 );
@@ -62,7 +63,7 @@ const websetListTool = createWebsetTool(
 	"webset_list",
 	"List Websets",
 	"List all websets in your account.",
-	Type.Object({}),
+	z.object({}),
 	"list_websets",
 );
 
@@ -70,8 +71,8 @@ const websetGetTool = createWebsetTool(
 	"webset_get",
 	"Get Webset",
 	"Get details of a specific webset by ID.",
-	Type.Object({
-		id: Type.String({ description: "Webset ID" }),
+	z.object({
+		id: z.string().describe("Webset ID"),
 	}),
 	"get_webset",
 );
@@ -80,10 +81,10 @@ const websetUpdateTool = createWebsetTool(
 	"webset_update",
 	"Update Webset",
 	"Update a webset's name or description.",
-	Type.Object({
-		id: Type.String({ description: "Webset ID" }),
-		name: Type.Optional(Type.String({ description: "New name" })),
-		description: Type.Optional(Type.String({ description: "New description" })),
+	z.object({
+		id: z.string().describe("Webset ID"),
+		name: z.string().describe("New name").optional(),
+		description: z.string().describe("New description").optional(),
 	}),
 	"update_webset",
 );
@@ -92,8 +93,8 @@ const websetDeleteTool = createWebsetTool(
 	"webset_delete",
 	"Delete Webset",
 	"Delete a webset and all its contents.",
-	Type.Object({
-		id: Type.String({ description: "Webset ID" }),
+	z.object({
+		id: z.string().describe("Webset ID"),
 	}),
 	"delete_webset",
 );
@@ -103,10 +104,10 @@ const websetItemsListTool = createWebsetTool(
 	"webset_items_list",
 	"List Webset Items",
 	"List items in a webset with optional pagination.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		limit: Type.Optional(Type.Number({ description: "Number of items to return" })),
-		offset: Type.Optional(Type.Number({ description: "Pagination offset" })),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		limit: z.number().describe("Number of items to return").optional(),
+		offset: z.number().describe("Pagination offset").optional(),
 	}),
 	"list_webset_items",
 );
@@ -115,9 +116,9 @@ const websetItemGetTool = createWebsetTool(
 	"webset_item_get",
 	"Get Webset Item",
 	"Get a specific item from a webset.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		item_id: Type.String({ description: "Item ID" }),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		item_id: z.string().describe("Item ID"),
 	}),
 	"get_item",
 );
@@ -127,9 +128,9 @@ const websetSearchCreateTool = createWebsetTool(
 	"webset_search_create",
 	"Create Webset Search",
 	"Create a new search within a webset.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		query: Type.String({ description: "Search query" }),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		query: z.string().describe("Search query"),
 	}),
 	"create_search",
 );
@@ -138,9 +139,9 @@ const websetSearchGetTool = createWebsetTool(
 	"webset_search_get",
 	"Get Webset Search",
 	"Get the status and results of a webset search.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		search_id: Type.String({ description: "Search ID" }),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		search_id: z.string().describe("Search ID"),
 	}),
 	"get_search",
 );
@@ -149,9 +150,9 @@ const websetSearchCancelTool = createWebsetTool(
 	"webset_search_cancel",
 	"Cancel Webset Search",
 	"Cancel a running webset search.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		search_id: Type.String({ description: "Search ID" }),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		search_id: z.string().describe("Search ID"),
 	}),
 	"cancel_search",
 );
@@ -161,10 +162,10 @@ const websetEnrichmentCreateTool = createWebsetTool(
 	"webset_enrichment_create",
 	"Create Enrichment",
 	"Create a new enrichment task for a webset.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		name: Type.String({ description: "Enrichment name" }),
-		prompt: Type.String({ description: "Enrichment prompt" }),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		name: z.string().describe("Enrichment name"),
+		prompt: z.string().describe("Enrichment prompt"),
 	}),
 	"create_enrichment",
 );
@@ -173,9 +174,9 @@ const websetEnrichmentGetTool = createWebsetTool(
 	"webset_enrichment_get",
 	"Get Enrichment",
 	"Get the status and results of an enrichment task.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		enrichment_id: Type.String({ description: "Enrichment ID" }),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		enrichment_id: z.string().describe("Enrichment ID"),
 	}),
 	"get_enrichment",
 );
@@ -184,11 +185,11 @@ const websetEnrichmentUpdateTool = createWebsetTool(
 	"webset_enrichment_update",
 	"Update Enrichment",
 	"Update an enrichment's name or prompt.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		enrichment_id: Type.String({ description: "Enrichment ID" }),
-		name: Type.Optional(Type.String({ description: "New name" })),
-		prompt: Type.Optional(Type.String({ description: "New prompt" })),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		enrichment_id: z.string().describe("Enrichment ID"),
+		name: z.string().describe("New name").optional(),
+		prompt: z.string().describe("New prompt").optional(),
 	}),
 	"update_enrichment",
 );
@@ -197,9 +198,9 @@ const websetEnrichmentDeleteTool = createWebsetTool(
 	"webset_enrichment_delete",
 	"Delete Enrichment",
 	"Delete an enrichment task.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		enrichment_id: Type.String({ description: "Enrichment ID" }),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		enrichment_id: z.string().describe("Enrichment ID"),
 	}),
 	"delete_enrichment",
 );
@@ -208,9 +209,9 @@ const websetEnrichmentCancelTool = createWebsetTool(
 	"webset_enrichment_cancel",
 	"Cancel Enrichment",
 	"Cancel a running enrichment task.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		enrichment_id: Type.String({ description: "Enrichment ID" }),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		enrichment_id: z.string().describe("Enrichment ID"),
 	}),
 	"cancel_enrichment",
 );
@@ -220,14 +221,14 @@ const websetMonitorCreateTool = createWebsetTool(
 	"webset_monitor_create",
 	"Create Monitor",
 	"Create a monitoring task for a webset with optional webhook notifications.",
-	Type.Object({
-		webset_id: Type.String({ description: "Webset ID" }),
-		webhook_url: Type.Optional(Type.String({ description: "Webhook URL for notifications" })),
+	z.object({
+		webset_id: z.string().describe("Webset ID"),
+		webhook_url: z.string().describe("Webhook URL for notifications").optional(),
 	}),
 	"create_monitor",
 );
 
-export const websetsTools: CustomTool<any, ExaRenderDetails>[] = [
+export const websetsTools: CustomTool<TSchema, ExaRenderDetails>[] = [
 	websetCreateTool,
 	websetListTool,
 	websetGetTool,

package/src/exec/bash-executor.ts

@@ -252,7 +252,8 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 					outputBytes: minimized.outputBytes,
 				});
 				if (artifactId) {
-					sink.push(`\n[raw output: artifact://${artifactId}]\n`);
+					const sep = minimized.text.endsWith("\n") ? "" : "\n";
+					sink.push(`${sep}[raw output: artifact://${artifactId}]\n`);
 				}
 			}
 		}

package/src/extensibility/custom-commands/loader.ts

@@ -1,15 +1,16 @@
 /**
  * Custom command loader - loads TypeScript command modules using native Bun import.
  *
- * Dependencies (@sinclair/typebox and pi-coding-agent) are injected via the CustomCommandAPI
- * to avoid import resolution issues with custom commands loaded from user directories.
+ * Dependencies (the zod-backed typebox shim and pi-coding-agent) are injected via the
+ * CustomCommandAPI to avoid import resolution issues with custom commands loaded from user directories.
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { getAgentDir, getProjectDir, isEnoent, logger } from "@oh-my-pi/pi-utils";
-import * as typebox from "@sinclair/typebox";
+import * as zod from "zod/v4";
 import { getConfigDirs } from "../../config";
 import { execCommand } from "../../exec/exec";
+import * as typebox from "../typebox";
 import { GreenCommand } from "./bundled/ci-green";
 import { ReviewCommand } from "./bundled/review";
 import type {
@@ -183,6 +184,7 @@ export async function loadCustomCommands(options: LoadCustomCommandsOptions = {}
 		exec: (command: string, args: string[], execOptions) =>
 			execCommand(command, args, execOptions?.cwd ?? cwd, execOptions),
 		typebox,
+		zod,
 		pi: await import("@oh-my-pi/pi-coding-agent"),
 	};
 

package/src/extensibility/custom-commands/types.ts

@@ -19,8 +19,10 @@ export interface CustomCommandAPI {
 	cwd: string;
 	/** Execute a shell command */
 	exec(command: string, args: string[], options?: ExecOptions): Promise<ExecResult>;
-	/** Injected @sinclair/typebox module */
-	typebox: typeof import("@sinclair/typebox");
+	/** Injected zod-backed typebox shim (legacy/compat). */
+	typebox: typeof import("../typebox");
+	/** Injected zod module for Zod-authored custom commands. */
+	zod: typeof import("zod/v4");
 	/** Injected pi-coding-agent exports */
 	pi: typeof import("../..");
 }

package/src/extensibility/custom-tools/loader.ts

@@ -1,19 +1,20 @@
 /**
  * Custom tool loader - loads TypeScript tool modules using native Bun import.
  *
- * Dependencies (@sinclair/typebox and pi-coding-agent) are injected via the CustomToolAPI
- * to avoid import resolution issues with custom tools loaded from user directories.
+ * Dependencies (the zod-backed typebox shim and pi-coding-agent) are injected via the
+ * CustomToolAPI to avoid import resolution issues with custom tools loaded from user directories.
  */
 import * as path from "node:path";
 import type { AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import { logger } from "@oh-my-pi/pi-utils";
-import * as typebox from "@sinclair/typebox";
+import * as z from "zod/v4";
 import { toolCapability } from "../../capability/tool";
 import { type CustomTool, loadCapability } from "../../discovery";
 import type { ExecOptions } from "../../exec/exec";
 import { execCommand } from "../../exec/exec";
 import type { HookUIContext } from "../../extensibility/hooks/types";
 import { getAllPluginToolPaths } from "../../extensibility/plugins/loader";
+import * as typebox from "../typebox";
 import { createNoOpUIContext, resolvePath } from "../utils";
 import type { CustomToolAPI, CustomToolFactory, LoadedCustomTool, ToolLoadError } from "./types";
 
@@ -103,6 +104,7 @@ export class CustomToolLoader {
 			hasUI: false,
 			logger,
 			typebox,
+			zod: z,
 			pi,
 			pushPendingAction: action => {
 				if (!pushPendingAction) {

package/src/extensibility/custom-tools/types.ts

@@ -5,16 +5,15 @@
  * They can provide custom rendering for tool calls and results in the TUI.
  */
 import type { AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { Model } from "@oh-my-pi/pi-ai";
+import type { CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
+import type { Model, Static, TSchema } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
-import type { Static, TSchema } from "@sinclair/typebox";
 import type { Rule } from "../../capability/rule";
 import type { ModelRegistry } from "../../config/model-registry";
 import type { Settings } from "../../config/settings";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type { HookUIContext } from "../../extensibility/hooks/types";
 import type { Theme } from "../../modes/theme/theme";
-import type { CompactionResult } from "../../session/compaction";
 import type { ReadonlySessionManager } from "../../session/session-manager";
 import type { TodoItem } from "../../tools/todo-write";
 
@@ -52,8 +51,10 @@ export interface CustomToolAPI {
 	hasUI: boolean;
 	/** File logger for error/warning/debug messages */
 	logger: typeof import("@oh-my-pi/pi-utils").logger;
-	/** Injected @sinclair/typebox module */
-	typebox: typeof import("@sinclair/typebox");
+	/** Injected zod-backed typebox shim (legacy/compat — Zod-authored tools are preferred). */
+	typebox: typeof import("../typebox");
+	/** Injected zod module for Zod-authored custom tools. */
+	zod: typeof import("zod/v4");
 	/** Injected pi-coding-agent exports */
 	pi: typeof import("../..");
 	/** Push a preview action that can later be resolved with the hidden resolve tool */
@@ -180,7 +181,7 @@ export interface CustomTool<TParams extends TSchema = TSchema, TDetails = any> {
 	strict?: boolean;
 	/** Description for LLM */
 	description: string;
-	/** Parameter schema (TypeBox) */
+	/** Parameter schema (Zod or TypeBox; TypeBox is auto-lifted to Zod at registration). */
 	parameters: TParams;
 	/** If true, tool is excluded unless explicitly listed in --tools or agent's tools field */
 	hidden?: boolean;

package/src/extensibility/custom-tools/wrapper.ts

@@ -2,7 +2,7 @@
  * CustomToolAdapter wraps CustomTool instances into AgentTool for use with the agent.
  */
 import type { AgentTool, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { Static, TSchema } from "@sinclair/typebox";
+import type { Static, TSchema } from "@oh-my-pi/pi-ai";
 import type { Theme } from "../../modes/theme/theme";
 import { applyToolProxy } from "../tool-proxy";
 import type { CustomTool, CustomToolContext } from "./types";