@qduc/term2 0.3.0 → 0.4.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, 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,
@@ -30,9 +50,121 @@ 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');
+});
 //# 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":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EACL,4BAA4B,EAC5B,aAAa,EACb,sBAAsB,EACtB,YAAY,EACZ,iBAAiB,EACjB,uBAAuB,EACvB,cAAc,GACf,MAAM,kBAAkB,CAAC;AAE1B,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,oCAAoC;IACpC,CAAC,CAAC,SAAS,CACT,cAAc,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,qBAAqB,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC,EACzG;QACE,aAAa,EAAE,EAAE;QACjB,iBAAiB,EAAE,EAAE;QACrB,YAAY,EAAE,EAAE;QAChB,iBAAiB,EAAE,CAAC;KACrB,CACF,CAAC;IAEF,kBAAkB;IAClB,CAAC,CAAC,SAAS,CACT,cAAc,CAAC;QACb,YAAY,EAAE,GAAG;QACjB,aAAa,EAAE,EAAE;QACjB,uBAAuB,EAAE,EAAE;QAC3B,2BAA2B,EAAE,EAAE;KAChC,CAAC,EACF;QACE,aAAa,EAAE,GAAG;QAClB,iBAAiB,EAAE,EAAE;QACrB,YAAY,EAAE,GAAG;QACjB,iBAAiB,EAAE,EAAE;QACrB,qBAAqB,EAAE,EAAE;KAC1B,CACF,CAAC;IAEF,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,oEAAoE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC/E,MAAM,OAAO,GAAG;QACd,KAAK,EAAE;YACL,aAAa,EAAE,EAAE;YACjB,qBAAqB,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE;SAC5C;QACD,QAAQ,EAAE;YACR,KAAK,EAAE;gBACL,iBAAiB,EAAE,CAAC;aACrB;SACF;KACF,CAAC;IAEF,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACjC,aAAa,EAAE,EAAE;QACjB,iBAAiB,EAAE,CAAC;QACpB,YAAY,EAAE,EAAE;QAChB,iBAAiB,EAAE,CAAC;KACrB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kEAAkE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7E,MAAM,OAAO,GAAG;QACd,IAAI,EAAE;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,EAAE,EAAE,sCAAsC;gBAC1C,MAAM,EAAE,uBAAuB;gBAC/B,OAAO,EAAE,UAAU;gBACnB,KAAK,EAAE,mBAAmB;gBAC1B,KAAK,EAAE;oBACL,aAAa,EAAE,CAAC;oBAChB,iBAAiB,EAAE,CAAC;oBACpB,YAAY,EAAE,EAAE;iBACjB;aACF;YACD,YAAY,EAAE;gBACZ,mBAAmB,EAAE,yBAAyB;aAC/C;SACF;QACD,MAAM,EAAE,yBAAyB;QACjC,IAAI,EAAE,wBAAwB;KAC/B,CAAC;IAEF,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACjC,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,CAAC;QACpB,YAAY,EAAE,EAAE;KACjB,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,yBAAyB,CAC1B,CAAC;IACF,CAAC,CAAC,EAAE,CACF,iBAAiB,CAAC;QAChB,aAAa,EAAE,IAAI;QACnB,iBAAiB,EAAE,GAAG;QACtB,YAAY,EAAE,IAAI;QAClB,iBAAiB,EAAE,GAAG;QACtB,qBAAqB,EAAE,GAAG;KAC3B,CAAC,EACF,uDAAuD,CACxD,CAAC;IACF,CAAC,CAAC,EAAE,CACF,iBAAiB,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,EAC1F,uCAAuC,CACxC,CAAC;IACF,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,EAAE,EAAE;IACrD,CAAC,CAAC,SAAS,CACT,aAAa,CACX,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,EACvE,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,qBAAqB,EAAE,EAAE,EAAE,CACpG,EACD;QACE,aAAa,EAAE,IAAI;QACnB,iBAAiB,EAAE,GAAG;QACtB,iBAAiB,EAAE,IAAI;QACvB,qBAAqB,EAAE,EAAE;KAC1B,CACF,CAAC;IAEF,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uFAAuF,EAAE,CAAC,CAAC,EAAE,EAAE;IAClG,CAAC,CAAC,SAAS,CACT,4BAA4B,CAC1B,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,EACpE,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,CACxE,EACD;QACE,aAAa,EAAE,GAAG;QAClB,iBAAiB,EAAE,GAAG;QACtB,iBAAiB,EAAE,GAAG;KACvB,CACF,CAAC;IAEF,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC,EAAE;QACnG,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,GAAG;KACvB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qEAAqE,EAAE,CAAC,CAAC,EAAE,EAAE;IAChF,MAAM,WAAW,GAAG,sBAAsB,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC;IACxF,WAAW,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC;IAElF,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE;QAC7B,aAAa,EAAE,EAAE;QACjB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC;KACrB,CAAC,CAAC;IAEH,WAAW,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mEAAmE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC9E,MAAM,WAAW,GAAG,sBAAsB,EAAE,CAAC;IAE7C,WAAW,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC;IACzF,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE;QAC7B,aAAa,EAAE,GAAG;QAClB,iBAAiB,EAAE,GAAG;QACtB,iBAAiB,EAAE,GAAG;KACvB,CAAC,CAAC;IAEH,WAAW,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC;IACzF,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE;QAC7B,aAAa,EAAE,GAAG;QAClB,iBAAiB,EAAE,GAAG;QACtB,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,CAAC,CAAC,EAAE,EAAE;IACjE,CAAC,CAAC,EAAE,CACF,uBAAuB,CAAC;QACtB,aAAa,EAAE,KAAK;QACpB,iBAAiB,EAAE,KAAK;QACxB,iBAAiB,EAAE,OAAO;QAC1B,qBAAqB,EAAE,GAAG;KAC3B,CAAC,EACF,6DAA6D,CAC9D,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,EAAE,mCAAmC,CAAC,CAAC;IAClH,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,gCAAgC,CAAC,CAAC;AACxE,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qduc/term2",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A terminal-based AI assistant that can help you get things done on your computer",
   "license": "MIT",
   "author": "qduc",
