be40b889e3
Replace Type.Any() with Type.Object({}, { additionalProperties: true }) in the
submit_result tool's fallback data schema. Type.Any() serializes to
{"description": "..."} which lacks the required 'type' field for valid
JSON Schema. Strict providers (e.g. MiniMax, Cloud Code Assist) reject this
with 400 Unrecognized schema errors.
The fix produces {"type": "object", "additionalProperties": true, ...}
which conforms to JSON Schema draft 2020-12 while preserving the same
permissive acceptance of arbitrary structured output.
Fixes schema rejection observed with:
- MiniMax API (via zuccaro/bryce proxy)
- Cloud Code Assist (Claude) - related to #45
Co-authored-by: Cursor <cursoragent@cursor.com>
153 lines
5.2 KiB
TypeScript
153 lines
5.2 KiB
TypeScript
/**
|
|
* Submit result tool for structured subagent output.
|
|
*
|
|
* 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 { StringEnum } from "@oh-my-pi/pi-ai";
|
|
import type { Static, TObject } from "@sinclair/typebox";
|
|
import { Type } from "@sinclair/typebox";
|
|
import Ajv, { type ErrorObject, type ValidateFunction } from "ajv";
|
|
import { subprocessToolRegistry } from "../task/subprocess-tool-registry";
|
|
import type { ToolSession } from ".";
|
|
import { jtdToJsonSchema } from "./jtd-to-json-schema";
|
|
|
|
export interface SubmitResultDetails {
|
|
data: unknown;
|
|
status: "success" | "aborted";
|
|
error?: string;
|
|
}
|
|
|
|
const ajv = new Ajv({ allErrors: true, strict: false });
|
|
|
|
function normalizeSchema(schema: unknown): { normalized?: unknown; error?: string } {
|
|
if (schema === undefined || schema === null) return {};
|
|
if (typeof schema === "string") {
|
|
try {
|
|
return { normalized: JSON.parse(schema) };
|
|
} catch (err) {
|
|
return { error: err instanceof Error ? err.message : String(err) };
|
|
}
|
|
}
|
|
return { normalized: schema };
|
|
}
|
|
|
|
function formatSchema(schema: unknown): string {
|
|
if (schema === undefined) return "No schema provided.";
|
|
if (typeof schema === "string") return schema;
|
|
try {
|
|
return JSON.stringify(schema, null, 2);
|
|
} catch {
|
|
return "[unserializable schema]";
|
|
}
|
|
}
|
|
|
|
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"}`;
|
|
})
|
|
.join("; ");
|
|
}
|
|
|
|
export class SubmitResultTool implements AgentTool<TObject, SubmitResultDetails> {
|
|
readonly name = "submit_result";
|
|
readonly label = "Submit Result";
|
|
readonly description =
|
|
"Finish the task with structured JSON output. Call exactly once at the end of the task.\n\n" +
|
|
"If you cannot complete the task, call with status='aborted' and an error message.";
|
|
readonly parameters: TObject;
|
|
|
|
readonly #validate?: ValidateFunction;
|
|
readonly #schemaError?: string;
|
|
|
|
constructor(session: ToolSession) {
|
|
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;
|
|
|
|
if (normalizedSchema !== undefined && !schemaError) {
|
|
try {
|
|
this.#validate = ajv.compile(normalizedSchema as any);
|
|
} catch (err) {
|
|
schemaError = err instanceof Error ? err.message : String(err);
|
|
}
|
|
}
|
|
|
|
this.#schemaError = schemaError;
|
|
|
|
const schemaHint = formatSchema(normalizedSchema ?? session.outputSchema);
|
|
|
|
// Use actual schema if provided, otherwise fall back to Type.Any
|
|
// Merge description into the JSON schema for better tool documentation
|
|
const dataSchema = normalizedSchema
|
|
? Type.Unsafe({
|
|
...(normalizedSchema as object),
|
|
description: `Structured output matching the schema:\n${schemaHint}`,
|
|
})
|
|
: Type.Object({}, { additionalProperties: true, description: "Structured JSON output (no schema specified)" });
|
|
|
|
this.parameters = Type.Object({
|
|
data: Type.Optional(dataSchema),
|
|
status: Type.Optional(
|
|
StringEnum(["success", "aborted"], {
|
|
description: "Use 'aborted' if the task cannot be completed, defaults to 'success'",
|
|
}),
|
|
),
|
|
error: Type.Optional(Type.String({ description: "Error message when status is 'aborted'" })),
|
|
});
|
|
}
|
|
|
|
async execute(
|
|
_toolCallId: string,
|
|
params: Static<TObject>,
|
|
_signal?: AbortSignal,
|
|
_onUpdate?: AgentToolUpdateCallback<SubmitResultDetails>,
|
|
_context?: AgentToolContext,
|
|
): Promise<AgentToolResult<SubmitResultDetails>> {
|
|
const status = (params.status ?? "success") as "success" | "aborted";
|
|
|
|
// Skip validation when aborting - data is optional for aborts
|
|
if (status === "success") {
|
|
if (params.data === undefined || params.data === null) {
|
|
throw new Error("data is required when status is 'success' (got null/undefined)");
|
|
}
|
|
if (this.#schemaError) {
|
|
throw new Error(`Invalid output schema: ${this.#schemaError}`);
|
|
}
|
|
if (this.#validate && !this.#validate(params.data)) {
|
|
throw new Error(`Output does not match schema: ${formatAjvErrors(this.#validate.errors)}`);
|
|
}
|
|
}
|
|
|
|
const responseText =
|
|
status === "aborted" ? `Task aborted: ${params.error || "No reason provided"}` : "Result submitted.";
|
|
|
|
return {
|
|
content: [{ type: "text", text: responseText }],
|
|
details: { data: params.data, status, error: params.error as string | undefined },
|
|
};
|
|
}
|
|
}
|
|
|
|
// Register subprocess tool handler for extraction + termination.
|
|
subprocessToolRegistry.register<SubmitResultDetails>("submit_result", {
|
|
extractData: event => {
|
|
const details = event.result?.details;
|
|
if (!details || typeof details !== "object") return undefined;
|
|
const record = details as Record<string, unknown>;
|
|
const status = record.status;
|
|
if (status !== "success" && status !== "aborted") return undefined;
|
|
return {
|
|
data: record.data,
|
|
status,
|
|
error: typeof record.error === "string" ? record.error : undefined,
|
|
};
|
|
},
|
|
shouldTerminate: event => !event.isError,
|
|
});
|