@sema-agent/core 3.0.0 → 5.0.0

package/dist/agents/subagent.js

@@ -5,12 +5,12 @@ import { OUTPUT_TOOL_NAME, REPORT_BLOCKED_TOOL_NAME } from "../core/runner/synth
 import { TOOL_SEARCH_NAME } from "../core/runner/tool-disclosure.js";
 import { OFFLOAD_TOOL_NAME } from "../core/tool-result-store.js";
 import { resolveToolSubset, toolNameAllowed } from "./tool-filter.js";
-import { canonicalToolName } from "../core/tool-name-aliases.js";
 import { builtinAgentDefinitions } from "./builtin-agents.js";
 import { SUBAGENT_PROMPT } from "../prompts/default.js";
 import { hasSessionFork } from "../core/session.js";
 import { isDurablePause } from "./suspend-guard.js";
 import { delimitUntrusted, inlineUntrusted } from "../core/untrusted-text.js";
+import { createSafeNotifier } from "../core/safe-notify.js";
 import { boundedRedactedSummary } from "../core/untrusted-egress.js";
 import { uuidv7 } from "../internal/harness.js";
 import { addWorktree } from "../core/git-worktree-env.js";
@@ -18,6 +18,17 @@ import { shellQuote } from "../tools/fs/search.js";
 import { BG_AGENT_REAP_STOP_ERROR } from "../core/task-registry.js";
 import { extractErrorCode } from "../brain/errors.js";
 import { FORK_DEFAULT_MAX_TURNS, SESSION_BG_DEFAULT_TIMEOUT_SEC, RETAIN_DEFAULT_TTL_MS, RETAIN_DEFAULT_MAX, RUNNING_AGENT_OBSERVE_EVERY_BEATS } from "../config/defaults.js";
+function rollupDelegatedCost(stats, nested) {
+    if (stats.costMicroUsd === undefined)
+        return undefined;
+    if (nested !== undefined && nested.costMicroUsd === undefined)
+        return undefined;
+    return stats.costMicroUsd + (nested?.costMicroUsd ?? 0);
+}
+function delegatedCostField(stats) {
+    const total = rollupDelegatedCost(stats, stats.nested);
+    return total !== undefined ? { costMicroUsd: total } : {};
+}
 export { FORK_DEFAULT_MAX_TURNS, SESSION_BG_DEFAULT_TIMEOUT_SEC, RETAIN_DEFAULT_TTL_MS, RETAIN_DEFAULT_MAX };
 import { SUBAGENT_RESUME_CAP, SubagentRetainLedger, getOrCreateSessionRetainLedger, ensureSessionReapHook, createResumePrompt, } from "./retain-ledger.js";
 import { recordRosterSpawn } from "./roster-store.js";
@@ -63,7 +74,6 @@ export function inheritedManifestScopeFor(snapshot) {
     return frames;
 }
 export const DEFAULT_SUBAGENT_TOOL_NAME = "Agent";
-export const LEGACY_SUBAGENT_TOOL_NAME = "Task";
 export const EXTRA_TOOLS_MAX_FACTORY_CALLS_PER_TREE = 64;
 export const DEFAULT_SUBAGENT_MAX_DEPTH = 3;
 export const EXTRA_TOOLS_FAILED_NOTE = "note: extraTools evaluation failed — the injected tool set was skipped for this spawn.";
