The Vercel AI SDK survives only as Band D (useChat client + UIMessage
record types); @openrouter/ai-sdk-provider is uninstalled.
- src/agent/models.ts: PiEngine {model, streamFn} via createModels +
openrouterProvider subpath; thinkingLevelFor maps config effort none->off
- src/agent/lh-tool.ts: neutral LhTool (zod authoring, optional execute,
clientQuestion flag); toPiTool converts via z.toJSONSchema and re-runs
zod inside execute so refinements ride the error-result retry path
- src/server/pi/record-adapter.ts: UIMessage records -> pi Messages
(dangling tool calls get synthesized interrupted results)
- src/server/pi/ui-stream.ts: SSE bridge emitting AI-SDK-shaped chunks so
the useChat client parses unchanged (continuation id rule, question
tools never emit output, tool-input-error for bad authoring)
- teacher-agent.ts: stateless per-turn pi Agents; shouldStopAfterTurn
stops only when every question-tool call resolved cleanly (errors retry)
- chat-handler.ts: buildAgent(outgoing) factory seam (stateless doctrine);
assertValidUiMessages owns the retired SDK validation gate
- sub-agents via shared runSubagent (pi-run.ts); extraction stages stop
after a clean submit; visual-maker keeps its hand-rolled loop over
direct streamSimple calls; aborted model calls bill no usage
- tests: all model seams ported to pi-ai faux provider (scripted
FauxResponseSteps, agent factories); handleChatRequest second param
is now an agent factory
Gates: tsc, lint, build, 305/305. Live GLM smoke (disposable driver,
deleted): prober streaming + persistence, question seam, turn-2
continuation same message id, per-turn real token usage - ALL PASS.
Data wiped at the pivot (chats/graph/jobs, .gitkeeps kept).
201 lines
7.8 KiB
TypeScript
201 lines
7.8 KiB
TypeScript
import * as fs from "node:fs";
|
|
import * as path from "node:path";
|
|
import { Agent } from "@earendil-works/pi-agent-core";
|
|
import type { AgentEvent, AgentMessage, AgentTool } from "@earendil-works/pi-agent-core";
|
|
import type { Usage } from "@earendil-works/pi-ai";
|
|
import { PATHS } from "../../config.ts";
|
|
import { MODELS } from "../../config.ts";
|
|
import { piEngineFor, thinkingLevelFor, openRouterApiKey, type PiEngine } from "./models.ts";
|
|
import {
|
|
askUserQuestionTool,
|
|
createProberTools,
|
|
createTeacherTools,
|
|
type ProbeDoneContext,
|
|
type TeacherToolContext,
|
|
} from "./tools.ts";
|
|
import { toPiTools, type LhTool } from "./lh-tool.ts";
|
|
import { quizInputObject, quizInputProblems } from "../core/question-core.ts";
|
|
import { QUESTION_TOOLS } from "../core/pending.ts";
|
|
|
|
/**
|
|
* The two teaching-side agents (docs/probe-teach-split.md): the PROBER and
|
|
* the TEACHER. Same transcript, different prompts and tool sets; the
|
|
* chat-handler constructs ONE per request off the transcript's seam
|
|
* (probe_done = teacher) — the STATELESS per-turn engine (docs/
|
|
* pi-engine-swap.md §2): the persisted record is the source of truth, the
|
|
* agent is rebuilt from it every POST and discarded at turn end.
|
|
*
|
|
* Engines are injectable so tests can pass a scripted faux engine and drive
|
|
* deterministic lessons (see tests/chat-flow.test.ts).
|
|
*
|
|
* System prompts are COMPOSED per agent: system-prompt.md (the shared base:
|
|
* philosophy, accuracy, quiz construction, question tools, formatting) +
|
|
* every numeric-prefix fragment in that agent's directory
|
|
* (src/agent/prompts/prober/ or src/agent/prompts/teacher/), in sorted
|
|
* filename order, joined with `---` separators.
|
|
*
|
|
* ONLY numeric-prefix files load — the loader enforces the convention, so
|
|
* non-fragment documentation (README.md, …) can live in the directories
|
|
* without ever leaking into the model's prompt.
|
|
*/
|
|
|
|
/** Which agent's prompt directory to compose. */
|
|
export type AgentKind = "prober" | "teacher";
|
|
|
|
const PROMPTS_DIR = path.join(PATHS.root, "src", "agent", "prompts");
|
|
|
|
/** A prompt fragment: numeric order key + .md (e.g. 20-teaching.md). Nothing else loads. */
|
|
const FRAGMENT_RE = /^\d+-[\w.-]+\.md$/;
|
|
|
|
/** Exported for tests: assert what composes into the model's prompt. */
|
|
export function composeInstructions(kind: AgentKind): string {
|
|
const base = fs.readFileSync(PATHS.teacherPrompt, "utf-8");
|
|
const dir = path.join(PROMPTS_DIR, kind);
|
|
if (!fs.existsSync(dir)) return base;
|
|
const fragments = fs
|
|
.readdirSync(dir)
|
|
.filter((f) => FRAGMENT_RE.test(f))
|
|
.sort()
|
|
.map((f) => fs.readFileSync(path.join(dir, f), "utf-8").trim())
|
|
.filter(Boolean);
|
|
return [base.trim(), ...fragments].join("\n\n---\n\n");
|
|
}
|
|
|
|
const composedInstructions: Record<AgentKind, string> = {
|
|
prober: composeInstructions("prober"),
|
|
teacher: composeInstructions("teacher"),
|
|
};
|
|
|
|
// Money channel (wave 4): the chat-handler passes a per-turn collector;
|
|
// every model call's usage lands in the chat record's turns log
|
|
// (ChatStore.appendTurnUsage). The narrow param keeps the seam honest.
|
|
export type StepUsageCollector = (usage: Usage) => void;
|
|
|
|
/** Per-request construction options (the handler wires all of these). */
|
|
export interface AgentBuildOptions {
|
|
/** Model + stream function — tests inject a scripted faux engine. */
|
|
engine?: PiEngine;
|
|
/** The initial transcript, as pi messages (recordToPiMessages). */
|
|
messages?: AgentMessage[];
|
|
/** Money channel: one call per model request. */
|
|
onUsage?: StepUsageCollector;
|
|
/** Safety net (the old stepCountIs). Default 20 turns. */
|
|
maxTurns?: number;
|
|
/** Tests may pass a bare tool registry to drive deterministic flows. */
|
|
tools?: Record<string, LhTool<any, any>>;
|
|
}
|
|
|
|
/**
|
|
* The turn's stop rule (docs/pi-engine-swap.md §2):
|
|
* - a question tool call (quiz / ask_user_question) that RESOLVED — its
|
|
* synthetic "question posed" result is not an error — ends the run: the
|
|
* learner's answer arrives as the next POST. A call that FAILED authoring
|
|
* validation (error result) must NOT stop the run — the model retries
|
|
* within the same turn, exactly the InvalidToolInputError semantics.
|
|
* - the maxTurns safety net replaces stepCountIs(20).
|
|
*/
|
|
function makeStopper(maxTurns: number) {
|
|
let turns = 0;
|
|
return (context: {
|
|
message: { content: Array<{ type: string; id?: string; name?: string }> };
|
|
toolResults: Array<{ toolCallId: string; isError?: boolean }>;
|
|
}): boolean => {
|
|
turns++;
|
|
if (turns >= maxTurns) return true;
|
|
const called = new Set(
|
|
context.message.content
|
|
.filter((c) => c.type === "toolCall" && c.name !== undefined && (QUESTION_TOOLS as readonly string[]).includes(c.name!))
|
|
.map((c) => c.id!),
|
|
);
|
|
if (called.size === 0) return false;
|
|
// Stop only when every question call of this turn resolved cleanly.
|
|
for (const result of context.toolResults) {
|
|
if (called.has(result.toolCallId) && result.isError) return false;
|
|
}
|
|
return true;
|
|
};
|
|
}
|
|
|
|
function baseAgentOptions(kind: AgentKind, opts: AgentBuildOptions, tools: AgentTool<any, any>[]) {
|
|
const engine = opts.engine ?? piEngineFor(kind);
|
|
const stopper = makeStopper(opts.maxTurns ?? 20);
|
|
const agent = new Agent({
|
|
initialState: {
|
|
systemPrompt: composedInstructions[kind],
|
|
model: engine.model,
|
|
thinkingLevel: thinkingLevelFor(kind),
|
|
tools,
|
|
messages: opts.messages ?? [],
|
|
},
|
|
streamFn: engine.streamFn,
|
|
getApiKey: () => openRouterApiKey(),
|
|
shouldStopAfterTurn: stopper,
|
|
});
|
|
if (opts.onUsage) {
|
|
agent.subscribe((event: AgentEvent) => {
|
|
if (event.type === "message_end" && event.message.role === "assistant" && "usage" in event.message) {
|
|
// A cancelled call is not a billed step (partial/estimated
|
|
// usage on an aborted message is not money spent).
|
|
if (event.message.stopReason === "aborted") return;
|
|
opts.onUsage!(event.message.usage);
|
|
}
|
|
});
|
|
}
|
|
return agent;
|
|
}
|
|
|
|
/**
|
|
* The PROBER (agent A): quiz (no nodeId) + ask + probe_done, lean on
|
|
* probing doctrine. Its whole job is bracketing the learner's edge and
|
|
* concluding with the assessment (probe_done) — which also queues the
|
|
* handoff wake (see tools/probe.ts) and is the transcript seam the
|
|
* handler keys teacher construction on.
|
|
*/
|
|
export function createProberAgent(ctx: ProbeDoneContext, opts: AgentBuildOptions = {}) {
|
|
return baseAgentOptions("prober", opts, toPiTools(createProberTools(ctx)));
|
|
}
|
|
|
|
/**
|
|
* The TEACHER (agent B): enters at planning (the probe is already
|
|
* concluded — its assessment is in the transcript), owns plan_init and the
|
|
* full toolset (teach questions with validated nodeId, the map, research,
|
|
* demos).
|
|
*/
|
|
export function createTeacherAgent(
|
|
// Optional so tests can construct a bare mock-driven agent (no storage
|
|
// wiring): without ctx the tools fall back to the validation-free
|
|
// question set. The handler ALWAYS passes ctx (the composition root).
|
|
ctx?: TeacherToolContext,
|
|
opts: AgentBuildOptions = {},
|
|
) {
|
|
const tools = opts.tools ?? (ctx ? createTeacherTools(ctx) : bareQuestionTools());
|
|
return baseAgentOptions("teacher", opts, toPiTools(tools));
|
|
}
|
|
|
|
/** The validation-free teach question set (tests, bare agents): quiz with
|
|
* the shared authoring refinement but NO per-session nodeId check (no
|
|
* record to read), plus ask. */
|
|
export function bareQuestionTools(): Record<string, LhTool<any, any>> {
|
|
return {
|
|
quiz: {
|
|
name: "quiz",
|
|
description: "Ask the learner a graded question.",
|
|
clientQuestion: true,
|
|
schema: quizInputObject.superRefine((input, add) => {
|
|
for (const problem of quizInputProblems(input)) {
|
|
add.addIssue({ code: "custom", message: problem });
|
|
}
|
|
}),
|
|
},
|
|
ask_user_question: askUserQuestionTool,
|
|
};
|
|
}
|
|
|
|
export type ProberAgent = ReturnType<typeof createProberAgent>;
|
|
export type TeacherAgent = ReturnType<typeof createTeacherAgent>;
|
|
export type TeachingAgent = ProberAgent | TeacherAgent;
|
|
|
|
/** The model id a role's engine resolves to (observability). */
|
|
export function modelIdFor(kind: AgentKind): string {
|
|
return MODELS[kind].model;
|
|
} |