@qduc/term2 0.4.0 → 0.6.0

package/dist/utils/execute-shell.d.ts

@@ -4,6 +4,7 @@ type ExecImpl = (command: string, options: {
     cwd?: string;
     timeout?: number;
     maxBuffer?: number;
+    detached?: boolean;
 }, callback: ExecCallback) => ChildProcess;
 export interface ShellExecutionResult {
     stdout: string;
@@ -16,6 +17,7 @@ export interface ExecuteShellOptions {
     cwd?: string;
     timeout?: number;
     maxBuffer?: number;
+    signal?: AbortSignal;
     sshService?: ISSHService;
     execImpl?: ExecImpl;
 }

package/dist/utils/execute-shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute-shell.d.ts","sourceRoot":"","sources":["../../source/utils/execute-shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAGxD,KAAK,YAAY,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC;AAE3F,KAAK,QAAQ,GAAG,CACd,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EAC/D,QAAQ,EAAE,YAAY,KACnB,YAAY,CAAC;AAIlB,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAEhE,MAAM,WAAW,mBAAmB;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,oBAAoB,CAAC,CAgD/B"}
+{"version":3,"file":"execute-shell.d.ts","sourceRoot":"","sources":["../../source/utils/execute-shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAGxD,KAAK,YAAY,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC;AAE3F,KAAK,QAAQ,GAAG,CACd,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,EACnF,QAAQ,EAAE,YAAY,KACnB,YAAY,CAAC;AAIlB,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAEhE,MAAM,WAAW,mBAAmB;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAeD,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,oBAAoB,CAAC,CA4D/B"}

package/dist/utils/execute-shell.js

@@ -1,18 +1,35 @@
 import { exec } from 'child_process';
 import process from 'process';
 const defaultExecImpl = exec;
+function stopChildProcess(child) {
+    if (process.platform !== 'win32' && child.pid) {
+        try {
+            process.kill(-child.pid, 'SIGTERM');
+            return;
+        }
+        catch {
+            // Fall back to killing the direct child when it has no usable process group.
+        }
+    }
+    child.kill('SIGTERM');
+}
 export async function executeShellCommand(command, options = {}) {
-    const { cwd = process.cwd(), timeout, maxBuffer, sshService, execImpl = defaultExecImpl } = options;
+    const { cwd = process.cwd(), timeout, maxBuffer, signal, sshService, execImpl = defaultExecImpl } = options;
     if (sshService) {
         return sshService.executeCommand(command, { cwd });
     }
     try {
         const result = await new Promise((resolve, reject) => {
+            let stopChild;
             const child = execImpl(command, {
                 cwd,
                 timeout,
                 maxBuffer,
+                detached: process.platform !== 'win32',
             }, (error, stdout, stderr) => {
+                if (stopChild) {
+                    signal?.removeEventListener('abort', stopChild);
+                }
                 if (error) {
                     error.stdout = stdout;
                     error.stderr = stderr;
@@ -21,6 +38,13 @@ export async function executeShellCommand(command, options = {}) {
                 }
                 resolve({ stdout, stderr });
             });
+            stopChild = () => stopChildProcess(child);
+            if (signal?.aborted) {
+                stopChild();
+            }
+            else {
+                signal?.addEventListener('abort', stopChild, { once: true });
+            }
             child.stdin?.end();
         });
         return {

package/dist/utils/execute-shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute-shell.js","sourceRoot":"","sources":["../../source/utils/execute-shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAqB,MAAM,eAAe,CAAC;AACxD,OAAO,OAAO,MAAM,SAAS,CAAC;AAU9B,MAAM,eAAe,GAAa,IAAI,CAAC;AAmBvC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAe,EACf,UAA+B,EAAE;IAEjC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,GAAG,eAAe,EAAE,GAAG,OAAO,CAAC;IAEpG,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAyD,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3G,MAAM,KAAK,GAAG,QAAQ,CACpB,OAAO,EACP;gBACE,GAAG;gBACH,OAAO;gBACP,SAAS;aACV,EACD,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACxB,IAAI,KAAK,EAAE,CAAC;oBACV,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;oBACtB,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;oBACtB,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,OAAO;gBACT,CAAC;gBAED,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9B,CAAC,CACF,CAAC;YAEF,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAG,OAAO,KAAK,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACrE,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,EAAE,MAAM,IAAI,KAAK,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC;QAEvE,OAAO;YACL,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,QAAQ;YACR,QAAQ;SACT,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"execute-shell.js","sourceRoot":"","sources":["../../source/utils/execute-shell.ts"],"names":[],"mappings":"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"}

package/dist/utils/execute-shell.test.js

@@ -59,6 +59,28 @@ test('executeShellCommand closes child stdin immediately', async (t) => {
     t.true(stdinEnded);
     t.is(result.exitCode, 0);
 });
+test('executeShellCommand stops the child process when execution is aborted', async (t) => {
+    const abortController = new AbortController();
+    let killCalls = 0;
+    const resultPromise = executeShellCommand('long-running', {
+        signal: abortController.signal,
+        execImpl: (_command, _options, callback) => {
+            const child = createFakeChildProcess();
+            child.kill = () => {
+                killCalls += 1;
+                const error = new Error('aborted');
+                error.signal = 'SIGTERM';
+                queueMicrotask(() => callback(error, '', ''));
+                return true;
+            };
+            return child;
+        },
+    });
+    abortController.abort();
+    const result = await resultPromise;
+    t.is(killCalls, 1);
+    t.true(result.timedOut);
+});
 function createFakeChildProcess() {
     return {
         stdin: new PassThrough(),

package/dist/utils/execute-shell.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute-shell.test.js","sourceRoot":"","sources":["../../source/utils/execute-shell.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execute-shell.test.js","sourceRoot":"","sources":["../../source/utils/execute-shell.test.ts"],"names":[],"mappings":"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"}

package/dist/utils/extract-command-messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-command-messages.d.ts","sourceRoot":"","sources":["../../source/utils/extract-command-messages.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAkBxD,eAAO,MAAM,+BAA+B,GAAI,SAAS,MAAM,GAAG,IAAI,KAAG,IAKxE,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,IAEhD,CAAC;AAsDF,eAAO,MAAM,sBAAsB,GAAI,QAAO,GAAG,EAAO,KAAG,cAAc,EAqFxE,CAAC"}
+{"version":3,"file":"extract-command-messages.d.ts","sourceRoot":"","sources":["../../source/utils/extract-command-messages.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIxD,eAAO,MAAM,+BAA+B,GAAI,SAAS,MAAM,GAAG,IAAI,KAAG,IAKxE,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,IAEhD,CAAC;AA0CF,eAAO,MAAM,sBAAsB,GAAI,QAAO,GAAG,EAAO,KAAG,cAAc,EAqFxE,CAAC"}

package/dist/utils/extract-command-messages.js

@@ -1,13 +1,5 @@
 import { getCallIdFromItem, normalizeToolArguments, getOutputText } from '../tools/format-helpers.js';
-import { formatShellCommandMessage } from '../tools/shell.js';
-import { formatGrepCommandMessage } from '../tools/grep.js';
-import { formatApplyPatchCommandMessage } from '../tools/apply-patch.js';
-import { formatSearchReplaceCommandMessage } from '../tools/search-replace.js';
-import { formatAskMentorCommandMessage } from '../tools/ask-mentor.js';
-import { formatReadFileCommandMessage } from '../tools/read-file.js';
-import { formatFindFilesCommandMessage } from '../tools/find-files.js';
-import { TOOL_NAME_APPLY_PATCH, TOOL_NAME_CODE_CONTEXT_SEARCH, TOOL_NAME_READ_CODE_OUTLINE, TOOL_NAME_SEARCH_REPLACE, } from '../tools/tool-names.js';
-import { formatCodeContextSearchCommandMessage, formatReadCodeOutlineCommandMessage } from '../tools/code-context.js';
+import { getToolFormatter } from '../tools/command-message-formatters.js';
 const approvalRejectionCallIds = new Set();
 export const markToolCallAsApprovalRejection = (callId) => {
     if (!callId) {
@@ -51,17 +43,6 @@ const normalizeToolItem = (item) => {
         outputText: getOutputText(item),
     };
 };
-const toolFormatters = {
-    shell: formatShellCommandMessage,
-    grep: formatGrepCommandMessage,
-    [TOOL_NAME_APPLY_PATCH]: formatApplyPatchCommandMessage,
-    read_file: formatReadFileCommandMessage,
-    find_files: formatFindFilesCommandMessage,
-    [TOOL_NAME_READ_CODE_OUTLINE]: formatReadCodeOutlineCommandMessage,
-    [TOOL_NAME_CODE_CONTEXT_SEARCH]: formatCodeContextSearchCommandMessage,
-    [TOOL_NAME_SEARCH_REPLACE]: formatSearchReplaceCommandMessage,
-    ask_mentor: formatAskMentorCommandMessage,
-};
 export const extractCommandMessages = (items = []) => {
     const messages = [];
     const toolCallArgumentsById = new Map();
@@ -90,7 +71,7 @@ export const extractCommandMessages = (items = []) => {
             continue;
         }
         const isApprovalRejection = isApprovalRejectionForItem(item);
-        const formatter = toolFormatters[normalizedItem.toolName];
+        const formatter = getToolFormatter(normalizedItem.toolName);
         if (formatter) {
             const results = formatter(item, index, toolCallArgumentsById);
             if (isApprovalRejection) {

package/dist/utils/extract-command-messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract-command-messages.js","sourceRoot":"","sources":["../../source/utils/extract-command-messages.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extract-command-messages.js","sourceRoot":"","sources":["../../source/utils/extract-command-messages.ts"],"names":[],"mappings":"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"}

package/dist/utils/model-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-settings.d.ts","sourceRoot":"","sources":["../../source/utils/model-settings.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,eAAO,MAAM,qBAAqB,EAAE,kBAAkB,EAwBrD,CAAC;AAEF,eAAO,MAAM,sBAAsB,UAAwD,CAAC;AAE5F,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAEtF;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAE3F"}
+{"version":3,"file":"model-settings.d.ts","sourceRoot":"","sources":["../../source/utils/model-settings.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,eAAO,MAAM,qBAAqB,EAAE,kBAAkB,EA0CrD,CAAC;AAEF,eAAO,MAAM,sBAAsB,UAAwD,CAAC;AAE5F,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAEtF;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAE3F"}

package/dist/utils/model-settings.js

@@ -24,6 +24,24 @@ export const MODEL_SETTING_CONFIGS = [
         providerKey: SETTING_KEYS.TOOLS_EDIT_HEALING_PROVIDER,
         fallbackProviderKey: SETTING_KEYS.AGENT_PROVIDER,
     },
+    {
+        modelKey: SETTING_KEYS.AGENT_SUBAGENT_EXPLORER_MODEL,
+        trigger: '/settings agent.subagentExplorerModel ',
+        providerKey: SETTING_KEYS.AGENT_SUBAGENT_EXPLORER_PROVIDER,
+        fallbackProviderKey: SETTING_KEYS.AGENT_PROVIDER,
+    },
+    {
+        modelKey: SETTING_KEYS.AGENT_SUBAGENT_WORKER_MODEL,
+        trigger: '/settings agent.subagentWorkerModel ',
+        providerKey: SETTING_KEYS.AGENT_SUBAGENT_WORKER_PROVIDER,
+        fallbackProviderKey: SETTING_KEYS.AGENT_PROVIDER,
+    },
+    {
+        modelKey: SETTING_KEYS.AGENT_SUBAGENT_RESEARCHER_MODEL,
+        trigger: '/settings agent.subagentResearcherModel ',
+        providerKey: SETTING_KEYS.AGENT_SUBAGENT_RESEARCHER_PROVIDER,
+        fallbackProviderKey: SETTING_KEYS.AGENT_PROVIDER,
+    },
 ];
 export const MODEL_SETTING_TRIGGERS = MODEL_SETTING_CONFIGS.map((config) => config.trigger);
 export function getModelSettingConfig(modelKey) {

package/dist/utils/model-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-settings.js","sourceRoot":"","sources":["../../source/utils/model-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAS9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,SAAS,CAAC;AAE3C,MAAM,CAAC,MAAM,qBAAqB,GAAyB;IACzD;QACE,QAAQ,EAAE,YAAY,CAAC,WAAW;QAClC,OAAO,EAAE,wBAAwB;QACjC,WAAW,EAAE,YAAY,CAAC,cAAc;KACzC;IACD;QACE,QAAQ,EAAE,YAAY,CAAC,kBAAkB;QACzC,OAAO,EAAE,8BAA8B;QACvC,WAAW,EAAE,YAAY,CAAC,qBAAqB;QAC/C,mBAAmB,EAAE,YAAY,CAAC,cAAc;KACjD;IACD;QACE,QAAQ,EAAE,YAAY,CAAC,wBAAwB;QAC/C,OAAO,EAAE,mCAAmC;QAC5C,WAAW,EAAE,YAAY,CAAC,2BAA2B;QACrD,mBAAmB,EAAE,YAAY,CAAC,cAAc;KACjD;IACD;QACE,QAAQ,EAAE,YAAY,CAAC,wBAAwB;QAC/C,OAAO,EAAE,mCAAmC;QAC5C,WAAW,EAAE,YAAY,CAAC,2BAA2B;QACrD,mBAAmB,EAAE,YAAY,CAAC,cAAc;KACjD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAE5F,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,KAAa;IACzD,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAClF,CAAC"}
+{"version":3,"file":"model-settings.js","sourceRoot":"","sources":["../../source/utils/model-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAS9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,SAAS,CAAC;AAE3C,MAAM,CAAC,MAAM,qBAAqB,GAAyB;IACzD;QACE,QAAQ,EAAE,YAAY,CAAC,WAAW;QAClC,OAAO,EAAE,wBAAwB;QACjC,WAAW,EAAE,YAAY,CAAC,cAAc;KACzC;IACD;QACE,QAAQ,EAAE,YAAY,CAAC,kBAAkB;QACzC,OAAO,EAAE,8BAA8B;QACvC,WAAW,EAAE,YAAY,CAAC,qBAAqB;QAC/C,mBAAmB,EAAE,YAAY,CAAC,cAAc;KACjD;IACD;QACE,QAAQ,EAAE,YAAY,CAAC,wBAAwB;QAC/C,OAAO,EAAE,mCAAmC;QAC5C,WAAW,EAAE,YAAY,CAAC,2BAA2B;QACrD,mBAAmB,EAAE,YAAY,CAAC,cAAc;KACjD;IACD;QACE,QAAQ,EAAE,YAAY,CAAC,wBAAwB;QAC/C,OAAO,EAAE,mCAAmC;QAC5C,WAAW,EAAE,YAAY,CAAC,2BAA2B;QACrD,mBAAmB,EAAE,YAAY,CAAC,cAAc;KACjD;IACD;QACE,QAAQ,EAAE,YAAY,CAAC,6BAA6B;QACpD,OAAO,EAAE,wCAAwC;QACjD,WAAW,EAAE,YAAY,CAAC,gCAAgC;QAC1D,mBAAmB,EAAE,YAAY,CAAC,cAAc;KACjD;IACD;QACE,QAAQ,EAAE,YAAY,CAAC,2BAA2B;QAClD,OAAO,EAAE,sCAAsC;QAC/C,WAAW,EAAE,YAAY,CAAC,8BAA8B;QACxD,mBAAmB,EAAE,YAAY,CAAC,cAAc;KACjD;IACD;QACE,QAAQ,EAAE,YAAY,CAAC,+BAA+B;QACtD,OAAO,EAAE,0CAA0C;QACnD,WAAW,EAAE,YAAY,CAAC,kCAAkC;QAC5D,mBAAmB,EAAE,YAAY,CAAC,cAAc;KACjD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAE5F,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,KAAa;IACzD,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAClF,CAAC"}

package/dist/utils/output-trim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output-trim.d.ts","sourceRoot":"","sources":["../../source/utils/output-trim.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,8DAA8D;IAC9D,QAAQ,EAAE,MAAM,CAAC;IACjB,kEAAkE;IAClE,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,iCAAiC;AACjC,eAAO,MAAM,mBAAmB,EAAE,gBAGjC,CAAC;AAKF;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAErE;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,gBAAgB,CAEhD;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAoD5F"}
+{"version":3,"file":"output-trim.d.ts","sourceRoot":"","sources":["../../source/utils/output-trim.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,8DAA8D;IAC9D,QAAQ,EAAE,MAAM,CAAC;IACjB,kEAAkE;IAClE,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,iCAAiC;AACjC,eAAO,MAAM,mBAAmB,EAAE,gBAGjC,CAAC;AAcF;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAErE;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,gBAAgB,CAEhD;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAsD5F"}

package/dist/utils/output-trim.js

@@ -5,6 +5,14 @@ export const DEFAULT_TRIM_CONFIG = {
 };
 /** Current trim configuration (can be modified at runtime) */
 let trimConfig = { ...DEFAULT_TRIM_CONFIG };
+function trimByCharacters(output, maxCharacters, note) {
+    const keepChars = Math.floor(maxCharacters * 0.4);
+    const head = output.slice(0, keepChars);
+    const tail = output.slice(-keepChars);
+    const trimmedChars = output.length - keepChars * 2;
+    const noteSuffix = note ? `; ${note}` : '';
+    return `${head}\n... [${trimmedChars} characters trimmed${noteSuffix}] ...\n${tail}`;
+}
 /**
  * Set the output trim configuration.
  */
@@ -39,11 +47,7 @@ export function trimOutput(output, maxLines, maxCharacters) {
     }
     // Special case: single very long line that exceeds character limit
     if (lines.length === 1 && exceedsCharacters) {
-        const keepChars = Math.floor(effectiveMaxCharacters * 0.4);
-        const head = output.slice(0, keepChars);
-        const tail = output.slice(-keepChars);
-        const trimmedChars = output.length - keepChars * 2;
-        return `${head}\n... [${trimmedChars} characters trimmed] ...\n${tail}`;
+        return trimByCharacters(output, effectiveMaxCharacters);
     }
     // Calculate how many lines to keep at beginning and end
     // Keep 40% at the beginning, 40% at the end, trim 20% from the middle
@@ -66,6 +70,10 @@ export function trimOutput(output, maxLines, maxCharacters) {
     const tailLines = lines.slice(-effectiveKeepLines);
     const trimmedCount = lines.length - effectiveKeepLines * 2;
     const trimMessage = `\n... [${trimmedCount} lines trimmed] ...\n`;
-    return headLines.join('\n') + trimMessage + tailLines.join('\n');
+    const lineTrimmedOutput = headLines.join('\n') + trimMessage + tailLines.join('\n');
+    if (lineTrimmedOutput.length > effectiveMaxCharacters) {
+        return trimByCharacters(lineTrimmedOutput, effectiveMaxCharacters, `${trimmedCount} lines trimmed`);
+    }
+    return lineTrimmedOutput;
 }
 //# sourceMappingURL=output-trim.js.map

package/dist/utils/output-trim.js.map

@@ -1 +1 @@
-{"version":3,"file":"output-trim.js","sourceRoot":"","sources":["../../source/utils/output-trim.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"output-trim.js","sourceRoot":"","sources":["../../source/utils/output-trim.ts"],"names":[],"mappings":"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"}

package/dist/utils/streaming-session-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streaming-session-factory.d.ts","sourceRoot":"","sources":["../../source/utils/streaming-session-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EACL,8BAA8B,EAC9B,KAAK,4BAA4B,EACjC,KAAK,SAAS,EACf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxD,MAAM,WAAW,2BAA2B,CAAC,QAAQ,SAAS,SAAS,GAAG,SAAS;IACjF,cAAc,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC;IACzE,WAAW,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC;IACnE,YAAY,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,CAAC;IACrE,sBAAsB,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,wBAAwB,CAAC,CAAC;IACzF,cAAc,EAAE,eAAe,CAAC;IAChC,YAAY,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/C,mBAAmB,EAAE,MAAM,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,cAAc,CAAC;IAC5C,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;CACxE;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,EAAE,4BAA4B,CAAC,oBAAoB,CAAC,CAAC;IACvE,gBAAgB,EAAE,4BAA4B,CAAC,kBAAkB,CAAC,CAAC;IACnE,cAAc,EAAE,cAAc,CAAC;IAC/B,sBAAsB,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC5D;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,SAAS,SAAS,GAAG,SAAS,EAC3E,IAAI,EAAE,2BAA2B,CAAC,QAAQ,CAAC,EAC3C,KAAK,EAAE,MAAM,GACZ,gBAAgB,CAmGlB"}
+{"version":3,"file":"streaming-session-factory.d.ts","sourceRoot":"","sources":["../../source/utils/streaming-session-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EACL,8BAA8B,EAC9B,KAAK,4BAA4B,EACjC,KAAK,SAAS,EACf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxD,MAAM,WAAW,2BAA2B,CAAC,QAAQ,SAAS,SAAS,GAAG,SAAS;IACjF,cAAc,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC;IACzE,WAAW,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC;IACnE,YAAY,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,CAAC;IACrE,sBAAsB,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,wBAAwB,CAAC,CAAC;IACzF,cAAc,EAAE,eAAe,CAAC;IAChC,YAAY,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/C,mBAAmB,EAAE,MAAM,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,cAAc,CAAC;IAC5C,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;CACxE;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,EAAE,4BAA4B,CAAC,oBAAoB,CAAC,CAAC;IACvE,gBAAgB,EAAE,4BAA4B,CAAC,kBAAkB,CAAC,CAAC;IACnE,cAAc,EAAE,cAAc,CAAC;IAC/B,sBAAsB,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC5D;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,SAAS,SAAS,GAAG,SAAS,EAC3E,IAAI,EAAE,2BAA2B,CAAC,QAAQ,CAAC,EAC3C,KAAK,EAAE,MAAM,GACZ,gBAAgB,CAiHlB"}

package/dist/utils/streaming-session-factory.js

@@ -79,13 +79,28 @@ export function createStreamingSession(deps, label) {
         if (event.type === 'usage_update') {
             // Emit usage updates in real-time during streaming
             deps.loggingService.debug(`UI received streaming usage (${label})`, { usage: event.usage });
+            streamingState.latestUsage = event.usage;
             deps.setLastUsage(event.usage);
         }
         else if (event.type === 'final') {
-            if (event.usage) {
+            if (event.usage && !streamingState.latestUsage) {
+                // No per-turn usage was streamed (e.g. a non-streaming provider). Fall
+                // back to the final event's usage so the footer still shows something.
                 deps.loggingService.debug(`UI received final usage (${label})`, { usage: event.usage });
+                streamingState.latestUsage = event.usage;
                 deps.setLastUsage(event.usage);
             }
+            else if (event.usage) {
+                // The final event carries the run-cumulative total (the sum of every
+                // model turn in the run). The footer is a per-turn indicator, so keep
+                // the last streamed turn's usage rather than overwriting it with the
+                // run total. The run-cumulative still reaches the session accumulator
+                // via result.usage in applyServiceResult.
+                deps.loggingService.debug(`UI keeping last streamed turn usage; final carries run total (${label})`, {
+                    finalUsage: event.usage,
+                    shownUsage: streamingState.latestUsage,
+                });
+            }
             else {
                 deps.loggingService.debug(`UI final event has no usage (${label})`);
             }

package/dist/utils/streaming-session-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"streaming-session-factory.js","sourceRoot":"","sources":["../../source/utils/streaming-session-factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"streaming-session-factory.js","sourceRoot":"","sources":["../../source/utils/streaming-session-factory.ts"],"names":[],"mappings":"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"}

package/dist/utils/streaming-session-factory.test.js

@@ -36,6 +36,7 @@ test('createStreamingSession wires state and logs final usage', (t) => {
                 flushedReasoningLength: 0,
                 textWasFlushed: false,
                 currentReasoningMessageId: null,
+                latestUsage: null,
             };
             calls.streamingState = state;
             return state;
@@ -53,12 +54,53 @@ test('createStreamingSession wires state and logs final usage', (t) => {
     const finalEvent = { type: 'final', usage, finalText: '' };
     session.applyConversationEvent(finalEvent);
     t.is(calls.lastUsage, usage);
+    t.is(session.streamingState.latestUsage, usage);
     t.is(calls.debugMessages[0]?.message, 'UI received final usage (sendUserMessage)');
     t.deepEqual(calls.debugMessages[0]?.meta, { usage });
     t.deepEqual(calls.eventHandlerEvents, [finalEvent]);
     session.applyConversationEvent({ type: 'final', finalText: '' });
     t.is(calls.debugMessages[1]?.message, 'UI final event has no usage (sendUserMessage)');
 });
+test('final event does not overwrite the per-turn footer usage with the run-cumulative total', (t) => {
+    const calls = {
+        lastUsageHistory: [],
+        debugMessages: [],
+    };
+    const reasoningUpdater = { push: () => { }, cancel: () => { }, flush: () => { } };
+    const session = createStreamingSession({
+        appendMessages: () => { },
+        setMessages: () => { },
+        trimMessages: (messages) => messages,
+        annotateCommandMessage: (msg) => msg,
+        loggingService: {
+            info: () => { },
+            warn: () => { },
+            error: () => { },
+            debug: (message) => calls.debugMessages.push(message),
+            security: () => { },
+            setCorrelationId: () => { },
+            getCorrelationId: () => undefined,
+            clearCorrelationId: () => { },
+        },
+        setLastUsage: (nextUsage) => {
+            calls.lastUsageHistory.push(nextUsage);
+        },
+        reasoningThrottleMs: 200,
+        now: () => 123,
+        createStreamingUpdateCoordinator: () => reasoningUpdater,
+        createConversationEventHandler: () => () => { },
+    }, 'sendUserMessage');
+    // Per-turn streamed usage for the last model turn (what the footer should show).
+    const lastTurnUsage = { prompt_tokens: 1800, completion_tokens: 90, total_tokens: 1890 };
+    session.applyConversationEvent({ type: 'usage_update', usage: lastTurnUsage });
+    // Terminal final event carries the run-cumulative total (sum of every turn).
+    const runTotalUsage = { prompt_tokens: 9000, completion_tokens: 420, total_tokens: 9420 };
+    session.applyConversationEvent({ type: 'final', finalText: 'Done.', usage: runTotalUsage });
+    // Footer keeps the last per-turn value; it is not overwritten by the run total.
+    t.is(session.streamingState.latestUsage, lastTurnUsage);
+    t.deepEqual(calls.lastUsageHistory, [lastTurnUsage]);
+    t.true(calls.debugMessages.some((m) => m.startsWith('UI keeping last streamed turn usage')));
+});
 test('botResponseUpdater creates and updates streaming bot messages', (t) => {
     let messages = [];
     const session = createStreamingSession({

package/dist/utils/streaming-session-factory.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"streaming-session-factory.test.js","sourceRoot":"","sources":["../../source/utils/streaming-session-factory.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"streaming-session-factory.test.js","sourceRoot":"","sources":["../../source/utils/streaming-session-factory.test.ts"],"names":[],"mappings":"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"}

package/dist/utils/token-usage.d.ts

@@ -19,10 +19,23 @@ export interface UsageAccumulator {
 }
 export declare function normalizeUsage(usage: any): NormalizedUsage | undefined;
 export declare function extractUsage(payload: unknown): NormalizedUsage | undefined;
+/**
+ * Normalize the Agents SDK run-level Usage accumulator (`runState.usage`) into
+ * NormalizedUsage. This is the authoritative, already-cumulative usage for an
+ * entire run (all model turns, including resumed approval continuations, since
+ * the SDK keeps accumulating onto the same RunContext.usage). Cache and
+ * reasoning details are exposed as per-request arrays, so they are summed here.
+ */
+export declare function normalizeAgentRunUsage(stateUsage: any): NormalizedUsage | undefined;
 export declare function mergeUsage(preferred: NormalizedUsage | undefined, fallback: NormalizedUsage | undefined): NormalizedUsage | undefined;
 export declare function formatFooterUsage(usage: NormalizedUsage | null | undefined): string;
 export declare function addTokenUsage(current: NormalizedUsage | null | undefined, next: NormalizedUsage | null | undefined): NormalizedUsage;
 export declare function addBillableSessionTokenUsage(current: NormalizedUsage | null | undefined, next: NormalizedUsage | null | undefined): NormalizedUsage;
 export declare function createUsageAccumulator(initialUsage?: NormalizedUsage | null): UsageAccumulator;
 export declare function formatSessionTokenUsage(usage: NormalizedUsage | null | undefined): string;
+/**
+ * Format session usage with a breakdown of main vs subagent token usage.
+ * Falls back to the legacy single-line format when there is no subagent usage.
+ */
+export declare function formatSessionUsageBreakdown(main: NormalizedUsage | null | undefined, sub: NormalizedUsage | null | undefined): string;
 //# sourceMappingURL=token-usage.d.ts.map

package/dist/utils/token-usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token-usage.d.ts","sourceRoot":"","sources":["../../source/utils/token-usage.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;IACrD,KAAK,IAAI,IAAI,CAAC;IACd,GAAG,IAAI,eAAe,CAAC;CACxB;AAkCD,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,eAAe,GAAG,SAAS,CAqFtE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,eAAe,GAAG,SAAS,CAmD1E;AAED,wBAAgB,UAAU,CACxB,SAAS,EAAE,eAAe,GAAG,SAAS,EACtC,QAAQ,EAAE,eAAe,GAAG,SAAS,GACpC,eAAe,GAAG,SAAS,CAM7B;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAwBnF;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,EAC3C,IAAI,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACvC,eAAe,CAoBjB;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,EAC3C,IAAI,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACvC,eAAe,CAUjB;AAED,wBAAgB,sBAAsB,CAAC,YAAY,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,gBAAgB,CAc9F;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAOzF"}
+{"version":3,"file":"token-usage.d.ts","sourceRoot":"","sources":["../../source/utils/token-usage.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;IACrD,KAAK,IAAI,IAAI,CAAC;IACd,GAAG,IAAI,eAAe,CAAC;CACxB;AAkCD,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,eAAe,GAAG,SAAS,CAsFtE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,eAAe,GAAG,SAAS,CAmD1E;AAuBD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,GAAG,GAAG,eAAe,GAAG,SAAS,CAqCnF;AAED,wBAAgB,UAAU,CACxB,SAAS,EAAE,eAAe,GAAG,SAAS,EACtC,QAAQ,EAAE,eAAe,GAAG,SAAS,GACpC,eAAe,GAAG,SAAS,CAM7B;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAwBnF;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,EAC3C,IAAI,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACvC,eAAe,CAoBjB;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,EAC3C,IAAI,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACvC,eAAe,CAUjB;AAED,wBAAgB,sBAAsB,CAAC,YAAY,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,gBAAgB,CAc9F;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAOzF;AAWD;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,EACxC,GAAG,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACtC,MAAM,CAaR"}

package/dist/utils/token-usage.js

@@ -41,7 +41,7 @@ export function normalizeUsage(usage) {
     const completionTokens = coalesceNumber(usage.completion_tokens, usage.output_tokens, usage.output_token_count, usage.completion_token_count, usage.candidatesTokenCount, usage.outputTokenCount, usage.outputTokens, // Agents SDK
     usage.predicted_n);
     const cacheCreationTokens = coalesceNumber(usage.cache_creation_input_tokens, usage.cacheCreationInputTokens, usage.cache_creation_tokens, usage.cacheCreationTokens);
-    const cacheReadTokens = coalesceNumber(usage.cache_read_input_tokens, usage.cacheReadInputTokens, usage.cache_read_tokens, usage.cached_tokens, usage.cachedTokens, usage.prompt_tokens_details?.cached_tokens, usage.promptTokensDetails?.cachedTokens, usage.cachedContentTokenCount, usage.cached_content_token_count);
+    const cacheReadTokens = coalesceNumber(usage.cache_read_input_tokens, usage.cacheReadInputTokens, usage.cache_read_tokens, usage.cached_tokens, usage.cachedTokens, usage.inputTokensDetails?.cached_tokens, usage.prompt_tokens_details?.cached_tokens, usage.promptTokensDetails?.cachedTokens, usage.cachedContentTokenCount, usage.cached_content_token_count);
     const totalTokens = coalesceNumber(usage.total_tokens, usage.total_token_count, usage.totalTokenCount, usage.totalTokens) ?? sumNumbers(promptTokens, completionTokens, cacheCreationTokens);
     const reasoningTokens = coalesceNumber(usage.reasoning_tokens, usage.reasoning_token_count, usage?.completion_tokens_details?.reasoning_tokens, usage?.output_tokens_details?.reasoning_tokens, usage.thoughtsTokenCount, usage.thoughts_token_count);
     const promptMs = coalesceNumber(usage.prompt_ms, usage.promptMs);
@@ -114,6 +114,75 @@ export function extractUsage(payload) {
     // Re-normalize to fix up computed total_tokens if components were merged from different sources
     return normalizeUsage(merged);
 }
+function sumDetailField(details, keys) {
+    if (!Array.isArray(details)) {
+        // The SDK may surface a single detail record instead of a per-request array.
+        const single = asUsageContainer(details);
+        if (!single)
+            return undefined;
+        return coalesceNumber(...keys.map((key) => single[key]));
+    }
+    let total = 0;
+    let found = false;
+    for (const entry of details) {
+        const record = asUsageContainer(entry);
+        if (!record)
+            continue;
+        const value = coalesceNumber(...keys.map((key) => record[key]));
+        if (value == null)
+            continue;
+        total += value;
+        found = true;
+    }
+    return found ? total : undefined;
+}
+/**
+ * Normalize the Agents SDK run-level Usage accumulator (`runState.usage`) into
+ * NormalizedUsage. This is the authoritative, already-cumulative usage for an
+ * entire run (all model turns, including resumed approval continuations, since
+ * the SDK keeps accumulating onto the same RunContext.usage). Cache and
+ * reasoning details are exposed as per-request arrays, so they are summed here.
+ */
+export function normalizeAgentRunUsage(stateUsage) {
+    const usage = asUsageContainer(stateUsage);
+    if (!usage)
+        return undefined;
+    const promptTokens = coalesceNumber(usage.inputTokens, usage.input_tokens);
+    const completionTokens = coalesceNumber(usage.outputTokens, usage.output_tokens);
+    const totalTokens = coalesceNumber(usage.totalTokens, usage.total_tokens) ?? sumNumbers(promptTokens, completionTokens);
+    const cacheReadTokens = sumDetailField(usage.inputTokensDetails ?? usage.input_tokens_details, [
+        'cached_tokens',
+        'cachedTokens',
+        'cache_read_tokens',
+        'cacheReadTokens',
+    ]);
+    const cacheCreationTokens = sumDetailField(usage.inputTokensDetails ?? usage.input_tokens_details, [
+        'cache_creation_tokens',
+        'cacheCreationTokens',
+        'cache_creation_input_tokens',
+    ]);
+    const reasoningTokens = sumDetailField(usage.outputTokensDetails ?? usage.output_tokens_details, [
+        'reasoning_tokens',
+        'reasoningTokens',
+    ]);
+    const mapped = {};
+    if (promptTokens != null)
+        mapped.prompt_tokens = promptTokens;
+    if (completionTokens != null)
+        mapped.completion_tokens = completionTokens;
+    if (totalTokens != null)
+        mapped.total_tokens = totalTokens;
+    if (reasoningTokens != null)
+        mapped.reasoning_tokens = reasoningTokens;
+    if (cacheReadTokens != null)
+        mapped.cache_read_tokens = cacheReadTokens;
+    if (cacheCreationTokens != null)
+        mapped.cache_creation_tokens = cacheCreationTokens;
+    // An all-zero accumulator means the provider never reported usage; treat as absent
+    // so callers can fall back to other extraction paths.
+    const hasSignal = (mapped.prompt_tokens ?? 0) + (mapped.completion_tokens ?? 0) + (mapped.total_tokens ?? 0) > 0;
+    return hasSignal ? mapped : undefined;
+}
 export function mergeUsage(preferred, fallback) {
     if (!preferred)
         return fallback;
@@ -197,4 +266,26 @@ export function formatSessionTokenUsage(usage) {
     const cachedPart = cachedTokens > 0 ? ` (${cachedTokens.toLocaleString()} cached)` : '';
     return `Token usage: ${promptTokens.toLocaleString()} input${cachedPart}, ${completionTokens.toLocaleString()} output`;
 }
+function formatUsageLine(label, usage) {
+    const promptTokens = usage?.prompt_tokens ?? 0;
+    const completionTokens = usage?.completion_tokens ?? 0;
+    const cachedTokens = usage?.cache_read_tokens ?? 0;
+    const cachedPart = cachedTokens > 0 ? ` (${cachedTokens.toLocaleString()} cached)` : '';
+    return `${label}: ${promptTokens.toLocaleString()} input${cachedPart}, ${completionTokens.toLocaleString()} output`;
+}
+/**
+ * Format session usage with a breakdown of main vs subagent token usage.
+ * Falls back to the legacy single-line format when there is no subagent usage.
+ */
+export function formatSessionUsageBreakdown(main, sub) {
+    const hasSubUsage = sub && Object.keys(sub).length > 0 && (sub.prompt_tokens ?? 0) + (sub.completion_tokens ?? 0) > 0;
+    if (!hasSubUsage) {
+        return formatSessionTokenUsage(main);
+    }
+    const mainLine = formatUsageLine('Main', main);
+    const subLine = formatUsageLine('Subagents', sub);
+    const total = addTokenUsage(main, sub);
+    const totalLine = formatUsageLine('Total', total);
+    return `${mainLine}\n${subLine}\n${totalLine}`;
+}
 //# sourceMappingURL=token-usage.js.map