npm - tokentracker-cli - Versions diffs - 0.88.7 → 0.88.9 - Mend

tokentracker-cli 0.88.7 → 0.88.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (109) hide show

package/dashboard/dist/llms.txt CHANGED Viewed

@@ -1,7 +1,7 @@
 # Token Tracker LLMs Index
 Token Tracker is a free, open-source, local-first AI coding usage and cost
-tracker for 29 tools. Its distinctive desktop experience includes a pixel pet
+tracker for 31 tools. Its distinctive desktop experience includes a pixel pet
 powered by real token activity, four desktop widgets, and achievements. The
 same data powers a cross-platform CLI, a native macOS menu bar app, a native
 Windows system tray app, and a dashboard. It records token counts and
@@ -23,7 +23,7 @@ timestamps, never prompts, responses, or source code.
 - [npm package](https://www.npmjs.com/package/tokentracker-cli)
 - [Latest release](https://github.com/xiufengsun/TokenTracker/releases/latest)
-## Supported AI coding tools (29)
+## Supported AI coding tools (31)
 - Claude Code
 - Codex CLI
 - Cursor
@@ -42,6 +42,7 @@ timestamps, never prompts, responses, or source code.
 - oh-my-pi
 - pi
 - Craft Agents
+- Reasonix
 - Kilo CLI
 - Kilo Code
 - Roo Code
@@ -53,6 +54,7 @@ timestamps, never prompts, responses, or source code.
 - Qoder
 - AnythingLLM Desktop
 - Claude Science
+- DeepSeek Harness
 ## Capabilities
 - Desktop pet that reacts to real token burn, streaks, and rest

package/dashboard/dist/share.html CHANGED Viewed

@@ -75,7 +75,7 @@
         "description": "Shareable Token Tracker dashboard snapshot."
       }
     </script>
-    <script type="module" crossorigin src="/assets/__vite-browser-external-BgeLzJ0q.js"></script>
+    <script type="module" crossorigin src="/assets/__vite-browser-external-TfJNQh7R.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/__vite-browser-external-CRYifSM4.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "tokentracker-cli",
-  "version": "0.88.7",
-  "description": "Local-first AI coding token usage and cost tracker for 29 tools, with a dashboard, desktop pet, widgets, achievements, and native macOS/Windows apps.",
+  "version": "0.88.9",
+  "description": "Local-first AI coding token usage and cost tracker for 31 tools, with a dashboard, desktop pet, widgets, achievements, and native macOS/Windows apps.",
   "main": "src/cli.js",
   "bin": {
     "tokentracker-cli": "bin/tracker.js",

package/src/commands/init.js CHANGED Viewed

@@ -66,6 +66,7 @@ const {
   resolvePiAgentDir,
   piAgentDirCollidesWithOmp,
   resolveAnythingllmDbPath,
+  resolveReasonixHome,
   resolveTraeStoragePath,
 } = require("../lib/rollout");
 const { resolveRuntimeConfig, DEFAULT_BASE_URL } = require("../lib/runtime-config");
@@ -121,6 +122,7 @@ const SUPPORTED_PROVIDERS = [
   "oh-my-pi",
   "pi",
   "Craft Agents",
+  "Reasonix",
   "Kilo CLI",
   "Kilo Code",
   "Roo Code",
@@ -132,6 +134,7 @@ const SUPPORTED_PROVIDERS = [
   "Qoder",
   "AnythingLLM Desktop",
   "Claude Science",
+  "DeepSeek Harness",
 ];
 async function cmdInit(argv) {
@@ -717,6 +720,14 @@ async function applyIntegrationSetup({
     }
   }
+  // Reasonix: passive reader of content-free *.jsonl.telemetry.json sidecars.
+  {
+    const reasonixHome = resolveReasonixHome(process.env);
+    if (fssync.existsSync(reasonixHome)) {
+      summary.push({ label: "Reasonix", status: "detected", detail: "Passive telemetry reader (no hook needed)" });
+    }
+  }
   // Trae SOLO (ByteDance AI IDE): plan snapshot only. Trae keeps its session
   // transcripts SQLCipher-encrypted and its plaintext summaries hold no token
   // counts, so there is no usage to read — the detail line must not promise

package/src/commands/status.js CHANGED Viewed

@@ -62,6 +62,8 @@ const {
   piAgentDirCollidesWithOmp,
   resolveCraftSessionFiles,
   resolveCraftConfigDir,
+  resolveReasonixHome,
+  resolveReasonixTelemetryFiles,
   resolveKilocodeTaskFiles,
   resolveRoocodeTaskFiles,
   resolveZedDbPath,
@@ -72,6 +74,8 @@ const {
   resolveGooseDbPath,
   listDroidSettingsFiles,
   resolveDroidSessionsDir,
+  resolveDshHome,
+  resolveDshSessionFiles,
   resolveTraeStoragePath,
   readTraeEntitlementFromStorage,
   resolveGrokBuildSessions,
@@ -85,7 +89,7 @@ const {
 } = require("../lib/rollout");
 const wsl = require("../lib/wsl-probe");
 const { getWslMode, isInvalidWslMode, shouldProbeWsl, discoverWslHome } = wsl;
-const { resolveInstallPaths } = require("../lib/install-resolver");
+const { resolveInstallPaths, resolveZcodeNativeDbPath } = require("../lib/install-resolver");
 const { probeGrokHookState, resolveGrokHome } = require("../lib/grok-hook");
 const { probeOmpHookState } = require("../lib/omp-hook");
@@ -428,6 +432,11 @@ async function cmdStatus(argv = []) {
   const craftInstalled = Boolean(craftConfigDir && fssync.existsSync(craftConfigDir));
   const craftFiles = craftInstalled ? resolveCraftSessionFiles(process.env) : [];
+  // Reasonix — passive scan of content-free cumulative telemetry sidecars.
+  const reasonixHome = resolveReasonixHome(process.env);
+  const reasonixInstalled = Boolean(reasonixHome && fssync.existsSync(reasonixHome));
+  const reasonixFiles = reasonixInstalled ? resolveReasonixTelemetryFiles(process.env) : [];
   // Kilo CLI (kilo.ai @kilocode/plugin) — passive scan of kilo.db.
   const xdgDataHome = process.env.XDG_DATA_HOME || path.join(home, ".local", "share");
   const kiloHome = process.env.KILO_HOME || path.join(xdgDataHome, "kilo");
@@ -456,10 +465,7 @@ async function cmdStatus(argv = []) {
   const mimoDbPath = mimoActive.join(" | ");
   // ZCode (Z.ai's coding agent — OpenCode-fork SQLite) — passive scan of db.sqlite.
-  const zcodeHome = process.env.ZCODE_HOME || path.join(home, ".zcode");
-  const zcodeNativeValue = process.platform === "win32" && typeof process.env.APPDATA === "string"
-    ? path.join(process.env.APPDATA.trim(), ".zcode", "cli", "db", "db.sqlite")
-    : path.join(zcodeHome, "cli", "db", "db.sqlite");
+  const zcodeNativeValue = resolveZcodeNativeDbPath({ home });
   const wslZcodeDir = process.platform === "win32" && wsl.shouldProbeWsl(process.env)
     ? wsl.discoverWslHome(".zcode")
     : null;
@@ -613,6 +619,10 @@ async function cmdStatus(argv = []) {
   const droidSessionsDir = resolveDroidSessionsDir(process.env);
   const droidSettingsFiles = listDroidSettingsFiles(process.env);
   const droidInstalled = droidSettingsFiles.length > 0;
+  const dshHome = resolveDshHome(process.env);
+  const dshSessionsDir = path.join(dshHome, "sessions");
+  const dshSessionFiles = await resolveDshSessionFiles(process.env);
+  const dshInstalled = dshSessionFiles.length > 0;
   // Trae SOLO (ByteDance AI IDE) — passive entitlement snapshot reader.
   const traeStoragePath = resolveTraeStoragePath(process.env);
@@ -866,6 +876,9 @@ async function cmdStatus(argv = []) {
         craft: craftInstalled
           ? { installed: true, files: craftFiles.length }
           : { installed: false },
+        reasonix: reasonixInstalled
+          ? { installed: true, files: reasonixFiles.length }
+          : { installed: false },
         anythingllm: anythingllmInstalled
           ? { installed: true, detail: anythingllmDbPath }
           : { installed: false },
@@ -900,6 +913,9 @@ async function cmdStatus(argv = []) {
         droid: droidInstalled
           ? { installed: true, files: droidSettingsFiles.length, detail: droidSessionsDir }
           : { installed: false },
+        dsh: dshInstalled
+          ? { installed: true, files: dshSessionFiles.length, detail: dshSessionsDir }
+          : { installed: false },
         trae: traeInstalled
           ? {
               installed: true,
@@ -1001,6 +1017,9 @@ async function cmdStatus(argv = []) {
       craftInstalled
         ? `- Craft Agents: passive reader (${craftFiles.length} session jsonl file${craftFiles.length !== 1 ? "s" : ""} found)`
         : null,
+      reasonixInstalled
+        ? `- Reasonix: passive reader (${reasonixFiles.length} telemetry file${reasonixFiles.length !== 1 ? "s" : ""} found)`
+        : null,
       anythingllmInstalled
         ? `- AnythingLLM Desktop: passive reader (${anythingllmDbPath})`
         : null,
@@ -1059,6 +1078,9 @@ async function cmdStatus(argv = []) {
       droidInstalled
         ? `- Droid (Factory): passive reader (${droidSettingsFiles.length} session${droidSettingsFiles.length !== 1 ? "s" : ""} in ${droidSessionsDir}, cumulative-delta)`
         : null,
+      dshInstalled
+        ? `- DeepSeek Harness: passive reader (${dshSessionFiles.length} session${dshSessionFiles.length !== 1 ? "s" : ""} in ${dshSessionsDir})`
+        : null,
       traeInstalled
         // Deliberately NOT "passive reader": every other line with that wording
         // means tokens are being counted. Trae encrypts its session transcripts

package/src/commands/sync.js CHANGED Viewed

@@ -5,7 +5,7 @@ const fssync = require("node:fs");
 const cp = require("node:child_process");
 const readline = require("node:readline");
-const { resolveInstallPaths, ensureFlatCursor } = require("../lib/install-resolver");
+const { resolveInstallPaths, resolveZcodeNativeDbPath, ensureFlatCursor } = require("../lib/install-resolver");
 const { multiInstallParse, mergeBothFileSources } = require("../lib/multi-install-parser");
 const wsl = require("../lib/wsl-probe");
 const {
@@ -80,6 +80,8 @@ const {
   piAgentDirCollidesWithOmp,
   resolveCraftSessionFiles,
   parseCraftIncremental,
+  resolveReasonixTelemetryFiles,
+  parseReasonixIncremental,
   resolveGrokBuildSessions,
   parseGrokBuildIncremental,
   listAntigravityTranscripts,
@@ -106,6 +108,8 @@ const {
   parseDroidIncremental,
   droidSessionIdFromPath,
   resolveDroidModel,
+  resolveDshSessionFiles,
+  parseDshIncremental,
   bucketKey,
   toUtcHalfHourStart,
   totalsKey,
@@ -244,8 +248,10 @@ const CODEX_COLD_SCAN_AUDIT_MAX_SYNCS = 288;
 // one-time repair purges all source=mimo data from the local queues + cursor
 // state so the next sync (providerID-filtered reader) rebuilds it correctly.
 const MIMO_PROVIDER_REPAIR_KEY = "mimoClaudeMislabelRepair_2026_06";
+const DSH_LEGACY_SOURCE_MIGRATION_KEY = "deepseekHarnessSourceMigration_2026_08";
 const AUTO_SYNC_SOURCE_ALIASES = new Map([
   ["code", "every-code"],
+  ["deepseek", "dsh"],
   ["everycode", "every-code"],
   ["kilo", "kilo-cli"],
   ["kilo-code", "kilocode"],
@@ -263,6 +269,7 @@ const AUTO_SYNC_SOURCES = new Set([
   "craft",
   "cursor",
   "droid",
+  "dsh",
   "every-code",
   "gemini",
   "goose",
@@ -280,6 +287,7 @@ const AUTO_SYNC_SOURCES = new Set([
   "pi",
   "qoder",
   "qoder-cn",
+  "reasonix",
   "roocode",
   "workbuddy",
   "zcode",
@@ -289,6 +297,7 @@ const BACKGROUND_AUTO_SYNC_SOURCES = new Set([
   // Keep unscoped native 5-minute syncs bounded to dated local session trees.
   "codex",
   "every-code",
+  "reasonix",
 ]);
 function warnProviderParseFailure(label, err, opts) {
@@ -354,7 +363,7 @@ async function acquireSyncLock(
     priorityPollMs = PRIORITY_LOCK_POLL_MS,
   } = {},
 ) {
-  const waitsForPriority = Boolean(opts.drain || opts.publishAccount);
+  const waitsForPriority = Boolean(opts.waitForLock || opts.drain || opts.publishAccount);
   let lock = await openLock(lockPath, {
     quietIfLocked: opts.auto || waitsForPriority,
   });
@@ -576,7 +585,6 @@ async function cmdSync(argv, context = {}) {
     const xdgDataHome = process.env.XDG_DATA_HOME || path.join(home, ".local", "share");
     const kiloHome = process.env.KILO_HOME || path.join(xdgDataHome, "kilo");
     const mimoHome = process.env.MIMO_HOME || path.join(xdgDataHome, "mimocode");
-    const zcodeHome = process.env.ZCODE_HOME || path.join(home, ".zcode");
     // OpenClaw session plugin integration: lifecycle hooks request an
     // OpenClaw-only auto sync so unrelated providers do not get walked.
@@ -1369,9 +1377,7 @@ async function cmdSync(argv, context = {}) {
     // ── ZCode (Z.ai's coding agent — OpenCode-fork SQLite) ──
     let zcodeResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     if (sourceAllowed("zcode")) {
-      const zcodeNativeValue = process.platform === "win32" && typeof process.env.APPDATA === "string"
-        ? path.join(process.env.APPDATA.trim(), ".zcode", "cli", "db", "db.sqlite")
-        : path.join(zcodeHome, "cli", "db", "db.sqlite");
+      const zcodeNativeValue = resolveZcodeNativeDbPath({ home });
       const wslZcodeDir = process.platform === "win32" && wsl.shouldProbeWsl(process.env)
         ? wsl.discoverWslHome(".zcode")
         : null;
@@ -1398,6 +1404,32 @@ async function cmdSync(argv, context = {}) {
       };
     }
+    // ── DeepSeek Harness — passive read of ~/.dsh/sessions session logs ──
+    let dshResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    if (sourceAllowed("dsh")) {
+      await migrateLegacyDeepseekHarnessSource({ cursors, queuePath, queueStatePath });
+      const dshSessionFiles = await resolveDshSessionFiles(process.env);
+      if (dshSessionFiles.length > 0) {
+        if (progress?.enabled) {
+          progress.start(
+            `Parsing DeepSeek Harness ${renderBar(0)} 0/${formatNumber(
+              dshSessionFiles.length,
+            )} sessions | buckets 0`,
+          );
+        }
+        try {
+          dshResult = await parseDshIncremental({
+            sessionFiles: dshSessionFiles,
+            cursors,
+            queuePath,
+            onProgress: makeProviderProgress("DeepSeek Harness"),
+          });
+        } catch (err) {
+          warnProviderParseFailure("DeepSeek Harness", err, opts);
+        }
+      }
+    }
     // ── AnythingLLM Desktop (workspace_chats.response.metrics) ──
     let anythingllmResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     if (sourceAllowed("anythingllm")) {
@@ -2075,6 +2107,25 @@ async function cmdSync(argv, context = {}) {
       }
     }
+    // Reasonix — content-free cumulative telemetry sidecars only.
+    let reasonixResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    const reasonixFiles = sourceAllowed("reasonix")
+      ? mergeBothFileSources({ resolveFiles: resolveReasonixTelemetryFiles, env: process.env })
+      : [];
+    if (reasonixFiles.length > 0) {
+      try {
+        reasonixResult = await parseReasonixIncremental({
+          telemetryFiles: reasonixFiles,
+          cursors,
+          queuePath,
+          env: process.env,
+          onProgress: makeProviderProgress("Reasonix"),
+        });
+      } catch (err) {
+        warnProviderParseFailure("Reasonix", err, opts);
+      }
+    }
     // ── Grok Build (xAI) ──
     let grokResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     // Full passive scan of all Grok sessions (historical + any not covered by hook)
@@ -2513,6 +2564,7 @@ async function cmdSync(argv, context = {}) {
       ompResult.recordsProcessed +
       piResult.recordsProcessed +
       craftResult.recordsProcessed +
+      reasonixResult.recordsProcessed +
       grokResult.recordsProcessed +
       copilotResult.recordsProcessed +
       anythingllmResult.recordsProcessed +
@@ -2523,6 +2575,7 @@ async function cmdSync(argv, context = {}) {
       roocodeResult.recordsProcessed +
       zedResult.recordsProcessed +
       gooseResult.recordsProcessed +
+      dshResult.recordsProcessed +
       droidResult.recordsProcessed;
     const totalBuckets =
       parseResult.bucketsQueued +
@@ -2545,6 +2598,7 @@ async function cmdSync(argv, context = {}) {
       ompResult.bucketsQueued +
       piResult.bucketsQueued +
       craftResult.bucketsQueued +
+      reasonixResult.bucketsQueued +
       grokResult.bucketsQueued +
       copilotResult.bucketsQueued +
       anythingllmResult.bucketsQueued +
@@ -2555,6 +2609,7 @@ async function cmdSync(argv, context = {}) {
       roocodeResult.bucketsQueued +
       zedResult.bucketsQueued +
       gooseResult.bucketsQueued +
+      dshResult.bucketsQueued +
       droidResult.bucketsQueued;
     const skipNoOpCursorCommit =
       opts.auto &&
@@ -2780,6 +2835,7 @@ function parseArgs(argv) {
     fromOpenclaw: false,
     source: null,
     drain: false,
+    waitForLock: false,
     background: false,
     publishAccount: false,
     allLocalSources: false,
@@ -2797,6 +2853,7 @@ function parseArgs(argv) {
     }
     else if (a.startsWith("--source=")) out.source = normalizeSyncSource(a.slice("--source=".length));
     else if (a === "--drain") out.drain = true;
+    else if (a === "--wait-for-lock") out.waitForLock = true;
     else if (a === "--background" || a === "--lightweight") out.background = true;
     else if (a === "--publish-account") out.publishAccount = true;
     else if (a === "--all-local-sources") out.allLocalSources = true;
@@ -2888,6 +2945,8 @@ module.exports = {
   repairCodebuddyLogJsonlOverlap,
   repairWorkbuddyContextUsage,
   WORKBUDDY_CONTEXT_USAGE_REPAIR_KEY,
+  migrateLegacyDeepseekHarnessSource,
+  DSH_LEGACY_SOURCE_MIGRATION_KEY,
   repairCodexRescanInflation,
   repairCodexForkReplayInflation,
   repairCodexInterleavedUsageInflation,
@@ -2912,6 +2971,121 @@ module.exports = {
   CLOUD_CONVERSATIONS_BACKFILL_KEY,
 };
+// The pre-merge Harness prototype briefly emitted source="deepseek" before
+// settling on the official CLI id, source="dsh". Relabel the local history,
+// append explicit zero rows for every old cloud key, and replay from offset 0.
+// That preserves the latest canonical totals while making remote whole-row
+// upserts remove the stale alias instead of displaying both sources or summing
+// the same session twice.
+async function migrateLegacyDeepseekHarnessSource({ cursors, queuePath, queueStatePath } = {}) {
+  if (!cursors || typeof cursors !== "object") return false;
+  const migrations = (cursors.migrations ||= {});
+  if (migrations[DSH_LEGACY_SOURCE_MIGRATION_KEY]) return false;
+  let raw = "";
+  try {
+    raw = await fs.readFile(queuePath, "utf8");
+  } catch (error) {
+    if (error?.code !== "ENOENT") throw error;
+  }
+  const output = [];
+  const legacyKeys = new Map();
+  const latestMigratedRows = new Map();
+  const latestExplicitCanonicalRows = new Map();
+  for (const line of raw.split("\n")) {
+    if (!line.trim()) continue;
+    let row;
+    try {
+      row = JSON.parse(line);
+    } catch (_error) {
+      output.push(line);
+      continue;
+    }
+    const isLegacy =
+      row?.source === "deepseek" &&
+      typeof row.model === "string" &&
+      typeof row.hour_start === "string";
+    if (isLegacy) {
+      const key = `${row.model}|${row.hour_start}`;
+      legacyKeys.set(key, { model: row.model, hour_start: row.hour_start });
+      row = {
+        ...row,
+        source: "dsh",
+        billable_total_tokens: row.billable_total_tokens ?? row.total_tokens,
+      };
+    }
+    const serialized = JSON.stringify(row);
+    output.push(serialized);
+    if (row?.source === "dsh" && typeof row.model === "string" && typeof row.hour_start === "string") {
+      const key = `${row.model}|${row.hour_start}`;
+      if (isLegacy) latestMigratedRows.set(key, serialized);
+      else latestExplicitCanonicalRows.set(key, serialized);
+    }
+  }
+  if (legacyKeys.size === 0) {
+    migrations[DSH_LEGACY_SOURCE_MIGRATION_KEY] = {
+      status: "noop",
+      appliedAt: new Date().toISOString(),
+      reason: "no-legacy-deepseek-rows",
+    };
+    return false;
+  }
+  // Re-append the last canonical row for each affected key so local readers'
+  // last-row-wins contract remains correct even when an old alias line was
+  // physically later than an already-emitted dsh row.
+  for (const key of legacyKeys.keys()) {
+    const canonical = latestExplicitCanonicalRows.get(key) || latestMigratedRows.get(key);
+    if (canonical) output.push(canonical);
+  }
+  for (const { model, hour_start } of legacyKeys.values()) {
+    output.push(JSON.stringify({
+      source: "deepseek",
+      model,
+      hour_start,
+      input_tokens: 0,
+      cached_input_tokens: 0,
+      cache_creation_input_tokens: 0,
+      output_tokens: 0,
+      reasoning_output_tokens: 0,
+      total_tokens: 0,
+      billable_total_tokens: 0,
+      conversation_count: 0,
+    }));
+  }
+  await ensureDir(path.dirname(queuePath));
+  const tmpPath = `${queuePath}.tmp.${process.pid}.${Date.now()}`;
+  await fs.writeFile(tmpPath, `${output.join("\n")}\n`, "utf8");
+  await fs.rename(tmpPath, queuePath);
+  if (typeof queueStatePath === "string" && queueStatePath) {
+    let state = {};
+    try {
+      state = JSON.parse(await fs.readFile(queueStatePath, "utf8"));
+      if (!state || typeof state !== "object") state = {};
+    } catch (_error) {
+      state = {};
+    }
+    state.offset = 0;
+    state.updatedAt = new Date().toISOString();
+    state.note = "reset_after_deepseek_harness_source_migration_2026_08";
+    await ensureDir(path.dirname(queueStatePath));
+    await fs.writeFile(queueStatePath, `${JSON.stringify(state, null, 2)}\n`, "utf8");
+  }
+  migrations[DSH_LEGACY_SOURCE_MIGRATION_KEY] = {
+    status: "applied",
+    appliedAt: new Date().toISOString(),
+    migratedBuckets: legacyKeys.size,
+    retractedBuckets: legacyKeys.size,
+  };
+  return true;
+}
 function normalizeString(value) {
   if (typeof value !== "string") return null;
   const trimmed = value.trim();

package/src/lib/install-resolver.js CHANGED Viewed

@@ -1,4 +1,5 @@
 const fssync = require("node:fs");
+const os = require("node:os");
 const path = require("node:path");
 const wsl = require("./wsl-probe");
@@ -48,6 +49,39 @@ function pathExists(p, existsSync) {
   try { return (existsSync || fssync.existsSync)(p) ? p : null; } catch (_e) { return null; }
 }
+// ZCode stores its CLI DB under the user's home dir on every platform
+// (~/.zcode/cli/db/db.sqlite), Windows included. The win32 APPDATA guess
+// (introduced with the WSL dual-install work) silently missed the native
+// install, so probe home first and keep APPDATA only as a fallback for
+// installs that do live under Roaming. Falls back to the home path when
+// neither exists so resolveInstallPaths can null it uniformly.
+function resolveZcodeNativeDbPath({
+  home = os.homedir(),
+  env = process.env,
+  platform = process.platform,
+  deps = {},
+} = {}) {
+  const existsSync = deps.existsSync || fssync.existsSync;
+  const zcodeHomeOverride =
+    typeof env.ZCODE_HOME === "string" ? env.ZCODE_HOME.trim() : "";
+  const zcodeHome = zcodeHomeOverride
+    ? path.resolve(zcodeHomeOverride)
+    : path.join(home, ".zcode");
+  // An explicit ZCODE_HOME pins the install: when its database is missing we
+  // must not fall back to an APPDATA database, or sync could read a different
+  // ZCode installation than the one the user pointed at.
+  const candidates = [
+    path.join(zcodeHome, "cli", "db", "db.sqlite"),
+    ...(!zcodeHomeOverride &&
+    platform === "win32" &&
+    typeof env.APPDATA === "string" &&
+    env.APPDATA.trim()
+      ? [path.join(env.APPDATA.trim(), ".zcode", "cli", "db", "db.sqlite")]
+      : []),
+  ];
+  return candidates.find((p) => existsSync(p)) || candidates[0];
+}
 function hasAnyChild(p, children, existsSync) {
   const ex = existsSync || fssync.existsSync;
   return children.some((c) => { try { return ex(path.join(p, c)); } catch (_e) { return false; } });
@@ -99,6 +133,7 @@ function ensureFlatCursor(cursors, providerName, env, preferredKey) {
 module.exports = {
   resolveInstallPaths,
+  resolveZcodeNativeDbPath,
   ensureNamespacedCursors,
   ensureFlatCursor,
 };

package/src/lib/local-api.js CHANGED Viewed

@@ -880,6 +880,7 @@ function runSyncCommand(extraEnv = {}, opts = {}) {
     if (opts.publishAccount === true) args.push("--publish-account");
     if (opts.allLocalSources === true) args.push("--all-local-sources");
     if (opts.drain === true) args.push("--drain");
+    if (opts.waitForLock === true) args.push("--wait-for-lock");
     const child = spawn(process.execPath, args, {
       env: { ...process.env, ...extraEnv },
       stdio: ["ignore", "pipe", "pipe"],
@@ -1971,6 +1972,8 @@ function createLocalApiHandler({ queuePath }) {
           background,
           publishAccount,
           allLocalSources,
+          waitForLock:
+            !drain && !background && Boolean(extraEnv.TOKENTRACKER_DEVICE_TOKEN),
         });
         try {
           const { resetUsageLimitsCache } = require("./usage-limits");