@qduc/term2 0.3.1 → 0.5.0

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

@@ -2,18 +2,14 @@ import test from 'ava';
 import { createStreamingSession } from './streaming-session-factory.js';
 test('createStreamingSession wires state and logs final usage', (t) => {
     const calls = {
-        liveResponses: [],
-        liveResponseIds: [],
         eventHandlerEvents: [],
         debugMessages: [],
     };
-    const liveResponseUpdater = { push: () => { }, cancel: () => { }, flush: () => { } };
     const reasoningUpdater = { push: () => { }, cancel: () => { }, flush: () => { } };
     const usage = { total_tokens: 12 };
     const session = createStreamingSession({
         appendMessages: () => { },
         setMessages: () => { },
-        setLiveResponse: (response) => calls.liveResponses.push(response),
         trimMessages: (messages) => messages,
         annotateCommandMessage: (msg) => msg,
         loggingService: {
@@ -29,25 +25,23 @@ test('createStreamingSession wires state and logs final usage', (t) => {
         setLastUsage: (nextUsage) => {
             calls.lastUsage = nextUsage;
         },
-        createLiveResponseUpdater: (id) => {
-            calls.liveResponseIds.push(id);
-            return liveResponseUpdater;
-        },
         reasoningThrottleMs: 200,
         now: () => 123,
         createStreamingState: () => {
             const state = {
                 accumulatedText: '',
+                flushedTextLength: 0,
+                currentBotMessageId: null,
                 accumulatedReasoningText: '',
                 flushedReasoningLength: 0,
                 textWasFlushed: false,
                 currentReasoningMessageId: null,
+                latestUsage: null,
             };
             calls.streamingState = state;
             return state;
         },
-        createStreamingUpdateCoordinator: (_callback, interval) => {
-            calls.coordinatorInterval = interval;
+        createStreamingUpdateCoordinator: (_callback) => {
             return reasoningUpdater;
         },
         createConversationEventHandler: (deps, state) => {
@@ -56,19 +50,99 @@ test('createStreamingSession wires state and logs final usage', (t) => {
             return (event) => calls.eventHandlerEvents.push(event);
         },
     }, 'sendUserMessage');
-    t.deepEqual(calls.liveResponses, [{ id: '123-0', sender: 'bot', text: '' }]);
-    t.deepEqual(calls.liveResponseIds, ['123-0']);
-    t.is(calls.coordinatorInterval, 200);
     t.is(calls.eventHandlerState, calls.streamingState);
-    t.is(calls.eventHandlerDeps.liveResponseUpdater, liveResponseUpdater);
-    t.is(calls.eventHandlerDeps.reasoningUpdater, reasoningUpdater);
     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({
+        appendMessages: (additions) => {
+            messages = [...messages, ...additions];
+        },
+        setMessages: (updater) => {
+            messages = updater(messages);
+        },
+        trimMessages: (nextMessages) => nextMessages,
+        annotateCommandMessage: (msg) => msg,
+        loggingService: {
+            info: () => { },
+            warn: () => { },
+            error: () => { },
+            debug: () => { },
+            security: () => { },
+            setCorrelationId: () => { },
+            getCorrelationId: () => undefined,
+            clearCorrelationId: () => { },
+        },
+        setLastUsage: () => { },
+        reasoningThrottleMs: 200,
+        now: () => 456,
+        createStreamingUpdateCoordinator: (callback) => {
+            const invoke = callback;
+            return {
+                push: (...args) => invoke(...args),
+                flush: () => { },
+                cancel: () => { },
+            };
+        },
+    }, 'sendUserMessage');
+    session.botResponseUpdater.push('Partial');
+    session.botResponseUpdater.push('Partial response');
+    t.deepEqual(messages, [
+        {
+            id: '456-0',
+            sender: 'bot',
+            status: 'streaming',
+            text: 'Partial response',
+        },
+    ]);
+});
 //# sourceMappingURL=streaming-session-factory.test.js.map

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":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE,IAAI,CAAC,yDAAyD,EAAE,CAAC,CAAC,EAAE,EAAE;IACpE,MAAM,KAAK,GAOP;QACF,kBAAkB,EAAE,EAAE;QACtB,aAAa,EAAE,EAAE;KAClB,CAAC;IAEF,MAAM,gBAAgB,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;IAC/E,MAAM,KAAK,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IAEnC,MAAM,OAAO,GAAG,sBAAsB,CACpC;QACE,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;QACxB,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC;QACrB,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACpC,sBAAsB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG;QACpC,cAAc,EAAE;YACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;YACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;YACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;YACf,KAAK,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YACrE,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;YAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;YAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;YACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;SAC7B;QACD,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE;YAC1B,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAC9B,CAAC;QACD,mBAAmB,EAAE,GAAG;QACxB,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG;QACd,oBAAoB,EAAE,GAAG,EAAE;YACzB,MAAM,KAAK,GAAG;gBACZ,eAAe,EAAE,EAAE;gBACnB,iBAAiB,EAAE,CAAC;gBACpB,mBAAmB,EAAE,IAAI;gBACzB,wBAAwB,EAAE,EAAE;gBAC5B,sBAAsB,EAAE,CAAC;gBACzB,cAAc,EAAE,KAAK;gBACrB,yBAAyB,EAAE,IAAI;gBAC/B,WAAW,EAAE,IAAI;aAClB,CAAC;YACF,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,gCAAgC,EAAE,CAAC,SAAS,EAAE,EAAE;YAC9C,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QACD,8BAA8B,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC9C,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC9B,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC;YAChC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzD,CAAC;KACF,EACD,iBAAiB,CAClB,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAEpD,MAAM,UAAU,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAW,CAAC;IACpE,OAAO,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAE3C,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,2CAA2C,CAAC,CAAC;IACnF,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACrD,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEpD,OAAO,CAAC,sBAAsB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAW,CAAC,CAAC;IAC1E,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,+CAA+C,CAAC,CAAC;AACzF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wFAAwF,EAAE,CAAC,CAAC,EAAE,EAAE;IACnG,MAAM,KAAK,GAAyD;QAClE,gBAAgB,EAAE,EAAE;QACpB,aAAa,EAAE,EAAE;KAClB,CAAC;IAEF,MAAM,gBAAgB,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;IAE/E,MAAM,OAAO,GAAG,sBAAsB,CACpC;QACE,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;QACxB,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC;QACrB,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACpC,sBAAsB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG;QACpC,cAAc,EAAE;YACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;YACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;YACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;YACf,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;YACrD,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;YAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;YAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;YACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;SAC7B;QACD,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE;YAC1B,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QACD,mBAAmB,EAAE,GAAG;QACxB,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG;QACd,gCAAgC,EAAE,GAAG,EAAE,CAAC,gBAAgB;QACxD,8BAA8B,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC;KAC/C,EACD,iBAAiB,CAClB,CAAC;IAEF,iFAAiF;IACjF,MAAM,aAAa,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IACzF,OAAO,CAAC,sBAAsB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,EAAW,CAAC,CAAC;IAExF,6EAA6E;IAC7E,MAAM,aAAa,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1F,OAAO,CAAC,sBAAsB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAW,CAAC,CAAC;IAErG,gFAAgF;IAChF,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACxD,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,qCAAqC,CAAC,CAAC,CAAC,CAAC;AAC/F,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+DAA+D,EAAE,CAAC,CAAC,EAAE,EAAE;IAC1E,IAAI,QAAQ,GAAU,EAAE,CAAC;IAEzB,MAAM,OAAO,GAAG,sBAAsB,CACpC;QACE,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE;YAC5B,QAAQ,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,SAAS,CAAC,CAAC;QACzC,CAAC;QACD,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE;YACvB,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;QACD,YAAY,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY;QAC5C,sBAAsB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG;QACpC,cAAc,EAAE;YACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;YACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;YACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;YACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;YACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;YAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;YAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;YACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;SAC7B;QACD,YAAY,EAAE,GAAG,EAAE,GAAE,CAAC;QACtB,mBAAmB,EAAE,GAAG;QACxB,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG;QACd,gCAAgC,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC7C,MAAM,MAAM,GAAG,QAA+C,CAAC;YAC/D,OAAO;gBACL,IAAI,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;gBACzC,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;gBACf,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC;aACjB,CAAC;QACJ,CAAC;KACF,EACD,iBAAiB,CAClB,CAAC;IAEF,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAEpD,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE;QACpB;YACE,EAAE,EAAE,OAAO;YACX,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,WAAW;YACnB,IAAI,EAAE,kBAAkB;SACzB;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/utils/subsequence-filter.d.ts

@@ -0,0 +1,8 @@
+export declare const isSubsequenceMatch: (query: string, target: string) => boolean;
+export declare const BOUNDARY_REGEX: RegExp;
+/**
+ * Returns -Infinity if query is not a subsequence of target.
+ * Higher score = better match. Rewards consecutive runs and word-boundary hits.
+ */
+export declare const scoreSubsequence: (query: string, target: string) => number;
+//# sourceMappingURL=subsequence-filter.d.ts.map

package/dist/utils/subsequence-filter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subsequence-filter.d.ts","sourceRoot":"","sources":["../../source/utils/subsequence-filter.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,OAQlE,CAAC;AAEF,eAAO,MAAM,cAAc,QAAY,CAAC;AAExC;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,MAiChE,CAAC"}

package/dist/utils/subsequence-filter.js

@@ -0,0 +1,47 @@
+export const isSubsequenceMatch = (query, target) => {
+    const q = query.toLowerCase();
+    const t = target.toLowerCase();
+    let qi = 0;
+    for (let ti = 0; ti < t.length && qi < q.length; ti++) {
+        if (t[ti] === q[qi])
+            qi++;
+    }
+    return qi === q.length;
+};
+export const BOUNDARY_REGEX = /[/.\-_]/;
+/**
+ * Returns -Infinity if query is not a subsequence of target.
+ * Higher score = better match. Rewards consecutive runs and word-boundary hits.
+ */
+export const scoreSubsequence = (query, target) => {
+    const q = query.toLowerCase();
+    let qi = 0;
+    let score = 0;
+    let consecutive = 0;
+    let prevMatchIndex = -1;
+    for (let ti = 0; ti < target.length && qi < q.length; ti++) {
+        if (target[ti].toLowerCase() === q[qi]) {
+            if (prevMatchIndex === ti - 1) {
+                consecutive++;
+                score += consecutive * 4;
+            }
+            else {
+                consecutive = 0;
+                score += 1;
+            }
+            const prev = ti > 0 ? target[ti - 1] : null;
+            const atBoundary = ti === 0 ||
+                (prev !== null && BOUNDARY_REGEX.test(prev)) ||
+                (prev !== null && prev === prev.toLowerCase() && target[ti] !== target[ti].toLowerCase());
+            if (atBoundary)
+                score += 8;
+            prevMatchIndex = ti;
+            qi++;
+        }
+    }
+    if (qi < q.length)
+        return -Infinity;
+    score -= target.length * 0.05;
+    return score;
+};
+//# sourceMappingURL=subsequence-filter.js.map

package/dist/utils/subsequence-filter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subsequence-filter.js","sourceRoot":"","sources":["../../source/utils/subsequence-filter.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAa,EAAE,MAAc,EAAW,EAAE;IAC3E,MAAM,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAC9B,MAAM,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;IAC/B,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;QACtD,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAAE,EAAE,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC;AAExC;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,MAAc,EAAU,EAAE;IACxE,MAAM,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAC9B,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;IAExB,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;QAC3D,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;YACvC,IAAI,cAAc,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC9B,WAAW,EAAE,CAAC;gBACd,KAAK,IAAI,WAAW,GAAG,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,WAAW,GAAG,CAAC,CAAC;gBAChB,KAAK,IAAI,CAAC,CAAC;YACb,CAAC;YAED,MAAM,IAAI,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5C,MAAM,UAAU,GACd,EAAE,KAAK,CAAC;gBACR,CAAC,IAAI,KAAK,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC5C,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YAC5F,IAAI,UAAU;gBAAE,KAAK,IAAI,CAAC,CAAC;YAE3B,cAAc,GAAG,EAAE,CAAC;YACpB,EAAE,EAAE,CAAC;QACP,CAAC;IACH,CAAC;IAED,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM;QAAE,OAAO,CAAC,QAAQ,CAAC;IAEpC,KAAK,IAAI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

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

@@ -7,10 +7,35 @@ export interface NormalizedUsage {
     completion_tokens?: number;
     total_tokens?: number;
     reasoning_tokens?: number;
+    cache_read_tokens?: number;
+    cache_creation_tokens?: number;
     prompt_ms?: number;
     completion_ms?: number;
 }
+export interface UsageAccumulator {
+    add(usage: NormalizedUsage | null | undefined): void;
+    reset(): void;
+    get(): NormalizedUsage;
+}
 export declare function normalizeUsage(usage: any): NormalizedUsage | undefined;
-export declare function extractUsage(payload: 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;AAEH,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,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AA6BD,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,eAAe,GAAG,SAAS,CAoEtE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,eAAe,GAAG,SAAS,CA8BtE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAgBnF"}
+{"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

@@ -1,7 +1,3 @@
-/**
- * Token usage normalization and extraction utilities.
- * Ported from backend/src/lib/utils/usage.js
- */
 function toNumber(value) {
     if (value == null)
         return undefined;
@@ -30,6 +26,11 @@ function sumNumbers(...values) {
     }
     return found ? total : undefined;
 }
+function asUsageContainer(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return undefined;
+    return value;
+}
 export function normalizeUsage(usage) {
     if (!usage || typeof usage !== 'object')
         return undefined;
@@ -39,9 +40,9 @@ export function normalizeUsage(usage) {
         : undefined);
     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);
-    const cacheReadTokens = coalesceNumber(usage.cache_read_input_tokens, usage.cacheReadInputTokens);
-    const totalTokens = coalesceNumber(usage.total_tokens, usage.total_token_count, usage.totalTokenCount, usage.totalTokens) ?? sumNumbers(promptTokens, completionTokens, cacheCreationTokens, cacheReadTokens);
+    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.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);
     const completionMs = coalesceNumber(usage.completion_ms, usage.completionMs, usage.predicted_ms, usage.predictedMs, usage.output_ms, usage.outputMs);
@@ -54,6 +55,10 @@ export function normalizeUsage(usage) {
         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;
     if (promptMs != null)
         mapped.prompt_ms = promptMs;
     if (completionMs != null)
@@ -61,49 +66,226 @@ export function normalizeUsage(usage) {
     return Object.keys(mapped).length > 0 ? mapped : undefined;
 }
 export function extractUsage(payload) {
-    if (!payload || typeof payload !== 'object')
+    const root = asUsageContainer(payload);
+    if (!root)
         return undefined;
     const results = [];
-    const direct = normalizeUsage(payload.usage);
-    if (direct)
-        results.push(direct);
-    const metadata = normalizeUsage(payload.usageMetadata || payload.usage_metadata);
-    if (metadata)
-        results.push(metadata);
-    const nested = normalizeUsage(payload.response?.usage);
-    if (nested)
-        results.push(nested);
-    const timings = normalizeUsage(payload.timings);
-    if (timings)
-        results.push(timings);
-    // Fallback search for any usage field in the payload itself
-    const self = normalizeUsage(payload);
-    if (self)
-        results.push(self);
+    const seen = new Set();
+    const enqueue = (candidate) => {
+        const record = asUsageContainer(candidate);
+        if (!record || seen.has(record))
+            return;
+        seen.add(record);
+        const direct = normalizeUsage(record.usage);
+        if (direct)
+            results.push(direct);
+        const metadata = normalizeUsage(record.usageMetadata || record.usage_metadata);
+        if (metadata)
+            results.push(metadata);
+        const responseUsage = normalizeUsage(asUsageContainer(record.response)?.usage);
+        if (responseUsage)
+            results.push(responseUsage);
+        const eventUsage = normalizeUsage(asUsageContainer(record.event)?.usage);
+        if (eventUsage)
+            results.push(eventUsage);
+        const timings = normalizeUsage(record.timings);
+        if (timings)
+            results.push(timings);
+        const self = normalizeUsage(record);
+        if (self)
+            results.push(self);
+    };
+    enqueue(root);
+    enqueue(root.data);
+    enqueue(root.event);
+    enqueue(asUsageContainer(root.data)?.event);
+    enqueue(root.response);
+    enqueue(asUsageContainer(root.data)?.response);
     if (results.length === 0)
         return undefined;
     const merged = {};
     for (let i = results.length - 1; i >= 0; i--) {
         Object.assign(merged, results[i]);
     }
+    const mergedComponentTotal = sumNumbers(merged.prompt_tokens, merged.completion_tokens, merged.cache_creation_tokens);
+    if (mergedComponentTotal != null) {
+        merged.total_tokens = mergedComponentTotal;
+    }
     // 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;
+    if (!fallback)
+        return preferred;
+    const merged = { ...fallback, ...preferred };
+    return normalizeUsage(merged) ?? merged;
+}
 export function formatFooterUsage(usage) {
     if (!usage)
         return '';
     const parts = [];
     if (usage.prompt_tokens != null) {
-        parts.push(`${usage.prompt_tokens.toLocaleString()} in`);
+        let promptPart = `${usage.prompt_tokens.toLocaleString()} in`;
+        const promptDetails = [];
+        if (usage.cache_read_tokens != null) {
+            promptDetails.push(`${usage.cache_read_tokens.toLocaleString()} cached`);
+        }
+        if (usage.cache_creation_tokens != null) {
+            promptDetails.push(`${usage.cache_creation_tokens.toLocaleString()} cache write`);
+        }
+        if (promptDetails.length > 0) {
+            promptPart += ` (${promptDetails.join(', ')})`;
+        }
+        parts.push(promptPart);
     }
     if (usage.completion_tokens != null) {
         parts.push(`${usage.completion_tokens.toLocaleString()} out`);
     }
-    if (usage.total_tokens != null) {
-        parts.push(`${usage.total_tokens.toLocaleString()} total`);
-    }
     if (parts.length === 0)
         return '';
     return `Tok: ${parts.join(' / ')}`;
 }
+export function addTokenUsage(current, next) {
+    const result = { ...(current ?? {}) };
+    if (!next)
+        return result;
+    const addField = (field) => {
+        const value = next[field];
+        if (value == null)
+            return;
+        result[field] = (result[field] ?? 0) + value;
+    };
+    addField('prompt_tokens');
+    addField('completion_tokens');
+    addField('total_tokens');
+    addField('reasoning_tokens');
+    addField('cache_read_tokens');
+    addField('cache_creation_tokens');
+    addField('prompt_ms');
+    addField('completion_ms');
+    return result;
+}
+export function addBillableSessionTokenUsage(current, next) {
+    if (!next)
+        return { ...(current ?? {}) };
+    const billablePromptTokens = next.prompt_tokens == null ? undefined : Math.max(0, next.prompt_tokens - (next.cache_read_tokens ?? 0));
+    return addTokenUsage(current, {
+        ...next,
+        ...(billablePromptTokens != null ? { prompt_tokens: billablePromptTokens } : {}),
+    });
+}
+export function createUsageAccumulator(initialUsage) {
+    let accumulated = addBillableSessionTokenUsage(undefined, initialUsage);
+    return {
+        add(usage) {
+            accumulated = addBillableSessionTokenUsage(accumulated, usage);
+        },
+        reset() {
+            accumulated = {};
+        },
+        get() {
+            return { ...accumulated };
+        },
+    };
+}
+export function formatSessionTokenUsage(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 `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

package/dist/utils/token-usage.js.map

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