claude-discover 1.9.4 → 1.9.5

package/out/preload/preload.cjs

@@ -14,8 +14,8 @@ electron.contextBridge.exposeInMainWorld("api", {
   deactivateSwitch: (name) => electron.ipcRenderer.invoke("switch:deactivate", name),
   setSwitchKeepActive: (name, value) => electron.ipcRenderer.invoke("switch:keep-active", name, value),
   listSessions: (date, granularity = "day") => electron.ipcRenderer.invoke("sessions:list", date, granularity),
-  readSession: (id, date = null, granularity = "day") => electron.ipcRenderer.invoke("sessions:read", id, date, granularity),
-  readRequests: (id, date = null, granularity = "day") => electron.ipcRenderer.invoke("sessions:read-requests", id, date, granularity),
+  readSession: (filePath, date = null, granularity = "day") => electron.ipcRenderer.invoke("sessions:read", filePath, date, granularity),
+  readRequests: (filePath, date = null, granularity = "day") => electron.ipcRenderer.invoke("sessions:read-requests", filePath, date, granularity),
   onSessionsUpdate: subscribe("sessions:update"),
   onScanProgress: subscribe("sessions:scan-progress"),
   getWorkHours: () => electron.ipcRenderer.invoke("work-hours:get"),

package/out/renderer/assets/{index-B4cvR_aa.js → index-CX9ZlZGo.js}

@@ -9,7 +9,7 @@ const SOURCE_COLORS = {
   other: "#94a3b8"
 };
 const SOURCE_ORDER = ["cli", "claude-desktop", "sdk-cli", "sdk-ts", "sdk-py", "scheduled", "other"];
-const SOURCE_LABELS = {
+const SOURCE_LABELS$1 = {
   scheduled: "Scheduled",
   cli: "CLI",
   "claude-desktop": "Desktop",
@@ -34,13 +34,13 @@ function useLocalStorage(key, initial) {
 }
 function clearOutdatedLocalStorage() {
   const version = localStorage.getItem(VERSION_KEY);
-  if (version !== "1.9.4") {
-    const [MAJOR, MINOR, PATCH] = "1.9.4".split(".");
+  if (version !== "1.9.5") {
+    const [MAJOR, MINOR, PATCH] = "1.9.5".split(".");
     const [major, minor, patch] = (version ?? "").split(".");
     if (MAJOR !== major || MINOR !== minor) {
       localStorage.clear();
     }
-    localStorage.setItem(VERSION_KEY, "1.9.4");
+    localStorage.setItem(VERSION_KEY, "1.9.5");
   }
 }
 function useMouseFontScale(storageKey) {
@@ -104,12 +104,12 @@ function useMouse(ref, handlers) {
 }
 const isJournal = (s) => s.sessionId.endsWith("-journal");
 function subagentsByParent(sessions) {
-  const ids = new Set(sessions.map((s) => s.sessionId));
+  const parents = new Set(sessions.map((s) => s.filePath));
   const byParent = /* @__PURE__ */ new Map();
   for (const s of sessions) {
-    if (!ids.has(s.parentSessionId)) continue;
-    let arr = byParent.get(s.parentSessionId);
-    if (!arr) byParent.set(s.parentSessionId, arr = []);
+    if (!parents.has(s.parentFilePath)) continue;
+    let arr = byParent.get(s.parentFilePath);
+    if (!arr) byParent.set(s.parentFilePath, arr = []);
     arr.push(s);
   }
   return byParent;
@@ -365,7 +365,7 @@ function GanttChart({
   }, []);
   const { groups, totalHeight } = reactExports.useMemo(() => {
     const clusters = subagentClusters(sessions, SUBAGENT_SPLIT_GAP).filter((c) => c.length >= 2);
-    const collapsed = new Set(clusters.flat().map((s) => s.sessionId));
+    const collapsed = new Set(clusters.flat().map((s) => s.filePath));
     const byKey = /* @__PURE__ */ new Map();
     const addItem = (s, item, cost) => {
       const key = s.project || "(no project)";
@@ -375,9 +375,9 @@ function GanttChart({
       group.cost += cost || 0;
     };
     for (const s of sessions) {
-      if (collapsed.has(s.sessionId)) continue;
+      if (collapsed.has(s.filePath)) continue;
       addItem(s, {
-        id: s.sessionId,
+        id: s.filePath,
         label: s.summary || s.firstUserPrompt || s.firstUserCommand || s.sessionId,
         start: s.startedAt,
         end: endOf(s),
@@ -388,7 +388,7 @@ function GanttChart({
     for (const subs of clusters) {
       const periods = subs.map((c) => ({ start: c.startedAt, end: endOf(c) }));
       addItem(subs[0], {
-        id: `${subs[0].sessionId}::subagents`,
+        id: `${subs[0].filePath}::subagents`,
         start: periods[0].start,
         end: Math.max(...periods.map((p) => p.end)),
         source: subs[0].source,
@@ -498,7 +498,7 @@ function GanttChart({
         g.placed.map(({ item, lane }) => {
           const y = g.yOffset + lane * (bar.height + bar.row_gap);
           const color = SOURCE_COLORS[item.source] || SOURCE_COLORS.other;
-          const isSelected = item.subs ? item.subs.some((c) => c.sessionId === selectedId) : item.id === selectedId;
+          const isSelected = item.subs ? item.subs.some((c) => c.filePath === selectedId) : item.id === selectedId;
           const periods = item.activityPeriods?.length ? item.activityPeriods : [{ start: item.start, end: item.end }];
           const rawX1 = xFor(item.start);
           const rawX2 = xFor(item.end);
@@ -509,7 +509,7 @@ function GanttChart({
             "g",
             {
               className: `bar ${isSelected ? "selected" : ""}`,
-              onClick: () => onSelect(item.subs ? item.subs.at(-1).sessionId : item.id),
+              onClick: () => onSelect(item.subs ? item.subs.at(-1).filePath : item.id),
               children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx("rect", { x, y, width: w, height: bar.height, rx: bar.radius, fill: color, className: "bar-fill" }),
                 periods.slice(0, -1).map((p, i) => {
@@ -521,7 +521,7 @@ function GanttChart({
                 item.subs && /* @__PURE__ */ jsxRuntimeExports.jsx("rect", { x, y, width: w, height: bar.height, rx: bar.radius, fill: "url(#gantt-subagent-hatch)", opacity: 0.5, pointerEvents: "none" }),
                 item.subs && /* @__PURE__ */ jsxRuntimeExports.jsx("text", { x: x + w / 2, y: y + bar.height / 2, textAnchor: "middle", dominantBaseline: "central", className: "gantt-bar-count", children: item.subCount }),
                 isSelected && /* @__PURE__ */ jsxRuntimeExports.jsx("rect", { x, y, width: w, height: bar.height, rx: bar.radius, className: "bar-outline" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("title", { children: `${item.subs ? `${item.subCount} subagents` : `${SOURCE_LABELS[item.source] || item.source} · ${item.label}`}
+                /* @__PURE__ */ jsxRuntimeExports.jsx("title", { children: `${item.subs ? `${item.subCount} subagents` : `${SOURCE_LABELS$1[item.source] || item.source} · ${item.label}`}
 ${g.key}
 ${new Date(item.start).toLocaleString()} → ${new Date(item.end).toLocaleString()}` })
               ]
@@ -616,7 +616,7 @@ function Toolbar({
       const dim = sourceFilter && !active2;
       return /* @__PURE__ */ jsxRuntimeExports.jsxs("button", { type: "button", className: `legend-chip ${active2 ? "active" : ""} ${dim ? "dim" : ""}`, onClick: () => onToggleSourceFilter?.(k), children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "swatch", style: { background: SOURCE_COLORS[k] || SOURCE_COLORS.other } }),
-        SOURCE_LABELS[k] || k
+        SOURCE_LABELS$1[k] || k
       ] }, k);
     }) }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "gantt-toolbar-nav", children: [
@@ -701,6 +701,9 @@ function fmtNum(n) {
   if (n == null) return "—";
   return n.toLocaleString();
 }
+function fmtToolCalls({ toolCalls, skillCalls }) {
+  return skillCalls ? `${fmtNum(toolCalls)}, ${fmtNum(skillCalls)} skill${skillCalls === 1 ? "" : "s"}` : fmtNum(toolCalls);
+}
 function fmtUSD(n) {
   if (n == null) return "—";
   return `$${n.toFixed(2)}`;
@@ -882,6 +885,7 @@ const queuedPrompt = (it) => it.type === "attachment" && it.attachment?.type ===
 function flatten(items, instructions = []) {
   const turns = [];
   const results = {};
+  const companions = {};
   for (const it of items) {
     const queued = queuedPrompt(it);
     if (queued) {
@@ -901,6 +905,7 @@ function flatten(items, instructions = []) {
       continue;
     }
     if (it.type === "attachment" && it.attachment) {
+      if (it.attachment.type === "structured_output" && it.attachment.toolUseID) continue;
       const block = { type: "attachment", attachment: it.attachment };
       const last = turns[turns.length - 1];
       if (last && last.isMeta && last.blocks.every((b) => b.type === "attachment")) {
@@ -939,9 +944,19 @@ ${text}` }]
       });
       continue;
     }
+    if (it.turnCompanion && it.sourceToolUseID) {
+      companions[it.sourceToolUseID] = companionText(it);
+      continue;
+    }
+    const command = it.turnCompanion && turns.findLast((t) => t.uuid === it.parentUuid);
+    if (command) {
+      const name = command.blocks.map((b) => parseCommand(b.text)?.name).find(Boolean)?.replace(/^\//, "");
+      command.blocks.push({ type: "skill", name, text: companionText(it) });
+      continue;
+    }
     if (it.type !== "user" && it.type !== "assistant") continue;
     const msg = it.message || {};
-    const blocks = normalizeContent(msg.content).filter((b) => !(b.type === "thinking" && !b.thinking?.trim()));
+    const blocks = collapseRedactedThinking(normalizeContent(msg.content));
     if (blocks.length === 0) continue;
     for (const b of blocks) {
       if (b.type === "tool_result" && b.tool_use_id) results[b.tool_use_id] = b;
@@ -961,21 +976,21 @@ ${text}` }]
     });
   }
   for (const t of turns) {
-    t.blocks = t.blocks.map((b) => b.type === "tool_use" ? { ...b, result: results[b.id] } : b).filter((b) => !(b.type === "tool_result" && results[b.tool_use_id]));
+    t.blocks = t.blocks.map((b) => b.type === "tool_use" ? { ...b, result: withCompanion(results[b.id], companions[b.id]) } : b).filter((b) => !(b.type === "tool_result" && results[b.tool_use_id]));
   }
   const out = turns.filter((t) => t.blocks.length > 0);
-  for (const it of instructions) {
+  if (instructions.length) {
+    const first = instructions.find((it) => it.timestamp);
     const turn = {
-      uuid: `instr-${it.hash ?? it.file_path}-${it.timestamp}`,
-      // system prompts share a file_path, their hash disambiguates
+      uuid: "instructions",
       role: "instruction",
       isMeta: true,
-      ts: it.timestamp ? Date.parse(it.timestamp) - 500 : null,
+      ts: first ? Date.parse(first.timestamp) - 500 : null,
       model: null,
       usage: null,
       tokenDelta: null,
       tokenTotal: null,
-      blocks: [{ type: "instruction", it }]
+      blocks: instructions.map((it) => ({ type: "instruction", it }))
     };
     const i = out.findIndex((t) => t.ts != null && t.ts > turn.ts);
     i === -1 ? out.push(turn) : out.splice(i, 0, turn);
@@ -1003,6 +1018,21 @@ function contextWindow(models = []) {
   const is200k = (model) => SMALL_CONTEXT.has(model.replace(/[-@]\d{8}.*$/, ""));
   return models.some((m) => m && !is200k(m)) ? 1e6 : 2e5;
 }
+function collapseRedactedThinking(blocks) {
+  const out = [];
+  for (const b of blocks) {
+    if (!(b.type === "thinking" && !b.thinking?.trim())) {
+      out.push(b);
+      continue;
+    }
+    const last = out[out.length - 1];
+    if (last?.redacted) last.redacted++;
+    else out.push({ type: "thinking", redacted: 1 });
+  }
+  return out;
+}
+const companionText = (it) => normalizeContent(it.message?.content).filter((b) => b.type === "text").map((b) => b.text).join("\n");
+const withCompanion = (result, text) => text ? { ...result ?? { type: "tool_result" }, content: [...normalizeContent(result?.content), { type: "text", text }] } : result;
 function normalizeContent(content) {
   if (typeof content === "string") return [{ type: "text", text: content }];
   if (!Array.isArray(content)) return [];
@@ -1050,6 +1080,10 @@ function parseCommand(text) {
     caveat: field("local-command-caveat")
   };
 }
+const SOURCE_LABELS = { system: "system prompt", tools: "tools", message: "user message" };
+function groupInstructions(strips) {
+  return Object.entries(SOURCE_LABELS).map(([source, label]) => [label, strips.filter((it) => it.source === source)]).filter(([, list]) => list.length);
+}
 function instructionTitle(it, model) {
   const parts = [it.memory_type, it.model && it.model !== model && it.model].filter(Boolean).join(", ");
   return parts ? `${it.name ?? it.file_path} (${parts})` : it.name ?? it.file_path;
@@ -1071,9 +1105,7 @@ function groupTurns(turns) {
       else pending.push(t);
     } else if (t.role === "instruction") {
       flush();
-      const prev = groups.at(-1);
-      if (prev?.kind === "instruction" && prev.turns.at(-1).ts === t.ts) prev.turns.push(t);
-      else groups.push({ kind: "instruction", turns: [t] });
+      groups.push({ kind: "instruction", turns: [t] });
     } else if (t.role === "user") {
       flush();
       groups.push({ kind: "user", turns: [...pending, t] });
@@ -1148,11 +1180,11 @@ function SessionList({ sessions, selectedId, deepLink, onSelect }) {
     const t = setInterval(() => tick((n) => n + 1), 6e4);
     return () => clearInterval(t);
   }, []);
-  const cmd = (text) => {
-    const c = parseCommand(text);
-    return c ? `${c.name || c.message} ${c.args}` : "";
+  const labelCommand = (s) => !(s.aiTitle || s.summary || s.firstUserPrompt) && parseCommand(s.firstUserCommand);
+  const sessionLabel = (s) => {
+    const c = labelCommand(s);
+    return c ? `${c.name || c.message} ${c.args}` : s.aiTitle || s.summary || s.firstUserPrompt || s.sessionId || "";
   };
-  const sessionLabel = (s) => s.aiTitle || s.summary || s.firstUserPrompt || cmd(s.firstUserCommand) || s.sessionId || "";
   const q = filter.trim().toLowerCase();
   const filtered = q ? sessions.filter((s) => [
     s.customTitle,
@@ -1170,9 +1202,9 @@ function SessionList({ sessions, selectedId, deepLink, onSelect }) {
   const sorted = sortBy === "cost" ? [...filtered].sort((a, b) => (b.cost || 0) - (a.cost || 0)) : sortBy === "tokens" ? [...filtered].sort((a, b) => (b.totalTokens || 0) - (a.totalTokens || 0)) : sortBy === "name" ? [...filtered].sort((a, b) => sessionLabel(a).toLowerCase().localeCompare(sessionLabel(b).toLowerCase())) : filtered;
   const grouped = reactExports.useMemo(() => {
     const byParent = subagentsByParent(sorted);
-    return sorted.flatMap((s) => byParent.has(s.parentSessionId) ? [] : [
+    return sorted.flatMap((s) => byParent.has(s.parentFilePath) ? [] : [
       { session: s, isChild: false },
-      ...(byParent.get(s.sessionId) ?? []).map((c) => ({ session: c, isChild: true }))
+      ...(byParent.get(s.filePath) ?? []).map((c) => ({ session: c, isChild: true }))
     ]);
   }, [sorted]);
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "session-list", children: [
@@ -1211,16 +1243,17 @@ function SessionList({ sessions, selectedId, deepLink, onSelect }) {
         const isSubagent = s.sessionId.startsWith("agent-");
         const journal = isJournal(s);
         const isFork = !!s.forkedFrom;
-        const linked = deepLink?.id === s.sessionId;
+        const linked = !!deepLink && s.filePath === selectedId;
         const linkTip = linked && `Opened from deep link
 claude-discover://session?id=${deepLink.id}${deepLink.date ? `&date=${deepLink.date}` : ""}`;
+        const command = labelCommand(s);
         const sessionName = s.customTitle && s.agentName && s.customTitle !== s.agentName ? `${s.customTitle} [${s.agentName}]` : s.customTitle || s.agentName || "";
         return /* @__PURE__ */ jsxRuntimeExports.jsxs(
           "div",
           {
-            ref: selectedId === s.sessionId ? selectedRef : null,
-            className: `session-row ${selectedId === s.sessionId ? "selected" : ""} ${isChild ? "is-subagent-child" : ""} ${linked ? "deep-linked" : ""}`,
-            onClick: () => onSelect(selectedId === s.sessionId ? null : s.sessionId),
+            ref: selectedId === s.filePath ? selectedRef : null,
+            className: `session-row ${selectedId === s.filePath ? "selected" : ""} ${isChild ? "is-subagent-child" : ""} ${linked ? "deep-linked" : ""}`,
+            onClick: () => onSelect(selectedId === s.filePath ? null : s.filePath),
             style: { borderLeftColor: SOURCE_COLORS[s.source] || SOURCE_COLORS.other },
             children: [
               /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "session-row-main", children: [
@@ -1256,7 +1289,11 @@ ${TIPS.time}`, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Clock, { size: 11
                   ] }),
                   isFork && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "fork-tag", title: `Forked from session ${s.forkedFrom.sessionId}`, children: "↳" }),
                   sessionName && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "session-name", children: sessionName }),
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "session-label-text", children: sessionLabel(s) })
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "session-label-text", children: command ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "session-command", children: command.name || command.message }),
+                    " ",
+                    command.args
+                  ] }) : sessionLabel(s) })
                 ] }),
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "session-time-bottom", children: [
                   s.project && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "session-project", title: s.project, children: s.projectShort }),
@@ -1271,7 +1308,7 @@ ${TIPS.time}`, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Clock, { size: 11
               ] })
             ]
           },
-          s.sessionId
+          s.filePath
         );
       })
     ] })
@@ -1342,7 +1379,9 @@ function fenceTags(text) {
     if (close < 0) continue;
     const end = close + m[1].length + 3;
     if (end !== text.length && text[end] !== "\n" && text[end] !== "\r") continue;
-    out += text.slice(cursor, m.index) + "```xml\n" + text.slice(m.index, end) + "\n```";
+    const gap = text.slice(cursor, m.index);
+    if (out && !gap.trim()) out = out.slice(0, -4) + gap + text.slice(m.index, end) + "\n```";
+    else out += gap + "```xml\n" + text.slice(m.index, end) + "\n```";
     cursor = startRe.lastIndex = end;
   }
   out += text.slice(cursor);
@@ -1495,6 +1534,7 @@ function AssistantCard({ turns, point, ctxLimit, duration: duration2, showAuthor
   const [open, setOpen] = useCollapsed(false);
   const toolBlocks = turns.flatMap((t) => t.blocks.filter((b) => b.type === "tool_use"));
   const errorCount = toolBlocks.filter((b) => b.result?.is_error).length;
+  const skillCount = toolBlocks.filter((b) => b.name === "Skill").length;
   const isAux = (t) => !t.blocks.some((b) => b.type === "text");
   const foldable = toolBlocks.length > 0 && turns.some(isAux);
   const end = turns.findLast((t) => t.ts != null)?.ts ?? null;
@@ -1506,6 +1546,7 @@ function AssistantCard({ turns, point, ctxLimit, duration: duration2, showAuthor
   const anyVisible = turns.some((t) => !hidden(t));
   const parts = [
     toolBlocks.length > 0 && `${toolBlocks.length} tool call${toolBlocks.length === 1 ? "" : "s"}`,
+    skillCount > 0 && `${skillCount} skill${skillCount === 1 ? "" : "s"}`,
     errorCount > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "msg-errors", children: [
       errorCount,
       " error",
@@ -1550,21 +1591,25 @@ function Block({ block }) {
     const cmd = parseCommand(block.text);
     if (cmd) {
       if (!cmd.name && !cmd.args && !cmd.stdout && !cmd.caveat) return null;
-      return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "block-command", children: [
-        cmd.name && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "cmd-name", children: cmd.name }),
-        cmd.args && /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "cmd-args", children: [
-          " ",
-          cmd.args
+      const promptArgs = cmd.args.trim().includes("\n");
+      return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "block-command", children: [
+          cmd.name && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "cmd-name", children: cmd.name }),
+          cmd.args && !promptArgs && /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "cmd-args", children: [
+            " ",
+            cmd.args
+          ] }),
+          cmd.stdout && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "cmd-stdout", children: cmd.stdout }),
+          cmd.caveat && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "cmd-stdout", children: cmd.caveat })
         ] }),
-        cmd.stdout && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "cmd-stdout", children: cmd.stdout }),
-        cmd.caveat && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "cmd-stdout", children: cmd.caveat })
+        promptArgs && /* @__PURE__ */ jsxRuntimeExports.jsx(Markdown, { className: "block-text", text: cmd.args, autoFence: true })
       ] });
     }
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Markdown, { className: "block-text", text: block.text, autoFence: true });
   }
   if (block.type === "thinking") {
-    if (!block.thinking) return null;
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(Collapsible, { title: "thinking", defaultOpen: false, children: /* @__PURE__ */ jsxRuntimeExports.jsx("pre", { children: block.thinking }) });
+    if (block.redacted) return /* @__PURE__ */ jsxRuntimeExports.jsx(Label, { title: `Thinking (encrypted${block.redacted > 1 ? ` · ${block.redacted}` : ""})` });
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(Collapsible, { title: "Thinking", defaultOpen: false, children: /* @__PURE__ */ jsxRuntimeExports.jsx("pre", { children: block.thinking }) });
   }
   if (block.type === "tool_use") {
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(Collapsible, { title: toolSummary(block.name, block.input), defaultOpen: false, children: [
@@ -1572,6 +1617,9 @@ function Block({ block }) {
       block.result && /* @__PURE__ */ jsxRuntimeExports.jsx(Block, { block: block.result })
     ] });
   }
+  if (block.type === "skill") {
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(Collapsible, { title: block.name ? `Skill: ${block.name}` : "Skill", defaultOpen: false, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Markdown, { className: "block-text", text: block.text }) });
+  }
   if (block.type === "tool_result") {
     const c = block.content;
     const parts = Array.isArray(c) ? c : [typeof c === "string" ? { type: "text", text: c } : c];
@@ -1675,12 +1723,15 @@ function JsonBlock({ value }) {
   return /* @__PURE__ */ jsxRuntimeExports.jsx(Markdown, { className: "block-text", text: "```json\n" + safeJson(value) + "\n```" });
 }
 function InstructionRun({ turns, model }) {
-  const tokens2 = turns.map((t) => countTokens(t.blocks[0].it.content, t.blocks[0].it.model ?? model));
+  const strips = turns.flatMap((t) => t.blocks).map(({ it }) => ({ ...it, tokens: countTokens(it.content, it.model ?? model) }));
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-    turns.map((t, i) => /* @__PURE__ */ jsxRuntimeExports.jsx(InstructionFile, { it: t.blocks[0].it, model, tokens: tokens2[i] }, t.uuid)),
-    turns.length > 1 && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "aux instruction-total", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "instruction-tokens", children: [
+    groupInstructions(strips).map(([label, list]) => /* @__PURE__ */ jsxRuntimeExports.jsxs(React.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "aux instruction-source", children: label }),
+      list.map((it) => /* @__PURE__ */ jsxRuntimeExports.jsx(InstructionFile, { it, model, tokens: it.tokens }, `${it.hash ?? it.file_path}-${it.timestamp}`))
+    ] }, label)),
+    strips.length > 1 && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "aux instruction-total", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "instruction-tokens", children: [
       "~ ",
-      fmtCompact(tokens2.reduce((a, b) => a + b, 0))
+      fmtCompact(strips.reduce((a, it) => a + it.tokens, 0))
     ] }) })
   ] });
 }
@@ -1883,7 +1934,7 @@ const Pane = React.memo(function Pane2({ value, headers, seen, expandAll }) {
     ] })
   ] });
 });
