fleetlens 0.16.1 → 0.16.3

package/dist/index.js

@@ -2853,6 +2853,11 @@ function parseRollout(file, lines) {
   let lastUserPreview;
   let lastAgentPreview;
   const tsMs = [];
+  let threadSource;
+  let rootSessionId;
+  let parentThreadId;
+  let agentNickname;
+  let agentPath;
   let idx = 0;
   for (const line of lines) {
     if (typeof line !== "object" || line === null)
@@ -2873,6 +2878,16 @@ function parseRollout(file, lines) {
     if (type === "session_meta") {
       if (typeof payload.cwd === "string")
         cwd = payload.cwd;
+      if (threadSource === void 0 && typeof payload.thread_source === "string")
+        threadSource = payload.thread_source;
+      if (rootSessionId === void 0 && typeof payload.session_id === "string")
+        rootSessionId = payload.session_id;
+      if (parentThreadId === void 0 && typeof payload.parent_thread_id === "string")
+        parentThreadId = payload.parent_thread_id;
+      if (agentNickname === void 0 && typeof payload.agent_nickname === "string")
+        agentNickname = payload.agent_nickname;
+      if (agentPath === void 0 && typeof payload.agent_path === "string")
+        agentPath = payload.agent_path;
       continue;
     }
     if (type === "turn_context") {
@@ -3076,7 +3091,7 @@ function parseRollout(file, lines) {
     airTimeMs,
     activeSegments
   };
-  return { meta, events };
+  return { meta, events, threadSource, rootSessionId, parentThreadId, agentNickname, agentPath };
 }
 function numberOf(v) {
   return typeof v === "number" && Number.isFinite(v) ? v : void 0;
@@ -3114,28 +3129,112 @@ function clearCodexCaches() {
   metaCache2.clear();
   detailCache2.clear();
 }
-async function listCodexSessions(opts = {}) {
-  const root = opts.root ?? DEFAULT_CODEX_ROOT;
+async function scanAllCodex(root) {
   const files = await listRolloutFiles(root);
   const out = [];
   for (const file of files) {
     const cached = metaCache2.get(file.filePath);
     if (cached && cached.mtimeMs === file.mtimeMs && cached.sizeBytes === file.sizeBytes) {
-      out.push(cached.meta);
+      out.push({
+        file,
+        meta: cached.meta,
+        threadSource: cached.threadSource,
+        rootSessionId: cached.rootSessionId,
+        parentThreadId: cached.parentThreadId,
+        agentNickname: cached.agentNickname,
+        agentPath: cached.agentPath
+      });
       continue;
     }
     try {
       const lines = await readJsonl(file.filePath);
-      const { meta } = parseRollout(file, lines);
+      const parsed = parseRollout(file, lines);
       metaCache2.set(file.filePath, {
-        meta,
+        meta: parsed.meta,
         mtimeMs: file.mtimeMs,
-        sizeBytes: file.sizeBytes
+        sizeBytes: file.sizeBytes,
+        threadSource: parsed.threadSource,
+        rootSessionId: parsed.rootSessionId,
+        parentThreadId: parsed.parentThreadId,
+        agentNickname: parsed.agentNickname,
+        agentPath: parsed.agentPath
+      });
+      out.push({
+        file,
+        meta: parsed.meta,
+        threadSource: parsed.threadSource,
+        rootSessionId: parsed.rootSessionId,
+        parentThreadId: parsed.parentThreadId,
+        agentNickname: parsed.agentNickname,
+        agentPath: parsed.agentPath
       });
-      out.push(meta);
     } catch {
     }
   }
+  return out;
+}
+function buildSubagentRun(entry, parentStartMs) {
+  const meta = entry.meta;
+  const startMs = meta.firstTimestamp ? Date.parse(meta.firstTimestamp) : void 0;
+  const endMs = meta.lastTimestamp ? Date.parse(meta.lastTimestamp) : void 0;
+  const startOk = startMs !== void 0 && Number.isFinite(startMs) ? startMs : void 0;
+  const endOk = endMs !== void 0 && Number.isFinite(endMs) ? endMs : void 0;
+  return {
+    agentId: meta.id,
+    agentType: entry.agentNickname ?? entry.agentPath ?? "subagent",
+    description: entry.agentPath ?? entry.agentNickname ?? meta.id,
+    startMs: startOk,
+    endMs: endOk,
+    durationMs: meta.durationMs,
+    startTOffsetMs: parentStartMs !== void 0 && startOk !== void 0 ? Math.max(0, startOk - parentStartMs) : void 0,
+    endTOffsetMs: parentStartMs !== void 0 && endOk !== void 0 ? Math.max(0, endOk - parentStartMs) : void 0,
+    eventCount: meta.eventCount,
+    totalUsage: meta.totalUsage,
+    model: meta.model,
+    toolCallCount: meta.toolCallCount,
+    finalPreview: meta.lastAgentPreview
+  };
+}
+async function listCodexSessions(opts = {}) {
+  const root = opts.root ?? DEFAULT_CODEX_ROOT;
+  const all = await scanAllCodex(root);
+  const subagentsByRoot = /* @__PURE__ */ new Map();
+  for (const entry of all) {
+    if (entry.threadSource !== "subagent" || !entry.rootSessionId)
+      continue;
+    const list = subagentsByRoot.get(entry.rootSessionId);
+    if (list)
+      list.push(entry);
+    else
+      subagentsByRoot.set(entry.rootSessionId, [entry]);
+  }
+  const out = [];
+  for (const entry of all) {
+    if (entry.threadSource === "subagent")
+      continue;
+    const children = subagentsByRoot.get(entry.meta.id);
+    if (!children || children.length === 0) {
+      out.push(entry.meta);
+      continue;
+    }
+    const merged = {
+      ...entry.meta,
+      spawnedAgentCount: children.length,
+      totalUsage: {
+        input: entry.meta.totalUsage.input + children.reduce((s, c) => s + c.meta.totalUsage.input, 0),
+        output: entry.meta.totalUsage.output + children.reduce((s, c) => s + c.meta.totalUsage.output, 0),
+        cacheRead: entry.meta.totalUsage.cacheRead + children.reduce((s, c) => s + c.meta.totalUsage.cacheRead, 0),
+        cacheWrite: entry.meta.totalUsage.cacheWrite + children.reduce((s, c) => s + c.meta.totalUsage.cacheWrite, 0)
+      },
+      toolCallCount: (entry.meta.toolCallCount ?? 0) + children.reduce((s, c) => s + (c.meta.toolCallCount ?? 0), 0)
+    };
+    for (const c of children) {
+      if (c.meta.lastTimestamp && (!merged.lastTimestamp || c.meta.lastTimestamp > merged.lastTimestamp)) {
+        merged.lastTimestamp = c.meta.lastTimestamp;
+      }
+    }
+    out.push(merged);
+  }
   out.sort((a, b) => (b.firstTimestamp ?? "").localeCompare(a.firstTimestamp ?? ""));
   if (opts.limit !== void 0)
     return out.slice(0, opts.limit);
@@ -3143,17 +3242,41 @@ async function listCodexSessions(opts = {}) {
 }
 async function getCodexSession(id, opts = {}) {
   const root = opts.root ?? DEFAULT_CODEX_ROOT;
-  const files = await listRolloutFiles(root);
-  const file = files.find((f) => f.sessionId === id);
-  if (!file)
-    return null;
+  const all = await scanAllCodex(root);
+  const rootEntry = all.find((a) => a.meta.id === id && a.threadSource !== "subagent");
+  if (!rootEntry) {
+    const direct = all.find((a) => a.meta.id === id);
+    if (!direct)
+      return null;
+    const cached2 = detailCache2.get(direct.file.filePath);
+    if (cached2 && cached2.mtimeMs === direct.file.mtimeMs && cached2.sizeBytes === direct.file.sizeBytes) {
+      return cached2.detail;
+    }
+    const lines2 = await readJsonl(direct.file.filePath);
+    const { meta: meta2, events: events2 } = parseRollout(direct.file, lines2);
+    const detail2 = { ...meta2, events: events2 };
+    detailCache2.set(direct.file.filePath, {
+      detail: detail2,
+      mtimeMs: direct.file.mtimeMs,
+      sizeBytes: direct.file.sizeBytes
+    });
+    return detail2;
+  }
+  const file = rootEntry.file;
   const cached = detailCache2.get(file.filePath);
   if (cached && cached.mtimeMs === file.mtimeMs && cached.sizeBytes === file.sizeBytes) {
     return cached.detail;
   }
   const lines = await readJsonl(file.filePath);
   const { meta, events } = parseRollout(file, lines);
-  const detail = { ...meta, events };
+  const children = all.filter((a) => a.threadSource === "subagent" && a.rootSessionId === id);
+  const parentStartMs = meta.firstTimestamp ? Date.parse(meta.firstTimestamp) : void 0;
+  const subagents = children.map((c) => buildSubagentRun(c, parentStartMs)).sort((a, b) => (a.startMs ?? 0) - (b.startMs ?? 0));
+  const detail = {
+    ...meta,
+    events,
+    ...subagents.length > 0 ? { subagents, spawnedAgentCount: subagents.length } : {}
+  };
   detailCache2.set(file.filePath, {
     detail,
     mtimeMs: file.mtimeMs,
@@ -3164,6 +3287,15 @@ async function getCodexSession(id, opts = {}) {
 function hasUsableRateLimitWindows(primary, secondary) {
   return numberOf(primary?.used_percent) !== void 0 || numberOf(secondary?.used_percent) !== void 0;
 }
+function normalizeCodexWindow(raw, nowMs) {
+  const usedPercent = numberOf(raw?.used_percent);
+  const resetUnix = numberOf(raw?.resets_at);
+  const expired = resetUnix !== void 0 && nowMs > resetUnix * 1e3;
+  return {
+    utilization: usedPercent === void 0 ? null : expired ? 0 : usedPercent,
+    resets_at: resetUnix !== void 0 ? new Date(resetUnix * 1e3).toISOString() : null
+  };
+}
 async function getLatestCodexUsage(opts = {}) {
   const root = opts.root ?? DEFAULT_CODEX_ROOT;
   const files = await listRolloutFiles(root);
@@ -3189,23 +3321,34 @@ async function getLatestCodexUsage(opts = {}) {
       const secondary = rl.secondary ?? null;
       if (!hasUsableRateLimitWindows(primary, secondary))
         continue;
-      const fivePct = numberOf(primary?.used_percent);
-      const sevenPct = numberOf(secondary?.used_percent);
-      const fiveResetUnix = numberOf(primary?.resets_at);
-      const sevenResetUnix = numberOf(secondary?.resets_at);
       const planType = typeof rl.plan_type === "string" ? rl.plan_type : null;
       const nowMs = Date.now();
-      const fiveExpired = fiveResetUnix !== void 0 && nowMs > fiveResetUnix * 1e3;
-      const sevenExpired = sevenResetUnix !== void 0 && nowMs > sevenResetUnix * 1e3;
+      let fiveHour = null;
+      let sevenDay = null;
+      for (const candidate of [primary, secondary]) {
+        if (!candidate)
+          continue;
+        const windowMinutes = numberOf(candidate.window_minutes);
+        if (windowMinutes === FIVE_HOUR_WINDOW_MINUTES) {
+          fiveHour = normalizeCodexWindow(candidate, nowMs);
+        } else if (windowMinutes === SEVEN_DAY_WINDOW_MINUTES) {
+          sevenDay = normalizeCodexWindow(candidate, nowMs);
+        }
+      }
+      const unknownWindows = [primary, secondary].filter((candidate) => candidate !== null && numberOf(candidate.window_minutes) === void 0);
+      if (!fiveHour && !sevenDay) {
+        fiveHour = primary ? normalizeCodexWindow(primary, nowMs) : null;
+        sevenDay = secondary ? normalizeCodexWindow(secondary, nowMs) : null;
+      } else if (unknownWindows.length === 1) {
+        const inferred = normalizeCodexWindow(unknownWindows[0], nowMs);
+        if (!fiveHour)
+          fiveHour = inferred;
+        else if (!sevenDay)
+          sevenDay = inferred;
+      }
       return {
-        five_hour: {
-          utilization: fiveExpired ? 0 : fivePct ?? null,
-          resets_at: fiveResetUnix !== void 0 ? new Date(fiveResetUnix * 1e3).toISOString() : null
-        },
-        seven_day: {
-          utilization: sevenExpired ? 0 : sevenPct ?? null,
-          resets_at: sevenResetUnix !== void 0 ? new Date(sevenResetUnix * 1e3).toISOString() : null
-        },
+        five_hour: fiveHour ?? { utilization: null, resets_at: null },
+        seven_day: sevenDay ?? { utilization: null, resets_at: null },
         plan_type: planType,
         source_path: file.filePath
       };
@@ -3219,7 +3362,7 @@ function codexSessionLocalDay(meta) {
   const ms = Date.parse(meta.firstTimestamp);
   return Number.isFinite(ms) ? toLocalDay(ms) : void 0;
 }
-var DEFAULT_CODEX_ROOT, ROLLOUT_RE, IDLE_GAP_MS, metaCache2, detailCache2;
+var DEFAULT_CODEX_ROOT, ROLLOUT_RE, IDLE_GAP_MS, metaCache2, detailCache2, FIVE_HOUR_WINDOW_MINUTES, SEVEN_DAY_WINDOW_MINUTES;
 var init_codex = __esm({
   "../parser/dist/codex.js"() {
     "use strict";
@@ -3231,6 +3374,8 @@ var init_codex = __esm({
     IDLE_GAP_MS = 3 * 60 * 1e3;
     metaCache2 = /* @__PURE__ */ new Map();
     detailCache2 = /* @__PURE__ */ new Map();
+    FIVE_HOUR_WINDOW_MINUTES = 5 * 60;
+    SEVEN_DAY_WINDOW_MINUTES = 7 * 24 * 60;
   }
 });
 
@@ -5576,7 +5721,8 @@ var init_fs = __esm({
           captured_at: (/* @__PURE__ */ new Date()).toISOString(),
           agent: "codex",
           five_hour: w.five_hour,
-          seven_day: w.seven_day
+          seven_day: w.seven_day,
+          plan_type: w.plan_type
         };
       }
     };
@@ -5663,9 +5809,9 @@ function onDiskVersion() {
   try {
     const here = dirname3(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(readFileSync5(join3(here, "..", "package.json"), "utf8"));
-    return pkg.version ?? "0.16.1";
+    return pkg.version ?? "0.16.3";
   } catch {
-    return "0.16.1";
+    return "0.16.3";
   }
 }
 function getServerStatus() {
@@ -5677,7 +5823,7 @@ function getServerStatus() {
   return { running: false };
 }
 function isServerStale(status2) {
-  return status2.running === true && status2.version !== "0.16.1";
+  return status2.running === true && status2.version !== "0.16.3";
 }
 async function ensureCurrentServer(opts = {}) {
   const status2 = getServerStatus();
@@ -6116,9 +6262,9 @@ Installed: ${PACKAGE_NAME}@${verify.installedVersion}  at ${verify.installedPath
     console.warn(
       `    \u2022 reinstall in the correct Node env: 'npm install -g ${PACKAGE_NAME}@latest'`
     );
-  } else if (verify.installedVersion !== "0.16.1") {
+  } else if (verify.installedVersion !== "0.16.3") {
     console.log(
-      `  \u2192 This process is still running ${"0.16.1"}. Next invocation will use ${verify.installedVersion}.`
+      `  \u2192 This process is still running ${"0.16.3"}. Next invocation will use ${verify.installedVersion}.`
     );
   }
 }
@@ -6153,14 +6299,14 @@ async function getUpdateAvailability() {
   if (isDevMode()) return null;
   const latest = await fetchLatestVersion();
   if (latest === null) return {
-    current: "0.16.1",
+    current: "0.16.3",
     latest: null,
     updateAvailable: false
   };
   return {
-    current: "0.16.1",
+    current: "0.16.3",
     latest,
-    updateAvailable: shouldUpdate("0.16.1", latest)
+    updateAvailable: shouldUpdate("0.16.3", latest)
   };
 }
 async function checkForUpdate() {
@@ -6250,7 +6396,7 @@ async function restartServices(state) {
 }
 async function forceUpdate() {
   const latest = await fetchLatestVersion();
-  const current = "0.16.1";
+  const current = "0.16.3";
   if (latest === null) {
     console.error("Could not reach npm registry. Check your network.");
     process.exit(1);
@@ -6663,7 +6809,7 @@ async function status() {
     console.log(`Server:  running on ${url} (PID ${server.pid}, v${ver})`);
     if (isServerStale(server)) {
       console.log(
-        `  \u26A0  serving stale ${ver} (CLI is ${"0.16.1"}) \u2014 run 'fleetlens start' to restart on the current version`
+        `  \u26A0  serving stale ${ver} (CLI is ${"0.16.3"}) \u2014 run 'fleetlens start' to restart on the current version`
       );
     }
   } else {
@@ -18806,7 +18952,7 @@ function buildIngestPayload(inputs) {
   return {
     ingestId: randomUUID2(),
     observedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    cliVersion: "0.16.1",
+    cliVersion: "0.16.3",
     ...richRollup || inputs.enrichedExtras || inputs.artifactSignals ? { schemaVersion: RICH_ROLLUP_SCHEMA_VERSION } : {},
     ...inputs.rollup ? { dailyRollup: inputs.rollup } : {},
     ...richRollup ? { richRollup } : {},
@@ -20849,7 +20995,7 @@ async function main() {
     case "version":
     case "--version":
     case "-v":
-      console.log(`fleetlens ${"0.16.1"}`);
+      console.log(`fleetlens ${"0.16.3"}`);
       break;
     case "help":
     case "--help":

package/menubar/FleetlensMenubar.app/Contents/Info.plist

@@ -10,8 +10,8 @@
   <key>CFBundleName</key><string>Fleetlens</string>
   <key>CFBundleDisplayName</key><string>Fleetlens Menu Bar</string>
   <key>CFBundlePackageType</key><string>APPL</string>
-  <key>CFBundleShortVersionString</key><string>0.16.1</string>
-  <key>CFBundleVersion</key><string>0.16.1</string>
+  <key>CFBundleShortVersionString</key><string>0.16.3</string>
+  <key>CFBundleVersion</key><string>0.16.3</string>
   <key>LSApplicationCategoryType</key><string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key><string>14.0</string>
   <key>LSUIElement</key><true/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetlens",
-  "version": "0.16.1",
+  "version": "0.16.3",
   "description": "fleetlens — local-only dashboard and usage tracker for Claude Code sessions and agent fleets",
   "license": "MIT",
   "repository": {