cogpit-memory 0.3.0 → 0.4.1

package/dist/index.js

@@ -54,10 +54,39 @@ var import_better_sqlite3 = __toESM(require("better-sqlite3"));
 var Database = import_better_sqlite3.default;
 
 // src/lib/search-index.ts
-var import_node_fs2 = require("node:fs");
+var import_node_fs3 = require("node:fs");
 
 // src/lib/types.ts
-var AGENT_KINDS = ["codex", "copilot", "claude"];
+var AGENT_KINDS = ["acp", "codex", "copilot", "claude"];
+
+// src/lib/instances.ts
+function instanceSessionId(instanceId, nativeId) {
+  if (instanceId === "default") return nativeId;
+  const bytes = new TextEncoder().encode(nativeId);
+  const encoded = btoa(Array.from(bytes, (byte) => String.fromCharCode(byte)).join("")).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+  return `i-${instanceId}__${encoded}`;
+}
+function splitInstanceSessionId(id) {
+  const match = /^i-([A-Za-z0-9-]+)__([A-Za-z0-9_-]+)$/.exec(id);
+  if (!match) return { instanceId: "default", nativeId: id };
+  try {
+    const bytes = Uint8Array.from(atob(match[2].replace(/-/g, "+").replace(/_/g, "/")), (character) => character.charCodeAt(0));
+    return { instanceId: match[1], nativeId: new TextDecoder("utf-8", { fatal: true }).decode(bytes) };
+  } catch {
+    throw new Error("Invalid instance session ID");
+  }
+}
+function instanceDirName(instanceId, nativeDirName) {
+  return instanceId === "default" ? nativeDirName : `instance__${instanceId}__${nativeDirName}`;
+}
+function splitInstanceDirName(dirName) {
+  const match = /^instance__([A-Za-z0-9-]+)__(.+)$/.exec(dirName ?? "");
+  return match ? { instanceId: match[1], nativeDirName: match[2] } : { instanceId: "default", nativeDirName: dirName ?? "" };
+}
+function scopeParsedSession(session, instanceId) {
+  if (instanceId === "default") return session;
+  return { ...session, instanceId, sessionId: instanceSessionId(instanceId, splitInstanceSessionId(session.sessionId).nativeId), ...session.branchedFrom ? { branchedFrom: { ...session.branchedFrom, sessionId: instanceSessionId(instanceId, splitInstanceSessionId(session.branchedFrom.sessionId).nativeId) } } : {} };
+}
 
 // src/lib/agent-descriptors.ts
 var SESSION_UUID = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
@@ -84,14 +113,26 @@ function base64DirNameCodec(prefix) {
   return {
     lossy: false,
     owns: (dirName) => typeof dirName === "string" && dirName.startsWith(prefix),
+    recognizes: (dirName) => {
+      const cwd = decodeBase64DirName(prefix, dirName);
+      return cwd !== null && cwd !== "" && encodeBase64DirName(prefix, cwd) === dirName;
+    },
     encode: (cwd) => encodeBase64DirName(prefix, cwd),
     decode: (dirName) => decodeBase64DirName(prefix, dirName)
   };
 }
 function sessionIdFromJsonlName(fileName) {
-  const match = new RegExp(`(${SESSION_UUID})\\.jsonl$`, "i").exec(fileName);
+  const match = new RegExp(`(${SESSION_UUID})\\.jsonl(?:\\.zst)?$`, "i").exec(fileName);
   return match ? match[1] : null;
 }
