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

package/src/tools/yield.ts

@@ -4,10 +4,15 @@
  * Subagents must call this tool to finish and return structured JSON output.
  */
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { dereferenceJsonSchema, sanitizeSchemaForStrictMode } from "@oh-my-pi/pi-ai/utils/schema";
-import type { Static, TSchema } from "@sinclair/typebox";
-import { Type } from "@sinclair/typebox";
-import Ajv, { type ErrorObject, type ValidateFunction } from "ajv";
+import type { TSchema } from "@oh-my-pi/pi-ai/types";
+import {
+	dereferenceJsonSchema,
+	isValidJsonSchema,
+	type JsonSchemaValidationIssue,
+	type JsonSchemaValidationResult,
+	sanitizeSchemaForStrictMode,
+	validateJsonSchemaValue,
+} from "@oh-my-pi/pi-ai/utils/schema";
 import { subprocessToolRegistry } from "../task/subprocess-tool-registry";
 import type { ToolSession } from ".";
 import { jtdToJsonSchema, normalizeSchema } from "./jtd-to-json-schema";
@@ -18,8 +23,6 @@ export interface YieldDetails {
 	error?: string;
 }
 
-const ajv = new Ajv({ allErrors: true, strict: false, logger: false });
-
 function formatSchema(schema: unknown): string {
 	if (schema === undefined) return "No schema provided.";
 	if (typeof schema === "string") return schema;
@@ -30,16 +33,72 @@ function formatSchema(schema: unknown): string {
 	}
 }
 
