tokentracker-cli 0.94.1 → 0.95.1

package/src/commands/status.js

@@ -69,8 +69,14 @@ const {
   resolveKilocodeTaskFiles,
   resolveRoocodeTaskFiles,
   resolveZedDbPath,
+  resolveLmstudioHome,
+  resolveLmstudioLogFiles,
+  resolveUnslothDbPath,
   resolveQoderDbPaths,
   resolveQoderCnDbPaths,
+  resolveQoderProjectsDir,
+  resolveQoderCnProjectsDir,
+  listQoderNewSessionFiles,
   resolveClaudeScienceDbPaths,
   resolveAnythingllmDbPath,
   resolveGooseDbPath,
@@ -127,6 +133,13 @@ function formatResolvedPaths(paths, filename) {
   return active;
 }
 
+// Combine a legacy DB path with its new-JSONL projects-dir path for the
+// machine-readable summary. Either side may be "" (absent); both absent
+// yields "" so callers can fall back to "not found".
+function summarizeQoderDetail(dbPath, newPath) {
+  return [dbPath, newPath].filter(Boolean).join(" + ") || "";
+}
+
 // The Trae SOLO entitlement snapshot is read directly from the Trae Local
 // State storage.json via the shared parser (readTraeEntitlementFromStorage).
 // The queue.jsonl contract is token-count-only (CLAUDE.md privacy rule), so
@@ -488,15 +501,28 @@ async function cmdStatus(argv = []) {
   const zcodeInstalled = zcodeActive.length > 0;
   const zcodeDbPath = zcodeActive.join(" | ");
 
-  // Qoder Desktop 1.18+ — token usage lives in SharedClientCache/local.db.
+  // Qoder Desktop 1.18+ — token usage lives in SharedClientCache/local.db (legacy)
+  // and since 2026-08 (app 0.1.2+) also in ~/.qoder/projects JSONL (credit-based).
   const qoderPaths = resolveQoderDbPaths({
     home,
     env: process.env,
     platform: process.platform,
   });
   const qoderActive = formatResolvedPaths(qoderPaths);
-  const qoderInstalled = qoderActive.length > 0;
+  // New JSONL location (com.qoder.app.stable + ~/.qoder/projects)
+  const qoderProjectsDirResolved = resolveQoderProjectsDir({ home, env: process.env });
+  let qoderNewFiles = [];
+  try {
+    qoderNewFiles = await listQoderNewSessionFiles(qoderProjectsDirResolved);
+  } catch (_e) {
+    qoderNewFiles = [];
+  }
+  const qoderNewInstalled = qoderNewFiles.length > 0;
+  const qoderInstalled = qoderActive.length > 0 || qoderNewInstalled;
   const qoderDbPath = qoderActive.join(" | ");
+  const qoderNewPath = qoderNewFiles.length > 0
+    ? `${qoderProjectsDirResolved} (${qoderNewFiles.length} sessions)`
+    : "";
 
   // Qoder CN (国内版) — same schema, separate Application Support/QoderCN dir.
   const qoderCnPaths = resolveQoderCnDbPaths({
@@ -505,8 +531,28 @@ async function cmdStatus(argv = []) {
     platform: process.platform,
   });
   const qoderCnActive = formatResolvedPaths(qoderCnPaths);
-  const qoderCnInstalled = qoderCnActive.length > 0;
+  // CN new-JSONL mirrors sync.js: CN and international currently share
+  // ~/.qoder/projects, and sync only parses the CN dir when it diverges from
+  // the international one (same files must not count under two sources). Only
+  // report CN JSONL when the dirs diverge.
+  const qoderCnProjectsDirResolved = resolveQoderCnProjectsDir({ home, env: process.env });
+  const qoderCnSharesIntlDir = path.normalize(qoderCnProjectsDirResolved) === path.normalize(qoderProjectsDirResolved)
+    || (process.platform === "win32"
+      && path.normalize(qoderCnProjectsDirResolved).toLowerCase() === path.normalize(qoderProjectsDirResolved).toLowerCase());
+  let qoderCnNewFiles = [];
+  if (!qoderCnSharesIntlDir) {
+    try {
+      qoderCnNewFiles = await listQoderNewSessionFiles(qoderCnProjectsDirResolved);
+    } catch (_e) {
+      qoderCnNewFiles = [];
+    }
+  }
+  const qoderCnNewInstalled = qoderCnNewFiles.length > 0;
+  const qoderCnInstalled = qoderCnActive.length > 0 || qoderCnNewInstalled;
   const qoderCnDbPath = qoderCnActive.join(" | ");
+  const qoderCnNewPath = qoderCnNewFiles.length > 0
+    ? `${qoderCnProjectsDirResolved} (${qoderCnNewFiles.length} sessions)`
+    : "";
 
   // Claude Science — token usage lives on the `frames` table of operon-cli.db.
   // Unlike the native/WSL pair other providers resolve to, this is an open-ended
@@ -637,6 +683,11 @@ 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;
+  const lmstudioHome = resolveLmstudioHome(process.env);
+  const lmstudioLogFiles = await resolveLmstudioLogFiles(process.env);
+  const lmstudioInstalled = lmstudioLogFiles.length > 0;
+  const unslothDbPath = resolveUnslothDbPath(process.env);
+  const unslothInstalled = Boolean(unslothDbPath && fssync.existsSync(unslothDbPath));
 
   // Trae SOLO (ByteDance AI IDE) — passive entitlement snapshot reader.
   const traeStoragePath = resolveTraeStoragePath(process.env);
@@ -937,10 +988,10 @@ async function cmdStatus(argv = []) {
           ? { installed: true, detail: zcodeDbPath }
           : { installed: false },
         qoder: qoderInstalled
-          ? { installed: true, detail: qoderDbPath }
+          ? { installed: true, detail: summarizeQoderDetail(qoderDbPath, qoderNewPath) }
           : { installed: false },
         "qoder-cn": qoderCnInstalled
-          ? { installed: true, detail: qoderCnDbPath }
+          ? { installed: true, detail: summarizeQoderDetail(qoderCnDbPath, qoderCnNewPath) }
           : { installed: false },
         "claude-science": claudeScienceInstalled
           ? { installed: true, detail: claudeScienceDbPath }
@@ -961,6 +1012,16 @@ async function cmdStatus(argv = []) {
         dsh: dshInstalled
           ? { installed: true, files: dshSessionFiles.length, detail: dshSessionsDir }
           : { installed: false },
+        lmstudio: lmstudioInstalled
+          ? {
+              installed: true,
+              files: lmstudioLogFiles.length,
+              detail: path.join(lmstudioHome, "server-logs"),
+            }
+          : { installed: false },
+        unsloth: unslothInstalled
+          ? { installed: true, detail: unslothDbPath }
+          : { installed: false },
         trae: traeInstalled
           ? {
               installed: true,
@@ -1089,10 +1150,10 @@ async function cmdStatus(argv = []) {
         ? `- ZCode: passive reader (${zcodeDbPath})`
         : null,
       qoderInstalled
-        ? `- Qoder: passive reader (${qoderDbPath})`
+        ? `- Qoder: passive reader (${[qoderDbPath, qoderNewPath].filter(Boolean).join(" + ") || "not found"}${qoderNewInstalled && qoderActive.length > 0 ? " [legacy DB + new JSONL (both tracked)]" : ""}${qoderNewInstalled && qoderActive.length === 0 ? " [new JSONL only]" : ""})`
         : null,
       qoderCnInstalled
-        ? `- Qoder CN: passive reader (${qoderCnDbPath})`
+        ? `- Qoder CN: passive reader (${summarizeQoderDetail(qoderCnDbPath, qoderCnNewPath) || "not found"}${qoderCnNewInstalled && qoderCnActive.length > 0 ? " [legacy DB + new JSONL (both tracked)]" : ""}${qoderCnNewInstalled && qoderCnActive.length === 0 ? " [new JSONL only]" : ""})`
         : null,
       claudeScienceInstalled
         ? `- Claude Science: passive reader (${claudeScienceDbPath})`
@@ -1137,6 +1198,12 @@ async function cmdStatus(argv = []) {
       dshInstalled
         ? `- DeepSeek Harness: passive reader (${dshSessionFiles.length} session${dshSessionFiles.length !== 1 ? "s" : ""} in ${dshSessionsDir})`
         : null,
+      lmstudioInstalled
+        ? `- LM Studio: passive reader (${lmstudioLogFiles.length} log${lmstudioLogFiles.length !== 1 ? "s" : ""} in ${path.join(lmstudioHome, "server-logs")})`
+        : null,
+      unslothInstalled
+        ? `- Unsloth Studio: passive reader (${unslothDbPath})`
+        : null,
       traeInstalled
         // Deliberately NOT "passive reader": every other line with that wording
         // means tokens are being counted. Trae encrypts its session transcripts
@@ -1438,4 +1505,4 @@ function parseEpochMsToIso(v) {
   return d.toISOString();
 }
 
-module.exports = { cmdStatus };
+module.exports = { cmdStatus, summarizeQoderDetail };

package/src/commands/sync.js

@@ -15,6 +15,7 @@ const {
   chmod600IfPossible,
   openLock,
   inspectLock,
+  updateJsonLocked,
 } = require("../lib/fs");
 const { physicalJsonlRecords } = require("../lib/jsonl-lines");
 const {
@@ -33,6 +34,10 @@ const {
   resolveQoderDbPaths,
   resolveQoderCnDbPaths,
   readQoderDbMessages,
+  resolveQoderProjectsDir,
+  resolveQoderCnProjectsDir,
+  listQoderNewSessionFiles,
+  parseQoderNewIncremental,
   resolveKiroDbPath,
   resolveKiroJsonlPath,
   resolveKiroBasePath,
@@ -104,6 +109,10 @@ const {
   parseRoocodeIncremental,
   resolveZedDbPath,
   parseZedIncremental,
+  resolveLmstudioLogFiles,
+  parseLmstudioIncremental,
+  resolveUnslothDbPath,
+  parseUnslothIncremental,
   resolveAnythingllmDbPath,
   parseAnythingllmIncremental,
   resolveGooseDbPath,
@@ -260,6 +269,7 @@ const CODEX_COLD_SCAN_AUDIT_MAX_SYNCS = 288;
 const MIMO_PROVIDER_REPAIR_KEY = "mimoClaudeMislabelRepair_2026_06";
 const DSH_LEGACY_SOURCE_MIGRATION_KEY = "deepseekHarnessSourceMigration_2026_08";
 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"],
   ["deepseek", "dsh"],
@@ -291,6 +301,7 @@ const AUTO_SYNC_SOURCES = new Set([
   "kiro",
   "kimi",
   "kimi-code",
+  "lmstudio",
   "mimo",
   "omp",
   "opencode",
@@ -301,6 +312,7 @@ const AUTO_SYNC_SOURCES = new Set([
   "reasonix",
   "roocode",
   "trae-cn",
+  "unsloth",
   "workbuddy",
   "zcode",
   "zed",
@@ -561,6 +573,8 @@ async function cmdSync(argv, context = {}) {
       legacyBaseUrlMigration = {
         previousDeviceToken,
         replacementDeviceToken,
+        hadPersistedAnonKey: Object.prototype.hasOwnProperty.call(config, "anonKey"),
+        persistedAnonKey: config.anonKey,
       };
     }
     const codexCursorRoots = [process.env.CODEX_HOME || path.join(home, ".codex")];
@@ -1259,6 +1273,39 @@ async function cmdSync(argv, context = {}) {
       }
     }
 
+    // Qoder new (JSONL) — com.qoder.app.stable / ~/.qoder/projects (2026-08+)
+    // The new Electron app no longer writes SharedClientCache/local.db; all
+    // recent sessions live in ~/.qoder/projects as flat JSONL with credit-based
+    // usage. Parse them into the same "qoder" source so history is continuous.
+    // The legacy DB block above remains as a fallback for pre-migration rows.
+    if (sourceAllowed("qoder")) {
+      try {
+        const projectsDir = resolveQoderProjectsDir({ home, env: process.env });
+        const sessionFiles = await listQoderNewSessionFiles(projectsDir);
+        if (sessionFiles.length > 0) {
+          if (progress?.enabled) {
+            progress.start(`Parsing Qoder (new) ${renderBar(0)} | buckets 0`);
+          }
+          const parsed = await parseQoderNewIncremental({
+            sessionFiles,
+            cursors,
+            queuePath,
+            projectQueuePath,
+            onProgress: makeProviderProgress("Qoder (new)"),
+            sourceKey: "qoder",
+            cursorKey: "qoderNew",
+          });
+          qoderResult = {
+            recordsProcessed: qoderResult.recordsProcessed + (parsed.messagesProcessed || 0),
+            eventsAggregated: qoderResult.eventsAggregated + (parsed.eventsAggregated || 0),
+            bucketsQueued: qoderResult.bucketsQueued + (parsed.bucketsQueued || 0),
+          };
+        }
+      } catch (err) {
+        warnProviderParseFailure("Qoder (new)", err, opts);
+      }
+    }
+
     // ── Qoder CN (国内版) — same SharedClientCache/local.db schema, separate
     // Application Support/QoderCN data directory. Tracked as its own source
     // with its own cursor namespace: the two DBs each number rowids from 1, so
@@ -1310,6 +1357,44 @@ async function cmdSync(argv, context = {}) {
       }
     }
 
+    // Qoder CN new (JSONL) — currently shares ~/.qoder/projects with international;
+    // keep distinct parsing only when CN projects dir diverges (future CN split)
+    // to avoid double-counting the same JSONL under two sources.
+    if (sourceAllowed("qoder-cn")) {
+      try {
+        const cnProjectsDir = resolveQoderCnProjectsDir({ home, env: process.env });
+        const intlProjectsDir = resolveQoderProjectsDir({ home, env: process.env });
+        const projectsDirKey = (p) => {
+          const normalized = path.normalize(p);
+          return process.platform === "win32" ? normalized.toLowerCase() : normalized;
+        };
+        if (projectsDirKey(cnProjectsDir) !== projectsDirKey(intlProjectsDir)) {
+          const sessionFiles = await listQoderNewSessionFiles(cnProjectsDir);
+          if (sessionFiles.length > 0) {
+            if (progress?.enabled) {
+              progress.start(`Parsing Qoder CN (new) ${renderBar(0)} | buckets 0`);
+            }
+            const parsed = await parseQoderNewIncremental({
+              sessionFiles,
+              cursors,
+              queuePath,
+              projectQueuePath,
+              onProgress: makeProviderProgress("Qoder CN (new)"),
+              sourceKey: "qoder-cn",
+              cursorKey: "qoderCnNew",
+            });
+            qoderCnResult = {
+              recordsProcessed: qoderCnResult.recordsProcessed + (parsed.messagesProcessed || 0),
+              eventsAggregated: qoderCnResult.eventsAggregated + (parsed.eventsAggregated || 0),
+              bucketsQueued: qoderCnResult.bucketsQueued + (parsed.bucketsQueued || 0),
+            };
+          }
+        }
+      } catch (err) {
+        warnProviderParseFailure("Qoder CN (new)", err, opts);
+      }
+    }
+
     // ── Claude Science (Anthropic's local research workbench, issue #246) ──
     // Per-frame token usage lives on the `frames` table of operon-cli.db.
     // Passive, incremental, subtract-on-change. There can be more than one DB:
@@ -1432,6 +1517,13 @@ async function cmdSync(argv, context = {}) {
               projectQueueStatePath,
             });
           }
+          await repairZcodeInclusiveTokenMigration({
+            cursors,
+            queuePath,
+            queueStatePath,
+            projectQueuePath,
+            projectQueueStatePath,
+          });
           zcodeResult = await multiInstallParse({
             paths: zcodePaths, parserFn: parseOpencodeDbForInstall, providerName: "zcode",
             cursors, getParams: (p) => ({ dbPath: p, readFn: readZcodeDbMessages, source: "zcode", cursorKey: "zcode" }),
@@ -1477,6 +1569,47 @@ async function cmdSync(argv, context = {}) {
       }
     }
 
+    // ── LM Studio and Unsloth Studio — passive inference usage ──
+    let lmstudioResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    if (sourceAllowed("lmstudio")) {
+      const lmstudioLogFiles = await resolveLmstudioLogFiles(process.env);
+      if (lmstudioLogFiles.length > 0) {
+        if (progress?.enabled) {
+          progress.start(
+            `Parsing LM Studio ${renderBar(0)} 0/${formatNumber(lmstudioLogFiles.length)} logs | buckets 0`,
+          );
+        }
+        try {
+          lmstudioResult = await parseLmstudioIncremental({
+            logFiles: lmstudioLogFiles,
+            cursors,
+            queuePath,
+            onProgress: makeProviderProgress("LM Studio"),
+          });
+        } catch (err) {
+          warnProviderParseFailure("LM Studio", err, opts);
+        }
+      }
+    }
+
+    let unslothResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    if (sourceAllowed("unsloth")) {
+      const unslothDbPath = resolveUnslothDbPath(process.env);
+      if (unslothDbPath && fssync.existsSync(unslothDbPath)) {
+        if (progress?.enabled) progress.start(`Parsing Unsloth ${renderBar(0)} | buckets 0`);
+        try {
+          unslothResult = await parseUnslothIncremental({
+            dbPath: unslothDbPath,
+            cursors,
+            queuePath,
+            onProgress: makeProviderProgress("Unsloth"),
+          });
+        } catch (err) {
+          warnProviderParseFailure("Unsloth", err, opts);
+        }
+      }
+    }
+
     // ── AnythingLLM Desktop (workspace_chats.response.metrics) ──
     let anythingllmResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     if (sourceAllowed("anythingllm")) {
@@ -2747,6 +2880,8 @@ async function cmdSync(argv, context = {}) {
       reasonixResult.recordsProcessed +
       grokResult.recordsProcessed +
       copilotResult.recordsProcessed +
+      lmstudioResult.recordsProcessed +
+      unslothResult.recordsProcessed +
       anythingllmResult.recordsProcessed +
       kiloResult.recordsProcessed +
       mimoResult.recordsProcessed +
@@ -2783,6 +2918,8 @@ async function cmdSync(argv, context = {}) {
       reasonixResult.bucketsQueued +
       grokResult.bucketsQueued +
       copilotResult.bucketsQueued +
+      lmstudioResult.bucketsQueued +
+      unslothResult.bucketsQueued +
       anythingllmResult.bucketsQueued +
       kiloResult.bucketsQueued +
       mimoResult.bucketsQueued +
@@ -2835,6 +2972,9 @@ async function cmdSync(argv, context = {}) {
     progress?.stop();
 
     const runtimeConfig = config ? { ...config } : {};
+    if (legacyBaseUrlMigration) {
+      delete runtimeConfig.anonKey;
+    }
     if (legacyBaseUrlMigration?.replacementDeviceToken) {
       runtimeConfig.deviceToken = legacyBaseUrlMigration.replacementDeviceToken;
     }
@@ -2888,6 +3028,7 @@ async function cmdSync(argv, context = {}) {
         const drainWithToken = (deviceToken) =>
           drainQueueToCloud({
             baseUrl: runtime.baseUrl,
+            anonKey: runtime.anonKey,
             deviceToken,
             queuePath,
             queueStatePath,
@@ -2917,15 +3058,25 @@ async function cmdSync(argv, context = {}) {
         if (legacyBaseUrlMigration && uploadResult.batches > 0) {
           // device-login does not share the sync lock and may have written a
           // fresh current-backend config while the scan/upload was running.
-          // Re-read before committing, merge only while the legacy marker still
-          // exists, and never clobber a concurrently completed login.
-          const latestConfig = (await readJson(configPath)) || config;
-          if (isLegacyInsforgeBaseUrl(latestConfig.baseUrl)) {
-            latestConfig.deviceToken = successfulDeviceToken;
-            delete latestConfig.baseUrl;
-            await writeJson(configPath, latestConfig);
-            await chmod600IfPossible(configPath);
-          }
+          // Re-read before committing and only remove the anonymous key this
+          // migration observed. A concurrent login may replace the backend URL
+          // while preserving the old key, or another writer may replace the key
+          // while the legacy URL is still present.
+          await updateJsonLocked(configPath, async (latestConfig) => {
+            const hasLegacyBaseUrl = isLegacyInsforgeBaseUrl(latestConfig.baseUrl);
+            const hasUnchangedLegacyAnonKey =
+              legacyBaseUrlMigration.hadPersistedAnonKey &&
+              latestConfig.anonKey === legacyBaseUrlMigration.persistedAnonKey;
+            if (!hasLegacyBaseUrl && !hasUnchangedLegacyAnonKey) return null;
+            if (hasLegacyBaseUrl) {
+              latestConfig.deviceToken = successfulDeviceToken;
+              delete latestConfig.baseUrl;
+            }
+            if (hasUnchangedLegacyAnonKey) {
+              delete latestConfig.anonKey;
+            }
+            return latestConfig;
+          });
         }
         // Record success so the exponential backoff step resets — otherwise
         // a single past failure keeps us pessimistically throttled forever.
@@ -3138,6 +3289,7 @@ module.exports = {
   repairDroidDuplicateSessionInflation,
   repairMimoClaudeMislabel,
   repairZcodeNativeUsageMigration,
+  repairZcodeInclusiveTokenMigration,
   reincludeClaudeMemObserverFiles,
   repairGrokQueueFromSessionSnapshots,
   applyCloudConversationsBackfill,
@@ -3613,7 +3765,7 @@ const AUTO_RETRY_MAX_DELAY_MS = 2 * 60 * 60 * 1000;
 const INGEST_SLUG = "tokentracker-ingest";
 const MAX_INGEST_BUCKETS = 500;
 
-async function drainQueueToCloud({ baseUrl, deviceToken, queuePath, queueStatePath, maxBatches = 5, batchSize = 200 }) {
+async function drainQueueToCloud({ baseUrl, anonKey, deviceToken, queuePath, queueStatePath, maxBatches = 5, batchSize = 200 }) {
   const state = (await readJson(queueStatePath)) || { offset: 0 };
   let offset = Number(state.offset || 0);
   let inserted = 0;
@@ -3632,7 +3784,6 @@ async function drainQueueToCloud({ baseUrl, deviceToken, queuePath, queueStatePa
     if (result.buckets.length === 0 && result.sessionStates.length === 0) break;
 
     const root = baseUrl.replace(/\/$/, "");
-    const anonKey = process.env.TOKENTRACKER_INSFORGE_ANON_KEY || "";
     const headers = {
       "Content-Type": "application/json",
       Accept: "application/json",
@@ -4116,7 +4267,7 @@ async function repairMimoClaudeMislabel({
   return true;
 }
 
-async function resetUploadOffsetForZcodeNativeRepair(queueStatePath) {
+async function resetUploadOffsetForZcodeRepair(queueStatePath, note) {
   if (typeof queueStatePath !== "string" || !queueStatePath) return false;
   let state = {};
   try {
@@ -4126,7 +4277,7 @@ async function resetUploadOffsetForZcodeNativeRepair(queueStatePath) {
   }
   state.offset = 0;
   state.updatedAt = new Date().toISOString();
-  state.note = "reset_after_zcode_native_usage_repair_2026_08";
+  state.note = note;
   await ensureDir(path.dirname(queueStatePath));
   await fs.writeFile(queueStatePath, JSON.stringify(state, null, 2) + "\n", "utf8");
   return true;
@@ -4188,7 +4339,9 @@ async function dropZcodeQueueRows(filePath, { retainRetractions = false } = {})
   return { removed, retractions: retractions.size };
 }
 
-async function repairZcodeNativeUsageMigration({
+async function repairZcodeUsageMigration({
+  migrationKey,
+  queueStateNote,
   cursors,
   queuePath,
   queueStatePath,
@@ -4197,7 +4350,7 @@ async function repairZcodeNativeUsageMigration({
 } = {}) {
   if (!cursors || typeof cursors !== "object") return false;
   const migrations = (cursors.migrations ||= {});
-  if (migrations[ZCODE_NATIVE_USAGE_REPAIR_KEY]) return false;
+  if (migrations[migrationKey]) return false;
 
   const mainRepair = await dropZcodeQueueRows(queuePath, { retainRetractions: true });
   const projectRepair = projectQueuePath
@@ -4225,11 +4378,13 @@ async function repairZcodeNativeUsageMigration({
   }
   delete cursors.zcode;
 
-  if (mainRepair.removed > 0) await resetUploadOffsetForZcodeNativeRepair(queueStatePath);
+  if (mainRepair.removed > 0) {
+    await resetUploadOffsetForZcodeRepair(queueStatePath, queueStateNote);
+  }
   if (projectRepair.removed > 0) {
-    await resetUploadOffsetForZcodeNativeRepair(projectQueueStatePath);
+    await resetUploadOffsetForZcodeRepair(projectQueueStatePath, queueStateNote);
   }
-  migrations[ZCODE_NATIVE_USAGE_REPAIR_KEY] = {
+  migrations[migrationKey] = {
     appliedAt: new Date().toISOString(),
     removedMain: mainRepair.removed,
     removedProject: projectRepair.removed,
@@ -4238,6 +4393,22 @@ async function repairZcodeNativeUsageMigration({
   return true;
 }
 
+async function repairZcodeNativeUsageMigration(options = {}) {
+  return repairZcodeUsageMigration({
+    ...options,
+    migrationKey: ZCODE_NATIVE_USAGE_REPAIR_KEY,
+    queueStateNote: "reset_after_zcode_native_usage_repair_2026_08",
+  });
+}
+
+async function repairZcodeInclusiveTokenMigration(options = {}) {
+  return repairZcodeUsageMigration({
+    ...options,
+    migrationKey: ZCODE_INCLUSIVE_TOKEN_REPAIR_KEY,
+    queueStateNote: "reset_after_zcode_inclusive_token_repair_2026_09",
+  });
+}
+
 async function repairGrokQueueFromSessionSnapshots({ cursors, queuePath, queueStatePath } = {}) {
   if (!cursors || typeof cursors !== "object") return false;
   const grokState = (cursors.grok ||= {});