@@ -73,7 +83,7 @@ function countArgLines(v) {
 }
 function createToolStatsCounter(delegationToolName) {
     const t = { readCount: 0, searchCount: 0, bashCount: 0, editFileCount: 0, linesAdded: 0, linesRemoved: 0, otherToolCount: 0 };
-    const excluded = new Set([delegationToolName, DEFAULT_SUBAGENT_TOOL_NAME, LEGACY_SUBAGENT_TOOL_NAME]);
+    const excluded = new Set([delegationToolName, DEFAULT_SUBAGENT_TOOL_NAME]);
     const recordEditLines = (args) => {
         if (args === null || typeof args !== "object")
             return;
@@ -198,7 +208,7 @@ const ccElapsedTag = (ms) => {
 };
 const ccCompletionText = (desc, settled, rawStatus, elapsedMs) => `Agent "${desc}" ${settled === "killed" ? "stopped" : settled === "completed" ? "finished" : rawStatus}${ccElapsedTag(elapsedMs)}`;
 const BG_AGENT_COLLATERAL_REAP_REASON = "its parent run ended";
-const RESERVED_AGENT_NAMES = new Set([OUTPUT_TOOL_NAME, TOOL_SEARCH_NAME, OFFLOAD_TOOL_NAME, REPORT_BLOCKED_TOOL_NAME, DEFAULT_SUBAGENT_TOOL_NAME, LEGACY_SUBAGENT_TOOL_NAME]);
+const RESERVED_AGENT_NAMES = new Set([OUTPUT_TOOL_NAME, TOOL_SEARCH_NAME, OFFLOAD_TOOL_NAME, REPORT_BLOCKED_TOOL_NAME, DEFAULT_SUBAGENT_TOOL_NAME]);
 export const REPORT_FIELD_MAX = 300;
 function configError(message, code) {
     const e = new Error(message);
@@ -264,6 +274,7 @@ function createSteerHandle(stream, parentToolCallId, agentName, settled, retain)
     };
 }
 export function createSubagentResume(deps) {
+    const notifier = createSafeNotifier(deps.onNotifyError !== undefined ? { onError: deps.onNotifyError } : undefined);
     const resume = async (content) => {
         const ledger = deps.ledger;
         if (!ledger) {
@@ -360,8 +371,8 @@ export function createSubagentResume(deps) {
                         ...(deps.parentToolCallId !== undefined ? { parentToolCallId: deps.parentToolCallId } : {}),
                         ...(deps.rowParentTaskId !== undefined ? { parentTaskId: deps.rowParentTaskId } : {}),
                         ...(deps.rowParentSessionId !== undefined ? { parentSessionId: deps.rowParentSessionId } : {}),
-                        ...(deps.rowRootSessionId !== undefined ? { rootSessionId: deps.rowRootSessionId } : {}),
-                        startedAt: Date.now(),
+                        ...((deps.rowRootSessionId ?? deps.rowParentSessionId) !== undefined ? { rootSessionId: deps.rowRootSessionId ?? deps.rowParentSessionId } : {}),
+                        startedAt: deps.rowSpawnedAt ?? Date.now(),
                     });
                 }
             }
@@ -403,6 +414,7 @@ export function createSubagentResume(deps) {
                                     taskId: deps.taskId,
                                     sessionScoped: deps.sessionScoped === true,
                                     ...(deps.rowAgentType !== undefined ? { agentType: deps.rowAgentType } : {}),
+                                    sessionId: entry.childSessionId,
                                     transcriptId: entry.childSessionId,
                                     ...(deps.parentToolCallId !== undefined ? { parentToolCallId: deps.parentToolCallId } : {}),
                                     progressTaskId: e.taskId,
@@ -442,11 +454,7 @@ export function createSubagentResume(deps) {
             settleResolve = r;
         });
         if (deps.sink) {
-            try {
-                deps.sink(createSteerHandle(stream, deps.parentToolCallId, entry.agentName, settled, { resume, childSessionId: entry.childSessionId }));
-            }
-            catch {
-            }
+            notifier.notify(() => deps.sink?.(createSteerHandle(stream, deps.parentToolCallId, entry.agentName, settled, { resume, childSessionId: entry.childSessionId })), "subagent.resume.sink");
         }
         void (async () => {
             try {
@@ -493,8 +501,9 @@ export function createSubagentResume(deps) {
                         seq: entry.cycleSeq,
                         ...(stoppedByRevive !== undefined ? { stoppedBy: stoppedByRevive } : {}),
                         summary: reviveTerminalSummary,
+                        ...resumeResidual(),
                         resumable: status !== "killed",
-                        usage: { tokens: child.stats.tokens, turns: child.stats.turns, costMicroUsd: child.stats.costMicroUsd },
+                        usage: { tokens: child.stats.tokens, turns: child.stats.turns, ...delegatedCostField(child.stats) },
                         ...(completionIdRevive !== undefined ? { completionId: completionIdRevive } : {}),
                     });
                 const resumeFrame = {
@@ -512,7 +521,7 @@ export function createSubagentResume(deps) {
                     ...(status === "killed" && child.result ? { partial: true } : {}),
                     ...resumeResidual(),
                     resumable: status !== "killed",
-                    usage: { tokens: child.stats.tokens, turns: child.stats.turns, costMicroUsd: child.stats.costMicroUsd },
+                    usage: { tokens: child.stats.tokens, turns: child.stats.turns, ...delegatedCostField(child.stats) },
                     ...(completionIdRevive !== undefined ? { completionId: completionIdRevive } : {}),
                 };
                 const gateOwner = ownsTerminalFacesRevive && status === "completed" && deps.notify !== undefined && deps.registry !== undefined && ledger.get(deps.parentToolCallId) === entry
@@ -632,18 +641,6 @@ function parkCompletionNotify(deps) {
     };
     entry.deferredNotify = { ...(payload.seq !== undefined ? { seq: payload.seq } : {}), cancel, flush: () => deliver(false) };
 }
-function adaptLegacyForkArgs(args) {
-    const raw = args;
-    if (raw !== null && typeof raw === "object" && raw.prompt === undefined && typeof raw.directive === "string") {
-        return {
-            ...args,
-            prompt: raw.directive,
-            subagent_type: FORK_SUBAGENT_TYPE,
-            description: typeof raw.description === "string" ? raw.description : "forked agent (legacy Fork call)",
-        };
-    }
-    return args;
-}
 export function normalizeSubagentType(value) {
     return value.normalize("NFKC").toLowerCase().replace(/[\p{White_Space}\p{Pd}_]+/gu, "");
 }
@@ -777,6 +774,7 @@ export function agentWhenToUseText(def, lean = true) {
 function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
     const maxDepth = opts.maxDepth ?? DEFAULT_SUBAGENT_MAX_DEPTH;
     const toolName = opts.name ?? DEFAULT_SUBAGENT_TOOL_NAME;
+    const notifier = createSafeNotifier(opts.onObserverError !== undefined ? { onError: (f) => opts.onObserverError?.(f.error, { site: f.site }) } : undefined);
     const deploymentNames = new Set((opts.agents ?? []).map((a) => a.name));
     const builtins = opts.builtinAgents === false ? [] : builtinAgentDefinitions(toolName).filter((d) => !deploymentNames.has(d.name));
     const available = [...(opts.agents ?? []), ...builtins].filter((a) => !excluded.has(a.name));
@@ -813,7 +811,6 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
         agentListing,
         ...(rosterNames !== undefined ? { agentModels: rosterNames } : {}),
         executionMode: "parallel",
-        ...(!opts.name ? { aliases: [LEGACY_SUBAGENT_TOOL_NAME] } : {}),
         contract: { contractId: "core.agent@1", implementationRevision: "1" },
         description: `Launch a new agent to handle complex, multi-step tasks. Each agent type has specific capabilities and tools available to it.\n` +
             (opts.purpose ? `\nThis sub-agent is for: ${opts.purpose}.\n` : "") +
@@ -897,9 +894,9 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                 }
                 : {}),
         }),
