anygate 0.5.4 → 0.5.5

package/dist/{chunk-E2MV3GDX.js → chunk-CH5IEXJN.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   getTemplateById
-} from "./chunk-VKROC37K.js";
+} from "./chunk-YYSUTRMV.js";
 
 // src/core/constants.ts
 import { homedir } from "os";
@@ -10,7 +10,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "anygate",
-  version: "0.5.4",
+  version: "0.5.5",
   publishConfig: {
     access: "public"
   },
@@ -4782,8 +4782,8 @@ function getUsage(chunk) {
   const u = resp?.usageMetadata;
   if (!u) return null;
   return {
-    input: u.promptTokenCount ?? 0,
-    output: u.candidatesTokenCount ?? 0
+    inputTokens: u.promptTokenCount ?? 0,
+    outputTokens: u.candidatesTokenCount ?? 0
   };
 }
 function partThoughtSignature(part) {
@@ -4842,7 +4842,7 @@ async function streamCloudCodeToAnthropic(res, upstreamRes, model, log7) {
     textBlockOpen: false,
     pendingThoughtSignature: void 0,
     toolCalls: [],
-    usage: { input: 0, output: 0 },
+    usage: { inputTokens: 0, outputTokens: 0 },
     emittedTextChars: 0,
     suppressedThoughtChars: 0
   };
@@ -4869,7 +4869,7 @@ async function streamCloudCodeToAnthropic(res, upstreamRes, model, log7) {
     writeEvent(res, "message_delta", { type: "message_delta", delta: { stop_reason: "end_turn", stop_sequence: null }, usage: { output_tokens: 0 } });
     writeEvent(res, "message_stop", { type: "message_stop" });
     res.end();
-    return;
+    return state.usage;
   }
   const reader = upstreamRes.body.getReader();
   const decoder = new TextDecoder();
@@ -4919,7 +4919,7 @@ async function streamCloudCodeToAnthropic(res, upstreamRes, model, log7) {
           finalStopReason = mapStopReason(finishReason);
           log7?.(() => {
             const toolNames = state.toolCalls.map((tc) => tc.name).filter(Boolean).join(",");
-            return `cloud-code stream finish=${finishReason} mapped=${finalStopReason} ${summarizeParts(parts)} emittedTextChars=${state.emittedTextChars} suppressedThoughtChars=${state.suppressedThoughtChars} queuedToolCalls=${state.toolCalls.length} queuedToolNames=${toolNames || "-"} outputTokens=${state.usage.output}`;
+            return `cloud-code stream finish=${finishReason} mapped=${finalStopReason} ${summarizeParts(parts)} emittedTextChars=${state.emittedTextChars} suppressedThoughtChars=${state.suppressedThoughtChars} queuedToolCalls=${state.toolCalls.length} queuedToolNames=${toolNames || "-"} outputTokens=${state.usage.outputTokens}`;
           });
           if (state.textBlockOpen) {
             closeBlock(res, state);
@@ -4951,11 +4951,11 @@ async function streamCloudCodeToAnthropic(res, upstreamRes, model, log7) {
           writeEvent(res, "message_delta", {
             type: "message_delta",
             delta: { stop_reason: anthropicStopReason, stop_sequence: null },
-            usage: { output_tokens: state.usage.output }
+            usage: { output_tokens: state.usage.outputTokens }
           });
           writeEvent(res, "message_stop", { type: "message_stop" });
           res.end();
-          return;
+          return state.usage;
         }
       }
     }
@@ -4969,10 +4969,11 @@ async function streamCloudCodeToAnthropic(res, upstreamRes, model, log7) {
   writeEvent(res, "message_delta", {
     type: "message_delta",
     delta: { stop_reason: finalStopReason, stop_sequence: null },
-    usage: { output_tokens: state.usage.output }
+    usage: { output_tokens: state.usage.outputTokens }
   });
   writeEvent(res, "message_stop", { type: "message_stop" });
   res.end();
+  return state.usage;
 }
 async function collectCloudCodeToAnthropic(upstreamRes, model, log7) {
   const text4 = await upstreamRes.text();
@@ -4988,8 +4989,8 @@ async function collectCloudCodeToAnthropic(upstreamRes, model, log7) {
     if (!chunk) continue;
     const usage = getUsage(chunk);
     if (usage) {
-      inputTokens = usage.input;
-      outputTokens = usage.output;
+      inputTokens = usage.inputTokens;
+      outputTokens = usage.outputTokens;
     }
     const candidate = getCandidate(chunk);
     if (!candidate) continue;
@@ -5033,7 +5034,9 @@ async function collectCloudCodeToAnthropic(upstreamRes, model, log7) {
     model,
     stop_reason: stopReason,
     stop_sequence: null,
-    usage: { input_tokens: inputTokens, output_tokens: outputTokens }
+    usage: { input_tokens: inputTokens, output_tokens: outputTokens },
+    inputTokens,
+    outputTokens
   };
 }
 
@@ -5472,6 +5475,9 @@ async function generateAnthropicResponse(model, params, modelId, options) {
 import { appendFileSync as appendFileSync2, openSync as openSync2, writeSync as writeSync2, closeSync as closeSync2, readFileSync as readFileSync9, existsSync as existsSync9 } from "fs";
 import { join as join9 } from "path";
 var ANALYTICS_FILE = "analytics.jsonl";
+function normalizeModelKey(modelId) {
+  return modelId.toLowerCase().replace(/\//g, ":").replace(/\s*\([^)]*\)\s*$/g, "").replace(/\s+/g, " ").trim();
+}
 function analyticsPath() {
   return join9(getAppHome(), ANALYTICS_FILE);
 }
@@ -5576,21 +5582,27 @@ function aggregateAnalytics(range) {
     const hour = Number(e.ts.slice(11, 13));
     if (Number.isFinite(hour) && hour >= 0 && hour < 24) hourCounts[hour] += 1;
     const provider = e.providerId ?? e.npm?.replace(/^@/, "").replace(/\//g, "-") ?? "unknown";
-    const key = `${provider}|${e.modelId}`;
-    const m = modelMap.get(key) ?? { provider, model: e.modelId, app: e.app, inputTokens: 0, outputTokens: 0 };
+    const key = `${provider}|${normalizeModelKey(e.modelId)}`;
+    const m = modelMap.get(key) ?? { provider, model: e.modelId, app: e.app, apps: /* @__PURE__ */ new Set(), inputTokens: 0, outputTokens: 0 };
+    if (!/\s/.test(m.model) && /\s/.test(e.modelId)) m.model = e.modelId;
     m.inputTokens += e.inputTokens;
     m.outputTokens += e.outputTokens;
+    m.apps.add(e.app);
     modelMap.set(key, m);
   }
-  const busiestDay = Math.max(1, ...[...eventsByDay.values()]);
+  const busiestDay = Math.max(1, ...[...tokensByDay.values()]);
   const heatmap = [];
   for (let i = rangeDays(range) - 1; i >= 0; i--) {
     const d = new Date(today);
     d.setUTCDate(today.getUTCDate() - i);
     const date = d.toISOString().slice(0, 10);
-    const count = eventsByDay.get(date) ?? 0;
-    const intensity = Math.min(4, Math.round(count / busiestDay * 4)) || 0;
-    heatmap.push({ date, count, intensity });
+    const tokens = tokensByDay.get(date) ?? 0;
+    let intensity = 0;
+    if (tokens > 0) {
+      const pct = tokens / busiestDay;
+      intensity = Math.max(1, Math.min(4, Math.round(1 + pct * 3)));
+    }
+    heatmap.push({ date, count: tokens, intensity });
   }
   const dailyTokens = [];
   for (let i = rangeDays(range) - 1; i >= 0; i--) {
@@ -5625,12 +5637,14 @@ function aggregateAnalytics(range) {
   }
   const models = [...modelMap.entries()].map(([, m], idx) => {
     const share = totalTokens > 0 ? (m.inputTokens + m.outputTokens) / totalTokens : 0;
+    const apps = [...m.apps];
     return {
       provider: m.provider,
       model: m.model,
       tier: "",
       // source tier isn't tracked in the log; UI shows it from catalog elsewhere
-      app: m.app,
+      app: apps[0] ?? m.app,
+      apps,
       inputTokens: m.inputTokens,
       outputTokens: m.outputTokens,
       share,
@@ -5939,12 +5953,22 @@ data: ${JSON.stringify({ type: "error", error: { type: errorType, message } })}
             anthropicError(res, upstream.status >= 500 ? 502 : upstream.status, errBody);
             return;
           }
+          let usage = { inputTokens: 0, outputTokens: 0 };
           if (clientWantsStream) {
-            await streamCloudCodeToAnthropic(res, upstream, route.realModelId, plog);
+            usage = await streamCloudCodeToAnthropic(res, upstream, route.realModelId, plog);
           } else {
             const response = await collectCloudCodeToAnthropic(upstream, route.realModelId, plog);
+            usage = { inputTokens: response.inputTokens ?? 0, outputTokens: response.outputTokens ?? 0 };
             sendJson(res, 200, response);
           }
+          recordUsage({
+            ts: (/* @__PURE__ */ new Date()).toISOString(),
+            modelId: route.realModelId,
+            providerId: route.providerId,
+            app: route.app ?? "Antigravity",
+            inputTokens: usage.inputTokens,
+            outputTokens: usage.outputTokens
+          });
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           plog(() => `cloud-code fetch error: ${message}`);
@@ -10749,6 +10773,7 @@ export {
   encodeToolUseId,
   serializeToolResultContent,
   translateRequest,
+  recordUsage,
   aggregateAnalytics,
   aliasModelId,
   startProxyCatalog,
@@ -10817,4 +10842,4 @@ export {
   quitClaudeAppGracefully,
   launchOrRestartClaudeApp
 };
-//# sourceMappingURL=chunk-E2MV3GDX.js.map
+//# sourceMappingURL=chunk-CH5IEXJN.js.map