@hybridaione/hybridclaw 0.2.3 → 0.2.7

package/tests/token-efficiency.basic.test.ts

@@ -1,6 +1,9 @@
 import { expect, test } from 'vitest';
 
-import { estimateTokenCountFromMessages, estimateTokenCountFromText } from '../src/token-efficiency.js';
+import {
+  estimateTokenCountFromMessages,
+  estimateTokenCountFromText,
+} from '../src/token-efficiency.js';
 import type { ChatMessage } from '../src/types.js';
 
 test('estimateTokenCountFromText uses simple chars-per-token heuristic', () => {
@@ -15,7 +18,10 @@ test('estimateTokenCountFromMessages supports multimodal content arrays', () =>
       role: 'user',
       content: [
         { type: 'text', text: 'hello' },
-        { type: 'image_url', image_url: { url: '/discord-media-cache/example.png' } },
+        {
+          type: 'image_url',
+          image_url: { url: '/discord-media-cache/example.png' },
+        },
       ],
     },
   ];

package/tests/token-usage.cache.test.ts

@@ -0,0 +1,128 @@
+import { describe, expect, test } from 'vitest';
+
+import {
+  accumulateApiUsage,
+  createTokenUsageStats,
+} from '../container/src/token-usage.js';
+import type { ChatCompletionResponse } from '../container/src/types.js';
+
+function buildResponse(usage: Record<string, unknown>): ChatCompletionResponse {
+  return {
+    id: 'resp_1',
+    model: 'gpt-5-nano',
+    choices: [
+      {
+        message: {
+          role: 'assistant',
+          content: 'ok',
+        },
+        finish_reason: 'stop',
+      },
+    ],
+    usage: usage as ChatCompletionResponse['usage'],
+  };
+}
+
+describe('accumulateApiUsage cache normalization', () => {
+  test('parses cache_read_input_tokens and cache_creation_input_tokens', () => {
+    const stats = createTokenUsageStats();
+    accumulateApiUsage(
+      stats,
+      buildResponse({
+        prompt_tokens: 1000,
+        completion_tokens: 200,
+        total_tokens: 1200,
+        cache_read_input_tokens: 900,
+        cache_creation_input_tokens: 100,
+      }),
+    );
+
+    expect(stats.apiUsageAvailable).toBe(true);
+    expect(stats.apiCacheUsageAvailable).toBe(true);
+    expect(stats.apiCacheReadTokens).toBe(900);
+    expect(stats.apiCacheWriteTokens).toBe(100);
+  });
+
+  test('parses cache_read and cache_write naming variants', () => {
+    const stats = createTokenUsageStats();
+    accumulateApiUsage(
+      stats,
+      buildResponse({
+        prompt_tokens: 1000,
+        completion_tokens: 50,
+        cache_read: 1500,
+        cache_write: 200,
+      }),
+    );
+
+    expect(stats.apiCacheUsageAvailable).toBe(true);
+    expect(stats.apiCacheReadTokens).toBe(1500);
+    expect(stats.apiCacheWriteTokens).toBe(200);
+  });
+
+  test('parses Moonshot/Kimi cached_tokens field', () => {
+    const stats = createTokenUsageStats();
+    accumulateApiUsage(
+      stats,
+      buildResponse({
+        prompt_tokens: 30,
+        completion_tokens: 9,
+        total_tokens: 39,
+        cached_tokens: 19,
+      }),
+    );
+
+    expect(stats.apiCacheUsageAvailable).toBe(true);
+    expect(stats.apiCacheReadTokens).toBe(19);
+    expect(stats.apiCacheWriteTokens).toBe(0);
+  });
+
+  test('parses prompt_tokens_details.cached_tokens', () => {
+    const stats = createTokenUsageStats();
+    accumulateApiUsage(
+      stats,
+      buildResponse({
+        prompt_tokens: 1113,
+        completion_tokens: 5,
+        total_tokens: 1118,
+        prompt_tokens_details: { cached_tokens: 1024 },
+      }),
+    );
+
+    expect(stats.apiCacheUsageAvailable).toBe(true);
+    expect(stats.apiCacheReadTokens).toBe(1024);
+    expect(stats.apiCacheWriteTokens).toBe(0);
+  });
+
+  test('keeps cache usage when provider reports only cache fields', () => {
+    const stats = createTokenUsageStats();
+    accumulateApiUsage(
+      stats,
+      buildResponse({
+        cached_tokens: 2048,
+      }),
+    );
+
+    expect(stats.apiUsageAvailable).toBe(false);
+    expect(stats.apiCacheUsageAvailable).toBe(true);
+    expect(stats.apiCacheReadTokens).toBe(2048);
+    expect(stats.apiCacheWriteTokens).toBe(0);
+  });
+
+  test('does not mark cache usage as available without cache fields', () => {
+    const stats = createTokenUsageStats();
+    accumulateApiUsage(
+      stats,
+      buildResponse({
+        prompt_tokens: 100,
+        completion_tokens: 20,
+        total_tokens: 120,
+      }),
+    );
+
+    expect(stats.apiUsageAvailable).toBe(true);
+    expect(stats.apiCacheUsageAvailable).toBe(false);
+    expect(stats.apiCacheReadTokens).toBe(0);
+    expect(stats.apiCacheWriteTokens).toBe(0);
+  });
+});

package/vitest.e2e.config.ts

@@ -3,7 +3,9 @@ import unitConfig from './vitest.unit.config.js';
 
 const base = unitConfig as unknown as Record<string, unknown>;
 const baseTest = (unitConfig as { test?: { exclude?: string[] } }).test ?? {};
-const exclude = (baseTest.exclude ?? []).filter((entry) => entry !== 'tests/**/*.e2e.test.ts');
+const exclude = (baseTest.exclude ?? []).filter(
+  (entry) => entry !== 'tests/**/*.e2e.test.ts',
+);
 
 export default defineConfig({
   ...base,

package/vitest.integration.config.ts

@@ -3,7 +3,9 @@ import unitConfig from './vitest.unit.config.js';
 
 const base = unitConfig as unknown as Record<string, unknown>;
 const baseTest = (unitConfig as { test?: { exclude?: string[] } }).test ?? {};
-const exclude = (baseTest.exclude ?? []).filter((entry) => entry !== 'tests/**/*.integration.test.ts');
+const exclude = (baseTest.exclude ?? []).filter(
+  (entry) => entry !== 'tests/**/*.integration.test.ts',
+);
 
 export default defineConfig({
   ...base,

package/vitest.live.config.ts

@@ -3,7 +3,9 @@ import unitConfig from './vitest.unit.config.js';
 
 const base = unitConfig as unknown as Record<string, unknown>;
 const baseTest = (unitConfig as { test?: { exclude?: string[] } }).test ?? {};
-const exclude = (baseTest.exclude ?? []).filter((entry) => entry !== 'tests/**/*.live.test.ts');
+const exclude = (baseTest.exclude ?? []).filter(
+  (entry) => entry !== 'tests/**/*.live.test.ts',
+);
 
 export default defineConfig({
   ...base,

package/vitest.unit.config.ts

@@ -11,5 +11,14 @@ export default defineConfig({
       'dist/**',
       'container/**',
     ],
+    coverage: {
+      provider: 'v8',
+      include: ['src/**/*.ts'],
+      thresholds: {
+        lines: 30,
+        functions: 30,
+        branches: 25,
+      },
+    },
   },
 });