@qduc/term2 0.3.1 → 0.5.0

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

@@ -1,5 +1,5 @@
 import test from 'ava';
-import { normalizeUsage, extractUsage, formatFooterUsage } from './token-usage.js';
+import { addBillableSessionTokenUsage, addTokenUsage, createUsageAccumulator, extractUsage, formatFooterUsage, formatSessionTokenUsage, formatSessionUsageBreakdown, normalizeAgentRunUsage, normalizeUsage, } from './token-usage.js';
 test('normalizeUsage handles multiple formats', (t) => {
     // OpenAI style
     t.deepEqual(normalizeUsage({ prompt_tokens: 10, completion_tokens: 20, total_tokens: 30 }), {
@@ -7,6 +7,26 @@ test('normalizeUsage handles multiple formats', (t) => {
         completion_tokens: 20,
         total_tokens: 30,
     });
+    // OpenAI prompt token details style
+    t.deepEqual(normalizeUsage({ prompt_tokens: 10, completion_tokens: 20, prompt_tokens_details: { cached_tokens: 4 } }), {
+        prompt_tokens: 10,
+        completion_tokens: 20,
+        total_tokens: 30,
+        cache_read_tokens: 4,
+    });
+    // Anthropic style
+    t.deepEqual(normalizeUsage({
+        input_tokens: 100,
+        output_tokens: 25,
+        cache_read_input_tokens: 60,
+        cache_creation_input_tokens: 12,
+    }), {
+        prompt_tokens: 100,
+        completion_tokens: 25,
+        total_tokens: 137,
+        cache_read_tokens: 60,
+        cache_creation_tokens: 12,
+    });
     // Agents SDK style
     t.deepEqual(normalizeUsage({ inputTokens: 5, outputTokens: 15, totalTokens: 20 }), {
         prompt_tokens: 5,
@@ -19,6 +39,36 @@ test('normalizeUsage handles multiple formats', (t) => {
         total_tokens: 100,
     });
 });
+test('normalizeAgentRunUsage reads the SDK run-state accumulator and sums per-request detail arrays', (t) => {
+    // Shape mirrors @openai/agents-core Usage: cumulative scalar totals plus
+    // per-request detail arrays for cache/reasoning.
+    t.deepEqual(normalizeAgentRunUsage({
+        requests: 3,
+        inputTokens: 6000,
+        outputTokens: 280,
+        totalTokens: 6280,
+        inputTokensDetails: [{ cached_tokens: 500 }, { cached_tokens: 1000 }, { cached_tokens: 0 }],
+        outputTokensDetails: [{ reasoning_tokens: 40 }, { reasoning_tokens: 60 }, {}],
+    }), {
+        prompt_tokens: 6000,
+        completion_tokens: 280,
+        total_tokens: 6280,
+        cache_read_tokens: 1500,
+        reasoning_tokens: 100,
+    });
+});
+test('normalizeAgentRunUsage treats an all-zero accumulator as absent', (t) => {
+    t.is(normalizeAgentRunUsage({
+        requests: 0,
+        inputTokens: 0,
+        outputTokens: 0,
+        totalTokens: 0,
+        inputTokensDetails: [],
+        outputTokensDetails: [],
+    }), undefined);
+    t.is(normalizeAgentRunUsage(undefined), undefined);
+    t.is(normalizeAgentRunUsage(null), undefined);
+});
 test('extractUsage finds usage in nested locations', (t) => {
     const payload = {
         usage: { prompt_tokens: 1, total_tokens: 3 },
@@ -30,9 +80,152 @@ test('extractUsage finds usage in nested locations', (t) => {
         total_tokens: 3,
     });
 });
+test('extractUsage preserves cache usage when merging normalized sources', (t) => {
+    const payload = {
+        usage: {
+            prompt_tokens: 10,
+            prompt_tokens_details: { cached_tokens: 4 },
+        },
+        response: {
+            usage: {
+                completion_tokens: 2,
+            },
+        },
+    };
+    t.deepEqual(extractUsage(payload), {
+        prompt_tokens: 10,
+        completion_tokens: 2,
+        total_tokens: 12,
+        cache_read_tokens: 4,
+    });
+});
+test('extractUsage finds usage in raw model stream event payload shape', (t) => {
+    const payload = {
+        data: {
+            type: 'model',
+            event: {
+                id: '8d03b4e8-46ab-45f7-aed4-670157c3dd6d',
+                object: 'chat.completion.chunk',
+                created: 1778912418,
+                model: 'deepseek-v4-flash',
+                usage: {
+                    prompt_tokens: 8,
+                    completion_tokens: 3,
+                    total_tokens: 11,
+                },
+            },
+            providerData: {
+                rawModelEventSource: 'openai-chat-completions',
+            },
+        },
+        source: 'openai-chat-completions',
+        type: 'raw_model_stream_event',
+    };
+    t.deepEqual(extractUsage(payload), {
+        prompt_tokens: 8,
+        completion_tokens: 3,
+        total_tokens: 11,
+    });
+});
 test('formatFooterUsage returns formatted string', (t) => {
-    t.is(formatFooterUsage({ prompt_tokens: 1200, completion_tokens: 350, total_tokens: 1550 }), 'Tok: 1,200 in / 350 out / 1,550 total');
-    t.is(formatFooterUsage({ total_tokens: 100 }), 'Tok: 100 total');
+    t.is(formatFooterUsage({ prompt_tokens: 1200, completion_tokens: 350, total_tokens: 1550 }), 'Tok: 1,200 in / 350 out');
+    t.is(formatFooterUsage({
+        prompt_tokens: 1200,
+        completion_tokens: 350,
+        total_tokens: 1550,
+        cache_read_tokens: 900,
+        cache_creation_tokens: 120,
+    }), 'Tok: 1,200 in (900 cached, 120 cache write) / 350 out');
+    t.is(formatFooterUsage({ prompt_tokens: 2054, completion_tokens: 74, cache_read_tokens: 1920 }), 'Tok: 2,054 in (1,920 cached) / 74 out');
+    t.is(formatFooterUsage({ cache_read_tokens: 42 }), '');
+    t.is(formatFooterUsage({ total_tokens: 100 }), '');
     t.is(formatFooterUsage(null), '');
 });
+test('addTokenUsage accumulates usage counters', (t) => {
+    t.deepEqual(addTokenUsage({ prompt_tokens: 1000, completion_tokens: 200, cache_read_tokens: 800 }, { prompt_tokens: 2000, completion_tokens: 300, cache_read_tokens: 1200, cache_creation_tokens: 50 }), {
+        prompt_tokens: 3000,
+        completion_tokens: 500,
+        cache_read_tokens: 2000,
+        cache_creation_tokens: 50,
+    });
+    t.deepEqual(addTokenUsage(undefined, undefined), {});
+});
+test('addBillableSessionTokenUsage subtracts cached input before accumulating prompt tokens', (t) => {
+    t.deepEqual(addBillableSessionTokenUsage({ prompt_tokens: 100, completion_tokens: 20, cache_read_tokens: 50 }, { prompt_tokens: 1000, completion_tokens: 200, cache_read_tokens: 800 }), {
+        prompt_tokens: 300,
+        completion_tokens: 220,
+        cache_read_tokens: 850,
+    });
+    t.deepEqual(addBillableSessionTokenUsage(undefined, { prompt_tokens: 100, cache_read_tokens: 150 }), {
+        prompt_tokens: 0,
+        cache_read_tokens: 150,
+    });
+});
+test('createUsageAccumulator adds billable input and resets session usage', (t) => {
+    const accumulator = createUsageAccumulator({ prompt_tokens: 10, completion_tokens: 2 });
+    accumulator.add({ prompt_tokens: 5, completion_tokens: 3, cache_read_tokens: 4 });
+    t.deepEqual(accumulator.get(), {
+        prompt_tokens: 11,
+        completion_tokens: 5,
+        cache_read_tokens: 4,
+    });
+    accumulator.reset();
+    t.deepEqual(accumulator.get(), {});
+});
+test('createUsageAccumulator subtracts cached input on every model turn', (t) => {
+    const accumulator = createUsageAccumulator();
+    accumulator.add({ prompt_tokens: 1000, completion_tokens: 100, cache_read_tokens: 800 });
+    t.deepEqual(accumulator.get(), {
+        prompt_tokens: 200,
+        completion_tokens: 100,
+        cache_read_tokens: 800,
+    });
+    accumulator.add({ prompt_tokens: 1000, completion_tokens: 100, cache_read_tokens: 800 });
+    t.deepEqual(accumulator.get(), {
+        prompt_tokens: 400,
+        completion_tokens: 200,
+        cache_read_tokens: 1600,
+    });
+});
+test('formatSessionTokenUsage matches slash command output', (t) => {
+    t.is(formatSessionTokenUsage({
+        prompt_tokens: 20000,
+        completion_tokens: 20000,
+        cache_read_tokens: 1000000,
+        cache_creation_tokens: 500,
+    }), 'Token usage: 20,000 input (1,000,000 cached), 20,000 output');
+    t.is(formatSessionTokenUsage({ prompt_tokens: 100, completion_tokens: 20 }), 'Token usage: 100 input, 20 output');
+    t.is(formatSessionTokenUsage(null), 'Token usage: 0 input, 0 output');
+});
+test('formatSessionUsageBreakdown shows breakdown when subagent usage exists', (t) => {
+    const main = { prompt_tokens: 6827, completion_tokens: 268, cache_read_tokens: 6656 };
+    const sub = { prompt_tokens: 1000, completion_tokens: 50, cache_read_tokens: 500 };
+    const result = formatSessionUsageBreakdown(main, sub);
+    const lines = result.split('\n');
+    t.is(lines.length, 3);
+    t.is(lines[0], 'Main: 6,827 input (6,656 cached), 268 output');
+    t.is(lines[1], 'Subagents: 1,000 input (500 cached), 50 output');
+    t.is(lines[2], 'Total: 7,827 input (7,156 cached), 318 output');
+});
+test('formatSessionUsageBreakdown falls back to single line when no subagent usage', (t) => {
+    const main = { prompt_tokens: 6827, completion_tokens: 268, cache_read_tokens: 6656 };
+    t.is(formatSessionUsageBreakdown(main, null), 'Token usage: 6,827 input (6,656 cached), 268 output');
+    t.is(formatSessionUsageBreakdown(main, undefined), 'Token usage: 6,827 input (6,656 cached), 268 output');
+    t.is(formatSessionUsageBreakdown(main, {}), 'Token usage: 6,827 input (6,656 cached), 268 output');
+});
+test('formatSessionUsageBreakdown single-line fallback when subagent usage is all zeros', (t) => {
+    const main = { prompt_tokens: 100, completion_tokens: 20 };
+    const sub = { prompt_tokens: 0, completion_tokens: 0 };
+    t.is(formatSessionUsageBreakdown(main, sub), 'Token usage: 100 input, 20 output');
+});
+test('formatSessionUsageBreakdown always shows three lines when subagent has non-zero usage', (t) => {
+    const main = { prompt_tokens: 100, completion_tokens: 20 };
+    const sub = { prompt_tokens: 0, completion_tokens: 5 };
+    const result = formatSessionUsageBreakdown(main, sub);
+    const lines = result.split('\n');
+    t.is(lines.length, 3);
+    t.is(lines[0], 'Main: 100 input, 20 output');
+    t.is(lines[1], 'Subagents: 0 input, 5 output');
+    t.is(lines[2], 'Total: 100 input, 25 output');
+});
 //# sourceMappingURL=token-usage.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"token-usage.test.js","sourceRoot":"","sources":["../../source/utils/token-usage.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAEnF,IAAI,CAAC,yCAAyC,EAAE,CAAC,CAAC,EAAE,EAAE;IACpD,eAAe;IACf,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,EAAE;QAC1F,aAAa,EAAE,EAAE;QACjB,iBAAiB,EAAE,EAAE;QACrB,YAAY,EAAE,EAAE;KACjB,CAAC,CAAC;IAEH,mBAAmB;IACnB,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAAE;QACjF,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,EAAE;QACrB,YAAY,EAAE,EAAE;KACjB,CAAC,CAAC;IAEH,gBAAgB;IAChB,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;QACjD,aAAa,EAAE,GAAG;QAClB,YAAY,EAAE,GAAG;KAClB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8CAA8C,EAAE,CAAC,CAAC,EAAE,EAAE;IACzD,MAAM,OAAO,GAAG;QACd,KAAK,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE;QAC5C,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE;KAC/D,CAAC;IACF,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACjC,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,CAAC;QACpB,YAAY,EAAE,CAAC;KAChB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4CAA4C,EAAE,CAAC,CAAC,EAAE,EAAE;IACvD,CAAC,CAAC,EAAE,CACF,iBAAiB,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,EACtF,uCAAuC,CACxC,CAAC;IACF,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACjE,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"token-usage.test.js","sourceRoot":"","sources":["../../source/utils/token-usage.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qduc/term2",
-  "version": "0.3.1",
+  "version": "0.5.0",
   "description": "A terminal-based AI assistant that can help you get things done on your computer",
   "license": "MIT",
   "author": "qduc",
@@ -48,7 +48,8 @@
     "dist"
   ],
   "dependencies": {
-    "@ai-sdk/openai-compatible": "^2.0.47",
+    "@ai-sdk/anthropic": "^3.0.76",
+    "@ai-sdk/google": "^3.0.72",
     "@mozilla/readability": "^0.6.0",
     "@openai/agents": "^0.8.3",
     "@openai/agents-extensions": "^0.11.1",
@@ -56,13 +57,11 @@
     "@qduc/web-fetch": "^0.1.0",
     "@types/ssh2": "^1.15.5",
     "ai": "^6.0.177",
-    "bash-parser": "^0.5.0",
     "env-paths": "^3.0.0",
     "fast-glob": "^3.3.2",
-    "fuse.js": "^7.0.0",
     "ignore": "^5.3.2",
     "ink": "^7.0.1",
-    "ink-prompt": "^0.2.4",
+    "ink-prompt": "^0.2.5",
     "jsdom": "^27.4.0",
     "marked": "^17.0.1",
     "meow": "^11.0.0",
@@ -70,6 +69,7 @@
     "react": "^19.0.0",
     "ssh2": "^1.17.0",
     "turndown": "^7.2.2",
+    "unbash": "^3.0.0",
     "winston": "^3.18.3",
     "winston-daily-rotate-file": "^5.0.0",
     "zod": "^4.1.13"