cogpit-memory 0.3.0 → 0.4.0

package/dist/cli.js

@@ -48,7 +48,36 @@ var Database = import_better_sqlite3.default;
 var import_node_fs2 = 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}";
@@ -75,6 +104,10 @@ 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)
   };
@@ -83,6 +116,14 @@ function sessionIdFromJsonlName(fileName) {
   const match = new RegExp(`(${SESSION_UUID})\\.jsonl$`, "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`
@@ -100,6 +141,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",
@@ -110,6 +162,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
@@ -127,10 +181,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: {
@@ -165,6 +221,7 @@ var claude = {
     bundledBySdk: true,
     homeDirName: ".claude",
     homeEnvVar: null,
+    sdkHomeEnvVar: "CLAUDE_CONFIG_DIR",
     installMarker: "projects",
     homeIsDiscoverable: false,
     process: {
@@ -176,7 +233,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"] },
@@ -221,7 +279,9 @@ var claude = {
     nativeRewind: false,
     fileCheckpoints: true,
     reasoningEffort: true,
+    configurableContextWindow: false,
     fastTier: true,
+    lowPriorityInTerminal: true,
     imageInput: true,
     midTurnSteering: false,
     stopSession: true,
@@ -231,6 +291,7 @@ var claude = {
     accountSwitching: true,
     modelFallbackNotices: true,
     autoPermissionMode: "per-model",
+    toolPermissionRules: true,
     settingsApply: "live",
     turnLiveness: "transcript",
     tokenStreaming: true,
@@ -247,6 +308,7 @@ var codex = {
   displayName: "Codex",
   binName: "codex",
   dirName: base64DirNameCodec(CODEX_DIR_PREFIX),
+  projectWorktreeDir: null,
   sessionFile: {
     /**
      * Codex nests rollouts by local date:
@@ -263,7 +325,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.
@@ -276,6 +340,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",
@@ -335,7 +400,7 @@ var codex = {
     extendedContext: null
   },
   capabilities: {
-    worktrees: false,
+    worktrees: true,
     mcp: false,
     slashCommands: false,
     workflows: false,
@@ -349,7 +414,9 @@ var codex = {
     nativeRewind: false,
     fileCheckpoints: false,
     reasoningEffort: true,
+    configurableContextWindow: true,
     fastTier: true,
+    lowPriorityInTerminal: false,
     imageInput: true,
     midTurnSteering: true,
     stopSession: false,
@@ -358,7 +425,8 @@ var codex = {
     externalProcesses: false,
     accountSwitching: false,
     modelFallbackNotices: false,
-    autoPermissionMode: "never",
+    autoPermissionMode: "always",
+    toolPermissionRules: true,
     settingsApply: "next-turn",
     turnLiveness: "runtime",
     tokenStreaming: true,
@@ -367,24 +435,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: {
@@ -466,7 +535,9 @@ 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,
     stopSession: true,
@@ -476,6 +547,7 @@ var copilot = {
     accountSwitching: false,
     modelFallbackNotices: false,
     autoPermissionMode: "always",
+    toolPermissionRules: true,
     settingsApply: "next-turn",
     turnLiveness: "runtime",
     tokenStreaming: false,
@@ -483,21 +555,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, 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 = {
@@ -673,6 +780,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;
@@ -1040,6 +1177,10 @@ 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 });
+      continue;
+    }
     if (isQueueOperationMessage(msg)) {
       if (current && msg.operation === "enqueue" && isVisibleQueuedPrompt(msg.content)) {
         const parsed = parseAgentEnvelope(msg.content);
@@ -1091,6 +1232,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);
               }
             }
@@ -2007,9 +2150,18 @@ 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 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;
@@ -2204,22 +2356,22 @@ 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 extractPromptFromRecord(record2) {
+  if (record2.type === "event_msg" && isObject3(record2.payload) && record2.payload.type === "user_message" && typeof record2.payload.message === "string") {
+    return normalizePromptText(record2.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" && isObject3(record2.payload) && record2.payload.type === "message" && record2.payload.role === "user") {
+    return normalizePromptText(extractMessageText(record2.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 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 extractPromptFromRecord(record2) !== "" || extractResponseMessageImages(payload).length > 0 || extractResponseMessageAudio(payload).length > 0;
     }
   }
   return true;
@@ -2240,22 +2392,22 @@ function extractMetadataFromRecords(records) {
   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 : "";
+  for (const record2 of records) {
+    if (!isObject3(record2.payload)) 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;
@@ -2263,25 +2415,23 @@ 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 = extractPromptFromRecord(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 {
@@ -2439,19 +2589,19 @@ function walkCodexRecords(records, options) {
     appendToolCall(targetTurn, toolCall, timestamp);
   }
   for (let index = 0; index < records.length; index++) {
-    const record = records[index];
-    if (!isCodexRecord(record)) continue;
+    const record2 = records[index];
+    if (!isCodexRecord(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;
@@ -2460,7 +2610,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);
       }
@@ -2484,12 +2634,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) {
@@ -2497,14 +2647,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";
@@ -2529,7 +2679,7 @@ 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") {
+    if (record2.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";
@@ -2563,7 +2713,7 @@ function walkCodexRecords(records, options) {
       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);
@@ -2840,7 +2990,7 @@ function parseCodexSession(jsonlText, 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);
 }
@@ -2991,11 +3141,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) {
@@ -3757,7 +3907,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);
 }
@@ -3865,11 +4015,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;
@@ -3915,6 +4065,15 @@ var claudeFormat = {
   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
@@ -3954,8 +4113,8 @@ var import_node_path2 = require("node:path");
 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 = {
@@ -3963,7 +4122,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");
 
@@ -4151,24 +4311,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_fs.realpathSync)(root()), (0, import_node_fs.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];
@@ -4177,7 +4361,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_fs.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;
@@ -4571,6 +4768,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) {
@@ -4817,7 +5019,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];
@@ -4838,7 +5040,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];
@@ -5090,6 +5292,8 @@ 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 };
     default: {
       const exhaustive = block;
       return exhaustive;
@@ -5179,14 +5383,14 @@ 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 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 session = parseTranscript(content, jsonlPath);
   if (turnIndex < 0 || turnIndex >= session.turns.length) return { error: "Turn not found" };
   return mapTurnToDetail(session, turnIndex);
 }
@@ -5194,11 +5398,11 @@ 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 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 subagentSession = parseTranscript(subagentContent, subagentFile.filePath);
   const metadata = findAgentMetadata(session, agentId);
   const parentToolCallId = findParentToolCallId(session, agentId);
   const teamContext = await findTeamContext(sessionId, subagentFile.fileName);
@@ -5219,7 +5423,7 @@ async function getAgentTurnDetail(sessionId, agentId, turnIndex) {
   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 subagentSession = parseTranscript(subagentContent, subagentFile.filePath);
   if (turnIndex < 0 || turnIndex >= subagentSession.turns.length) return { error: "Turn not found" };
   return mapTurnToDetail(subagentSession, turnIndex);
 }
@@ -5253,15 +5457,15 @@ function scanClaudeMessages(lines) {
     turnCount: 0
   };
   for (const line of lines) {
-    let record;
+    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);
@@ -5308,6 +5512,7 @@ async function getSessionMeta(filePath) {
     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 ?? "",
@@ -5315,7 +5520,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,
@@ -5325,7 +5530,7 @@ 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) {
@@ -5420,7 +5625,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,