@@ -48,20 +48,21 @@
     "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",
+    "@openrouter/ai-sdk-provider": "^2.9.0",
     "@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",

package/readme.md

@@ -15,18 +15,22 @@ https://github.com/user-attachments/assets/ac960d65-f7c8-453a-9440-91f6397ae842
 
 - 🎭 **Three Operating Modes** - Default (full-power), Lite (fast & safe), and Mentor (get help from a smarter model on complex problems)
 - 🌍 **Open Source** - MIT licensed, hackable, auditable, community-driven
-- 🤖 **Multi-Provider Support** - Works with OpenAI, OpenRouter, and OpenAI-compatible APIs
+- 🤖 **Multi-Provider Support** - Works with OpenAI, OpenRouter, OpenAI-compatible APIs, and Vercel AI SDK providers
 - 🔒 **Safe Execution** - Every command requires your explicit approval with diff preview
-- 🛠️ **Advanced Tools** - Shell execution, file patching, search/replace, grep, find files, file reading, web search, and mentor consultation
-- 💬 **Slash Commands** - Quick actions like `/clear`, `/quit`, `/model`, `/mentor`, `/lite` for easy control
+- 🛠️ **Advanced Tools** - Shell execution, file patching, search/replace (with `<...>` gap matching), grep, find files, file reading, file creation, web search, and mentor consultation
+- 💬 **Slash Commands** - Quick actions like `/clear`, `/quit`, `/model`, `/mentor`, `/lite`, `/copy`, `/auto-approve` for easy control
 - 📝 **Smart Context** - The assistant understands your environment and provides relevant help
 - 🎯 **Streaming Responses** - See the AI's thoughts and reasoning in real-time
 - 🧠 **Reasoning Effort Control** - Configurable reasoning levels (minimal to high) for O1/O3 models
 - ⚡ **Command History** - Navigate previous inputs with arrow keys
-- 🎨 **Markdown Rendering** - Formatted code blocks and text in the terminal
+- 🎨 **Markdown Rendering** - Formatted code blocks, tables, and text in the terminal
 - 🔄 **Retry Logic** - Automatic recovery from tool hallucinations and upstream errors
 - 🌐 **SSH Mode** - Execute commands and edit files on remote servers over SSH
 - 🤖 **Non-Interactive Mode** - Run commands from the CLI without starting the full UI
+- ✏️ **Edit Mode** - Press `Shift+Tab` to auto-approve file edits in your workspace for faster development
+- 🤖 **Auto-Approval** - Optional LLM-based safety evaluation can automatically approve safe shell commands
+- 🖼️ **Image Pasting** - Paste images from your clipboard directly into the terminal for vision-model analysis
+- 📈 **Real-time Token Usage** - Live token consumption displayed during streaming
 
 ## Why term2 vs Alternatives?
 
