fleetlens 0.9.0 → 0.10.0

package/dist/daemon-worker.js

@@ -32,21 +32,37 @@ function findWorktreeMarker(projectName) {
   }
   return null;
 }
+function findConductorWorkspace(projectName) {
+  const m = CONDUCTOR_RE.exec(projectName);
+  if (!m)
+    return null;
+  const workspaceName = m[1];
+  const trailingSlash = m[0].endsWith("/") ? 1 : 0;
+  const canonicalEndIdx = m.index + m[0].length - workspaceName.length - 1 - trailingSlash;
+  return { canonicalEndIdx, workspaceName };
+}
 function canonicalProjectName(projectName) {
   const normalized = projectName.replace(/\/{2,}/g, "/");
-  const hit = findWorktreeMarker(normalized);
-  if (hit)
-    return normalized.slice(0, hit.idx);
+  const wt = findWorktreeMarker(normalized);
+  if (wt)
+    return normalized.slice(0, wt.idx);
+  const cd = findConductorWorkspace(normalized);
+  if (cd)
+    return normalized.slice(0, cd.canonicalEndIdx);
   return normalized;
 }
 function worktreeName(projectName) {
   const normalized = projectName.replace(/\/{2,}/g, "/");
-  const hit = findWorktreeMarker(normalized);
-  if (!hit)
-    return null;
-  const tail = normalized.slice(hit.idx + hit.marker.length);
-  const slash = tail.indexOf("/");
-  return slash >= 0 ? tail.slice(0, slash) : tail;
+  const wt = findWorktreeMarker(normalized);
+  if (wt) {
+    const tail = normalized.slice(wt.idx + wt.marker.length);
+    const slash = tail.indexOf("/");
+    return slash >= 0 ? tail.slice(0, slash) : tail;
+  }
+  const cd = findConductorWorkspace(normalized);
+  if (cd)
+    return cd.workspaceName;
+  return null;
 }
 function makeDay(date) {
   return {
@@ -515,7 +531,7 @@ function groupByProject(sessions) {
   }
   return Array.from(map.values()).sort((a, b) => (b.lastActiveMs ?? 0) - (a.lastActiveMs ?? 0));
 }
-var BLANK_USAGE, WORKTREE_MARKERS, PR_CREATE_RE, PR_NUMBER_RE, TITLE_FLAG_RE;
+var BLANK_USAGE, WORKTREE_MARKERS, CONDUCTOR_RE, PR_CREATE_RE, PR_NUMBER_RE, TITLE_FLAG_RE;
 var init_analytics = __esm({
   "../parser/dist/analytics.js"() {
     "use strict";
@@ -525,6 +541,7 @@ var init_analytics = __esm({
       "/.worktrees/",
       "/claude/worktrees/"
     ];
+    CONDUCTOR_RE = /\/conductor\/workspaces\/[^/]+\/([^/]+)(?:\/|$)/;
     PR_CREATE_RE = /gh\s+pr\s+create\b/i;
     PR_NUMBER_RE = /#(\d+)/;
     TITLE_FLAG_RE = /--title\s+["']([^"']+)["']/;
@@ -757,10 +774,64 @@ var init_calibration = __esm({
   }
 });
 
+// ../parser/dist/user-input.js
+function stripFrameworkBoilerplate(rawText) {
+  if (!rawText)
+    return rawText;
+  let out = rawText;
+  for (const re of STRIPPABLE_WRAPPERS) {
+    out = out.replace(re, "");
+  }
+  return out.trim();
+}
+function isFrameworkInjectedUserInput(rawText) {
+  if (!rawText)
+    return false;
+  const stripped = stripFrameworkBoilerplate(rawText);
+  if (!stripped)
+    return true;
+  for (const prefix of ENTIRELY_INJECTED_PREFIXES) {
+    if (stripped.startsWith(prefix))
+      return true;
+  }
+  return false;
+}
+var STRIPPABLE_WRAPPERS, ENTIRELY_INJECTED_PREFIXES;
+var init_user_input = __esm({
+  "../parser/dist/user-input.js"() {
+    "use strict";
+    STRIPPABLE_WRAPPERS = [
+      /<system_instruction\b[^>]*>[\s\S]*?<\/system_instruction>\s*/gi
+    ];
+    ENTIRELY_INJECTED_PREFIXES = [
+      "<command-name>",
+      "<local-command-stdout>",
+      "<local-command-caveat>",
+      "<task-notification>",
+      "Base directory for this skill:"
+    ];
+  }
+});
+
 // ../parser/dist/parser.js
 function cleanText(s) {
   return s.replace(/<[^>]+>/g, "").replace(/\s+/g, " ").trim();
 }
+function extractRawUserText(rawMsg) {
+  const c = rawMsg?.content;
+  if (typeof c === "string")
+    return c;
+  if (Array.isArray(c)) {
+    for (const block of c) {
+      if (block && typeof block === "object") {
+        const b = block;
+        if (b.type === "text" && typeof b.text === "string")
+          return b.text;
+      }
+    }
+  }
+  return "";
+}
 function truncate(s, n = 200) {
   const one = cleanText(s);
   return one.length > n ? one.slice(0, n - 1) + "\u2026" : one;
@@ -859,7 +930,8 @@ function toEvent(raw, index) {
     const msg = r.message ?? {};
     const c = msg.content;
     if (typeof c === "string") {
-      const tm = classifyTeammateMessage(c);
+      const cleaned = stripFrameworkBoilerplate(c);
+      const tm = classifyTeammateMessage(cleaned);
       return {
         index,
         uuid,
@@ -867,8 +939,8 @@ function toEvent(raw, index) {
         timestamp,
         role: "user",
         rawType,
-        preview: truncate(c, 200),
-        blocks: [{ type: "text", text: c }],
+        preview: truncate(cleaned, 200),
+        blocks: cleaned ? [{ type: "text", text: cleaned }] : [],
         raw,
         teammateMessage: tm
       };
@@ -892,7 +964,9 @@ function toEvent(raw, index) {
         };
       }
       const textBlock = c.find((b) => b?.type === "text");
-      const tm = textBlock ? classifyTeammateMessage(textBlock.text) : void 0;
+      const cleanedText = textBlock ? stripFrameworkBoilerplate(textBlock.text) : "";
+      const cleanedBlocks = textBlock ? c.map((b) => b === textBlock ? { type: "text", text: cleanedText } : b) : c;
+      const tm = cleanedText ? classifyTeammateMessage(cleanedText) : void 0;
       return {
         index,
         uuid,
@@ -900,8 +974,8 @@ function toEvent(raw, index) {
         timestamp,
         role: "user",
         rawType,
-        preview: textBlock ? truncate(textBlock.text, 200) : truncate(JSON.stringify(c), 200),
-        blocks: c,
+        preview: cleanedText ? truncate(cleanedText, 200) : truncate(JSON.stringify(c), 200),
+        blocks: cleanedBlocks,
         raw,
         teammateMessage: tm
       };
@@ -1121,8 +1195,8 @@ function parseTranscript(rawLines) {
     }
     if (e.role === "user") {
       const rawMsg = e.raw?.message;
-      const rawContent = typeof rawMsg?.content === "string" ? rawMsg.content : "";
-      const isHidden = rawContent.startsWith("<command-name>") || rawContent.startsWith("<local-command-caveat>") || rawContent.startsWith("Base directory for this skill:") || rawContent.startsWith("<task-notification>");
+      const rawContent = extractRawUserText(rawMsg);
+      const isHidden = isFrameworkInjectedUserInput(rawContent);
       const isTeamNoise = e.teammateMessage !== void 0 && !agentName;
       if (!isHidden && !isTeamNoise) {
         if (!firstUserPreview) {
@@ -1207,6 +1281,7 @@ var BLANK_USAGE2, TEAMMATE_MSG_RE;
 var init_parser = __esm({
   "../parser/dist/parser.js"() {
     "use strict";
+    init_user_input();
     BLANK_USAGE2 = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
     TEAMMATE_MSG_RE = /^\s*<teammate-message\s+teammate_id="([^"]+)"[^>]*>([\s\S]*?)<\/teammate-message>/;
   }
@@ -2025,7 +2100,8 @@ function parseRollout(file, lines) {
     if (type === "event_msg" && subtype === "user_message") {
       const text = typeof payload.message === "string" ? payload.message : "";
       const preview = previewOf(text);
-      if (text) {
+      const isHidden = isFrameworkInjectedUserInput(text);
+      if (text && !isHidden) {
         if (!firstUserPreview)
           firstUserPreview = preview;
         lastUserPreview = preview;
@@ -2342,6 +2418,7 @@ var init_codex = __esm({
   "../parser/dist/codex.js"() {
     "use strict";
     init_analytics();
+    init_user_input();
     DEFAULT_CODEX_ROOT = path2.join(os2.homedir(), ".codex", "sessions");
     ROLLOUT_RE = /^rollout-(\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2})-([0-9a-f-]+)\.jsonl$/;
     IDLE_GAP_MS = 3 * 60 * 1e3;
@@ -2564,7 +2641,8 @@ async function parseSession(file) {
     if (msg.type === "user") {
       const text = flattenContent(msg.displayContent ?? msg.content);
       const preview = previewOf2(text);
-      if (text) {
+      const isHidden = isFrameworkInjectedUserInput(text);
+      if (text && !isHidden) {
         if (!firstUserPreview)
           firstUserPreview = preview;
         lastUserPreview = preview;
@@ -2839,6 +2917,7 @@ var init_gemini = __esm({
   "../parser/dist/gemini.js"() {
     "use strict";
     init_analytics();
+    init_user_input();
     DEFAULT_GEMINI_ROOT = path3.join(os3.homedir(), ".gemini", "tmp");
     GEMINI_PROJECTS_FILE = path3.join(os3.homedir(), ".gemini", "projects.json");
     SESSION_FILE_RE = /^session-.+\.(jsonl|json)$/;
@@ -3339,7 +3418,13 @@ function buildPresentation(events) {
       return false;
     if (e.role === "user") {
       const txt = firstTextOfBlocks(e.blocks) ?? "";
-      if (SKILL_CONTENT_RE.test(txt))
+      if (e.blocks.length === 0 || !txt.trim())
+        return false;
+      if (SLASH_COMMAND_RE.test(txt))
+        return true;
+      if (TASK_NOTIFICATION_RE.test(txt))
+        return true;
+      if (isFrameworkInjectedUserInput(txt))
         return false;
     }
     return true;
@@ -3467,13 +3552,13 @@ function buildPresentation(events) {
   }
   return rows;
 }
-var INTERRUPT_RE, RATE_LIMIT_RE, SKILL_CONTENT_RE, SLASH_COMMAND_RE, TASK_NOTIFICATION_RE;
+var INTERRUPT_RE, RATE_LIMIT_RE, SLASH_COMMAND_RE, TASK_NOTIFICATION_RE;
 var init_presentation = __esm({
   "../parser/dist/presentation.js"() {
     "use strict";
+    init_user_input();
     INTERRUPT_RE = /\[request interrupted|interrupted by user/i;
     RATE_LIMIT_RE = /rate.?limit|overloaded_error|api error|Error sending message/i;
-    SKILL_CONTENT_RE = /^Base directory for this skill:/;
     SLASH_COMMAND_RE = /<command-name>(\/[^<\s]+)<\/command-name>(?:[\s\S]*?<command-args>([\s\S]*?)<\/command-args>)?/;
     TASK_NOTIFICATION_RE = /<task-notification>/;
   }
@@ -3607,6 +3692,7 @@ __export(dist_exports, {
   groupSnapsByCycle: () => groupSnapsByCycle,
   highLevelMetrics: () => highLevelMetrics,
   isAgentKind: () => isAgentKind,
+  isFrameworkInjectedUserInput: () => isFrameworkInjectedUserInput,
   last4CompletedWeeks: () => last4CompletedWeeks,
   modelFamily: () => modelFamily,
   parseTranscript: () => parseTranscript,
@@ -3617,6 +3703,7 @@ __export(dist_exports, {
   rowPrimaryIndex: () => rowPrimaryIndex,
   sessionAirTimeMs: () => sessionAirTimeMs,
   sessionDay: () => sessionDay,
+  stripFrameworkBoilerplate: () => stripFrameworkBoilerplate,
   summarizeBursts: () => summarizeBursts,
   toLocalDay: () => toLocalDay,
   userSoloRate: () => userSoloRate,
@@ -3627,6 +3714,7 @@ var init_dist = __esm({
     "use strict";
     init_types();
     init_parser();
+    init_user_input();
     init_presentation();
     init_analytics();
     init_aggregate();
@@ -3799,9 +3887,13 @@ function readSnapshots(filePath) {
   }
   return snapshots;
 }
-function latestSnapshot(filePath) {
+function latestClaudeCodeSnapshot(filePath) {
   const all = readSnapshots(filePath);
-  return all.length > 0 ? all[all.length - 1] : null;
+  for (let i = all.length - 1; i >= 0; i--) {
+    const s = all[i];
+    if (!s.agent || s.agent === "claude-code") return s;
+  }
+  return null;
 }
 
 // src/daemon-worker.ts
@@ -3843,7 +3935,7 @@ init_dist();
 import { randomUUID } from "node:crypto";
 var SNAPSHOT_FRESHNESS_MS = 10 * 60 * 1e3;
 function readLatestUsageSnapshotForWire(filePath, nowMs = Date.now()) {
-  const raw = latestSnapshot(filePath);
+  const raw = latestClaudeCodeSnapshot(filePath);
   if (!raw) return null;
   const capturedMs = Date.parse(raw.captured_at);
   if (Number.isNaN(capturedMs)) return null;
@@ -4264,17 +4356,21 @@ var PROMPT_FRAME_ORIGIN = {
 };
 
 // ../entries/dist/signals.js
+init_dist();
 var TEAMMATE_RE = /^<teammate-message\b/;
 var SKILL_LOAD_RE = /^Base directory for this skill:/;
 var SLASH_COMMAND_RE2 = /^<command-name>|^<local-command-stdout>/;
 function classifyUserInputSource(text) {
   if (!text)
     return "human";
-  if (TEAMMATE_RE.test(text))
+  const stripped = stripFrameworkBoilerplate(text);
+  if (!stripped)
+    return "system_instruction";
+  if (TEAMMATE_RE.test(stripped))
     return "teammate";
-  if (SKILL_LOAD_RE.test(text))
+  if (SKILL_LOAD_RE.test(stripped))
     return "skill_load";
-  if (SLASH_COMMAND_RE2.test(text))
+  if (SLASH_COMMAND_RE2.test(stripped))
     return "slash_command";
   return "human";
 }
@@ -4663,7 +4759,7 @@ function aggregateDay(dayEvents, _sessionFallbackProject) {
           closeTurn(cur, closed, eventCwd);
         }
         cur = newTurn(tsMs, text);
-        if (!firstUser && text && !text.startsWith("<command-name>")) {
+        if (!firstUser && text && classifyUserInputSource(text) === "human") {
           firstUser = text;
         }
       } else {
@@ -4907,7 +5003,13 @@ function buildEntries(sessionDetail) {
       return classifyUserInputSource(text) === "human";
     }).map((ev) => blockText(ev.blocks) || ev.preview || "").join("\n");
     const satisfaction_signals = countSatisfactionSignals(humanText);
-    const user_input_sources = { human: 0, teammate: 0, skill_load: 0, slash_command: 0 };
+    const user_input_sources = {
+      human: 0,
+      teammate: 0,
+      skill_load: 0,
+      slash_command: 0,
+      system_instruction: 0
+    };
     for (const ev of dayEvents) {
       const v = viewEvent(ev);
       if (v.rawType !== "user")