-function RequestsView({ sessionId, date, granularity = "day", fileSize = 0, expandAll = null }) {
+function RequestsView({ filePath, date, granularity = "day", fileSize = 0, expandAll = null }) {
   const [records, setRecords] = reactExports.useState(null);
   const [selected, setSelected] = reactExports.useState(0);
   const [tab, setTab] = reactExports.useState("request");
@@ -1894,16 +1945,16 @@ function RequestsView({ sessionId, date, granularity = "day", fileSize = 0, expa
   reactExports.useEffect(() => {
     setRecords(null);
     setSelected(0);
-  }, [sessionId, date, granularity]);
+  }, [filePath, date, granularity]);
   reactExports.useEffect(() => {
     let cancelled = false;
-    window.api.readRequests(sessionId, date || null, granularity).then((res) => {
+    window.api.readRequests(filePath, date || null, granularity).then((res) => {
       if (!cancelled) setRecords(res);
     });
     return () => {
       cancelled = true;
     };
-  }, [sessionId, date, granularity, fileSize]);
+  }, [filePath, date, granularity, fileSize]);
   if (!records) return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "requests-view", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "requests-empty", children: "Loading…" }) });
   if (!records.length) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "requests-view", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "requests-empty", children: "No captured requests for this session. Requests are recorded only while the capture proxy is running." }) });