@@ -51,7 +55,7 @@ https://github.com/user-attachments/assets/ac960d65-f7c8-453a-9440-91f6397ae842
 
 **Requirements:**
 
-- Node.js 16 or higher
+- Node.js 20 or higher
 - An API key from OpenAI, OpenRouter, or any OpenAI-compatible provider
 
 Install globally via npm:
@@ -139,6 +143,8 @@ While in the chat, you can use these commands:
 - `/model [model-name]` - Switch to a different model
 - `/mentor` - Toggle mentor mode (see "Operating Modes" section for details)
 - `/lite` - Toggle lite mode (see "Operating Modes" section for details)
+- `/copy` - Copy the latest assistant response
+- `/auto-approve [off|advisory|auto]` - Set or cycle shell auto-approval mode
 - `/settings [key] [value]` - Modify runtime settings (e.g., `/settings agent.temperature 0.7`)
 
 ## Operating Modes
@@ -222,7 +228,7 @@ Mentor mode gives you two AI minds working together on your codebase. Your prima
 
 **Requirements:**
 
-- Configure `agent.mentorModel` in settings (e.g., `gpt-5.2`, `claude-opus-4.5` or `gemini-3-pro-preview`)
+- Configure `agent.mentorModel` in settings (e.g., `gpt-5.5`, `claude-opus-4.6` or `gemini-3.1-pro-preview`)
 - Mentor model should be more capable than primary model for best results
 - Toggle with `/mentor` command mid-session
 
