tokentracker-cli 0.58.0 → 0.60.0

package/src/lib/rollout.js

@@ -2553,22 +2553,31 @@ function readMimoDbMessages(dbPath, sqliteOptions = {}) {
 // ZCode is Z.ai's (Zhipu) coding agent — another OpenCode-fork that stores
 // assistant messages in the identical `message` table schema
 // (~/.zcode/cli/db/db.sqlite). Its own agent runs GLM models through Z.ai /
-// BigModel endpoints, tagged with a providerID like "builtin:zai-start-plan",
-// "builtin:zai-coding-plan", or "builtin:bigmodel-coding-plan". ZCode can ALSO
-// orchestrate bundled claude-code / codex / gemini-cli sub-agents; those turns
-// carry providerID "anthropic"/"openai"/"google" and are already counted by the
-// standalone Claude/Codex/Gemini parsers. Keep ONLY ZCode-native (Z.ai /
-// BigModel / Zhipu) rows so we never double-count. Key off providerID, NEVER the
-// model id — a GLM model the user ran *inside* Claude Code is source=claude, so
-// matching "glm" on the model would re-count it. Mirrors the Mimo discipline.
+// BigModel endpoints (providerID "builtin:zai-start-plan",
+// "builtin:bigmodel-coding-plan", …), but ZCode also lets users add CUSTOM
+// providers (a built-in feature beyond the Z.ai plan subscription) that point at
+// ANY model — MiMo, Sakana Fugu, any OpenAI-compatible proxy. A user-defined
+// provider is assigned a random UUID as its providerID (observed on a real box:
+// model "mimo-v2.5-pro" under providerID "265956bf-…"), so an allowlist of known
+// vendor keywords can NEVER match it and silently drops every custom-provider
+// turn (issue #216). Those turns live ONLY in this DB, so we must keep them or
+// they go uncounted entirely. The exception is the bundled
+// claude-code / codex / gemini-cli sub-agents ZCode can orchestrate: those carry
+// providerID "anthropic"/"openai"/"google" and write to ~/.claude / ~/.codex /
+// ~/.gemini, so the standalone Claude/Codex/Gemini parsers already count them —
+// DROP those here to avoid double-counting. Hence a blocklist (exclude the three
+// direct vendors), not an allowlist that would silently miss every third-party
+// model. Key off providerID, NEVER the model id — a GLM/Claude model the user
+// ran *inside* Claude Code is source=claude, so matching the model name would
+// re-count it. Mirrors the Mimo discipline.
 function isZcodeNativeMessage(data) {
   if (!data) return false;
   const provider = String(data.providerID || "").toLowerCase();
-  return (
-    provider.includes("zai") ||
-    provider.includes("bigmodel") ||
-    provider.includes("zcode") ||
-    provider.includes("zhipu")
+  if (!provider) return false;
+  return !(
+    provider.includes("anthropic") ||
+    provider.includes("openai") ||
+    provider.includes("google")
   );
 }
 

package/src/lib/usage-limits.js

@@ -25,6 +25,7 @@ const {
 } = require("./cursor-config");
 const { fetchGrokLimits } = require("./grok-limits");
 const { fetchZcodeLimits } = require("./zcode-limits");
+const { fetchOpencodeGoLimits } = require("./opencode-go-limits");
 const { readSqliteJsonRows } = require("./sqlite-reader");
 
 // 2-minute in-memory cache
@@ -2290,7 +2291,7 @@ async function fetchUsageLimitsUncached({
   const freshClaudeCache = claudeToken ? readFreshClaudeLimitsCache({ home, nowMs }) : null;
 
   const providerFetch = withFetchTimeout(fetchImpl, providerTimeoutMs);
-  const [claudeResult, codexResult, cursor, kimi, gemini, kiro, antigravity, copilot, grok, zcode] = await Promise.all([
+  const [claudeResult, codexResult, cursor, kimi, gemini, kiro, antigravity, copilot, grok, zcode, opencodeGo] = await Promise.all([
     claudeToken && !freshClaudeCache && !claudeRetryAtMs
       ? withProviderTimeout(fetchClaudeUsageLimits(claudeToken, { fetchImpl: providerFetch, maxAttempts: 1 }), "Claude", providerTimeoutMs).then(
           (value) => ({ status: "fulfilled", value }),
@@ -2321,6 +2322,11 @@ async function fetchUsageLimitsUncached({
       .catch((reason) => ({ configured: true, error: reason?.message || "Unknown error" })),
     withProviderTimeout(fetchZcodeLimits({ home, env, fetchImpl: providerFetch }), "ZCode", providerTimeoutMs)
       .catch((reason) => ({ configured: true, error: reason?.message || "Unknown error" })),
+    // OpenCode Go scrapes the workspace dashboard (no public REST API yet,
+    // tracked at anomalyco/opencode#16017). Auth is via two env vars, see
+    // src/lib/opencode-go-limits.js for the exact endpoint + cookie shape.
+    withProviderTimeout(fetchOpencodeGoLimits({ env, fetchImpl: providerFetch }), "OpenCode Go", providerTimeoutMs)
+      .catch((reason) => ({ configured: true, error: reason?.message || "Unknown error" })),
   ]);
 
   let claude;
@@ -2403,6 +2409,7 @@ async function fetchUsageLimitsUncached({
     copilot: withPlanLabel(copilot, copilot.plan_name, "Copilot"),
     grok: withPlanLabel(grok, null, "Grok"),
     zcode: withPlanLabel(zcode, zcode.plan_label, "ZCode"),
+    opencodeGo: withPlanLabel(opencodeGo, opencodeGo?.plan_label, "OpenCode Go"),
   };
 
   cache = { data, fetchedAt: nowMs };
@@ -2435,4 +2442,5 @@ module.exports = {
   describeCopilotOtelStatus,
   fetchGrokLimits,
   fetchZcodeLimits,
+  fetchOpencodeGoLimits,
 };