Wave 4 (agent-side observability + control), reconciled with the dock contract (master relay 2026-09): - abortJob in src/server/jobs.ts, exported through the server barrel for POST /api/activity/abort (master's thin route): fires the job's AbortController (real kill — the in-flight model call aborts, not just the next loop check), drops any queued result steer, flips the record to error "Aborted by learner" + activity "aborted" synchronously, and queues a one-line abort steer (buildAbortSteer) through the same wake pipeline so the teacher's promise doesn't hang in the lesson. Shares the result steer's deterministic id space, so abort + racing result can never both deliver (steerDelivered dedupe). - Abort registry (src/agent/subagents/aborts.ts) on globalThis, mirroring the wake pipeline's module-state pattern; runner registers/unregisters per run, so the route's module instance sees the loop's controller. - Runner usage capture: LoopContext (abortSignal + onUsage) threads into all three kind loops; per-step usage folds via accumulateJobUsage into JobRecord.usage (model from config MODELS, absent-never-zero), flushed in runJob's finally so an aborted job's money record survives the kill. - Contracts: JobUsage token fields optional + lastStep (most recent call's accounting, for the dock's per-blob context line vs CONTEXT_LIMITS); SubagentResultMeta.aborted; AbortSteerMessage; buildAbortSteer; SteerMessage union generalized. - demo-builder/visual-maker accept abortSignal + onUsage (visual folds generateText usage per iteration). - stillRunning/finishJob/jobContext guards: an aborted job is never overwritten by the runner (terminal no matter what the wake does); failJob and the pump's finalizeJob keep the flip. - UI: abort steer renders a quiet aborted chip (job-aborted-badge). - Prompt 20-jobs.md: one line about aborted jobs. Tests: accumulateJobUsage folds (undefined-preservation, lastStep), runner usage capture, real-kill abort (sync flip, silent unwind, abort steer wakes), usage-so-far survives the kill, aborting a delivering job drops the queued result steer, outcome reasons, abort-chip render. 330/330, typecheck/lint/build green.
336 lines
15 KiB
TypeScript
336 lines
15 KiB
TypeScript
/**
|
|
* Sub-agent job contracts — the async ack-and-steer protocol
|
|
*
|
|
* Part of the domain-split contracts (src/core/contracts/): each domain file
|
|
* is owned outright by its stream — cross-domain schema changes go through
|
|
* master. Pure types + protocol docs + tiny pure helpers; type-only imports
|
|
* of "ai" (safe everywhere: server, client, tests). See docs/vision.md.
|
|
*/
|
|
import type { UIMessage } from "ai";
|
|
import type { CallUsage } from "./chat.ts";
|
|
|
|
// ─── Async sub-agent jobs (vision §2.5; plan.md Wave 0 protocol) ────────────
|
|
|
|
export type JobKind = "research" | "demo" | "visual";
|
|
export type JobStatus = "running" | "done" | "error";
|
|
|
|
export interface JobRecord {
|
|
id: string;
|
|
kind: JobKind;
|
|
chatId: string;
|
|
/** The tool part this job fulfills. */
|
|
toolCallId: string;
|
|
status: JobStatus;
|
|
/** Latest human-readable activity line, e.g. `web_search: "sigma.js v3"`. */
|
|
activity: string;
|
|
createdAt: string;
|
|
updatedAt: string;
|
|
/** The sub-agent's result (steer-artifact payload). */
|
|
result?: unknown;
|
|
error?: string;
|
|
/** Money channel (observability, 2026-09): accumulated token usage of
|
|
* the sub-agent's run, written by the runner as steps complete. Cost is
|
|
* inferred at read time (core/prices.ts). Absent on pre-2026-09 jobs and
|
|
* until the runner's capture lands — renderers show "—", never zero. */
|
|
usage?: JobUsage;
|
|
}
|
|
|
|
/** A sub-agent run's accumulated usage — the same accounting shape as a
|
|
* chat turn (contracts/chat.ts CallUsage), flattened to one running total
|
|
* plus a step count. Token fields are optional exactly like CallUsage: a
|
|
* field NO model call reported stays undefined — absent is not zero (the
|
|
* money-channel doctrine; cost renders "—", never $0). */
|
|
export interface JobUsage {
|
|
/** The OpenRouter model id that ran the sub-agent. */
|
|
model: string;
|
|
/** Running totals summed over the run's model calls so far. */
|
|
inputTokens: number | undefined;
|
|
outputTokens: number | undefined;
|
|
cacheReadTokens: number | undefined;
|
|
cacheWriteTokens: number | undefined;
|
|
reasoningTokens: number | undefined;
|
|
/** How many model calls the run has made (each bills separately). */
|
|
steps: number;
|
|
/** The MOST RECENT model call's accounting (2026-09 dock contract): the
|
|
* per-blob context line reads last-step input+output against the model's
|
|
* CONTEXT_LIMITS — never the cumulative totals. Absent until the first
|
|
* call completes; absent provider fields stay absent (never zero). */
|
|
lastStep?: CallUsage;
|
|
}
|
|
|
|
/** The per-model-call usage shape we fold into JobUsage — the SDK's
|
|
* LanguageModelUsage narrowed structurally (no runtime "ai" import: any
|
|
* object with these fields folds, including the real thing and test fakes). */
|
|
export interface UsageStepLike {
|
|
inputTokens?: number | undefined;
|
|
inputTokenDetails?: { cacheReadTokens?: number; cacheWriteTokens?: number } | undefined;
|
|
outputTokens?: number | undefined;
|
|
outputTokenDetails?: { reasoningTokens?: number } | undefined;
|
|
}
|
|
|
|
/** Fold one model call's usage into the run's running total (pure). A
|
|
* field neither the total nor the step reported stays undefined; once
|
|
* reported, later unreported calls contribute 0. The `steps` counter is
|
|
* the billing count: one per model call, reported or not. */
|
|
export function accumulateJobUsage(
|
|
total: JobUsage | undefined,
|
|
model: string,
|
|
step: UsageStepLike,
|
|
): JobUsage {
|
|
const add = (a: number | undefined, b: number | undefined): number | undefined =>
|
|
a === undefined && b === undefined ? undefined : (a ?? 0) + (b ?? 0);
|
|
return {
|
|
model,
|
|
inputTokens: add(total?.inputTokens, step.inputTokens),
|
|
outputTokens: add(total?.outputTokens, step.outputTokens),
|
|
cacheReadTokens: add(total?.cacheReadTokens, step.inputTokenDetails?.cacheReadTokens),
|
|
cacheWriteTokens: add(total?.cacheWriteTokens, step.inputTokenDetails?.cacheWriteTokens),
|
|
reasoningTokens: add(total?.reasoningTokens, step.outputTokenDetails?.reasoningTokens),
|
|
steps: (total?.steps ?? 0) + 1,
|
|
lastStep: {
|
|
inputTokens: step.inputTokens,
|
|
outputTokens: step.outputTokens,
|
|
cacheReadTokens: step.inputTokenDetails?.cacheReadTokens,
|
|
cacheWriteTokens: step.inputTokenDetails?.cacheWriteTokens,
|
|
reasoningTokens: step.outputTokenDetails?.reasoningTokens,
|
|
},
|
|
};
|
|
}
|
|
|
|
/**
|
|
* THE ASYNC PROTOCOL — "ack now, steer later" (the pi sub-agents model,
|
|
* vision §2.5):
|
|
*
|
|
* 1. Job tools (research / demo / visual) are SERVER-EXECUTED. The model
|
|
* calls one MID-TURN; execute creates the job record, fires the
|
|
* background runner, and resolves IMMEDIATELY with an acknowledgement
|
|
* ("dispatched — continue your turn"). The teacher's turn does NOT end
|
|
* at the call: it keeps teaching, may dispatch other independent jobs
|
|
* (full parallelism), and ends whenever it ends. The tool part's output
|
|
* is the ack, forever.
|
|
*
|
|
* 2. The background runner (src/agent/subagents/runner.ts) runs the kind's
|
|
* sub-agent loop — isolated context, modelFor(role), the
|
|
* verify-never-one-shot doctrine (headless-tested demos, looked-at SVGs,
|
|
* sourced briefs) — tracking a live activity line in the job record.
|
|
* ONE central client poll of GET /api/jobs?chatId=… (in Chat) drives every
|
|
* job surface: the transcript dispatch cards (live activity by
|
|
* toolCallId, quiet one-liner after delivery), the sub-agents sidebar
|
|
* panel, and the single re-sync when a job settles.
|
|
*
|
|
* 3. On completion the runner builds a STEER MESSAGE (buildSubagentSteer)
|
|
* and hands it to the wake pipeline (src/server/jobs.ts): a user-role
|
|
* UIMessage carrying the result — a text part with what the MODEL needs
|
|
* (the research brief, the builder's notes), plus a data-subagent-artifact
|
|
* part with what the UI renders (the full result: brief + sources /
|
|
* SVG / demo HTML). Provider conversion drops data parts, so artifact
|
|
* payloads never enter the teacher's context. metadata.subagentResult
|
|
* identifies the job; the UI renders these as sub-agent result cards,
|
|
* NEVER as learner interjections.
|
|
*
|
|
* 4. The wake pipeline delivers the steer by firing a SERVER-SIDE teacher
|
|
* turn through the same turn composition as a client request
|
|
* (handleChatRequest) — write-ahead persist, turn liveness, extraction
|
|
* trigger: one code path. A per-chat serialized queue: a steer waits
|
|
* while a turn is in flight OR a question tool part is pending (an
|
|
* unanswered client-side tool call breaks provider conversion — the
|
|
* steer fires right after the learner's continuation), then fires; a 409
|
|
* (a client turn raced in) retries. Delivery is idempotent per jobId, so
|
|
* a crashed wake can be re-entered by the stale-job recovery sweep. The
|
|
* job's status flips to done/error only AFTER the wake turn completes —
|
|
* a polling client that sees the flip re-syncs once and gets the
|
|
* finished record.
|
|
*
|
|
* CONTINUATION COALESCING: the idle window above can starve — a
|
|
* quiz-chaining teacher ends every turn with a new pending check, so
|
|
* the gates never stay open long enough for a wake to fire. The fix:
|
|
* when a client turn wins the turn registry, the handler CLAIMS every
|
|
* queued, undelivered steer (jobs.ts claimSteers) and appends it after
|
|
* the learner's answer in that very turn — conversion-safe, because the
|
|
* answered quiz carries its output. Every answer flushes pending
|
|
* steers immediately; the wake pump remains for turns that end with no
|
|
* pending question. The pump re-checks steerDelivered right before
|
|
* firing, so a claim racing the pump converges to exactly one delivery.
|
|
*
|
|
* 5. No pending job parts ever exist, so the composer never gates on jobs
|
|
* (the learner can interject mid-job; the steer queues behind their
|
|
* turn) and job tool outputs never trigger the client-side
|
|
* sendAutomatically continuation — that mechanism stays quiz/ask-only.
|
|
*/
|
|
|
|
export interface ResearchToolInput {
|
|
question: string;
|
|
/** What the teacher needs it for — focuses the research brief. */
|
|
context?: string;
|
|
}
|
|
|
|
export interface ResearchResult {
|
|
brief: string;
|
|
sources: { title: string; url: string }[];
|
|
}
|
|
|
|
export interface DemoToolInput {
|
|
title: string;
|
|
/** Precise brief: concept, parameters/interactions, visual style. */
|
|
brief: string;
|
|
}
|
|
|
|
export interface DemoResult {
|
|
title: string;
|
|
/** Self-contained single-file HTML/JS document (sandboxed-iframe ready). */
|
|
html: string;
|
|
/** The builder sub-agent headlessly executed the demo before delivery. */
|
|
tested: true;
|
|
notes?: string;
|
|
}
|
|
|
|
export interface VisualToolInput {
|
|
/** Precise brief for ONE visual (what it must show, exactly). */
|
|
brief: string;
|
|
}
|
|
|
|
export interface VisualResult {
|
|
/** Complete SVG markup (verified by the maker looking at the render). */
|
|
svg: string;
|
|
notes?: string;
|
|
}
|
|
|
|
// ─── Sub-agent steer messages (THE ASYNC PROTOCOL §3–4) ─────────────────────
|
|
|
|
/** Message metadata marking a sub-agent steer (contracts.ts §3). */
|
|
export interface SubagentResultMeta {
|
|
jobId: string;
|
|
kind: JobKind;
|
|
toolCallId: string;
|
|
/** Present only on an abort steer (2026-09 abort semantics): the
|
|
* learner aborted the job (it lands as error "Aborted by learner");
|
|
* the teacher is told so its promise of a result doesn't hang
|
|
* silently in the lesson. */
|
|
aborted?: true;
|
|
}
|
|
|
|
/** The data-subagent-artifact part payload: what the UI renders. */
|
|
export interface SubagentArtifactData {
|
|
kind: JobKind;
|
|
result: ResearchResult | DemoResult | VisualResult;
|
|
}
|
|
|
|
/**
|
|
* The steer message: user-role on the wire (UIMessage roles are fixed), but
|
|
* NEVER a learner interjection — metadata.subagentResult is the marker the
|
|
* UI branches on, and the artifact rides the data part (stripped by provider
|
|
* conversion, so the model sees only the text part).
|
|
*/
|
|
export interface SubagentSteerMessage extends UIMessage {
|
|
role: "user";
|
|
metadata: { subagentResult: SubagentResultMeta };
|
|
parts: [
|
|
{ type: "text"; text: string },
|
|
{ type: "data-subagent-artifact"; data: SubagentArtifactData },
|
|
];
|
|
}
|
|
|
|
/** The abort steer: user-role like any steer, but NO artifact part —
|
|
* there is no result to render, only the teacher-facing text. Shares the
|
|
* result steer's deterministic id space (`steer_${jobId}`): steerDelivered
|
|
* matches on metadata jobId, so an abort and a (racing) result steer
|
|
* can never BOTH deliver — exactly one wakes the teacher. */
|
|
export interface AbortSteerMessage extends UIMessage {
|
|
role: "user";
|
|
metadata: { subagentResult: SubagentResultMeta & { aborted: true } };
|
|
parts: [{ type: "text"; text: string }];
|
|
}
|
|
|
|
/** Anything the wake pipeline may queue and deliver. */
|
|
export type SteerMessage = SubagentSteerMessage | AbortSteerMessage;
|
|
|
|
/** Whether a result is the failure shape (html/svg empty, failure brief). */
|
|
export function isSubagentFailure(kind: JobKind, result: ResearchResult | DemoResult | VisualResult): boolean {
|
|
if (kind === "research") {
|
|
const r = result as ResearchResult;
|
|
return r.sources.length === 0 && /^Research failed:/i.test(r.brief);
|
|
}
|
|
if (kind === "demo") {
|
|
const r = result as DemoResult;
|
|
return typeof r.html !== "string" || r.html.length === 0;
|
|
}
|
|
const r = result as VisualResult;
|
|
return typeof r.svg !== "string" || r.svg.length === 0;
|
|
}
|
|
|
|
/** The model-facing text of a steer: what the result IS, what to do with it. */
|
|
function steerText(kind: JobKind, result: ResearchResult | DemoResult | VisualResult): string {
|
|
if (isSubagentFailure(kind, result)) {
|
|
if (kind === "research")
|
|
return `${(result as ResearchResult).brief}\n\nContinue with what you can establish and flag the uncertainty to the learner.`;
|
|
if (kind === "demo")
|
|
return `The demo "${(result as DemoResult).title}" could not be built: ${
|
|
(result as DemoResult).notes ?? "unknown reason"
|
|
}. Fall back to explaining in prose; if the brief was the problem, re-call demo with a tighter one.`;
|
|
return `The figure could not be made: ${(result as VisualResult).notes ?? "unknown reason"}. Fall back to prose or mermaid, or re-call visual with a tighter brief.`;
|
|
}
|
|
if (kind === "research")
|
|
return `Research complete — the researcher's full brief follows. Weave it into the lesson and cite its sources when you use its findings:\n\n${(result as ResearchResult).brief}`;
|
|
if (kind === "demo")
|
|
return `The demo "${(result as DemoResult).title}" is built, headlessly tested, and rendered in the lesson. Builder notes: ${
|
|
(result as DemoResult).notes ?? "(none)"
|
|
}.\nTeach with it — reference its controls by name and point the learner at what to try.`;
|
|
return `The figure is drawn, verified by inspection, and rendered in the lesson. Maker notes: ${
|
|
(result as VisualResult).notes ?? "(none)"
|
|
}.\nReference its elements as you teach.`;
|
|
}
|
|
|
|
/**
|
|
* Build the steer message for a finished job (pure — shared by the runner,
|
|
* the wake pipeline, and tests). Deterministic id per job makes re-delivery
|
|
* idempotent.
|
|
*/
|
|
export function buildSubagentSteer(
|
|
job: Pick<JobRecord, "id" | "kind" | "toolCallId">,
|
|
result: ResearchResult | DemoResult | VisualResult,
|
|
): SubagentSteerMessage {
|
|
return {
|
|
id: `steer_${job.id}`,
|
|
role: "user",
|
|
metadata: { subagentResult: { jobId: job.id, kind: job.kind, toolCallId: job.toolCallId } },
|
|
parts: [
|
|
{ type: "text", text: steerText(job.kind, result) },
|
|
{ type: "data-subagent-artifact", data: { kind: job.kind, result } },
|
|
],
|
|
};
|
|
}
|
|
|
|
/** Build the abort steer for an aborted job (pure — shared by the
|
|
* abort path in src/server/jobs.ts and tests). Same id space as the result
|
|
* steer; see AbortSteerMessage. */
|
|
export function buildAbortSteer(
|
|
job: Pick<JobRecord, "id" | "kind" | "toolCallId">,
|
|
): AbortSteerMessage {
|
|
return {
|
|
id: `steer_${job.id}`,
|
|
role: "user",
|
|
metadata: {
|
|
subagentResult: { jobId: job.id, kind: job.kind, toolCallId: job.toolCallId, aborted: true },
|
|
},
|
|
parts: [{ type: "text", text: abortText(job.kind) }],
|
|
};
|
|
}
|
|
|
|
/** What the teacher reads: one line telling it the result is not coming,
|
|
* how to acknowledge, and that re-dispatching is allowed. */
|
|
function abortText(kind: JobKind): string {
|
|
if (kind === "research")
|
|
return "Research aborted — the learner aborted the research job, so no brief is coming. Acknowledge it in one line and continue teaching without it (or offer to re-dispatch it).";
|
|
if (kind === "demo")
|
|
return "The demo job was aborted by the learner — no demo is coming. Acknowledge it in one line and teach the topic in prose instead (a re-dispatch is fine if the learner wants it).";
|
|
return "The figure job was aborted by the learner — no figure is coming. Acknowledge it in one line and teach without it (a re-dispatch is fine if the learner wants it).";
|
|
}
|
|
|
|
/** True when the transcript already carries this job's steer (idempotent delivery). */
|
|
export function steerDelivered(messages: UIMessage[], jobId: string): boolean {
|
|
return messages.some(
|
|
(m) => (m.metadata as { subagentResult?: { jobId?: string } } | undefined)?.subagentResult?.jobId === jobId,
|
|
);
|
|
}
|
|
|