@@ -1949,8 +2000,8 @@ function resultText(r) {
 }
 function renderBlock(b) {
   if (b.type === "text") return truncate(b.text || "");
-  if (b.type === "thinking") return `thinking:
-${fence(b.thinking || "")}`;
+  if (b.type === "thinking") return b.redacted ? `_Thinking (encrypted${b.redacted > 1 ? ` · ${b.redacted}` : ""})_` : `Thinking:
+${fence(b.thinking)}`;
   if (b.type === "tool_use") {
     const tail = b.result ? `
 ${b.result.is_error ? "error" : "result"}:
@@ -1961,6 +2012,8 @@ ${fence(JSON.stringify(b.input, null, 2), "json")}${tail}`;
   }
   if (b.type === "tool_result") return `${b.is_error ? "error" : "result"}:
 ${fence(resultText(b))}`;
+  if (b.type === "skill") return `Skill${b.name ? `: ${b.name}` : ""}:
+${fence(b.text)}`;
   if (b.type === "image") return "[image]";
   if (b.type === "instruction") {
     const it = b.it;
@@ -1972,9 +2025,11 @@ ${fence(it.error ? `error: ${it.error}` : it.content || "")}`;
   return fence(JSON.stringify(b, null, 2), "json");
 }
 function renderTurn(t) {
-  if (t.role === "instruction") return `**Instructions loaded:**
+  if (t.role === "instruction") {
+    return groupInstructions(t.blocks.map((b) => b.it)).map(([label, list]) => `**Instructions loaded (${label}):**
 
-${t.blocks.map(renderBlock).join("\n\n")}`;
+${list.map((it) => renderBlock({ type: "instruction", it })).join("\n\n")}`).join("\n\n");
+  }
   const role = t.role === "user" ? t.queued ? "User (queued)" : "User" : `Assistant`;
   const tokens2 = t.tokenTotal > 0 && t.tokenDelta != null ? ` (${t.tokenDelta >= 0 ? "+" : ""}${fmtCompact(t.tokenDelta)} / ${fmtCompact(t.tokenTotal)} tokens)` : "";
   return `**${role}${tokens2}:**
@@ -2026,7 +2081,7 @@ ${transcript}`;
 - Wall duration: ${fmtDuration(wallDuration)}
 - Active periods: ${fmtNum(meta.activityPeriods.length)}
 - Messages: ${fmtNum(meta.messageCount)}
-- Tool calls: ${fmtNum(meta.toolCalls)}
+- Tool calls: ${fmtToolCalls(meta)}
 
 ## Identity
 - Model: ${meta.models.join(", ") || "—"}
@@ -2271,7 +2326,7 @@ ${body}`);
       /* @__PURE__ */ jsxRuntimeExports.jsx(Field, { label: "Wall duration", value: fmtDuration(wallDuration) }),
       /* @__PURE__ */ jsxRuntimeExports.jsx(Field, { label: "Active periods", value: fmtNum(meta.activityPeriods.length) }),
       /* @__PURE__ */ jsxRuntimeExports.jsx(Field, { label: "Messages", value: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: tone(meta.messageCount, THRESHOLDS.messages), children: fmtNum(meta.messageCount) }) }),
-      /* @__PURE__ */ jsxRuntimeExports.jsx(Field, { label: "Tool calls", value: fmtNum(meta.toolCalls) })
+      /* @__PURE__ */ jsxRuntimeExports.jsx(Field, { label: "Tool calls", value: fmtToolCalls(meta) })
     ] }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs(Section, { title: "Identity", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(Field, { label: "Model", value: modelLabel, mono: true }),
@@ -2363,17 +2418,17 @@ function Session({ meta, missing, date, granularity = "day" }) {
   const [mode, setMode] = useLocalStorage("session.view-mode", "conversation");
   const [agentOpen, setAgentOpen] = reactExports.useState(false);
   const [expandAll, setExpandAll] = reactExports.useState(null);
-  const sessionId = meta?.sessionId;
+  const filePath = meta?.filePath;
   const fileSize = meta?.fileSize;
-  const agent = useAgent(`${sessionId}|${date}`);
+  const agent = useAgent(`${filePath}|${date}`);
   reactExports.useEffect(() => {
     setItems(null);
     setInstructions([]);
-  }, [sessionId, date, granularity]);
+  }, [filePath, date, granularity]);
   reactExports.useEffect(() => {
-    if (!sessionId) return;
+    if (!filePath) return;
     let cancelled = false;
-    window.api.readSession(sessionId, date || null, granularity).then((res) => {
+    window.api.readSession(filePath, date || null, granularity).then((res) => {
       if (cancelled || !res) return;
       setItems(res.items);
       setInstructions(res.instructions || []);
@@ -2381,7 +2436,7 @@ function Session({ meta, missing, date, granularity = "day" }) {
     return () => {
       cancelled = true;
     };
-  }, [sessionId, date, granularity, fileSize]);
+  }, [filePath, date, granularity, fileSize]);
   if (!meta) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "session-view empty", children: missing?.warn ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "session-missing", children: [
       "⚠ ",
@@ -2410,7 +2465,7 @@ function Session({ meta, missing, date, granularity = "day" }) {
           }
         )
       ] }),
-      mode === "conversation" ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "view-tab-pane-content", children: items ? /* @__PURE__ */ jsxRuntimeExports.jsx(ConversationView, { items, instructions, expandAll }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "empty", children: "Loading conversation…" }) }) : mode === "jsonl" ? /* @__PURE__ */ jsxRuntimeExports.jsx(JsonlView, { items, expandAll }) : /* @__PURE__ */ jsxRuntimeExports.jsx(RequestsView, { sessionId, date, granularity, fileSize, expandAll })
+      mode === "conversation" ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "view-tab-pane-content", children: items ? /* @__PURE__ */ jsxRuntimeExports.jsx(ConversationView, { items, instructions, expandAll }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "empty", children: "Loading conversation…" }) }) : mode === "jsonl" ? /* @__PURE__ */ jsxRuntimeExports.jsx(JsonlView, { items, expandAll }) : /* @__PURE__ */ jsxRuntimeExports.jsx(RequestsView, { filePath, date, granularity, fileSize, expandAll })
     ] }),
     /* @__PURE__ */ jsxRuntimeExports.jsx(SessionSummary, { meta, items, instructions, agent, onOpenAgent: () => setAgentOpen(true), granularity })
   ] }) }) }) }) });
