fleetlens 1.0.2 → 1.0.4

package/dist/daemon-worker.js

@@ -2780,6 +2780,36 @@ function emptyUsage() {
 function previewOf(text) {
   return text.replace(/\s+/g, " ").trim().slice(0, 200);
 }
+function stripCodexMemCitation(text) {
+  const cut = text.search(/<oai-mem-citation\b/i);
+  return (cut >= 0 ? text.slice(0, cut) : text).trim();
+}
+function normalizeCodexAgentBody(text) {
+  return stripCodexMemCitation(text);
+}
+function agentEventText(ev) {
+  for (const b of ev.blocks) {
+    if (b?.type === "text" && typeof b.text === "string")
+      return b.text;
+  }
+  return ev.preview ?? "";
+}
+function lastAgentEventIndex(events) {
+  for (let i = events.length - 1; i >= 0; i--) {
+    if (events[i].role === "agent")
+      return i;
+  }
+  return -1;
+}
+function sameCodexAgentBody(a, b) {
+  const na = normalizeCodexAgentBody(a);
+  const nb = normalizeCodexAgentBody(b);
+  if (!na && !nb)
+    return true;
+  if (!na || !nb)
+    return false;
+  return na === nb;
+}
 function parseRollout(file, lines) {
   const events = [];
   let firstTimestamp;
@@ -2871,6 +2901,27 @@ function parseRollout(file, lines) {
     if (type === "event_msg" && subtype === "agent_message") {
       const text = typeof payload.message === "string" ? payload.message : "";
       const preview = previewOf(text);
+      const lastIdx = lastAgentEventIndex(events);
+      if (lastIdx >= 0) {
+        const prev = events[lastIdx];
+        if (prev.rawType === "response_item/message" && sameCodexAgentBody(agentEventText(prev), text)) {
+          events[lastIdx] = {
+            ...prev,
+            timestamp: ts ?? prev.timestamp,
+            rawType: "event_msg/agent_message",
+            preview,
+            blocks: text ? [{ type: "text", text }] : [],
+            model,
+            raw: obj
+          };
+          if (text)
+            lastAgentPreview = preview;
+          continue;
+        }
+        if (prev.rawType === "event_msg/agent_message" && sameCodexAgentBody(agentEventText(prev), text)) {
+          continue;
+        }
+      }
       if (text)
         lastAgentPreview = preview;
       events.push({
@@ -2903,6 +2954,10 @@ function parseRollout(file, lines) {
     if (type === "response_item" && subtype === "message" && payload.role === "assistant") {
       const items = payload.content ?? [];
       const text = items.map((c) => typeof c.text === "string" ? c.text : "").join("\n").trim();
+      const lastIdx = lastAgentEventIndex(events);
+      if (lastIdx >= 0 && sameCodexAgentBody(agentEventText(events[lastIdx]), text)) {
+        continue;
+      }
       const preview = previewOf(text);
       if (text)
         lastAgentPreview = preview;
@@ -6863,9 +6918,9 @@ var init_file_probe = __esm({
 // src/pid.ts
 import { readFileSync as readFileSync21, writeFileSync as writeFileSync15, mkdirSync as mkdirSync14, unlinkSync as unlinkSync5 } from "node:fs";
 import { execFileSync as execFileSync3 } from "node:child_process";
-import { dirname as dirname12 } from "node:path";
+import { dirname as dirname13 } from "node:path";
 function writePid(filePath, pid, port, version) {
-  mkdirSync14(dirname12(filePath), { recursive: true });
+  mkdirSync14(dirname13(filePath), { recursive: true });
   let content = String(pid);
   if (port != null) {
     content += `:${port}`;
@@ -6929,13 +6984,13 @@ var init_pid = __esm({
 
 // src/server.ts
 import { spawn as spawn3 } from "node:child_process";
-import { join as join13, dirname as dirname13 } from "node:path";
+import { join as join14, dirname as dirname14 } from "node:path";
 import { fileURLToPath } from "node:url";
-import { existsSync as existsSync19, realpathSync as realpathSync3, readFileSync as readFileSync22 } from "node:fs";
-import { homedir as homedir6 } from "node:os";
+import { existsSync as existsSync20, realpathSync as realpathSync3, readFileSync as readFileSync22 } from "node:fs";
+import { homedir as homedir7 } from "node:os";
 function appDir() {
-  const here = dirname13(fileURLToPath(import.meta.url));
-  return join13(here, "..", "app", "apps", "web");
+  const here = dirname14(fileURLToPath(import.meta.url));
+  return join14(here, "..", "app", "apps", "web");
 }
 function cliBinRealPath() {
   const argv1 = process.argv[1] ?? "";
@@ -6947,11 +7002,11 @@ function cliBinRealPath() {
 }
 function onDiskVersion() {
   try {
-    const here = dirname13(fileURLToPath(import.meta.url));
-    const pkg = JSON.parse(readFileSync22(join13(here, "..", "package.json"), "utf8"));
-    return pkg.version ?? "1.0.2";
+    const here = dirname14(fileURLToPath(import.meta.url));
+    const pkg = JSON.parse(readFileSync22(join14(here, "..", "package.json"), "utf8"));
+    return pkg.version ?? "1.0.4";
   } catch {
-    return "1.0.2";
+    return "1.0.4";
   }
 }
 function getServerStatus() {
@@ -6964,15 +7019,15 @@ function getServerStatus() {
 }
 async function startServer(opts = {}) {
   const port = opts.port ?? (parseInt(process.env.CCLENS_PORT ?? "", 10) || DEFAULT_PORT);
-  const serverJs = join13(appDir(), "server.js");
-  if (!existsSync19(serverJs)) {
+  const serverJs = join14(appDir(), "server.js");
+  if (!existsSync20(serverJs)) {
     throw new Error(`Server not found at ${serverJs}. Reinstall with: npm install -g fleetlens`);
   }
   const portInUse = await checkPort(port);
   if (portInUse) {
     throw new Error(`Port ${port} is in use. Use --port to specify a different port.`);
   }
-  const dataDir = join13(homedir6(), ".claude", "projects");
+  const dataDir = join14(homedir7(), ".claude", "projects");
   const child = spawn3(process.execPath, [serverJs], {
     detached: true,
     stdio: "ignore",
@@ -7055,8 +7110,8 @@ var init_server = __esm({
 
 // src/daemon-worker.ts
 import { spawn as spawn4 } from "node:child_process";
-import { closeSync, existsSync as existsSync20, mkdirSync as mkdirSync15, openSync, readFileSync as readFileSync23, writeFileSync as writeFileSync16 } from "node:fs";
-import { dirname as dirname14, join as join14 } from "node:path";
+import { closeSync, existsSync as existsSync21, mkdirSync as mkdirSync15, openSync, readFileSync as readFileSync23, writeFileSync as writeFileSync16 } from "node:fs";
+import { dirname as dirname15, join as join15 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/usage/token.ts
@@ -9304,7 +9359,7 @@ function buildIngestPayload(inputs) {
   return {
     ingestId: randomUUID(),
     observedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    cliVersion: "1.0.2",
+    cliVersion: "1.0.4",
     ...richRollup || inputs.enrichedExtras || inputs.artifactSignals ? { schemaVersion: RICH_ROLLUP_SCHEMA_VERSION } : {},
     ...inputs.rollup ? { dailyRollup: inputs.rollup } : {},
     ...richRollup ? { richRollup } : {},
@@ -14577,14 +14632,56 @@ var ENRICHMENT_SYSTEM_PROMPT = SYSTEM_PROMPT;
 // ../entries/dist/llm-runner.js
 init_fs();
 import { spawn as spawn2 } from "node:child_process";
-import { mkdirSync as mkdirSync11, appendFileSync as appendFileSync5, writeFileSync as writeFileSync12, existsSync as existsSync15 } from "node:fs";
-import { join as join12 } from "node:path";
+import { mkdirSync as mkdirSync11, appendFileSync as appendFileSync5, writeFileSync as writeFileSync12, existsSync as existsSync16 } from "node:fs";
+import { join as join13 } from "node:path";
 import { randomUUID as randomUUID4 } from "node:crypto";
 
-// ../entries/dist/tmux-runner.js
-import { mkdirSync as mkdirSync10, writeFileSync as writeFileSync11, existsSync as existsSync14, readdirSync as readdirSync5, realpathSync as realpathSync2, readFileSync as readFileSync17, unlinkSync as unlinkSync3, renameSync as renameSync5 } from "node:fs";
-import { join as join11 } from "node:path";
+// ../entries/dist/claude-bin.js
+import { existsSync as existsSync14 } from "node:fs";
+import { join as join11, dirname as dirname11, delimiter } from "node:path";
 import { homedir as homedir5 } from "node:os";
+function resolveClaudeBin(opts = {}) {
+  const env = opts.env ?? process.env;
+  const home = opts.home ?? homedir5();
+  const execPath = opts.execPath ?? process.execPath;
+  const exists = opts.exists ?? existsSync14;
+  for (const dir of (env.PATH ?? "").split(delimiter)) {
+    if (!dir)
+      continue;
+    const onPath = join11(dir, "claude");
+    if (exists(onPath))
+      return onPath;
+  }
+  return [
+    join11(home, ".local", "bin", "claude"),
+    // native installer
+    join11(home, ".claude", "local", "claude"),
+    // legacy local install
+    join11(dirname11(execPath), "claude"),
+    // npm -g, beside the node running us
+    "/opt/homebrew/bin/claude",
+    "/usr/local/bin/claude"
+  ].find(exists);
+}
+function claudeSpawnEnv(bin, env = process.env, execPath = process.execPath) {
+  const parts = (env.PATH ?? "").split(delimiter).filter(Boolean);
+  for (const dir of [dirname11(execPath), dirname11(bin)]) {
+    if (!parts.includes(dir))
+      parts.unshift(dir);
+  }
+  return { ...env, PATH: parts.join(delimiter) };
+}
+var ClaudeBinNotFoundError = class extends Error {
+  constructor() {
+    super("claude CLI not found. Looked on PATH and in ~/.local/bin, ~/.claude/local, the npm global bin, homebrew, and /usr/local/bin. Install it, or if Fleetlens was started at login, restart it from a terminal: fleetlens stop && fleetlens start");
+    this.name = "ClaudeBinNotFoundError";
+  }
+};
+
+// ../entries/dist/tmux-runner.js
+import { mkdirSync as mkdirSync10, writeFileSync as writeFileSync11, existsSync as existsSync15, readdirSync as readdirSync5, realpathSync as realpathSync2, readFileSync as readFileSync17, unlinkSync as unlinkSync3, renameSync as renameSync5 } from "node:fs";
+import { join as join12 } from "node:path";
+import { homedir as homedir6 } from "node:os";
 import { spawnSync } from "node:child_process";
 var TmuxUnavailableError = class extends Error {
   constructor(message) {
@@ -14607,18 +14704,18 @@ function which(bin) {
 function tmuxRunnerAvailable() {
   if (!which("tmux"))
     return { ok: false, reason: "tmux not on PATH" };
-  if (!which("claude"))
-    return { ok: false, reason: "claude not on PATH" };
+  if (!resolveClaudeBin())
+    return { ok: false, reason: "claude CLI not found" };
   return { ok: true };
 }
 function runtimeCwd() {
-  const dir = join11(homedir5(), ".cclens", "runtime");
-  if (!existsSync14(dir))
+  const dir = join12(homedir6(), ".cclens", "runtime");
+  if (!existsSync15(dir))
     mkdirSync10(dir, { recursive: true });
   return realpathSync2(dir);
 }
 function ensureRuntimeCwdTrusted(cwd) {
-  const cfgPath = join11(homedir5(), ".claude.json");
+  const cfgPath = join12(homedir6(), ".claude.json");
   let cfg;
   try {
     cfg = JSON.parse(readFileSync17(cfgPath, "utf8"));
@@ -14655,18 +14752,18 @@ async function runClaudeUnderTmuxImpl(args) {
   const tmuxBin = args.tmuxBin ?? which("tmux");
   if (!tmuxBin)
     throw new TmuxUnavailableError("tmux not on PATH");
-  const claudeBin = args.claudeBin ?? which("claude");
+  const claudeBin = args.claudeBin ?? resolveClaudeBin();
   if (!claudeBin)
-    throw new TmuxUnavailableError("claude not on PATH");
+    throw new TmuxUnavailableError("claude CLI not found");
   if (args.signal?.aborted)
     throw new TmuxRunError("aborted before spawn");
   const cwd = runtimeCwd();
   ensureRuntimeCwdTrusted(cwd);
   const runId = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
   const sessionName = `cclens-${runId}`;
-  const systemFile = join11(cwd, `system-${runId}.txt`);
-  const userFile = join11(cwd, `user-${runId}.txt`);
-  const wrapper = join11(cwd, `run-${runId}.sh`);
+  const systemFile = join12(cwd, `system-${runId}.txt`);
+  const userFile = join12(cwd, `user-${runId}.txt`);
+  const wrapper = join12(cwd, `run-${runId}.sh`);
   writeFileSync11(systemFile, args.systemPrompt);
   writeFileSync11(userFile, args.reminder ? `${args.userPrompt}
 
@@ -14745,7 +14842,7 @@ function num(v) {
 function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
-var PROJECTS_ROOT = () => join11(homedir5(), ".claude", "projects");
+var PROJECTS_ROOT = () => join12(homedir6(), ".claude", "projects");
 function snapshotAllTranscripts() {
   const out = /* @__PURE__ */ new Set();
   const root = PROJECTS_ROOT();
@@ -14756,7 +14853,7 @@ function snapshotAllTranscripts() {
     return out;
   }
   for (const sub of subs) {
-    const dir = join11(root, sub);
+    const dir = join12(root, sub);
     let files;
     try {
       files = readdirSync5(dir);
@@ -14765,7 +14862,7 @@ function snapshotAllTranscripts() {
     }
     for (const f of files) {
       if (f.endsWith(".jsonl"))
-        out.add(join11(dir, f));
+        out.add(join12(dir, f));
     }
   }
   return out;
@@ -14806,7 +14903,7 @@ async function discoverTranscript(targetCwd, existingBefore, startMs, timeoutMs,
       subs = [];
     }
     for (const sub of subs) {
-      const dir = join11(root, sub);
+      const dir = join12(root, sub);
       let files;
       try {
         files = readdirSync5(dir);
@@ -14816,7 +14913,7 @@ async function discoverTranscript(targetCwd, existingBefore, startMs, timeoutMs,
       for (const f of files) {
         if (!f.endsWith(".jsonl"))
           continue;
-        const full = join11(dir, f);
+        const full = join12(dir, f);
         if (existingBefore.has(full))
           continue;
         if (readJsonlCwd(full) === targetCwd)
@@ -14890,7 +14987,7 @@ function cleanup(cwd, runId, tmuxBin, sessionName, transcriptPath) {
     }
     for (const f of [`system-${runId}.txt`, `user-${runId}.txt`, `run-${runId}.sh`]) {
       try {
-        unlinkSync3(join11(cwd, f));
+        unlinkSync3(join12(cwd, f));
       } catch {
       }
     }
@@ -14905,7 +15002,7 @@ function shellEscape(s) {
 // ../entries/dist/llm-runner.js
 var RUNS_DIR = cclensPath("llm-runs");
 function ensureRunsDir() {
-  if (!existsSync15(RUNS_DIR)) {
+  if (!existsSync16(RUNS_DIR)) {
     try {
       mkdirSync11(RUNS_DIR, { recursive: true });
     } catch {
@@ -14934,7 +15031,7 @@ function newRunId(kind) {
   return `${ts}_${kind}_${short}`;
 }
 function tracePath(runId) {
-  return join12(RUNS_DIR, `${runId}.jsonl`);
+  return join13(RUNS_DIR, `${runId}.jsonl`);
 }
 function safeAppend(path11, line) {
   try {
@@ -15077,7 +15174,14 @@ function runClaudePrintMode(args) {
       "--append-system-prompt",
       args.systemPrompt
     ];
-    const proc = spawn2("claude", claudeArgs, { stdio: ["pipe", "pipe", "pipe"], env: { ...process.env } });
+    const claudeBin = resolveClaudeBin();
+    if (!claudeBin) {
+      const err = new ClaudeBinNotFoundError();
+      safeAppend(trace, JSON.stringify({ _meta: { type: "spawn_error", run_id: runId, ts: (/* @__PURE__ */ new Date()).toISOString(), error: err.message } }) + "\n");
+      reject(err);
+      return;
+    }
+    const proc = spawn2(claudeBin, claudeArgs, { stdio: ["pipe", "pipe", "pipe"], env: claudeSpawnEnv(claudeBin) });
     safeAppend(trace, JSON.stringify({ _meta: { type: "spawned", run_id: runId, pid: proc.pid } }) + "\n");
     const stdinPayload = args.reminder ? `${args.userPrompt}
 
@@ -15333,8 +15437,8 @@ function applyEnrichmentError(entry, errorMessage, model, costUsd, generatedAt,
 
 // ../entries/dist/budget.js
 init_fs();
-import { appendFileSync as appendFileSync6, readFileSync as readFileSync18, existsSync as existsSync16, mkdirSync as mkdirSync12 } from "node:fs";
-import { dirname as dirname11 } from "node:path";
+import { appendFileSync as appendFileSync6, readFileSync as readFileSync18, existsSync as existsSync17, mkdirSync as mkdirSync12 } from "node:fs";
+import { dirname as dirname12 } from "node:path";
 var spendPathCached = null;
 function spendPath() {
   if (spendPathCached)
@@ -15344,12 +15448,12 @@ function spendPath() {
 }
 function appendSpend(record) {
   const p = spendPath();
-  mkdirSync12(dirname11(p), { recursive: true });
+  mkdirSync12(dirname12(p), { recursive: true });
   appendFileSync6(p, JSON.stringify(record) + "\n", { encoding: "utf8" });
 }
 function monthToDateSpend(now = /* @__PURE__ */ new Date()) {
   const p = spendPath();
-  if (!existsSync16(p))
+  if (!existsSync17(p))
     return 0;
   const year = now.getUTCFullYear();
   const month = now.getUTCMonth();
@@ -15376,7 +15480,7 @@ function monthToDateSpend(now = /* @__PURE__ */ new Date()) {
 
 // ../entries/dist/pipeline-lock.js
 init_fs();
-import { writeFileSync as writeFileSync13, unlinkSync as unlinkSync4, existsSync as existsSync17, readFileSync as readFileSync19, statSync as statSync7 } from "node:fs";
+import { writeFileSync as writeFileSync13, unlinkSync as unlinkSync4, existsSync as existsSync18, readFileSync as readFileSync19, statSync as statSync7 } from "node:fs";
 var STALE_MS2 = 60 * 1e3;
 var HEARTBEAT_MS = 30 * 1e3;
 var lockPathCached = null;
@@ -15422,7 +15526,7 @@ function pidAlive(pid) {
 }
 function interactiveLockFresh(nowMs) {
   const p = lockPath();
-  if (!existsSync17(p))
+  if (!existsSync18(p))
     return false;
   try {
     const mtime = statSync7(p).mtimeMs;
@@ -15443,7 +15547,7 @@ function interactiveLockFresh(nowMs) {
 var THIRTY_MIN_MS = 30 * 60 * 1e3;
 
 // ../entries/dist/settings.js
-import { readFileSync as readFileSync20, writeFileSync as writeFileSync14, renameSync as renameSync6, chmodSync as chmodSync2, mkdirSync as mkdirSync13, existsSync as existsSync18 } from "node:fs";
+import { readFileSync as readFileSync20, writeFileSync as writeFileSync14, renameSync as renameSync6, chmodSync as chmodSync2, mkdirSync as mkdirSync13, existsSync as existsSync19 } from "node:fs";
 init_fs();
 var DEFAULT_SETTINGS = {
   ai_features: {
@@ -15475,7 +15579,7 @@ function fromDisk(d) {
 }
 function readSettings() {
   const p = settingsPath();
-  if (!existsSync18(p))
+  if (!existsSync19(p))
     return DEFAULT_SETTINGS;
   try {
     const raw = readFileSync20(p, "utf8");
@@ -18238,14 +18342,14 @@ async function getUpdateAvailability() {
   if (isDevMode()) return null;
   const latest = await fetchLatestVersion();
   if (latest === null) return {
-    current: "1.0.2",
+    current: "1.0.4",
     latest: null,
     updateAvailable: false
   };
   return {
-    current: "1.0.2",
+    current: "1.0.4",
     latest,
-    updateAvailable: shouldUpdate("1.0.2", latest)
+    updateAvailable: shouldUpdate("1.0.4", latest)
   };
 }
 
@@ -18297,7 +18401,7 @@ var WATCHDOG_INTERVAL_MS = 5 * 1e3;
 var AUTO_UPDATE_INTERVAL_MS = 6 * 60 * 60 * 1e3;
 var SERVER_HEALTH_INTERVAL_MS = 60 * 1e3;
 var SERVER_HEALTH_TIMEOUT_MS = 10 * 1e3;
-mkdirSync15(dirname14(USAGE_LOG3), { recursive: true });
+mkdirSync15(dirname15(USAGE_LOG3), { recursive: true });
 function log2(level, message) {
   appendDaemonLogLine(level, message);
 }
@@ -18357,7 +18461,7 @@ function nextUpdateCheckFromState(nowMs) {
 }
 var nextUpdateCheckAtMs = nextUpdateCheckFromState(Date.now());
 function cliEntryPath() {
-  return join14(dirname14(fileURLToPath2(import.meta.url)), "index.js");
+  return join15(dirname15(fileURLToPath2(import.meta.url)), "index.js");
 }
 async function runDaemonUpdateCheck() {
   if (process.env.FLEETLENS_DAEMON_AUTO_UPDATE === "0") {
@@ -18389,7 +18493,7 @@ async function runDaemonUpdateCheck() {
       return;
     }
     const entry = cliEntryPath();
-    if (!existsSync20(entry)) {
+    if (!existsSync21(entry)) {
       log2("warn", `update check found ${availability.latest}, but CLI entry is missing at ${entry}`);
       return;
     }