- src/agent/lh-tool.ts deleted: the zod-wrapped LhTool + toPiTool bridge (z.toJSONSchema per call, clientQuestion flag, hand-rolled result mapping) is gone. Tools are pi-agent-core native AgentTools now. - New src/agent/tool-execute.ts owns what the wrapper added: the abort guard (runWithAbortGuard: run signal + 30s per-call timeout + 250ms grace, 'Operation aborted' / timeout wording preserved), ToolInputError (the retryable '- problem at path' format), result mapping (string verbatim / object JSON / image parts, details rides the record's tool part output), and questionResult() — placeholder + terminate:true (owner Option A: belt of terminate + slim makeQuestionStopper with the clean-question rule; maxTurns deleted from the teaching turn entirely per owner). - All 11 tool files + tools.ts registries converted to TypeBox parameters (typebox@1.3.7, pinned to pi-agent-core's copy). zod refinements (quizInputProblems, askOptionProblems, live-nodeId) moved from schemas into execute — the model sees the same retryable error shape. - question-core + contracts/probe TypeBox-authored (single source shared with the UI); tool-parts parse seam runs the boundary's full chain (Convert → Check → Clean → refinement), fixing the live-smoke lockout: pi's boundary Value.Converts correctAnswer: 17 → '17' but the record keeps raw args, so a parse without Convert rejected a posed quiz (invisible pending question, turn ended). Pinned with the real smoke emission shape. - Subagents converted: demo-builder/researcher AgentTool-native, visual-maker/pdf-reader declaration-only pi-ai Tools with local execute fns, extraction submit schemas re-authored in TypeBox (owner option 2: zod defaults → Type.Optional + fill at the submit seam). - Accepted delta, flagged: TypeBox-native schemas skip pi's JSON-Schema primitive coercion fast path... (boundary still Value.Converts), and prober-quiz unknown keys ride through (Value.Clean strips at display). - Tests: 988 passing (was 967 at the recon baseline); tool-abort and read-tool rewritten against the native seams; question-core/question- tools/tool-parts/demos/web-search/graph-tools/plan-tree/probe-done/ tool-toggles converted to Value.Check/execute pins. Live smoke (PORT=3004, real model): native ls turn streams end-to-end; a real quiz pose (first attempt missing correctAnswer → tool-input-error → model retry → posed) terminates the turn cleanly and persists pending.
234 lines
10 KiB
TypeScript
234 lines
10 KiB
TypeScript
/**
|
|
* The agent-split question tools (docs/probe-teach-split.md §1):
|
|
*
|
|
* - teachQuizToolFor — the TEACHER's quiz: the shared authoring contract +
|
|
* the per-session plan-nodeId validation (position signal; a mismatched id
|
|
* is rejected at the call boundary and returns to the agent to fix).
|
|
* - createProberTools — the PROBER's quiz has NO nodeId field at all (the
|
|
* schema is built from quizInputBase; the key is stripped if the model
|
|
* tries anyway), plus ask + probe_done.
|
|
*
|
|
* The grading contract (question-core) is shared and untouched by both.
|
|
*/
|
|
import assert from "node:assert/strict";
|
|
import * as fs from "node:fs";
|
|
import * as path from "node:path";
|
|
import { after, describe, it } from "node:test";
|
|
import { Value } from "typebox/value";
|
|
import { createProberTools, createTeacherTools, teachQuizToolFor, type TeacherToolContext } from "../src/agent/tools.ts";
|
|
import { TOGGLEABLE_TOOLS } from "../src/core/pending.ts";
|
|
import { jobStore } from "../src/store/jobs.ts";
|
|
import { probeQuizInputSchema } from "../src/core/question-core.ts";
|
|
import { chatStore } from "../src/store/chats.ts";
|
|
import { PATHS } from "../config.ts";
|
|
|
|
const dataDir = path.join(PATHS.root, "data");
|
|
fs.mkdirSync(dataDir, { recursive: true });
|
|
|
|
const createdChats: string[] = [];
|
|
after(() => {
|
|
for (const id of createdChats) {
|
|
try {
|
|
fs.unlinkSync(path.join(PATHS.chats, `${id}.json`));
|
|
} catch {
|
|
/* scratch cleanup, best effort */
|
|
}
|
|
}
|
|
});
|
|
|
|
function newChat(title: string): string {
|
|
const chat = chatStore.createChat(title);
|
|
createdChats.push(chat.id);
|
|
return chat.id;
|
|
}
|
|
|
|
const validQuiz = {
|
|
question: "What is 2 + 2?",
|
|
options: [
|
|
{ label: "3", value: "3" },
|
|
{ label: "4", value: "4" },
|
|
],
|
|
correctAnswer: "4",
|
|
explanation: "Arithmetic.",
|
|
};
|
|
|
|
import type { AgentTool } from "@earendil-works/pi-agent-core";
|
|
import { ToolInputError } from "../src/agent/tool-execute.ts";
|
|
|
|
/** The Wave A boundary predicate (2026-09-26): pi's loop structurally
|
|
* validates against the TypeBox parameters, then execute re-runs the
|
|
* authoring refinements (the old superRefine) and throws ToolInputError
|
|
* on problems — the model sees both as retryable input errors. This
|
|
* helper replicates the old safeParse seam end to end. */
|
|
async function boundaryParse(
|
|
// `input: never` param: contravariance lets any AgentTool's execute slot in.
|
|
tool: { parameters: any; execute: (id: string, input: never) => Promise<unknown> },
|
|
input: unknown,
|
|
): Promise<{ success: boolean; error?: ToolInputError }> {
|
|
if (!Value.Check(tool.parameters, input)) return { success: false };
|
|
try {
|
|
await tool.execute("tc", input as never);
|
|
return { success: true };
|
|
} catch (e) {
|
|
assert.ok(e instanceof ToolInputError, `expected ToolInputError, got: ${e}`);
|
|
return { success: false, error: e };
|
|
}
|
|
}
|
|
const problemLines = (e?: ToolInputError): string[] =>
|
|
(e?.message.split("\n") ?? []).filter((l) => l.startsWith("- "));
|
|
|
|
describe("teachQuizToolFor: the dynamic plan-nodeId validation (position signal)", () => {
|
|
it("accepts a nodeId that matches a node of the session's tree", async () => {
|
|
const chatId = newChat("NodeId: valid");
|
|
chatStore.saveTree(chatId, {
|
|
nodes: [
|
|
{ id: "arith", title: "Arithmetic" },
|
|
{ id: "expressions", title: "Expressions" },
|
|
],
|
|
edges: [{ from: "arith", to: "expressions" }],
|
|
version: 1,
|
|
});
|
|
const res = await boundaryParse(teachQuizToolFor({ chatId, chatStore }), {
|
|
...validQuiz,
|
|
nodeId: "expressions",
|
|
});
|
|
assert.equal(res.success, true);
|
|
});
|
|
|
|
it("rejects a nodeId that matches no node — with a message listing the slugs", async () => {
|
|
const chatId = newChat("NodeId: typo");
|
|
chatStore.saveTree(chatId, {
|
|
nodes: [{ id: "arith", title: "Arithmetic" }],
|
|
edges: [],
|
|
version: 1,
|
|
});
|
|
const res = await boundaryParse(teachQuizToolFor({ chatId, chatStore }), {
|
|
...validQuiz,
|
|
nodeId: "arithmetic", // the typo — slug is 'arith'
|
|
});
|
|
assert.equal(res.success, false);
|
|
const msg = problemLines(res.error).join("\n");
|
|
assert.match(msg, /matches no node/);
|
|
assert.match(msg, /arith/);
|
|
});
|
|
|
|
it("no tree yet: ANY nodeId is rejected — omit it for ad-hoc checks", async () => {
|
|
const chatId = newChat("NodeId: no tree");
|
|
const tool = teachQuizToolFor({ chatId, chatStore });
|
|
const res = await boundaryParse(tool, { ...validQuiz, nodeId: "anything" });
|
|
assert.equal(res.success, false);
|
|
assert.match(problemLines(res.error).at(-1)!, /No plan map exists yet/);
|
|
// …while an untagged ad-hoc check is fine
|
|
const plain = await boundaryParse(tool, validQuiz);
|
|
assert.equal(plain.success, true);
|
|
});
|
|
|
|
it("reads the LIVE record — a plan_init mutation mid-turn is honored immediately", async () => {
|
|
const chatId = newChat("NodeId: live record");
|
|
const tool = teachQuizToolFor({ chatId, chatStore });
|
|
|
|
const before = await boundaryParse(tool, { ...validQuiz, nodeId: "fresh-node" });
|
|
assert.equal(before.success, false, "no tree yet → rejected");
|
|
|
|
chatStore.saveTree(chatId, {
|
|
nodes: [{ id: "fresh-node", title: "Just initialized" }],
|
|
edges: [],
|
|
version: 1,
|
|
});
|
|
const after = await boundaryParse(tool, { ...validQuiz, nodeId: "fresh-node" });
|
|
assert.equal(after.success, true, "the same id validates once the tree exists — same turn");
|
|
});
|
|
|
|
it("the shared grading rules still chain FIRST (schema-valid ⇔ gradeable)", async () => {
|
|
const chatId = newChat("NodeId: grading rules intact");
|
|
const res = await boundaryParse(teachQuizToolFor({ chatId, chatStore }), {
|
|
...validQuiz,
|
|
correctAnswer: "42", // matches no option — question-core's rule
|
|
nodeId: "ghost", // also bad — BOTH problems surface
|
|
});
|
|
assert.equal(res.success, false);
|
|
const msgs = problemLines(res.error).join("\n");
|
|
assert.match(msgs, /correctAnswer/);
|
|
assert.match(msgs, /matches no node/);
|
|
});
|
|
});
|
|
|
|
describe("the prober's quiz: no nodeId field at all", () => {
|
|
it("the probe schema accepts a plain quiz; a smuggled nodeId is NOT in the wire schema", () => {
|
|
assert.ok(Value.Check(probeQuizInputSchema, validQuiz));
|
|
// Wave A delta (2026-09-26): pi's TypeBox validation tolerates unknown
|
|
// keys rather than stripping them — but the probe schema's wire
|
|
// properties carry no nodeId at all, and the display parse seam
|
|
// (tool-parts parseQuizInput, Value.Clean) strips it before the dock.
|
|
const smuggled = { ...validQuiz, nodeId: "anything" };
|
|
assert.ok(Value.Check(probeQuizInputSchema, smuggled));
|
|
const wireKeys = Object.keys((probeQuizInputSchema as { properties: Record<string, unknown> }).properties);
|
|
assert.ok(!wireKeys.includes("nodeId"), "no session check to fail — the field isn't the prober's to set");
|
|
assert.equal("nodeId" in (Value.Clean(probeQuizInputSchema, smuggled) as object), false, "the dock parse strips it");
|
|
});
|
|
|
|
it("the prober's tool registry carries the nodeId-less quiz, probe_done, and the learner-filesystem set", () => {
|
|
const chatId = newChat("Prober: registry");
|
|
const tools = createProberTools({ chatId, chatStore, deliver: () => {}, jobStore, spawn: () => {} });
|
|
// Fix wave (2026-09-20): the owner ruling adds research + pdf dispatch
|
|
// to the probe phase's registry (demo/visual stay teach-only).
|
|
assert.deepEqual(Object.keys(tools).sort(), [
|
|
"ask_user_question", "find", "grep", "ls", "pdf", "probe_done", "quiz", "read", "research",
|
|
]);
|
|
const quiz = tools.quiz as AgentTool<any>;
|
|
assert.equal(Value.Check(quiz.parameters, { ...validQuiz, nodeId: "anything" }), true, "no session check to fail");
|
|
});
|
|
});
|
|
// ─── tool availability (2026-09 settings seam) ───────────────────────────────
|
|
|
|
describe("tool toggles (core/pending.ts + factories)", () => {
|
|
it("TOGGLEABLE_TOOLS: the sub-agent dispatch tools; quiz/ask/read stay off the list", () => {
|
|
// THE DEFINITIVE vocabulary (adjudicated with the user 2026-09-19, P2
|
|
// reconciliation): the job tools only. quiz/ask_user_question are
|
|
// permanently always-on (the prober's assessment + teaching doctrine
|
|
// are built on graded questions — the wedge danger), as are the
|
|
// learner-fs set, plan tools, and probe_done. The settings WRITE side
|
|
// validates against this list (settings-body).
|
|
assert.deepEqual(TOGGLEABLE_TOOLS, ["research", "demo", "visual", "pdf"]);
|
|
});
|
|
|
|
it("createProberTools: absent record = full set; explicit false drops exactly that tool; probe_done survives everything", () => {
|
|
const chatId = newChat("Prober: toggles");
|
|
const ctx = { chatId, chatStore, deliver: () => {}, jobStore, spawn: () => {} };
|
|
assert.deepEqual(Object.keys(createProberTools(ctx)).sort(), [
|
|
"ask_user_question", "find", "grep", "ls", "pdf", "probe_done", "quiz", "read", "research",
|
|
]);
|
|
|
|
const noAsk = createProberTools(ctx, { ask_user_question: false });
|
|
assert.deepEqual(Object.keys(noAsk).sort(), ["find", "grep", "ls", "pdf", "probe_done", "quiz", "read", "research"]);
|
|
|
|
// quiz off is honored by the generic machinery too (future toggleable),
|
|
// but probe_done is never droppable — it is how the phase ends.
|
|
const noQuiz = createProberTools(ctx, { quiz: false });
|
|
assert.deepEqual(Object.keys(noQuiz).sort(), ["ask_user_question", "find", "grep", "ls", "pdf", "probe_done", "read", "research"]);
|
|
assert.ok(createProberTools(ctx, { probe_done: false }).probe_done, "probe_done always-on");
|
|
});
|
|
|
|
it("createTeacherTools: {research: false} removes exactly research; unknown keys are no-ops", () => {
|
|
const chatId = newChat("Teacher: toggles");
|
|
const ctx: TeacherToolContext = {
|
|
chatId,
|
|
chatStore,
|
|
jobStore,
|
|
spawn: () => {},
|
|
};
|
|
const full = Object.keys(createTeacherTools(ctx)).sort();
|
|
assert.deepEqual(full, ["ask_user_question", "demo", "find", "grep", "ls", "pdf", "plan_init", "quiz", "read", "research", "visual"]);
|
|
|
|
const noResearch = Object.keys(createTeacherTools(ctx, { research: false })).sort();
|
|
assert.deepEqual(noResearch, ["ask_user_question", "demo", "find", "grep", "ls", "pdf", "plan_init", "quiz", "read", "visual"]);
|
|
|
|
// absent = enabled: an empty record and undefined behave identically
|
|
assert.deepEqual(
|
|
Object.keys(createTeacherTools(ctx, {})).sort(),
|
|
full,
|
|
"absent keys mean enabled — old records behave exactly as today",
|
|
);
|
|
});
|
|
});
|