@@ -2477,10 +2532,9 @@ function StatusSwitch({ service, on, warn, button, className = "", tooltip, chan
     )
   ] });
 }
-const proxyTooltip = /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { children: [
-  "Captures Claude Code's raw API traffic - system prompt, tool definitions, injected reminders, responses.",
-  /* @__PURE__ */ jsxRuntimeExports.jsx("p", {}),
-  "Applies only to newly started Claude Code sessions."
+const proxyTooltip = /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+  /* @__PURE__ */ jsxRuntimeExports.jsx("p", { children: "Captures Claude Code's raw API traffic - system prompt, tool definitions, injected reminders, responses." }),
+  /* @__PURE__ */ jsxRuntimeExports.jsx("p", { children: "Applies only to newly started Claude Code sessions." })
 ] });
 const proxyChanges = /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
   /* @__PURE__ */ jsxRuntimeExports.jsx("pre", { children: `"env": {
@@ -2578,6 +2632,15 @@ function App() {
     const end = endOfPeriod(anchor, granularity);
     return { start, end };
   }, [anchor, granularity]);
+  reactExports.useEffect(() => {
+    const shown = startOfPeriod(Date.now(), granularity);
+    if (anchor !== shown) return;
+    const id = setInterval(() => {
+      const current = startOfPeriod(Date.now(), granularity);
+      if (current !== shown) setAnchor(current);
+    }, 6e4);
+    return () => clearInterval(id);
+  }, [anchor, granularity]);
   reactExports.useEffect(() => {
     let cancelled = false;
     setScanProgress(null);
@@ -2609,7 +2672,7 @@ function App() {
     return { sourceFiltered, past, availableSources };
   }, [sessions, sourceFilter, projectFilter]);
   const selected = reactExports.useMemo(
-    () => sessions.find((s) => s.sessionId === selectedId) || null,
+    () => sessions.find((s) => s.filePath === selectedId || s.sessionId === selectedId) || null,
     [sessions, selectedId]
   );
   let missing = null;
@@ -2682,7 +2745,7 @@ function App() {
                   dayRange,
                   sessions: dayItems.sourceFiltered,
                   onSelect: selectSession,
-                  selectedId,
+                  selectedId: selected?.filePath ?? null,
                   dayAnchor: anchor,
                   granularity,
                   projectFilter,
@@ -2705,7 +2768,7 @@ function App() {
                   SessionList,
                   {
                     sessions: dayItems.past,
-                    selectedId,
+                    selectedId: selected?.filePath ?? null,
                     deepLink,
                     onSelect: selectSession
                   }

package/out/renderer/assets/{index-B1hu0QHl.css → index-DZ1Gj6hz.css}

@@ -616,6 +616,8 @@
   color: var(--accent, #4ea1ff);
 }
 
+.session-command { color: var(--accent); }
+
 .subagent-tag,
 .worktree-tag {
   font-family: var(--font-mono), monospace;
@@ -721,7 +723,7 @@
 }
 
 .conv-row + .conv-row { margin-top: 15px; }
-/* One instruction row per API call (see groupTurns) — the gap keeps two calls' strips apart. */
+/* The session's one instruction row (see flatten) — the gap keeps its strips off the first message. */
 .conv-row-instruction + .conv-row { margin-top: 20px; }
 .conv-row-assistant + .conv-row-user { margin-top: 60px; }
 .conv-row-assistant + .conv-row-assistant { margin-top: 0; }
@@ -921,6 +923,7 @@ button.msg-summary:hover { color: var(--text); background: var(--bg-elev-2); bor
     text-align: left;
     margin: 0;
   }
+  & .block-command + .block-text { margin-top: 4px; }
 }
 
 .turn-assistant .block-text { color: var(--text); }
@@ -1052,13 +1055,26 @@ button.msg-summary:hover { color: var(--text); background: var(--bg-elev-2); bor
   }
 }
 
-/* Instruction files (system prompt / CLAUDE.md / memory) extracted from the captured API requests. */
-.instruction-file {
+/* Instruction files (system prompt / CLAUDE.md / memory) extracted from the captured API requests,
+   and the label over each group — one unbroken strip down the whole run. */
+.instruction-file,
+.instruction-source {
   border-left: 2px solid #a78bfa;
   padding-left: 8px;
   margin-left: -10px;
 }
 
+/* Group label over the strips read from one part of the request (system prompt / tools / user message). */
+.instruction-source {
+  font-family: var(--font-mono), monospace;
+  font-size: calc(10.5px * var(--font-scale, 1));
+  color: var(--text-faint);
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  padding-top: 6px;
+}
+.instruction-source:first-child { padding-top: 0; }
+
 /* Full-width toggle so the estimated token count can sit right-aligned, like msg-header-right. */
 .instruction-file .aux-toggle { display: flex; width: 100%; align-items: center; }
 .instruction-tokens { margin-left: auto; color: var(--text-faint); }
@@ -2319,4 +2335,4 @@ button:hover { background: var(--border); }
 .kind-suggest { color: #6ea882; }
 .kind-web { color: #5fa8ad; }
 .kind-security { color: #c4937b; }
-.kind-quota, .kind-status, .kind-count { color: var(--text-faint); }
+.kind-quota, .kind-status, .kind-count, .kind-aux { color: var(--text-faint); }