-function formatAjvErrors(errors: ErrorObject[] | null | undefined): string {
-	if (!errors || errors.length === 0) return "Unknown schema validation error.";
-	return errors
-		.map(err => {
-			const path = err.instancePath ? `${err.instancePath}: ` : "";
-			return `${path}${err.message ?? "invalid"}`;
+function formatJsonSchemaIssues(issues: ReadonlyArray<JsonSchemaValidationIssue> | undefined): string {
+	if (!issues || issues.length === 0) return "Unknown schema validation error.";
+	return issues
+		.map(issue => {
+			const path = issue.path.length === 0 ? "" : `${issue.path.map(seg => String(seg)).join("/")}: `;
+			return `${path}${issue.message}`;
 		})
 		.join("; ");
 }
 
+function looseRecordSchema(description: string): Record<string, unknown> {
+	return {
+		type: "object",
+		additionalProperties: true,
+		description,
+	};
+}
+
+function hasUnresolvedRefs(schema: unknown): boolean {
+	if (schema == null) return false;
+	if (Array.isArray(schema)) {
+		for (const item of schema) {
+			if (hasUnresolvedRefs(item)) return true;
+		}
+		return false;
+	}
+	if (typeof schema !== "object") return false;
+	const record = schema as Record<string, unknown>;
+	if (typeof record.$ref === "string") return true;
+	for (const key in record) {
+		if (key === "const" || key === "default" || key === "enum" || key === "examples") continue;
+		if (hasUnresolvedRefs(record[key])) return true;
+	}
+	return false;
+}
+
+function wrapYieldParameters(dataSchema: Record<string, unknown>): Record<string, unknown> {
+	return {
+		type: "object",
+		additionalProperties: false,
+		description: "submit data or error",
+		properties: {
+			result: {
+				anyOf: [
+					{
+						type: "object",
+						additionalProperties: false,
+						description: "task succeeded",
+						properties: { data: dataSchema },
+						required: ["data"],
+					},
+					{
+						type: "object",
+						additionalProperties: false,
+						properties: {
+							error: { type: "string", description: "error message" },
+						},
+						required: ["error"],
+					},
+				],
+			},
+		},
+		required: ["result"],
+	};
+}
+
 export class YieldTool implements AgentTool<TSchema, YieldDetails> {
 	readonly name = "yield";
 	readonly label = "Submit Result";
@@ -52,33 +111,15 @@ export class YieldTool implements AgentTool<TSchema, YieldDetails> {
 	readonly intent = "omit" as const;
 	lenientArgValidation = true;
 
-	readonly #validate?: ValidateFunction;
+	readonly #validate?: (value: unknown) => JsonSchemaValidationResult;
 	#schemaValidationFailures = 0;
 
 	constructor(session: ToolSession) {
-		const createParameters = (dataSchema: TSchema): TSchema =>
-			Type.Object(
-				{
-					result: Type.Union([
-						Type.Object({ data: dataSchema }, { description: "task succeeded" }),
-						Type.Object({
-							error: Type.String({ description: "error message" }),
-						}),
-					]),
-				},
-				{
-					additionalProperties: false,
-					description: "submit data or error",
-				},
-			) as TSchema;
-
-		let validate: ValidateFunction | undefined;
-		let dataSchema: TSchema;
+		let validate: ((value: unknown) => JsonSchemaValidationResult) | undefined;
 		let parameters: TSchema;
 
 		try {
 			const schemaResult = normalizeSchema(session.outputSchema);
-			// Convert JTD to JSON Schema if needed (auto-detected)
 			const normalizedSchema =
 				schemaResult.normalized !== undefined ? jtdToJsonSchema(schemaResult.normalized) : undefined;
 			let schemaError = schemaResult.error;
@@ -88,10 +129,10 @@ export class YieldTool implements AgentTool<TSchema, YieldDetails> {
 			}
 
 			if (normalizedSchema !== undefined && normalizedSchema !== false && !schemaError) {
-				try {
-					validate = ajv.compile(normalizedSchema as Record<string, unknown> | boolean);
-				} catch (err) {
-					schemaError = err instanceof Error ? err.message : String(err);
+				if (!isValidJsonSchema(normalizedSchema)) {
+					schemaError = "invalid JSON schema";
+				} else {
+					validate = value => validateJsonSchemaValue(normalizedSchema, value);
 				}
 			}
 
@@ -109,27 +150,29 @@ export class YieldTool implements AgentTool<TSchema, YieldDetails> {
 						? {}
 						: undefined;
 
+			let dataSchema: Record<string, unknown>;
 			if (sanitizedSchema !== undefined) {
 				const resolved = dereferenceJsonSchema({
 					...sanitizedSchema,
 					description: schemaDescription,
-				});
-				dataSchema = Type.Unsafe(resolved as Record<string, unknown>);
+				}) as Record<string, unknown>;
+				if (hasUnresolvedRefs(resolved)) {
+					throw new Error("schema contains unresolved $ref after dereferencing");
+				}
+				dataSchema = resolved;
 			} else {
-				dataSchema = Type.Record(Type.String(), Type.Any(), {
-					description: schemaError ? schemaDescription : "Structured JSON output (no schema specified)",
-				});
+				dataSchema = looseRecordSchema(
+					schemaError ? schemaDescription : "Structured JSON output (no schema specified)",
+				);
 			}
-			parameters = createParameters(dataSchema);
+			parameters = wrapYieldParameters(dataSchema);
 			JSON.stringify(parameters);
-			// Verify the final parameters compile with AJV (catches unresolved $ref, etc.)
-			ajv.compile(parameters as Record<string, unknown>);
+			if (!isValidJsonSchema(parameters)) throw new Error("yield parameters schema is invalid");
 		} catch (err) {
 			const errorMsg = err instanceof Error ? err.message : String(err);
-			dataSchema = Type.Record(Type.String(), Type.Any(), {
-				description: `Structured JSON output (schema processing failed: ${errorMsg})`,
-			});
-			parameters = createParameters(dataSchema);
+			parameters = wrapYieldParameters(
+				looseRecordSchema(`Structured JSON output (schema processing failed: ${errorMsg})`),
+			);
 			validate = undefined;
 			this.strict = false;
 		}
@@ -140,7 +183,7 @@ export class YieldTool implements AgentTool<TSchema, YieldDetails> {
 
 	async execute(
 		_toolCallId: string,
-		params: Static<TSchema>,
+		params: unknown,
 		_signal?: AbortSignal,
 		_onUpdate?: AgentToolUpdateCallback<YieldDetails>,
 		_context?: AgentToolContext,
@@ -170,12 +213,15 @@ export class YieldTool implements AgentTool<TSchema, YieldDetails> {
 			if (data === undefined || data === null) {
 				throw new Error("data is required when yield indicates success");
 			}
-			if (this.#validate && !this.#validate(data)) {
-				this.#schemaValidationFailures++;
-				if (this.#schemaValidationFailures <= 1) {
-					throw new Error(`Output does not match schema: ${formatAjvErrors(this.#validate.errors)}`);
+			if (this.#validate) {
+				const parsed = this.#validate(data);
+				if (!parsed.success) {
+					this.#schemaValidationFailures++;
+					if (this.#schemaValidationFailures <= 1) {
+						throw new Error(`Output does not match schema: ${formatJsonSchemaIssues(parsed.issues)}`);
+					}
+					schemaValidationOverridden = true;
 				}
-				schemaValidationOverridden = true;
 			}
 		}
 

package/src/web/search/index.ts

@@ -6,9 +6,8 @@
  *
  */
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { StringEnum } from "@oh-my-pi/pi-ai";
 import { prompt } from "@oh-my-pi/pi-utils";
-import { Type } from "@sinclair/typebox";
+import * as z from "zod/v4";
 import type { CustomTool, CustomToolContext, RenderResultOptions } from "../../extensibility/custom-tools/types";
 import type { Theme } from "../../modes/theme/theme";
 import webSearchSystemPrompt from "../../prompts/system/web-search.md" with { type: "text" };
@@ -21,30 +20,16 @@ import type { SearchProviderId, SearchResponse } from "./types";
 import { SearchProviderError } from "./types";
 
 /** Web search tool parameters schema */
-export const webSearchSchema = Type.Object({
-	query: Type.String({ description: "Search query" }),
-	recency: Type.Optional(
-		StringEnum(["day", "week", "month", "year"], {
-			description: "Recency filter (Brave, Perplexity)",
-		}),
-	),
-	limit: Type.Optional(Type.Number({ description: "Max results to return" })),
-	max_tokens: Type.Optional(Type.Number({ description: "Maximum output tokens" })),
-	temperature: Type.Optional(Type.Number({ description: "Sampling temperature" })),
-	num_search_results: Type.Optional(Type.Number({ description: "Number of search results to retrieve" })),
+export const webSearchSchema = z.object({
+	query: z.string().describe("Search query"),
+	recency: z.enum(["day", "week", "month", "year"]).describe("Recency filter (Brave, Perplexity)").optional(),
+	limit: z.number().describe("Max results to return").optional(),
+	max_tokens: z.number().describe("Maximum output tokens").optional(),
+	temperature: z.number().describe("Sampling temperature").optional(),
+	num_search_results: z.number().describe("Number of search results to retrieve").optional(),
 });
 
-export type SearchToolParams = {
-	query: string;
-	recency?: "day" | "week" | "month" | "year";
-	limit?: number;
-	/** Maximum output tokens. Defaults to 4096. */
-	max_tokens?: number;
-	/** Sampling temperature (0–1). Lower = more focused/factual. Defaults to 0.2. */
-	temperature?: number;
-	/** Number of search results to retrieve. Defaults to 10. */
-	num_search_results?: number;
-};
+export type SearchToolParams = z.infer<typeof webSearchSchema>;
 
 export interface SearchQueryParams extends SearchToolParams {
 	provider?: SearchProviderId | "auto";

package/src/prompts/compaction/branch-summary-context.md

@@ -1,5 +0,0 @@
-The following is a summary of a branch that this conversation came back from:
-
-<summary>
-{{summary}}
-</summary>

package/src/prompts/compaction/branch-summary-preamble.md

@@ -1,2 +0,0 @@
-The user explored a different conversation branch before returning here.
-Summary of that exploration:

package/src/prompts/compaction/branch-summary.md

@@ -1,30 +0,0 @@
-You MUST create a structured summary of the conversation branch for context when returning.
-
-You MUST use EXACT format:
-
-## Goal
-
-[What user trying to accomplish in this branch?]
-
-## Constraints & Preferences
-- [Constraints, preferences, requirements mentioned]
-- [(none) if none mentioned]
-
-## Progress
-
-### Done
-- [x] [Completed tasks/changes]
-
-### In Progress
-- [ ] [Work started but not finished]
-
-### Blocked
-- [Issues preventing progress]
-
-## Key Decisions
-- **[Decision]**: [Brief rationale]
-
-## Next Steps
-1. [What should happen next to continue]
-
-Sections MUST be kept concise. You MUST preserve exact file paths, function names, error messages.

package/src/prompts/compaction/compaction-short-summary.md

@@ -1,9 +0,0 @@
-You MUST summarize what was done in this conversation, written like a pull request description.
-
-Rules:
-- MUST be 2-3 sentences max
-- MUST describe the changes made, not the process
-- NEVER mention running tests, builds, or other validation steps
-- NEVER explain what the user asked for
-- MUST write in first person (I added…, I fixed…)
-- NEVER ask questions

package/src/prompts/compaction/compaction-summary-context.md

@@ -1,5 +0,0 @@
-Another language model started to solve this problem and produced a summary of its thinking process. You also have access to the state of the tools that were used by that language model. You MUST use this to build on the work that has already been done and NEVER duplicate work. Here is the summary produced by the other language model; you MUST use the information in this summary to assist with your own analysis:
-
-<summary>
-{{summary}}
-</summary>

package/src/prompts/compaction/compaction-summary.md

@@ -1,38 +0,0 @@
-You MUST summarize the conversation above into a structured context checkpoint handoff summary for another LLM to resume task.
-
-IMPORTANT: If conversation ends with unanswered question to user or imperative/request awaiting user response (e.g., "Please run command and paste output"), you MUST preserve that exact question/request.
-
-You MUST use this format (sections can be omitted if not applicable):
-
-## Goal
-[User goals; list multiple if session covers different tasks.]
-
-## Constraints & Preferences
-- [Constraints or requirements mentioned]
-
-## Progress
-
-### Done
-- [x] [Completed tasks/changes]
-
-### In Progress
-- [ ] [Current work]
-
-### Blocked
-- [Issues preventing progress]
-
-## Key Decisions
-- **[Decision]**: [Brief rationale]
-
-## Next Steps
-1. [Ordered list of next actions]
-
-## Critical Context
-- [Important data, pending questions, references]
-
-## Additional Notes
-[Anything else important not covered above]
-
-You MUST output only the structured summary; you NEVER include extra text.
-
-Sections MUST be kept concise. You MUST preserve exact file paths, function names, error messages, and relevant tool outputs or command results. You MUST include repository state changes (branch, uncommitted changes) if mentioned.

package/src/prompts/compaction/compaction-turn-prefix.md

@@ -1,17 +0,0 @@
-This is the PREFIX of a turn that was too large to keep. The SUFFIX (recent work) is retained.
-
-You MUST summarize the prefix to provide context for the retained suffix:
-
-## Original Request
-
-[What did the user ask for in this turn?]
-
-## Early Progress
-- [Key decisions and work done in the prefix]
-
-## Context for Suffix
-- [Information needed to understand the retained recent work]
-
-You MUST output only the structured summary. You NEVER include extra text.
-
-You MUST be concise. You MUST preserve exact file paths, function names, error messages, and relevant tool outputs or command results if they appear. You MUST focus on what's needed to understand the kept suffix.

package/src/prompts/compaction/compaction-update-summary.md

@@ -1,45 +0,0 @@
-You MUST incorporate new messages above into the existing handoff summary in <previous-summary> tags, used by another LLM to resume task.
-RULES:
-- MUST preserve all information from previous summary
-- MUST add new progress, decisions, and context from new messages
-- MUST update Progress: move items from "In Progress" to "Done" when completed
-- MUST update "Next Steps" based on what was accomplished
-- MUST preserve exact file paths, function names, and error messages
-- You MAY remove anything no longer relevant
-
-IMPORTANT: If new messages end with unanswered question or request to user, you MUST add it to Critical Context (replacing any previous pending question if answered).
-
-You MUST use this format (omit sections if not applicable):
-
-## Goal
-[Preserve existing goals; add new ones if task expanded]
-
-## Constraints & Preferences
-- [Preserve existing; add new ones discovered]
-
-## Progress
-
-### Done
-- [x] [Include previously done and newly completed items]
-
-### In Progress
-- [ ] [Current work—update based on progress]
-
-### Blocked
-- [Current blockers—remove if resolved]
-
-## Key Decisions
-- **[Decision]**: [Brief rationale] (preserve all previous, add new)
-
-## Next Steps
-1. [Update based on current state]
-
-## Critical Context
-- [Preserve important context; add new if needed]
-
-## Additional Notes
-[Other important info not fitting above]
-
-You MUST output only the structured summary; you NEVER include extra text.
-
-Sections MUST be kept concise. You MUST preserve relevant tool outputs/command results. You MUST include repository state changes (branch, uncommitted changes) if mentioned.

package/src/prompts/system/auto-handoff-threshold-focus.md

@@ -1 +0,0 @@
-Threshold-triggered maintenance: preserve critical implementation state and immediate next actions.

package/src/prompts/system/file-operations.md

@@ -1,10 +0,0 @@
-{{#if readFiles.length}}
-{{#xml "read-files"}}
-{{join readFiles "\n"}}
-{{/xml}}
-{{/if}}
-{{#if modifiedFiles.length}}
-{{#xml "modified-files"}}
-{{join modifiedFiles "\n"}}
-{{/xml}}
-{{/if}}

package/src/prompts/system/handoff-document.md

@@ -1,49 +0,0 @@
-<critical>
-Write a handoff document for another instance of yourself.
-The handoff MUST be sufficient for seamless continuation without access to this conversation.
-Output ONLY the handoff document. No preamble, no commentary, no wrapper text.
-</critical>
-
-<instruction>
-Capture exact technical state, not abstractions.
-- File paths, symbol names, commands run
-- Test results, observed failures
-- Decisions made
-- Partial work affecting the next step
-</instruction>
-
-<output>
-Use exactly this structure:
-
-## Goal
-[What the user is trying to accomplish]
-
-## Constraints & Preferences
-- [Any constraints, preferences, or requirements mentioned]
-
-## Progress
-### Done
-- [x] [Completed tasks with specifics]
-
-### In Progress
-- [ ] [Current work if any]
-
-### Pending
-- [ ] [Tasks mentioned but not started]
-
-## Key Decisions
-- **[Decision]**: [Rationale]
-
-## Critical Context
-- Code snippets, file paths, function/type names, error messages, data essential to continue
-- Repository state if relevant
-
-## Next Steps
-1. [What should happen next]
-</output>
-
-{{#if additionalFocus}}
-<instruction>
-Additional focus: {{additionalFocus}}
-</instruction>
-{{/if}}

package/src/prompts/system/summarization-system.md

@@ -1,3 +0,0 @@
-Summarize conversations between users and AI coding assistants. Produce structured summaries in the exact specified format.
-
-Do NOT continue the conversation. Do NOT respond to questions in the conversation. Output ONLY the structured summary.