@@ -253,10 +259,11 @@ AI: [Does additional checks based on mentor's questions]
 
 Modes are mutually exclusive—each represents a different working style matched to your task. You can switch modes mid-session:
 
-- `/lite` - Toggle lite mode (clears history when switching)
+- `/lite` - Toggle lite mode (requires clearing history first if session is active)
 - `/mentor` - Toggle mentor mode
+- `Shift+Tab` - Toggle edit mode (auto-approves file edits in workspace)
 - Switching to lite mode automatically disables edit/mentor modes
-- Enabling edit or mentor mode automatically disables lite mode
+- Enabling lite mode disables edit and mentor modes
 
 ## SSH Mode
 
@@ -375,8 +382,11 @@ export OPENAI_API_KEY="sk-..."
 # OpenRouter (for Claude, Gemini, and other models)
 export OPENROUTER_API_KEY="sk-or-v1-..."
 
-# Web Search (Tavily)
+# Web Search (Tavily — default)
 export TAVILY_API_KEY="tvly-..."
+
+# Web Search (Exa)
+export EXA_API_KEY="..."
 ```
 
 To make them permanent, add these exports to your shell configuration file (`~/.bashrc`, `~/.zshrc`, or `~/.profile`).
@@ -477,17 +487,12 @@ term2 works with multiple AI providers:
 
 ### OpenAI (default)
 
-- `gpt-5.2` (latest)
+- `gpt-5.5` (latest)
+- `gpt-5.4`
+- `gpt-5.4-mini`
+- `gpt-5.3-codex`
+- `gpt-5.2`
 - `gpt-5.1` (default)
-- `gpt-5`
-- `gpt-5-mini`
-- `gpt-4.1`
-- `gpt-4.1-mini`
-- `gpt-5.1`
-- `gpt-5.1-mini`
-- `o3` (supports reasoning effort)
-- `o3-mini` (supports reasoning effort)
-- `o1` (supports reasoning effort)
 
 ### OpenRouter
 
@@ -503,13 +508,14 @@ Use CLI flags (`-m model-name`) or settings file to select OpenRouter models.
 
 term2 can connect to any OpenAI-compatible API. This allows you to use:
 
-- **Local Models**: Run private models locally via Ollama, LM Studio, vLLM, or LocalAI.
+- **Local Models**: Run private models locally via Ollama, LM Studio, vLLM, or llama.cpp.
 - **Self-Hosted**: Connect to private deployments of models.
 - **Other Providers**: Any service offering an OpenAI-compatible endpoint (e.g., Groq, Together AI).
 
 ## Safety Features
 
 - **Command Approval** - Every destructive operation requires your explicit confirmation
+- **Auto-Approval** - Optional LLM-based safety evaluation with advisory and auto modes for shell commands
 - **Diff Preview** - See exact file changes before approving patches or edits
 - **Risk Analysis** - Dangerous operations (like `rm -rf`, `git push --force`) are flagged
 - **Path Safety** - Operations on sensitive directories require extra caution
@@ -616,6 +622,9 @@ term2 --ssh user@host --lite
 - Use arrow keys to navigate through your command history
 - Be specific in your requests for better results
 - Use `/mentor` to get expert consultation on difficult architectural decisions
+- Use `Shift+Tab` to toggle edit mode for faster file editing workflows
+- Use `/auto-approve` to enable LLM-based safety evaluation for faster shell command workflows
+- Paste images directly into the terminal when using vision-capable models
 - Use `--lite` flag when SSH'ing to servers for general system work without codebase context
 
 ## Contributing
@@ -634,7 +643,3 @@ Built with:
 - [Ink](https://github.com/vadimdemedes/ink) - React for CLI
 - [TypeScript](https://www.typescriptlang.org/)
 - [ssh2](https://github.com/mscdex/ssh2) - SSH client for Node.js
-
----
-
-Made with ❤️ by [qduc](https://github.com/qduc)

package/dist/agent.lite-mode.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=agent.lite-mode.test.d.ts.map

package/dist/agent.lite-mode.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"agent.lite-mode.test.d.ts","sourceRoot":"","sources":["../source/agent.lite-mode.test.ts"],"names":[],"mappings":""}

package/dist/agent.lite-mode.test.js

@@ -1,39 +0,0 @@
-import test from 'ava';
-import { getAgentDefinition } from './agent.js';
-const mockSettings = (lite) => ({
-    get: (key) => {
-        if (key === 'app.liteMode')
-            return lite;
-        if (key === 'agent.model')
-            return 'gpt-4';
-        return undefined;
-    },
-    set: () => { },
-    on: () => { },
-    off: () => { },
-    getAll: () => ({}),
-});
-const mockLogging = {};
-test('getAgentDefinition in lite mode should include web_search tool', t => {
-    const deps = {
-        settingsService: mockSettings(true),
-        loggingService: mockLogging,
-    };
-    const agent = getAgentDefinition(deps, 'gpt-4');
-    const toolNames = agent.tools.map(tool => tool.name);
-    t.true(toolNames.includes('shell'));
-    t.true(toolNames.includes('read_file'));
-    t.true(toolNames.includes('find_files'));
-    t.true(toolNames.includes('grep'));
-    t.true(toolNames.includes('web_search'), 'web_search should be included in lite mode');
-});
-test('getAgentDefinition in non-lite mode should include web_search tool', t => {
-    const deps = {
-        settingsService: mockSettings(false),
-        loggingService: mockLogging,
-    };
-    const agent = getAgentDefinition(deps, 'gpt-4');
-    const toolNames = agent.tools.map(tool => tool.name);
-    t.true(toolNames.includes('web_search'), 'web_search should be included in full mode');
-});
-//# sourceMappingURL=agent.lite-mode.test.js.map

package/dist/agent.lite-mode.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"agent.lite-mode.test.js","sourceRoot":"","sources":["../source/agent.lite-mode.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAGhD,MAAM,YAAY,GAAG,CAAC,IAAa,EAAoB,EAAE,CAAC,CAAC;IACvD,GAAG,EAAE,CAAC,GAAW,EAAE,EAAE;QACjB,IAAI,GAAG,KAAK,cAAc;YAAE,OAAO,IAAI,CAAC;QACxC,IAAI,GAAG,KAAK,aAAa;YAAE,OAAO,OAAO,CAAC;QAC1C,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;IACb,EAAE,EAAE,GAAG,EAAE,GAAE,CAAC;IACZ,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;IACb,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;CACW,CAAA,CAAC;AAElC,MAAM,WAAW,GAAG,EAAgC,CAAC;AAErD,IAAI,CAAC,gEAAgE,EAAE,CAAC,CAAC,EAAE;IACvE,MAAM,IAAI,GAAG;QACT,eAAe,EAAE,YAAY,CAAC,IAAI,CAAC;QACnC,cAAc,EAAE,WAAW;KAC9B,CAAC;IACF,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAErD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACnC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,4CAA4C,CAAC,CAAC;AAC3F,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oEAAoE,EAAE,CAAC,CAAC,EAAE;IAC3E,MAAM,IAAI,GAAG;QACT,eAAe,EAAE,YAAY,CAAC,KAAK,CAAC;QACpC,cAAc,EAAE,WAAW;KAC9B,CAAC;IACF,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAErD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,4CAA4C,CAAC,CAAC;AAC3F,CAAC,CAAC,CAAC"}

package/dist/components/ModelSelectionMenu.error-tabs.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ModelSelectionMenu.error-tabs.test.d.ts.map

package/dist/components/ModelSelectionMenu.error-tabs.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModelSelectionMenu.error-tabs.test.d.ts","sourceRoot":"","sources":["../../source/components/ModelSelectionMenu.error-tabs.test.tsx"],"names":[],"mappings":""}

package/dist/components/ModelSelectionMenu.error-tabs.test.js

@@ -1,18 +0,0 @@
-import test from 'ava';
-import React from 'react';
-import { render } from 'ink-testing-library';
-import ModelSelectionMenu from './ModelSelectionMenu.js';
-import { createMockSettingsService } from '../services/settings-service.mock.js';
-test('ModelSelectionMenu renders provider tabs even when error occurs', t => {
-    // OpenAI is a default provider
-    const settingsService = createMockSettingsService();
-    const { lastFrame } = render(React.createElement(ModelSelectionMenu, { settingsService: settingsService, items: [], selectedIndex: 0, query: "", error: "Failed to fetch models", provider: "openai" }));
-    const output = lastFrame();
-    t.true(output?.includes('Unable to load models: Failed to fetch models'));
-    // Should verify that provider tabs are still visible
-    // "OpenAI" shows up as a label in the tabs
-    t.true(output?.includes('OpenAI'));
-    // And possibly the switch instruction
-    t.true(output?.includes('Tab → switch provider'));
-});
-//# sourceMappingURL=ModelSelectionMenu.error-tabs.test.js.map

package/dist/components/ModelSelectionMenu.error-tabs.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModelSelectionMenu.error-tabs.test.js","sourceRoot":"","sources":["../../source/components/ModelSelectionMenu.error-tabs.test.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAC3C,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAC,yBAAyB,EAAC,MAAM,sCAAsC,CAAC;AAE/E,IAAI,CAAC,iEAAiE,EAAE,CAAC,CAAC,EAAE;IACxE,+BAA+B;IAC/B,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;IAEpD,MAAM,EAAC,SAAS,EAAC,GAAG,MAAM,CACtB,oBAAC,kBAAkB,IACf,eAAe,EAAE,eAAe,EAChC,KAAK,EAAE,EAAE,EACT,aAAa,EAAE,CAAC,EAChB,KAAK,EAAC,EAAE,EACR,KAAK,EAAC,wBAAwB,EAC9B,QAAQ,EAAC,QAAQ,GACnB,CACL,CAAC;IAEF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,+CAA+C,CAAC,CAAC,CAAC;IAC1E,qDAAqD;IACrD,2CAA2C;IAC3C,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnC,sCAAsC;IACtC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC"}

package/dist/components/TextInput.d.ts

@@ -1,42 +0,0 @@
-import React from 'react';
-interface TextInputProps {
-    /**
-     * The value of the input.
-     */
-    value: string;
-    /**
-     * Handler called when value changes.
-     */
-    onChange: (value: string) => void;
-    /**
-     * Handler called when "Enter" is pressed.
-     */
-    onSubmit?: (value: string) => void;
-    /**
-     * Text to display when value is empty.
-     */
-    placeholder?: string;
-    /**
-     * Whether the input is currently focused and accepting input.
-     */
-    focus?: boolean;
-    /**
-     * Character to mask input with (e.g. '*' for passwords).
-     */
-    mask?: string;
-    /**
-     * Whether to allow multi-line input.
-     */
-    multiLine?: boolean;
-    /**
-     * Called whenever the cursor offset changes.
-     */
-    onCursorChange?: (offset: number) => void;
-    /**
-     * Optional external cursor override.
-     */
-    cursorOverride?: number;
-}
-export declare const TextInput: React.FC<TextInputProps>;
-export default TextInput;
-//# sourceMappingURL=TextInput.d.ts.map

package/dist/components/TextInput.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TextInput.d.ts","sourceRoot":"","sources":["../../source/components/TextInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoC,MAAM,OAAO,CAAC;AAKzD,UAAU,cAAc;IACpB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAElC;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAEnC;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAE1C;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;AAID,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAoc9C,CAAC;AAEF,eAAe,SAAS,CAAC"}