-        prepareArguments: (args) => foldGeneralPurposeAlias(adaptLegacyForkArgs(args), generalPurposeShadowed),
+        prepareArguments: (args) => foldGeneralPurposeAlias(args, generalPurposeShadowed),
         execute: async (args, ctx) => {
-            const a = foldGeneralPurposeAlias(adaptLegacyForkArgs(args), generalPurposeShadowed);
+            const a = foldGeneralPurposeAlias(args, generalPurposeShadowed);
             const wantsBackground = opts.background !== undefined && a.run_in_background !== false;
             const reviveClaim = ctx.reviveClaim;
             if (reviveClaim !== undefined && opts.background === undefined) {
@@ -1125,18 +1122,16 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
             if (injectedTools.length > 0) {
                 const taken = new Set();
                 const reserve = (t) => {
-                    taken.add(canonicalToolName(t.name));
+                    taken.add(t.name);
                     for (const alias of t.aliases ?? [])
-                        taken.add(canonicalToolName(alias));
+                        taken.add(alias);
                 };
                 for (const t of opts.tools ?? [])
                     reserve(t);
-                taken.add(canonicalToolName(toolName));
-                if (!opts.name)
-                    taken.add(canonicalToolName(LEGACY_SUBAGENT_TOOL_NAME));
+                taken.add(toolName);
                 const merged = [...(opts.tools ?? [])];
                 for (const t of injectedTools) {
-                    const names = [canonicalToolName(t.name), ...(t.aliases ?? []).map((alias) => canonicalToolName(alias))];
+                    const names = [t.name, ...(t.aliases ?? [])];
                     if (names.some((n) => taken.has(n)))
                         continue;
                     for (const n of names)
@@ -1153,8 +1148,9 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                 : perCallModel ?? (def ? (def.model ?? ctx.model ?? opts.model) : opts.model);
             const childSystemPrompt = def?.systemPrompt ?? opts.systemPrompt;
             const childDefaultPersona = childSystemPrompt === undefined && !wantsFork ? SUBAGENT_PROMPT : undefined;
-            const childLimits = def?.maxTurns !== undefined
-                ? { ...opts.limits, maxTurns: def.maxTurns }
+            const defMaxTurns = typeof def?.maxTurns === "number" && Number.isFinite(def.maxTurns) && def.maxTurns > 0 ? def.maxTurns : undefined;
+            const childLimits = defMaxTurns !== undefined
+                ? { ...opts.limits, maxTurns: defMaxTurns }
                 : wantsFork && opts.limits?.maxTurns === undefined
                     ? { ...opts.limits, maxTurns: FORK_DEFAULT_MAX_TURNS }
                     : opts.limits;
@@ -1188,14 +1184,10 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                 else if (observerFailure === undefined) {
                     observerFailure = msg;
                 }
-                try {
-                    opts.onObserverError?.(err, {
-                        ...(def !== undefined ? { observedAgent: def.name } : {}),
-                        ...(observerArm ? { observerAgent: observerArm.observerDefinition.name } : {}),
-                    });
-                }
-                catch {
-                }
+                notifier.notify(() => opts.onObserverError?.(err, {
+                    ...(def !== undefined ? { observedAgent: def.name } : {}),
+                    ...(observerArm ? { observerAgent: observerArm.observerDefinition.name } : {}),
+                }), "subagent.onObserverError");
             };
             const observedSteerRef = {};
             let pendingTrigger = [];
@@ -1239,7 +1231,10 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                     ...(ctx.alwaysLoadTools !== undefined ? { alwaysLoadTools: [...ctx.alwaysLoadTools] } : {}),
                     ...(ctx.promptProfile !== undefined ? { promptProfile: ctx.promptProfile } : {}),
                     enableBlockedReport: false,
-                    limits: { maxTurns: observerDef.maxTurns ?? 8, timeoutSec: 120 },
+                    limits: {
+                        maxTurns: typeof observerDef.maxTurns === "number" && Number.isFinite(observerDef.maxTurns) && observerDef.maxTurns > 0 ? observerDef.maxTurns : 8,
+                        timeoutSec: 120,
+                    },
                 });
                 const runObserverLeg = async (spec) => {
                     if (!isObserverTaskId(sid))
@@ -1683,21 +1678,17 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                             resumable: false,
                             ...(completionIdReap !== undefined ? { completionId: completionIdReap } : {}),
                         });
