modelstat 0.0.44 → 0.0.46

package/dist/cli.mjs

@@ -50,9 +50,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // ../../packages/parsers/src/types.ts
+var PARSER_EVENT_CHUNK;
 var init_types = __esm({
   "../../packages/parsers/src/types.ts"() {
     "use strict";
+    PARSER_EVENT_CHUNK = 256;
   }
 });
 
@@ -4688,6 +4690,16 @@ import { createReadStream, existsSync as existsSync2, readdirSync } from "fs";
 import { stat } from "fs/promises";
 import { dirname as dirname2, join } from "path";
 import { createInterface } from "readline";
+function countToolCalls(content) {
+  const counts = {};
+  if (!Array.isArray(content)) return counts;
+  for (const block of content) {
+    if (block && block.type === "tool_use" && typeof block.name === "string" && block.name) {
+      counts[block.name] = (counts[block.name] ?? 0) + 1;
+    }
+  }
+  return counts;
+}
 function extractExcerpt(content) {
   if (!content) return void 0;
   let text = "";
@@ -4712,6 +4724,21 @@ function extractExcerpt(content) {
 }
 async function parseClaudeCodeJsonl(ctx) {
   const events = [];
+  let chunk = [];
+  let emitted = 0;
+  const emit = async (e) => {
+    emitted += 1;
+    if (!ctx.onEvents) {
+      events.push(e);
+      return;
+    }
+    chunk.push(e);
+    if (chunk.length >= PARSER_EVENT_CHUNK) {
+      const full = chunk;
+      chunk = [];
+      await ctx.onEvents(full);
+    }
+  };
   let rawLines = 0;
   let skipped = 0;
   let bytePos = 0;
@@ -4799,7 +4826,7 @@ async function parseClaudeCodeJsonl(ctx) {
       }
       const slug = guessRepoSlugFromPath(cwd);
       const excerpt = extractExcerpt(a.message?.content);
-      events.push({
+      await emit({
         source_event_id: eventId,
         ts: a.timestamp,
         kind: "assistant_message",
@@ -4825,7 +4852,7 @@ async function parseClaudeCodeJsonl(ctx) {
           reasoning: 0
         },
         duration_ms: null,
-        tool_calls: {},
+        tool_calls: countToolCalls(a.message?.content),
         files_touched: [],
         ...excerpt ? { content_excerpt: excerpt } : {},
         source_file: ctx.sourceFile,
@@ -4848,7 +4875,7 @@ async function parseClaudeCodeJsonl(ctx) {
         continue;
       }
       const excerpt = extractExcerpt(u.message?.content);
-      events.push({
+      await emit({
         source_event_id: eventId,
         ts: u.timestamp,
         kind: "user_message",
@@ -4873,9 +4900,10 @@ async function parseClaudeCodeJsonl(ctx) {
       skipped += 1;
     }
   }
+  if (ctx.onEvents && chunk.length > 0) await ctx.onEvents(chunk);
   return {
     events,
-    stats: { rawLines, emittedEvents: events.length, skipped },
+    stats: { rawLines, emittedEvents: emitted, skipped },
     sourceFile: ctx.sourceFile
   };
 }
@@ -4897,6 +4925,7 @@ var init_claude_code = __esm({
   "../../packages/parsers/src/claude-code/index.ts"() {
     "use strict";
     init_src();
+    init_types();
     init_git();
   }
 });
@@ -4912,6 +4941,21 @@ function deriveSessionIdFromRolloutPath(path5) {
 }
 async function parseCodexRollout(ctx) {
   const events = [];
+  let chunk = [];
+  let emitted = 0;
+  const emit = async (e) => {
+    emitted += 1;
+    if (!ctx.onEvents) {
+      events.push(e);
+      return;
+    }
+    chunk.push(e);
+    if (chunk.length >= PARSER_EVENT_CHUNK) {
+      const full = chunk;
+      chunk = [];
+      await ctx.onEvents(full);
+    }
+  };
   let rawLines = 0;
   let skipped = 0;
   let bytePos = 0;
@@ -4967,7 +5011,7 @@ async function parseCodexRollout(ctx) {
           continue;
         }
         const slug = guessRepoSlugFromPath(cwd);
-        events.push({
+        await emit({
           source_event_id: sourceEventId(ctx.deviceId, ctx.sourceFile, offsetAtLineStart),
           ts,
           kind: "assistant_message",
@@ -5006,7 +5050,7 @@ async function parseCodexRollout(ctx) {
           skipped += 1;
           continue;
         }
-        events.push({
+        await emit({
           source_event_id: sourceEventId(ctx.deviceId, ctx.sourceFile, offsetAtLineStart),
           ts,
           kind: "user_message",
@@ -5032,9 +5076,10 @@ async function parseCodexRollout(ctx) {
     }
     skipped += 1;
   }
+  if (ctx.onEvents && chunk.length > 0) await ctx.onEvents(chunk);
   return {
     events,
-    stats: { rawLines, emittedEvents: events.length, skipped },
+    stats: { rawLines, emittedEvents: emitted, skipped },
     sourceFile: ctx.sourceFile
   };
 }
@@ -5042,6 +5087,7 @@ var init_codex = __esm({
   "../../packages/parsers/src/codex/index.ts"() {
     "use strict";
     init_src();
+    init_types();
     init_git();
   }
 });
@@ -7612,107 +7658,6 @@ var init_src2 = __esm({
   }
 });
 
-// src/identity.ts
-import {
-  chmodSync,
-  mkdirSync,
-  readFileSync as readFileSync2,
-  renameSync,
-  writeFileSync,
-  existsSync as existsSync4
-} from "fs";
-import { homedir as homedir2, hostname as osHostname } from "os";
-import { join as join3 } from "path";
-function ensureRoot() {
-  mkdirSync(ROOT, { recursive: true, mode: 448 });
-}
-function writeAtomic(meta) {
-  ensureRoot();
-  const tmp = `${IDENTITY_FILE}.${process.pid}.tmp`;
-  writeFileSync(tmp, JSON.stringify(meta, null, 2), { mode: 384 });
-  renameSync(tmp, IDENTITY_FILE);
-  try {
-    chmodSync(IDENTITY_FILE, 384);
-  } catch {
-  }
-}
-function identityPath() {
-  return IDENTITY_FILE;
-}
-function hasIdentityFile() {
-  return existsSync4(IDENTITY_FILE);
-}
-function parseFile() {
-  try {
-    const raw = readFileSync2(IDENTITY_FILE, "utf8");
-    const obj = JSON.parse(raw);
-    if (!obj.deviceUuid || !obj.deviceId || !obj.bearerToken) {
-      return null;
-    }
-    return {
-      deviceUuid: obj.deviceUuid,
-      deviceId: obj.deviceId,
-      bearerToken: obj.bearerToken,
-      claimCode: obj.claimCode ?? null,
-      claimUrl: obj.claimUrl ?? null,
-      hostname: obj.hostname ?? osHostname(),
-      createdAt: obj.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-      userEmail: obj.userEmail ?? null,
-      defaultOrgId: obj.defaultOrgId ?? null
-    };
-  } catch {
-    return null;
-  }
-}
-function loadIdentity(migrateFromConf2) {
-  const fromFile = parseFile();
-  if (fromFile) return fromFile;
-  if (!migrateFromConf2) return null;
-  const legacy = migrateFromConf2();
-  if (!legacy) return null;
-  if (!legacy.deviceUuid || !legacy.deviceId || !legacy.bearerToken) {
-    return null;
-  }
-  const migrated = {
-    deviceUuid: legacy.deviceUuid,
-    deviceId: legacy.deviceId,
-    bearerToken: legacy.bearerToken,
-    claimCode: legacy.claimCode ?? null,
-    claimUrl: legacy.claimUrl ?? null,
-    hostname: osHostname(),
-    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-    userEmail: legacy.userEmail ?? null,
-    defaultOrgId: legacy.defaultOrgId ?? null
-  };
-  writeAtomic(migrated);
-  return migrated;
-}
-function saveIdentity(meta) {
-  writeAtomic(meta);
-}
-function backupIdentity() {
-  if (!existsSync4(IDENTITY_FILE)) return null;
-  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const dest = `${IDENTITY_FILE}.bak-${stamp}`;
-  renameSync(IDENTITY_FILE, dest);
-  return dest;
-}
-function updateIdentity(patch) {
-  const current = parseFile();
-  if (!current) return null;
-  const merged = { ...current, ...patch };
-  writeAtomic(merged);
-  return merged;
-}
-var ROOT, IDENTITY_FILE;
-var init_identity = __esm({
-  "src/identity.ts"() {
-    "use strict";
-    ROOT = join3(homedir2(), ".modelstat");
-    IDENTITY_FILE = join3(ROOT, "identity.json");
-  }
-});
-
 // ../../node_modules/.pnpm/undici@7.25.0/node_modules/undici/lib/core/symbols.js
 var require_symbols = __commonJS({
   "../../node_modules/.pnpm/undici@7.25.0/node_modules/undici/lib/core/symbols.js"(exports, module) {
@@ -32604,6 +32549,9 @@ function classifyStatus(status2, attempt) {
   }
   return { type: "drop", reason: `http_${status2}` };
 }
+function wellFormedStringify(value) {
+  return JSON.stringify(value, (_key, v) => typeof v === "string" ? v.toWellFormed() : v);
+}
 function sleep(ms) {
   return new Promise((r) => {
     setTimeout(r, ms);
@@ -32642,7 +32590,10 @@ var init_http = __esm({
                 "content-type": "application/json",
                 authorization: `Bearer ${token}`
               },
-              body: JSON.stringify(batch)
+              // wellFormedStringify, not JSON.stringify: a truncated-emoji
+              // lone surrogate in any excerpt 400s the whole batch on the
+              // serde_json side. See the helper's doc comment.
+              body: wellFormedStringify(batch)
             });
           } catch (err) {
             const detail = describeErrorWithCause(err);
@@ -33291,15 +33242,15 @@ function envPaths(name, { suffix = "nodejs" } = {}) {
   }
   return linux(name);
 }
-var homedir3, tmpdir, env, macos, windows, linux;
+var homedir2, tmpdir, env, macos, windows, linux;
 var init_env_paths = __esm({
   "../../node_modules/.pnpm/env-paths@3.0.0/node_modules/env-paths/index.js"() {
     "use strict";
-    homedir3 = os.homedir();
+    homedir2 = os.homedir();
     tmpdir = os.tmpdir();
     ({ env } = process2);
     macos = (name) => {
-      const library = path.join(homedir3, "Library");
+      const library = path.join(homedir2, "Library");
       return {
         data: path.join(library, "Application Support", name),
         config: path.join(library, "Preferences", name),
@@ -33309,8 +33260,8 @@ var init_env_paths = __esm({
       };
     };
     windows = (name) => {
-      const appData = env.APPDATA || path.join(homedir3, "AppData", "Roaming");
-      const localAppData = env.LOCALAPPDATA || path.join(homedir3, "AppData", "Local");
+      const appData = env.APPDATA || path.join(homedir2, "AppData", "Roaming");
+      const localAppData = env.LOCALAPPDATA || path.join(homedir2, "AppData", "Local");
       return {
         // Data/config/cache/log are invented by me as Windows isn't opinionated about this
         data: path.join(localAppData, name, "Data"),
@@ -33321,13 +33272,13 @@ var init_env_paths = __esm({
       };
     };
     linux = (name) => {
-      const username = path.basename(homedir3);
+      const username = path.basename(homedir2);
       return {
-        data: path.join(env.XDG_DATA_HOME || path.join(homedir3, ".local", "share"), name),
-        config: path.join(env.XDG_CONFIG_HOME || path.join(homedir3, ".config"), name),
-        cache: path.join(env.XDG_CACHE_HOME || path.join(homedir3, ".cache"), name),
+        data: path.join(env.XDG_DATA_HOME || path.join(homedir2, ".local", "share"), name),
+        config: path.join(env.XDG_CONFIG_HOME || path.join(homedir2, ".config"), name),
+        cache: path.join(env.XDG_CACHE_HOME || path.join(homedir2, ".cache"), name),
         // https://wiki.debian.org/XDGBaseDirectorySpecification#state
-        log: path.join(env.XDG_STATE_HOME || path.join(homedir3, ".local", "state"), name),
+        log: path.join(env.XDG_STATE_HOME || path.join(homedir2, ".local", "state"), name),
         temp: path.join(tmpdir, username, name)
       };
     };
@@ -33768,9 +33719,9 @@ import { once } from "events";
 import { createWriteStream } from "fs";
 import path3 from "path";
 import { Readable } from "stream";
-function writeFileSync2(filePath, data, options = DEFAULT_WRITE_OPTIONS) {
+function writeFileSync(filePath, data, options = DEFAULT_WRITE_OPTIONS) {
   if (isString(options))
-    return writeFileSync2(filePath, data, { encoding: options });
+    return writeFileSync(filePath, data, { encoding: options });
   const timeout = options.timeout ?? DEFAULT_TIMEOUT_SYNC;
   const retryOptions = { timeout };
   let tempDisposer = null;
@@ -43893,7 +43844,7 @@ var init_source = __esm({
           fs2.writeFileSync(this.path, data, { mode: this.#options.configFileMode });
         } else {
           try {
-            writeFileSync2(this.path, data, { mode: this.#options.configFileMode });
+            writeFileSync(this.path, data, { mode: this.#options.configFileMode });
           } catch (error) {
             if (error?.code === "EXDEV") {
               fs2.writeFileSync(this.path, data, { mode: this.#options.configFileMode });
@@ -43994,6 +43945,107 @@ var init_source = __esm({
   }
 });
 
+// src/identity.ts
+import {
+  chmodSync,
+  mkdirSync,
+  readFileSync as readFileSync2,
+  renameSync,
+  writeFileSync as writeFileSync2,
+  existsSync as existsSync4
+} from "fs";
+import { homedir as homedir3, hostname as osHostname } from "os";
+import { join as join3 } from "path";
+function ensureRoot() {
+  mkdirSync(ROOT, { recursive: true, mode: 448 });
+}
+function writeAtomic(meta) {
+  ensureRoot();
+  const tmp = `${IDENTITY_FILE}.${process.pid}.tmp`;
+  writeFileSync2(tmp, JSON.stringify(meta, null, 2), { mode: 384 });
+  renameSync(tmp, IDENTITY_FILE);
+  try {
+    chmodSync(IDENTITY_FILE, 384);
+  } catch {
+  }
+}
+function identityPath() {
+  return IDENTITY_FILE;
+}
+function hasIdentityFile() {
+  return existsSync4(IDENTITY_FILE);
+}
+function parseFile() {
+  try {
+    const raw = readFileSync2(IDENTITY_FILE, "utf8");
+    const obj = JSON.parse(raw);
+    if (!obj.deviceUuid || !obj.deviceId || !obj.bearerToken) {
+      return null;
+    }
+    return {
+      deviceUuid: obj.deviceUuid,
+      deviceId: obj.deviceId,
+      bearerToken: obj.bearerToken,
+      claimCode: obj.claimCode ?? null,
+      claimUrl: obj.claimUrl ?? null,
+      hostname: obj.hostname ?? osHostname(),
+      createdAt: obj.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+      userEmail: obj.userEmail ?? null,
+      defaultOrgId: obj.defaultOrgId ?? null
+    };
+  } catch {
+    return null;
+  }
+}
+function loadIdentity(migrateFromConf2) {
+  const fromFile = parseFile();
+  if (fromFile) return fromFile;
+  if (!migrateFromConf2) return null;
+  const legacy = migrateFromConf2();
+  if (!legacy) return null;
+  if (!legacy.deviceUuid || !legacy.deviceId || !legacy.bearerToken) {
+    return null;
+  }
+  const migrated = {
+    deviceUuid: legacy.deviceUuid,
+    deviceId: legacy.deviceId,
+    bearerToken: legacy.bearerToken,
+    claimCode: legacy.claimCode ?? null,
+    claimUrl: legacy.claimUrl ?? null,
+    hostname: osHostname(),
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    userEmail: legacy.userEmail ?? null,
+    defaultOrgId: legacy.defaultOrgId ?? null
+  };
+  writeAtomic(migrated);
+  return migrated;
+}
+function saveIdentity(meta) {
+  writeAtomic(meta);
+}
+function backupIdentity() {
+  if (!existsSync4(IDENTITY_FILE)) return null;
+  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const dest = `${IDENTITY_FILE}.bak-${stamp}`;
+  renameSync(IDENTITY_FILE, dest);
+  return dest;
+}
+function updateIdentity(patch) {
+  const current = parseFile();
+  if (!current) return null;
+  const merged = { ...current, ...patch };
+  writeAtomic(merged);
+  return merged;
+}
+var ROOT, IDENTITY_FILE;
+var init_identity = __esm({
+  "src/identity.ts"() {
+    "use strict";
+    ROOT = join3(homedir3(), ".modelstat");
+    IDENTITY_FILE = join3(ROOT, "identity.json");
+  }
+});
+
 // src/config.ts
 import { existsSync as existsSync5 } from "fs";
 import { hostname } from "os";
@@ -45312,6 +45364,21 @@ var init_llama = __esm({
   }
 });
 
+// ../../packages/companion-core/src/optional-module.ts
+function isMissingOptionalModuleError(err) {
+  const code = err?.code;
+  if (code === "ERR_MODULE_NOT_FOUND" || code === "MODULE_NOT_FOUND") return true;
+  const msg = err instanceof Error ? err.message : String(err);
+  return /cannot find (package|module)|cannot resolve|failed to resolve/i.test(msg);
+}
+var OPTIONAL_MODULE_MAX_LOAD_ATTEMPTS;
+var init_optional_module = __esm({
+  "../../packages/companion-core/src/optional-module.ts"() {
+    "use strict";
+    OPTIONAL_MODULE_MAX_LOAD_ATTEMPTS = 3;
+  }
+});
+
 // ../../packages/companion-core/src/node/transformersjs-embed.ts
 async function loadPipeline(model) {
   if (cached) return cached;
@@ -45319,11 +45386,7 @@ async function loadPipeline(model) {
   if (!loadPromise2) {
     loadPromise2 = (async () => {
       try {
-        const moduleId = "@huggingface/transformers";
-        const tjs = await import(
-          /* @vite-ignore */
-          moduleId
-        );
+        const tjs = await importModule("@huggingface/transformers");
         const p = await tjs.pipeline("feature-extraction", model, {
           device: "cpu",
           dtype: "fp32"
@@ -45332,12 +45395,16 @@ async function loadPipeline(model) {
         return p;
       } catch (err) {
         const msg = err.message;
-        if (/unsupported|architecture|not supported|onnx|cannot resolve/i.test(msg)) {
+        loadAttempts += 1;
+        if (isMissingOptionalModuleError(err) || /unsupported|architecture|not supported|onnx/i.test(msg) || loadAttempts >= OPTIONAL_MODULE_MAX_LOAD_ATTEMPTS) {
           loadFailedPermanently = true;
         }
-        console.warn(
-          `[modelstat] transformers.js embedder unavailable (segments will be re-embedded server-side): ${msg}`
-        );
+        if (!warnedUnavailable) {
+          warnedUnavailable = true;
+          console.warn(
+            `[modelstat] transformers.js embedder unavailable (segments will be re-embedded server-side; further attempts ${loadFailedPermanently ? "disabled" : `limited to ${OPTIONAL_MODULE_MAX_LOAD_ATTEMPTS}`}, warning once): ${msg}`
+          );
+        }
         loadPromise2 = null;
         return null;
       }
@@ -45354,21 +45421,32 @@ function createTransformersJsEmbedder(model = DEFAULT_MODEL) {
       const out = await pipe(text, { pooling: "mean", normalize: true });
       return Array.from(out.data);
     } catch (err) {
-      console.warn(
-        `[modelstat] embed error (returning empty vector, server will re-embed): ${err.message}`
-      );
+      if (!warnedInferenceError) {
+        warnedInferenceError = true;
+        console.warn(
+          `[modelstat] embed error (returning empty vectors, server will re-embed; warning once): ${err.message}`
+        );
+      }
       return [];
     }
   };
 }
-var cached, loadPromise2, loadFailedPermanently, DEFAULT_MODEL;
+var cached, loadPromise2, loadFailedPermanently, loadAttempts, warnedUnavailable, warnedInferenceError, DEFAULT_MODEL, importModule;
 var init_transformersjs_embed = __esm({
   "../../packages/companion-core/src/node/transformersjs-embed.ts"() {
     "use strict";
+    init_optional_module();
     cached = null;
     loadPromise2 = null;
     loadFailedPermanently = false;
+    loadAttempts = 0;
+    warnedUnavailable = false;
+    warnedInferenceError = false;
     DEFAULT_MODEL = "Xenova/bge-small-en-v1.5";
+    importModule = (id) => import(
+      /* @vite-ignore */
+      id
+    );
   }
 });
 
@@ -45407,18 +45485,23 @@ async function createPrivacyFilterRedactor(opts = {}) {
   const device = opts.device ?? (isBrowser ? "webgpu" : "cpu");
   const dtype = opts.dtype ?? "q4";
   const modelId = opts.model ?? "openai/privacy-filter";
+  const importModule2 = opts.importModule ?? ((id) => import(
+    /* @vite-ignore */
+    id
+  ));
   let cached2 = null;
   let loadPromise3 = null;
+  let loadFailedPermanently2 = false;
+  let loadAttempts2 = 0;
+  let warnedUnavailable2 = false;
+  let warnedInferenceError2 = false;
   async function loadPipeline2() {
     if (cached2) return cached2;
+    if (loadFailedPermanently2) return null;
     if (!loadPromise3) {
       loadPromise3 = (async () => {
         try {
-          const moduleId = "@huggingface/transformers";
-          const tjs = await import(
-            /* @vite-ignore */
-            moduleId
-          );
+          const tjs = await importModule2("@huggingface/transformers");
           const p = await tjs.pipeline("token-classification", modelId, {
             device,
             dtype,
@@ -45428,10 +45511,17 @@ async function createPrivacyFilterRedactor(opts = {}) {
           return p;
         } catch (err) {
           loadPromise3 = null;
-          console.warn(
-            "[privacy-filter] adapter unavailable \u2014 install @huggingface/transformers in the consuming package to enable model-based redaction. Falling back to pass-through.",
-            err.message
-          );
+          loadAttempts2 += 1;
+          if (isMissingOptionalModuleError(err) || loadAttempts2 >= OPTIONAL_MODULE_MAX_LOAD_ATTEMPTS) {
+            loadFailedPermanently2 = true;
+          }
+          if (!warnedUnavailable2) {
+            warnedUnavailable2 = true;
+            console.warn(
+              "[privacy-filter] adapter unavailable \u2014 install @huggingface/transformers in the consuming package to enable model-based redaction. Falling back to pass-through (warning once).",
+              err.message
+            );
+          }
           return null;
         }
       })();
@@ -45454,10 +45544,13 @@ async function createPrivacyFilterRedactor(opts = {}) {
     try {
       tokens = await classify(text);
     } catch (err) {
-      console.warn(
-        "[privacy-filter] inference failed, returning input unchanged:",
-        err.message
-      );
+      if (!warnedInferenceError2) {
+        warnedInferenceError2 = true;
+        console.warn(
+          "[privacy-filter] inference failed, returning input unchanged (warning once):",
+          err.message
+        );
+      }
       return empty;
     }
     const spans = [];
@@ -45494,6 +45587,7 @@ async function createPrivacyFilterRedactor(opts = {}) {
 var init_privacy_filter = __esm({
   "../../packages/companion-core/src/redact/privacy-filter.ts"() {
     "use strict";
+    init_optional_module();
   }
 });
 
@@ -45603,9 +45697,8 @@ async function scanAll(cb = {}) {
         const full = join5(dir, f);
         jobs.push({
           path: full,
-          parse: async () => {
-            const r = await parseClaudeCodeJsonl({ deviceId, sourceFile: full });
-            return { events: r.events, path: full };
+          parse: async (sink2) => {
+            await parseClaudeCodeJsonl({ deviceId, sourceFile: full, onEvents: sink2 });
           }
         });
       }
@@ -45627,9 +45720,8 @@ async function scanAll(cb = {}) {
             const full = join5(base, y, m, d, f);
             jobs.push({
               path: full,
-              parse: async () => {
-                const r = await parseCodexRollout({ deviceId, sourceFile: full });
-                return { events: r.events, path: full };
+              parse: async (sink2) => {
+                await parseCodexRollout({ deviceId, sourceFile: full, onEvents: sink2 });
               }
             });
           }
@@ -45684,6 +45776,17 @@ async function scanAll(cb = {}) {
     buffer = [];
     cb.onUploaded?.({ events: res.accepted, segments: segments.length });
   }
+  const sink = async (events) => {
+    for (const e of events) {
+      buffer.push(e);
+      if (buffer.length >= BATCH_MAX_EVENTS) await flushBatch();
+    }
+    if (buffer.length > BATCH_BUFFER_HARD_CAP) {
+      throw new Error(
+        `scan event buffer exceeded ${BATCH_BUFFER_HARD_CAP} events \u2014 incremental batch flushing has regressed (see BATCH_BUFFER_HARD_CAP)`
+      );
+    }
+  };
   for (let i = 0; i < jobs.length; i++) {
     const job = jobs[i];
     cb.onFile?.(job.path, i, jobs.length);
@@ -45695,13 +45798,7 @@ async function scanAll(cb = {}) {
     }
     filesScanned += 1;
     try {
-      const r = await job.parse();
-      if (r.events.length) {
-        for (const e of r.events) {
-          buffer.push(e);
-          if (buffer.length >= BATCH_MAX_EVENTS) await flushBatch();
-        }
-      }
+      await job.parse(sink);
       if (cs) pendingCursors.push({ path: job.path, cs });
     } catch (e) {
       console.warn(`  ! parse failed for ${job.path}:`, e.message);
@@ -45710,7 +45807,7 @@ async function scanAll(cb = {}) {
   await flushBatch();
   return { filesScanned, filesUnchanged, batchesUploaded, eventsUploaded, segmentsUploaded };
 }
-var AGENT_VERSION, BATCH_MAX_EVENTS, ZERO_TOKENS;
+var AGENT_VERSION, BATCH_MAX_EVENTS, BATCH_BUFFER_HARD_CAP, ZERO_TOKENS;
 var init_scan = __esm({
   "src/scan.ts"() {
     "use strict";
@@ -45719,8 +45816,9 @@ var init_scan = __esm({
     init_pipeline2();
     init_config2();
     init_api();
-    AGENT_VERSION = true ? "agent-0.0.44" : "agent-dev";
+    AGENT_VERSION = true ? "agent-0.0.46" : "agent-dev";
     BATCH_MAX_EVENTS = 2e3;
+    BATCH_BUFFER_HARD_CAP = BATCH_MAX_EVENTS * 2;
     ZERO_TOKENS = {
       input: 0,
       output: 0,
@@ -45756,9 +45854,9 @@ function isProcessAlive(pid) {
     return false;
   }
 }
-function readLock() {
+function readDaemonLock(lockFile = LOCK_FILE) {
   try {
-    const raw = readFileSync4(LOCK_FILE, "utf8");
+    const raw = readFileSync4(lockFile, "utf8");
     const obj = JSON.parse(raw);
     if (typeof obj.pid !== "number") return null;
     return {
@@ -45783,7 +45881,7 @@ function writeLockAtomic(meta) {
   renameSync2(tmp, LOCK_FILE);
 }
 function removeLockIfOwned(ownerPid) {
-  const lock = readLock();
+  const lock = readDaemonLock();
   if (!lock) return;
   if (lock.pid !== ownerPid) return;
   try {
@@ -45792,7 +45890,7 @@ function removeLockIfOwned(ownerPid) {
   }
 }
 function acquireDaemonLock(opts) {
-  const existing = readLock();
+  const existing = readDaemonLock();
   if (existing && isProcessAlive(existing.pid)) {
     if (!opts.force) {
       const ageSec = ageInSeconds(existing.startedAt);
@@ -45810,6 +45908,20 @@ function acquireDaemonLock(opts) {
     apiUrl: opts.apiUrl
   };
   writeLockAtomic(meta);
+  const recheck = setTimeout(() => {
+    const current = readDaemonLock();
+    if (checkLockOwnership(process.pid, current) !== "lost") return;
+    const winner = current;
+    if (opts.onLockLost) {
+      opts.onLockLost(winner);
+      return;
+    }
+    console.log(
+      `[modelstat] another daemon (pid ${winner.pid}, started ${winner.startedAt}) won the lock race \u2014 this instance is standing down.`
+    );
+    process.exit(0);
+  }, LOCK_RECHECK_MS);
+  recheck.unref();
   const cleanup = () => removeLockIfOwned(process.pid);
   process.once("beforeExit", cleanup);
   process.once("SIGINT", () => {
@@ -45827,6 +45939,11 @@ function acquireDaemonLock(opts) {
   });
   return { kind: "acquired" };
 }
+function checkLockOwnership(myPid, current, pidAlive = isProcessAlive) {
+  if (!current || current.pid === myPid) return "owned";
+  if (!pidAlive(current.pid)) return "winner_dead";
+  return "lost";
+}
 function ageInSeconds(iso) {
   const t = Date.parse(iso);
   if (Number.isNaN(t)) return -1;
@@ -45841,12 +45958,13 @@ function formatAge(seconds) {
   const h = Math.floor(m / 60);
   return `${h}h ${m % 60}m`;
 }
-var LOCK_DIR, LOCK_FILE;
+var LOCK_DIR, LOCK_FILE, LOCK_RECHECK_MS;
 var init_lock = __esm({
   "src/lock.ts"() {
     "use strict";
     LOCK_DIR = join7(homedir7(), ".modelstat");
     LOCK_FILE = join7(LOCK_DIR, "daemon.lock");
+    LOCK_RECHECK_MS = 5e3;
   }
 });
 
@@ -47720,17 +47838,44 @@ async function sendHeartbeat() {
   }
   writeLocalStatus(body).catch(() => void 0);
 }
+async function rotateRunawayLogs() {
+  const { homedir: homedir10 } = await import("os");
+  const { join: join12 } = await import("path");
+  const { open: open2, stat: stat6, truncate, writeFile } = await import("fs/promises");
+  const dir = join12(homedir10(), ".modelstat", "logs");
+  for (const name of ["out.log", "err.log"]) {
+    const p = join12(dir, name);
+    try {
+      const st = await stat6(p);
+      if (st.size <= LOG_MAX_BYTES) continue;
+      const keep = Math.min(LOG_TAIL_KEEP_BYTES, st.size);
+      const fh = await open2(p, "r");
+      try {
+        const buf = Buffer.alloc(keep);
+        await fh.read(buf, 0, keep, st.size - keep);
+        await writeFile(p.replace(/\.log$/, ".old.log"), buf);
+      } finally {
+        await fh.close();
+      }
+      await truncate(p, 0);
+      console.log(
+        `[modelstat] rotated ${name}: was ${(st.size / 1024 / 1024).toFixed(0)} MB (> ${LOG_MAX_BYTES / 1024 / 1024} MB cap), tail kept in ${name.replace(/\.log$/, ".old.log")}`
+      );
+    } catch {
+    }
+  }
+}
 async function writeLocalStatus(snapshot) {
-  const { homedir: homedir9 } = await import("os");
-  const { join: join11 } = await import("path");
+  const { homedir: homedir10 } = await import("os");
+  const { join: join12 } = await import("path");
   const { writeFile, mkdir: mkdir2, rename } = await import("fs/promises");
   if (!lastStatusPath) {
-    const dir = join11(homedir9(), ".modelstat");
+    const dir = join12(homedir10(), ".modelstat");
     try {
       await mkdir2(dir, { recursive: true });
     } catch {
     }
-    lastStatusPath = join11(dir, "last-status.json");
+    lastStatusPath = join12(dir, "last-status.json");
   }
   const tmp = `${lastStatusPath}.tmp`;
   try {
@@ -47812,7 +47957,17 @@ async function runDaemon(opts = {}) {
   const lock = acquireDaemonLock({
     agentVersion: AGENT_VERSION2,
     apiUrl: state.apiUrl,
-    force: opts.force === true
+    force: opts.force === true,
+    // If a racing daemon out-renamed us for the lock (see lock.ts
+    // recheck), stand down with exit 0: our supervisor's next health
+    // check sees the winner and adopts it instead of respawning us.
+    onLockLost: (winner) => {
+      setPhase("offline", `another daemon (pid ${winner.pid}) owns the lock \u2014 standing down`);
+      console.log(
+        `[modelstat] another daemon (pid ${winner.pid}, started ${winner.startedAt}) won the lock race \u2014 this instance is standing down.`
+      );
+      process.exit(0);
+    }
   });
   if (lock.kind === "already_running") {
     console.log(
@@ -47829,6 +47984,7 @@ async function runDaemon(opts = {}) {
     return;
   }
   setPhase("starting", "Booting");
+  await rotateRunawayLogs();
   setStat("segments_sent", state.segmentsSent);
   const hb = setInterval(() => void sendHeartbeat(), HEARTBEAT_INTERVAL_MS);
   hb.unref();
@@ -47852,19 +48008,19 @@ async function runDaemon(opts = {}) {
   await runDiscovery();
   await requestScan("startup");
   const chokidar = (await Promise.resolve().then(() => (init_esm2(), esm_exports))).default;
-  const { homedir: homedir9, platform: platform5 } = await import("os");
-  const { join: join11 } = await import("path");
-  const home2 = homedir9();
+  const { homedir: homedir10, platform: platform5 } = await import("os");
+  const { join: join12 } = await import("path");
+  const home2 = homedir10();
   const dirs = [
-    join11(home2, ".claude/projects"),
-    join11(home2, ".codex/sessions"),
-    join11(home2, ".cursor/ai-tracking"),
-    join11(home2, ".gemini"),
+    join12(home2, ".claude/projects"),
+    join12(home2, ".codex/sessions"),
+    join12(home2, ".cursor/ai-tracking"),
+    join12(home2, ".gemini"),
     ...platform5() === "darwin" ? [
-      join11(home2, "Library/Application Support/Cursor/User/workspaceStorage"),
-      join11(home2, "Library/Application Support/Claude")
+      join12(home2, "Library/Application Support/Cursor/User/workspaceStorage"),
+      join12(home2, "Library/Application Support/Claude")
     ] : [
-      join11(home2, ".config/Cursor/User/workspaceStorage")
+      join12(home2, ".config/Cursor/User/workspaceStorage")
     ]
   ].filter((p) => existsSync9(p) && statSync2(p).isDirectory());
   setPhase("watching", `Watching ${dirs.length} directories`);
@@ -47907,7 +48063,7 @@ async function runDaemon(opts = {}) {
   await new Promise(() => {
   });
 }
-var import_undici2, AGENT_VERSION2, HEARTBEAT_INTERVAL_MS, SCAN_INTERVAL_MS, DISCOVERY_INTERVAL_MS, status, LOCAL_FLUSH_THROTTLE_MS, localFlushTimer, localFlushPending, lastStatusPath, scanRunner;
+var import_undici2, AGENT_VERSION2, HEARTBEAT_INTERVAL_MS, SCAN_INTERVAL_MS, DISCOVERY_INTERVAL_MS, status, LOCAL_FLUSH_THROTTLE_MS, localFlushTimer, localFlushPending, LOG_MAX_BYTES, LOG_TAIL_KEEP_BYTES, lastStatusPath, scanRunner;
 var init_daemon = __esm({
   "src/daemon.ts"() {
     "use strict";
@@ -47919,7 +48075,7 @@ var init_daemon = __esm({
     init_lock();
     init_scan();
     init_single_flight();
-    AGENT_VERSION2 = true ? "agent-0.0.44" : "agent-dev";
+    AGENT_VERSION2 = true ? "agent-0.0.46" : "agent-dev";
     HEARTBEAT_INTERVAL_MS = 1e4;
     SCAN_INTERVAL_MS = 5 * 60 * 1e3;
     DISCOVERY_INTERVAL_MS = 6e4;
@@ -47935,6 +48091,8 @@ var init_daemon = __esm({
     LOCAL_FLUSH_THROTTLE_MS = 400;
     localFlushTimer = null;
     localFlushPending = false;
+    LOG_MAX_BYTES = 64 * 1024 * 1024;
+    LOG_TAIL_KEEP_BYTES = 4 * 1024 * 1024;
     lastStatusPath = null;
     scanRunner = createCoalescingRunner(runScanCycle);
   }
@@ -47946,33 +48104,33 @@ __export(watch_exports, {
   watchForever: () => watchForever
 });
 import { existsSync as existsSync10 } from "fs";
-import { homedir as homedir8, platform as platform3 } from "os";
-import { join as join10 } from "path";
+import { homedir as homedir9, platform as platform3 } from "os";
+import { join as join11 } from "path";
 function resolveWatchDirs() {
-  const home2 = homedir8();
-  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join10(home2, ".config");
-  const xdgData = process.env.XDG_DATA_HOME ?? join10(home2, ".local/share");
+  const home2 = homedir9();
+  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join11(home2, ".config");
+  const xdgData = process.env.XDG_DATA_HOME ?? join11(home2, ".local/share");
   const candidates = [
     // universal (default HOME-rooted CLI data dirs)
-    join10(home2, ".claude/projects"),
-    join10(home2, ".codex/sessions"),
-    join10(home2, ".cursor/ai-tracking"),
-    join10(home2, ".gemini"),
-    join10(home2, ".aider"),
+    join11(home2, ".claude/projects"),
+    join11(home2, ".codex/sessions"),
+    join11(home2, ".cursor/ai-tracking"),
+    join11(home2, ".gemini"),
+    join11(home2, ".aider"),
     // XDG / Linux
-    join10(xdgConfig, "claude/projects"),
-    join10(xdgConfig, "codex/sessions"),
-    join10(xdgConfig, "Cursor/User/workspaceStorage"),
-    join10(xdgConfig, "Code/User/workspaceStorage"),
-    join10(xdgConfig, "Code - Insiders/User/workspaceStorage"),
-    join10(xdgData, "claude/projects"),
+    join11(xdgConfig, "claude/projects"),
+    join11(xdgConfig, "codex/sessions"),
+    join11(xdgConfig, "Cursor/User/workspaceStorage"),
+    join11(xdgConfig, "Code/User/workspaceStorage"),
+    join11(xdgConfig, "Code - Insiders/User/workspaceStorage"),
+    join11(xdgData, "claude/projects"),
     // macOS
     ...platform3() === "darwin" ? [
-      join10(home2, "Library/Application Support/Cursor/User/workspaceStorage"),
-      join10(home2, "Library/Application Support/Claude"),
-      join10(home2, "Library/Application Support/Code/User/workspaceStorage"),
-      join10(home2, "Library/Application Support/Windsurf/User/workspaceStorage"),
-      join10(home2, "Library/Application Support/Zed")
+      join11(home2, "Library/Application Support/Cursor/User/workspaceStorage"),
+      join11(home2, "Library/Application Support/Claude"),
+      join11(home2, "Library/Application Support/Code/User/workspaceStorage"),
+      join11(home2, "Library/Application Support/Windsurf/User/workspaceStorage"),
+      join11(home2, "Library/Application Support/Zed")
     ] : []
   ];
   return Array.from(new Set(candidates)).filter((p) => existsSync10(p));
@@ -48037,13 +48195,13 @@ var init_watch = __esm({
 
 // src/cli.ts
 init_src2();
-init_identity();
 init_api();
 init_config2();
+init_identity();
 init_scan();
 import { spawn } from "child_process";
 import { randomBytes } from "crypto";
-import { platform as platform4, release, arch as cpuArch, hostname as hostname2 } from "os";
+import { arch as cpuArch, hostname as hostname2, platform as platform4, release } from "os";
 import { createInterface as createInterface3 } from "readline";
 
 // src/service.ts
@@ -48399,6 +48557,59 @@ function trayStatus() {
   return exe ? { installed: true, path: exe.replace(/\/Contents\/MacOS\/modelstat-tray$/, "") } : { installed: false, path: null };
 }
 
+// src/supervise.ts
+init_lock();
+import { readFileSync as readFileSync5 } from "fs";
+import { homedir as homedir8 } from "os";
+import { join as join8 } from "path";
+var STATUS_FRESH_MS = 12e4;
+var BOOT_GRACE_MS = 9e4;
+function decideSupervision(input) {
+  const fresh = input.statusFreshMs ?? STATUS_FRESH_MS;
+  const grace = input.bootGraceMs ?? BOOT_GRACE_MS;
+  if (!input.lock || !input.ownerAlive) return "spawn";
+  if (input.myAgentVersion && input.lock.agentVersion !== "unknown" && input.lock.agentVersion !== input.myAgentVersion) {
+    return "replace";
+  }
+  if (input.statusAgeMs !== null && input.statusAgeMs <= fresh) return "adopt";
+  if (input.lockAgeMs !== null && input.lockAgeMs <= grace) return "adopt";
+  return "replace";
+}
+function daemonHealth(opts = {}) {
+  const now = opts.now ?? Date.now();
+  const pidAlive = opts.pidAlive ?? isProcessAlive;
+  const statusPath = opts.statusPath ?? join8(homedir8(), ".modelstat", "last-status.json");
+  const lock = opts.lockPath === void 0 ? readDaemonLock() : readDaemonLock(opts.lockPath);
+  const ownerAlive = lock !== null && pidAlive(lock.pid);
+  const lockAgeMs = lock ? ageMs(lock.startedAt, now) : null;
+  let statusAgeMs = null;
+  try {
+    const raw = readFileSync5(statusPath, "utf8");
+    const writtenAt = JSON.parse(raw).written_at;
+    statusAgeMs = writtenAt ? ageMs(writtenAt, now) : null;
+  } catch {
+    statusAgeMs = null;
+  }
+  return {
+    decision: decideSupervision({
+      lock,
+      ownerAlive,
+      lockAgeMs,
+      statusAgeMs,
+      myAgentVersion: opts.myAgentVersion
+    }),
+    lock,
+    ownerAlive,
+    lockAgeMs,
+    statusAgeMs
+  };
+}
+function ageMs(iso, now) {
+  const t = Date.parse(iso);
+  if (Number.isNaN(t)) return null;
+  return Math.max(0, now - t);
+}
+
 // src/cli.ts
 async function confirmPrompt(question, defaultYes) {
   if (process.stdin.isTTY !== true) return defaultYes;
@@ -48429,7 +48640,7 @@ function tryOpenBrowser(url) {
     return false;
   }
 }
-var AGENT_VERSION3 = true ? "agent-0.0.44" : "agent-dev";
+var AGENT_VERSION3 = true ? "agent-0.0.46" : "agent-dev";
 function osFamily() {
   const p = platform4();
   if (p === "darwin") return "macos";
@@ -48472,10 +48683,8 @@ async function cmdSelfRegister() {
     process.stdout.write(`  \x1B[2mgenerated UUIDv7 ${deviceUuid.slice(0, 8)}\u2026\x1B[0m
 `);
   }
-  process.stdout.write(
-    `  \x1B[2m\u2192 POST ${state.apiUrl}/v1/devices/self-register\x1B[0m
-`
-  );
+  process.stdout.write(`  \x1B[2m\u2192 POST ${state.apiUrl}/v1/devices/self-register\x1B[0m
+`);
   const res = await selfRegister({
     device_uuid: deviceUuid,
     fingerprint
@@ -48489,8 +48698,10 @@ async function cmdSelfRegister() {
   });
   process.stdout.write(`  \x1B[32m\u2713\x1B[0m registered  device_id=${res.device_id}
 `);
-  process.stdout.write(`  \x1B[32m\u2713\x1B[0m secret      ${res.secret_prefix}\u2026  (hashed on server, never re-sent)
-`);
+  process.stdout.write(
+    `  \x1B[32m\u2713\x1B[0m secret      ${res.secret_prefix}\u2026  (hashed on server, never re-sent)
+`
+  );
   process.stdout.write(`  \x1B[32m\u2713\x1B[0m claim code  ${res.claim_code}
 `);
 }
@@ -48523,10 +48734,8 @@ async function cmdAwaitClaim() {
 }
 function emitEvent(opts, event, fields = {}) {
   if (!opts.json) return;
-  process.stdout.write(
-    `${JSON.stringify({ v: 1, ts: Date.now(), event, ...fields })}
-`
-  );
+  process.stdout.write(`${JSON.stringify({ v: 1, ts: Date.now(), event, ...fields })}
+`);
 }
 async function cmdConnect(opts) {
   const step = (msg) => {
@@ -48629,9 +48838,7 @@ async function cmdConnect(opts) {
       error: e.message
     });
     warn(`couldn't prepare summariser model: ${e.message}`);
-    warn(
-      "the background service will retry the download on its first scan"
-    );
+    warn("the background service will retry the download on its first scan");
   }
   step("Installing/refreshing background service so the agent survives reboots");
   let serviceOk = false;
@@ -48647,9 +48854,7 @@ async function cmdConnect(opts) {
   } catch (e) {
     emitEvent(opts, "service_install_failed", { error: e.message });
     warn(`couldn't install service: ${e.message}`);
-    warn(
-      "the agent will not run in the background \u2014 re-run after fixing the issue"
-    );
+    warn("the agent will not run in the background \u2014 re-run after fixing the issue");
   }
   step("Detecting installed AI tools and signed-in accounts");
   let discovered = null;
@@ -48667,9 +48872,7 @@ async function cmdConnect(opts) {
         identities: d.identities.length
       };
       emitEvent(opts, "discovered", discovered);
-      ok(
-        `${discovered.installations} installs \xB7 ${discovered.identities} accounts`
-      );
+      ok(`${discovered.installations} installs \xB7 ${discovered.identities} accounts`);
     } catch (e) {
       emitEvent(opts, "discovery_failed", { error: e.message });
       warn(`couldn't detect accounts: ${e.message}`);
@@ -48765,9 +48968,7 @@ async function cmdRescan() {
   console.log(
     `[modelstat] cursors wiped \u2014 next \`modelstat scan\` (or daemon scan cycle) will re-read every JSONL from the start and re-summarise every session at processing version v${PROCESSING_VERSION2}.`
   );
-  console.log(
-    "  If the daemon is running, kick it with: modelstat stop && modelstat start"
-  );
+  console.log("  If the daemon is running, kick it with: modelstat stop && modelstat start");
 }
 async function cmdWatch() {
   const { watchForever: watchForever2 } = await Promise.resolve().then(() => (init_watch(), watch_exports));
@@ -48823,10 +49024,10 @@ function fmtTokens(v) {
 }
 async function readLocalStatus() {
   try {
-    const { homedir: homedir9 } = await import("os");
-    const { join: join11 } = await import("path");
+    const { homedir: homedir10 } = await import("os");
+    const { join: join12 } = await import("path");
     const { readFile } = await import("fs/promises");
-    const p = join11(homedir9(), ".modelstat", "last-status.json");
+    const p = join12(homedir10(), ".modelstat", "last-status.json");
     const txt = await readFile(p, "utf8");
     return JSON.parse(txt);
   } catch {
@@ -48869,7 +49070,9 @@ async function cmdStats(args) {
       console.log("device is claimed \u2014 live stats available at:");
       console.log(`  ${dashboard}`);
       if (local) {
-        console.log(`local agent: ${local.status ?? "?"}${local.message ? ` \xB7 ${local.message}` : ""}`);
+        console.log(
+          `local agent: ${local.status ?? "?"}${local.message ? ` \xB7 ${local.message}` : ""}`
+        );
         const stats = local.stats ?? {};
         for (const [k, v] of Object.entries(stats)) console.log(`  ${k}: ${v}`);
       }
@@ -48887,7 +49090,9 @@ async function cmdStats(args) {
   console.log(
     `status:   ${view.device.agent_status ?? "(unknown)"}${view.device.last_seen_at ? ` \xB7 last seen ${view.device.last_seen_at}` : ""}`
   );
-  console.log(`claim:    ${view.status}${view.status === "unclaimed" ? ` (at ${view.claim_url})` : ""}`);
+  console.log(
+    `claim:    ${view.status}${view.status === "unclaimed" ? ` (at ${view.claim_url})` : ""}`
+  );
   console.log(`sessions: ${fmtInt(view.analyzed.count)}`);
   console.log(`tokens:   ${fmtTokens(view.analyzed.totalTokens)}`);
   console.log(`cost:     ${fmtCost(view.analyzed.totalCostUsd)}`);
@@ -48912,10 +49117,8 @@ async function cmdJobs(args) {
   if (!jobs && !ledger) {
     const dashboard = `${state.apiUrl.replace(/\/$/, "")}/dashboard/jobs`;
     if (asJson) {
-      process.stdout.write(
-        `${JSON.stringify({ paired: true, claimed: true, dashboard })}
-`
-      );
+      process.stdout.write(`${JSON.stringify({ paired: true, claimed: true, dashboard })}
+`);
     } else {
       console.log("device is claimed \u2014 job queue at:");
       console.log(`  ${dashboard}`);
@@ -48959,6 +49162,22 @@ function cmdPaths(args) {
     console.log(`${k.padEnd(8)} ${String(v)}`);
   }
 }
+function cmdToken(args) {
+  if (!state.bearer) {
+    console.error("not paired \u2014 run `npx modelstat@latest` first");
+    process.exit(1);
+  }
+  if (args.includes("--json")) {
+    process.stdout.write(`${JSON.stringify({ token: state.bearer, api: state.apiUrl })}
+`);
+    return;
+  }
+  process.stdout.write(`${state.bearer}
+`);
+  if (process.stderr.isTTY) {
+    console.error("(device token \u2014 treat it like a password; rotate via the dashboard if leaked)");
+  }
+}
 function parseConnectOpts(argv) {
   return {
     json: argv.includes("--json"),
@@ -48989,6 +49208,14 @@ async function main() {
       console.log(`\u2713 runtime staged at ${dest}`);
       return;
     }
+    case "_daemon-health": {
+      try {
+        console.log(JSON.stringify(daemonHealth({ myAgentVersion: AGENT_VERSION3 })));
+      } catch (e) {
+        console.log(JSON.stringify({ decision: "spawn", error: e.message }));
+      }
+      return;
+    }
     // ── Diagnostics / dev one-shots ────────────────────────────
     case "status":
       return cmdStatus();
@@ -48999,6 +49226,9 @@ async function main() {
     case "paths":
       cmdPaths(rest);
       return;
+    case "token":
+      cmdToken(rest);
+      return;
     case "discover":
       return cmdDiscover();
     case "scan":
@@ -49013,24 +49243,39 @@ async function main() {
       return cmdAwaitClaim();
     default:
       console.log("usage:");
-      console.log("  npx modelstat@latest                \u2014 install or upgrade. Registers the device, installs the background service, exits.");
-      console.log("                                        flags: --json (NDJSON events on stdout), --no-browser, --fresh, -y");
-      console.log("  npx modelstat@latest remove         \u2014 stop and uninstall the background service. Keeps your identity.");
-      console.log("  npx modelstat@latest reinstall      \u2014 alias for the default. Useful when you want to be explicit.");
+      console.log(
+        "  npx modelstat@latest                \u2014 install or upgrade. Registers the device, installs the background service, exits."
+      );
+      console.log(
+        "                                        flags: --json (NDJSON events on stdout), --no-browser, --fresh, -y"
+      );
+      console.log(
+        "  npx modelstat@latest remove         \u2014 stop and uninstall the background service. Keeps your identity."
+      );
+      console.log(
+        "  npx modelstat@latest reinstall      \u2014 alias for the default. Useful when you want to be explicit."
+      );
       console.log();
       console.log("Diagnostics:");
       console.log("  npx modelstat@latest status         \u2014 show pairing + service state");
       console.log("  npx modelstat@latest stats          \u2014 live device summary: sessions \xB7 tokens \xB7 cost (--json)");
       console.log("  npx modelstat@latest jobs           \u2014 pipeline queue + recent processing ledger (--json)");
       console.log("  npx modelstat@latest paths          \u2014 print state file + log dir + api URL (--json)");
+      console.log("  npx modelstat@latest token          \u2014 print the device token for hosted MCP / API access (--json)");
       console.log();
       console.log("Dev / one-shots:");
       console.log("  npx modelstat@latest scan           \u2014 one-shot parse + upload of local JSONL");
-      console.log("  npx modelstat@latest rescan         \u2014 wipe file cursors so the next scan re-reads & re-summarises everything");
-      console.log("  npx modelstat@latest watch          \u2014 continuous (chokidar) with periodic backstop");
+      console.log(
+        "  npx modelstat@latest rescan         \u2014 wipe file cursors so the next scan re-reads & re-summarises everything"
+      );
+      console.log(
+        "  npx modelstat@latest watch          \u2014 continuous (chokidar) with periodic backstop"
+      );
       console.log("  npx modelstat@latest discover       \u2014 one-shot report of installs/identities");
       console.log();
-      console.log("Internal (called by launchd/systemd, not by humans): _daemon, start, self-register, await-claim");
+      console.log(
+        "Internal (called by launchd/systemd, not by humans): _daemon, start, self-register, await-claim"
+      );
       process.exit(1);
   }
 }