@buildautomaton/cli 0.1.57 → 0.1.58

package/dist/cli.js

@@ -25631,7 +25631,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.57".length > 0 ? "0.1.57" : "0.0.0-dev";
+var CLI_VERSION = "0.1.58".length > 0 ? "0.1.58" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -28757,6 +28757,81 @@ function isUserEndedSessionTurnErrorText(errorText) {
 // ../types/src/session-kind.ts
 var SESSION_KINDS = ["regular", "planning", "planned"];
 var SESSION_KIND_SET = new Set(SESSION_KINDS);
+function parseSessionKind(raw) {
+  if (raw === "todo") return "planned";
+  if (typeof raw === "string" && SESSION_KIND_SET.has(raw)) return raw;
+  return "regular";
+}
+
+// ../types/src/planning-todo.ts
+function planningTodoTitle(item) {
+  return item.content.title;
+}
+
+// ../types/src/parse-planning-todo-agent-json.ts
+function parsePlanningTodoAgentJson(raw) {
+  if (raw == null || raw.trim() === "") return [];
+  let text = raw.trim();
+  const fence = text.match(/```(?:json)?\s*([\s\S]*?)```/i);
+  if (fence?.[1]) text = fence[1].trim();
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    const start = text.indexOf("[");
+    const end = text.lastIndexOf("]");
+    if (start < 0 || end <= start) return [];
+    try {
+      parsed = JSON.parse(text.slice(start, end + 1));
+    } catch {
+      return [];
+    }
+  }
+  if (!Array.isArray(parsed)) return [];
+  const rows = [];
+  for (const item of parsed) {
+    if (!item || typeof item !== "object" || Array.isArray(item)) continue;
+    const o = item;
+    const title = typeof o.title === "string" ? o.title.trim() : "";
+    const prompt = typeof o.prompt === "string" ? o.prompt.trim() : typeof o.promptText === "string" ? o.promptText.trim() : "";
+    if (!title || !prompt) continue;
+    rows.push({ title, prompt });
+  }
+  return rows;
+}
+
+// ../types/src/build-planning-session-agent-prompt.ts
+var PLANNING_INSTRUCTIONS = [
+  "PLANNING MODE: You must NOT make any changes to the codebase, filesystem, or environment.",
+  "Do not run tools that modify files or execute commands that change state.",
+  "Your only task is to analyze and produce a plan.",
+  "",
+  "Respond with ONLY a single JSON array \u2014 no markdown fences, no other text before or after.",
+  "Each array element must be an object with exactly:",
+  '- "title": a one-line summary of the task',
+  '- "prompt": the full prompt to use when creating a new draft session from this todo',
+  "",
+  "Example:",
+  '[{"title":"Add user login","prompt":"Implement a login form with email and password..."}]'
+].join("\n");
+function buildPlanningSessionAgentPrompt(userPrompt) {
+  return [PLANNING_INSTRUCTIONS, "", "User request:", userPrompt.trim()].join("\n");
+}
+function buildPlanningSessionFollowUpAgentPrompt(userPrompt, existingTodos) {
+  const todoLines = existingTodos.length > 0 ? existingTodos.map((t) => {
+    const status = t.plannedSessionId ? "DONE (draft session already created)" : "OPEN";
+    return `- [${status}] ${planningTodoTitle(t)}`;
+  }).join("\n") : "(none yet)";
+  return [
+    PLANNING_INSTRUCTIONS,
+    "",
+    "Existing todo items from this planning session (consider these when responding; do not duplicate completed items):",
+    todoLines,
+    "",
+    "User follow-up:",
+    userPrompt.trim()
+  ].join("\n");
+}
 
 // ../types/src/change-summary-path.ts
 function normalizeRepoRelativePath(p) {
@@ -29140,6 +29215,19 @@ function buildCliAutoApprovedPermissionRpcResult(requestParams) {
   };
 }
 
+// ../types/src/acp-agent-text-stream-bucket.ts
+function resolveAgentTextStreamBucket(params) {
+  const k = params.transcriptRowKind;
+  const su = params.sessionUpdate;
+  if (k === "agent_thought_chunk" || su === "agent_thought_chunk" || k === "thinking" || su === "thinking") {
+    return "thought";
+  }
+  if (k === "agent_message_chunk" || su === "agent_message_chunk" || k === "update" || su === "update") {
+    return "message";
+  }
+  return null;
+}
+
 // ../types/src/agent-config.ts
 var AGENT_CONFIG_CLAUDE_PERMISSION_MODE_KEY = "claude_permission_mode";
 var AGENT_CONFIG_CLI_PERMISSION_MODE_KEY = "cli_permission_mode";
@@ -34109,6 +34197,185 @@ function createBridgeOnRequest(opts) {
   };
 }
 