-                        try {
-                            notify?.({
-                                task_id: taskId,
-                                task_type: "background_agent",
-                                toolUseId: ctx.toolCallId,
-                                status: "killed",
-                                stoppedBy: stoppedByReap,
-                                summary: summaryReap,
-                                sessionId: forkedId,
-                                resumable: false,
-                                ...(completionIdReap !== undefined ? { completionId: completionIdReap } : {}),
-                            }, { priority: "later" });
-                        }
-                        catch {
-                        }
+                        notifier.notify(() => notify?.({
+                            task_id: taskId,
+                            task_type: "background_agent",
+                            toolUseId: ctx.toolCallId,
+                            status: "killed",
+                            stoppedBy: stoppedByReap,
+                            summary: summaryReap,
+                            sessionId: forkedId,
+                            resumable: false,
+                            ...(completionIdReap !== undefined ? { completionId: completionIdReap } : {}),
+                        }, { priority: "later" }), "subagent.reapTerminalNotify");
                     });
                     if (agentName !== undefined) {
                         recordRosterSpawn(ctx.roster, { name: agentName, agentId: taskId, sessionId: forkedId, toolUseId: ctx.toolCallId, owner: bgOwner, scope: bgScope, ...((typeof childModel === "string" ? resolveModelDisplayLabel(childModel) : childModel?.id) !== undefined ? { model: typeof childModel === "string" ? childModel : childModel?.id } : {}), ...((ctx.rootSessionId ?? ctx.sessionId) !== undefined ? { rootSessionId: ctx.rootSessionId ?? ctx.sessionId } : {}), ...(sessionScopedBg ? { sessionScoped: true } : {}), createdAt: Date.now() });
@@ -1770,6 +1761,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                                         kind: "tick",
                                         taskId,
                                         sessionScoped: sessionScopedBg === true,
+                                        sessionId: forkedId,
                                         transcriptId: forkedId,
                                         parentToolCallId: ctx.toolCallId,
                                         progressTaskId: e.taskId,
@@ -1805,7 +1797,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                                 tokens: child.stats.tokens + (nsb?.tokens ?? 0),
                                 turns: child.stats.turns + (nsb?.turns ?? 0),
                                 tasks: 1 + (nsb?.tasks ?? 0),
-                                costMicroUsd: (child.stats.costMicroUsd ?? 0) + (nsb?.costMicroUsd ?? 0),
+                                costMicroUsd: rollupDelegatedCost(child.stats, nsb),
                             });
                         }
                         catch {
@@ -1857,7 +1849,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                                 summary: forkTerminalSummary,
                                 ...residualFork,
                                 resumable: resumableFork,
-                                usage: { tokens: child.stats.tokens, turns: child.stats.turns, costMicroUsd: (child.stats.costMicroUsd ?? 0) + (child.stats.nested?.costMicroUsd ?? 0) },
+                                usage: { tokens: child.stats.tokens, turns: child.stats.turns, ...delegatedCostField(child.stats) },
                                 ...(completionIdFork !== undefined ? { completionId: completionIdFork } : {}),
                             });
                         try {
@@ -1876,7 +1868,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                                     ...(settledBg === "killed" && child.result ? { partial: true } : {}),
                                     ...residualFork,
                                     resumable: resumableFork,
-                                    usage: { tokens: child.stats.tokens, turns: child.stats.turns, costMicroUsd: (child.stats.costMicroUsd ?? 0) + (child.stats.nested?.costMicroUsd ?? 0) },
+                                    usage: { tokens: child.stats.tokens, turns: child.stats.turns, ...delegatedCostField(child.stats) },
                                     ...(completionIdFork !== undefined ? { completionId: completionIdFork } : {}),
                                 }, { priority: "later" });
                         }
@@ -1980,7 +1972,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                     tokens: forkChild.stats.tokens + (nsf?.tokens ?? 0),
                     turns: forkChild.stats.turns + (nsf?.turns ?? 0),
                     tasks: 1 + (nsf?.tasks ?? 0),
