modelstat 0.0.49 → 0.0.50

package/dist/cli.mjs

@@ -78,11 +78,11 @@ var init_git = __esm({
 });
 
 // ../../packages/core/src/enums.ts
-var TOOLS, PROVIDERS, IDENTITY_OWNER_SCOPES, INSTALL_METHODS, OS_FAMILIES, EVENT_KINDS, TOOL_CALL_STATUSES, COMPANION_PHASES, CLASSIFICATION_CONFIDENCE;
+var AGENTS, PROVIDERS, IDENTITY_OWNER_SCOPES, INSTALL_METHODS, OS_FAMILIES, EVENT_KINDS, TOOL_CALL_STATUSES, COMPANION_PHASES, CLASSIFICATION_CONFIDENCE;
 var init_enums = __esm({
   "../../packages/core/src/enums.ts"() {
     "use strict";
-    TOOLS = [
+    AGENTS = [
       "claude_code",
       "claude_desktop",
       "codex_cli",
@@ -105,12 +105,13 @@ var init_enums = __esm({
       "crush",
       "kimi",
       "openclaw",
+      "hermes",
       "ollama",
       "raw_sdk_anthropic",
       "raw_sdk_openai",
       "raw_sdk_google",
       // Web chat UIs (Chrome-extension companion). Categorically distinct
-      // from *_cli / *_desktop tools — same provider, different surface.
+      // from *_cli / *_desktop agents — same provider, different surface.
       "chatgpt_web",
       "claude_web",
       "gemini_web",
@@ -4339,11 +4340,11 @@ var init_schemas = __esm({
       ts: external_exports.string().datetime({ offset: true }),
       kind: external_exports.enum(EVENT_KINDS),
       // Attribution
-      tool: external_exports.enum(TOOLS),
+      agent: external_exports.enum(AGENTS),
       provider: external_exports.enum(PROVIDERS),
       model: external_exports.string().max(120).nullable(),
       session_id: external_exports.string().max(120),
-      // tool-local session id (UUID in most cases)
+      // agent-local session id (UUID in most cases)
       turn_index: external_exports.number().int().nonnegative().nullable(),
       parent_event_id: external_exports.string().nullable(),
       // for subagent turns
@@ -4372,7 +4373,7 @@ var init_schemas = __esm({
       // Reference to originating file for reparsing
       source_file: external_exports.string().max(1024).nullable(),
       source_byte_offset: external_exports.number().int().nonnegative().nullable(),
-      // Billing mode. Tools with a flat-fee subscription tier (Claude
+      // Billing mode. Agents with a flat-fee subscription tier (Claude
       // Code, Cursor Pro, GitHub Copilot, etc) emit events tagged
       // `billing: "subscription"` — the server short-circuits cost to $0
       // for those, since token-level pricing doesn't apply once the user
@@ -4397,7 +4398,7 @@ var init_schemas = __esm({
       /** sha256-based deterministic id — see @modelstat/core/ids.ts segmentId(). */
       segment_id: external_exports.string().max(64),
       session_id: external_exports.string().max(120),
-      tool: external_exports.enum(TOOLS),
+      agent: external_exports.enum(AGENTS),
       started_at: external_exports.string().datetime({ offset: true }),
       ended_at: external_exports.string().datetime({ offset: true }),
       /** Pre-redacted abstract, ≤ 512 chars. Never contains PII. */
@@ -4421,15 +4422,15 @@ var init_schemas = __esm({
        * deterministic `tc_<djb2-base36>` of `${source_event_id}|${call_index}`
        * when the source line carries no id. */
       external_call_id: external_exports.string().max(120),
-      /** Tool-local session id — same id space as RawEvent.session_id. */
+      /** Agent-local session id — same id space as RawEvent.session_id. */
       session_id: external_exports.string().max(120),
       /** The RawEvent that contained the tool_use (dedupe/replay anchor). */
       source_event_id: external_exports.string(),
       /** Segment containing source_event_id — filled by the companion at
        * batch-build time when known, else null. */
       segment_id: external_exports.string().max(64).nullable().default(null),
-      /** The agent that made the call (TOOLS enum — "tool" in legacy naming). */
-      agent: external_exports.enum(TOOLS),
+      /** The agent that made the call (AGENTS enum). */
+      agent: external_exports.enum(AGENTS),
       /** `builtin` or `mcp:<server>`. */
       server: external_exports.string().max(120),
       /** Bare tool name (`Bash`, `create_pr`) — normalised vendor identifier. */
@@ -4463,7 +4464,7 @@ var init_schemas = __esm({
       batch_id: external_exports.string(),
       // ULID
       device_id: external_exports.string(),
-      agent_version: external_exports.string().max(40),
+      companion_version: external_exports.string().max(40),
       events: external_exports.array(RawEvent).max(1e4),
       segments: external_exports.array(Segment).max(2e3).default([]),
       /** Per-call tool invocations (additive — old agents omit it, old
@@ -4496,7 +4497,7 @@ var init_schemas = __esm({
       queue_size: external_exports.number().int().nonnegative().default(0),
       stats: external_exports.record(external_exports.string(), external_exports.unknown()).default({}),
       last_event_at: external_exports.string().datetime({ offset: true }).nullable(),
-      agent_version: external_exports.string().max(40)
+      companion_version: external_exports.string().max(40)
     });
     DeviceEnrollment = external_exports.object({
       machine_id: external_exports.string(),
@@ -4505,7 +4506,7 @@ var init_schemas = __esm({
       os_family: external_exports.enum(OS_FAMILIES),
       os_version: external_exports.string().max(60),
       arch: external_exports.enum(["x86_64", "arm64", "other"]),
-      agent_version: external_exports.string().max(40)
+      companion_version: external_exports.string().max(40)
     });
     DeviceSelfRegister = external_exports.object({
       /** Agent-generated UUIDv7 — must pass shape + recent-timestamp checks. */
@@ -4521,8 +4522,8 @@ var init_schemas = __esm({
         os_family: external_exports.enum(OS_FAMILIES).optional(),
         os_version: external_exports.string().max(60).optional(),
         arch: external_exports.enum(["x86_64", "arm64", "other"]).optional(),
-        agent: external_exports.string().max(80).optional(),
-        agent_version: external_exports.string().max(40).optional()
+        companion: external_exports.string().max(80).optional(),
+        companion_version: external_exports.string().max(40).optional()
         // Allow extra fields for forward-compat without breaking old agents.
       }).catchall(external_exports.union([external_exports.string(), external_exports.number(), external_exports.boolean()])).default({})
     });
@@ -4553,7 +4554,7 @@ var init_schemas = __esm({
       recommended_for: external_exports.string().max(160).optional()
     });
     DetectedInstallation = external_exports.object({
-      tool: external_exports.enum(TOOLS),
+      agent: external_exports.enum(AGENTS),
       install_method: external_exports.enum(INSTALL_METHODS),
       binary_path: external_exports.string().nullable(),
       data_dir: external_exports.string().nullable(),
@@ -5143,7 +5144,7 @@ async function parseClaudeCodeJsonl(ctx) {
         source_event_id: eventId,
         ts: a.timestamp,
         kind: "assistant_message",
-        tool: "claude_code",
+        agent: "claude_code",
         provider: "anthropic",
         model: a.message?.model ?? null,
         session_id: sessionId,
@@ -5206,7 +5207,7 @@ async function parseClaudeCodeJsonl(ctx) {
         source_event_id: eventId,
         ts: u.timestamp,
         kind: "user_message",
-        tool: "claude_code",
+        agent: "claude_code",
         provider: "anthropic",
         model: lastModel,
         session_id: sessionId,
@@ -5531,7 +5532,7 @@ async function parseCodexRollout(ctx) {
           source_event_id: sourceEventId(ctx.deviceId, ctx.sourceFile, offsetAtLineStart),
           ts,
           kind: "assistant_message",
-          tool: "codex_cli",
+          agent: "codex_cli",
           provider: "openai",
           model,
           session_id: sessionId,
@@ -5571,7 +5572,7 @@ async function parseCodexRollout(ctx) {
           source_event_id: sourceEventId(ctx.deviceId, ctx.sourceFile, offsetAtLineStart),
           ts,
           kind: "user_message",
-          tool: "codex_cli",
+          agent: "codex_cli",
           provider: "openai",
           model,
           session_id: sessionId,
@@ -7805,11 +7806,11 @@ async function discover(options = {}) {
       const v = process.env[env2];
       if (v) candidates.add(v);
     }
-    for (const extra of options.extraDataDirs?.[spec.tool] ?? []) candidates.add(expandPath(extra));
+    for (const extra of options.extraDataDirs?.[spec.agent] ?? []) candidates.add(expandPath(extra));
     for (const p of candidates) {
       if (existsSync3(p) && statSync(p).isDirectory()) {
         installations.push({
-          tool: spec.tool,
+          agent: spec.agent,
           install_method: "manual",
           binary_path: null,
           data_dir: p,
@@ -7828,7 +7829,7 @@ async function discover(options = {}) {
           if (existsSync3(p)) {
             const version = await safeVersionProbe(p);
             installations.push({
-              tool: spec.tool,
+              agent: spec.agent,
               install_method: classifyInstallMethod(p, os2),
               binary_path: p,
               data_dir: null,
@@ -7848,7 +7849,7 @@ async function discover(options = {}) {
           const hit = apps.find((a) => a.bundleId === bid);
           if (hit) {
             installations.push({
-              tool: spec.tool,
+              agent: spec.agent,
               install_method: "app_bundle",
               binary_path: hit.path,
               data_dir: null,
@@ -8076,7 +8077,7 @@ async function probeIdentities(os2) {
 function dedupeInstalls(list) {
   const seen = /* @__PURE__ */ new Map();
   for (const i of list) {
-    const k = `${i.tool}|${i.binary_path ?? ""}|${i.data_dir ?? ""}`;
+    const k = `${i.agent}|${i.binary_path ?? ""}|${i.data_dir ?? ""}`;
     const prev = seen.get(k);
     if (!prev) {
       seen.set(k, i);
@@ -8103,7 +8104,7 @@ var init_discovery = __esm({
     H = (p) => p.startsWith("~") ? p.replace("~", homedir()) : p;
     SOURCES = [
       {
-        tool: "claude_code",
+        agent: "claude_code",
         dataDirs: {
           macos: ["~/.claude"],
           linux: ["$XDG_CONFIG_HOME/claude", "~/.claude", "~/.config/claude"]
@@ -8115,7 +8116,7 @@ var init_discovery = __esm({
         ]
       },
       {
-        tool: "codex_cli",
+        agent: "codex_cli",
         dataDirs: {
           macos: ["~/.codex"],
           linux: ["$XDG_CONFIG_HOME/codex", "~/.codex"]
@@ -8125,7 +8126,7 @@ var init_discovery = __esm({
         fileSignatures: [{ filenameGlob: "sessions/**/rollout-*.jsonl" }]
       },
       {
-        tool: "claude_desktop",
+        agent: "claude_desktop",
         dataDirs: {
           macos: ["~/Library/Application Support/Claude"],
           linux: ["~/.config/Claude"]
@@ -8133,7 +8134,7 @@ var init_discovery = __esm({
         bundleIds: ["com.anthropic.claudeforbrowser", "com.anthropic.claudeelectron"]
       },
       {
-        tool: "cursor",
+        agent: "cursor",
         dataDirs: {
           macos: ["~/Library/Application Support/Cursor"],
           linux: ["~/.config/Cursor"]
@@ -8141,7 +8142,7 @@ var init_discovery = __esm({
         bundleIds: ["co.anysphere.cursor", "com.todesktop.230313mzl4w4u92"]
       },
       {
-        tool: "windsurf",
+        agent: "windsurf",
         dataDirs: {
           macos: ["~/Library/Application Support/Windsurf"],
           linux: ["~/.config/Windsurf"]
@@ -8149,7 +8150,7 @@ var init_discovery = __esm({
         bundleIds: ["com.codeium.windsurf"]
       },
       {
-        tool: "zed",
+        agent: "zed",
         dataDirs: {
           macos: ["~/Library/Application Support/Zed", "~/.config/zed"],
           linux: ["~/.config/zed"]
@@ -8158,7 +8159,7 @@ var init_discovery = __esm({
         bundleIds: ["dev.zed.Zed"]
       },
       {
-        tool: "gemini_cli",
+        agent: "gemini_cli",
         dataDirs: {
           macos: ["~/.gemini"],
           linux: ["~/.gemini"]
@@ -8166,18 +8167,18 @@ var init_discovery = __esm({
         binaries: ["gemini"]
       },
       {
-        tool: "aider",
+        agent: "aider",
         dataDirs: { macos: ["~/.aider"], linux: ["~/.aider"] },
         binaries: ["aider"]
       },
       {
-        tool: "ollama",
+        agent: "ollama",
         dataDirs: { macos: ["~/.ollama"], linux: ["~/.ollama"] },
         binaries: ["ollama"],
         bundleIds: ["com.electron.ollama"]
       },
       {
-        tool: "openclaw",
+        agent: "openclaw",
         dataDirs: { macos: ["~/.openclaw", "~/.claw"], linux: ["~/.openclaw", "~/.claw"] },
         binaries: ["openclaw", "claw", "clawdbot", "moltbot"]
       }
@@ -45209,7 +45210,7 @@ async function buildSessionTitles(segments, entitle) {
       const project = first.tags.find((t) => t.root_key === "projects")?.name;
       const facts = [
         project ? `repo ${project}` : null,
-        `${sorted.length} part${sorted.length === 1 ? "" : "s"} on ${first.tool}`
+        `${sorted.length} part${sorted.length === 1 ? "" : "s"} on ${first.agent}`
       ].filter(Boolean).join("; ");
       try {
         title = sanitiseTitle(await entitle({ abstracts: sampleAbstracts(abstracts), facts }));
@@ -45364,14 +45365,14 @@ async function summariseSlice(sessionId, slice, adapters2) {
   const promptFacts = [
     first.git?.remote_slug ? `repo ${first.git.remote_slug}` : null,
     first.git?.branch ? `branch ${first.git.branch}` : null,
-    `${slice.length} turns on ${first.tool}`,
+    `${slice.length} turns on ${first.agent}`,
     first.files_touched?.length ? `files touched: ${first.files_touched.slice(0, 5).join(", ")}` : null,
     Object.keys(first.tool_calls ?? {}).length ? `tool calls: ${Object.keys(first.tool_calls).slice(0, 5).join(", ")}` : null
   ].filter(Boolean).join("; ");
   const excerpts = sampleAndRedactExcerpts(slice);
   if (excerpts.length === 0) {
     throw new Error(
-      `parser produced 0 content excerpts for session ${sessionId} (${slice.length} turns) \u2014 the summariser would only see metadata and produce "${slice.length} turns on ${first.tool}". Check the parser for ${first.tool} (likely extractExcerpt stripped everything as code or the session is pure tool_use).`
+      `parser produced 0 content excerpts for session ${sessionId} (${slice.length} turns) \u2014 the summariser would only see metadata and produce "${slice.length} turns on ${first.agent}". Check the parser for ${first.agent} (likely extractExcerpt stripped everything as code or the session is pure tool_use).`
     );
   }
   const excerptBlock = excerpts.map((e, i) => `  [turn ${i + 1}] "${e.replace(/\s+/g, " ").trim()}"`).join("\n");
@@ -45414,7 +45415,7 @@ Write the SHORTEST keyword-dense paragraph (1-3 sentences, \u2264${ABSTRACT_OUTP
     }
   }
   const tags = [
-    { root_key: "tools", name: first.tool, confidence: 1 },
+    { root_key: "agents", name: first.agent, confidence: 1 },
     { root_key: "providers", name: first.provider, confidence: 1 }
   ];
   if (first.model) tags.push({ root_key: "models", name: first.model, confidence: 1 });
@@ -45465,7 +45466,7 @@ Write the SHORTEST keyword-dense paragraph (1-3 sentences, \u2264${ABSTRACT_OUTP
   return {
     segment_id: id,
     session_id: sessionId,
-    tool: first.tool,
+    agent: first.agent,
     started_at: first.ts,
     ended_at: last.ts,
     // Slice to the user-visible cap (ABSTRACT_OUTPUT_MAX_CHARS, default
@@ -45509,7 +45510,7 @@ function sampleAndRedactExcerpts(slice) {
   return out;
 }
 function turnSurface(e) {
-  const parts = [e.kind, e.tool];
+  const parts = [e.kind, e.agent];
   if (e.model) parts.push(e.model);
   const toolCalls = Object.keys(e.tool_calls ?? {});
   if (toolCalls.length) parts.push(`tools:${toolCalls.join(",")}`);
@@ -45594,7 +45595,7 @@ var init_file_queue_store = __esm({
         try {
           const raw = await fs3.readFile(this.filePath, "utf8");
           const parsed = JSON.parse(raw);
-          if (parsed.version === 1 && parsed.items) {
+          if (parsed.version === 2 && parsed.items) {
             const now = Date.now();
             for (const [k, v] of Object.entries(parsed.items)) {
               if (v.synced && now - v.last_event_ts_ms > SENT_TTL_MS) continue;
@@ -45606,7 +45607,7 @@ var init_file_queue_store = __esm({
             try {
               const bak = await fs3.readFile(`${this.filePath}.bak`, "utf8");
               const parsed = JSON.parse(bak);
-              if (parsed.version === 1 && parsed.items) {
+              if (parsed.version === 2 && parsed.items) {
                 for (const [k, v] of Object.entries(parsed.items)) {
                   this.items.set(k, v);
                 }
@@ -45625,7 +45626,7 @@ var init_file_queue_store = __esm({
         const run = async () => {
           await prior?.catch(() => void 0);
           const snap = {
-            version: 1,
+            version: 2,
             items: Object.fromEntries(this.items.entries())
           };
           const tmp = `${this.filePath}.tmp`;
@@ -46442,7 +46443,7 @@ async function scanAll(cb = {}) {
     const batch = {
       batch_id: batchId(),
       device_id: deviceId,
-      agent_version: AGENT_VERSION,
+      companion_version: AGENT_VERSION,
       events,
       segments,
       tool_calls: attachSegmentIdsByMap(toolCallBuffer, callSegmentByEvent),
@@ -46507,7 +46508,7 @@ var init_scan = __esm({
     init_api();
     init_config2();
     init_pipeline2();
-    AGENT_VERSION = true ? "agent-0.0.49" : "agent-dev";
+    AGENT_VERSION = true ? "agent-0.0.50" : "agent-dev";
     BATCH_MAX_EVENTS = 2e3;
     BATCH_MAX_TOOL_CALLS = 2e4;
     BATCH_BUFFER_HARD_CAP = BATCH_MAX_EVENTS * 2;
@@ -46554,7 +46555,7 @@ function readDaemonLock(lockFile = LOCK_FILE) {
     return {
       pid: obj.pid,
       startedAt: obj.startedAt ?? "unknown",
-      agentVersion: obj.agentVersion ?? "unknown",
+      companionVersion: obj.companionVersion ?? "unknown",
       apiUrl: obj.apiUrl ?? "unknown"
     };
   } catch {
@@ -46596,7 +46597,7 @@ function acquireDaemonLock(opts) {
   const meta = {
     pid: process.pid,
     startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    agentVersion: opts.agentVersion,
+    companionVersion: opts.companionVersion,
     apiUrl: opts.apiUrl
   };
   writeLockAtomic(meta);
@@ -48494,7 +48495,7 @@ function snapshotBody() {
     queue_size: status.queueSize,
     stats: status.stats,
     last_event_at: status.lastEventAt,
-    agent_version: AGENT_VERSION2,
+    companion_version: AGENT_VERSION2,
     machine_id: machineKey()
   };
 }
@@ -48645,7 +48646,7 @@ async function runDaemon(opts = {}) {
     throw new Error("not enrolled \u2014 run `npx modelstat@latest` first");
   }
   const lock = acquireDaemonLock({
-    agentVersion: AGENT_VERSION2,
+    companionVersion: AGENT_VERSION2,
     apiUrl: state.apiUrl,
     force: opts.force === true,
     // If a racing daemon out-renamed us for the lock (see lock.ts
@@ -48663,7 +48664,7 @@ async function runDaemon(opts = {}) {
     console.log(
       `modelstat daemon is already running \u2014 PID ${lock.owner.pid}, started ${formatAge(
         lock.ageSec
-      )} ago, agent ${lock.owner.agentVersion}.`
+      )} ago, agent ${lock.owner.companionVersion}.`
     );
     console.log("  \u2192 to stop it:          kill " + lock.owner.pid);
     console.log("  \u2192 to force-replace it: modelstat start --force");
@@ -48757,7 +48758,7 @@ var init_daemon = __esm({
     init_machine_key();
     init_scan();
     init_single_flight();
-    AGENT_VERSION2 = true ? "agent-0.0.49" : "agent-dev";
+    AGENT_VERSION2 = true ? "agent-0.0.50" : "agent-dev";
     HEARTBEAT_INTERVAL_MS = 1e4;
     SCAN_INTERVAL_MS = 5 * 60 * 1e3;
     DISCOVERY_INTERVAL_MS = 6e4;
@@ -49250,7 +49251,7 @@ 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) {
+  if (input.myCompanionVersion && input.lock.companionVersion !== "unknown" && input.lock.companionVersion !== input.myCompanionVersion) {
     return "replace";
   }
   if (input.statusAgeMs !== null && input.statusAgeMs <= fresh) return "adopt";
@@ -49278,7 +49279,7 @@ function daemonHealth(opts = {}) {
       ownerAlive,
       lockAgeMs,
       statusAgeMs,
-      myAgentVersion: opts.myAgentVersion
+      myCompanionVersion: opts.myCompanionVersion
     }),
     lock,
     ownerAlive,
@@ -49322,7 +49323,7 @@ function tryOpenBrowser(url) {
     return false;
   }
 }
-var AGENT_VERSION3 = true ? "agent-0.0.49" : "agent-dev";
+var AGENT_VERSION3 = true ? "agent-0.0.50" : "agent-dev";
 function osFamily() {
   const p = platform5();
   if (p === "darwin") return "macos";
@@ -49349,8 +49350,8 @@ async function cmdSelfRegister() {
     os_family: osFamily(),
     os_version: release(),
     arch: osArch(),
-    agent: "modelstat-agent-dev",
-    agent_version: AGENT_VERSION3,
+    companion: "modelstat-agent-dev",
+    companion_version: AGENT_VERSION3,
     // Stable, install-method-independent machine key. The server
     // dedupes self-register on this so the same physical machine can
     // never become two device rows, even if the UUID somehow differs
@@ -49766,9 +49767,9 @@ async function cmdStats(args) {
   }
   console.log(`device:   ${view.device.id}`);
   console.log(`host:     ${view.device.hostname ?? "(unknown)"} (${view.device.os_family ?? "?"})`);
-  console.log(`agent:    ${view.device.agent_version ?? "(unknown)"}`);
+  console.log(`companion: ${view.device.companion_version ?? "(unknown)"}`);
   console.log(
-    `status:   ${view.device.agent_status ?? "(unknown)"}${view.device.last_seen_at ? ` \xB7 last seen ${view.device.last_seen_at}` : ""}`
+    `status:   ${view.device.companion_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})` : ""}`
@@ -49896,7 +49897,7 @@ async function main() {
     }
     case "_daemon-health": {
       try {
-        console.log(JSON.stringify(daemonHealth({ myAgentVersion: AGENT_VERSION3 })));
+        console.log(JSON.stringify(daemonHealth({ myCompanionVersion: AGENT_VERSION3 })));
       } catch (e) {
         console.log(JSON.stringify({ decision: "spawn", error: e.message }));
       }