modelstat 0.0.18 → 0.0.20

package/dist/cli.mjs

@@ -32291,6 +32291,70 @@ var init_config = __esm({
   }
 });
 
+// ../../packages/companion-core/src/logger.ts
+function defaultLevel() {
+  const env2 = globalThis.process?.env ?? {};
+  const raw = (env2.LOG_LEVEL ?? "").toLowerCase();
+  if (raw === "debug" || raw === "info" || raw === "warn" || raw === "error") return raw;
+  return env2.NODE_ENV === "production" ? "info" : "debug";
+}
+function consoleLogger(opts = {}) {
+  const scope = opts.scope ?? "main";
+  const level = opts.level ?? defaultLevel();
+  const threshold = LEVEL_RANK[level];
+  const emit = (lvl, msg, fields) => {
+    if (LEVEL_RANK[lvl] < threshold) return;
+    const prefix = `[modelstat:${scope}]`;
+    const args = fields !== void 0 ? [prefix, msg, fields] : [prefix, msg];
+    const fn = lvl === "warn" ? "warn" : lvl === "error" ? "error" : "log";
+    console[fn](...args);
+  };
+  return {
+    debug: (msg, fields) => emit("debug", msg, fields),
+    info: (msg, fields) => emit("info", msg, fields),
+    warn: (msg, fields) => emit("warn", msg, fields),
+    error: (msg, fields) => emit("error", msg, fields),
+    child: (childScope) => consoleLogger({ scope: `${scope}:${childScope}`, level })
+  };
+}
+function createLogger(scope, opts = {}) {
+  return consoleLogger({ scope, ...opts });
+}
+function describeErrorWithCause(err, depth = 4) {
+  if (!err) return "unknown";
+  if (!(err instanceof Error)) return String(err);
+  const parts = [err.message || err.name];
+  let cur = err.cause;
+  let left = depth;
+  while (cur && left-- > 0) {
+    if (cur instanceof AggregateError && Array.isArray(cur.errors) && cur.errors[0]) {
+      cur = cur.errors[0];
+      continue;
+    }
+    if (cur instanceof Error) {
+      const code = cur.code;
+      parts.push(`${code ? `code=${code} ` : ""}msg=${cur.message || cur.name}`);
+      cur = cur.cause;
+      continue;
+    }
+    parts.push(String(cur));
+    break;
+  }
+  return parts.join(" \u2192 ");
+}
+var LEVEL_RANK;
+var init_logger = __esm({
+  "../../packages/companion-core/src/logger.ts"() {
+    "use strict";
+    LEVEL_RANK = {
+      debug: 10,
+      info: 20,
+      warn: 30,
+      error: 40
+    };
+  }
+});
+
 // ../../packages/companion-core/src/http/index.ts
 function classifyStatus(status2, attempt) {
   if (status2 >= 200 && status2 < 300) return { type: "commit" };
@@ -32311,6 +32375,7 @@ var init_http = __esm({
   "../../packages/companion-core/src/http/index.ts"() {
     "use strict";
     init_config();
+    init_logger();
     IngestClient = class {
       constructor(opts) {
         this.opts = opts;
@@ -32322,6 +32387,7 @@ var init_http = __esm({
       maxAttempts;
       async upload(batch) {
         const url = `${this.opts.apiUrl.replace(/\/+$/, "")}/v1/ingest`;
+        let lastFetchError = null;
         for (let attempt = 0; attempt < this.maxAttempts; attempt++) {
           const token = await this.opts.auth.getToken();
           if (!token) {
@@ -32340,7 +32406,13 @@ var init_http = __esm({
               body: JSON.stringify(batch)
             });
           } catch (err) {
-            this.opts.logger.warn("ingest fetch failed", { err: String(err), attempt });
+            const detail = describeErrorWithCause(err);
+            lastFetchError = detail;
+            this.opts.logger.warn("ingest fetch failed", {
+              err: detail,
+              url,
+              attempt
+            });
             await sleep(expBackoff(attempt));
             continue;
           }
@@ -32370,54 +32442,13 @@ var init_http = __esm({
           });
           await sleep(decision.delayMs);
         }
-        return { kind: "drop", reason: "max_attempts_exceeded" };
+        const reason = lastFetchError ? `network: ${lastFetchError}` : "max_attempts_exceeded";
+        return { kind: "drop", reason };
       }
     };
   }
 });
 
-// ../../packages/companion-core/src/logger.ts
-function defaultLevel() {
-  const env2 = globalThis.process?.env ?? {};
-  const raw = (env2.LOG_LEVEL ?? "").toLowerCase();
-  if (raw === "debug" || raw === "info" || raw === "warn" || raw === "error") return raw;
-  return env2.NODE_ENV === "production" ? "info" : "debug";
-}
-function consoleLogger(opts = {}) {
-  const scope = opts.scope ?? "main";
-  const level = opts.level ?? defaultLevel();
-  const threshold = LEVEL_RANK[level];
-  const emit = (lvl, msg, fields) => {
-    if (LEVEL_RANK[lvl] < threshold) return;
-    const prefix = `[modelstat:${scope}]`;
-    const args = fields !== void 0 ? [prefix, msg, fields] : [prefix, msg];
-    const fn = lvl === "warn" ? "warn" : lvl === "error" ? "error" : "log";
-    console[fn](...args);
-  };
-  return {
-    debug: (msg, fields) => emit("debug", msg, fields),
-    info: (msg, fields) => emit("info", msg, fields),
-    warn: (msg, fields) => emit("warn", msg, fields),
-    error: (msg, fields) => emit("error", msg, fields),
-    child: (childScope) => consoleLogger({ scope: `${scope}:${childScope}`, level })
-  };
-}
-function createLogger(scope, opts = {}) {
-  return consoleLogger({ scope, ...opts });
-}
-var LEVEL_RANK;
-var init_logger = __esm({
-  "../../packages/companion-core/src/logger.ts"() {
-    "use strict";
-    LEVEL_RANK = {
-      debug: 10,
-      info: 20,
-      warn: 30,
-      error: 40
-    };
-  }
-});
-
 // ../../node_modules/.pnpm/dotenv@16.6.1/node_modules/dotenv/package.json
 var require_package = __commonJS({
   "../../node_modules/.pnpm/dotenv@16.6.1/node_modules/dotenv/package.json"(exports, module) {
@@ -44018,7 +44049,15 @@ async function buildForOneSession(sessionId, events, adapters2) {
   const turnSurfaces = sorted.map((e) => turnSurface(e));
   const turnEmbeddings = [];
   for (const s of turnSurfaces) {
-    turnEmbeddings.push(s.length > 0 ? await adapters2.embed(s) : []);
+    if (s.length === 0) {
+      turnEmbeddings.push([]);
+      continue;
+    }
+    try {
+      turnEmbeddings.push(await adapters2.embed(s));
+    } catch {
+      turnEmbeddings.push([]);
+    }
   }
   const boundaries = [];
   let runStart = 0;
@@ -44289,27 +44328,62 @@ var init_node2 = __esm({
 });
 
 // src/pipeline.ts
-function getAdapters() {
-  if (!adapters) {
-    const cfg = defaultOllamaConfig();
+async function probeOllama(baseUrl) {
+  try {
+    const ctrl = new AbortController();
+    const t = setTimeout(() => ctrl.abort(), 500);
+    const res = await fetch(`${baseUrl.replace(/\/+$/, "")}/api/tags`, {
+      method: "GET",
+      signal: ctrl.signal
+    });
+    clearTimeout(t);
+    return res.ok;
+  } catch {
+    return false;
+  }
+}
+function fallbackAdapters() {
+  return {
+    embed: async () => [],
+    // Throw → companion-core/summariseSlice's try/catch falls back to
+    // the `promptFacts` string which is what we want here.
+    summarize: async () => {
+      throw new Error("ollama_unavailable");
+    },
+    tokenize: (text) => Math.max(1, Math.ceil(text.length / 4))
+  };
+}
+async function getAdapters() {
+  if (adapters && probed) return adapters;
+  const cfg = defaultOllamaConfig();
+  const up = await probeOllama(cfg.baseUrl);
+  probed = true;
+  if (up) {
+    console.log(`[modelstat] ollama up at ${cfg.baseUrl} \u2014 using LLM pipeline`);
     adapters = {
       embed: ollamaEmbed(cfg),
       summarize: ollamaSummarize(cfg),
       tokenize: ollamaTokenize()
     };
+  } else {
+    console.log(
+      `[modelstat] ollama not reachable at ${cfg.baseUrl} \u2014 using fallback pipeline (server does classification)`
+    );
+    adapters = fallbackAdapters();
   }
   return adapters;
 }
 async function buildSegments(events) {
-  return buildSegmentsForSession(events, getAdapters());
+  return buildSegmentsForSession(events, await getAdapters());
 }
-var adapters;
+var adapters, probed;
 var init_pipeline2 = __esm({
   "src/pipeline.ts"() {
     "use strict";
     init_pipeline();
     init_node2();
     adapters = null;
+    probed = false;
   }
 });
 
@@ -44375,6 +44449,7 @@ async function scanAll(cb = {}) {
   let batchesUploaded = 0;
   let eventsUploaded = 0;
   let buffer = [];
+  let pendingCursors = [];
   async function flushBatch() {
     if (!buffer.length) return;
     cb.onUpload?.(buffer.length);
@@ -44389,6 +44464,8 @@ async function scanAll(cb = {}) {
     const res = await uploadBatch(batch);
     batchesUploaded += 1;
     eventsUploaded += res.accepted;
+    for (const pc of pendingCursors) state.setCursor(pc.path, pc.cs);
+    pendingCursors = [];
     buffer = [];
   }
   for (let i = 0; i < jobs.length; i++) {
@@ -44409,7 +44486,7 @@ async function scanAll(cb = {}) {
           if (buffer.length >= BATCH_MAX_EVENTS) await flushBatch();
         }
       }
-      if (cs) state.setCursor(job.path, cs);
+      if (cs) pendingCursors.push({ path: job.path, cs });
     } catch (e) {
       console.warn(`  ! parse failed for ${job.path}:`, e.message);
     }
@@ -44426,7 +44503,7 @@ var init_scan = __esm({
     init_pipeline2();
     init_config2();
     init_api();
-    AGENT_VERSION = "agent-dev-0.0.1";
+    AGENT_VERSION = "agent-dev-0.0.20";
     BATCH_MAX_EVENTS = 2e3;
   }
 });
@@ -46219,7 +46296,7 @@ async function runDiscovery() {
     status.stats["installations_detected"] = d.installations.length;
     status.stats["identities_detected"] = d.identities.length;
   } catch (e) {
-    setPhase("error", `discovery failed: ${e.message}`);
+    setPhase("error", `discovery failed: ${describeErrorWithCause(e)}`);
   }
 }
 async function runScanCycle(reason) {
@@ -46243,7 +46320,7 @@ async function runScanCycle(reason) {
     setPhase("watching", "Waiting for new events");
     setProgress(0, 0);
   } catch (e) {
-    setPhase("offline", `Upload failed: ${e.message}`);
+    setPhase("offline", `Upload failed: ${describeErrorWithCause(e)}`);
   }
 }
 function basename3(p) {
@@ -46315,11 +46392,12 @@ var init_daemon = __esm({
   "src/daemon.ts"() {
     "use strict";
     import_undici2 = __toESM(require_undici(), 1);
+    init_logger();
     init_src2();
     init_api();
     init_config2();
     init_scan();
-    AGENT_VERSION2 = "agent-dev-0.0.1";
+    AGENT_VERSION2 = "agent-dev-0.0.20";
     HEARTBEAT_INTERVAL_MS = 1e4;
     SCAN_INTERVAL_MS = 5 * 60 * 1e3;
     status = {