+function ownTranscriptRoot(sessionId) {
+  return sessionId ? { rootSessionId: sessionId.toLowerCase(), isRootTranscript: true } : null;
+}
+function plainPathSegments(relativePath) {
+  const segments = relativePath.split("/");
+  const plain = segments.every((segment) => segment !== "" && segment !== "." && segment !== ".." && !segment.includes("\\"));
+  return plain ? segments : null;
+}
 var jsonlPathUrlCodec = {
   urlId: (fileName) => fileName.replace(/\.jsonl$/, ""),
   fileNameFromUrlId: (urlId) => urlId.endsWith(".jsonl") ? urlId : `${urlId}.jsonl`
@@ -109,6 +150,17 @@ var ARGV_SESSION_ID = "[0-9a-f-]{36}";
 var CODEX_DIR_PREFIX = "codex__";
 var COPILOT_DIR_PREFIX = "copilot__";
 var CLAUDE_PERMISSION_MODES = /* @__PURE__ */ new Set(["default", "plan", "acceptEdits", "dontAsk", "auto"]);
+var CLAUDE_SESSION_CHILD_DIRS = /* @__PURE__ */ new Set(["subagents", "workflows"]);
+function claudeTranscriptRoot(relativePath) {
+  const segments = plainPathSegments(relativePath);
+  if (!segments) return null;
+  const [root, childDir] = segments;
+  if (segments.length === 1) {
+    const sessionId = root.replace(/\.jsonl$/, "");
+    return sessionId !== root && isSessionUuid(sessionId) ? ownTranscriptRoot(sessionId) : null;
+  }
+  return segments.length > 2 && CLAUDE_SESSION_CHILD_DIRS.has(childDir) && isSessionUuid(root) ? { rootSessionId: root.toLowerCase(), isRootTranscript: false } : null;
+}
 var claude = {
   kind: "claude",
   displayName: "Claude Code",
@@ -119,6 +171,8 @@ var claude = {
     // registry checks the prefixed agents first, so this is only ever reached
     // as the terminal arm.
     owns: (dirName) => typeof dirName === "string" && !dirName.startsWith(CODEX_DIR_PREFIX) && !dirName.startsWith(COPILOT_DIR_PREFIX),
+    // An absolute path starts with `/` or `\` (`-`) or a drive (`C:\` → `C--`); a drive root alone is `C-`.
+    recognizes: (dirName) => /^(?:(?:-|[A-Za-z]--)[A-Za-z0-9-]*|[A-Za-z]-)$/.test(dirName),
     /**
      * Claude Code's own convention: every character outside `[A-Za-z0-9]`
      * becomes `-`, so `/Users/x/proj` and `C:\Users\x\proj` both collapse into a
@@ -136,10 +190,12 @@ var claude = {
       return "/" + dirName.replace(/^-/, "").replace(/-/g, "/");
     }
   },
+  projectWorktreeDir: ".claude/worktrees",
   sessionFile: {
     name: (sessionId) => `${sessionId}.jsonl`,
     sessionId: sessionIdFromJsonlName,
-    ...jsonlPathUrlCodec
+    ...jsonlPathUrlCodec,
+    transcriptRoot: claudeTranscriptRoot
   },
   metadataFromHead: true,
   resume: {
@@ -174,6 +230,7 @@ var claude = {
     bundledBySdk: true,
     homeDirName: ".claude",
     homeEnvVar: null,
+    sdkHomeEnvVar: "CLAUDE_CONFIG_DIR",
     installMarker: "projects",
     homeIsDiscoverable: false,
     process: {
@@ -185,7 +242,8 @@ var claude = {
     rootDirName: ".claude",
     instructions: [
       { in: "scope", path: "CLAUDE.md", scopes: ["global", "project"] },
-      { in: "root", path: "CLAUDE.md", label: ".claude/CLAUDE.md", scopes: ["project"] }
+      { in: "root", path: "CLAUDE.md", label: ".claude/CLAUDE.md", scopes: ["project"] },
+      { in: "scope", path: "AGENTS.md", scopes: ["project"], fallback: true }
     ],
     settings: [
       { in: "root", path: "settings.json", scopes: ["global"] },
@@ -230,9 +288,12 @@ var claude = {
     nativeRewind: false,
     fileCheckpoints: true,
     reasoningEffort: true,
+    configurableContextWindow: false,
     fastTier: true,
+    lowPriorityInTerminal: true,
     imageInput: true,
-    midTurnSteering: false,
+    midTurnSteering: true,
+    activeNotifications: true,
     stopSession: true,
     ultracode: true,
     contextWindow: true,
@@ -240,6 +301,7 @@ var claude = {
     accountSwitching: true,
     modelFallbackNotices: true,
     autoPermissionMode: "per-model",
+    toolPermissionRules: true,
     settingsApply: "live",
     turnLiveness: "transcript",
     tokenStreaming: true,
@@ -256,6 +318,7 @@ var codex = {
   displayName: "Codex",
   binName: "codex",
   dirName: base64DirNameCodec(CODEX_DIR_PREFIX),
+  projectWorktreeDir: null,
   sessionFile: {
     /**
      * Codex nests rollouts by local date:
@@ -272,7 +335,9 @@ var codex = {
     },
     sessionId: sessionIdFromJsonlName,
     // The date nesting is unrecoverable from the id, so the URL keeps the path.
-    ...jsonlPathUrlCodec
+    ...jsonlPathUrlCodec,
+    // A sub-agent is a rollout of its own, linked to its parent only in its header.
+    transcriptRoot: (relativePath) => plainPathSegments(relativePath) ? ownTranscriptRoot(sessionIdFromJsonlName(relativePath)) : null
   },
   // A rollout's header carries no turn count and no last user message; both
   // only settle at the end of the file.
@@ -285,6 +350,7 @@ var codex = {
     permissions: (permissions) => {
       const mode = permissions?.mode || "default";
       if (mode === "bypassPermissions") return ["--dangerously-bypass-approvals-and-sandbox"];
+      if (mode === "auto") return ["--approve-for-me"];
       return [
         "--sandbox",
         mode === "plan" ? "read-only" : "workspace-write",
@@ -313,6 +379,7 @@ var codex = {
     bundledBySdk: false,
     homeDirName: ".codex",
     homeEnvVar: "CODEX_HOME",
+    sessionIdEnvVar: "CODEX_THREAD_ID",
     installMarker: "",
     homeIsDiscoverable: true,
     process: {
@@ -344,7 +411,7 @@ var codex = {
     extendedContext: null
   },
   capabilities: {
-    worktrees: false,
+    worktrees: true,
     mcp: false,
     slashCommands: false,
     workflows: false,
@@ -358,16 +425,20 @@ var codex = {
     nativeRewind: false,
     fileCheckpoints: false,
     reasoningEffort: true,
+    configurableContextWindow: true,
     fastTier: true,
+    lowPriorityInTerminal: false,
     imageInput: true,
     midTurnSteering: true,
+    activeNotifications: true,
     stopSession: false,
     ultracode: false,
     contextWindow: false,
     externalProcesses: false,
     accountSwitching: false,
     modelFallbackNotices: false,
-    autoPermissionMode: "never",
+    autoPermissionMode: "always",
+    toolPermissionRules: true,
     settingsApply: "next-turn",
     turnLiveness: "runtime",
     tokenStreaming: true,
@@ -376,24 +447,25 @@ var codex = {
     namedSessions: false
   }
 };
+function copilotSessionId(fileName) {
+  const match = new RegExp(`^(${SESSION_UUID})/events\\.jsonl$`, "i").exec(fileName);
+  return match ? match[1] : null;
+}
 var copilot = {
   kind: "copilot",
   displayName: "GitHub Copilot CLI",
   binName: "copilot",
   dirName: base64DirNameCodec(COPILOT_DIR_PREFIX),
+  projectWorktreeDir: null,
   sessionFile: {
     /** Copilot keeps one directory per session: `<uuid>/events.jsonl`. */
     name: (sessionId) => `${sessionId}/events.jsonl`,
-    sessionId: (fileName) => {
-      const match = new RegExp(`^(${SESSION_UUID})/events\\.jsonl$`, "i").exec(fileName);
-      return match ? match[1] : null;
-    },
+    sessionId: copilotSessionId,
     // `<id>/events.jsonl` rebuilds from the id, so URLs stay short.
-    urlId: (fileName) => {
-      const match = new RegExp(`^(${SESSION_UUID})/events\\.jsonl$`, "i").exec(fileName);
-      return match ? match[1] : fileName.replace(/\.jsonl$/, "");
-    },
-    fileNameFromUrlId: (urlId) => urlId.endsWith(".jsonl") ? urlId : `${urlId}/events.jsonl`
+    urlId: (fileName) => copilotSessionId(fileName) ?? fileName.replace(/\.jsonl$/, ""),
+    fileNameFromUrlId: (urlId) => urlId.endsWith(".jsonl") ? urlId : `${urlId}/events.jsonl`,
+    // Sub-agents are events inside the parent transcript, so every file is a root.
+    transcriptRoot: (relativePath) => ownTranscriptRoot(copilotSessionId(relativePath))
   },
   metadataFromHead: true,
   resume: {
@@ -475,9 +547,12 @@ var copilot = {
     fileCheckpoints: false,
     // Effort is only offered for models whose catalog entry advertises it.
     reasoningEffort: false,
+    configurableContextWindow: false,
     fastTier: false,
+    lowPriorityInTerminal: false,
     imageInput: false,
     midTurnSteering: true,
+    activeNotifications: true,
     stopSession: true,
     ultracode: false,
     contextWindow: false,
@@ -485,6 +560,7 @@ var copilot = {
     accountSwitching: false,
     modelFallbackNotices: false,
     autoPermissionMode: "always",
+    toolPermissionRules: true,
     settingsApply: "next-turn",
     turnLiveness: "runtime",
     tokenStreaming: false,
@@ -492,21 +568,56 @@ var copilot = {
     namedSessions: true
   }
 };
+var acp = {
+  ...copilot,
+  kind: "acp",
+  displayName: "ACP agent",
+  binName: "acp",
+  dirName: base64DirNameCodec("acp__"),
+  sessionFile: { name: (id) => `${id}.jsonl`, sessionId: sessionIdFromJsonlName, ...jsonlPathUrlCodec, transcriptRoot: (path) => {
+    const segments = plainPathSegments(path);
+    return segments?.length === 1 ? ownTranscriptRoot(sessionIdFromJsonlName(path)) : null;
+  } },
+  resume: { command: () => "Resume this session in Cogpit", args: () => [] },
+  launchArgs: { permissions: () => [], model: () => [], effort: () => [], fastTier: () => [] },
+  cli: { ...copilot.cli, packageName: "", homebrew: null, wingetId: null, selfUpdate: null, requiresConfiguration: true, homeDirName: ".cogpit-acp", homeEnvVar: "COGPIT_ACP_HOME", homeIsDiscoverable: true, installMarker: "projects" },
+  config: { ...copilot.config, rootDirName: ".cogpit-acp", instructions: [], settings: [], skillsDir: null },
+  capabilities: { ...copilot.capabilities, undo: false, redo: false, nativeRewind: false, nativeFork: false, midTurnSteering: false, activeNotifications: false, externalProcesses: false, autoPermissionMode: "never", toolPermissionRules: false, namedSessions: false }
+};
 var DESCRIPTORS = Object.freeze({
   claude,
   codex,
-  copilot
+  copilot,
+  acp
 });
 function descriptorFor(kind) {
   return DESCRIPTORS[kind];
 }
 function descriptorForDirName(dirName) {
+  const scoped = splitInstanceDirName(dirName);
+  if (scoped.instanceId !== "default") {
+    const descriptor = descriptorForDirName(scoped.nativeDirName);
+    return {
+      ...descriptor,
+      dirName: { ...descriptor.dirName, encode: (cwd) => instanceDirName(scoped.instanceId, descriptor.dirName.encode(cwd)), decode: (name) => descriptor.dirName.decode(splitInstanceDirName(name).nativeDirName) },
+      sessionFile: { ...descriptor.sessionFile, name: (id) => descriptor.sessionFile.name(splitInstanceSessionId(id).nativeId), sessionId: (file) => {
+        const nativeId = descriptor.sessionFile.sessionId(file);
+        return nativeId ? instanceSessionId(scoped.instanceId, nativeId) : null;
+      }, transcriptRoot: (file) => {
+        const root = descriptor.sessionFile.transcriptRoot(file);
+        return root ? { ...root, rootSessionId: instanceSessionId(scoped.instanceId, root.rootSessionId) } : null;
+      } }
+    };
+  }
   for (const kind of AGENT_KINDS) {
     if (kind === "claude") continue;
     if (DESCRIPTORS[kind].dirName.owns(dirName)) return DESCRIPTORS[kind];
   }
   return claude;
 }
+function isSessionUuid(value) {
+  return SESSION_UUID_RE.test(value);
+}
 
 // src/lib/codex-exec.ts
 var JS_SIMPLE_ESCAPES = {
@@ -575,6 +686,27 @@ function readJsStringLiteral(source, startIndex) {
   return null;
 }
 
+// src/lib/backgroundAgents.ts
+function awaitingAgentsStatus(launches, pendingQueue = 0) {
+  if (!launches.some((launch) => launch.endedAt === void 0)) return null;
+  const ordered = [...launches].sort((a, b) => a.launchedAt - b.launchedAt);
+  let batchStart = 0;
+  let busyUntil = -Infinity;
+  ordered.forEach((launch, index) => {
+    if (busyUntil < launch.launchedAt) batchStart = index;
+    busyUntil = Math.max(busyUntil, launch.endedAt ?? Infinity);
+  });
+  const batch = ordered.slice(batchStart).map(({ agent, endedAt }) => ({ ...agent, done: endedAt !== void 0 }));
+  const running = batch.filter((agent) => !agent.done);
+  return {
+    status: "awaiting_agents",
+    pendingQueue,
+    pendingAgents: running.length,
+    pendingAgentDescriptions: running.map((agent) => agent.description).filter((description) => description.length > 0),
+    backgroundAgents: batch
+  };
+}
+
 // src/lib/messageTypeGuards.ts
 function isUserMessage(msg) {
   return msg.type === "user";
@@ -682,6 +814,36 @@ function parseAgentEnvelope(text) {
   return { sender, matched, body: matched ? unwrapped.trim() : text };
 }
 
+// src/lib/toolResults.ts
+function record(value) {
+  return value && typeof value === "object" ? value : {};
+}
+function toolResultMetadata(name, value) {
+  const result = record(value);
+  if (name === "Edit" || name === "Write") {
+    return result.staged === true ? { awaitingReview: true } : {};
+  }
+  if (name !== "Bash") return {};
+  const diff = record(result.bashEditDiff);
+  if (!Array.isArray(diff.files)) return {};
+  const files = [];
+  for (const raw of diff.files) {
+    const file = record(raw);
+    if (typeof file.filePath !== "string" || !file.filePath || !Array.isArray(file.hunks)) continue;
+    const hunks = [];
+    for (const rawHunk of file.hunks) {
+      const hunk = record(rawHunk);
+      const { oldStart, oldLines, newStart, newLines, lines } = hunk;
+      if (![oldStart, oldLines, newStart, newLines].every((n) => typeof n === "number" && Number.isInteger(n) && n >= 0)) continue;
+      if (!Array.isArray(lines) || !lines.every((line) => typeof line === "string" && /^[ +\\-]/.test(line))) continue;
+      hunks.push({ oldStart, oldLines, newStart, newLines, lines });
+    }
+    if (hunks.length) files.push({ filePath: file.filePath, hunks });
+  }
+  const more = typeof diff.moreFiles === "number" && Number.isInteger(diff.moreFiles) && diff.moreFiles > 0 ? diff.moreFiles : 0;
+  return { fileDiffs: files, ...more ? { additionalFileDiffs: more } : {} };
+}
+
 // src/lib/turnBuilder.ts
 function extractTextFromContent(content) {
   if (typeof content === "string") return content;
@@ -709,6 +871,17 @@ function isTaskNotificationRecord(msg) {
   if (!text.includes("<task-notification>")) return false;
   return text.replace(TASK_NOTIFICATION_BLOCK_RE, "").replace(ANY_TAG_RE, "").trim() === "";
 }
+function isTaskToolName(name) {
+  return name === "Task" || name === "Agent";
+}
+function readTaskMeta(input) {
+  const effort = input.effort;
+  return {
+    name: typeof input.name === "string" ? input.name : null,
+    subagentType: typeof input.subagent_type === "string" ? input.subagent_type : null,
+    effort: typeof effort === "string" || typeof effort === "number" ? String(effort) : null
+  };
+}
 function queuedCommandPrompt(msg) {
   if (!isAttachmentMessage(msg)) return null;
   const attachment = msg.attachment;
@@ -1049,6 +1222,16 @@ function buildTurnsWithStarts(messages) {
       pendingRecap = { content: msg.content, timestamp: msg.timestamp };
       continue;
     }
+    if (isSystemMessage(msg) && msg.subtype === "local_command" && msg.content) {
+      current?.contentBlocks.push({
+        kind: "local_command",
+        content: msg.content,
+        timestamp: msg.timestamp,
+        ...msg.contextUsage ? { contextUsage: msg.contextUsage } : {},
+        ...msg.usageReport ? { usageReport: msg.usageReport } : {}
+      });
+      continue;
+    }
     if (isQueueOperationMessage(msg)) {
       if (current && msg.operation === "enqueue" && isVisibleQueuedPrompt(msg.content)) {
         const parsed = parseAgentEnvelope(msg.content);
@@ -1100,6 +1283,8 @@ function buildTurnsWithStarts(messages) {
               if (pending) {
                 pending.turn.toolCalls[pending.index].result = extractToolResultText(block.content);
                 pending.turn.toolCalls[pending.index].isError = block.is_error === true;
+                const call = pending.turn.toolCalls[pending.index];
+                Object.assign(call, toolResultMetadata(call.name, msg.toolUseResult));
                 pendingToolUses.delete(block.tool_use_id);
               }
             }
@@ -1120,6 +1305,7 @@ function buildTurnsWithStarts(messages) {
               parentToolUseId: toolUseId || void 0,
               agentName: taskMeta?.name ?? null,
               subagentType: taskMeta?.subagentType ?? null,
+              ...taskMeta?.effort ? { effort: taskMeta.effort } : {},
               type: "assistant",
               content: toolUseResult.content,
               toolCalls: [],
@@ -1258,15 +1444,12 @@ function buildTurnsWithStarts(messages) {
           current.toolCalls.push(tc);
           msgToolCalls.push(tc);
           pendingToolUses.set(block.id, { turn: current, index: idx });
-          if (block.name === "Task" || block.name === "Agent") {
+          if (isTaskToolName(block.name)) {
             const input = block.input;
             if (input.run_in_background === true) {
               backgroundAgentParentIds.add(block.id);
             }
-            taskMetaMap.set(block.id, {
-              name: input.name ?? null,
-              subagentType: input.subagent_type ?? null
-            });
+            taskMetaMap.set(block.id, readTaskMeta(input));
           }
         }
       }
@@ -1277,6 +1460,7 @@ function buildTurnsWithStarts(messages) {
     if (isProgressMessage(msg) && msg.data.type === "agent_progress") {
       const data = msg.data;
       const parentId = msg.parentToolUseID ?? "";
+      const ownToolUseId = data.toolUseId ?? parentId;
       let subAgentUsage = null;
       if (data.message.type === "assistant") {
         const innerMsg = data.message.message;
@@ -1293,12 +1477,14 @@ function buildTurnsWithStarts(messages) {
         }
       }
       const innerModel = data.message.type === "assistant" ? data.message.message.model ?? null : null;
-      const taskMeta = taskMetaMap.get(parentId);
+      const taskMeta = taskMetaMap.get(ownToolUseId);
       const agentMsg = {
         agentId: data.agentId,
-        parentToolUseId: parentId || void 0,
+        parentToolUseId: ownToolUseId || void 0,
+        ...data.parentAgentId ? { parentAgentId: data.parentAgentId } : {},
+        ...taskMeta?.effort ? { effort: taskMeta.effort } : {},
         agentName: taskMeta?.name ?? null,
-        subagentType: taskMeta?.subagentType ?? null,
+        subagentType: taskMeta?.subagentType ?? data.subagentType ?? null,
         type: data.message.type,
         content: data.message.message.content,
         toolCalls: [],
@@ -1318,6 +1504,7 @@ function buildTurnsWithStarts(messages) {
             } else if (block.type === "text") {
               agentMsg.text.push(block.text);
             } else if (block.type === "tool_use") {
+              if (isTaskToolName(block.name)) taskMetaMap.set(block.id, readTaskMeta(block.input));
               agentMsg.toolCalls.push({
                 id: block.id,
                 name: block.name,
@@ -1410,11 +1597,19 @@ function buildTurns(messages) {
 function isClaudeSessionText() {
   return true;
 }
+var API_REQUEST_TYPE = '"type":"api-request';
+var RECORD_TYPE_WINDOW = 256;
+function isClaudeNoiseLine(line) {
+  if (line.startsWith(`{${API_REQUEST_TYPE}`)) return true;
+  const head = line.slice(0, RECORD_TYPE_WINDOW);
+  const at = head.indexOf(API_REQUEST_TYPE);
+  return at > 0 && head.lastIndexOf("{", at) === 0;
+}
 function parseRecords(lines) {
   const messages = [];
   for (const line of lines) {
     const trimmed = line.trim();
-    if (!trimmed) continue;
+    if (!trimmed || isClaudeNoiseLine(trimmed)) continue;
     try {
       messages.push(JSON.parse(trimmed));
     } catch {
@@ -1519,21 +1714,24 @@ function userMessageTexts(msg) {
 }
 function collectClaudeBackgroundWork(rawMessages) {
   const launches = [];
-  const resolved = /* @__PURE__ */ new Set();
+  const resolvedAt = /* @__PURE__ */ new Map();
   const queuedIds = /* @__PURE__ */ new Set();
   const deliveredIds = /* @__PURE__ */ new Set();
-  function noteNotifications(text, sink) {
+  function resolve2(id, index) {
+    if (!resolvedAt.has(id)) resolvedAt.set(id, index);
+  }
+  function noteNotifications(text, index, sink) {
     if (!text.includes(TASK_NOTIFICATION_MARKER)) return;
     for (const match of text.matchAll(TASK_ID_RE)) {
-      resolved.add(match[1]);
+      resolve2(match[1], index);
       sink?.add(match[1]);
     }
     for (const match of text.matchAll(TOOL_USE_ID_RE)) {
-      resolved.add(match[1]);
+      resolve2(match[1], index);
       sink?.add(match[1]);
     }
   }
-  for (const msg of rawMessages) {
+  for (const [index, msg] of rawMessages.entries()) {
     if (msg.type === "user") {
       const toolUseResult = isObject(msg.toolUseResult) ? msg.toolUseResult : null;
       if (toolUseResult?.status === "async_launched") {
@@ -1542,9 +1740,11 @@ function collectClaudeBackgroundWork(rawMessages) {
         const toolUseIds = blocks.filter((block) => isObject(block) && block.type === "tool_result").map((block) => block.tool_use_id);
         const ids = [toolUseResult.agentId, toolUseResult.taskId, ...toolUseIds].filter((id) => typeof id === "string" && id.length > 0);
         const description = [toolUseResult.description, toolUseResult.workflowName, toolUseResult.summary].find((value) => typeof value === "string" && value.length > 0) ?? "";
-        if (ids.length > 0) launches.push({ ids, description });
+        const toolUseId = toolUseIds.find((id) => typeof id === "string" && id.length > 0);
+        const startedAt = typeof msg.timestamp === "string" ? msg.timestamp : void 0;
+        if (ids.length > 0) launches.push({ ids, launch: { agent: { description, startedAt, toolUseId }, launchedAt: index } });
       }
-      for (const text of userMessageTexts(msg)) noteNotifications(text, deliveredIds);
+      for (const text of userMessageTexts(msg)) noteNotifications(text, index, deliveredIds);
       continue;
     }
     if (msg.type === "assistant") {
@@ -1554,33 +1754,28 @@ function collectClaudeBackgroundWork(rawMessages) {
         if (!isObject(block) || block.type !== "tool_use" || block.name !== "TaskStop") continue;
         const input = isObject(block.input) ? block.input : null;
         const taskId = input?.task_id ?? input?.shell_id;
-        if (typeof taskId === "string") resolved.add(taskId);
+        if (typeof taskId === "string") resolve2(taskId, index);
       }
       continue;
     }
     if (msg.type === "attachment") {
       const attachment = isObject(msg.attachment) ? msg.attachment : null;
-      if (typeof attachment?.prompt === "string") noteNotifications(attachment.prompt, deliveredIds);
+      if (typeof attachment?.prompt === "string") noteNotifications(attachment.prompt, index, deliveredIds);
       continue;
     }
     if (msg.type === "queue-operation" && typeof msg.content === "string") {
       const op = msg.operation;
-      noteNotifications(msg.content, op === "enqueue" ? queuedIds : deliveredIds);
+      noteNotifications(msg.content, index, op === "enqueue" ? queuedIds : deliveredIds);
     }
   }
   return {
-    pendingDescriptions: launches.filter((launch) => !launch.ids.some((id) => resolved.has(id))).map((launch) => launch.description),
+    launches: launches.map(({ ids, launch }) => {
+      const ends = ids.flatMap((id) => resolvedAt.get(id) ?? []);
+      return ends.length > 0 ? { ...launch, endedAt: Math.min(...ends) } : launch;
+    }),
     undeliveredNotifications: [...queuedIds].filter((id) => !deliveredIds.has(id)).length
   };
 }
-function awaitingAgentsResult(pendingDescriptions, pendingQueue) {
-  return {
-    status: "awaiting_agents",
-    pendingQueue,
-    pendingAgents: pendingDescriptions.length,
-    pendingAgentDescriptions: pendingDescriptions.filter((description) => description.length > 0)
-  };
-}
 function deriveClaudeSessionStatus(rawMessages) {
   let pendingEnqueues = 0;
   let backgroundWork = null;
@@ -1626,9 +1821,8 @@ function deriveClaudeSessionStatus(rawMessages) {
       if (stopReason === "end_turn") {
         const work = getBackgroundWork();
         if (deliveringNotification || work.undeliveredNotifications > 0) return result("processing");
-        if (work.pendingDescriptions.length > 0) {
-          return awaitingAgentsResult(work.pendingDescriptions, Math.max(0, pendingEnqueues));
-        }
+        const awaiting = awaitingAgentsStatus(work.launches, Math.max(0, pendingEnqueues));
+        if (awaiting) return awaiting;
         let hasActivity = false;
         for (let j = i - 1; j >= 0; j--) {
           const m = rawMessages[j];
@@ -2016,9 +2210,60 @@ function safeParseLine(line) {
 function isObject3(value) {
   return typeof value === "object" && value !== null;
 }
-function isCodexRecord(record) {
-  if (!record || typeof record.type !== "string") return false;
-  return record.type === "session_meta" || record.type === "turn_context" || record.type === "event_msg" || record.type === "response_item" || record.type === "inter_agent_communication_metadata" || record.type === "compacted" || record.type === "world_state";
+function codexParentId(payload) {
+  const source = isObject3(payload.source) ? payload.source : null;
+  const subagent = source && isObject3(source.subagent) ? source.subagent : null;
+  const threadSpawn = subagent && isObject3(subagent.thread_spawn) ? subagent.thread_spawn : null;
+  for (const candidate of [payload.forked_from_id, payload.parent_thread_id, threadSpawn?.parent_thread_id]) {
+    if (typeof candidate === "string" && candidate) return candidate;
+  }
+  return null;
+}
+function inheritedHistoryFilter(records) {
+  const meta = records.find((record2) => record2?.type === "session_meta");
+  const start = meta?.payload?.subagent_history_start_ordinal;
+  if (typeof start !== "number") return null;
+  const reachesPast = (ordinal) => typeof ordinal === "number" && ordinal >= start;
+  if (!reachesPast(meta?.rolloutLastOrdinal) && !records.some((record2) => reachesPast(record2?.ordinal))) return null;
+  return (record2) => typeof record2.ordinal === "number" && record2.ordinal > 0 && record2.ordinal < start;
+}
+async function codexPageHeaderLine(firstLine, lastLines) {
+  if (!firstLine.includes('"subagent_history_start_ordinal"')) return firstLine;
+  const meta = safeParseLine(firstLine);
+  if (meta?.type !== "session_meta") return firstLine;
+  const lines = await lastLines();
+  for (let index = lines.length - 1; index >= 0; index--) {
+    const ordinal = safeParseLine(lines[index])?.ordinal;
+    if (typeof ordinal === "number") return JSON.stringify({ ...meta, rolloutLastOrdinal: ordinal });
+  }
+  return firstLine;
+}
+function subAgentActivitySource(record2) {
+  const payload = record2.payload;
+  if (record2.type !== "event_msg" || !isObject3(payload)) return null;
+  if (payload.type === "sub_agent_activity") return payload;
+  if (payload.type === "item_completed" && isObject3(payload.item) && payload.item.type === "SubAgentActivity") return payload.item;
+  return null;
+}
+function readSubAgentActivity(record2) {
+  const source = subAgentActivitySource(record2);
+  if (!source || typeof source.agent_thread_id !== "string" || typeof source.agent_path !== "string") return null;
+  return {
+    agentId: source.agent_thread_id,
+    agentPath: source.agent_path,
+    kind: typeof source.kind === "string" ? source.kind : "started",
+    eventId: findString(source.event_id, source.id) ?? "",
+    model: findString(source.model) || null,
+    effort: findString(source.reasoning_effort) || null
+  };
+}
+function turnErrorMessage(payload) {
+  if (payload.type !== "task_complete" || !isObject3(payload.error)) return "";
+  return typeof payload.error.message === "string" ? payload.error.message.trim() : "";
+}
+function isCodexRecord(record2) {
+  if (!record2 || typeof record2.type !== "string") return false;
+  return record2.type === "session_meta" || record2.type === "turn_context" || record2.type === "event_msg" || record2.type === "response_item" || record2.type === "inter_agent_communication_metadata" || record2.type === "compacted" || record2.type === "world_state";
 }
 function extractMessageText(payload, blockType) {
   const content = payload?.content;
@@ -2213,22 +2458,39 @@ function createTurn2(turnId, timestamp, model) {
     model
   };
 }
-function extractPromptFromRecord(record) {
-  if (record.type === "event_msg" && isObject3(record.payload) && record.payload.type === "user_message" && typeof record.payload.message === "string") {
-    return normalizePromptText(record.payload.message);
+function codexPromptText(record2) {
+  const payload = isObject3(record2.payload) ? record2.payload : null;
+  if (record2.type === "event_msg" && payload?.type === "user_message" && typeof payload.message === "string") {
+    return normalizePromptText(payload.message);
   }
-  if (record.type === "response_item" && isObject3(record.payload) && record.payload.type === "message" && record.payload.role === "user") {
-    return normalizePromptText(extractMessageText(record.payload, "input_text"));
+  if (record2.type === "response_item" && payload?.type === "message" && payload.role === "user") {
+    return normalizePromptText(extractMessageText(payload, "input_text"));
   }
   return "";
 }
-function recordOpensTurn(record, payload) {
-  if (record.type === "session_meta") return false;
-  if (record.type === "event_msg" && payload?.type === "task_started") return false;
-  if (record.type === "response_item" && payload?.type === "message") {
+function createCodexPromptReader() {
+  let echoPending = false;
+  return (record2) => {
+    const payload = isObject3(record2.payload) ? record2.payload : null;
+    if (record2.type === "event_msg" && payload?.type === "user_message") {
+      const isEcho = echoPending;
+      echoPending = false;
+      return isEcho ? "" : codexPromptText(record2);
+    }
+    if (record2.type !== "response_item") return "";
+    const prompt = codexPromptText(record2);
+    if (prompt) echoPending = true;
+    else if (payload?.type !== "message" || payload.role !== "user") echoPending = false;
+    return prompt;
+  };
+}
+function recordOpensTurn(record2, payload) {
+  if (record2.type === "session_meta") return false;
+  if (record2.type === "event_msg" && payload?.type === "task_started") return false;
+  if (record2.type === "response_item" && payload?.type === "message") {
     if (payload.role === "developer" || payload.role === "system") return false;
     if (payload.role === "user") {
-      return extractPromptFromRecord(record) !== "" || extractResponseMessageImages(payload).length > 0 || extractResponseMessageAudio(payload).length > 0;
+      return codexPromptText(record2) !== "" || extractResponseMessageImages(payload).length > 0 || extractResponseMessageAudio(payload).length > 0;
     }
   }
   return true;
@@ -2248,23 +2510,24 @@ function extractMetadataFromRecords(records) {
   let isSubagent = false;
   let parentSessionId = null;
   let agentPath = "/root";
-  let previousPrompt = "";
-  for (const record of records) {
-    if (!isObject3(record.payload)) continue;
-    if (record.type === "session_meta") {
-      sessionId ||= typeof record.payload.id === "string" ? record.payload.id : "";
-      version ||= typeof record.payload.cli_version === "string" ? record.payload.cli_version : "";
-      cwd ||= typeof record.payload.cwd === "string" ? record.payload.cwd : "";
-      if (!branchedFrom && isObject3(record.payload.branchedFrom)) {
-        const sourceId = typeof record.payload.branchedFrom.sessionId === "string" ? record.payload.branchedFrom.sessionId : "";
+  const readPrompt = createCodexPromptReader();
+  const isInherited = inheritedHistoryFilter(records);
+  for (const record2 of records) {
+    if (!isObject3(record2.payload) || isInherited?.(record2)) continue;
+    if (record2.type === "session_meta") {
+      sessionId ||= typeof record2.payload.id === "string" ? record2.payload.id : "";
+      version ||= typeof record2.payload.cli_version === "string" ? record2.payload.cli_version : "";
+      cwd ||= typeof record2.payload.cwd === "string" ? record2.payload.cwd : "";
+      if (!branchedFrom && isObject3(record2.payload.branchedFrom)) {
+        const sourceId = typeof record2.payload.branchedFrom.sessionId === "string" ? record2.payload.branchedFrom.sessionId : "";
         if (sourceId) {
           branchedFrom = {
             sessionId: sourceId,
-            turnIndex: typeof record.payload.branchedFrom.turnIndex === "number" ? record.payload.branchedFrom.turnIndex : null
+            turnIndex: typeof record2.payload.branchedFrom.turnIndex === "number" ? record2.payload.branchedFrom.turnIndex : null
           };
         }
       }
-      const source = isObject3(record.payload.source) ? record.payload.source : null;
+      const source = isObject3(record2.payload.source) ? record2.payload.source : null;
       if (source && isObject3(source.subagent)) {
         isSubagent = true;
         const threadSpawn = isObject3(source.subagent.thread_spawn) ? source.subagent.thread_spawn : null;
@@ -2272,25 +2535,21 @@ function extractMetadataFromRecords(records) {
           agentPath = threadSpawn.agent_path;
         }
       }
-      if (typeof record.payload.forked_from_id === "string" && record.payload.forked_from_id) {
-        parentSessionId = record.payload.forked_from_id;
-      }
-      const git = isObject3(record.payload.git) ? record.payload.git : null;
+      parentSessionId = codexParentId(record2.payload) ?? parentSessionId;
+      const git = isObject3(record2.payload.git) ? record2.payload.git : null;
       gitBranch ||= git && typeof git.branch === "string" ? git.branch : "";
     }
-    if (record.type === "turn_context") {
-      model ||= typeof record.payload.model === "string" ? record.payload.model : "";
-      cwd ||= typeof record.payload.cwd === "string" ? record.payload.cwd : "";
+    if (record2.type === "turn_context") {
+      model ||= typeof record2.payload.model === "string" ? record2.payload.model : "";
+      cwd ||= typeof record2.payload.cwd === "string" ? record2.payload.cwd : "";
     }
-    const prompt = extractPromptFromRecord(record);
+    const prompt = readPrompt(record2);
     if (!prompt) continue;
-    if (prompt === previousPrompt) continue;
     if (!firstUserMessage) firstUserMessage = prompt;
     lastUserMessage = prompt;
-    previousPrompt = prompt;
     turnCount++;
-    if (!timestamp) timestamp = record.timestamp ?? "";
-    lastTimestamp = record.timestamp ?? lastTimestamp;
+    if (!timestamp) timestamp = record2.timestamp ?? "";
+    lastTimestamp = record2.timestamp ?? lastTimestamp;
   }
   if (lastTimestamp === "") lastTimestamp = timestamp;
   return {
@@ -2357,6 +2616,7 @@ function walkCodexRecords(records, options) {
         timestamp: info?.timestamp ?? eventTimestamp2,
         tokenUsage: null,
         model: info?.model ?? null,
+        ...info?.effort ? { effort: info.effort } : {},
         isBackground: false,
         prompt: info?.message || void 0,
         status: update.status ?? "running"
@@ -2377,6 +2637,7 @@ function walkCodexRecords(records, options) {
       agentMessage.agentName = info.nickname ?? (info.agentPath ? agentNameFromPath(info.agentPath) : agentMessage.agentName);
       agentMessage.subagentType = info.agentType;
       agentMessage.model = info.model;
+      if (info.effort) agentMessage.effort = info.effort;
       agentMessage.prompt = info.message || agentMessage.prompt;
     }
     if (update.text && !agentMessage.text.includes(update.text)) {
@@ -2447,20 +2708,21 @@ function walkCodexRecords(records, options) {
     webSearchCalls.set(id, toolCall);
     appendToolCall(targetTurn, toolCall, timestamp);
   }
+  const isInherited = inheritedHistoryFilter(records);
   for (let index = 0; index < records.length; index++) {
-    const record = records[index];
-    if (!isCodexRecord(record)) continue;
+    const record2 = records[index];
+    if (!isCodexRecord(record2) || isInherited?.(record2)) continue;
     recordIndex = index;
-    const payload = isObject3(record.payload) ? record.payload : void 0;
-    const timestamp = record.timestamp ?? "";
-    if (record.type === "compacted") {
+    const payload = isObject3(record2.payload) ? record2.payload : void 0;
+    const timestamp = record2.timestamp ?? "";
+    if (record2.type === "compacted") {
       current = commitTurn(current);
       pendingCompaction = "Conversation compacted";
       lastTurnTimestamp = timestamp;
       continue;
     }
-    if (record.type === "world_state") continue;
-    if (record.type === "turn_context") {
+    if (record2.type === "world_state") continue;
+    if (record2.type === "turn_context") {
       current = commitTurn(current);
       pendingContextIndex = index;
       currentTurnId = typeof payload?.turn_id === "string" ? payload.turn_id : null;
@@ -2469,7 +2731,7 @@ function walkCodexRecords(records, options) {
       sawTurnStart = true;
       continue;
     }
-    if (record.type === "event_msg" && payload?.type === "user_message" && typeof payload.message === "string") {
+    if (record2.type === "event_msg" && payload?.type === "user_message" && typeof payload.message === "string") {
       if (current && (current.assistantText.length > 0 || current.toolCalls.length > 0 || current.thinking.length > 0)) {
         current = commitTurn(current);
       }
@@ -2493,12 +2755,12 @@ function walkCodexRecords(records, options) {
       lastTurnTimestamp = timestamp;
       continue;
     }
-    if (!current && !recordOpensTurn(record, payload)) continue;
+    if (!current && !recordOpensTurn(record2, payload)) continue;
     current ??= createActiveTurn(currentTurnId, timestamp, currentModel);
     if (!current.model && currentModel) current.model = currentModel;
     if (!current.timestamp) current.timestamp = timestamp;
     if (timestamp) lastTurnTimestamp = timestamp;
-    if (record.type === "event_msg" && payload?.type === "token_count") {
+    if (record2.type === "event_msg" && payload?.type === "token_count") {
       const info = isObject3(payload.info) ? payload.info : null;
       const lastUsage = info ? parseTokenUsage(info.last_token_usage) : null;
       if (lastUsage) {
@@ -2506,14 +2768,14 @@ function walkCodexRecords(records, options) {
       }
       continue;
     }
-    if (record.type === "event_msg" && payload?.type === "web_search_end" && typeof payload.call_id === "string") {
+    if (record2.type === "event_msg" && payload?.type === "web_search_end" && typeof payload.call_id === "string") {
       const input = {};
       if (typeof payload.query === "string" && payload.query) input.query = payload.query;
       if (isObject3(payload.action)) input.action = payload.action;
       upsertWebSearchCall(current, payload.call_id, input, "completed", timestamp);
       continue;
     }
-    if (record.type === "event_msg" && payload?.type === "mcp_tool_call_end" && typeof payload.call_id === "string" && isObject3(payload.invocation)) {
+    if (record2.type === "event_msg" && payload?.type === "mcp_tool_call_end" && typeof payload.call_id === "string" && isObject3(payload.invocation)) {
       const invocation = payload.invocation;
       const server = typeof invocation.server === "string" ? invocation.server : "mcp";
       const tool = typeof invocation.tool === "string" ? invocation.tool : "tool";
@@ -2538,12 +2800,18 @@ function walkCodexRecords(records, options) {
       }
       continue;
     }
-    if (record.type === "event_msg" && payload?.type === "sub_agent_activity" && typeof payload.agent_thread_id === "string" && typeof payload.agent_path === "string") {
-      const agentId = payload.agent_thread_id;
-      const eventId2 = typeof payload.event_id === "string" ? payload.event_id : "";
-      const kind = typeof payload.kind === "string" ? payload.kind : "started";
+    if (record2.type === "event_msg" && payload) {
+      const turnError = turnErrorMessage(payload);
+      if (turnError) {
+        appendAssistantText(current, turnError, timestamp);
+        continue;
+      }
+    }
+    const activity = readSubAgentActivity(record2);
+    if (activity) {
+      const { agentId, agentPath, eventId: eventId2, kind } = activity;
       const spawnInfo = eventId2 ? spawnAgentCalls.get(eventId2) : void 0;
-      const existingId = agentIdByPath.get(payload.agent_path);
+      const existingId = agentIdByPath.get(agentPath);
       const existing = agentRegistry.get(agentId) ?? (existingId ? agentRegistry.get(existingId) : void 0);
       if (kind !== "started" && !existing && !spawnInfo) continue;
       if (existingId && existingId !== agentId && !agentMessages.has(agentId)) {
@@ -2557,22 +2825,23 @@ function walkCodexRecords(records, options) {
       }
       const info = {
         agentId,
-        nickname: existing?.nickname ?? agentNameFromPath(payload.agent_path) ?? spawnInfo?.taskName ?? null,
-        agentPath: payload.agent_path,
+        nickname: existing?.nickname ?? agentNameFromPath(agentPath) ?? spawnInfo?.taskName ?? null,
+        agentPath,
         message: existing?.message ?? spawnInfo?.message ?? "",
-        model: existing?.model ?? spawnInfo?.model ?? null,
+        model: activity.model ?? existing?.model ?? spawnInfo?.model ?? null,
+        effort: activity.effort ?? existing?.effort ?? null,
         agentType: existing?.agentType ?? spawnInfo?.agentType ?? null,
         timestamp: existing?.timestamp ?? (timestamp || spawnInfo?.timestamp || ""),
         parentToolCallId: existing?.parentToolCallId ?? eventId2
       };
       agentRegistry.set(agentId, info);
-      agentIdByPath.set(payload.agent_path, agentId);
+      agentIdByPath.set(agentPath, agentId);
       if (eventId2 && (kind === "started" || spawnInfo)) agentIdBySpawnCall.set(eventId2, agentId);
-      const status = kind === "interrupted" ? "interrupted" : "running";
+      const status = kind === "interrupted" || kind === "completed" ? kind : "running";
       upsertAgentMessage(agentId, current, timestamp, { status });
       continue;
     }
-    if (record.type !== "response_item" || !payload) continue;
+    if (record2.type !== "response_item" || !payload) continue;
     if (payload.type === "reasoning") {
       const summary = Array.isArray(payload.summary) ? payload.summary.filter((item) => typeof item === "string").join("\n") : "";
       appendThinking(current, summary.trim(), timestamp);
@@ -2724,6 +2993,7 @@ function walkCodexRecords(records, options) {
               agentPath: agentPath ?? existing?.agentPath ?? null,
               message: existing?.message ?? spawnInfo?.message ?? "",
               model: existing?.model ?? spawnInfo?.model ?? null,
+              effort: existing?.effort ?? null,
               agentType: existing?.agentType ?? spawnInfo?.agentType ?? null,
               timestamp: existing?.timestamp ?? spawnInfo?.timestamp ?? timestamp,
               parentToolCallId: existing?.parentToolCallId ?? toolCall.id
@@ -2842,14 +3112,16 @@ function walkCodexRecords(records, options) {
 }
 function parseCodexSession(jsonlText, options) {
   const records = jsonlText.split("\n").map((line) => line.trim()).filter(Boolean).map(safeParseLine).filter(isCodexRecord);
+  const isInherited = inheritedHistoryFilter(records);
+  const ownRecords = isInherited ? records.filter((record2) => !isInherited(record2)) : records;
   const { turnStartIndices: _starts, ...session } = walkCodexRecords(
-    records,
+    ownRecords,
     options
   );
   return session;
 }
 function appendCodexSession(existing, newJsonlText) {
-  const prefix = existing.rawMessages.map((record) => JSON.stringify(record)).join("\n");
+  const prefix = existing.rawMessages.map((record2) => JSON.stringify(record2)).join("\n");
   return parseCodexSession(prefix ? `${prefix}
 ${newJsonlText}` : newJsonlText);
 }
@@ -2868,40 +3140,48 @@ function parseJsonObject(value) {
     return null;
   }
 }
-function collectCodexPendingAgents(rawMessages) {
-  const alive = /* @__PURE__ */ new Map();
-  const done = /* @__PURE__ */ new Set();
+function collectCodexBackgroundAgents(rawMessages) {
+  const launched = /* @__PURE__ */ new Map();
+  const alive = /* @__PURE__ */ new Set();
+  const endedAt = /* @__PURE__ */ new Map();
   const agentIdByPath = /* @__PURE__ */ new Map();
   const spawnCalls = /* @__PURE__ */ new Map();
   const waitCalls = /* @__PURE__ */ new Set();
   const interruptCalls = /* @__PURE__ */ new Map();
-  function markAlive(agentId, description) {
-    if (!done.has(agentId)) alive.set(agentId, alive.get(agentId) || description);
-  }
-  for (const msg of rawMessages) {
+  function markAlive(agentId, description, index, startedAt) {
+    if (endedAt.has(agentId)) return;
+    alive.add(agentId);
+    const launch = launched.get(agentId);
+    if (!launch) launched.set(agentId, { launchedAt: index, description, startedAt });
+    else if (!launch.description) launch.description = description;
+  }
+  function markEnded(agentId, index) {
+    if (!endedAt.has(agentId)) endedAt.set(agentId, index);
+    alive.delete(agentId);
+  }
+  for (const [index, msg] of rawMessages.entries()) {
     const payload = isObject3(msg.payload) ? msg.payload : null;
     if (!payload) continue;
-    if (msg.type === "event_msg" && payload.type === "sub_agent_activity" && typeof payload.agent_thread_id === "string" && typeof payload.agent_path === "string") {
-      const agentId = payload.agent_thread_id;
-      const kind = typeof payload.kind === "string" ? payload.kind : "started";
-      const eventId2 = typeof payload.event_id === "string" ? payload.event_id : "";
-      const existingId = agentIdByPath.get(payload.agent_path);
-      const known = alive.has(agentId) || done.has(agentId) || existingId !== void 0 || spawnCalls.has(eventId2);
+    const timestamp = typeof msg.timestamp === "string" ? msg.timestamp : void 0;
+    const activity = readSubAgentActivity(msg);
+    if (activity) {
+      const { agentId, agentPath, kind, eventId: eventId2 } = activity;
+      const existingId = agentIdByPath.get(agentPath);
+      const known = alive.has(agentId) || endedAt.has(agentId) || existingId !== void 0 || spawnCalls.has(eventId2);
       if (kind !== "started" && !known) continue;
       if (existingId && existingId !== agentId) {
-        if (alive.has(existingId)) {
-          markAlive(agentId, alive.get(existingId) ?? "");
-          alive.delete(existingId);
-        }
-        if (done.has(existingId)) done.add(agentId);
-      }
-      agentIdByPath.set(payload.agent_path, agentId);
-      if (kind === "interrupted") {
-        done.add(agentId);
-        alive.delete(agentId);
-      } else {
-        markAlive(agentId, spawnCalls.get(eventId2) ?? "");
+        const prior = launched.get(existingId);
+        launched.delete(existingId);
+        const current = launched.get(agentId);
+        if (prior && !current) launched.set(agentId, prior);
+        else if (prior && current && !current.description) current.description = prior.description;
+        if (alive.delete(existingId)) markAlive(agentId, "", index, timestamp);
+        const priorEnd = endedAt.get(existingId);
+        if (priorEnd !== void 0) markEnded(agentId, priorEnd);
       }
+      agentIdByPath.set(agentPath, agentId);
+      if (kind === "interrupted" || kind === "completed") markEnded(agentId, index);
+      else markAlive(agentId, spawnCalls.get(eventId2) ?? "", index, timestamp);
       continue;
     }
     if (msg.type !== "response_item") continue;
@@ -2925,7 +3205,7 @@ function collectCodexPendingAgents(rawMessages) {
         const output = parseJsonObject(payload.output);
         const agentId = typeof output?.agent_id === "string" ? output.agent_id : "";
         if (agentId) {
-          markAlive(agentId, spawnCalls.get(callId) ?? "");
+          markAlive(agentId, spawnCalls.get(callId) ?? "", index, timestamp);
           const agentPath = typeof output?.task_name === "string" ? output.task_name : "";
           if (agentPath && !agentIdByPath.has(agentPath)) agentIdByPath.set(agentPath, agentId);
         }
@@ -2936,16 +3216,10 @@ function collectCodexPendingAgents(rawMessages) {
           const statusValue = isObject3(status) ? status : {};
           const lifecycle = typeof statusValue.status === "string" ? statusValue.status : "";
           const isTerminal = typeof statusValue.completed === "string" || typeof statusValue.failed === "string" || typeof statusValue.error === "string" || typeof statusValue.interrupted === "string" || lifecycle === "completed" || lifecycle === "failed" || lifecycle === "interrupted";
-          if (isTerminal) {
-            done.add(agentId);
-            alive.delete(agentId);
-          }
+          if (isTerminal) markEnded(agentId, index);
         }
       } else if (interruptCalls.has(callId)) {
-        for (const agentId of interruptCalls.get(callId) ?? []) {
-          done.add(agentId);
-          alive.delete(agentId);
-        }
+        for (const agentId of interruptCalls.get(callId) ?? []) markEnded(agentId, index);
       }
       continue;
     }
@@ -2953,12 +3227,14 @@ function collectCodexPendingAgents(rawMessages) {
       const text = codexPayloadText(payload);
       const messageType = text.match(/^Message Type:\s*([^\r\n]+)/)?.[1]?.trim().toUpperCase() ?? "";
       if (!TERMINAL_INTER_AGENT_TYPES.has(messageType)) continue;
-      const agentId = agentIdByPath.get(payload.author) ?? payload.author;
-      done.add(agentId);
-      alive.delete(agentId);
+      markEnded(agentIdByPath.get(payload.author) ?? payload.author, index);
     }
   }
-  return [...alive.entries()].filter(([agentId]) => !done.has(agentId)).map(([, description]) => description);
+  return [...launched.entries()].map(([agentId, { description, startedAt, launchedAt }]) => ({
+    agent: { description, startedAt },
+    launchedAt,
+    endedAt: alive.has(agentId) ? void 0 : endedAt.get(agentId) ?? launchedAt
+  }));
 }
 function deriveCodexSessionStatus(rawMessages) {
   for (let i = rawMessages.length - 1; i >= 0; i--) {
@@ -2967,16 +3243,7 @@ function deriveCodexSessionStatus(rawMessages) {
       const payload = msg.payload;
       switch (payload?.type) {
         case "task_complete": {
-          const pending = collectCodexPendingAgents(rawMessages);
-          if (pending.length > 0) {
-            return {
-              status: "awaiting_agents",
-              pendingQueue: 0,
-              pendingAgents: pending.length,
-              pendingAgentDescriptions: pending.filter((description) => description.length > 0)
-            };
-          }
-          return { status: "completed" };
+          return awaitingAgentsStatus(collectCodexBackgroundAgents(rawMessages)) ?? { status: "completed" };
         }
         case "task_started":
           return { status: "processing" };
@@ -3000,11 +3267,11 @@ function deriveCodexSessionStatus(rawMessages) {
   }
   return { status: "idle" };
 }
-function brandCodexBranch(firstRecord, sessionId, turnIndex) {
+function brandCodexBranch(firstRecord, sessionId, turnIndex, branchedAt) {
   const payload = isObject3(firstRecord.payload) ? { ...firstRecord.payload } : {};
   const originalId = typeof payload.id === "string" ? payload.id : "";
   payload.id = sessionId;
-  payload.branchedFrom = { sessionId: originalId, turnIndex };
+  payload.branchedFrom = { sessionId: originalId, turnIndex, at: new Date(branchedAt).toISOString() };
   return { record: { ...firstRecord, payload }, originalId };
 }
 function codexTurnBoundaries(records) {
@@ -3766,7 +4033,7 @@ function parseCopilotSession(jsonlText, options) {
   };
 }
 function appendCopilotSession(existing, newJsonlText) {
-  const prefix = existing.rawMessages.map((record) => JSON.stringify(record)).join("\n");
+  const prefix = existing.rawMessages.map((record2) => JSON.stringify(record2)).join("\n");
   return parseCopilotSession(prefix ? `${prefix}
 ${newJsonlText}` : newJsonlText);
 }
@@ -3774,33 +4041,32 @@ function isCopilotEventType(type) {
   return typeof type === "string" && (type === "abort" || type === "binary_asset" || type === "user.message" || type.startsWith("assistant.") || type.startsWith("permission.") || type.startsWith("session.") || type.startsWith("subagent.") || type.startsWith("tool.") || type.startsWith("user_input."));
 }
 function deriveCopilotSessionStatus(rawMessages) {
-  const pendingAgents = /* @__PURE__ */ new Map();
-  for (const event of rawMessages) {
+  const agents = /* @__PURE__ */ new Map();
+  for (const [index, event] of rawMessages.entries()) {
     const agentId = typeof event.agentId === "string" ? event.agentId : "";
     if (!agentId && (event.type === "abort" || event.type === "session.shutdown" || event.type === "session.error")) {
-      pendingAgents.clear();
+      agents.clear();
       continue;
     }
     if (!agentId || !event.type.startsWith("subagent.")) continue;
     const data = isObject4(event.data) ? event.data : {};
+    const launch = agents.get(agentId);
     if (event.type === "subagent.completed" || event.type === "subagent.failed") {
-      pendingAgents.delete(agentId);
+      if (launch) launch.endedAt ??= index;
       continue;
     }
     if (event.type === "subagent.started" || event.type === "subagent.configured") {
       const description = [data.agentDisplayName, data.description, data.agentName].find((value) => typeof value === "string") ?? "";
-      pendingAgents.set(agentId, description || pendingAgents.get(agentId) || "");
+      if (!launch || launch.endedAt !== void 0) {
+        const startedAt = typeof event.timestamp === "string" ? event.timestamp : void 0;
+        agents.set(agentId, { agent: { description, startedAt }, launchedAt: index });
+      } else if (description) {
+        launch.agent.description = description;
+      }
     }
   }
-  if (pendingAgents.size > 0) {
-    const descriptions = [...pendingAgents.values()];
-    return {
-      status: "awaiting_agents",
-      pendingQueue: 0,
-      pendingAgents: descriptions.length,
-      pendingAgentDescriptions: descriptions.filter((description) => description.length > 0)
-    };
-  }
+  const awaiting = awaitingAgentsStatus([...agents.values()]);
+  if (awaiting) return awaiting;
   let sawUserActivity = false;
   const completedPermissionRequests = /* @__PURE__ */ new Set();
   for (let i = rawMessages.length - 1; i >= 0; i--) {
@@ -3874,11 +4140,11 @@ function brandCopilotBranch() {
 function copilotTurnBoundaries(records) {
   const boundaries = [];
   for (let index = 0; index < records.length; index++) {
-    const record = records[index];
-    if (record.type !== "user.message" || typeof record.agentId === "string") continue;
-    const data = record.data;
+    const record2 = records[index];
+    if (record2.type !== "user.message" || typeof record2.agentId === "string") continue;
+    const data = record2.data;
     if (!data || typeof data !== "object" || Array.isArray(data)) continue;
-    if (typeof record.id !== "string" || !record.id) continue;
+    if (typeof record2.id !== "string" || !record2.id) continue;
     boundaries.push(index);
   }
   return boundaries;
@@ -3886,6 +4152,7 @@ function copilotTurnBoundaries(records) {
 
 // src/lib/agents.ts
 var TERMINAL_AGENT_KIND = AGENT_KINDS[AGENT_KINDS.length - 1];
+var hasNoNoiseLines = () => false;
 var codexFormat = {
   kind: "codex",
   descriptor: descriptorFor("codex"),
@@ -3895,6 +4162,8 @@ var codexFormat = {
   append: appendCodexSession,
   metadataFromLines: extractCodexMetadataFromLines,
   status: deriveCodexSessionStatus,
+  isNoiseLine: hasNoNoiseLines,
+  pageHeaderLine: codexPageHeaderLine,
   brandBranch: brandCodexBranch,
   turnBoundaries: codexTurnBoundaries
 };
@@ -3907,6 +4176,7 @@ var copilotFormat = {
   append: appendCopilotSession,
   metadataFromLines: extractCopilotMetadataFromLines,
   status: deriveCopilotSessionStatus,
+  isNoiseLine: hasNoNoiseLines,
   brandBranch: brandCopilotBranch,
   turnBoundaries: copilotTurnBoundaries
 };
@@ -3920,10 +4190,20 @@ var claudeFormat = {
   append: appendClaudeSession,
   metadataFromLines: extractClaudeMetadataFromLines,
   status: deriveClaudeSessionStatus,
+  isNoiseLine: isClaudeNoiseLine,
   brandBranch: brandClaudeBranch,
   turnBoundaries: claudeTurnBoundaries
 };
 var FORMATS = Object.freeze({
+  acp: {
+    ...claudeFormat,
+    kind: "acp",
+    descriptor: descriptorFor("acp"),
+    detectsText: (text) => text.split("\n", 1)[0]?.includes('"type":"acp_session"') ?? false,
+    detectsRecords: (records) => records[0]?.type === "acp_session",
+    parse: (text, options) => ({ ...parseClaudeSession(text, options), agentKind: "acp" }),
+    append: (session, text) => ({ ...appendClaudeSession(session, text), agentKind: "acp" })
+  },
   claude: claudeFormat,
   codex: codexFormat,
   copilot: copilotFormat
@@ -3940,6 +4220,9 @@ function formatForText(jsonlText) {
 function formatForRecords(records) {
   return firstMatch((format) => format.detectsRecords(records));
 }
+function isAnyAgentNoiseLine(line) {
+  return AGENT_KINDS.some((kind) => FORMATS[kind].isNoiseLine(line));
+}
 
 // src/lib/parser.ts
 function extractTextFromContent2(content) {
@@ -3952,7 +4235,8 @@ function parseSession(jsonlText, options) {
 function parseSessionAppend(existing, newJsonlText) {
   const byRecords = formatForRecords(existing.rawMessages);
   const format = byRecords.kind === TERMINAL_AGENT_KIND ? formatForText(newJsonlText) : byRecords;
-  return format.append(existing, newJsonlText);
+  const appended = format.append(existing, newJsonlText);
+  return existing.instanceId ? scopeParsedSession(appended, existing.instanceId) : appended;
 }
 function getUserMessageText(content) {
   if (content === null) return "";
@@ -3964,16 +4248,63 @@ function getUserMessageImages(content) {
   return content.filter((b) => b.type === "image");
 }
 
-// src/lib/stores.ts
+// src/lib/transcriptFile.ts
 var import_node_fs = require("node:fs");
+var import_promises = require("node:fs/promises");
+var zlib = __toESM(require("node:zlib"));
+var COMPRESSED_SUFFIX = ".zst";
+var canReadCompressedTranscripts = typeof zlib.zstdDecompressSync === "function";
+function isCompressedTranscript(filePath) {
+  return filePath.endsWith(COMPRESSED_SUFFIX);
+}
+function uncompressedTranscriptName(fileName) {
+  return isCompressedTranscript(fileName) ? fileName.slice(0, -COMPRESSED_SUFFIX.length) : fileName;
+}
+function isListableTranscript(name, siblings) {
+  const plainName = uncompressedTranscriptName(name);
+  if (!plainName.endsWith(".jsonl")) return false;
+  if (plainName === name) return true;
+  return canReadCompressedTranscripts && !siblings.has(plainName);
+}
+function inflate(data) {
+  if (!canReadCompressedTranscripts) {
+    throw new Error("Reading a .jsonl.zst transcript needs Node.js 22.15 or newer, or Bun");
+  }
+  return zlib.zstdDecompressSync(data);
+}
+function readTranscriptTextSync(filePath) {
+  const data = (0, import_node_fs.readFileSync)(filePath);
+  return (isCompressedTranscript(filePath) ? inflate(data) : data).toString("utf-8");
+}
+async function readTranscriptText(filePath) {
+  const data = await (0, import_promises.readFile)(filePath);
+  return (isCompressedTranscript(filePath) ? inflate(data) : data).toString("utf-8");
+}
+async function openTranscript(filePath) {
+  if (!isCompressedTranscript(filePath)) return (0, import_promises.open)(filePath, "r");
+  const [fileStat, compressed] = await Promise.all([(0, import_promises.stat)(filePath), (0, import_promises.readFile)(filePath)]);
+  const data = inflate(compressed);
+  return {
+    async read(buffer, offset, length, position) {
+      const start = Math.min(Math.max(position, 0), data.length);
+      return { bytesRead: data.copy(buffer, offset, start, Math.min(start + length, data.length)) };
+    },
+    stat: async () => ({ size: data.length, mtimeMs: fileStat.mtimeMs }),
+    close: async () => {
+    }
+  };
+}
+
+// src/lib/stores.ts
+var import_node_fs2 = require("node:fs");
 var import_node_path2 = require("node:path");
 
 // src/lib/dirs.ts
 var import_node_path = require("node:path");
 var import_node_os = require("node:os");
 function agentHomeDir(kind, env = process.env, homeDirectory = (0, import_node_os.homedir)()) {
-  const { homeEnvVar, homeDirName } = descriptorFor(kind).cli;
-  const override = homeEnvVar ? env[homeEnvVar] : void 0;
+  const { homeEnvVar, homeDirName, sdkHomeEnvVar } = descriptorFor(kind).cli;
+  const override = env[homeEnvVar ?? sdkHomeEnvVar ?? ""];
   return override || (0, import_node_path.join)(homeDirectory, homeDirName);
 }
 var dirs = {
@@ -3981,7 +4312,8 @@ var dirs = {
   TEAMS_DIR: (0, import_node_path.join)(agentHomeDir("claude"), "teams"),
   TASKS_DIR: (0, import_node_path.join)(agentHomeDir("claude"), "tasks"),
   CODEX_SESSIONS_DIR: (0, import_node_path.join)(agentHomeDir("codex"), "sessions"),
-  COPILOT_SESSIONS_DIR: (0, import_node_path.join)(agentHomeDir("copilot"), "session-state")
+  COPILOT_SESSIONS_DIR: (0, import_node_path.join)(agentHomeDir("copilot"), "session-state"),
+  ACP_PROJECTS_DIR: (0, import_node_path.join)(agentHomeDir("acp"), "projects")
 };
 var DEFAULT_DB_PATH = (0, import_node_path.join)(agentHomeDir("claude"), "cogpit-memory", "search-index.db");
 
@@ -3991,14 +4323,14 @@ var MAX_WALK_DEPTH = 4;
 var SUBAGENTS_DIR = "subagents";
 function mtimeOf(filePath) {
   try {
-    return (0, import_node_fs.statSync)(filePath).mtimeMs;
+    return (0, import_node_fs2.statSync)(filePath).mtimeMs;
   } catch {
     return null;
   }
 }
 function readDirSafe(dir) {
   try {
-    return (0, import_node_fs.readdirSync)(dir, { withFileTypes: true });
+    return (0, import_node_fs2.readdirSync)(dir, { withFileTypes: true });
   } catch {
     return [];
   }
@@ -4009,8 +4341,8 @@ function isWithin(root, target) {
 }
 function canonicalWithinRoot(root, filePath) {
   try {
-    const realRoot = (0, import_node_fs.realpathSync)(root);
-    const real = (0, import_node_fs.realpathSync)(filePath);
+    const realRoot = (0, import_node_fs2.realpathSync)(root);
+    const real = (0, import_node_fs2.realpathSync)(filePath);
     return isWithin(realRoot, real) ? real : null;
   } catch {
     return null;
@@ -4076,13 +4408,15 @@ function walkClaude(root, cutoffMs) {
 function walkCodex(root, cutoffMs, dir = root, depth = 0) {
   if (depth > MAX_WALK_DEPTH) return [];
   const found = [];
-  for (const entry of readDirSafe(dir)) {
+  const entries = readDirSafe(dir);
+  const names = new Set(entries.map((entry) => entry.name));
+  for (const entry of entries) {
     const filePath = (0, import_node_path2.join)(dir, entry.name);
     if (entry.isDirectory()) {
       found.push(...walkCodex(root, cutoffMs, filePath, depth + 1));
       continue;
     }
-    if (!entry.name.endsWith(".jsonl")) continue;
+    if (!isListableTranscript(entry.name, names)) continue;
     const mtimeMs = mtimeOf(filePath);
     if (mtimeMs === null || mtimeMs < cutoffMs) continue;
     found.push({
@@ -4143,14 +4477,18 @@ var WALKERS = {
     find(root, sessionId) {
       const walk = (dir, depth) => {
         if (depth > MAX_WALK_DEPTH) return null;
-        for (const entry of readDirSafe(dir)) {
+        const entries = readDirSafe(dir);
+        const names = new Set(entries.map((entry) => entry.name));
+        for (const entry of entries) {
           const filePath = (0, import_node_path2.join)(dir, entry.name);
           if (entry.isDirectory()) {
             const match = walk(filePath, depth + 1);
             if (match) return match;
             continue;
           }
-          if (entry.name.endsWith(`${sessionId}.jsonl`)) return filePath;
+          if (uncompressedTranscriptName(entry.name).endsWith(`${sessionId}.jsonl`) && isListableTranscript(entry.name, names)) {
+            return filePath;
+          }
         }
         return null;
       };
@@ -4169,24 +4507,48 @@ var WALKERS = {
       const candidate = copilotTranscript(root, sessionId);
       return mtimeOf(candidate) === null ? null : candidate;
     }
+  },
+  acp: {
+    root: () => dirs.ACP_PROJECTS_DIR,
+    list: walkClaude,
+    identify: claudeIdentify,
+    find: (root, id) => WALKERS.claude.find(root, id)
   }
 };
-function makeStore(kind) {
+function makeStore(kind, home, configuredId) {
   const walker = WALKERS[kind];
+  const instanceId = configuredId ?? (process.env.COGPIT_WORKER_AGENT === kind ? process.env.COGPIT_AGENT_INSTANCE_ID : void 0) ?? "default";
+  const root = home ? () => (0, import_node_path2.join)(home, kind === "codex" ? "sessions" : kind === "copilot" ? "session-state" : "projects") : walker.root;
+  const identify = (filePath, directory = root()) => {
+    const identity = walker.identify(filePath, directory);
+    return { ...identity, sessionId: instanceSessionId(instanceId, identity.sessionId), parentSessionId: identity.parentSessionId ? instanceSessionId(instanceId, identity.parentSessionId) : null };
+  };
   return {
     kind,
+    instanceId,
     descriptor: descriptorFor(kind),
-    root: walker.root,
-    ownsPath: (filePath) => isWithin((0, import_node_path2.resolve)(walker.root()), (0, import_node_path2.resolve)(filePath)),
-    identify: (filePath, root = walker.root()) => walker.identify(filePath, root),
-    list: (cutoffMs, root = walker.root()) => walker.list(root, cutoffMs),
-    find: (sessionId) => walker.find(walker.root(), sessionId)
+    root,
+    ownsPath: (filePath) => {
+      if (isWithin((0, import_node_path2.resolve)(root()), (0, import_node_path2.resolve)(filePath))) return true;
+      try {
+        return isWithin((0, import_node_fs2.realpathSync)(root()), (0, import_node_fs2.realpathSync)(filePath));
+      } catch {
+        return false;
+      }
+    },
+    identify,
+    list: (cutoffMs, directory = root()) => walker.list(directory, cutoffMs).map((file) => ({ ...file, ...identify(file.path, directory) })),
+    find: (sessionId) => {
+      const parts = splitInstanceSessionId(sessionId);
+      return parts.instanceId === instanceId ? walker.find(root(), parts.nativeId) : null;
+    }
   };
 }
 var STORES = {
   claude: makeStore("claude"),
   codex: makeStore("codex"),
-  copilot: makeStore("copilot")
+  copilot: makeStore("copilot"),
+  acp: makeStore("acp")
 };
 function storeFor(kind) {
   return STORES[kind];
@@ -4195,7 +4557,20 @@ function defaultStore() {
   return storeFor(descriptorForDirName(null).kind);
 }
 function allStores() {
-  return AGENT_KINDS.map((kind) => STORES[kind]);
+  if (process.env.COGPIT_AGENT_INSTANCE_ID && AGENT_KINDS.includes(process.env.COGPIT_WORKER_AGENT)) return [STORES[process.env.COGPIT_WORKER_AGENT]];
+  const stores = AGENT_KINDS.map((kind) => STORES[kind]);
+  const root = process.env.COGPIT_ORCHESTRATION_ROOT;
+  if (!root) return stores;
+  for (const entry of readDirSafe((0, import_node_path2.join)(root, "provider-instances"))) {
+    if (!entry.isDirectory()) continue;
+    const home = (0, import_node_path2.join)(root, "provider-instances", entry.name);
+    try {
+      const config = JSON.parse((0, import_node_fs2.readFileSync)((0, import_node_path2.join)(home, "config.json"), "utf8"));
+      if (config.providerInstance?.id === entry.name && config.providerInstance.agent && AGENT_KINDS.includes(config.providerInstance.agent)) stores.push(makeStore(config.providerInstance.agent, home, entry.name));
+    } catch {
+    }
+  }
+  return stores;
 }
 function storeForPath(filePath) {
   return allStores().find((store) => store.ownsPath(filePath)) ?? null;
@@ -4265,7 +4640,7 @@ var SearchIndex = class {
     const { count: totalRows } = this.db.prepare("SELECT COUNT(*) as count FROM search_content").get();
     let dbSizeBytes = 0;
     try {
-      dbSizeBytes = (0, import_node_fs2.statSync)(this.dbPath).size;
+      dbSizeBytes = (0, import_node_fs3.statSync)(this.dbPath).size;
     } catch {
     }
     return {
@@ -4338,9 +4713,9 @@ var SearchIndex = class {
   indexFile(filePath, sessionId, mtimeMs, opts) {
     const resolvedSessionId = sessionId ?? identifyTranscript(filePath).sessionId;
     if (mtimeMs == null) {
-      mtimeMs = (0, import_node_fs2.statSync)(filePath).mtimeMs;
+      mtimeMs = (0, import_node_fs3.statSync)(filePath).mtimeMs;
     }
-    const content = (0, import_node_fs2.readFileSync)(filePath, "utf-8");
+    const content = readTranscriptTextSync(filePath);
     const session = parseSession(content, { skipStats: true });
     const isSubagent = opts?.isSubagent ? 1 : 0;
     const parentSessionId = opts?.parentSessionId ?? null;
@@ -4369,7 +4744,7 @@ var SearchIndex = class {
     const files = this.db.prepare("SELECT file_path FROM indexed_files").all();
     const missing = files.filter(({ file_path }) => {
       try {
-        (0, import_node_fs2.statSync)(file_path);
+        (0, import_node_fs3.statSync)(file_path);
         return false;
       } catch (error) {
         const code = error.code;
@@ -4486,7 +4861,7 @@ var SearchIndex = class {
     this.db.close();
     for (const suffix of ["", "-wal", "-shm"]) {
       try {
-        (0, import_node_fs2.unlinkSync)(this.dbPath + suffix);
+        (0, import_node_fs3.unlinkSync)(this.dbPath + suffix);
       } catch {
       }
     }
@@ -4510,7 +4885,7 @@ var SearchIndex = class {
     const txn = this.db.transaction(() => {
       for (const file of files) {
         try {
-          const content = (0, import_node_fs2.readFileSync)(file.path, "utf-8");
+          const content = readTranscriptTextSync(file.path);
           const session = parseSession(content, { skipStats: true });
           this.insertSessionContent(insert, file.sessionId, file.path, session);
           insertFile.run(file.path, file.mtimeMs, file.sessionId, file.isSubagent ? 1 : 0, file.parentSessionId);
@@ -4572,8 +4947,8 @@ var SearchIndex = class {
 };
 
 // src/commands/search.ts
-var import_node_fs3 = require("node:fs");
-var import_promises = require("node:fs/promises");
+var import_node_fs4 = require("node:fs");
+var import_promises2 = require("node:fs/promises");
 var import_node_path3 = require("node:path");
 
 // src/lib/response.ts
@@ -4594,6 +4969,11 @@ function parseMaxAge(raw) {
   }
 }
 
+// src/lib/read-session.ts
+function parseTranscript(content, filePath) {
+  return scopeParsedSession(parseSession(content), storeForPath(filePath)?.instanceId ?? "default");
+}
+
 // src/commands/search.ts
 async function searchSessions(query, opts, searchIndex) {
   if (!query || query.length < 2) {
@@ -4606,9 +4986,9 @@ async function searchSessions(query, opts, searchIndex) {
   let ownedIndex = false;
   if (!index && searchIndex === void 0) {
     try {
-      const dbExists = (0, import_node_fs3.existsSync)(DEFAULT_DB_PATH);
+      const dbExists = (0, import_node_fs4.existsSync)(DEFAULT_DB_PATH);
       if (!dbExists) {
-        (0, import_node_fs3.mkdirSync)((0, import_node_path3.dirname)(DEFAULT_DB_PATH), { recursive: true });
+        (0, import_node_fs4.mkdirSync)((0, import_node_path3.dirname)(DEFAULT_DB_PATH), { recursive: true });
       }
       index = new SearchIndex(DEFAULT_DB_PATH);
       ownedIndex = true;
@@ -4682,7 +5062,7 @@ async function cwdFromFilePath(filePath) {
   const cached = cwdCache.get(filePath);
   if (cached !== void 0) return cached;
   try {
-    const fh = await (0, import_promises.open)(filePath, "r");
+    const fh = await openTranscript(filePath);
     try {
       const buf = Buffer.alloc(CWD_READ_BYTES);
       const { bytesRead } = await fh.read(buf, 0, CWD_READ_BYTES, 0);
@@ -4740,7 +5120,7 @@ function searchField(text, location, query, caseSensitive, extras) {
 async function discoverSingleSession(sessionId) {
   const jsonlPath = await findSessionFile(sessionId);
   if (!jsonlPath) return [];
-  const s = await (0, import_promises.stat)(jsonlPath);
+  const s = await (0, import_promises2.stat)(jsonlPath);
   return [{ path: jsonlPath, mtimeMs: s.mtimeMs, sessionId }];
 }
 function discoverAllSessions(maxAgeMs) {
@@ -4748,7 +5128,7 @@ function discoverAllSessions(maxAgeMs) {
 }
 async function rawTextMatch(filePath, query, caseSensitive) {
   try {
-    const content = await (0, import_promises.readFile)(filePath, "utf-8");
+    const content = await readTranscriptText(filePath);
     const haystack = caseSensitive ? content : content.toLowerCase();
     const needle = caseSensitive ? query : query.toLowerCase();
     if (haystack.includes(needle)) return content;
@@ -4823,7 +5203,7 @@ async function walkSubagentFiles(parentJsonlPath, query, caseSensitive, currentD
   const subDir = parentJsonlPath.replace(/\.jsonl$/, "") + "/subagents";
   let files;
   try {
-    files = await (0, import_promises.readdir)(subDir);
+    files = await (0, import_promises2.readdir)(subDir);
   } catch {
     return [];
   }
@@ -4840,7 +5220,7 @@ async function walkSubagentFiles(parentJsonlPath, query, caseSensitive, currentD
   );
   const hitArrays = await Promise.all(
     matched.filter((m) => m.rawContent).map(async ({ agentId, filePath, rawContent }) => {
-      const subSession = parseSession(rawContent);
+      const subSession = parseTranscript(rawContent, filePath);
       const subHits = walkSession(subSession, query, caseSensitive, `agent/${agentId}/`);
       const nestedHits = await walkSubagentFiles(filePath, query, caseSensitive, currentDepth + 1, maxDepth);
       return [...subHits, ...nestedHits];
@@ -4861,7 +5241,7 @@ async function rawScanSearch(query, sessionId, maxAgeMs, limit, caseSensitive, e
       const rawContent = await rawTextMatch(file.path, query, caseSensitive);
       sessionsSearched++;
       if (!rawContent) continue;
-      const session = parseSession(rawContent);
+      const session = parseTranscript(rawContent, file.path);
       const sessionHits = walkSession(session, query, caseSensitive);
       const subagentHits = await walkSubagentFiles(file.path, query, caseSensitive, 0, MAX_SUBAGENT_DEPTH);
       const allHits = [...sessionHits, ...subagentHits];
@@ -4901,14 +5281,14 @@ async function rawScanSearch(query, sessionId, maxAgeMs, limit, caseSensitive, e
 }
 
 // src/commands/context.ts
-var import_promises3 = require("node:fs/promises");
+var import_promises4 = require("node:fs/promises");
 var import_node_path5 = require("node:path");
 
 // src/lib/helpers.ts
-var import_promises2 = require("node:fs/promises");
+var import_promises3 = require("node:fs/promises");
 var import_node_path4 = require("node:path");
 async function matchSubagentToMember(leadSessionId, subagentFileName, members) {
-  const entries = await (0, import_promises2.readdir)(dirs.PROJECTS_DIR, { withFileTypes: true });
+  const entries = await (0, import_promises3.readdir)(dirs.PROJECTS_DIR, { withFileTypes: true });
   for (const entry of entries) {
     if (!entry.isDirectory() || entry.name === "memory") continue;
     const filePath = (0, import_node_path4.join)(
@@ -4919,7 +5299,7 @@ async function matchSubagentToMember(leadSessionId, subagentFileName, members) {
       subagentFileName
     );
     try {
-      const fh = await (0, import_promises2.open)(filePath, "r");
+      const fh = await (0, import_promises3.open)(filePath, "r");
       try {
         const buf = Buffer.alloc(16384);
         const { bytesRead } = await fh.read(buf, 0, 16384, 0);
@@ -5113,6 +5493,14 @@ function mapContentBlock(block) {
       return { kind: "recap", content: block.content, timestamp: block.timestamp ?? null };
     case "task_notification":
       return { kind: "task_notification", content: block.content, timestamp: block.timestamp ?? null };
+    case "local_command":
+      return {
+        kind: "local_command",
+        content: block.content,
+        timestamp: block.timestamp ?? null,
+        ...block.contextUsage ? { contextUsage: block.contextUsage } : {},
+        ...block.usageReport ? { usageReport: block.usageReport } : {}
+      };
     default: {
       const exhaustive = block;
       return exhaustive;
@@ -5122,7 +5510,7 @@ function mapContentBlock(block) {
 async function findSubagentFile(parentJsonlPath, agentId) {
   const subagentsDir = parentJsonlPath.replace(/\.jsonl$/, "") + "/subagents";
   try {
-    const files = await (0, import_promises3.readdir)(subagentsDir);
+    const files = await (0, import_promises4.readdir)(subagentsDir);
     for (const f of files) {
       if (!f.startsWith("agent-") || !f.endsWith(".jsonl")) continue;
       const fileAgentId = f.replace("agent-", "").replace(".jsonl", "");
@@ -5136,12 +5524,12 @@ async function findSubagentFile(parentJsonlPath, agentId) {
 }
 async function findTeamContext(sessionId, subagentFileName) {
   try {
-    const teamEntries = await (0, import_promises3.readdir)(dirs.TEAMS_DIR, { withFileTypes: true });
+    const teamEntries = await (0, import_promises4.readdir)(dirs.TEAMS_DIR, { withFileTypes: true });
     for (const entry of teamEntries) {
       if (!entry.isDirectory()) continue;
       const configPath = (0, import_node_path5.join)(dirs.TEAMS_DIR, entry.name, "config.json");
       try {
-        const raw = await (0, import_promises3.readFile)(configPath, "utf-8");
+        const raw = await (0, import_promises4.readFile)(configPath, "utf-8");
         const config = JSON.parse(raw);
         if (config.leadSessionId !== sessionId) continue;
         const members = config.members ?? [];
@@ -5150,10 +5538,10 @@ async function findTeamContext(sessionId, subagentFileName) {
         let currentTask = null;
         try {
           const taskDir = (0, import_node_path5.join)(dirs.TASKS_DIR, entry.name);
-          const taskFiles = await (0, import_promises3.readdir)(taskDir);
+          const taskFiles = await (0, import_promises4.readdir)(taskDir);
           for (const tf of taskFiles) {
             if (!tf.endsWith(".json")) continue;
-            const taskRaw = await (0, import_promises3.readFile)((0, import_node_path5.join)(taskDir, tf), "utf-8");
+            const taskRaw = await (0, import_promises4.readFile)((0, import_node_path5.join)(taskDir, tf), "utf-8");
             const task = JSON.parse(taskRaw);
             if (task.owner === memberName && task.status === "in_progress") {
               currentTask = { id: task.id, subject: task.subject, status: task.status };
@@ -5201,27 +5589,27 @@ function findAgentMetadata(session, agentId) {
 async function getSessionOverview(sessionId) {
   const jsonlPath = await findSessionFile(sessionId);
   if (!jsonlPath) return { error: "Session not found" };
-  const content = await (0, import_promises3.readFile)(jsonlPath, "utf-8");
-  const session = parseSession(content);
+  const content = await readTranscriptText(jsonlPath);
+  const session = parseTranscript(content, jsonlPath);
   return mapSessionToOverview(session);
 }
 async function getTurnDetail(sessionId, turnIndex) {
   const jsonlPath = await findSessionFile(sessionId);
   if (!jsonlPath) return { error: "Session not found" };
-  const content = await (0, import_promises3.readFile)(jsonlPath, "utf-8");
-  const session = parseSession(content);
+  const content = await readTranscriptText(jsonlPath);
+  const session = parseTranscript(content, jsonlPath);
   if (turnIndex < 0 || turnIndex >= session.turns.length) return { error: "Turn not found" };
   return mapTurnToDetail(session, turnIndex);
 }
 async function getAgentOverview(sessionId, agentId) {
   const jsonlPath = await findSessionFile(sessionId);
   if (!jsonlPath) return { error: "Session not found" };
-  const content = await (0, import_promises3.readFile)(jsonlPath, "utf-8");
-  const session = parseSession(content);
+  const content = await readTranscriptText(jsonlPath);
+  const session = parseTranscript(content, jsonlPath);
   const subagentFile = await findSubagentFile(jsonlPath, agentId);
   if (!subagentFile) return { error: "Agent not found" };
-  const subagentContent = await (0, import_promises3.readFile)(subagentFile.filePath, "utf-8");
-  const subagentSession = parseSession(subagentContent);
+  const subagentContent = await readTranscriptText(subagentFile.filePath);
+  const subagentSession = parseTranscript(subagentContent, subagentFile.filePath);
   const metadata = findAgentMetadata(session, agentId);
   const parentToolCallId = findParentToolCallId(session, agentId);
   const teamContext = await findTeamContext(sessionId, subagentFile.fileName);
@@ -5241,8 +5629,8 @@ async function getAgentTurnDetail(sessionId, agentId, turnIndex) {
   if (!jsonlPath) return { error: "Session not found" };
   const subagentFile = await findSubagentFile(jsonlPath, agentId);
   if (!subagentFile) return { error: "Agent not found" };
-  const subagentContent = await (0, import_promises3.readFile)(subagentFile.filePath, "utf-8");
-  const subagentSession = parseSession(subagentContent);
+  const subagentContent = await readTranscriptText(subagentFile.filePath);
+  const subagentSession = parseTranscript(subagentContent, subagentFile.filePath);
   if (turnIndex < 0 || turnIndex >= subagentSession.turns.length) return { error: "Turn not found" };
   return mapTurnToDetail(subagentSession, turnIndex);
 }
@@ -5251,7 +5639,7 @@ async function getAgentTurnDetail(sessionId, agentId, turnIndex) {
 var import_node_path6 = require("node:path");
 
 // src/lib/metadata.ts
-var import_promises4 = require("node:fs/promises");
+var import_promises5 = require("node:fs/promises");
 
 // src/lib/sessionStatus.ts
 function deriveSessionStatus(rawMessages) {
@@ -5276,15 +5664,16 @@ function scanClaudeMessages(lines) {
     turnCount: 0
   };
   for (const line of lines) {
-    let record;
+    if (isAnyAgentNoiseLine(line)) continue;
+    let record2;
     try {
-      record = JSON.parse(line);
+      record2 = JSON.parse(line);
     } catch {
       continue;
     }
-    if (record.type !== "user" || record.isMeta) continue;
-    if (!meta.timestamp) meta.timestamp = record.timestamp || "";
-    const content = record.message?.content;
+    if (record2.type !== "user" || record2.isMeta) continue;
+    if (!meta.timestamp) meta.timestamp = record2.timestamp || "";
+    const content = record2.message?.content;
     let extracted = "";
     if (typeof content === "string") {
       extracted = cleanUserText(content);
@@ -5304,11 +5693,11 @@ function scanClaudeMessages(lines) {
   return meta;
 }
 async function readLines(filePath, size) {
-  if (size <= FULL_READ_LIMIT) {
-    const content = await (0, import_promises4.readFile)(filePath, "utf-8");
+  if (size <= FULL_READ_LIMIT || isCompressedTranscript(filePath)) {
+    const content = await readTranscriptText(filePath);
     return { lines: content.split("\n").filter(Boolean), isPartialRead: false };
   }
-  const handle = await (0, import_promises4.open)(filePath, "r");
+  const handle = await (0, import_promises5.open)(filePath, "r");
   try {
     const buffer = Buffer.alloc(HEAD_READ_BYTES);
     const { bytesRead } = await handle.read(buffer, 0, HEAD_READ_BYTES, 0);
@@ -5323,14 +5712,15 @@ async function readLines(filePath, size) {
   }
 }
 async function getSessionMeta(filePath) {
-  const fileStat = await (0, import_promises4.stat)(filePath);
+  const fileStat = await (0, import_promises5.stat)(filePath);
   let { lines, isPartialRead } = await readLines(filePath, fileStat.size);
   const format = formatForText(lines.join("\n"));
   if (isPartialRead && !format.descriptor.metadataFromHead) {
-    lines = (await (0, import_promises4.readFile)(filePath, "utf-8")).split("\n").filter(Boolean);
+    lines = (await (0, import_promises5.readFile)(filePath, "utf-8")).split("\n").filter(Boolean);
     isPartialRead = false;
   }
   const header = readHeader(format, lines);
+  const instanceId = storeForPath(filePath)?.instanceId ?? "default";
   const conversation = header.turnCount === void 0 ? scanClaudeMessages(lines) : {
     firstUserMessage: header.firstUserMessage ?? "",
     lastUserMessage: header.lastUserMessage ?? "",
@@ -5338,7 +5728,7 @@ async function getSessionMeta(filePath) {
     turnCount: header.turnCount
   };
   return {
-    sessionId: header.sessionId,
+    sessionId: instanceSessionId(instanceId, header.sessionId),
     version: header.version,
     gitBranch: header.gitBranch,
     model: header.model,
@@ -5348,17 +5738,17 @@ async function getSessionMeta(filePath) {
     // A head read saw a known number of lines in a known number of bytes;
     // scaling that by the file size is the only estimate available.
     lineCount: isPartialRead ? Math.round(fileStat.size / (HEAD_READ_BYTES / lines.length)) : lines.length,
-    branchedFrom: header.branchedFrom
+    branchedFrom: header.branchedFrom ? { ...header.branchedFrom, sessionId: instanceSessionId(instanceId, header.branchedFrom.sessionId) } : void 0
   };
 }
 async function getSessionStatus(filePath) {
   const CHUNK = 4096;
   const MAX_CHUNKS = 64;
   try {
-    const fileStat = await (0, import_promises4.stat)(filePath);
-    if (fileStat.size === 0) return { status: "idle" };
-    const fh = await (0, import_promises4.open)(filePath, "r");
+    const fh = await openTranscript(filePath);
     try {
+      const fileStat = await fh.stat();
+      if (fileStat.size === 0) return { status: "idle" };
       const meaningful = [];
       let cursor = fileStat.size;
       let leftover = "";
@@ -5374,7 +5764,7 @@ async function getSessionStatus(filePath) {
         const startIdx = cursor > 0 ? 1 : 0;
         for (let i = lines.length - 1; i >= startIdx; i--) {
           const line = lines[i];
-          if (!line) continue;
+          if (!line || isAnyAgentNoiseLine(line)) continue;
           let obj;
           try {
             obj = JSON.parse(line);
@@ -5443,7 +5833,7 @@ async function getSessionStatus(filePath) {
 // src/commands/sessions.ts
 function toSessionSummary(file, meta, status) {
   return {
-    sessionId: meta.sessionId,
+    sessionId: file.sessionId || meta.sessionId,
     filePath: file.path,
     timestamp: meta.timestamp,
     model: meta.model,
@@ -5505,11 +5895,11 @@ async function currentSession(cwd) {
 }
 
 // src/commands/index-cmd.ts
-var import_node_fs4 = require("node:fs");
+var import_node_fs5 = require("node:fs");
 var import_node_path7 = require("node:path");
 async function indexStats(dbPath) {
   const path = dbPath ?? DEFAULT_DB_PATH;
-  if (!(0, import_node_fs4.existsSync)(path)) {
+  if (!(0, import_node_fs5.existsSync)(path)) {
     return { error: `Database not found at ${path}. Run 'cogpit-memory index rebuild' to create it.` };
   }
   const index = new SearchIndex(path);
@@ -5519,7 +5909,7 @@ async function indexStats(dbPath) {
 }
 async function indexRebuild(dbPath) {
   const path = dbPath ?? DEFAULT_DB_PATH;
-  (0, import_node_fs4.mkdirSync)((0, import_node_path7.dirname)(path), { recursive: true });
+  (0, import_node_fs5.mkdirSync)((0, import_node_path7.dirname)(path), { recursive: true });
   const index = new SearchIndex(path);
   index.buildFull();
   const stats = index.getStats();