@oh-my-pi/pi-coding-agent 15.0.1 → 15.1.0

package/src/tools/job.ts

@@ -2,7 +2,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt } from "@oh-my-pi/pi-utils";
-import { type Static, Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import { type AsyncJob, AsyncJobManager, isBackgroundJobSupportEnabled } from "../async";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
@@ -22,28 +22,21 @@ import {
 } from "./render-utils";
 import { ToolError } from "./tool-errors";
 
-const jobSchema = Type.Object({
-	poll: Type.Optional(
-		Type.Array(Type.String(), {
-			description: "background job ids to wait for; omit (with no `cancel`) to wait on all running jobs",
-			examples: [["job-1234"]],
-		}),
-	),
-	cancel: Type.Optional(
-		Type.Array(Type.String(), {
-			description: "background job ids to cancel",
-			examples: [["job-1234"]],
-		}),
-	),
-	list: Type.Optional(
-		Type.Boolean({
-			description:
-				"Return an immediate snapshot of every job spawned by this agent (running + completed within retention). Read-only \u2014 cannot be combined with `poll` or `cancel`.",
-		}),
-	),
+const jobSchema = z.object({
+	poll: z
+		.array(z.string())
+		.optional()
+		.describe("background job ids to wait for; omit (with no `cancel`) to wait on all running jobs"),
+	cancel: z.array(z.string()).optional().describe("background job ids to cancel"),
+	list: z
+		.boolean()
+		.optional()
+		.describe(
+			"Return an immediate snapshot of every job spawned by this agent (running + completed within retention). Read-only \u2014 cannot be combined with `poll` or `cancel`.",
+		),
 });
 
-type JobParams = Static<typeof jobSchema>;
+type JobParams = z.infer<typeof jobSchema>;
 
 const WAIT_DURATION_MS: Record<string, number> = {
 	"5s": 5_000,
@@ -362,6 +355,8 @@ const COLLAPSED_LIST_LIMIT = PREVIEW_LIMITS.COLLAPSED_ITEMS;
 const LABEL_MAX_WIDTH = 60;
 const PREVIEW_LINES_COLLAPSED = 1;
 const PREVIEW_LINES_EXPANDED = 4;
+const LABEL_LINES_COLLAPSED = 1;
+const LABEL_LINES_EXPANDED = 3;
 const PREVIEW_LINE_WIDTH = 80;
 
 function statusToIcon(status: JobSnapshot["status"]): ToolUIStatus {
@@ -488,14 +483,21 @@ export const jobToolRenderer = {
 							);
 							const typeBadge = formatBadge(job.type, statusToColor(job.status), uiTheme);
 							const idText = uiTheme.fg("muted", job.id);
-							const label = truncateToWidth(
-								replaceTabs(job.label || "(no label)"),
-								LABEL_MAX_WIDTH,
-								Ellipsis.Unicode,
-							);
-							const labelText = uiTheme.fg("toolOutput", label);
+							const rawLabelLines = (job.label || "(no label)").split(/\r?\n/);
+							const maxLabelLines = expanded ? LABEL_LINES_EXPANDED : LABEL_LINES_COLLAPSED;
+							const visibleLabelLines = rawLabelLines
+								.slice(0, maxLabelLines)
+								.map(l => truncateToWidth(replaceTabs(l), LABEL_MAX_WIDTH, Ellipsis.Unicode));
+							if (rawLabelLines.length > maxLabelLines && visibleLabelLines.length > 0) {
+								const last = visibleLabelLines[visibleLabelLines.length - 1]!;
+								visibleLabelLines[visibleLabelLines.length - 1] = `${last} …`;
+							}
 							const durationText = uiTheme.fg("dim", formatDuration(job.durationMs));
-							lines.push(`${icon} ${idText} ${typeBadge} ${labelText} ${durationText}`);
+							const headLabel = uiTheme.fg("toolOutput", visibleLabelLines[0] ?? "");
+							lines.push(`${icon} ${idText} ${typeBadge} ${headLabel} ${durationText}`);
+							for (let i = 1; i < visibleLabelLines.length; i++) {
+								lines.push(`  ${uiTheme.fg("toolOutput", visibleLabelLines[i]!)}`);
+							}
 
 							const preview = job.errorText?.trim() || job.resultText?.trim();
 							if (preview) {

package/src/tools/output-meta.ts

@@ -489,6 +489,32 @@ export function formatStyledTruncationWarning(meta: OutputMeta | undefined, them
 	return theme.fg("warning", wrapBrackets(message, theme));
 }
 
+/**
+ * Strip the trailing notice that {@link appendOutputNotice} bakes into the
+ * LLM-facing content body. Renderers should call this before printing
+ * `result.content` text in the TUI, because they emit a styled warning line of
+ * their own; without this, users see the same `[Showing lines …]` string twice
+ * (once verbatim from the body, once as the styled `⟨…⟩` warning).
+ *
+ * Safe to call eagerly: returns the input unchanged when no notice is present
+ * (e.g. during streaming, before {@link wrappedExecute} runs).
+ */
+export function stripOutputNotice(text: string, meta: OutputMeta | undefined): string {
+	const notice = formatOutputNotice(meta);
+	if (!notice) return text;
+	// Trim trailing whitespace from `text` and from the notice itself so we
+	// match regardless of whether: (a) the caller already trimEnd()'d, (b)
+	// extra blank lines slipped in after the notice (diagnostics blocks add
+	// `\n\n` between sections, OutputSink may pad), or (c) neither. Returns
+	// the prefix before the notice so the caller can re-trim as needed.
+	const trimmedText = text.trimEnd();
+	const trimmedNotice = notice.trimEnd();
+	if (trimmedText.endsWith(trimmedNotice)) {
+		return trimmedText.slice(0, -trimmedNotice.length);
+	}
+	return text;
+}
+
 // =============================================================================
 // Tool wrapper
 // =============================================================================

package/src/tools/read.ts

@@ -7,7 +7,7 @@ import { glob, type SummaryResult, summarizeCode } from "@oh-my-pi/pi-natives";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { getRemoteDir, logger, prompt, readImageMetadata, untilAborted } from "@oh-my-pi/pi-utils";
-import { type Static, Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import { getFileReadCache } from "../edit/file-read-cache";
 import { isNotebookPath, readEditableNotebookText } from "../edit/notebook";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
@@ -60,6 +60,7 @@ import {
 	formatStyledTruncationWarning,
 	type OutputMeta,
 	resolveOutputMaxColumns,
+	stripOutputNotice,
 } from "./output-meta";
 import { expandPath, formatPathRelativeToCwd, resolveReadPath, splitPathAndSel } from "./path-utils";
 import { formatBytes, replaceTabs, shortenPath, wrapBrackets } from "./render-utils";
@@ -172,6 +173,19 @@ function countTextLines(text: string): number {
 	if (text.length === 0) return 0;
 	return text.split("\n").length;
 }
+
+/**
+ * Footer appended to summarized reads telling the model how to recover the
+ * elided body. Without this hint, agents either ignore the `...`/`{ .. }`
+ * markers or burn a turn guessing the right selector (see issue #1046).
+ */
+function formatSummaryElisionFooter(readPath: string, elidedSpans: number, elidedLines: number): string {
+	if (elidedSpans <= 0) return "";
+	const spanWord = elidedSpans === 1 ? "region" : "regions";
+	const lineWord = elidedLines === 1 ? "line" : "lines";
+	const linePart = elidedLines > 0 ? `${elidedLines} ${lineWord} across ` : "";
+	return `[${linePart}${elidedSpans} elided ${spanWord}; read ${readPath}:raw or a line range like ${readPath}:1-9999 for verbatim content]`;
+}
 const READ_CHUNK_SIZE = 8 * 1024;
 
 /**
@@ -459,14 +473,13 @@ function prependSuffixResolutionNotice(text: string, suffixResolution?: { from:
 	return text ? `${notice}\n${text}` : notice;
 }
 
-const readSchema = Type.Object({
-	path: Type.String({
-		description: 'path or url; append :<sel> for line ranges or raw mode (e.g. "src/foo.ts:50-100")',
-		examples: ["src/foo.ts", "src/foo.ts:50-100", "https://example.com/:1-40"],
-	}),
-});
+const readSchema = z
+	.object({
+		path: z.string().describe('path or url; append :<sel> for line ranges or raw mode (e.g. "src/foo.ts:50-100")'),
+	})
+	.strict();
 
-export type ReadToolInput = Static<typeof readSchema>;
+export type ReadToolInput = z.infer<typeof readSchema>;
 
 export interface ReadToolDetails {
 	kind?: "file" | "url";
@@ -484,7 +497,7 @@ export interface ReadToolDetails {
 	 * Mirrors the same lines the model receives but without hashline/line-number prefixes,
 	 * so the TUI can render the file content with its own gutter without re-parsing the formatted text. */
 	displayContent?: { text: string; startLine: number };
-	summary?: { lines: number; elidedSpans: number };
+	summary?: { lines: number; elidedSpans: number; elidedLines: number };
 	/** Number of unresolved git conflicts surfaced by this read (TUI uses for inline `⚠ N` badge). */
 	conflictCount?: number;
 }
@@ -1317,6 +1330,7 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 		text: string;
 		displayText: string;
 		elidedSpans: number;
+		elidedLines: number;
 	} {
 		const displayMode = resolveFileDisplayMode(this.session);
 		const shouldAddHashLines = displayMode.hashLines;
@@ -1377,11 +1391,13 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 		const modelParts: string[] = [];
 		const displayParts: string[] = [];
 		let elidedSpans = 0;
+		let elidedLines = 0;
 		for (const unit of units) {
 			if (unit.kind === "elided") {
 				modelParts.push("...");
 				displayParts.push("...");
 				elidedSpans++;
+				elidedLines += unit.endLine - unit.startLine + 1;
 				continue;
 			}
 			if (unit.kind === "merged") {
@@ -1396,13 +1412,15 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 				modelParts.push(formatted.model);
 				displayParts.push(formatted.display);
 				elidedSpans++;
+				// Merged brace pair encloses (start+1)..(end-1) as elided.
+				elidedLines += Math.max(0, unit.endLine - unit.startLine - 1);
 				continue;
 			}
 			modelParts.push(formatSingleLine(unit.line, unit.text, shouldAddHashLines, shouldAddLineNumbers));
 			displayParts.push(unit.text);
 		}
 
-		return { text: modelParts.join("\n"), displayText: displayParts.join("\n"), elidedSpans };
+		return { text: modelParts.join("\n"), displayText: displayParts.join("\n"), elidedSpans, elidedLines };
 	}
 
 	async execute(
@@ -1646,16 +1664,23 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 				const summary = await this.#trySummarize(absolutePath, fileSize, signal);
 				if (summary?.parsed && summary.elided) {
 					const renderedSummary = this.#renderSummary(summary);
+					const footer = formatSummaryElisionFooter(
+						localReadPath,
+						renderedSummary.elidedSpans,
+						renderedSummary.elidedLines,
+					);
+					const modelText = footer ? `${renderedSummary.text}\n\n${footer}` : renderedSummary.text;
 					details = {
 						displayContent: { text: renderedSummary.displayText, startLine: 1 },
 						summary: {
 							lines: countTextLines(renderedSummary.text),
 							elidedSpans: renderedSummary.elidedSpans,
+							elidedLines: renderedSummary.elidedLines,
 						},
 					};
 
 					sourcePath = absolutePath;
-					content = [{ type: "text", text: renderedSummary.text }];
+					content = [{ type: "text", text: modelText }];
 				}
 			}
 
@@ -2169,7 +2194,9 @@ export const readToolRenderer = {
 		const rawText = result.content?.find(c => c.type === "text")?.text ?? "";
 		// Prefer structured `displayContent` from details when available so the TUI
 		// shows clean file content (no model-only hashline anchors) without parsing the formatted text.
-		const contentText = details?.displayContent?.text ?? rawText;
+		// Fall back to the raw text, but strip the LLM-facing notice so it doesn't
+		// echo next to the styled warning line below.
+		const contentText = details?.displayContent?.text ?? stripOutputNotice(rawText, details?.meta);
 		const imageContent = result.content?.find(c => c.type === "image");
 		const rawPath = args?.file_path || args?.path || "";
 		const filePath = shortenPath(rawPath);

package/src/tools/recipe/index.ts

@@ -1,7 +1,7 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { prompt } from "@oh-my-pi/pi-utils";
-import { type Static, Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import type { RenderResultOptions } from "../../extensibility/custom-tools/types";
 import type { Theme } from "../../modes/theme/theme";
 import recipeDescription from "../../prompts/tools/recipe.md" with { type: "text" };
@@ -11,14 +11,12 @@ import { createRecipeToolRenderer, type RecipeRenderArgs } from "./render";
 import { buildPromptModel, type DetectedRunner, resolveCommand } from "./runner";
 import { RUNNERS } from "./runners";
 
-const recipeSchema = Type.Object({
-	op: Type.String({
-		description: 'task name and args, e.g. "test" or "build --release"',
-		examples: ["test", "build --release", "pkg:test --watch"],
-	}),
-});
-
-type RecipeParams = Static<typeof recipeSchema>;
+const recipeSchema = z
+	.object({
+		op: z.string().describe('task name and args, e.g. "test" or "build --release"'),
+	})
+	.strict();
+type RecipeParams = z.infer<typeof recipeSchema>;
 
 type RecipeRenderResult = {
 	content: Array<{ type: string; text?: string }>;

package/src/tools/render-mermaid.ts

@@ -1,22 +1,22 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { type MermaidAsciiRenderOptions, prompt, renderMermaidAscii } from "@oh-my-pi/pi-utils";
-import { type Static, Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import renderMermaidDescription from "../prompts/tools/render-mermaid.md" with { type: "text" };
 import type { ToolSession } from "./index";
 
-const renderMermaidSchema = Type.Object({
-	mermaid: Type.String({ description: "mermaid source", examples: ["graph TD; A-->B"] }),
-	config: Type.Optional(
-		Type.Object({
-			useAscii: Type.Optional(Type.Boolean()),
-			paddingX: Type.Optional(Type.Number()),
-			paddingY: Type.Optional(Type.Number()),
-			boxBorderPadding: Type.Optional(Type.Number()),
-		}),
-	),
+const renderMermaidSchema = z.object({
+	mermaid: z.string().describe("mermaid source"),
+	config: z
+		.object({
+			useAscii: z.boolean().optional(),
+			paddingX: z.number().optional(),
+			paddingY: z.number().optional(),
+			boxBorderPadding: z.number().optional(),
+		})
+		.optional(),
 });
 
-type RenderMermaidParams = Static<typeof renderMermaidSchema>;
+type RenderMermaidParams = z.infer<typeof renderMermaidSchema>;
 
 function sanitizeRenderConfig(config: MermaidAsciiRenderOptions | undefined): MermaidAsciiRenderOptions | undefined {
 	if (!config) return undefined;

package/src/tools/report-tool-issue.ts

@@ -9,13 +9,13 @@ import { Database } from "bun:sqlite";
 import path from "node:path";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import { $flag, getAgentDir, logger, VERSION } from "@oh-my-pi/pi-utils";
-import { Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import type { Settings } from "..";
 import type { ToolSession } from "./index";
 
-const ReportToolIssueParams = Type.Object({
-	tool: Type.String({ description: "tool name", examples: ["bash", "read"] }),
-	report: Type.String({ description: "unexpected behavior" }),
+const ReportToolIssueParams = z.object({
+	tool: z.string().describe("tool name"),
+	report: z.string().describe("unexpected behavior"),
 });
 
 export function isAutoQaEnabled(settings?: Settings): boolean {

package/src/tools/resolve.ts

@@ -2,7 +2,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
-import { type Static, Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import resolveDescription from "../prompts/tools/resolve.md" with { type: "text" };
@@ -11,18 +11,18 @@ import type { ToolSession } from ".";
 import { replaceTabs } from "./render-utils";
 import { ToolError } from "./tool-errors";
 
-const resolveSchema = Type.Object({
-	action: Type.Union([Type.Literal("apply"), Type.Literal("discard")]),
-	reason: Type.String({ description: "reason for action", examples: ["approved by user"] }),
-	extra: Type.Optional(
-		Type.Record(Type.String(), Type.Unknown(), {
-			description:
-				'Free-form metadata interpreted by the resolving tool (e.g. plan-mode approval requires `{ title: "<PLAN_TITLE>" }`).',
-		}),
-	),
+const resolveSchema = z.object({
+	action: z.union([z.literal("apply"), z.literal("discard")]),
+	reason: z.string().describe("reason for action"),
+	extra: z
+		.record(z.string(), z.unknown())
+		.optional()
+		.describe(
+			'Free-form metadata interpreted by the resolving tool (e.g. plan-mode approval requires `{ title: "<PLAN_TITLE>" }`).',
+		),
 });
 
-type ResolveParams = Static<typeof resolveSchema>;
+type ResolveParams = z.infer<typeof resolveSchema>;
 
 export interface ResolveToolDetails {
 	action: "apply" | "discard";

package/src/tools/review.ts

@@ -6,18 +6,15 @@
  * Reviewers finish via `yield` tool with SubmitReviewDetails schema.
  */
 // ─────────────────────────────────────────────────────────────────────────────
-// Subprocess tool handlers - registered for extraction/rendering in task tool
-// ─────────────────────────────────────────────────────────────────────────────
+
 import path from "node:path";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import { StringEnum } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Container, Text } from "@oh-my-pi/pi-tui";
 import { isRecord } from "@oh-my-pi/pi-utils";
-import { Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import type { Theme, ThemeColor } from "../modes/theme/theme";
 import { subprocessToolRegistry } from "../task/subprocess-tool-registry";
-
 export type FindingPriority = "P0" | "P1" | "P2" | "P3";
 
 export interface FindingPriorityInfo {
@@ -53,27 +50,18 @@ function getPriorityDisplay(
 }
 
 // report_finding schema
-const ReportFindingParams = Type.Object({
-	title: Type.String({
-		description: "prefixed imperative title",
-		examples: ["[P1] un-padding wrong dimension"],
-	}),
-	body: Type.String({
-		description: "problem explanation",
-	}),
-	priority: StringEnum(["P0", "P1", "P2", "P3"], {
-		description: "priority 0-3",
-	}),
-	confidence: Type.Number({
-		minimum: 0,
-		maximum: 1,
-		description: "confidence score",
-		examples: [0.0, 0.5, 1.0],
-	}),
-	file_path: Type.String({ description: "file path" }),
-	line_start: Type.Number({ description: "start line" }),
-	line_end: Type.Number({ description: "end line" }),
-});
+// report_finding schema
+const ReportFindingParams = z
+	.object({
+		title: z.string().describe("prefixed imperative title"),
+		body: z.string().describe("problem explanation"),
+		priority: z.enum(["P0", "P1", "P2", "P3"] as const).describe("priority 0-3"),
+		confidence: z.number().min(0).max(1).describe("confidence score"),
+		file_path: z.string().describe("file path"),
+		line_start: z.number().describe("start line"),
+		line_end: z.number().describe("end line"),
+	})
+	.strict();
 
 interface ReportFindingDetails {
 	title: string;

package/src/tools/search-tool-bm25.ts

@@ -1,7 +1,8 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { type Component, Text } from "@oh-my-pi/pi-tui";
+import type { Component } from "@oh-my-pi/pi-tui";
+import { Text } from "@oh-my-pi/pi-tui";
 import { prompt } from "@oh-my-pi/pi-utils";
-import { type Static, Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import searchToolBm25Description from "../prompts/tools/search-tool-bm25.md" with { type: "text" };
@@ -30,15 +31,12 @@ const COLLAPSED_MATCH_LIMIT = 5;
 const MATCH_LABEL_LEN = 72;
 const MATCH_DESCRIPTION_LEN = 96;
 
-const searchToolBm25Schema = Type.Object({
-	query: Type.String({
-		description: "tool search query",
-		examples: ["kubernetes pod", "image processing", "git commit"],
-	}),
-	limit: Type.Optional(Type.Integer({ description: "max matches", minimum: 1 })),
+const searchToolBm25Schema = z.object({
+	query: z.string().describe("tool search query"),
+	limit: z.number().int().min(1).optional().describe("max matches"),
 });
 
-type SearchToolBm25Params = Static<typeof searchToolBm25Schema>;
+type SearchToolBm25Params = z.infer<typeof searchToolBm25Schema>;
 
 interface SearchToolBm25Match {
 	name: string;

package/src/tools/search.ts

@@ -1,11 +1,10 @@
 import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-
 import { type GrepMatch, GrepOutputMode, type GrepResult, grep } from "@oh-my-pi/pi-natives";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
-import { type Static, Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import { getFileReadCache } from "../edit/file-read-cache";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
@@ -31,25 +30,23 @@ import {
 import { ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 
-const searchSchema = Type.Object({
-	pattern: Type.String({ description: "regex pattern", examples: ["function\\s+\\w+", "TODO"] }),
-	paths: Type.Array(Type.String({ description: "file, directory, glob, or internal URL to search" }), {
-		minItems: 1,
-		description: "files, directories, globs, or internal URLs to search",
-		examples: [["src/"], ["src/foo.ts"], ["src/**/*.ts"], ["src/", "packages/"]],
-	}),
-	i: Type.Optional(Type.Boolean({ description: "case-insensitive search", default: false })),
-	gitignore: Type.Optional(Type.Boolean({ description: "respect gitignore", default: true })),
-	skip: Type.Optional(
-		Type.Number({
-			description:
-				"files to skip before collecting results — use to paginate when the prior call hit the file limit",
-			default: 0,
-		}),
-	),
-});
-
-export type SearchToolInput = Static<typeof searchSchema>;
+const searchSchema = z
+	.object({
+		pattern: z.string().describe("regex pattern"),
+		paths: z
+			.array(z.string().describe("file, directory, glob, or internal URL to search"))
+			.min(1)
+			.describe("files, directories, globs, or internal URLs to search"),
+		i: z.boolean().optional().describe("case-insensitive search"),
+		gitignore: z.boolean().optional().describe("respect gitignore"),
+		skip: z
+			.number()
+			.optional()
+			.describe("files to skip before collecting results — use to paginate when the prior call hit the file limit"),
+	})
+	.strict();
+
+export type SearchToolInput = z.infer<typeof searchSchema>;
 
 /** Maximum number of distinct files surfaced in a single response. The
  * agent paginates further pages via `skip`. */
@@ -89,7 +86,7 @@ export interface SearchToolDetails {
 	missingPaths?: string[];
 }
 
-type SearchParams = Static<typeof searchSchema>;
+type SearchParams = z.infer<typeof searchSchema>;
 
 export class SearchTool implements AgentTool<typeof searchSchema, SearchToolDetails> {
 	readonly name = "search";

package/src/tools/ssh.ts

@@ -2,7 +2,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt } from "@oh-my-pi/pi-utils";
-import { type Static, Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import type { SSHHost } from "../capability/ssh";
 import { sshCapability } from "../capability/ssh";
 import { loadCapability } from "../discovery";
@@ -16,16 +16,16 @@ import { executeSSH } from "../ssh/ssh-executor";
 import { renderStatusLine } from "../tui";
 import { CachedOutputBlock } from "../tui/output-block";
 import type { ToolSession } from ".";
-import { formatStyledTruncationWarning, type OutputMeta } from "./output-meta";
+import { formatStyledTruncationWarning, type OutputMeta, stripOutputNotice } from "./output-meta";
 import { ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { clampTimeout } from "./tool-timeouts";
 
-const sshSchema = Type.Object({
-	host: Type.String({ description: "ssh host", examples: ["my-server", "prod-1"] }),
-	command: Type.String({ description: "remote command", examples: ["ls -la", "uptime"] }),
-	cwd: Type.Optional(Type.String({ description: "remote working directory", examples: ["/var/log"] })),
-	timeout: Type.Optional(Type.Number({ description: "timeout in seconds", default: 60 })),
+const sshSchema = z.object({
+	host: z.string().describe("ssh host"),
+	command: z.string().describe("remote command"),
+	cwd: z.string().optional().describe("remote working directory"),
+	timeout: z.number().optional().describe("timeout in seconds").default(60),
 });
 
 export interface SSHToolDetails {
@@ -116,7 +116,7 @@ async function loadHosts(session: ToolSession): Promise<{
 	return { hostNames, hostsByName };
 }
 
-type SshToolParams = Static<typeof sshSchema>;
+type SshToolParams = z.infer<typeof sshSchema>;
 
 export class SshTool implements AgentTool<typeof sshSchema, SSHToolDetails> {
 	readonly name = "ssh";
@@ -253,7 +253,8 @@ export const sshToolRenderer = {
 			render: (width: number): string[] => {
 				// REACTIVE: read mutable options at render time
 				const { expanded, renderContext } = options;
-				const output = textContent.trimEnd();
+				// Strip LLM-facing notice so we don't echo it next to the styled warning.
+				const output = stripOutputNotice(textContent, details?.meta).trimEnd();
 				const outputLines: string[] = [];
 
 				if (output) {