+// src/agents/acp/hooks/bridge-on-session-update/constants.ts
+var PATH_SNAPSHOT_DEBOUNCE_MS = 500;
+
+// src/agents/acp/hooks/bridge-on-session-update/tool-key.ts
+function getToolCallId(params) {
+  if (!params || typeof params !== "object") return "";
+  const u = params;
+  const id = u.toolCallId ?? u.tool_call_id;
+  return typeof id === "string" ? id : "";
+}
+function isCompletedToolStatus(status) {
+  if (typeof status !== "string") return false;
+  const s = status.toLowerCase();
+  return s === "completed" || s === "complete" || s === "succeeded" || s === "success";
+}
+function accumulateToolPaths(toolKey, paths, acc) {
+  if (!toolKey || paths.length === 0) return;
+  let s = acc.get(toolKey);
+  if (!s) {
+    s = /* @__PURE__ */ new Set();
+    acc.set(toolKey, s);
+  }
+  for (const p of paths) s.add(p);
+}
+
+// src/agents/acp/hooks/bridge-on-session-update/path-snapshot-tracker.ts
+var PathSnapshotTracker = class {
+  lastSeenRunId;
+  anonToolSeq = 0;
+  lastAnonymousToolKey = null;
+  beforeByToolKey = /* @__PURE__ */ new Map();
+  debouncers = /* @__PURE__ */ new Map();
+  accumulatedPathsByToolKey = /* @__PURE__ */ new Map();
+  clearRunState() {
+    for (const t of this.debouncers.values()) clearTimeout(t);
+    this.debouncers.clear();
+    this.beforeByToolKey.clear();
+    this.accumulatedPathsByToolKey.clear();
+    this.lastAnonymousToolKey = null;
+  }
+  onRunIdChanged(runId) {
+    if (runId && runId !== this.lastSeenRunId) {
+      this.lastSeenRunId = runId;
+      this.clearRunState();
+    }
+  }
+  resolveToolKey(params, updateKind) {
+    const id = getToolCallId(params);
+    if (id) return id;
+    if (updateKind === "tool_call") {
+      this.lastAnonymousToolKey = `anon:${++this.anonToolSeq}`;
+      return this.lastAnonymousToolKey;
+    }
+    return this.lastAnonymousToolKey ?? "_unknown";
+  }
+  resetToolSnapshots(toolKey) {
+    const t = this.debouncers.get(toolKey);
+    if (t) clearTimeout(t);
+    this.debouncers.delete(toolKey);
+    this.beforeByToolKey.delete(toolKey);
+    this.accumulatedPathsByToolKey.delete(toolKey);
+  }
+  captureBeforeFromDisk(toolKey, paths, sessionParentPath) {
+    if (paths.length === 0) return;
+    let m = this.beforeByToolKey.get(toolKey);
+    if (!m) {
+      m = /* @__PURE__ */ new Map();
+      this.beforeByToolKey.set(toolKey, m);
+    }
+    for (const p of paths) {
+      if (m.has(p)) continue;
+      m.set(p, readUtf8WorkspaceFile(sessionParentPath, p));
+    }
+  }
+  ensureBeforeFromHeadForMissing(toolKey, paths, sessionParentPath) {
+    let m = this.beforeByToolKey.get(toolKey);
+    if (!m) {
+      m = /* @__PURE__ */ new Map();
+      this.beforeByToolKey.set(toolKey, m);
+    }
+    for (const p of paths) {
+      if (m.has(p)) continue;
+      m.set(p, readGitHeadBlob(sessionParentPath, p));
+    }
+  }
+  flushPathSnapshots(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2) {
+    const t = this.debouncers.get(toolKey);
+    if (t) clearTimeout(t);
+    this.debouncers.delete(toolKey);
+    const beforeMap = this.beforeByToolKey.get(toolKey);
+    if (!beforeMap || beforeMap.size === 0) return;
+    this.beforeByToolKey.delete(toolKey);
+    if (!send || !runId || !sessionId) return;
+    for (const [displayPath, oldText] of beforeMap) {
+      const newText = readUtf8WorkspaceFile(sessionParentPath, displayPath);
+      if (oldText === newText) continue;
+      const patchContent = editSnippetToUnifiedDiff(displayPath, oldText, newText);
+      const dirFlags = getSessionFileChangeDirectoryFlags(sessionParentPath, displayPath);
+      try {
+        send({
+          type: "session_file_change",
+          sessionId,
+          runId,
+          path: displayPath,
+          oldText,
+          newText,
+          patchContent,
+          isDirectory: dirFlags.isDirectory,
+          directoryRemoved: dirFlags.directoryRemoved
+        });
+        sentPaths.add(displayPath);
+      } catch (err) {
+        log2(`[Bridge service] Session file change failed for ${displayPath}: ${errorMessage(err)}`);
+      }
+    }
+  }
+  scheduleDebouncedFlush(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2) {
+    const prev = this.debouncers.get(toolKey);
+    if (prev) clearTimeout(prev);
+    this.debouncers.set(
+      toolKey,
+      setTimeout(() => {
+        this.debouncers.delete(toolKey);
+        this.flushPathSnapshots(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2);
+      }, PATH_SNAPSHOT_DEBOUNCE_MS)
+    );
+  }
+  handleToolCallLifecycle(updateKind, toolKey, toolPaths, status, sessionParentPath, sentPaths, send, runId, sessionId, log2) {
+    if (updateKind === "tool_call") {
+      this.resetToolSnapshots(toolKey);
+    }
+    if (updateKind === "tool_call") {
+      this.captureBeforeFromDisk(toolKey, toolPaths, sessionParentPath);
+    } else if (updateKind === "tool_call_update") {
+      if (isCompletedToolStatus(status)) {
+        this.ensureBeforeFromHeadForMissing(toolKey, toolPaths, sessionParentPath);
+        this.flushPathSnapshots(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2);
+      } else {
+        this.captureBeforeFromDisk(toolKey, toolPaths, sessionParentPath);
+        if (this.beforeByToolKey.has(toolKey)) {
+          this.scheduleDebouncedFlush(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2);
+        }
+      }
+    }
+  }
+};
+
+// src/agents/acp/hooks/bridge-on-session-update/send-session-info-title-update.ts
+function extractSessionInfoTitle(params) {
+  if (!params || typeof params !== "object") return null;
+  const p = params;
+  const title = typeof p.title === "string" ? p.title.trim() : "";
+  return title ? title : null;
+}
+function sendSessionInfoTitleUpdate(params) {
+  const title = extractSessionInfoTitle(params.payload);
+  if (!title || !params.runId || !params.send) return;
+  try {
+    params.send({
+      type: "session_title_update",
+      ...params.sessionId ? { sessionId: params.sessionId } : {},
+      runId: params.runId,
+      title
+    });
+  } catch (err) {
+    params.log(`[Bridge service] Session title update send failed: ${errorMessage(err)}`);
+  }
+}
+
+// src/agents/acp/hooks/bridge-on-session-update/parse-bridge-session-update.ts
+function parseBridgeSessionUpdate(params) {
+  const p = params;
+  const updateKind = p.sessionUpdate ?? p.session_update ?? p.type ?? "update";
+  const isCompletedToolCallUpdate = updateKind === "tool_call_update" && isCompletedToolStatus(p.status);
+  const toolName = p.toolCall?.name ?? p.tool_call?.name ?? "";
+  const isToolUpdate = updateKind === "tool_call" || updateKind === "tool_call_update" || typeof toolName === "string" && toolName.length > 0;
+  return { updateKind, toolName, isToolUpdate, isCompletedToolCallUpdate };
+}
+
 // src/agents/acp/hooks/extract-acp-file-diffs-from-update/paths-and-text.ts
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function readOptionalTextField(v) {
@@ -34279,174 +34546,27 @@ function extractToolTargetDisplayPaths(update, sessionParentPath) {
   return [...out];
 }
 
-// src/agents/acp/hooks/bridge-on-session-update/constants.ts
-var PATH_SNAPSHOT_DEBOUNCE_MS = 500;
-
-// src/agents/acp/hooks/bridge-on-session-update/tool-key.ts
-function getToolCallId(params) {
-  if (!params || typeof params !== "object") return "";
-  const u = params;
-  const id = u.toolCallId ?? u.tool_call_id;
-  return typeof id === "string" ? id : "";
-}
-function isCompletedToolStatus(status) {
-  if (typeof status !== "string") return false;
-  const s = status.toLowerCase();
-  return s === "completed" || s === "complete" || s === "succeeded" || s === "success";
-}
-function accumulateToolPaths(toolKey, paths, acc) {
-  if (!toolKey || paths.length === 0) return;
-  let s = acc.get(toolKey);
-  if (!s) {
-    s = /* @__PURE__ */ new Set();
-    acc.set(toolKey, s);
-  }
-  for (const p of paths) s.add(p);
-}
-
-// src/agents/acp/hooks/bridge-on-session-update/path-snapshot-tracker.ts
-var PathSnapshotTracker = class {
-  lastSeenRunId;
-  anonToolSeq = 0;
-  lastAnonymousToolKey = null;
-  beforeByToolKey = /* @__PURE__ */ new Map();
-  debouncers = /* @__PURE__ */ new Map();
-  accumulatedPathsByToolKey = /* @__PURE__ */ new Map();
-  clearRunState() {
-    for (const t of this.debouncers.values()) clearTimeout(t);
-    this.debouncers.clear();
-    this.beforeByToolKey.clear();
-    this.accumulatedPathsByToolKey.clear();
-    this.lastAnonymousToolKey = null;
-  }
-  onRunIdChanged(runId) {
-    if (runId && runId !== this.lastSeenRunId) {
-      this.lastSeenRunId = runId;
-      this.clearRunState();
-    }
-  }
-  resolveToolKey(params, updateKind) {
-    const id = getToolCallId(params);
-    if (id) return id;
-    if (updateKind === "tool_call") {
-      this.lastAnonymousToolKey = `anon:${++this.anonToolSeq}`;
-      return this.lastAnonymousToolKey;
-    }
-    return this.lastAnonymousToolKey ?? "_unknown";
-  }
-  resetToolSnapshots(toolKey) {
-    const t = this.debouncers.get(toolKey);
-    if (t) clearTimeout(t);
-    this.debouncers.delete(toolKey);
-    this.beforeByToolKey.delete(toolKey);
-    this.accumulatedPathsByToolKey.delete(toolKey);
-  }
-  captureBeforeFromDisk(toolKey, paths, sessionParentPath) {
-    if (paths.length === 0) return;
-    let m = this.beforeByToolKey.get(toolKey);
-    if (!m) {
-      m = /* @__PURE__ */ new Map();
-      this.beforeByToolKey.set(toolKey, m);
-    }
-    for (const p of paths) {
-      if (m.has(p)) continue;
-      m.set(p, readUtf8WorkspaceFile(sessionParentPath, p));
-    }
-  }
-  ensureBeforeFromHeadForMissing(toolKey, paths, sessionParentPath) {
-    let m = this.beforeByToolKey.get(toolKey);
-    if (!m) {
-      m = /* @__PURE__ */ new Map();
-      this.beforeByToolKey.set(toolKey, m);
-    }
-    for (const p of paths) {
-      if (m.has(p)) continue;
-      m.set(p, readGitHeadBlob(sessionParentPath, p));
-    }
-  }
-  flushPathSnapshots(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2) {
-    const t = this.debouncers.get(toolKey);
-    if (t) clearTimeout(t);
-    this.debouncers.delete(toolKey);
-    const beforeMap = this.beforeByToolKey.get(toolKey);
-    if (!beforeMap || beforeMap.size === 0) return;
-    this.beforeByToolKey.delete(toolKey);
-    if (!send || !runId || !sessionId) return;
-    for (const [displayPath, oldText] of beforeMap) {
-      const newText = readUtf8WorkspaceFile(sessionParentPath, displayPath);
-      if (oldText === newText) continue;
-      const patchContent = editSnippetToUnifiedDiff(displayPath, oldText, newText);
-      const dirFlags = getSessionFileChangeDirectoryFlags(sessionParentPath, displayPath);
-      try {
-        send({
-          type: "session_file_change",
-          sessionId,
-          runId,
-          path: displayPath,
-          oldText,
-          newText,
-          patchContent,
-          isDirectory: dirFlags.isDirectory,
-          directoryRemoved: dirFlags.directoryRemoved
-        });
-        sentPaths.add(displayPath);
-      } catch (err) {
-        log2(`[Bridge service] Session file change failed for ${displayPath}: ${errorMessage(err)}`);
-      }
-    }
-  }
-  scheduleDebouncedFlush(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2) {
-    const prev = this.debouncers.get(toolKey);
-    if (prev) clearTimeout(prev);
-    this.debouncers.set(
-      toolKey,
-      setTimeout(() => {
-        this.debouncers.delete(toolKey);
-        this.flushPathSnapshots(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2);
-      }, PATH_SNAPSHOT_DEBOUNCE_MS)
-    );
-  }
-  handleToolCallLifecycle(updateKind, toolKey, toolPaths, status, sessionParentPath, sentPaths, send, runId, sessionId, log2) {
-    if (updateKind === "tool_call") {
-      this.resetToolSnapshots(toolKey);
-    }
-    if (updateKind === "tool_call") {
-      this.captureBeforeFromDisk(toolKey, toolPaths, sessionParentPath);
-    } else if (updateKind === "tool_call_update") {
-      if (isCompletedToolStatus(status)) {
-        this.ensureBeforeFromHeadForMissing(toolKey, toolPaths, sessionParentPath);
-        this.flushPathSnapshots(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2);
-      } else {
-        this.captureBeforeFromDisk(toolKey, toolPaths, sessionParentPath);
-        if (this.beforeByToolKey.has(toolKey)) {
-          this.scheduleDebouncedFlush(toolKey, sessionParentPath, sentPaths, send, runId, sessionId, log2);
-        }
-      }
-    }
-  }
-};
-
-// src/agents/acp/hooks/bridge-on-session-update/send-structured-file-changes.ts
-function sendExtractedDiffsAsSessionFileChanges(diffs, send, sessionParentPath, sessionId, runId, sentPaths, log2) {
-  for (const d of diffs) {
-    try {
-      const patchContent = editSnippetToUnifiedDiff(d.path, d.oldText, d.newText);
-      const dirFlags = getSessionFileChangeDirectoryFlags(sessionParentPath, d.path);
-      send({
-        type: "session_file_change",
-        sessionId,
-        runId,
-        path: d.path,
-        oldText: d.oldText,
-        newText: d.newText,
-        patchContent,
-        isDirectory: dirFlags.isDirectory,
-        directoryRemoved: dirFlags.directoryRemoved
-      });
-      sentPaths.add(d.path);
-    } catch (err) {
-      log2(`[Bridge service] Session file change failed for ${d.path}: ${errorMessage(err)}`);
-    }
+// src/agents/acp/hooks/bridge-on-session-update/send-structured-file-changes.ts
+function sendExtractedDiffsAsSessionFileChanges(diffs, send, sessionParentPath, sessionId, runId, sentPaths, log2) {
+  for (const d of diffs) {
+    try {
+      const patchContent = editSnippetToUnifiedDiff(d.path, d.oldText, d.newText);
+      const dirFlags = getSessionFileChangeDirectoryFlags(sessionParentPath, d.path);
+      send({
+        type: "session_file_change",
+        sessionId,
+        runId,
+        path: d.path,
+        oldText: d.oldText,
+        newText: d.newText,
+        patchContent,
+        isDirectory: dirFlags.isDirectory,
+        directoryRemoved: dirFlags.directoryRemoved
+      });
+      sentPaths.add(d.path);
+    } catch (err) {
+      log2(`[Bridge service] Session file change failed for ${d.path}: ${errorMessage(err)}`);
+    }
   }
 }
 function sendGitHeadVsWorkspaceForToolPaths(mergedPaths, sentPaths, send, sessionParentPath, sessionId, runId, log2) {
@@ -34476,25 +34596,158 @@ function sendGitHeadVsWorkspaceForToolPaths(mergedPaths, sentPaths, send, sessio
   }
 }
 
-// src/agents/acp/hooks/bridge-on-session-update/send-session-info-title-update.ts
-function extractSessionInfoTitle(params) {
-  if (!params || typeof params !== "object") return null;
-  const p = params;
-  const title = typeof p.title === "string" ? p.title.trim() : "";
-  return title ? title : null;
+// src/agents/acp/hooks/bridge-on-session-update/handle-bridge-tool-session-update.ts
+function handleBridgeToolSessionUpdate(params) {
+  const {
+    params: updateParams,
+    updateKind,
+    isToolUpdate,
+    isCompletedToolCallUpdate,
+    toolKey,
+    toolPaths,
+    status,
+    sessionParentPath,
+    pathTracker,
+    sentFileChangePaths,
+    send,
+    runId,
+    sessionId,
+    log: log2
+  } = params;
+  if (updateKind === "tool_call") {
+    pathTracker.resetToolSnapshots(toolKey);
+  }
+  if (isToolUpdate) {
+    accumulateToolPaths(toolKey, toolPaths, pathTracker.accumulatedPathsByToolKey);
+  }
+  if (isToolUpdate) {
+    const deliver = send && runId && sessionId ? (msg) => send(msg) : null;
+    pathTracker.handleToolCallLifecycle(
+      updateKind,
+      toolKey,
+      toolPaths,
+      status,
+      sessionParentPath,
+      sentFileChangePaths,
+      deliver,
+      runId,
+      sessionId,
+      log2
+    );
+  }
+  const diffs = extractAcpFileDiffsFromUpdate(updateParams, sessionParentPath);
+  if (diffs.length > 0 && send && runId && sessionId) {
+    sendExtractedDiffsAsSessionFileChanges(
+      diffs,
+      send,
+      sessionParentPath,
+      sessionId,
+      runId,
+      sentFileChangePaths,
+      log2
+    );
+  } else if (diffs.length > 0) {
+    log2(
+      `[Bridge service] Agent file diff(s) not forwarded (${diffs.length}): session or run not wired to the bridge.`
+    );
+  }
+  if (isCompletedToolCallUpdate && send && runId && sessionId) {
+    const acc = pathTracker.accumulatedPathsByToolKey.get(toolKey);
+    const merged = [.../* @__PURE__ */ new Set([...acc ? [...acc] : [], ...toolPaths])];
+    sendGitHeadVsWorkspaceForToolPaths(
+      merged,
+      sentFileChangePaths,
+      send,
+      sessionParentPath,
+      sessionId,
+      runId,
+      log2
+    );
+    pathTracker.accumulatedPathsByToolKey.delete(toolKey);
+  }
 }
-function sendSessionInfoTitleUpdate(params) {
-  const title = extractSessionInfoTitle(params.payload);
-  if (!title || !params.runId || !params.send) return;
+function resolveBridgeToolPaths(params, isToolUpdate, sessionParentPath) {
+  return isToolUpdate ? extractToolTargetDisplayPaths(params, sessionParentPath) : [];
+}
+
+// src/agents/planning/extract-session-update-message-text.ts
+function extractSessionUpdateMessageText(params) {
+  if (params == null || typeof params !== "object" || Array.isArray(params)) return null;
+  const o = params;
+  if (typeof o.text === "string" && o.text.length > 0) return o.text;
+  const content = o.content;
+  if (typeof content === "string" && content.length > 0) return content;
+  if (content != null && typeof content === "object" && !Array.isArray(content)) {
+    const c = content;
+    if (typeof c.text === "string" && c.text.length > 0) return c.text;
+  }
+  const update = o.update;
+  if (typeof update === "string" && update.length > 0) return update;
+  if (update != null && typeof update === "object" && !Array.isArray(update)) {
+    const u = update;
+    const innerContent = u.content;
+    if (typeof innerContent === "string" && innerContent.length > 0) return innerContent;
+    if (innerContent != null && typeof innerContent === "object" && !Array.isArray(innerContent)) {
+      const ic = innerContent;
+      if (typeof ic.text === "string" && ic.text.length > 0) return ic.text;
+    }
+  }
+  return null;
+}
+
+// src/agents/planning/planning-session-turn-buffer.ts
+var buffersByRunId = /* @__PURE__ */ new Map();
+function registerPlanningSessionTurn(runId) {
+  buffersByRunId.set(runId, { messageBuffer: "" });
+}
+function clearPlanningSessionTurn(runId) {
+  buffersByRunId.delete(runId);
+}
+function capturePlanningSessionUpdate(params) {
+  const state = buffersByRunId.get(params.runId);
+  if (!state) return false;
+  const sessionUpdate = params.payload != null && typeof params.payload === "object" && !Array.isArray(params.payload) ? params.payload.sessionUpdate ?? params.payload.session_update : void 0;
+  const bucket = resolveAgentTextStreamBucket({
+    transcriptRowKind: params.updateKind,
+    sessionUpdate: typeof sessionUpdate === "string" ? sessionUpdate : void 0
+  });
+  if (bucket !== "message") return false;
+  const text = extractSessionUpdateMessageText(params.payload);
+  if (text) state.messageBuffer += text;
+  return true;
+}
+function getPlanningSessionTurnOutput(runId) {
+  return buffersByRunId.get(runId)?.messageBuffer ?? "";
+}
+function consumePlanningSessionTurnOutput(runId) {
+  const state = buffersByRunId.get(runId);
+  buffersByRunId.delete(runId);
+  return state?.messageBuffer ?? "";
+}
+
+// src/agents/acp/hooks/bridge-on-session-update/forward-bridge-session-update.ts
+function forwardBridgeSessionUpdate(params) {
+  const { runId, sessionId, updateKind, payload, send, nextTranscriptStreamSeq, log: log2 } = params;
+  if (updateKind === "permission") {
+    return;
+  }
+  if (capturePlanningSessionUpdate({ runId, updateKind, payload })) {
+    return;
+  }
   try {
-    params.send({
-      type: "session_title_update",
-      ...params.sessionId ? { sessionId: params.sessionId } : {},
-      runId: params.runId,
-      title
+    const transcriptStreamSeq = nextTranscriptStreamSeq?.(runId);
+    send({
+      type: "session_update",
+      ...sessionId ? { sessionId } : {},
+      runId,
+      kind: updateKind,
+      payload,
+      ...transcriptStreamSeq != null ? { transcriptStreamSeq } : {}
     });
   } catch (err) {
-    params.log(`[Bridge service] Session title update send failed: ${errorMessage(err)}`);
+    log2(
+      `[Bridge service] Session update send failed (${formatSessionUpdateKindForLog(updateKind)}): ${errorMessage(err)}`
+    );
   }
 }
 
@@ -34509,8 +34762,7 @@ function createBridgeOnSessionUpdate(opts) {
     pathTracker.onRunIdChanged(runId);
     const send = getSendSessionUpdate();
     const sentFileChangePaths = /* @__PURE__ */ new Set();
-    const p = params;
-    const updateKind = p.sessionUpdate ?? p.session_update ?? p.type ?? "update";
+    const { updateKind, isToolUpdate, isCompletedToolCallUpdate } = parseBridgeSessionUpdate(params);
     if (updateKind === "config_option_update") {
       return;
     }
@@ -34518,81 +34770,35 @@ function createBridgeOnSessionUpdate(opts) {
       sendSessionInfoTitleUpdate({ payload: params, runId, sessionId, send, log: log2 });
       return;
     }
-    const isCompletedToolCallUpdate = updateKind === "tool_call_update" && isCompletedToolStatus(p.status);
-    const toolName = p.toolCall?.name ?? p.tool_call?.name ?? "";
-    const isToolUpdate = updateKind === "tool_call" || updateKind === "tool_call_update" || typeof toolName === "string" && toolName.length > 0;
-    const toolPaths = isToolUpdate ? extractToolTargetDisplayPaths(params, sessionParentPath) : [];
+    const toolPaths = resolveBridgeToolPaths(params, isToolUpdate, sessionParentPath);
     const toolKey = isToolUpdate ? pathTracker.resolveToolKey(params, updateKind) : "";
-    if (updateKind === "tool_call") {
-      pathTracker.resetToolSnapshots(toolKey);
-    }
-    if (isToolUpdate) {
-      accumulateToolPaths(toolKey, toolPaths, pathTracker.accumulatedPathsByToolKey);
-    }
-    if (isToolUpdate) {
-      const deliver = send && runId && sessionId ? (msg) => send(msg) : null;
-      pathTracker.handleToolCallLifecycle(
-        updateKind,
-        toolKey,
-        toolPaths,
-        p.status,
-        sessionParentPath,
-        sentFileChangePaths,
-        deliver,
-        runId ?? "",
-        sessionId ?? "",
-        log2
-      );
-    }
-    const diffs = extractAcpFileDiffsFromUpdate(params, sessionParentPath);
-    if (diffs.length > 0 && send && runId && sessionId) {
-      sendExtractedDiffsAsSessionFileChanges(
-        diffs,
-        send,
-        sessionParentPath,
-        sessionId,
+    const status = params.status;
+    handleBridgeToolSessionUpdate({
+      params,
+      updateKind,
+      isToolUpdate,
+      isCompletedToolCallUpdate,
+      toolKey,
+      toolPaths,
+      status,
+      sessionParentPath,
+      pathTracker,
+      sentFileChangePaths,
+      send,
+      runId: runId ?? "",
+      sessionId: sessionId ?? "",
+      log: log2
+    });
+    if (runId && send) {
+      forwardBridgeSessionUpdate({
         runId,
-        sentFileChangePaths,
-        log2
-      );
-    } else if (diffs.length > 0) {
-      log2(
-        `[Bridge service] Agent file diff(s) not forwarded (${diffs.length}): session or run not wired to the bridge.`
-      );
-    }
-    if (isCompletedToolCallUpdate && send && runId && sessionId) {
-      const acc = pathTracker.accumulatedPathsByToolKey.get(toolKey);
-      const merged = [.../* @__PURE__ */ new Set([...acc ? [...acc] : [], ...toolPaths])];
-      sendGitHeadVsWorkspaceForToolPaths(
-        merged,
-        sentFileChangePaths,
-        send,
-        sessionParentPath,
         sessionId,
-        runId,
-        log2
-      );
-      pathTracker.accumulatedPathsByToolKey.delete(toolKey);
-    }
-    if (runId && send) {
-      if (updateKind === "permission") {
-        return;
-      }
-      try {
-        const transcriptStreamSeq = nextTranscriptStreamSeq?.(runId);
-        send({
-          type: "session_update",
-          ...sessionId ? { sessionId } : {},
-          runId,
-          kind: updateKind,
-          payload: params,
-          ...transcriptStreamSeq != null ? { transcriptStreamSeq } : {}
-        });
-      } catch (err) {
-        log2(
-          `[Bridge service] Session update send failed (${formatSessionUpdateKindForLog(updateKind)}): ${errorMessage(err)}`
-        );
-      }
+        updateKind,
+        payload: params,
+        send,
+        nextTranscriptStreamSeq,
+        log: log2
+      });
     }
   };
 }
@@ -34932,14 +35138,48 @@ async function disconnectAll(ctx) {
   ctx.pendingCancelRunIds.clear();
 }
 
-// src/git/git-runtime.ts
-var activeGitChildProcesses = /* @__PURE__ */ new Set();
-function abortActiveGitChildProcesses() {
-  for (const child of activeGitChildProcesses) {
-    try {
-      child.kill("SIGTERM");
-    } catch {
-    }
+// src/agents/acp/manager/resolve-prompt-run-context.ts
+function resolvePromptRunContext(ctx, opts) {
+  const { runId, mode, agentType, agentConfig, sessionId } = opts;
+  const preferredForPrompt = agentType ?? ctx.backendFallbackAgentType ?? null;
+  if (!runId) {
+    ctx.log("[Agent] Prompt ignored: missing runId (cannot route session updates).");
+    return null;
+  }
+  const acpAgentKey = computeAcpAgentKey(preferredForPrompt, mode, agentConfig ?? null);
+  if (!acpAgentKey) {
+    return null;
+  }
+  const activeAcpSessionAgentKey = computeAcpSessionAgentKey(sessionId, acpAgentKey);
+  ctx.pendingCancelRunIds.delete(runId);
+  ctx.promptRouting.registerRun({ sessionId, runId });
+  ctx.runDispatch.set(runId, { acpSessionAgentKey: activeAcpSessionAgentKey });
+  return {
+    activeRunId: runId,
+    activeAcpAgentKey: acpAgentKey,
+    activeAcpSessionAgentKey,
+    preferredForPrompt
+  };
+}
+
+// src/agents/acp/send-prompt-result-augment.ts
+function augmentPromptResultAuthFields(agentType, errorText) {
+  const err = errorText ?? "";
+  const at = agentType ?? null;
+  const evaluated = Boolean(at && err.trim());
+  const suggestsAuth = evaluated && at ? localAgentErrorSuggestsAuth(at, err) : false;
+  if (!suggestsAuth || !agentType) return {};
+  return { agentAuthRequired: true, agentType };
+}
+
+// src/git/git-runtime.ts
+var activeGitChildProcesses = /* @__PURE__ */ new Set();
+function abortActiveGitChildProcesses() {
+  for (const child of activeGitChildProcesses) {
+    try {
+      child.kill("SIGTERM");
+    } catch {
+    }
   }
 }
 var GitOperationAbortedError = class extends Error {
@@ -35387,104 +35627,136 @@ async function maybeUploadE2eeSessionChangeSummariesAfterAgentSuccess(params) {
   }
 }
 
-// src/agents/acp/send-prompt-result-augment.ts
-function augmentPromptResultAuthFields(agentType, errorText) {
-  const err = errorText ?? "";
-  const at = agentType ?? null;
-  const evaluated = Boolean(at && err.trim());
-  const suggestsAuth = evaluated && at ? localAgentErrorSuggestsAuth(at, err) : false;
-  if (!suggestsAuth || !agentType) return {};
-  return { agentAuthRequired: true, agentType };
+// src/agents/planning/submit-planning-todos-for-turn.ts
+async function submitPlanningTodosForTurn(params) {
+  const token = params.getCloudAccessToken();
+  if (!token.trim()) return { ok: false, error: "Missing cloud access token" };
+  const base = params.cloudApiBaseUrl.replace(/\/$/, "");
+  const url2 = `${base}/internal/sessions/todos/submit`;
+  const res = await fetch(url2, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      sessionId: params.sessionId,
+      turnId: params.turnId,
+      items: params.items
+    })
+  });
+  if (!res.ok) {
+    const body = await res.json().catch(() => null);
+    return { ok: false, error: body?.error ?? `Planning todo submit failed (${res.status})` };
+  }
+  return { ok: true };
 }
 
-// src/agents/acp/fetch-session-attachments.ts
-function metaSaysEncrypted(meta) {
-  if (!meta) return false;
-  const e = meta.encrypted;
-  return e === true || e === "true" || e === 1;
-}
-function warnIfDecodedImageMagicUnexpected(buf, mimeType, idShort) {
-  const m = mimeType.toLowerCase();
-  if (!m.startsWith("image/") || buf.length < 4) return;
-  const b0 = buf[0];
-  const b1 = buf[1];
-  const b2 = buf[2];
-  const b3 = buf[3];
-  let looksOk = false;
-  if (m.includes("png") && b0 === 137 && b1 === 80 && b2 === 78 && b3 === 71) looksOk = true;
-  else if ((m.includes("jpeg") || m.includes("jpg")) && b0 === 255 && b1 === 216 && b2 === 255) looksOk = true;
-  else if (m.includes("gif") && b0 === 71 && b1 === 73 && b2 === 70) looksOk = true;
-  else if (m.includes("webp") && buf.length >= 12 && buf.subarray(0, 4).toString("ascii") === "RIFF" && buf.subarray(8, 12).toString("ascii") === "WEBP")
-    looksOk = true;
-  else if (!/(png|jpe?g|gif|webp)/i.test(m)) looksOk = true;
-  if (!looksOk) {
-    logDebug(
-      `[Agent] Attachment ${idShort} (${mimeType}): decoded bytes do not match common image signatures \u2014 wrong E2EE key, corrupt blob, or metadata mismatch. First 12 bytes (hex): ${buf.subarray(0, Math.min(12, buf.length)).toString("hex")}`
-    );
+// src/agents/planning/maybe-submit-planning-todos-after-agent-success.ts
+async function maybeSubmitPlanningTodosAfterAgentSuccess(params) {
+  const { sessionId, runId, resultSuccess, output, cloudApiBaseUrl, getCloudAccessToken, log: log2 } = params;
+  const buffered = runId ? getPlanningSessionTurnOutput(runId) : "";
+  const outputFromResult = typeof output === "string" ? output : "";
+  const outputStr = buffered.trim() !== "" ? buffered : outputFromResult;
+  if (!sessionId || !runId || !resultSuccess || outputStr.trim() === "") {
+    return { submitted: false, suppressOutput: false };
   }
-}
-async function fetchSessionAttachmentPayloadsForAgent(params) {
-  const { attachments, sessionId, cloudApiBaseUrl, getCloudAccessToken, e2ee, log: log2 } = params;
-  const token = getCloudAccessToken();
-  if (!token) {
-    return { ok: false, error: "Missing cloud access token; cannot download attachments." };
+  if (!cloudApiBaseUrl || !getCloudAccessToken) {
+    return { submitted: false, suppressOutput: false };
   }
-  const wantedCount = attachments.filter((a) => typeof a.attachmentId === "string" && a.attachmentId.trim() !== "").length;
-  if (wantedCount === 0) {
-    return { ok: false, error: "No valid attachment ids in prompt." };
+  const items = parsePlanningTodoAgentJson(outputStr);
+  if (items.length === 0) {
+    return { submitted: false, suppressOutput: false };
   }
-  const base = cloudApiBaseUrl.replace(/\/+$/, "");
-  const out = [];
-  for (const a of attachments) {
-    const id = typeof a.attachmentId === "string" ? a.attachmentId.trim() : "";
-    if (!id) continue;
-    const metaUrl = `${base}/internal/sessions/${encodeURIComponent(sessionId)}/attachments/${encodeURIComponent(id)}/meta`;
-    const blobUrl = `${base}/internal/sessions/${encodeURIComponent(sessionId)}/attachments/${encodeURIComponent(id)}/blob`;
-    const metaRes = await fetch(metaUrl, { headers: { Authorization: `Bearer ${token}` } });
-    if (!metaRes.ok) {
-      const t = await metaRes.text().catch(() => "");
-      log2(`[Agent] Attachment meta fetch failed ${metaRes.status}: ${t.slice(0, 200)}`);
-      return { ok: false, error: `Could not load attachment (${id.slice(0, 8)}\u2026): ${metaRes.status}` };
-    }
-    const meta = await metaRes.json().catch(() => null);
-    const mimeType = typeof meta?.mimeType === "string" && meta.mimeType.trim() ? meta.mimeType.trim() : a.mimeType;
-    const blobRes = await fetch(blobUrl, { headers: { Authorization: `Bearer ${token}` } });
-    if (!blobRes.ok) {
-      const t = await blobRes.text().catch(() => "");
-      log2(`[Agent] Attachment blob fetch failed ${blobRes.status}: ${t.slice(0, 200)}`);
-      return { ok: false, error: `Could not load attachment data (${id.slice(0, 8)}\u2026): ${blobRes.status}` };
-    }
-    const buf = Buffer.from(await blobRes.arrayBuffer());
-    let imageBytes;
-    const encrypted = metaSaysEncrypted(meta);
-    if (encrypted) {
-      if (!e2ee) {
-        return { ok: false, error: "Encrypted attachments require E2EE keys on this bridge." };
-      }
-      const k = typeof meta?.k === "string" ? meta.k : "";
-      const n = typeof meta?.n === "string" ? meta.n : "";
-      if (!k || !n) {
-        return { ok: false, error: "Invalid encrypted attachment metadata (missing key id or nonce)." };
-      }
-      const c = base64UrlEncode(buf);
-      imageBytes = e2ee.decryptEnvelopeToBuffer({ k, n, c });
+  const result = await submitPlanningTodosForTurn({
+    sessionId,
+    turnId: runId,
+    items,
+    cloudApiBaseUrl,
+    getCloudAccessToken
+  });
+  if (!result.ok) {
+    log2(`[Agent] Planning todo submit failed: ${result.error}`);
+    return { submitted: false, suppressOutput: false };
+  }
+  if (runId) consumePlanningSessionTurnOutput(runId);
+  log2(`[Agent] Planning session: stored ${items.length} todo(s) via internal API`);
+  return { submitted: true, suppressOutput: true };
+}
+
+// src/agents/acp/prompts/finalize-and-send-prompt-result.ts
+async function finalizeAndSendPromptResult(params) {
+  const {
+    result,
+    sessionId,
+    runId,
+    promptId,
+    agentType,
+    agentCwd,
+    isPlanningSession,
+    followUpCatalogPromptId,
+    sessionChangeSummaryFilePaths,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    e2ee,
+    sendResult,
+    sendSessionUpdate,
+    log: log2
+  } = params;
+  if (sessionId && runId && sendSessionUpdate && agentCwd && result.success) {
+    await collectTurnGitDiffFromPreTurnSnapshot({
+      sessionId,
+      runId,
+      agentCwd,
+      sendSessionUpdate,
+      log: log2
+    });
+  }
+  await maybeUploadE2eeSessionChangeSummariesAfterAgentSuccess({
+    sessionId,
+    runId,
+    resultSuccess: result.success === true,
+    output: result.output,
+    e2ee,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    followUpCatalogPromptId,
+    sessionChangeSummaryFilePaths,
+    log: log2
+  });
+  const planningTodosSubmit = await maybeSubmitPlanningTodosAfterAgentSuccess({
+    sessionId,
+    runId,
+    resultSuccess: result.success === true,
+    output: result.output,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    log: log2
+  });
+  const errStr = typeof result.error === "string" ? result.error : void 0;
+  const resultStop = typeof result.stopReason === "string" ? result.stopReason.trim() : "";
+  const cancelledByAgent = resultStop.toLowerCase() === "cancelled" || errStr != null && isUserEndedSessionTurnErrorText(errStr);
+  const planningFallbackOutput = !planningTodosSubmit.suppressOutput && isPlanningSession && runId ? consumePlanningSessionTurnOutput(runId) : "";
+  sendResult({
+    type: "prompt_result",
+    id: promptId,
+    ...sessionId ? { sessionId } : {},
+    ...runId ? { runId } : {},
+    ...result,
+    ...planningTodosSubmit.suppressOutput ? { output: void 0 } : planningFallbackOutput.trim() !== "" ? { output: planningFallbackOutput } : {},
+    ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
+    ...augmentPromptResultAuthFields(agentType, errStr),
+    ...!result.success && cancelledByAgent ? { stopReason: "cancelled" } : {}
+  });
+  if (!result.success) {
+    if (cancelledByAgent) {
+      log2("[Agent] Run ended after stop request (stopped by user).");
     } else {
-      imageBytes = buf;
+      log2(
+        `[Agent] Prompt did not run successfully on the agent (no successful start/completion): ${result.error ?? "Unknown error"}`
+      );
     }
-    warnIfDecodedImageMagicUnexpected(imageBytes, mimeType, id.slice(0, 8));
-    logDebug(
-      `[Agent] Loaded prompt image ${id.slice(0, 8)}\u2026: ${imageBytes.length} bytes, mime=${mimeType}, ${encrypted ? "E2EE decrypted" : "plaintext from storage"}`
-    );
-    const dataBase64 = imageBytes.toString("base64");
-    out.push({ mimeType, dataBase64 });
   }
-  if (out.length !== wantedCount) {
-    return {
-      ok: false,
-      error: `Expected ${wantedCount} image attachment(s) but only loaded ${out.length} (check attachment ids and empty rows).`
-    };
-  }
-  return { ok: true, images: out };
 }
 
 // src/agents/acp/build-forked-session-agent-prompt.ts
@@ -35675,7 +35947,213 @@ function enrichIntegrationContentPromptForAgent(params) {
   return injectIntegrationContentAgentPromptNote(params.agentPromptText, params.sessionId);
 }
 
-// src/agents/acp/send-prompt-to-agent.ts
+// src/agents/planning/enrich-planning-session-prompt-for-agent.ts
+async function enrichPlanningSessionPromptForAgent(params) {
+  const meta = await fetchCloudSessionMeta({
+    sessionId: params.sessionId,
+    cloudApiBaseUrl: params.cloudApiBaseUrl,
+    getCloudAccessToken: params.getCloudAccessToken
+  });
+  if (!meta.ok) return { promptText: params.promptText, isPlanningSession: false };
+  const sessionKind = parseSessionKind(meta.data.sessionKind);
+  if (sessionKind !== "planning") return { promptText: params.promptText, isPlanningSession: false };
+  const todos = Array.isArray(meta.data.planningTodos) ? meta.data.planningTodos : [];
+  if (params.isNewSession || todos.length === 0) {
+    return {
+      promptText: buildPlanningSessionAgentPrompt(params.promptText),
+      isPlanningSession: true
+    };
+  }
+  return {
+    promptText: buildPlanningSessionFollowUpAgentPrompt(params.promptText, todos),
+    isPlanningSession: true
+  };
+}
+
+// src/agents/acp/prompts/prepare-agent-prompt-text.ts
+async function prepareAgentPromptText(params) {
+  const { promptText, sessionId, runId, isNewSession, cloudApiBaseUrl, getCloudAccessToken } = params;
+  let agentPromptText = promptText;
+  let isPlanningSession = false;
+  if (sessionId && cloudApiBaseUrl && getCloudAccessToken) {
+    agentPromptText = await enrichForkedSessionPromptForAgent({
+      sessionId,
+      promptText,
+      cloudApiBaseUrl,
+      getCloudAccessToken
+    });
+    const planningEnriched = await enrichPlanningSessionPromptForAgent({
+      sessionId,
+      promptText: agentPromptText,
+      isNewSession,
+      cloudApiBaseUrl,
+      getCloudAccessToken
+    });
+    agentPromptText = planningEnriched.promptText;
+    isPlanningSession = planningEnriched.isPlanningSession;
+  }
+  if (isPlanningSession && runId) {
+    registerPlanningSessionTurn(runId);
+  }
+  if (sessionId) {
+    agentPromptText = enrichIntegrationContentPromptForAgent({
+      sessionId,
+      originalPromptText: promptText,
+      agentPromptText
+    });
+  }
+  return { agentPromptText, isPlanningSession };
+}
+
+// src/agents/acp/fetch-session-attachments.ts
+function metaSaysEncrypted(meta) {
+  if (!meta) return false;
+  const e = meta.encrypted;
+  return e === true || e === "true" || e === 1;
+}
+function warnIfDecodedImageMagicUnexpected(buf, mimeType, idShort) {
+  const m = mimeType.toLowerCase();
+  if (!m.startsWith("image/") || buf.length < 4) return;
+  const b0 = buf[0];
+  const b1 = buf[1];
+  const b2 = buf[2];
+  const b3 = buf[3];
+  let looksOk = false;
+  if (m.includes("png") && b0 === 137 && b1 === 80 && b2 === 78 && b3 === 71) looksOk = true;
+  else if ((m.includes("jpeg") || m.includes("jpg")) && b0 === 255 && b1 === 216 && b2 === 255) looksOk = true;
+  else if (m.includes("gif") && b0 === 71 && b1 === 73 && b2 === 70) looksOk = true;
+  else if (m.includes("webp") && buf.length >= 12 && buf.subarray(0, 4).toString("ascii") === "RIFF" && buf.subarray(8, 12).toString("ascii") === "WEBP")
+    looksOk = true;
+  else if (!/(png|jpe?g|gif|webp)/i.test(m)) looksOk = true;
+  if (!looksOk) {
+    logDebug(
+      `[Agent] Attachment ${idShort} (${mimeType}): decoded bytes do not match common image signatures \u2014 wrong E2EE key, corrupt blob, or metadata mismatch. First 12 bytes (hex): ${buf.subarray(0, Math.min(12, buf.length)).toString("hex")}`
+    );
+  }
+}
+async function fetchSessionAttachmentPayloadsForAgent(params) {
+  const { attachments, sessionId, cloudApiBaseUrl, getCloudAccessToken, e2ee, log: log2 } = params;
+  const token = getCloudAccessToken();
+  if (!token) {
+    return { ok: false, error: "Missing cloud access token; cannot download attachments." };
+  }
+  const wantedCount = attachments.filter((a) => typeof a.attachmentId === "string" && a.attachmentId.trim() !== "").length;
+  if (wantedCount === 0) {
+    return { ok: false, error: "No valid attachment ids in prompt." };
+  }
+  const base = cloudApiBaseUrl.replace(/\/+$/, "");
+  const out = [];
+  for (const a of attachments) {
+    const id = typeof a.attachmentId === "string" ? a.attachmentId.trim() : "";
+    if (!id) continue;
+    const metaUrl = `${base}/internal/sessions/${encodeURIComponent(sessionId)}/attachments/${encodeURIComponent(id)}/meta`;
+    const blobUrl = `${base}/internal/sessions/${encodeURIComponent(sessionId)}/attachments/${encodeURIComponent(id)}/blob`;
+    const metaRes = await fetch(metaUrl, { headers: { Authorization: `Bearer ${token}` } });
+    if (!metaRes.ok) {
+      const t = await metaRes.text().catch(() => "");
+      log2(`[Agent] Attachment meta fetch failed ${metaRes.status}: ${t.slice(0, 200)}`);
+      return { ok: false, error: `Could not load attachment (${id.slice(0, 8)}\u2026): ${metaRes.status}` };
+    }
+    const meta = await metaRes.json().catch(() => null);
+    const mimeType = typeof meta?.mimeType === "string" && meta.mimeType.trim() ? meta.mimeType.trim() : a.mimeType;
+    const blobRes = await fetch(blobUrl, { headers: { Authorization: `Bearer ${token}` } });
+    if (!blobRes.ok) {
+      const t = await blobRes.text().catch(() => "");
+      log2(`[Agent] Attachment blob fetch failed ${blobRes.status}: ${t.slice(0, 200)}`);
+      return { ok: false, error: `Could not load attachment data (${id.slice(0, 8)}\u2026): ${blobRes.status}` };
+    }
+    const buf = Buffer.from(await blobRes.arrayBuffer());
+    let imageBytes;
+    const encrypted = metaSaysEncrypted(meta);
+    if (encrypted) {
+      if (!e2ee) {
+        return { ok: false, error: "Encrypted attachments require E2EE keys on this bridge." };
+      }
+      const k = typeof meta?.k === "string" ? meta.k : "";
+      const n = typeof meta?.n === "string" ? meta.n : "";
+      if (!k || !n) {
+        return { ok: false, error: "Invalid encrypted attachment metadata (missing key id or nonce)." };
+      }
+      const c = base64UrlEncode(buf);
+      imageBytes = e2ee.decryptEnvelopeToBuffer({ k, n, c });
+    } else {
+      imageBytes = buf;
+    }
+    warnIfDecodedImageMagicUnexpected(imageBytes, mimeType, id.slice(0, 8));
+    logDebug(
+      `[Agent] Loaded prompt image ${id.slice(0, 8)}\u2026: ${imageBytes.length} bytes, mime=${mimeType}, ${encrypted ? "E2EE decrypted" : "plaintext from storage"}`
+    );
+    const dataBase64 = imageBytes.toString("base64");
+    out.push({ mimeType, dataBase64 });
+  }
+  if (out.length !== wantedCount) {
+    return {
+      ok: false,
+      error: `Expected ${wantedCount} image attachment(s) but only loaded ${out.length} (check attachment ids and empty rows).`
+    };
+  }
+  return { ok: true, images: out };
+}
+
+// src/agents/acp/prompts/resolve-send-prompt-images.ts
+async function resolveSendPromptImages(params) {
+  const {
+    attachments,
+    sessionId,
+    promptId,
+    runId,
+    agentType,
+    followUpCatalogPromptId,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    e2ee,
+    log: log2
+  } = params;
+  if (!attachments || attachments.length === 0) {
+    return { ok: true, sendOpts: {} };
+  }
+  if (!sessionId || !cloudApiBaseUrl || !getCloudAccessToken) {
+    return {
+      ok: false,
+      errorResult: {
+        type: "prompt_result",
+        id: promptId,
+        ...sessionId ? { sessionId } : {},
+        ...runId ? { runId } : {},
+        success: false,
+        error: "Prompt includes images but the bridge is not configured with a cloud API URL and token to fetch them.",
+        ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
+        ...augmentPromptResultAuthFields(agentType, "missing cloud for images download")
+      }
+    };
+  }
+  const resolved = await fetchSessionAttachmentPayloadsForAgent({
+    attachments,
+    sessionId,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    e2ee,
+    log: log2
+  });
+  if (!resolved.ok) {
+    return {
+      ok: false,
+      errorResult: {
+        type: "prompt_result",
+        id: promptId,
+        ...sessionId ? { sessionId } : {},
+        ...runId ? { runId } : {},
+        success: false,
+        error: resolved.error,
+        ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
+        ...augmentPromptResultAuthFields(agentType, resolved.error)
+      }
+    };
+  }
+  return { ok: true, sendOpts: { images: resolved.images } };
+}
+
+// src/agents/acp/prompts/send-prompt-to-agent.ts
 async function sendPromptToAgent(options) {
   const {
     handle,
@@ -35693,107 +36171,54 @@ async function sendPromptToAgent(options) {
     cloudApiBaseUrl,
     getCloudAccessToken,
     e2ee,
-    attachments
+    attachments,
+    isNewSession = false
   } = options;
+  let isPlanningSession = false;
   try {
-    let agentPromptText = promptText;
-    if (sessionId && cloudApiBaseUrl && getCloudAccessToken) {
-      agentPromptText = await enrichForkedSessionPromptForAgent({
-        sessionId,
-        promptText,
-        cloudApiBaseUrl,
-        getCloudAccessToken
-      });
-    }
-    if (sessionId) {
-      agentPromptText = enrichIntegrationContentPromptForAgent({
-        sessionId,
-        originalPromptText: promptText,
-        agentPromptText
-      });
-    }
-    let sendOpts = {};
-    if (attachments && attachments.length > 0) {
-      if (!sessionId || !cloudApiBaseUrl || !getCloudAccessToken) {
-        sendResult({
-          type: "prompt_result",
-          id: promptId,
-          ...sessionId ? { sessionId } : {},
-          ...runId ? { runId } : {},
-          success: false,
-          error: "Prompt includes images but the bridge is not configured with a cloud API URL and token to fetch them.",
-          ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
-          ...augmentPromptResultAuthFields(agentType, "missing cloud for images download")
-        });
-        return;
-      }
-      const resolved = await fetchSessionAttachmentPayloadsForAgent({
-        attachments,
-        sessionId,
-        cloudApiBaseUrl,
-        getCloudAccessToken,
-        e2ee,
-        log: log2
-      });
-      if (!resolved.ok) {
-        sendResult({
-          type: "prompt_result",
-          id: promptId,
-          ...sessionId ? { sessionId } : {},
-          ...runId ? { runId } : {},
-          success: false,
-          error: resolved.error,
-          ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
-          ...augmentPromptResultAuthFields(agentType, resolved.error)
-        });
-        return;
-      }
-      sendOpts = { images: resolved.images };
-    }
-    const result = await handle.sendPrompt(agentPromptText, sendOpts);
-    if (sessionId && runId && sendSessionUpdate && agentCwd && result.success) {
-      await collectTurnGitDiffFromPreTurnSnapshot({
-        sessionId,
-        runId,
-        agentCwd,
-        sendSessionUpdate,
-        log: log2
-      });
-    }
-    await maybeUploadE2eeSessionChangeSummariesAfterAgentSuccess({
+    const prepared = await prepareAgentPromptText({
+      promptText,
       sessionId,
       runId,
-      resultSuccess: result.success === true,
-      output: result.output,
-      e2ee,
+      isNewSession,
+      cloudApiBaseUrl,
+      getCloudAccessToken
+    });
+    isPlanningSession = prepared.isPlanningSession;
+    const imagesResolved = await resolveSendPromptImages({
+      attachments,
+      sessionId,
+      promptId,
+      runId,
+      agentType,
+      followUpCatalogPromptId,
       cloudApiBaseUrl,
       getCloudAccessToken,
+      e2ee,
+      log: log2
+    });
+    if (!imagesResolved.ok) {
+      sendResult(imagesResolved.errorResult);
+      return;
+    }
+    const result = await handle.sendPrompt(prepared.agentPromptText, imagesResolved.sendOpts);
+    await finalizeAndSendPromptResult({
+      result,
+      sessionId,
+      runId,
+      promptId,
+      agentType,
+      agentCwd,
+      isPlanningSession,
       followUpCatalogPromptId,
       sessionChangeSummaryFilePaths,
+      cloudApiBaseUrl,
+      getCloudAccessToken,
+      e2ee,
+      sendResult,
+      sendSessionUpdate,
       log: log2
     });
-    const errStr = typeof result.error === "string" ? result.error : void 0;
-    const resultStop = typeof result.stopReason === "string" ? result.stopReason.trim() : "";
-    const cancelledByAgent = resultStop.toLowerCase() === "cancelled" || errStr != null && isUserEndedSessionTurnErrorText(errStr);
-    sendResult({
-      type: "prompt_result",
-      id: promptId,
-      ...sessionId ? { sessionId } : {},
-      ...runId ? { runId } : {},
-      ...result,
-      ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
-      ...augmentPromptResultAuthFields(agentType, errStr),
-      ...!result.success && cancelledByAgent ? { stopReason: "cancelled" } : {}
-    });
-    if (!result.success) {
-      if (cancelledByAgent) {
-        log2("[Agent] Run ended after stop request (stopped by user).");
-      } else {
-        log2(
-          `[Agent] Prompt did not run successfully on the agent (no successful start/completion): ${result.error ?? "Unknown error"}`
-        );
-      }
-    }
   } catch (err) {
     const errMsg = err instanceof Error ? err.message : String(err);
     log2(`[Agent] Send failed: ${errMsg}`);
@@ -35807,6 +36232,8 @@ async function sendPromptToAgent(options) {
       ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
       ...augmentPromptResultAuthFields(agentType, errMsg)
     });
+  } finally {
+    if (runId && isPlanningSession) clearPlanningSessionTurn(runId);
   }
 }
 
@@ -35820,15 +36247,36 @@ function getAcpSessionAgentState(ctx, acpSessionAgentKey) {
   return state;
 }
 
-// src/agents/acp/manager/handle-prompt.ts
-function handlePrompt(ctx, opts) {
+// src/agents/acp/manager/handle-pending-prompt-cancel.ts
+async function handlePendingPromptCancel(params) {
+  const { ctx, activeRunId, promptId, sessionId, handle, sendResult } = params;
+  if (!ctx.pendingCancelRunIds.has(activeRunId)) {
+    return false;
+  }
+  ctx.pendingCancelRunIds.delete(activeRunId);
+  try {
+    await handle.cancel?.();
+  } catch {
+  }
+  sendResult({
+    type: "prompt_result",
+    id: promptId,
+    ...sessionId ? { sessionId } : {},
+    runId: activeRunId,
+    success: false,
+    error: "Stopped by user",
+    stopReason: "cancelled"
+  });
+  return true;
+}
+
+// src/agents/acp/manager/run-acp-prompt.ts
+async function runAcpPrompt(ctx, runCtx, opts) {
   const {
     promptText,
     promptId,
     sessionId,
-    runId,
     mode,
-    agentType,
     agentConfig,
     sessionParentPath,
     sendResult,
@@ -35838,109 +36286,99 @@ function handlePrompt(ctx, opts) {
     cloudApiBaseUrl,
     getCloudAccessToken,
     e2ee,
-    attachments
+    attachments,
+    isNewSession
   } = opts;
-  const preferredForPrompt = agentType ?? ctx.backendFallbackAgentType ?? null;
-  if (!runId) {
-    ctx.log("[Agent] Prompt ignored: missing runId (cannot route session updates).");
-    return;
-  }
-  const activeRunId = runId;
-  const acpAgentKey = computeAcpAgentKey(preferredForPrompt, mode, agentConfig ?? null);
-  if (!acpAgentKey) {
+  const { activeRunId, activeAcpAgentKey, activeAcpSessionAgentKey, preferredForPrompt } = runCtx;
+  const acpAgentState = getAcpSessionAgentState(ctx, activeAcpSessionAgentKey);
+  const handle = await ensureAcpClient({
+    state: acpAgentState,
+    acpAgentKey: activeAcpAgentKey,
+    preferredAgentType: preferredForPrompt,
+    mode,
+    agentConfig: agentConfig ?? null,
+    sessionParentPath,
+    resolveRouting: () => ctx.promptRouting.resolveRouting(activeAcpSessionAgentKey),
+    cloudSessionId: sessionId,
+    bridgeAccessPort: ctx.getBridgeAccessPort(),
+    sendSessionUpdate,
+    sendRequest: sendSessionUpdate,
+    log: ctx.log,
+    reportAgentCapabilities: ctx.reportAgentCapabilities
+  });
+  if (!handle) {
+    const errMsg = acpAgentState.lastAcpStartError || "No agent configured. Register local agents on this bridge in the app.";
+    const evaluated = Boolean(preferredForPrompt && errMsg.trim());
+    const suggestsAuth = evaluated ? localAgentErrorSuggestsAuth(preferredForPrompt, errMsg) : false;
+    const auth = suggestsAuth && preferredForPrompt ? { agentAuthRequired: true, agentType: preferredForPrompt } : {};
     sendResult({
       type: "prompt_result",
       id: promptId,
       ...sessionId ? { sessionId } : {},
       runId: activeRunId,
       success: false,
-      error: "No agent type: ensure the app sends agentType on prompts or agent_config for this bridge."
+      error: errMsg,
+      ...auth
     });
     return;
   }
-  const activeAcpAgentKey = acpAgentKey;
-  const activeAcpSessionAgentKey = computeAcpSessionAgentKey(sessionId, activeAcpAgentKey);
-  ctx.pendingCancelRunIds.delete(activeRunId);
-  ctx.promptRouting.registerRun({ sessionId, runId: activeRunId });
-  ctx.runDispatch.set(activeRunId, { acpSessionAgentKey: activeAcpSessionAgentKey });
-  async function run() {
-    const acpAgentState = getAcpSessionAgentState(ctx, activeAcpSessionAgentKey);
-    const handle = await ensureAcpClient({
-      state: acpAgentState,
-      acpAgentKey: activeAcpAgentKey,
-      preferredAgentType: preferredForPrompt,
-      mode,
-      agentConfig: agentConfig ?? null,
-      sessionParentPath,
-      resolveRouting: () => ctx.promptRouting.resolveRouting(activeAcpSessionAgentKey),
-      cloudSessionId: sessionId,
-      bridgeAccessPort: ctx.getBridgeAccessPort(),
+  if (!ctx.promptRouting.isRegisteredRun(activeRunId)) {
+    return;
+  }
+  const cancelled = await handlePendingPromptCancel({
+    ctx,
+    activeRunId,
+    promptId,
+    sessionId,
+    handle,
+    sendResult
+  });
+  if (cancelled) return;
+  ctx.promptRouting.setStreamingRunId(activeAcpSessionAgentKey, activeRunId);
+  try {
+    await sendPromptToAgent({
+      handle,
+      promptText,
+      promptId,
+      sessionId,
+      runId: activeRunId,
+      agentType: preferredForPrompt,
+      agentCwd: resolveSessionParentPathForAgentProcess(sessionParentPath),
+      sendResult,
       sendSessionUpdate,
-      sendRequest: sendSessionUpdate,
       log: ctx.log,
-      reportAgentCapabilities: ctx.reportAgentCapabilities
+      followUpCatalogPromptId,
+      sessionChangeSummaryFilePaths,
+      cloudApiBaseUrl,
+      getCloudAccessToken,
+      e2ee,
+      attachments,
+      isNewSession
     });
-    if (!handle) {
-      const errMsg = acpAgentState.lastAcpStartError || "No agent configured. Register local agents on this bridge in the app.";
-      const evaluated = Boolean(preferredForPrompt && errMsg.trim());
-      const suggestsAuth = evaluated ? localAgentErrorSuggestsAuth(preferredForPrompt, errMsg) : false;
-      const auth = suggestsAuth && preferredForPrompt ? { agentAuthRequired: true, agentType: preferredForPrompt } : {};
-      sendResult({
-        type: "prompt_result",
-        id: promptId,
-        ...sessionId ? { sessionId } : {},
-        runId: activeRunId,
-        success: false,
-        error: errMsg,
-        ...auth
-      });
-      return;
-    }
-    if (!ctx.promptRouting.isRegisteredRun(activeRunId)) {
-      return;
-    }
-    if (ctx.pendingCancelRunIds.has(activeRunId)) {
-      ctx.pendingCancelRunIds.delete(activeRunId);
-      try {
-        await handle.cancel?.();
-      } catch {
-      }
+  } finally {
+    ctx.promptRouting.clearStreamingRunId(activeAcpSessionAgentKey, activeRunId);
+  }
+}
+
+// src/agents/acp/manager/handle-prompt.ts
+function handlePrompt(ctx, opts) {
+  const { promptId, sessionId, runId, mode, agentType, agentConfig, sendResult } = opts;
+  const runCtx = resolvePromptRunContext(ctx, { runId, mode, agentType, agentConfig, sessionId });
+  if (!runCtx) {
+    if (runId) {
       sendResult({
         type: "prompt_result",
         id: promptId,
         ...sessionId ? { sessionId } : {},
-        runId: activeRunId,
+        runId,
         success: false,
-        error: "Stopped by user",
-        stopReason: "cancelled"
-      });
-      return;
-    }
-    ctx.promptRouting.setStreamingRunId(activeAcpSessionAgentKey, activeRunId);
-    try {
-      await sendPromptToAgent({
-        handle,
-        promptText,
-        promptId,
-        sessionId,
-        runId: activeRunId,
-        agentType: preferredForPrompt,
-        agentCwd: resolveSessionParentPathForAgentProcess(sessionParentPath),
-        sendResult,
-        sendSessionUpdate,
-        log: ctx.log,
-        followUpCatalogPromptId,
-        sessionChangeSummaryFilePaths,
-        cloudApiBaseUrl,
-        getCloudAccessToken,
-        e2ee,
-        attachments
+        error: "No agent type: ensure the app sends agentType on prompts or agent_config for this bridge."
       });
-    } finally {
-      ctx.promptRouting.clearStreamingRunId(activeAcpSessionAgentKey, activeRunId);
     }
+    return;
   }
-  void run().finally(() => {
+  const { activeRunId } = runCtx;
+  void runAcpPrompt(ctx, runCtx, opts).finally(() => {
     ctx.promptRouting.unregisterRun(activeRunId);
     ctx.runDispatch.delete(activeRunId);
     ctx.pendingCancelRunIds.delete(activeRunId);
@@ -45406,7 +45844,8 @@ async function runPreambleAndPrompt(params) {
     cloudApiBaseUrl: deps.cloudApiBaseUrl,
     getCloudAccessToken: deps.getCloudAccessToken,
     e2ee: deps.e2ee,
-    ...attachments.length > 0 ? { attachments } : {}
+    ...attachments.length > 0 ? { attachments } : {},
+    isNewSession: msg.isNewSession === true
   });
 }