tokentracker-cli 1.1.2 → 1.1.4

package/src/commands/status.js

@@ -93,6 +93,8 @@ const {
   resolveDroidSessionsDir,
   resolveDshHomes,
   resolveDshSessionFiles,
+  resolveCommandCodeHomes,
+  resolveCommandCodeSessionFiles,
   resolveTraeStoragePath,
   readTraeEntitlementFromStorage,
   resolveGrokBuildSessions,
@@ -729,6 +731,20 @@ async function cmdStatus(argv = []) {
   const dshSessionsDir = dshHomes.map((homeDir) => path.join(homeDir, "sessions")).join(", ");
   const dshSessionFiles = await resolveDshSessionFiles(process.env);
   const dshInstalled = dshSessionFiles.length > 0;
+  let commandCodeProjectsDir = "";
+  let commandCodeSessionFiles = [];
+  let commandCodeDiscoveryError = null;
+  try {
+    commandCodeProjectsDir = resolveCommandCodeHomes(process.env)
+      .map((homeDir) => path.join(homeDir, "projects"))
+      .join(", ");
+    commandCodeSessionFiles = await resolveCommandCodeSessionFiles(process.env);
+  } catch (error) {
+    // Discovery stays strict for sync, but a provider read error must not
+    // suppress the rest of the status diagnostics.
+    commandCodeDiscoveryError = `${error?.code ? `${error.code}: ` : ""}${error?.message || String(error)}`;
+  }
+  const commandCodeInstalled = commandCodeSessionFiles.length > 0;
   const lmstudioHome = resolveLmstudioHome(process.env);
   const lmstudioLogFiles = await resolveLmstudioLogFiles(process.env);
   const lmstudioInstalled = lmstudioLogFiles.length > 0;
@@ -739,9 +755,10 @@ async function cmdStatus(argv = []) {
   const devinDbPath = resolveDevinDbPath(process.env);
   const devinInstalled = Boolean(devinDbPath && fssync.existsSync(devinDbPath));
 
-  // Trae SOLO (ByteDance AI IDE) — passive entitlement snapshot reader.
+  const { resolveTraeDbPaths } = require("../lib/trae-db");
+  const traeDbPaths = resolveTraeDbPaths(process.env);
   const traeStoragePath = resolveTraeStoragePath(process.env);
-  const traeInstalled = Boolean(traeStoragePath);
+  const traeInstalled = Boolean(traeStoragePath || traeDbPaths.length);
   // Render path for the entitlement snapshot: read it straight from the
   // Trae Local State storage.json via the shared parser. The queue stays
   // token-count-only, so the status read path never depends on queue rows
@@ -1083,6 +1100,15 @@ async function cmdStatus(argv = []) {
         dsh: dshInstalled
           ? { installed: true, files: dshSessionFiles.length, detail: dshSessionsDir }
           : { installed: false },
+        "command-code": commandCodeInstalled
+          ? {
+              installed: true,
+              files: commandCodeSessionFiles.length,
+              detail: commandCodeProjectsDir,
+            }
+          : commandCodeDiscoveryError
+            ? { installed: false, error: commandCodeDiscoveryError }
+            : { installed: false },
         lmstudio: lmstudioInstalled
           ? {
               installed: true,
@@ -1099,7 +1125,9 @@ async function cmdStatus(argv = []) {
         trae: traeInstalled
           ? {
               installed: true,
-              detail: traeStoragePath,
+              detail: traeDbPaths[0] || traeStoragePath,
+              usage_databases: traeDbPaths.length,
+              usage_key_source: process.env.TOKENTRACKER_TRAE_SQLCIPHER_KEY?.trim() ? "environment" : "application",
               ...(traeEntitlement ? { entitlement: traeEntitlement } : {}),
             }
           : { installed: false },
@@ -1288,6 +1316,11 @@ async function cmdStatus(argv = []) {
       dshInstalled
         ? `- DeepSeek Harness: passive reader (${dshSessionFiles.length} session${dshSessionFiles.length !== 1 ? "s" : ""} in ${dshSessionsDir})`
         : null,
+      commandCodeInstalled
+        ? `- Command Code: passive reader (${commandCodeSessionFiles.length} session${commandCodeSessionFiles.length !== 1 ? "s" : ""} in ${commandCodeProjectsDir})`
+        : commandCodeDiscoveryError
+          ? `- Command Code: discovery failed (${commandCodeDiscoveryError})`
+          : null,
       lmstudioInstalled
         ? `- LM Studio: passive reader (${lmstudioLogFiles.length} log${lmstudioLogFiles.length !== 1 ? "s" : ""} in ${path.join(lmstudioHome, "server-logs")})`
         : null,
@@ -1298,12 +1331,9 @@ async function cmdStatus(argv = []) {
         ? `- Devin CLI: passive reader (${devinDbPath})`
         : null,
       traeInstalled
-        // Deliberately NOT "passive reader": every other line with that wording
-        // means tokens are being counted. Trae encrypts its session transcripts
-        // (SQLCipher) and its plaintext summaries carry no token counts, so this
-        // provider contributes plan info and nothing else — say so, or users go
-        // looking for Trae usage in the dashboard that will never appear.
-        ? `- Trae SOLO: plan info only, no token usage (${traeStoragePath})`
+        ? traeDbPaths.length
+          ? `- TRAE: local usage reader, ${traeDbPaths.length} database(s) (shared application key; optional key override)`
+          : `- TRAE: plan info only, no local usage database found (${traeStoragePath})`
         : null,
       traeEntitlement
         ? `- Trae SOLO plan: ${formatTraeEntitlementLine(traeEntitlement)}`

package/src/commands/sync.js

@@ -135,7 +135,10 @@ const {
   resolveDroidModel,
   resolveDshSessionFiles,
   parseDshIncremental,
+  resolveCommandCodeSessionFiles,
+  parseCommandCodeIncremental,
   parseTraeCnApiIncremental,
+  parseTraeIncremental,
   bucketKey,
   toUtcHalfHourStart,
   totalsKey,
@@ -284,6 +287,7 @@ const ZCODE_NATIVE_USAGE_REPAIR_KEY = "zcodeNativeUsageRepair_2026_08";
 const ZCODE_INCLUSIVE_TOKEN_REPAIR_KEY = "zcodeInclusiveTokenRepair_2026_09";
 const AUTO_SYNC_SOURCE_ALIASES = new Map([
   ["code", "every-code"],
+  ["commandcode", "command-code"],
   ["deepseek", "dsh"],
   ["everycode", "every-code"],
   ["kilo", "kilo-cli"],
@@ -300,6 +304,7 @@ const AUTO_SYNC_SOURCES = new Set([
   "cline",
   "codebuddy",
   "codex",
+  "command-code",
   "copilot",
   "craft",
   "cursor",
@@ -329,6 +334,7 @@ const AUTO_SYNC_SOURCES = new Set([
   "reasonix",
   "roocode",
   "trae-cn",
+  "trae",
   "unsloth",
   "workbuddy",
   "zcode",
@@ -1650,6 +1656,34 @@ async function cmdSync(argv, context = {}) {
       }
     }
 
+    // ── Command Code (`cmd`) — passive read of ~/.commandcode session logs ──
+    let commandCodeResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    if (sourceAllowed("command-code")) {
+      try {
+        const commandCodeSessionFiles = await resolveCommandCodeSessionFiles(process.env);
+        // Empty discovery preserves durable usage history. Native I/O failures
+        // remain visible; optional WSL failures do not suppress native usage.
+        if (commandCodeSessionFiles.length > 0 || cursors.commandCode) {
+          if (progress?.enabled) {
+            progress.start(
+              `Parsing Command Code ${renderBar(0)} 0/${formatNumber(
+                commandCodeSessionFiles.length,
+              )} sessions | buckets 0`,
+            );
+          }
+          commandCodeResult = await parseCommandCodeIncremental({
+            sessionFiles: commandCodeSessionFiles,
+            cursors,
+            queuePath,
+            projectQueuePath,
+            onProgress: makeProviderProgress("Command Code"),
+          });
+        }
+      } catch (err) {
+        warnProviderParseFailure("Command Code", err, opts);
+      }
+    }
+
     // ── LM Studio and Unsloth Studio — passive inference usage ──
     let lmstudioResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     if (sourceAllowed("lmstudio")) {
@@ -1979,6 +2013,27 @@ async function cmdSync(argv, context = {}) {
       }
     }
 
+    let traeResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    if (sourceAllowed("trae")) {
+      try {
+        traeResult = await parseTraeIncremental({
+          cursors, queuePath, onProgress: makeProviderProgress("TRAE"),
+        });
+        for (const { database, message } of traeResult.errors) {
+          process.stderr.write(`TRAE sync: could not read ${database}: ${message}. Will retry on the next sync.\n`);
+        }
+        if (traeResult.recordsSkipped > 0 && !opts.auto) {
+          process.stderr.write(`TRAE sync: skipped ${traeResult.recordsSkipped} records with unsupported usage metadata.\n`);
+        }
+        if (traeResult.estimatedRecords > 0 && !opts.auto) {
+          process.stderr.write(`TRAE sync: ${traeResult.estimatedRecords} Gemini records have repaired thought or cache counters, marked as estimated.\n`);
+        }
+        if (traeResult.unpricedRecords > 0 && !opts.auto) {
+          process.stderr.write(`TRAE sync: ${traeResult.unpricedRecords} multi-request turns include earlier input without a cache split; it is counted in token totals but left out of cost.\n`);
+        }
+      } catch (err) { warnProviderParseFailure("TRAE", err); }
+    }
+
     // ── Trae Work CN (国内版) — account-level usage API ──
     // A simple explicit rolling 30-day window captured once per sync (no
     // cursor checkpoints / full-history import / page retries / background
@@ -3069,6 +3124,7 @@ async function cmdSync(argv, context = {}) {
       claudeScienceResult.recordsProcessed +
       cursorResult.recordsProcessed +
       traeCnResult.recordsProcessed +
+      traeResult.recordsProcessed +
       kiroResult.recordsProcessed +
       kiroCliResult.recordsProcessed +
       hermesResult.recordsProcessed +
@@ -3098,6 +3154,7 @@ async function cmdSync(argv, context = {}) {
       zedResult.recordsProcessed +
       gooseResult.recordsProcessed +
       dshResult.recordsProcessed +
+      commandCodeResult.recordsProcessed +
       droidResult.recordsProcessed;
     const totalBuckets =
       parseResult.bucketsQueued +
@@ -3111,6 +3168,7 @@ async function cmdSync(argv, context = {}) {
       claudeScienceResult.bucketsQueued +
       cursorResult.bucketsQueued +
       traeCnResult.bucketsQueued +
+      traeResult.bucketsQueued +
       kiroResult.bucketsQueued +
       kiroCliResult.bucketsQueued +
       hermesResult.bucketsQueued +
@@ -3140,15 +3198,18 @@ async function cmdSync(argv, context = {}) {
       zedResult.bucketsQueued +
       gooseResult.bucketsQueued +
       dshResult.bucketsQueued +
+      commandCodeResult.bucketsQueued +
       droidResult.bucketsQueued;
     const skipNoOpCursorCommit =
       opts.auto &&
       !isFullSourceScan &&
       cursorStore.mode === "v2" &&
       cursorStore.requiresCommit !== true &&
-      totalParsed === 0 &&
+      totalParsed === (commandCodeResult.cursorUnchanged ? commandCodeResult.recordsProcessed : 0) &&
       totalBuckets === 0 &&
       !(grokResult.projectBucketsQueued > 0) &&
+      !(commandCodeResult.projectBucketsQueued > 0) &&
+      !commandCodeResult.schemaMigrated &&
       !codexColdAuditDue &&
       !codexFallbackRetryRan &&
       !grokHookSignalConsumed &&

package/src/lib/pricing/curated-overrides.json

@@ -118,6 +118,13 @@
       "cache_write": 0.167,
       "note": "See hy3-preview-agent."
     },
+    "qwen3.8-flash": {
+      "input": 0.15,
+      "output": 0.47,
+      "cache_read": 0.016,
+      "cache_write": 0.2,
+      "note": "Alibaba Model Studio Singapore (International), USD per MTok, verified 2026-09-29: https://www.alibabacloud.com/help/en/model-studio/qwen3-8-flash . Reference API estimate; other regions/providers can have different rates. Issue #715."
+    },
     "hy4-preview": {
       "input": 0.833,
       "output": 2.5,

package/src/lib/pricing/matcher.js

@@ -277,6 +277,11 @@ function lookupPricing(model, { curated, litellm, source } = {}) {
   }
 
   // 1. CURATED exact
+  // Qwen Flash's provider-qualified and dated IDs share the reference SKU.
+  // Keep the boundary strict: Flash-Next and Max have independent prices.
+  if (/(?:^|\/)qwen3[.-]8-flash(?:-\d{4}-\d{2}-\d{2})?$/.test(lower.trim()) && curated.exact?.["qwen3.8-flash"]) {
+    return { hit: true, source: "curated:exact", value: curated.exact["qwen3.8-flash"] };
+  }
   if (curated.exact && curated.exact[lookupModel]) {
     return { hit: true, source: "curated:exact", value: curated.exact[lookupModel] };
   }