@qduc/term2 0.11.1 → 0.12.0

package/dist/services/subagents/types.d.ts

@@ -1,7 +1,8 @@
 import type { NormalizedUsage } from '../../utils/ai/token-usage.js';
+import type { ModelRequestCost } from '../../services/cost/model-cost.js';
 import type { ExecutionBudget } from '../agent-runtime/execution-budget.js';
-export declare const SUBAGENT_ROLES: readonly ['explorer', 'worker', 'researcher', 'mentor', 'librarian'];
-export declare const PHASE_1_ASYNC_SUBAGENT_ROLES: readonly ['explorer', 'researcher', 'mentor'];
+export declare const SUBAGENT_ROLES: readonly ['explorer', 'worker', 'mentor', 'librarian'];
+export declare const PHASE_1_ASYNC_SUBAGENT_ROLES: readonly ['explorer', 'mentor'];
 export type SupportedSubagentRole = (typeof SUBAGENT_ROLES)[number];
 export type Phase1AsyncSubagentRole = (typeof PHASE_1_ASYNC_SUBAGENT_ROLES)[number];
 export type SubagentRole = SupportedSubagentRole | string;
@@ -116,6 +117,8 @@ export interface ValidationEvidence {
 }
 export interface SubagentResult {
     agentId: string;
+    /** Optional user-provided alias retained after an async run settles. */
+    name?: string;
     role: string;
     status: 'completed' | 'failed' | 'cancelled';
     finalText: string;
@@ -129,6 +132,8 @@ export interface SubagentResult {
         count: number;
     }>;
     usage?: NormalizedUsage;
+    /** Cumulative model-request cost records for the subagent run. */
+    costRecords?: ModelRequestCost[];
     error?: string;
     /** SDK nested run result used to propagate/resume delegated approvals. */
     nestedRunResult?: unknown;
@@ -145,6 +150,20 @@ export interface SubagentResult {
      */
     validation?: ValidationEvidence;
 }
+/**
+ * What a nested (synchronous) subagent tool returns to its parent.
+ *
+ * Only this path can stop at an approval pause, so only this type carries the
+ * `interrupted` status: the run is settled but unfinished, which is neither
+ * `completed` nor `failed`. The asynchronous and public-API paths cannot
+ * produce it, which is why it is not part of {@link SubagentResult}.
+ */
+export type NestedSubagentResult = Omit<SubagentResult, 'status'> & {
+    /** `running` is the one-shot foreground result after ownership transfers. */
+    status: SubagentResult['status'] | 'interrupted' | 'running';
+    /** True when the run paused for an approval the parent must surface. */
+    interrupted?: boolean;
+};
 /** The only state exposed while an asynchronous run is live. */
 export interface SubagentRunHandle {
     runId: string;
@@ -170,7 +189,7 @@ export interface SubagentRunStatus {
     /** Optional active-run alias retained in status snapshots. */
     name?: string;
     role: string;
-    status: 'running' | 'waiting_for_answer' | 'cancelling' | 'completed' | 'failed' | 'cancelled' | 'not_found';
+    status: 'running' | 'awaiting_approval' | 'waiting_for_answer' | 'cancelling' | 'completed' | 'failed' | 'cancelled' | 'not_found';
     task: string;
     taskPreview: string;
     startedAt: number;

package/dist/services/subagents/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/types.ts"],"names":[],"mappings":"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"}

package/dist/services/subagents/types.js

@@ -1,3 +1,3 @@
-export const SUBAGENT_ROLES = ['explorer', 'worker', 'researcher', 'mentor', 'librarian'];
-export const PHASE_1_ASYNC_SUBAGENT_ROLES = ['explorer', 'researcher', 'mentor'];
+export const SUBAGENT_ROLES = ['explorer', 'worker', 'mentor', 'librarian'];
+export const PHASE_1_ASYNC_SUBAGENT_ROLES = ['explorer', 'mentor'];
 //# sourceMappingURL=types.js.map

package/dist/services/subagents/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../source/services/subagents/types.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAU,CAAC;AACnG,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,CAAU,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../source/services/subagents/types.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAU,CAAC;AACrF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAU,CAAC"}

package/dist/services/subagents/utils.d.ts

@@ -1,8 +1,8 @@
+import type { SubagentResult } from './types.js';
 export declare function isAbortLike(message: string | undefined, obj?: unknown): boolean;
 export declare function isToolHistoryItem(raw: any): boolean;
 export declare function assistantText(raw: any): string | null;
 export declare function extractFinalText(result: any): string;
-export declare function runWithProvider(providerId: string, runner: any, agent: any, input: any, options: any): Promise<any>;
 export declare function aggregateToolUsage(toolCounts: Map<string, number>): Array<{
     toolName: string;
     count: number;
@@ -28,5 +28,12 @@ export declare const MAX_PREVIEW_LENGTH = 300;
  * first paragraph with whitespace collapsed, ellipsised at MAX_PREVIEW_LENGTH.
  */
 export declare function truncatePreview(text: unknown): string;
+/**
+ * Formats a SubagentResult into the model-facing report string: status,
+ * error, structured validation and diff evidence, then the full final
+ * text. Used both by the get_subagent_result tool and by the completion
+ * notification so the same evidence shape reaches the main agent either way.
+ */
+export declare function formatSubagentResult(result: SubagentResult): string;
 export declare function createAbortError(message?: string): Error;
 //# sourceMappingURL=utils.d.ts.map

package/dist/services/subagents/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/utils.ts"],"names":[],"mappings":"AAGA,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,CAK/E;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAInD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAWrD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,CA2BpD;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAiBnH;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAE9G;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAE5C;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAMpE;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,OAAO,EAAE,CAAC,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC,EAAE,GAC7C;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,GAAG,SAAS,CAqC1D;AAED,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAmBrD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAkC,GAAG,KAAK,CAIjF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,CAK/E;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAInD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAWrD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,CA2BpD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAE9G;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAE5C;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAMpE;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,OAAO,EAAE,CAAC,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC,EAAE,GAC7C;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,GAAG,SAAS,CAqC1D;AAED,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAmBrD;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CA2CnE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAkC,GAAG,KAAK,CAIjF"}

package/dist/services/subagents/utils.js

@@ -1,5 +1,3 @@
-import { run } from '@openai/agents';
-import { getProvider } from '../../providers/index.js';
 export function isAbortLike(message, obj) {
     if (message?.includes('abort') || message?.includes('cancel'))
         return true;
@@ -54,20 +52,6 @@ export function extractFinalText(result) {
     }
     return '';
 }
-export function runWithProvider(providerId, runner, agent, input, options) {
-    const providerDef = getProvider(providerId);
-    const supportsTracingControl = providerDef?.capabilities?.supportsTracingControl ?? false;
-    const effectiveOptions = { ...options };
-    if (!supportsTracingControl) {
-        effectiveOptions.tracingDisabled = true;
-    }
-    if (!runner && providerId !== 'openai') {
-        const label = providerDef?.label || providerId;
-        throw new Error(`${label} is configured but could not be initialized. ` +
-            `Please check that all required credentials and provider settings are set.`);
-    }
-    return runner ? runner.run(agent, input, effectiveOptions) : run(agent, input, effectiveOptions);
-}
 export function aggregateToolUsage(toolCounts) {
     return Array.from(toolCounts.entries()).map(([toolName, count]) => ({ toolName, count }));
 }
@@ -141,6 +125,49 @@ export function truncatePreview(text) {
     }
     return `${firstParagraph.slice(0, MAX_PREVIEW_LENGTH - 3)}...`;
 }
+/**
+ * Formats a SubagentResult into the model-facing report string: status,
+ * error, structured validation and diff evidence, then the full final
+ * text. Used both by the get_subagent_result tool and by the completion
+ * notification so the same evidence shape reaches the main agent either way.
+ */
+export function formatSubagentResult(result) {
+    const lines = [];
+    lines.push(`Status: ${result.status}`);
+    if (result.error) {
+        lines.push(`Error: ${result.error}`);
+    }
+    // Structured validation evidence (machine-checkable, before narrative).
+    if (result.validation) {
+        lines.push('');
+        const v = result.validation;
+        lines.push(`Validation: ${v.command} → exit ${v.exitStatus}`);
+        if (v.outputExcerpt) {
+            const excerpt = v.outputExcerpt.length > 500 ? v.outputExcerpt.slice(-500) + '...' : v.outputExcerpt;
+            lines.push(`Output excerpt: ${excerpt}`);
+        }
+    }
+    // Structured diff stat (machine-checkable, before narrative).
+    if (result.diffStat && result.diffStat.length > 0) {
+        lines.push('');
+        const stats = result.diffStat.map((d) => `  ${d.path} +${d.added}/-${d.deleted}`).join('\n');
+        lines.push(`Diff stat:`);
+        lines.push(stats);
+    }
+    if (result.finalText) {
+        lines.push('');
+        lines.push(result.finalText);
+    }
+    if (result.toolsUsed && result.toolsUsed.length > 0) {
+        lines.push('');
+        lines.push(`Tools used: ${result.toolsUsed.map((t) => `${t.toolName}(${t.count})`).join(', ')}`);
+    }
+    if (result.filesChanged && result.filesChanged.length > 0) {
+        lines.push('');
+        lines.push(`Files changed: ${result.filesChanged.join(', ')}`);
+    }
+    return lines.join('\n') || `Status: ${result.status}`;
+}
 export function createAbortError(message = 'The subagent run was aborted.') {
     const error = new Error(message);
     error.name = 'AbortError';

package/dist/services/subagents/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../source/services/subagents/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../source/services/subagents/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CAAC,OAA2B,EAAE,GAAa;IACpE,IAAI,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3E,MAAM,CAAC,GAAG,GAA0C,CAAC;IACrD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,YAAY,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,aAAa,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7G,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAQ;IACxC,MAAM,IAAI,GAAG,OAAO,GAAG,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,IAAI,GAAG,EAAE,IAAI,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACtC,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAQ;IACpC,IAAI,GAAG,EAAE,IAAI,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAC3C,MAAM,OAAO,GAAG,GAAG,EAAE,OAAO,CAAC;IAC7B,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC;IAChD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO,OAAO;aACX,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,KAAK,QAAQ,CAAC;aAC/C,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aACvB,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAW;IAC1C,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACnG,OAAO,MAAM,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzD,aAAa,GAAG,CAAC,CAAC;gBAClB,MAAM;YACR,CAAC;QACH,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;YACxD,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9D,IAAI,IAAI,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAC;QACjC,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9D,IAAI,IAAI,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAC;QACjC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,UAA+B;IAChE,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,UAAkC;IAElC,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAW,EAAE,OAAY,EAAE,KAAU;IAC5D,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IACxE,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CACxC,GAAG,OAA2C;IAE9C,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAyB,EAAE,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC;IACvF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjE,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,UAAU,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;IAC1D,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;IACxD,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAC;IAErD,MAAM,OAAO,GAAG,GAAS,EAAE;QACzB,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC;YAC3C,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,GAAS,EAAE;YAC1B,UAAU,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;QACF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAEtC;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,IAAa;IAC3C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,cAAc,GAClB,IAAI;SACD,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACpB,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACrB,IAAI,EAAE,IAAI,EAAE,CAAC;IAClB,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,IAAI,kBAAkB,EAAE,CAAC;QAChD,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAsB;IACzD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAEvC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,wEAAwE;IACxE,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,MAAM,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,WAAW,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,CAAC,CAAC,aAAa,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YACrG,KAAK,CAAC,IAAI,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,8DAA8D;IAC9D,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7F,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnG,CAAC;IAED,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1D,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,WAAW,MAAM,CAAC,MAAM,EAAE,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAO,GAAG,+BAA+B;IACxE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IACjC,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC;IAC1B,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/services/test-helpers/mock-stream.d.ts

@@ -1,3 +1,4 @@
+import { type AgentStream } from '../agent-stream.js';
 export declare class MockStream<TEvent = unknown> implements AsyncIterable<TEvent> {
     events: TEvent[];
     completed: Promise<unknown>;
@@ -9,6 +10,8 @@ export declare class MockStream<TEvent = unknown> implements AsyncIterable<TEven
     finalOutput: string;
     output: unknown[];
     constructor(events: TEvent[]);
+    get runUsage(): unknown;
     [Symbol.asyncIterator](): AsyncGenerator<TEvent, void, unknown>;
 }
+export declare function createMockStream<TEvent = unknown>(events: TEvent[]): AgentStream & MockStream<TEvent>;
 //# sourceMappingURL=mock-stream.d.ts.map

package/dist/services/test-helpers/mock-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mock-stream.d.ts","sourceRoot":"","sources":["../../../source/services/test-helpers/mock-stream.ts"],"names":[],"mappings":"AAAA,qBAAa,UAAU,CAAC,MAAM,GAAG,OAAO,CAAE,YAAW,aAAa,CAAC,MAAM,CAAC;IACxE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,OAAO,EAAE,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,EAAE,CAAC;IAElB,YAAY,MAAM,EAAE,MAAM,EAAE,EAU3B;IAEM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAIrE;CACF"}
+{"version":3,"file":"mock-stream.d.ts","sourceRoot":"","sources":["../../../source/services/test-helpers/mock-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEzE,qBAAa,UAAU,CAAC,MAAM,GAAG,OAAO,CAAE,YAAW,aAAa,CAAC,MAAM,CAAC;IACxE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,OAAO,EAAE,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,EAAE,CAAC;IAElB,YAAY,MAAM,EAAE,MAAM,EAAE,EAW3B;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAEM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAIrE;CACF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAErG"}

package/dist/services/test-helpers/mock-stream.js

@@ -1,3 +1,4 @@
+import { createAgentStream } from '../agent-stream.js';
 export class MockStream {
     events;
     completed;
@@ -18,6 +19,10 @@ export class MockStream {
         this.history = [];
         this.finalOutput = '';
         this.output = [];
+        createAgentStream(this);
+    }
+    get runUsage() {
+        return this.state.usage;
     }
     async *[Symbol.asyncIterator]() {
         for (const event of this.events) {
@@ -25,4 +30,7 @@ export class MockStream {
         }
     }
 }
+export function createMockStream(events) {
+    return createAgentStream(new MockStream(events));
+}
 //# sourceMappingURL=mock-stream.js.map

package/dist/services/test-helpers/mock-stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"mock-stream.js","sourceRoot":"","sources":["../../../source/services/test-helpers/mock-stream.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,UAAU;IACrB,MAAM,CAAW;IACjB,SAAS,CAAmB;IAC5B,cAAc,CAAS;IACvB,aAAa,CAAY;IACzB,KAAK,CAA0B;IAC/B,QAAQ,CAAY;IACpB,OAAO,CAAY;IACnB,WAAW,CAAS;IACpB,MAAM,CAAY;IAElB,YAAY,MAAgB;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"mock-stream.js","sourceRoot":"","sources":["../../../source/services/test-helpers/mock-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAoB,MAAM,oBAAoB,CAAC;AAEzE,MAAM,OAAO,UAAU;IACrB,MAAM,CAAW;IACjB,SAAS,CAAmB;IAC5B,cAAc,CAAS;IACvB,aAAa,CAAY;IACzB,KAAK,CAA0B;IAC/B,QAAQ,CAAY;IACpB,OAAO,CAAY;IACnB,WAAW,CAAS;IACpB,MAAM,CAAY;IAElB,YAAY,MAAgB;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,iBAAiB,CAAC,IAAa,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,gBAAgB,CAAmB,MAAgB;IACjE,OAAO,iBAAiB,CAAC,IAAI,UAAU,CAAC,MAAM,CAAU,CAAqC,CAAC;AAChG,CAAC"}

package/dist/services/tool-execution-ledger.d.ts

@@ -50,6 +50,8 @@ export declare class ToolExecutionLedger {
      * synthetic output.
      */
     activeCallIdsForTurn(turnId?: string): string[];
+    /** Returns completed tool-result call IDs recorded during the current turn. */
+    completedResultCallIdsForCurrentTurn(): string[];
     getRecoverySummary(): ToolLedgerRecoverySummary | null;
 }
 /**

package/dist/services/tool-execution-ledger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-execution-ledger.d.ts","sourceRoot":"","sources":["../../source/services/tool-execution-ledger.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAEvG,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,yBAAyB;IACxC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,QAAQ,UAAW,OAAO,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IACqC,CAAC;AAE1G,eAAO,MAAM,OAAO,SAAU,OAAO,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAMjE,CAAC;AAUF,eAAO,MAAM,QAAQ,SAAU,OAAO,KAAG,MAAM,GAAG,IAIjD,CAAC;AAOF,eAAO,MAAM,UAAU,SAAU,OAAO,KAAG,MAI1C,CAAC;AAOF,eAAO,MAAM,QAAQ,SAAU,OAAO,KAAG,OAGxC,CAAC;AAqHF,qBAAa,mBAAmB;;IAM9B,SAAS,IAAI,MAAM,CAIlB;IAED;;;;OAIG;IACH,gBAAgB,IAAI,MAAM,CAEzB;IAED,MAAM,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,GAAG,SAAS,GAAG,IAAI,CAI/D;IAED,MAAM,IAAI,kBAAkB,EAAE,CAE7B;IAED,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAKtC;IAED,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAiCtC;IAED,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAqCxC;IAED,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAY1D;IAED,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,SAAqC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CA+BxG;IAED;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAG9C;IAED,kBAAkB,IAAI,yBAAyB,GAAG,IAAI,CAsBrD;CACF;AAKD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,EAAE,CA8BhF;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,SAAS,OAAO,EAAE,EAC3B,MAAM,EAAE,SAAS,kBAAkB,EAAE,GAAG,SAAS,GAChD,yBAAyB,CA4B3B;AAsBD;;;;;;;;;;GAUG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,CAQlF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,EAAE,CA4BzF"}
+{"version":3,"file":"tool-execution-ledger.d.ts","sourceRoot":"","sources":["../../source/services/tool-execution-ledger.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAEvG,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,yBAAyB;IACxC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,QAAQ,UAAW,OAAO,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IACqC,CAAC;AAE1G,eAAO,MAAM,OAAO,SAAU,OAAO,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAMjE,CAAC;AAoBF,eAAO,MAAM,QAAQ,SAAU,OAAO,KAAG,MAAM,GAAG,IAEjD,CAAC;AAKF,eAAO,MAAM,UAAU,SAAU,OAAO,KAAG,MAE1C,CAAC;AAEF,eAAO,MAAM,QAAQ,SAAU,OAAO,KAAG,OAGxC,CAAC;AAoFF,qBAAa,mBAAmB;;IAM9B,SAAS,IAAI,MAAM,CAIlB;IAED;;;;OAIG;IACH,gBAAgB,IAAI,MAAM,CAEzB;IAED,MAAM,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,GAAG,SAAS,GAAG,IAAI,CAI/D;IAED,MAAM,IAAI,kBAAkB,EAAE,CAE7B;IAED,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAKtC;IAED,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CA+BtC;IAED,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CA6BxC;IAED,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAY1D;IAED,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,SAAqC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CA+BxG;IAED;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAG9C;IAED,+EAA+E;IAC/E,oCAAoC,IAAI,MAAM,EAAE,CAI/C;IAED,kBAAkB,IAAI,yBAAyB,GAAG,IAAI,CAsBrD;CACF;AAKD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,EAAE,CA8BhF;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,SAAS,OAAO,EAAE,EAC3B,MAAM,EAAE,SAAS,kBAAkB,EAAE,GAAG,SAAS,GAChD,yBAAyB,CAoC3B;AAsBD;;;;;;;;;;GAUG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,CAQlF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,EAAE,CA4BzF"}

package/dist/services/tool-execution-ledger.js

@@ -1,3 +1,4 @@
+import { normalizeRunItem } from './conversation/run-item-normalizer.js';
 export const asRecord = (value) => value && typeof value === 'object' && !Array.isArray(value) ? value : null;
 export const rawItem = (item) => {
     const record = asRecord(item);
@@ -6,6 +7,8 @@ export const rawItem = (item) => {
     }
     return asRecord(record.rawItem) ?? record;
 };
+const canonicalToolItem = (item) => normalizeRunItem(item).find((candidate) => candidate.type === 'tool_call' || candidate.type === 'tool_result') ?? null;
+const hasCanonicalType = (item, type) => normalizeRunItem(item).some((candidate) => candidate.type === type);
 const clone = (value) => {
     try {
         return structuredClone(value);
@@ -15,46 +18,21 @@ const clone = (value) => {
     }
 };
 export const callIdOf = (item) => {
-    const raw = rawItem(item);
-    const callId = raw?.callId ?? raw?.call_id ?? raw?.tool_call_id ?? raw?.toolCallId ?? raw?.id;
-    return typeof callId === 'string' && callId ? callId : null;
-};
-const typeOf = (item) => {
-    const type = rawItem(item)?.type;
-    return typeof type === 'string' ? type : '';
+    return canonicalToolItem(item)?.callId ?? null;
 };
+const isToolCall = (item) => canonicalToolItem(item)?.type === 'tool_call';
+const isToolResult = (item) => canonicalToolItem(item)?.type === 'tool_result';
 export const toolNameOf = (item) => {
-    const raw = rawItem(item);
-    const name = raw?.name ?? asRecord(item)?.name;
-    return typeof name === 'string' && name ? name : 'unknown';
-};
-const argumentsOf = (item) => {
-    const raw = rawItem(item);
-    return raw?.arguments ?? raw?.args ?? asRecord(item)?.arguments ?? asRecord(item)?.args;
+    return canonicalToolItem(item)?.toolName ?? 'unknown';
 };
 export const outputOf = (item) => {
-    const raw = rawItem(item);
-    return raw?.output ?? asRecord(item)?.output;
+    const normalized = canonicalToolItem(item);
+    return normalized?.type === 'tool_result' ? normalized.output : undefined;
 };
-const normalizedRawItem = (item) => {
-    const raw = rawItem(item);
-    return raw ? clone(raw) : clone(item);
-};
-const normalizeAbortedHistoryItem = (item, isAbortedEntry) => {
-    if (!isAbortedEntry) {
-        return clone(item);
-    }
-    const raw = rawItem(item);
-    if (!raw) {
-        return clone(item);
-    }
-    const type = typeof raw.type === 'string' ? raw.type : '';
-    if (type !== 'function_call_output' && type !== 'function_call_output_result') {
-        return clone(item);
-    }
-    const normalized = clone(raw);
-    normalized.type = 'tool_call_output_item';
-    return normalized;
+/** History remains provider-facing even when the stream hands us an SDK wrapper. */
+const providerHistoryItem = (item) => {
+    const canonical = canonicalToolItem(item);
+    return clone(canonical?.providerItem ?? rawItem(item) ?? item);
 };
 const turnNumberOf = (turnId) => {
     if (typeof turnId !== 'string') {
@@ -95,14 +73,10 @@ const hasCallPair = (history, callId) => {
         if (callIdOf(item) !== callId) {
             continue;
         }
-        const type = typeOf(item);
-        if (type === 'function_call') {
+        if (isToolCall(item)) {
             hasCall = true;
         }
-        else if (type === 'function_call_result' ||
-            type === 'function_call_output' ||
-            type === 'function_call_output_result' ||
-            type === 'tool_call_output_item') {
+        else if (isToolResult(item)) {
             hasResult = true;
         }
     }
@@ -110,14 +84,8 @@ const hasCallPair = (history, callId) => {
 };
 const hasRecoverableCallPair = (entry) => Array.isArray(entry.historyItems) && entry.historyItems.length >= 2;
 const isCompleteLedgerEntry = (entry) => entry.status === 'completed' && hasRecoverableCallPair(entry);
-const hasReasoningHistoryItem = (items) => Array.isArray(items) && items.some((item) => typeOf(item) === 'reasoning');
-const isResultHistoryItem = (item) => {
-    const type = typeOf(item);
-    return (type === 'function_call_result' ||
-        type === 'function_call_output' ||
-        type === 'function_call_output_result' ||
-        type === 'tool_call_output_item');
-};
+const hasReasoningHistoryItem = (items) => Array.isArray(items) && items.some((item) => hasCanonicalType(item, 'reasoning'));
+const isResultHistoryItem = isToolResult;
 const hasResultHistoryItem = (items, callId) => Array.isArray(items) && items.some((item) => callIdOf(item) === callId && isResultHistoryItem(item));
 const reasoningHistoryItem = (text) => ({
     type: 'reasoning',
@@ -157,20 +125,18 @@ export class ToolExecutionLedger {
         this.#pendingReasoningHistoryItems = [reasoningHistoryItem(text)];
     }
     recordFunctionCall(item) {
-        if (typeOf(item) !== 'function_call') {
-            return;
-        }
-        const callId = callIdOf(item);
-        if (!callId) {
+        const toolCall = canonicalToolItem(item);
+        if (toolCall?.type !== 'tool_call') {
             return;
         }
+        const { callId } = toolCall;
         const existing = this.#entries.find((entry) => entry.callId === callId && entry.status !== 'completed');
         if (existing) {
-            existing.toolName = toolNameOf(item);
-            existing.arguments = argumentsOf(item);
+            existing.toolName = toolCall.toolName;
+            existing.arguments = toolCall.arguments;
             existing.status = 'started';
             if (!existing.historyItems || existing.historyItems.length === 0) {
-                existing.historyItems = [...this.#pendingReasoningHistoryItems, normalizedRawItem(item)];
+                existing.historyItems = [...this.#pendingReasoningHistoryItems, providerHistoryItem(item)];
             }
             else if (this.#pendingReasoningHistoryItems.length > 0 && !hasReasoningHistoryItem(existing.historyItems)) {
                 existing.historyItems = [...this.#pendingReasoningHistoryItems, ...existing.historyItems];
@@ -181,42 +147,36 @@ export class ToolExecutionLedger {
         this.#entries.push({
             turnId: this.#currentTurnId,
             callId,
-            toolName: toolNameOf(item),
-            arguments: argumentsOf(item),
+            toolName: toolCall.toolName,
+            arguments: toolCall.arguments,
             status: 'started',
             startedAt: new Date().toISOString(),
-            historyItems: [...this.#pendingReasoningHistoryItems, normalizedRawItem(item)],
+            historyItems: [...this.#pendingReasoningHistoryItems, providerHistoryItem(item)],
         });
         this.#pendingReasoningHistoryItems = [];
     }
     recordFunctionResult(item) {
-        const type = typeOf(item);
-        if (type !== 'function_call_result' &&
-            type !== 'function_call_output' &&
-            type !== 'function_call_output_result' &&
-            type !== 'tool_call_output_item') {
-            return;
-        }
-        const callId = callIdOf(item);
-        if (!callId) {
+        const toolResult = canonicalToolItem(item);
+        if (toolResult?.type !== 'tool_result') {
             return;
         }
+        const { callId } = toolResult;
         let entry = [...this.#entries].reverse().find((candidate) => candidate.callId === callId);
         if (!entry) {
             entry = {
                 turnId: this.#currentTurnId,
                 callId,
-                toolName: toolNameOf(item),
+                toolName: toolResult.toolName,
                 status: 'started',
                 startedAt: new Date().toISOString(),
                 historyItems: [],
             };
             this.#entries.push(entry);
         }
-        const callItem = entry.historyItems?.find((historyItem) => typeOf(historyItem) === 'function_call');
-        const resultItem = normalizedRawItem(item);
+        const callItem = entry.historyItems?.find(isToolCall);
+        const resultItem = providerHistoryItem(item);
         entry.status = 'completed';
-        entry.output = outputOf(item);
+        entry.output = toolResult.output;
         entry.completedAt = new Date().toISOString();
         const previousHistoryItems = entry.historyItems ?? (callItem ? [callItem] : []);
         entry.historyItems = hasResultHistoryItem(previousHistoryItems, callId)
@@ -242,7 +202,7 @@ export class ToolExecutionLedger {
             .filter((candidate) => candidate.status === 'started' || candidate.status === 'approval_required');
         const targets = callId ? candidates.filter((c) => c.callId === callId) : candidates;
         for (const entry of targets) {
-            const callItem = entry.historyItems?.find((historyItem) => typeOf(historyItem) === 'function_call');
+            const callItem = entry.historyItems?.find(isToolCall);
             if (!callItem) {
                 entry.status = 'aborted';
                 entry.failureReason = reason;
@@ -276,6 +236,12 @@ export class ToolExecutionLedger {
         const target = turnId ?? this.#currentTurnId;
         return this.#entries.filter((entry) => entry.turnId === target).map((entry) => entry.callId);
     }
+    /** Returns completed tool-result call IDs recorded during the current turn. */
+    completedResultCallIdsForCurrentTurn() {
+        return this.#entries
+            .filter((entry) => entry.turnId === this.#currentTurnId && entry.status === 'completed')
+            .map((entry) => entry.callId);
+    }
     getRecoverySummary() {
         const currentTurnEntries = this.#entries.filter((entry) => entry.turnId === this.#currentTurnId);
         if (currentTurnEntries.length === 0) {
@@ -313,7 +279,7 @@ export function dropUnpairedFunctionCalls(history) {
     const callIdsWithCall = new Set();
     const callIdsWithResult = new Set();
     for (const item of history) {
-        if (typeOf(item) === 'function_call') {
+        if (isToolCall(item)) {
             const callId = callIdOf(item);
             if (callId) {
                 callIdsWithCall.add(callId);
@@ -328,7 +294,7 @@ export function dropUnpairedFunctionCalls(history) {
     }
     const filtered = history.filter((item) => {
         const callId = callIdOf(item);
-        if (typeOf(item) === 'function_call') {
+        if (isToolCall(item)) {
             return !callId || callIdsWithResult.has(callId);
         }
         if (isResultHistoryItem(item)) {
@@ -339,7 +305,7 @@ export function dropUnpairedFunctionCalls(history) {
     return filtered.length === history.length ? history : filtered;
 }
 export function reconcileHistoryWithToolLedger(history, ledger) {
-    const next = clone([...history]);
+    let next = clone([...history]);
     const entries = Array.isArray(ledger) ? ledger : [];
     let addedCompletedPairs = 0;
     let droppedIncompleteCalls = 0;
@@ -348,8 +314,20 @@ export function reconcileHistoryWithToolLedger(history, ledger) {
             if (hasCallPair(next, entry.callId)) {
                 continue;
             }
-            next.splice(insertionIndexForEntry(next, entry), 0, ...entry.historyItems.map((item) => normalizeAbortedHistoryItem(item, entry.status === 'aborted')));
-            if (entry.status === 'completed') {
+            // The persisted assistant_turn is compact: it keeps only a turn's last
+            // tool result, so replayed history can hold a lone call or result for
+            // this callId. Drop those fragments before inserting the authoritative
+            // ledger pair, or the result is duplicated and the pair lands after a
+            // result that precedes its call — a shape OpenAI-compatible providers
+            // reject with 400 ("tool must be a response to a preceding message with
+            // tool_calls").
+            next = next.filter((item) => callIdOf(item) !== entry.callId);
+            next.splice(insertionIndexForEntry(next, entry), 0, ...clone(entry.historyItems));
+            // Count both completed and aborted pairs as injected so the warning fires
+            // and replaceHistory is called. Without this, aborted pairs injected from
+            // markOpenCallsAborted (with synthetic error results) would not trigger a
+            // history replacement, leaving dangling function_call items in the store.
+            if (entry.status === 'completed' || entry.status === 'aborted') {
                 addedCompletedPairs++;
             }
             continue;
@@ -393,7 +371,7 @@ const isMalformedJsonString = (value) => {
  */
 export function hasMalformedToolCallArguments(history) {
     return history.some((item) => {
-        if (typeOf(item) !== 'function_call') {
+        if (!isToolCall(item)) {
             return false;
         }
         const raw = rawItem(item);
@@ -418,7 +396,7 @@ export function hasMalformedToolCallArguments(history) {
 export function sanitizeMalformedToolCallArguments(history) {
     let changed = false;
     const result = history.map((item) => {
-        if (typeOf(item) !== 'function_call') {
+        if (!isToolCall(item)) {
             return item;
         }
         const raw = rawItem(item);