-                    costMicroUsd: (forkChild.stats.costMicroUsd ?? 0) + (nsf?.costMicroUsd ?? 0),
+                    costMicroUsd: rollupDelegatedCost(forkChild.stats, nsf),
                 });
                 if (isDurablePause(forkChild.status)) {
                     return {
@@ -2100,7 +2092,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                     return { isError: true, content: `Sub-agent not started in background: ${e instanceof Error ? e.message : String(e)}${wt ? `\n${wt}` : ""}`, details: { error: "register_failed" } };
                 }
                 if (agentName !== undefined) {
-                    recordRosterSpawn(ctx.roster, { name: agentName, agentId: taskId, toolUseId: ctx.toolCallId, owner: bgOwner, scope: bgScope, ...((typeof childModel === "string" ? resolveModelDisplayLabel(childModel) : childModel?.id) !== undefined ? { model: typeof childModel === "string" ? childModel : childModel?.id } : {}), ...(reviveRow !== undefined ? (reviveRow.rootSessionId !== undefined ? { rootSessionId: reviveRow.rootSessionId } : {}) : (ctx.rootSessionId ?? ctx.sessionId) !== undefined ? { rootSessionId: ctx.rootSessionId ?? ctx.sessionId } : {}), ...(sessionScopedBg ? { sessionScoped: true } : {}), createdAt: reviveRow?.spawnedAt ?? Date.now() });
+                    recordRosterSpawn(ctx.roster, { name: agentName, agentId: taskId, toolUseId: ctx.toolCallId, owner: bgOwner, scope: bgScope, ...((typeof childModel === "string" ? resolveModelDisplayLabel(childModel) : childModel?.id) !== undefined ? { model: typeof childModel === "string" ? childModel : childModel?.id } : {}), ...(reviveRow !== undefined ? ((reviveRow.rootSessionId ?? reviveRow.parentSessionId) !== undefined ? { rootSessionId: reviveRow.rootSessionId ?? reviveRow.parentSessionId } : {}) : (ctx.rootSessionId ?? ctx.sessionId) !== undefined ? { rootSessionId: ctx.rootSessionId ?? ctx.sessionId } : {}), ...(sessionScopedBg ? { sessionScoped: true } : {}), createdAt: reviveRow?.spawnedAt ?? Date.now() });
                 }
                 const bgSink = ctx.onBackgroundChildEvent;
                 const sinkEmit = (event) => {
@@ -2131,21 +2123,17 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                         resumable: false,
                         ...(completionIdReap !== undefined ? { completionId: completionIdReap } : {}),
                     });
-                    try {
-                        notify?.({
-                            task_id: taskId,
-                            task_type: "background_agent",
-                            toolUseId: ctx.toolCallId,
-                            status: "killed",
-                            stoppedBy: stoppedByReap,
-                            summary: summaryReap,
-                            sessionId: bgChildSessionId,
-                            resumable: false,
-                            ...(completionIdReap !== undefined ? { completionId: completionIdReap } : {}),
-                        }, { priority: "later" });
-                    }
-                    catch {
-                    }
+                    notifier.notify(() => notify?.({
+                        task_id: taskId,
+                        task_type: "background_agent",
+                        toolUseId: ctx.toolCallId,
+                        status: "killed",
+                        stoppedBy: stoppedByReap,
+                        summary: summaryReap,
+                        sessionId: bgChildSessionId,
+                        resumable: false,
+                        ...(completionIdReap !== undefined ? { completionId: completionIdReap } : {}),
+                    }, { priority: "later" }), "subagent.reapTerminalNotify");
                 });
                 const bgDurableProbe = bg.registry.durableAgentRowProbe(taskId);
                 const bgRowConfirmed = async () => (bgDurableProbe ? await bgDurableProbe().catch(() => false) : false);
@@ -2165,14 +2153,14 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                         ? {
                             ...(reviveRow.parentTaskId !== undefined ? { parentTaskId: reviveRow.parentTaskId } : {}),
                             ...(reviveRow.parentSessionId !== undefined ? { parentSessionId: reviveRow.parentSessionId } : {}),
-                            ...(reviveRow.rootSessionId !== undefined ? { rootSessionId: reviveRow.rootSessionId } : {}),
+                            ...((reviveRow.rootSessionId ?? reviveRow.parentSessionId) !== undefined ? { rootSessionId: reviveRow.rootSessionId ?? reviveRow.parentSessionId } : {}),
                         }
                         : {
                             ...(ctx.taskId !== undefined && ctx.taskId !== ctx.sessionId ? { parentTaskId: ctx.taskId } : {}),
                             ...(ctx.sessionId !== undefined ? { parentSessionId: ctx.sessionId } : {}),
                             ...((ctx.rootSessionId ?? ctx.sessionId) !== undefined ? { rootSessionId: ctx.rootSessionId ?? ctx.sessionId } : {}),
                         }),
-                    startedAt: Date.now(),
+                    startedAt: reviveRow?.spawnedAt ?? Date.now(),
                 });
                 const bgRetainLedger = reviveRow !== undefined
                     ? undefined
