@chenpu17/cc-gw 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chenpu17/cc-gw",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "private": false,
   "type": "module",
   "scripts": {

package/src/server/dist/index.js

@@ -11102,6 +11102,12 @@ async function migrateDailyMetricsTable(db) {
   const hasCompositePrimaryKey = primaryKeyColumns.length > 1;
   if (!hasEndpointColumn || !hasCompositePrimaryKey) {
     const endpointSelector = hasEndpointColumn ? "COALESCE(endpoint, 'anthropic')" : "'anthropic'";
+    const hasCachedTokensColumn = columns.some((column) => column.name === "total_cached_tokens");
+    const hasCacheReadColumn = columns.some((column) => column.name === "total_cache_read_tokens");
+    const hasCacheCreationColumn = columns.some((column) => column.name === "total_cache_creation_tokens");
+    const cachedTokensSelector = hasCachedTokensColumn ? "COALESCE(total_cached_tokens, 0)" : "0";
+    const cacheReadSelector = hasCacheReadColumn ? "COALESCE(total_cache_read_tokens, 0)" : "0";
+    const cacheCreationSelector = hasCacheCreationColumn ? "COALESCE(total_cache_creation_tokens, 0)" : "0";
     await exec(
       db,
       `ALTER TABLE daily_metrics RENAME TO daily_metrics_old;
@@ -11111,15 +11117,21 @@ async function migrateDailyMetricsTable(db) {
          request_count INTEGER DEFAULT 0,
          total_input_tokens INTEGER DEFAULT 0,
          total_output_tokens INTEGER DEFAULT 0,
+         total_cached_tokens INTEGER DEFAULT 0,
+         total_cache_read_tokens INTEGER DEFAULT 0,
+         total_cache_creation_tokens INTEGER DEFAULT 0,
          total_latency_ms INTEGER DEFAULT 0,
          PRIMARY KEY (date, endpoint)
        );
-       INSERT INTO daily_metrics (date, endpoint, request_count, total_input_tokens, total_output_tokens, total_latency_ms)
+       INSERT INTO daily_metrics (date, endpoint, request_count, total_input_tokens, total_output_tokens, total_cached_tokens, total_cache_read_tokens, total_cache_creation_tokens, total_latency_ms)
          SELECT date,
                 ${endpointSelector},
                 request_count,
                 total_input_tokens,
                 total_output_tokens,
+                ${cachedTokensSelector},
+                ${cacheReadSelector},
+                ${cacheCreationSelector},
                 total_latency_ms
            FROM daily_metrics_old;
        DROP TABLE daily_metrics_old;`
@@ -11176,6 +11188,9 @@ async function ensureSchema(db) {
       request_count INTEGER DEFAULT 0,
       total_input_tokens INTEGER DEFAULT 0,
       total_output_tokens INTEGER DEFAULT 0,
+      total_cached_tokens INTEGER DEFAULT 0,
+      total_cache_read_tokens INTEGER DEFAULT 0,
+      total_cache_creation_tokens INTEGER DEFAULT 0,
       total_latency_ms INTEGER DEFAULT 0,
       PRIMARY KEY (date, endpoint)
     );
@@ -11233,6 +11248,9 @@ async function ensureSchema(db) {
   await maybeAddColumn(db, "api_keys", "total_input_tokens", "INTEGER DEFAULT 0");
   await maybeAddColumn(db, "api_keys", "total_output_tokens", "INTEGER DEFAULT 0");
   await migrateDailyMetricsTable(db);
+  await maybeAddColumn(db, "daily_metrics", "total_cached_tokens", "INTEGER DEFAULT 0");
+  await maybeAddColumn(db, "daily_metrics", "total_cache_read_tokens", "INTEGER DEFAULT 0");
+  await maybeAddColumn(db, "daily_metrics", "total_cache_creation_tokens", "INTEGER DEFAULT 0");
   await run(db, "CREATE UNIQUE INDEX IF NOT EXISTS idx_api_keys_hash ON api_keys(key_hash) WHERE key_hash IS NOT NULL");
   await run(db, "UPDATE api_keys SET key_hash = '*' WHERE is_wildcard = 1 AND (key_hash IS NULL OR key_hash = '')");
   await run(db, "UPDATE api_keys SET updated_at = created_at WHERE updated_at IS NULL");
@@ -11449,23 +11467,33 @@ async function upsertLogPayload(requestId, payload) {
   );
 }
 async function updateMetrics(date, endpoint, delta) {
-  await runQuery(
-    `INSERT INTO daily_metrics (date, endpoint, request_count, total_input_tokens, total_output_tokens, total_latency_ms)
-     VALUES (?, ?, ?, ?, ?, ?)
-     ON CONFLICT(date, endpoint) DO UPDATE SET
-       request_count = daily_metrics.request_count + excluded.request_count,
-       total_input_tokens = daily_metrics.total_input_tokens + excluded.total_input_tokens,
-       total_output_tokens = daily_metrics.total_output_tokens + excluded.total_output_tokens,
-       total_latency_ms = daily_metrics.total_latency_ms + excluded.total_latency_ms`,
-    [
-      date,
-      endpoint,
-      delta.requests,
-      delta.inputTokens,
-      delta.outputTokens,
-      delta.latencyMs
-    ]
-  );
+  try {
+    await runQuery(
+      `INSERT INTO daily_metrics (date, endpoint, request_count, total_input_tokens, total_output_tokens, total_cached_tokens, total_cache_read_tokens, total_cache_creation_tokens, total_latency_ms)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+       ON CONFLICT(date, endpoint) DO UPDATE SET
+         request_count = daily_metrics.request_count + excluded.request_count,
+         total_input_tokens = daily_metrics.total_input_tokens + excluded.total_input_tokens,
+         total_output_tokens = daily_metrics.total_output_tokens + excluded.total_output_tokens,
+         total_cached_tokens = daily_metrics.total_cached_tokens + excluded.total_cached_tokens,
+         total_cache_read_tokens = daily_metrics.total_cache_read_tokens + excluded.total_cache_read_tokens,
+         total_cache_creation_tokens = daily_metrics.total_cache_creation_tokens + excluded.total_cache_creation_tokens,
+         total_latency_ms = daily_metrics.total_latency_ms + excluded.total_latency_ms`,
+      [
+        date,
+        endpoint,
+        delta.requests,
+        delta.inputTokens,
+        delta.outputTokens,
+        delta.cachedTokens ?? 0,
+        delta.cacheReadTokens ?? 0,
+        delta.cacheCreationTokens ?? 0,
+        delta.latencyMs
+      ]
+    );
+  } catch (err) {
+    console.error("[updateMetrics] Failed to update metrics:", err);
+  }
 }
 
 // metrics/activity.ts
@@ -11935,23 +11963,24 @@ function computeTpot(totalLatencyMs, outputTokens, options) {
   return Number.isFinite(raw) ? roundTwoDecimals(raw) : null;
 }
 function resolveCachedTokens(usage) {
+  const result = { read: 0, creation: 0 };
   if (!usage || typeof usage !== "object") {
-    return null;
+    return result;
+  }
+  if (typeof usage.cache_read_input_tokens === "number") {
+    result.read = usage.cache_read_input_tokens;
+  }
+  if (typeof usage.cache_creation_input_tokens === "number") {
+    result.creation = usage.cache_creation_input_tokens;
   }
   if (typeof usage.cached_tokens === "number") {
-    return usage.cached_tokens;
+    result.read = usage.cached_tokens;
   }
   const promptDetails = usage.prompt_tokens_details;
   if (promptDetails && typeof promptDetails.cached_tokens === "number") {
-    return promptDetails.cached_tokens;
-  }
-  if (typeof usage.cache_read_input_tokens === "number") {
-    return usage.cache_read_input_tokens;
-  }
-  if (typeof usage.cache_creation_input_tokens === "number") {
-    return usage.cache_creation_input_tokens;
+    result.read = promptDetails.cached_tokens;
   }
-  return null;
+  return result;
 }
 function cloneOriginalPayload(value) {
   const structuredCloneFn = globalThis.structuredClone;
@@ -12214,7 +12243,8 @@ async function registerMessagesRoute(app) {
         if (providerType === "anthropic") {
           let inputTokens2 = json.usage?.input_tokens ?? 0;
           let outputTokens2 = json.usage?.output_tokens ?? 0;
-          const cachedTokens2 = resolveCachedTokens(json.usage);
+          const cached3 = resolveCachedTokens(json.usage);
+          const cachedTokens3 = cached3.read + cached3.creation;
           if (!inputTokens2) {
             inputTokens2 = target.tokenEstimate || estimateTokens(normalized, target.modelId);
           }
@@ -12225,13 +12255,13 @@ async function registerMessagesRoute(app) {
           logUsage("non_stream.anthropic", {
             input: inputTokens2,
             output: outputTokens2,
-            cached: cachedTokens2
+            cached: cachedTokens3
           });
           const latencyMs2 = Date.now() - requestStart;
           await updateLogTokens(logId, {
             inputTokens: inputTokens2,
             outputTokens: outputTokens2,
-            cachedTokens: cachedTokens2,
+            cachedTokens: cachedTokens3,
             ttftMs: latencyMs2,
             tpotMs: computeTpot(latencyMs2, outputTokens2, { streaming: false })
           });
@@ -12240,6 +12270,9 @@ async function registerMessagesRoute(app) {
             requests: 1,
             inputTokens: inputTokens2,
             outputTokens: outputTokens2,
+            cachedTokens: cachedTokens3,
+            cacheReadTokens: cached3.read,
+            cacheCreationTokens: cached3.creation,
             latencyMs: latencyMs2
           });
           if (storeResponsePayloads) {
@@ -12260,7 +12293,8 @@ async function registerMessagesRoute(app) {
         const claudeResponse = buildClaudeResponse(json, target.modelId);
         let inputTokens = json.usage?.prompt_tokens ?? 0;
         let outputTokens = json.usage?.completion_tokens ?? 0;
-        const cachedTokens = resolveCachedTokens(json.usage);
+        const cached2 = resolveCachedTokens(json.usage);
+        const cachedTokens2 = cached2.read + cached2.creation;
         if (!inputTokens) {
           inputTokens = target.tokenEstimate || estimateTokens(normalized, target.modelId);
         }
@@ -12271,13 +12305,13 @@ async function registerMessagesRoute(app) {
         logUsage("non_stream.openai", {
           input: inputTokens,
           output: outputTokens,
-          cached: cachedTokens
+          cached: cachedTokens2
         });
         const latencyMs = Date.now() - requestStart;
         await updateLogTokens(logId, {
           inputTokens,
           outputTokens,
-          cachedTokens,
+          cachedTokens: cachedTokens2,
           ttftMs: latencyMs,
           tpotMs: computeTpot(latencyMs, outputTokens, { streaming: false })
         });
@@ -12286,6 +12320,9 @@ async function registerMessagesRoute(app) {
           requests: 1,
           inputTokens,
           outputTokens,
+          cachedTokens: cachedTokens2,
+          cacheReadTokens: cached2.read,
+          cacheCreationTokens: cached2.creation,
           latencyMs
         });
         if (storeResponsePayloads) {
@@ -12457,9 +12494,7 @@ async function registerMessagesRoute(app) {
                         usagePrompt2 = payload2.usage.input_tokens ?? usagePrompt2;
                         usageCompletion2 = payload2.usage.output_tokens ?? usageCompletion2;
                         const maybeCached = resolveCachedTokens(payload2.usage);
-                        if (maybeCached !== null) {
-                          usageCached2 = maybeCached;
-                        }
+                        usageCached2 = maybeCached.read + maybeCached.creation;
                         lastUsagePayload = payload2.usage;
                       }
                       if (payload2?.delta) {
@@ -12486,9 +12521,7 @@ async function registerMessagesRoute(app) {
                         usagePrompt2 = payload2.usage.input_tokens ?? usagePrompt2;
                         usageCompletion2 = payload2.usage.output_tokens ?? usageCompletion2;
                         const maybeCached = resolveCachedTokens(payload2.usage);
-                        if (maybeCached !== null) {
-                          usageCached2 = maybeCached;
-                        }
+                        usageCached2 = maybeCached.read + maybeCached.creation;
                         lastUsagePayload = payload2.usage;
                       }
                       if (payload2?.stop_reason) {
@@ -12540,8 +12573,9 @@ async function registerMessagesRoute(app) {
         }
         const totalLatencyMs = Date.now() - requestStart;
         const ttftMs = firstTokenAt2 ? firstTokenAt2 - requestStart : null;
+        const cached2 = resolveCachedTokens(lastUsagePayload);
         if (usageCached2 === null) {
-          usageCached2 = resolveCachedTokens(lastUsagePayload);
+          usageCached2 = cached2.read + cached2.creation;
         }
         logUsage("stream.anthropic.final", {
           input: usagePrompt2,
@@ -12563,6 +12597,9 @@ async function registerMessagesRoute(app) {
           requests: 1,
           inputTokens: usagePrompt2,
           outputTokens: usageCompletion2,
+          cachedTokens: usageCached2,
+          cacheReadTokens: cached2.read,
+          cacheCreationTokens: cached2.creation,
           latencyMs: totalLatencyMs
         });
         if (storeResponsePayloads) {
@@ -12733,6 +12770,9 @@ data: ${JSON.stringify(data)}
               requests: 1,
               inputTokens: finalPromptTokens,
               outputTokens: finalCompletionTokens,
+              cachedTokens: usageCached ?? 0,
+              cacheReadTokens: 0,
+              cacheCreationTokens: 0,
               latencyMs: totalLatencyMs
             });
             if (storeResponsePayloads) {
@@ -12894,6 +12934,9 @@ data: ${JSON.stringify(data)}
           requests: 1,
           inputTokens: fallbackPrompt,
           outputTokens: fallbackCompletion,
+          cachedTokens: usageCached ?? 0,
+          cacheReadTokens: 0,
+          cacheCreationTokens: 0,
           latencyMs: totalLatencyMs
         });
         if (storeResponsePayloads) {
@@ -13294,27 +13337,28 @@ function computeTpot2(totalLatencyMs, outputTokens, options) {
   return Number.isFinite(raw) ? roundTwoDecimals2(raw) : null;
 }
 function resolveCachedTokens2(usage) {
+  const result = { read: 0, creation: 0 };
   if (!usage || typeof usage !== "object") {
-    return null;
+    return result;
+  }
+  if (typeof usage.cache_read_input_tokens === "number") {
+    result.read = usage.cache_read_input_tokens;
+  }
+  if (typeof usage.cache_creation_input_tokens === "number") {
+    result.creation = usage.cache_creation_input_tokens;
   }
   if (typeof usage.cached_tokens === "number") {
-    return usage.cached_tokens;
+    result.read = usage.cached_tokens;
   }
   const promptDetails = usage.prompt_tokens_details;
   if (promptDetails && typeof promptDetails.cached_tokens === "number") {
-    return promptDetails.cached_tokens;
+    result.read = promptDetails.cached_tokens;
   }
   const inputDetails = usage.input_tokens_details;
   if (inputDetails && typeof inputDetails.cached_tokens === "number") {
-    return inputDetails.cached_tokens;
-  }
-  if (typeof usage.cache_read_input_tokens === "number") {
-    return usage.cache_read_input_tokens;
+    result.read = inputDetails.cached_tokens;
   }
-  if (typeof usage.cache_creation_input_tokens === "number") {
-    return usage.cache_creation_input_tokens;
-  }
-  return null;
+  return result;
 }
 var generateId = (prefix) => `${prefix}_${Math.random().toString(36).slice(2, 10)}`;
 var isText = (input) => typeof input === "string" && input.length > 0;
@@ -13836,17 +13880,18 @@ async function registerOpenAiRoutes(app) {
           if (!Number.isFinite(inputTokens3) || inputTokens3 <= 0) {
             inputTokens3 = target.tokenEstimate ?? estimateTokens(normalized, target.modelId);
           }
-          const cachedTokens2 = resolveCachedTokens2(usagePayload2);
+          const cached3 = resolveCachedTokens2(usagePayload2);
+          const cachedTokens3 = cached3.read + cached3.creation;
           const latencyMs3 = Date.now() - requestStart;
           const openAIResponse = buildOpenAIResponseFromClaude(parsed, target.modelId, converted, {
             inputTokens: inputTokens3,
             outputTokens: outputTokens3,
-            cachedTokens: cachedTokens2
+            cachedTokens: cachedTokens3
           });
           await updateLogTokens(logId, {
             inputTokens: inputTokens3,
             outputTokens: outputTokens3,
-            cachedTokens: cachedTokens2,
+            cachedTokens: cachedTokens3,
             ttftMs: latencyMs3,
             tpotMs: computeTpot2(latencyMs3, outputTokens3, { streaming: false })
           });
@@ -13855,6 +13900,7 @@ async function registerOpenAiRoutes(app) {
             requests: 1,
             inputTokens: inputTokens3,
             outputTokens: outputTokens3,
+            cachedTokens: cachedTokens3,
             latencyMs: latencyMs3
           });
           if (storeResponsePayloads) {
@@ -13889,12 +13935,13 @@ async function registerOpenAiRoutes(app) {
           return 0;
         })();
         const outputTokens2 = baseOutputTokens + reasoningTokens2;
-        const cachedTokens = resolveCachedTokens2(usagePayload);
+        const cached2 = resolveCachedTokens2(usagePayload);
+        const cachedTokens2 = cached2.read + cached2.creation;
         const latencyMs2 = Date.now() - requestStart;
         await updateLogTokens(logId, {
           inputTokens: inputTokens2,
           outputTokens: outputTokens2,
-          cachedTokens,
+          cachedTokens: cachedTokens2,
           ttftMs: usagePayload?.first_token_latency_ms ?? latencyMs2,
           tpotMs: usagePayload?.tokens_per_second ? computeTpot2(latencyMs2, outputTokens2, { streaming: false, reasoningTokens: reasoningTokens2 }) : null
         });
@@ -14292,6 +14339,9 @@ async function registerOpenAiRoutes(app) {
           requests: 1,
           inputTokens: finalPromptTokens,
           outputTokens: finalCompletionTokens,
+          cachedTokens: usageCached2,
+          cacheReadTokens: cached.read,
+          cacheCreationTokens: cached.creation,
           latencyMs: totalLatencyMs
         });
         if (storeResponsePayloads && capturedResponseChunks2) {
@@ -14699,12 +14749,13 @@ async function registerOpenAiRoutes(app) {
             inputTokens: inputTokens3,
             outputTokens: outputTokens3
           });
-          const cachedTokens2 = resolveCachedTokens2(usagePayload2);
+          const cached3 = resolveCachedTokens2(usagePayload2);
+          const cachedTokens3 = cached3.read + cached3.creation;
           const latencyMs3 = Date.now() - requestStart;
           await updateLogTokens(logId, {
             inputTokens: inputTokens3,
             outputTokens: outputTokens3,
-            cachedTokens: cachedTokens2,
+            cachedTokens: cachedTokens3,
             ttftMs: latencyMs3,
             tpotMs: computeTpot2(latencyMs3, outputTokens3, { streaming: false })
           });
@@ -14713,6 +14764,7 @@ async function registerOpenAiRoutes(app) {
             requests: 1,
             inputTokens: inputTokens3,
             outputTokens: outputTokens3,
+            cachedTokens: cachedTokens3,
             latencyMs: latencyMs3
           });
           if (storeResponsePayloads) {
@@ -14742,12 +14794,13 @@ async function registerOpenAiRoutes(app) {
           })(),
           target.modelId
         );
-        const cachedTokens = resolveCachedTokens2(usagePayload);
+        const cached2 = resolveCachedTokens2(usagePayload);
+        const cachedTokens2 = cached2.read + cached2.creation;
         const latencyMs2 = Date.now() - requestStart;
         await updateLogTokens(logId, {
           inputTokens: inputTokens2,
           outputTokens: outputTokens2,
-          cachedTokens,
+          cachedTokens: cachedTokens2,
           ttftMs: usagePayload?.first_token_latency_ms ?? latencyMs2,
           tpotMs: usagePayload?.tokens_per_second ? computeTpot2(latencyMs2, outputTokens2, { streaming: false }) : null
         });
@@ -15188,6 +15241,9 @@ async function registerOpenAiRoutes(app) {
           requests: 1,
           inputTokens: finalPromptTokens,
           outputTokens: finalCompletionTokens,
+          cachedTokens: usageCached2,
+          cacheReadTokens: cached.read,
+          cacheCreationTokens: cached.creation,
           latencyMs: totalLatencyMs
         });
         if (storeResponsePayloads && capturedResponseChunks2) {
@@ -15597,6 +15653,9 @@ async function getDailyMetrics(days = 7, endpoint) {
             request_count AS requestCount,
             total_input_tokens AS inputTokens,
             total_output_tokens AS outputTokens,
+            total_cached_tokens AS cachedTokens,
+            total_cache_read_tokens AS cacheReadTokens,
+            total_cache_creation_tokens AS cacheCreationTokens,
             total_latency_ms AS totalLatency
        FROM daily_metrics
        ${whereClause}
@@ -15609,6 +15668,9 @@ async function getDailyMetrics(days = 7, endpoint) {
     requestCount: row.requestCount ?? 0,
     inputTokens: row.inputTokens ?? 0,
     outputTokens: row.outputTokens ?? 0,
+    cachedTokens: row.cachedTokens ?? 0,
+    cacheReadTokens: row.cacheReadTokens ?? 0,
+    cacheCreationTokens: row.cacheCreationTokens ?? 0,
     avgLatencyMs: row.requestCount ? Math.round((row.totalLatency ?? 0) / row.requestCount) : 0
   })).reverse();
 }
@@ -15619,6 +15681,9 @@ async function getMetricsOverview(endpoint) {
        COALESCE(SUM(request_count), 0) AS requests,
        COALESCE(SUM(total_input_tokens), 0) AS inputTokens,
        COALESCE(SUM(total_output_tokens), 0) AS outputTokens,
+       COALESCE(SUM(total_cached_tokens), 0) AS cachedTokens,
+       COALESCE(SUM(total_cache_read_tokens), 0) AS cacheReadTokens,
+       COALESCE(SUM(total_cache_creation_tokens), 0) AS cacheCreationTokens,
        COALESCE(SUM(total_latency_ms), 0) AS totalLatency
      FROM daily_metrics
      ${totalsWhere}`,
@@ -15629,6 +15694,9 @@ async function getMetricsOverview(endpoint) {
     `SELECT request_count AS requests,
             total_input_tokens AS inputTokens,
             total_output_tokens AS outputTokens,
+            total_cached_tokens AS cachedTokens,
+            total_cache_read_tokens AS cacheReadTokens,
+            total_cache_creation_tokens AS cacheCreationTokens,
             total_latency_ms AS totalLatency
        FROM daily_metrics
        WHERE date = ?
@@ -15645,12 +15713,18 @@ async function getMetricsOverview(endpoint) {
       requests: totalsRequests,
       inputTokens: totalsRow?.inputTokens ?? 0,
       outputTokens: totalsRow?.outputTokens ?? 0,
+      cachedTokens: totalsRow?.cachedTokens ?? 0,
+      cacheReadTokens: totalsRow?.cacheReadTokens ?? 0,
+      cacheCreationTokens: totalsRow?.cacheCreationTokens ?? 0,
       avgLatencyMs: resolveAvg(totalsLatency, totalsRequests)
     },
     today: {
       requests: todayRequests,
       inputTokens: todayRow?.inputTokens ?? 0,
       outputTokens: todayRow?.outputTokens ?? 0,
+      cachedTokens: todayRow?.cachedTokens ?? 0,
+      cacheReadTokens: todayRow?.cacheReadTokens ?? 0,
+      cacheCreationTokens: todayRow?.cacheCreationTokens ?? 0,
       avgLatencyMs: resolveAvg(todayLatency, todayRequests)
     }
   };
@@ -17075,23 +17149,24 @@ function getPathsToRegister(basePath, protocol) {
   }
 }
 function resolveCachedTokens3(usage) {
+  const result = { read: 0, creation: 0 };
   if (!usage || typeof usage !== "object") {
-    return null;
+    return result;
+  }
+  if (typeof usage.cache_read_input_tokens === "number") {
+    result.read = usage.cache_read_input_tokens;
+  }
+  if (typeof usage.cache_creation_input_tokens === "number") {
+    result.creation = usage.cache_creation_input_tokens;
   }
   if (typeof usage.cached_tokens === "number") {
-    return usage.cached_tokens;
+    result.read = usage.cached_tokens;
   }
   const promptDetails = usage.prompt_tokens_details;
   if (promptDetails && typeof promptDetails.cached_tokens === "number") {
-    return promptDetails.cached_tokens;
+    result.read = promptDetails.cached_tokens;
   }
-  if (typeof usage.cache_read_input_tokens === "number") {
-    return usage.cache_read_input_tokens;
-  }
-  if (typeof usage.cache_creation_input_tokens === "number") {
-    return usage.cache_creation_input_tokens;
-  }
-  return null;
+  return result;
 }
 var roundTwoDecimals3 = (value) => Math.round(value * 100) / 100;
 function cloneOriginalPayload2(value) {
@@ -17448,12 +17523,13 @@ async function handleAnthropicProtocol(request, reply, endpoint, endpointId, app
       const json = await new Response(upstream.body).json();
       const inputTokens = json.usage?.input_tokens ?? estimateTokens(normalized, target.modelId);
       const outputTokens = json.usage?.output_tokens ?? 0;
-      const cachedTokens = resolveCachedTokens3(json.usage);
+      const cached2 = resolveCachedTokens3(json.usage);
+      const cachedTokens2 = cached2.read + cached2.creation;
       const latencyMs = Date.now() - requestStart;
       await updateLogTokens(logId, {
         inputTokens,
         outputTokens,
-        cachedTokens,
+        cachedTokens: cachedTokens2,
         ttftMs: latencyMs,
         tpotMs: computeTpot3(latencyMs, outputTokens, { streaming: false })
       });
@@ -17462,6 +17538,7 @@ async function handleAnthropicProtocol(request, reply, endpoint, endpointId, app
         requests: 1,
         inputTokens,
         outputTokens,
+        cachedTokens: cachedTokens2,
         latencyMs
       });
       if (storeResponsePayloads) {
@@ -17517,9 +17594,9 @@ async function handleAnthropicProtocol(request, reply, endpoint, endpointId, app
                 if (parsed?.usage) {
                   usagePrompt = parsed.usage.input_tokens ?? usagePrompt;
                   usageCompletion = parsed.usage.output_tokens ?? usageCompletion;
-                  const cached = resolveCachedTokens3(parsed.usage);
-                  if (cached !== null) {
-                    usageCached = cached;
+                  const cached2 = resolveCachedTokens3(parsed.usage);
+                  if (cached2 !== null) {
+                    usageCached = cached2;
                   }
                 }
                 if (!firstTokenAt && (parsed?.type === "content_block_delta" || parsed?.delta?.text)) {
@@ -17558,6 +17635,9 @@ async function handleAnthropicProtocol(request, reply, endpoint, endpointId, app
       requests: 1,
       inputTokens: usagePrompt,
       outputTokens: usageCompletion,
+      cachedTokens: usageCached,
+      cacheReadTokens: cached.read,
+      cacheCreationTokens: cached.creation,
       latencyMs: totalLatencyMs
     });
     if (storeResponsePayloads && capturedChunks) {
@@ -17737,12 +17817,13 @@ async function handleOpenAIChatProtocol(request, reply, endpoint, endpointId, ap
       const usagePayload = json?.usage ?? null;
       const inputTokens2 = usagePayload?.prompt_tokens ?? usagePayload?.input_tokens ?? target.tokenEstimate ?? estimateTokens(normalized, target.modelId);
       const outputTokens2 = usagePayload?.completion_tokens ?? usagePayload?.output_tokens ?? estimateTextTokens(json?.choices?.[0]?.message?.content ?? "", target.modelId);
-      const cachedTokens = resolveCachedTokens3(usagePayload);
+      const cached2 = resolveCachedTokens3(usagePayload);
+      const cachedTokens2 = cached2.read + cached2.creation;
       const latencyMs2 = Date.now() - requestStart;
       await updateLogTokens(logId, {
         inputTokens: inputTokens2,
         outputTokens: outputTokens2,
-        cachedTokens,
+        cachedTokens: cachedTokens2,
         ttftMs: latencyMs2,
         tpotMs: computeTpot3(latencyMs2, outputTokens2, { streaming: false })
       });
@@ -17751,6 +17832,7 @@ async function handleOpenAIChatProtocol(request, reply, endpoint, endpointId, ap
         requests: 1,
         inputTokens: inputTokens2,
         outputTokens: outputTokens2,
+        cachedTokens: cachedTokens2,
         latencyMs: latencyMs2
       });
       if (storeResponsePayloads) {
@@ -18016,12 +18098,13 @@ async function handleOpenAIResponsesProtocol(request, reply, endpoint, endpointI
       const inputTokens2 = usagePayload?.prompt_tokens ?? usagePayload?.input_tokens ?? target.tokenEstimate ?? estimateTokens(normalized, target.modelId);
       const content = json?.response?.body?.content ?? json?.choices?.[0]?.message?.content ?? "";
       const outputTokens2 = usagePayload?.completion_tokens ?? usagePayload?.output_tokens ?? estimateTextTokens(content, target.modelId);
-      const cachedTokens = resolveCachedTokens3(usagePayload);
+      const cached2 = resolveCachedTokens3(usagePayload);
+      const cachedTokens2 = cached2.read + cached2.creation;
       const latencyMs2 = Date.now() - requestStart;
       await updateLogTokens(logId, {
         inputTokens: inputTokens2,
         outputTokens: outputTokens2,
-        cachedTokens,
+        cachedTokens: cachedTokens2,
         ttftMs: latencyMs2,
         tpotMs: computeTpot3(latencyMs2, outputTokens2, { streaming: false })
       });
@@ -18030,6 +18113,7 @@ async function handleOpenAIResponsesProtocol(request, reply, endpoint, endpointI
         requests: 1,
         inputTokens: inputTokens2,
         outputTokens: outputTokens2,
+        cachedTokens: cachedTokens2,
         latencyMs: latencyMs2
       });
       if (storeResponsePayloads) {

package/src/web/dist/assets/{About-DpeHLv4-.js → About-BWcLLdLY.js}

@@ -1,4 +1,4 @@
-import{c as p,u as v,a as k,r,j as e,d as o,U as j,m as i}from"./index-B-8NzzZq.js";import{u as N}from"./useApiQuery-DZHaAgf7.js";import{P as w,a as d}from"./PageSection-BbmHOMiD.js";import"./Input-jZIOmpmG.js";import{B as b}from"./Button-CkW8jVT-.js";import{I as y}from"./info-B7P9oOld.js";/**
+import{c as p,u as v,a as k,r,j as e,d as o,U as j,m as i}from"./index-BK1UNVMz.js";import{u as N}from"./useApiQuery-BNTE55UK.js";import{P as w,a as d}from"./PageSection-B08EcVAN.js";import"./Input-BdyQWPOU.js";import{B as b}from"./Button-CZXniSHM.js";import{I as y}from"./info-BTcWJb9B.js";/**
  * @license lucide-react v0.344.0 - ISC
  *
  * This source code is licensed under the ISC license.
@@ -8,4 +8,4 @@ import{c as p,u as v,a as k,r,j as e,d as o,U as j,m as i}from"./index-B-8NzzZq.
  *
  * This source code is licensed under the ISC license.
  * See the LICENSE file in the root directory of this source tree.
- */const E=p("Sparkles",[["path",{d:"m12 3-1.912 5.813a2 2 0 0 1-1.275 1.275L3 12l5.813 1.912a2 2 0 0 1 1.275 1.275L12 21l1.912-5.813a2 2 0 0 1 1.275-1.275L21 12l-5.813-1.912a2 2 0 0 1-1.275-1.275L12 3Z",key:"17u4zn"}],["path",{d:"M5 3v4",key:"bklmnn"}],["path",{d:"M19 17v4",key:"iiml17"}],["path",{d:"M3 5h4",key:"nem4j1"}],["path",{d:"M17 19h4",key:"lbex7p"}]]),I="0.4.1",_={version:I},L={VITE_BUILD_TIME:"2025-10-29T01:35:31.647Z",VITE_NODE_VERSION:"v22.14.0"};function m({items:t}){return t.length===0?null:e.jsx("dl",{className:"grid gap-4 sm:grid-cols-2 xl:grid-cols-2",children:t.map(s=>e.jsxs("div",{className:"rounded-2xl border border-slate-200/50 bg-white p-4 shadow-sm shadow-slate-200/30 transition-all duration-200 hover:-translate-y-0.5 hover:border-slate-200/70 hover:shadow-md hover:shadow-slate-200/40 dark:border-slate-700/50 dark:bg-slate-900/80 dark:shadow-lg dark:shadow-slate-900/30 dark:hover:border-slate-600/70",children:[e.jsx("dt",{className:"text-xs font-semibold uppercase tracking-[0.14em] text-slate-500 dark:text-slate-400",children:s.label}),e.jsx("dd",{className:"mt-2 text-base font-semibold text-slate-900 dark:text-slate-100",children:s.value}),s.hint?e.jsx("p",{className:o(i,"mt-2 text-xs leading-relaxed"),children:s.hint}):null]},s.label))})}function P(){const{t}=v(),{pushToast:s}=k(),a=N(["status","gateway"],{url:"/api/status",method:"GET"},{staleTime:6e4});r.useEffect(()=>{a.isError&&a.error&&s({title:t("about.toast.statusError.title"),description:a.error.message,variant:"error"})},[a.isError,a.error,s,t]);const n=_.version,l=r.useMemo(()=>{const u=L,f=u.VITE_BUILD_TIME,g=u.VITE_NODE_VERSION;return{buildTime:f,nodeVersion:g}},[]),h=r.useMemo(()=>[{label:t("about.app.labels.name"),value:e.jsx("span",{className:"font-mono text-sm font-semibold text-slate-900 dark:text-slate-100",children:"cc-gw"})},{label:t("about.app.labels.version"),value:e.jsxs("span",{className:"font-mono text-sm font-semibold text-blue-700 dark:text-blue-200",children:["v",n]})},{label:t("about.app.labels.buildTime"),value:l.buildTime,hint:t("about.app.hint.buildTime")},{label:t("about.app.labels.node"),value:e.jsx("span",{className:"font-mono text-sm text-slate-800 dark:text-slate-200",children:l.nodeVersion})}],[n,l.buildTime,l.nodeVersion,t]),c=r.useMemo(()=>a.data?[{label:t("about.status.labels.host"),value:a.data.host??"127.0.0.1"},{label:t("about.status.labels.port"),value:a.data.port.toLocaleString()},{label:t("about.status.labels.providers"),value:a.data.providers.toLocaleString()},{label:t("about.status.labels.active"),value:(a.data.activeRequests??0).toLocaleString(),hint:t("about.status.hint.active")}]:[],[a.data,t]),x=()=>{s({title:t("about.toast.updatesPlanned"),variant:"info"})};return e.jsxs("div",{className:"space-y-8",children:[e.jsx(w,{icon:e.jsx(y,{className:"h-6 w-6","aria-hidden":"true"}),title:t("about.title"),description:t("about.description"),badge:`v${n}`,actions:e.jsx(b,{variant:"primary",icon:e.jsx(E,{className:"h-4 w-4","aria-hidden":"true"}),onClick:x,children:t("about.support.actions.checkUpdates")})}),e.jsxs("div",{className:"grid gap-6 lg:grid-cols-2",children:[e.jsx(d,{title:t("about.app.title"),description:t("about.app.subtitle"),className:"h-full",contentClassName:"gap-4",children:e.jsx(m,{items:h})}),e.jsx(d,{title:t("about.status.title"),description:t("about.status.subtitle"),className:"h-full",contentClassName:"gap-4",actions:e.jsx(b,{variant:"subtle",size:"sm",icon:e.jsx(T,{className:"h-4 w-4","aria-hidden":"true"}),onClick:()=>a.refetch(),loading:a.isFetching,children:a.isFetching?t("common.actions.refreshing"):t("common.actions.refresh")}),children:a.isLoading?e.jsxs("div",{className:"flex h-36 flex-col items-center justify-center gap-3 text-center",children:[e.jsx("div",{className:"h-10 w-10 animate-spin rounded-full border-[3px] border-blue-500/30 border-t-blue-600 dark:border-blue-400/20 dark:border-t-blue-300"}),e.jsx("p",{className:o(i,"text-sm"),children:t("about.status.loading")})]}):c.length>0?e.jsx(m,{items:c}):e.jsxs("div",{className:"flex h-36 flex-col items-center justify-center gap-2 rounded-2xl border border-dashed border-slate-200/60 bg-white p-6 text-center shadow-inner dark:border-slate-700/60 dark:bg-slate-900/60",children:[e.jsx("p",{className:"text-sm font-semibold text-slate-700 dark:text-slate-200",children:t("about.status.empty")}),e.jsx("p",{className:o(i,"text-xs"),children:t("common.actions.refresh")})]})})]}),e.jsx(d,{title:t("about.support.title"),description:e.jsxs("span",{className:"space-y-1",children:[e.jsx("span",{className:"block text-sm font-semibold text-blue-600 dark:text-blue-300",children:t("about.support.subtitle")}),e.jsx("span",{children:t("about.support.description")})]}),className:"relative overflow-hidden",contentClassName:"gap-6",children:e.jsxs("div",{className:"flex flex-col gap-4 rounded-3xl border border-slate-200/50 bg-white p-6 shadow-lg shadow-slate-200/30 backdrop-blur-md dark:border-slate-700/50 dark:bg-slate-900/80 dark:shadow-slate-900/40",children:[e.jsxs("div",{className:"flex flex-wrap items-start gap-4",children:[e.jsx("div",{className:"grid h-12 w-12 place-items-center rounded-2xl bg-gradient-to-br from-blue-500/20 to-indigo-500/20 text-blue-600 shadow-inner dark:text-blue-200",children:e.jsx(j,{className:"h-6 w-6","aria-hidden":"true"})}),e.jsx("p",{className:o(i,"text-sm leading-6"),children:t("about.support.tip")})]}),e.jsx("code",{className:"inline-flex items-center gap-2 self-start rounded-full border border-blue-200/50 bg-blue-50/80 px-4 py-2 text-xs font-semibold tracking-wide text-blue-700 shadow-sm dark:border-blue-500/30 dark:bg-blue-900/30 dark:text-blue-200",children:"~/.cc-gw/config.json"})]})})]})}export{P as default};
+ */const E=p("Sparkles",[["path",{d:"m12 3-1.912 5.813a2 2 0 0 1-1.275 1.275L3 12l5.813 1.912a2 2 0 0 1 1.275 1.275L12 21l1.912-5.813a2 2 0 0 1 1.275-1.275L21 12l-5.813-1.912a2 2 0 0 1-1.275-1.275L12 3Z",key:"17u4zn"}],["path",{d:"M5 3v4",key:"bklmnn"}],["path",{d:"M19 17v4",key:"iiml17"}],["path",{d:"M3 5h4",key:"nem4j1"}],["path",{d:"M17 19h4",key:"lbex7p"}]]),I="0.4.3",_={version:I},L={VITE_BUILD_TIME:"2025-10-30T03:41:36.581Z",VITE_NODE_VERSION:"v22.14.0"};function m({items:t}){return t.length===0?null:e.jsx("dl",{className:"grid gap-4 sm:grid-cols-2 xl:grid-cols-2",children:t.map(s=>e.jsxs("div",{className:"rounded-2xl border border-slate-200/50 bg-white p-4 shadow-sm shadow-slate-200/30 transition-all duration-200 hover:-translate-y-0.5 hover:border-slate-200/70 hover:shadow-md hover:shadow-slate-200/40 dark:border-slate-700/50 dark:bg-slate-900/80 dark:shadow-lg dark:shadow-slate-900/30 dark:hover:border-slate-600/70",children:[e.jsx("dt",{className:"text-xs font-semibold uppercase tracking-[0.14em] text-slate-500 dark:text-slate-400",children:s.label}),e.jsx("dd",{className:"mt-2 text-base font-semibold text-slate-900 dark:text-slate-100",children:s.value}),s.hint?e.jsx("p",{className:o(i,"mt-2 text-xs leading-relaxed"),children:s.hint}):null]},s.label))})}function P(){const{t}=v(),{pushToast:s}=k(),a=N(["status","gateway"],{url:"/api/status",method:"GET"},{staleTime:6e4});r.useEffect(()=>{a.isError&&a.error&&s({title:t("about.toast.statusError.title"),description:a.error.message,variant:"error"})},[a.isError,a.error,s,t]);const n=_.version,l=r.useMemo(()=>{const u=L,f=u.VITE_BUILD_TIME,g=u.VITE_NODE_VERSION;return{buildTime:f,nodeVersion:g}},[]),h=r.useMemo(()=>[{label:t("about.app.labels.name"),value:e.jsx("span",{className:"font-mono text-sm font-semibold text-slate-900 dark:text-slate-100",children:"cc-gw"})},{label:t("about.app.labels.version"),value:e.jsxs("span",{className:"font-mono text-sm font-semibold text-blue-700 dark:text-blue-200",children:["v",n]})},{label:t("about.app.labels.buildTime"),value:l.buildTime,hint:t("about.app.hint.buildTime")},{label:t("about.app.labels.node"),value:e.jsx("span",{className:"font-mono text-sm text-slate-800 dark:text-slate-200",children:l.nodeVersion})}],[n,l.buildTime,l.nodeVersion,t]),c=r.useMemo(()=>a.data?[{label:t("about.status.labels.host"),value:a.data.host??"127.0.0.1"},{label:t("about.status.labels.port"),value:a.data.port.toLocaleString()},{label:t("about.status.labels.providers"),value:a.data.providers.toLocaleString()},{label:t("about.status.labels.active"),value:(a.data.activeRequests??0).toLocaleString(),hint:t("about.status.hint.active")}]:[],[a.data,t]),x=()=>{s({title:t("about.toast.updatesPlanned"),variant:"info"})};return e.jsxs("div",{className:"space-y-8",children:[e.jsx(w,{icon:e.jsx(y,{className:"h-6 w-6","aria-hidden":"true"}),title:t("about.title"),description:t("about.description"),badge:`v${n}`,actions:e.jsx(b,{variant:"primary",icon:e.jsx(E,{className:"h-4 w-4","aria-hidden":"true"}),onClick:x,children:t("about.support.actions.checkUpdates")})}),e.jsxs("div",{className:"grid gap-6 lg:grid-cols-2",children:[e.jsx(d,{title:t("about.app.title"),description:t("about.app.subtitle"),className:"h-full",contentClassName:"gap-4",children:e.jsx(m,{items:h})}),e.jsx(d,{title:t("about.status.title"),description:t("about.status.subtitle"),className:"h-full",contentClassName:"gap-4",actions:e.jsx(b,{variant:"subtle",size:"sm",icon:e.jsx(T,{className:"h-4 w-4","aria-hidden":"true"}),onClick:()=>a.refetch(),loading:a.isFetching,children:a.isFetching?t("common.actions.refreshing"):t("common.actions.refresh")}),children:a.isLoading?e.jsxs("div",{className:"flex h-36 flex-col items-center justify-center gap-3 text-center",children:[e.jsx("div",{className:"h-10 w-10 animate-spin rounded-full border-[3px] border-blue-500/30 border-t-blue-600 dark:border-blue-400/20 dark:border-t-blue-300"}),e.jsx("p",{className:o(i,"text-sm"),children:t("about.status.loading")})]}):c.length>0?e.jsx(m,{items:c}):e.jsxs("div",{className:"flex h-36 flex-col items-center justify-center gap-2 rounded-2xl border border-dashed border-slate-200/60 bg-white p-6 text-center shadow-inner dark:border-slate-700/60 dark:bg-slate-900/60",children:[e.jsx("p",{className:"text-sm font-semibold text-slate-700 dark:text-slate-200",children:t("about.status.empty")}),e.jsx("p",{className:o(i,"text-xs"),children:t("common.actions.refresh")})]})})]}),e.jsx(d,{title:t("about.support.title"),description:e.jsxs("span",{className:"space-y-1",children:[e.jsx("span",{className:"block text-sm font-semibold text-blue-600 dark:text-blue-300",children:t("about.support.subtitle")}),e.jsx("span",{children:t("about.support.description")})]}),className:"relative overflow-hidden",contentClassName:"gap-6",children:e.jsxs("div",{className:"flex flex-col gap-4 rounded-3xl border border-slate-200/50 bg-white p-6 shadow-lg shadow-slate-200/30 backdrop-blur-md dark:border-slate-700/50 dark:bg-slate-900/80 dark:shadow-slate-900/40",children:[e.jsxs("div",{className:"flex flex-wrap items-start gap-4",children:[e.jsx("div",{className:"grid h-12 w-12 place-items-center rounded-2xl bg-gradient-to-br from-blue-500/20 to-indigo-500/20 text-blue-600 shadow-inner dark:text-blue-200",children:e.jsx(j,{className:"h-6 w-6","aria-hidden":"true"})}),e.jsx("p",{className:o(i,"text-sm leading-6"),children:t("about.support.tip")})]}),e.jsx("code",{className:"inline-flex items-center gap-2 self-start rounded-full border border-blue-200/50 bg-blue-50/80 px-4 py-2 text-xs font-semibold tracking-wide text-blue-700 shadow-sm dark:border-blue-500/30 dark:bg-blue-900/30 dark:text-blue-200",children:"~/.cc-gw/config.json"})]})})]})}export{P as default};

package/src/web/dist/assets/{ApiKeys-CTR9Ynaf.js → ApiKeys-DsYmx21U.js}

@@ -1,4 +1,4 @@
-import{c as T,u as W,a as J,r as d,j as e,L as X,N as Y,d as t,b as K,m as r,H as m,E as Z,k as ee,l as ae,f as se,h as te}from"./index-B-8NzzZq.js";import{E as le}from"./index-BuSvAxno.js";import{u as w}from"./useApiQuery-DZHaAgf7.js";import{P as ie,a as q}from"./PageSection-BbmHOMiD.js";import{F as I}from"./FormField-CsiVhN9M.js";import{I as re}from"./Input-jZIOmpmG.js";import{B as C}from"./Button-CkW8jVT-.js";import{S as ne}from"./StatusBadge-DCmNAKwK.js";import{C as ce}from"./copy-D50F736h.js";/**
+import{c as T,u as W,a as J,r as d,j as e,L as X,N as Y,d as t,b as K,m as r,H as m,E as Z,k as ee,l as ae,f as se,h as te}from"./index-BK1UNVMz.js";import{E as le}from"./index-CyrAg0Ev.js";import{u as w}from"./useApiQuery-BNTE55UK.js";import{P as ie,a as q}from"./PageSection-B08EcVAN.js";import{F as I}from"./FormField-SZpxR702.js";import{I as re}from"./Input-BdyQWPOU.js";import{B as C}from"./Button-CZXniSHM.js";import{S as ne}from"./StatusBadge-8KAMZvYW.js";import{C as ce}from"./copy-BdNskWTP.js";/**
  * @license lucide-react v0.344.0 - ISC
  *
  * This source code is licensed under the ISC license.