@@ -2249,6 +2237,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                                     kind: "tick",
                                     taskId,
                                     sessionScoped: sessionScopedBg === true,
+                                    sessionId: bgChildSessionId,
                                     transcriptId: bgChildSessionId,
                                     parentToolCallId: ctx.toolCallId,
                                     progressTaskId: e.taskId,
@@ -2405,7 +2394,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                             tokens: child.stats.tokens + (ns2?.tokens ?? 0),
                             turns: child.stats.turns + (ns2?.turns ?? 0),
                             tasks: 1 + (ns2?.tasks ?? 0),
-                            costMicroUsd: (child.stats.costMicroUsd ?? 0) + (ns2?.costMicroUsd ?? 0),
+                            costMicroUsd: rollupDelegatedCost(child.stats, ns2),
                         });
                     }
                     catch {
@@ -2515,7 +2504,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                             summary: bgTerminalSummary,
                             ...residual,
                             resumable: resumableBg,
-                            usage: { tokens: child.stats.tokens, turns: child.stats.turns, costMicroUsd: (child.stats.costMicroUsd ?? 0) + (child.stats.nested?.costMicroUsd ?? 0) },
+                            usage: { tokens: child.stats.tokens, turns: child.stats.turns, ...delegatedCostField(child.stats) },
                             ...(completionIdBg !== undefined ? { completionId: completionIdBg } : {}),
                         });
                     const completionFrame = {
@@ -2533,7 +2522,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                         ...(settled === "killed" && child.result ? { partial: true } : {}),
                         ...residual,
                         resumable: resumableBg,
-                        usage: { tokens: child.stats.tokens, turns: child.stats.turns, costMicroUsd: (child.stats.costMicroUsd ?? 0) + (child.stats.nested?.costMicroUsd ?? 0) },
+                        usage: { tokens: child.stats.tokens, turns: child.stats.turns, ...delegatedCostField(child.stats) },
                         ...(completionIdBg !== undefined ? { completionId: completionIdBg } : {}),
                     };
                     const gateOwner = ownsTerminalFaces && settled === "completed" && notify !== undefined ? bgRetain?.childSessionId : undefined;
@@ -2685,14 +2674,10 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                         sink: ctx.onSubagentSpawn,
                         ...(opts.background ? { registry: opts.background.registry } : {}),
                     });
-                    try {
-                        ctx.onSubagentSpawn(createSteerHandle(stream, ctx.toolCallId, childAgentName, settled, {
-                            resume,
-                            ...(retainEntry ? { childSessionId: retainEntry.childSessionId } : {}),
-                        }));
-                    }
-                    catch {
-                    }
+                    notifier.notify(() => ctx.onSubagentSpawn?.(createSteerHandle(stream, ctx.toolCallId, childAgentName, settled, {
+                        resume,
+                        ...(retainEntry ? { childSessionId: retainEntry.childSessionId } : {}),
+                    })), "subagent.onSubagentSpawn");
                 }
                 try {
                     for await (const ev of stream)
@@ -2737,7 +2722,7 @@ function createSubagentToolNode(opts, depth, excluded, extraToolsBudget) {
                 tokens: child.stats.tokens + (ns?.tokens ?? 0),
                 turns: child.stats.turns + (ns?.turns ?? 0),
                 tasks: 1 + (ns?.tasks ?? 0),
-                costMicroUsd: (child.stats.costMicroUsd ?? 0) + (ns?.costMicroUsd ?? 0),
+                costMicroUsd: rollupDelegatedCost(child.stats, ns),
             });
             if (isDurablePause(child.status)) {
                 if (retainEntry)

package/dist/agents/teacher.d.ts

@@ -53,15 +53,7 @@ export interface TeacherRunResult extends TaskResult {
         tokens: number;
         tasks: number;
         costMicroUsd?: number;
-        humanReview?: {
-            count: number;
-            totalWaitMs: number;
-            gates: Array<{
-                kind: string;
-                waitMs: number;
-                decision?: string;
-            }>;
-        };
+        humanReview?: NonNullable<TaskResult["stats"]["humanReview"]>;
     };
 }
 export declare function parseTeacherAdvice(text: string): TeacherAdvice;

package/dist/agents/teacher.js

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 import { mapNestedSuspend, isDurablePause } from "./suspend-guard.js";
 import { isDefineToolProduct, stampDefineToolBrand } from "../core/tools.js";
 import { delimitUntrusted, inlineUntrusted } from "../core/untrusted-text.js";
+import { buildCumulativeStats } from "./cumulative-stats.js";
 export const TEACHER_PROMPT = `You are an expert advisor to a less-capable "student" agent that got stuck.
 You receive the task and the student's recent failed attempts. Your job is to help the student RECOVER,
 not to do the work for it.
@@ -84,6 +85,7 @@ async function runTeacherCore(runner, studentSpec, teacher) {
     let studentTokens = 0;
     let studentTurns = 0;
     let studentCostMicro = 0;
+    let anyStudentLegUnpriced = false;
     let studentPrompt = 0;
     let studentTotalInput = 0;
     let studentCached = 0;
@@ -202,6 +204,8 @@ async function runTeacherCore(runner, studentSpec, teacher) {
         studentTokens += s.tokens;
         studentTurns += s.turns;
         studentCostMicro += s.costMicroUsd ?? 0;
+        if (s.costMicroUsd === undefined)
+            anyStudentLegUnpriced = true;
         studentPrompt += s.promptTokens ?? 0;
         studentTotalInput += s.totalInputTokens ?? 0;
         studentCached += s.cachedTokens ?? 0;
@@ -442,34 +446,27 @@ async function runTeacherCore(runner, studentSpec, teacher) {
     function finalize(result) {
         return {
             ...result,
-            stats: {
-                ...result.stats,
+            stats: buildCumulativeStats(result.stats, {
                 tokens: studentTokens,
                 turns: studentTurns,
                 costMicroUsd: studentCostMicro || undefined,
-                promptTokens: studentPrompt || undefined,
-                totalInputTokens: studentTotalInput || undefined,
-                cachedTokens: studentCached || undefined,
-                outputTokens: studentOutput || undefined,
-                cacheWriteTokens: studentCacheWrite || undefined,
-                cacheWriteTokensLong: studentCacheWriteLong || undefined,
-                cacheHitRate: studentTotalInput > 0 ? Math.min(1, studentCached / studentTotalInput) : undefined,
-                nested: studentNestedTokens > 0 || studentNestedTasks > 0
-                    ? {
-                        tokens: studentNestedTokens,
-                        turns: studentNestedTurns,
-                        tasks: studentNestedTasks,
-                        costMicroUsd: studentNestedCostMicro || undefined,
-                    }
-                    : undefined,
-                costBreakdown: {
-                    llmRootMicroUsd: studentLlmRootMicro,
-                    nestedSubagentMicroUsd: studentNestedCostMicro,
-                    memoryConsolidationMicroUsd: 0,
-                    compactionMicroUsd: studentCompactionMicro,
+                anyLegUnpriced: anyStudentLegUnpriced,
+                promptTokens: studentPrompt,
+                totalInputTokens: studentTotalInput,
+                cachedTokens: studentCached,
+                outputTokens: studentOutput,
+                cacheWriteTokens: studentCacheWrite,
+                cacheWriteTokensLong: studentCacheWriteLong,
+                llmRootMicroUsd: studentLlmRootMicro,
+                compactionMicroUsd: studentCompactionMicro,
+                nested: {
+                    tokens: studentNestedTokens,
+                    turns: studentNestedTurns,
+                    tasks: studentNestedTasks,
+                    costMicroUsd: studentNestedCostMicro,
                 },
-                humanReview: hrCount > 0 ? { count: hrCount, totalWaitMs: hrWaitMs, gates: hrGates } : undefined,
-            },
+                humanReview: { count: hrCount, totalWaitMs: hrWaitMs, gates: hrGates },
+            }),
             escalations,
             teacherStats: {
                 tokens: teacherTokens,

package/dist/agents/tool-filter.js

@@ -1,17 +1,16 @@
-import { canonicalToolName } from "../core/tool-name-aliases.js";
 export function toolNameAllowed(name, allowTools, denyTools) {
-    const allow = allowTools !== undefined && !allowTools.includes("*") ? new Set(allowTools.map(canonicalToolName)) : undefined;
-    const deny = denyTools && denyTools.length > 0 ? new Set(denyTools.map(canonicalToolName)) : undefined;
-    const n = canonicalToolName(name);
+    const allow = allowTools !== undefined && !allowTools.includes("*") ? new Set(allowTools) : undefined;
+    const deny = denyTools && denyTools.length > 0 ? new Set(denyTools) : undefined;
+    const n = name;
     return (!allow || allow.has(n)) && (!deny || !deny.has(n));
 }
 export function resolveToolSubset(pool, allowTools, denyTools) {
-    const allow = allowTools !== undefined && !allowTools.includes("*") ? new Set(allowTools.map(canonicalToolName)) : undefined;
-    const deny = denyTools && denyTools.length > 0 ? new Set(denyTools.map(canonicalToolName)) : undefined;
+    const allow = allowTools !== undefined && !allowTools.includes("*") ? new Set(allowTools) : undefined;
+    const deny = denyTools && denyTools.length > 0 ? new Set(denyTools) : undefined;
     if (!allow && !deny)
         return [...pool];
     return pool.filter((t) => {
-        const matches = (set) => set.has(canonicalToolName(t.name)) || (t.aliases ?? []).some((a) => set.has(canonicalToolName(a)));
+        const matches = (set) => set.has(t.name) || (t.aliases ?? []).some((a) => set.has(a));
         return (!allow || matches(allow)) && (!deny || !matches(deny));
     });
 }

package/dist/agents/verify.d.ts

@@ -11,6 +11,7 @@ export declare const VerdictSchema: Type.TObject<{
 }>;
 export type Verdict = Static<typeof VerdictSchema>;
 export interface VerifyConfig {
+    onNotifyError?: (failure: import("../core/safe-notify.js").SafeNotifyFailure) => void;
     verifierModel?: ModelRef;
     verifierTools?: ToolSpec[];
     maxRounds?: number;

package/dist/agents/verify.js

@@ -3,6 +3,7 @@ import { CODE_AGENT_PROMPT } from "../prompts/default.js";
 import { releaseSession } from "./session-util.js";
 import { mapNestedSuspend, isDurablePause } from "./suspend-guard.js";
 import { delimitUntrusted, sanitizeUntrustedText } from "../core/untrusted-text.js";
+import { createSafeNotifier } from "../core/safe-notify.js";
 export const VERIFICATION_PROMPT = `You are a verification specialist. Your job is NOT to confirm the implementation works — it is to try to BREAK it.
 
 You have two documented failure patterns. First, verification avoidance: faced with a check, you find reasons not to run it — you read code, narrate what you would test, declare "PASS," and move on. Second, being seduced by the first 80%: a polished result or a passing test suite makes you inclined to pass it, not noticing the edge that crashes, the state that vanishes, the bad input that is unhandled. The first 80% is the easy part. Your entire value is in finding the last 20%.
@@ -58,6 +59,8 @@ export const VerdictSchema = Type.Object({
     }),
     evidence: Type.Optional(Type.String({ description: "Commands run + observed output backing the verdict." })),
 });
+const VERIFY_ON_ROUND_SITE = "verify.onRound";
+const VERIFY_ON_VERIFIER_PAUSE_SITE = "verify.onVerifierPause";
 function fixObjective(findings) {
     const list = findings.length
         ? findings.map((f) => `- ${sanitizeUntrustedText(f)}`).join("\n")
@@ -82,7 +85,8 @@ export async function verifyCompleted(runner, result, specBase, objective, confi
     if (result.status !== "completed") {
         return { ...result, verification: { verdict: "unverified", unverifiedReason: "impl_incomplete", rounds: 0, findings: [] } };
     }
-    const maxRounds = Math.max(1, Math.floor(config.maxRounds ?? 2));
+    const maxRounds = Number.isFinite(config.maxRounds) ? Math.max(1, Math.floor(config.maxRounds)) : 2;
+    const notifier = createSafeNotifier(config.onNotifyError !== undefined ? { onError: config.onNotifyError } : undefined);
     const verifierTools = config.verifierTools ?? (specBase.tools ?? []).filter((t) => t.effect === "read");
     const evidenceMode = config.evidence != null && config.evidence.trim() !== "";
     const verifierPrompt = config.verifierPrompt ?? (evidenceMode ? STATIC_VERIFICATION_PROMPT : VERIFICATION_PROMPT);
@@ -126,6 +130,7 @@ export async function verifyCompleted(runner, result, specBase, objective, confi
         spend += v.cost;
         verifierSpend += v.cost;
         if (v.paused) {
+            const paused = v.paused;
             outcome = {
                 verdict: "unverified",
                 unverifiedReason: "verifier_paused",
@@ -139,18 +144,14 @@ export async function verifyCompleted(runner, result, specBase, objective, confi
                     ...(v.paused.checkpointGate ? { checkpointGate: v.paused.checkpointGate } : {}),
                 },
             };
-            try {
-                config.onVerifierPause?.({
-                    round,
-                    status: v.paused.status,
-                    sessionId: v.paused.sessionId,
-                    ...(v.paused.checkpointToken ? { checkpointToken: v.paused.checkpointToken } : {}),
-                    ...(v.paused.checkpointGate ? { checkpointGate: v.paused.checkpointGate } : {}),
-                });
-            }
-            catch {
-            }
-            config.onRound?.({ round, verdict: outcome.verdict, findings: outcome.findings });
+            notifier.notify(() => config.onVerifierPause?.({
+                round,
+                status: paused.status,
+                sessionId: paused.sessionId,
+                ...(paused.checkpointToken ? { checkpointToken: paused.checkpointToken } : {}),
+                ...(paused.checkpointGate ? { checkpointGate: paused.checkpointGate } : {}),
+            }), VERIFY_ON_VERIFIER_PAUSE_SITE);
+            notifier.notify(() => config.onRound?.({ round, verdict: outcome.verdict, findings: outcome.findings }), VERIFY_ON_ROUND_SITE);
             break;
         }
         const rawVerdict = v.verdict?.verdict ?? "unverified";
@@ -164,7 +165,7 @@ export async function verifyCompleted(runner, result, specBase, objective, confi
             evidence: v.verdict?.evidence,
             verifierCost: verifierSpend,
         };
-        config.onRound?.({ round, verdict: outcome.verdict, findings: outcome.findings });
+        notifier.notify(() => config.onRound?.({ round, verdict: outcome.verdict, findings: outcome.findings }), VERIFY_ON_ROUND_SITE);
         if (outcome.verdict !== "FAIL")
             break;
         if (round >= maxRounds)