@letta-ai/letta-code 0.19.2 → 0.19.4

package/letta.js

@@ -3240,7 +3240,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.19.2",
+    version: "0.19.4",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -3313,7 +3313,7 @@ var init_package = __esm(() => {
       "test:update-chain:manual": "bun run src/tests/update-chain-smoke.ts --mode manual",
       "test:update-chain:startup": "bun run src/tests/update-chain-smoke.ts --mode startup",
       prepublishOnly: "bun run build",
-      postinstall: "node scripts/postinstall-patches.js || echo letta: vendor patches skipped"
+      postinstall: `node scripts/postinstall-patches.js || echo letta: vendor patches skipped && node -e "try{require('fs').chmodSync(require('path').join(require.resolve('node-pty/package.json'),'../prebuilds/darwin-arm64/spawn-helper'),0o755)}catch(e){}" || true`
     },
     "lint-staged": {
       "*.{ts,tsx,js,jsx,json}": [
@@ -5737,7 +5737,7 @@ var explore_default = `---
 name: explore
 description: Fast agent for codebase exploration - finding files, searching code, understanding structure. (Read-Only)
 tools: Glob, Grep, Read, TaskOutput
-model: haiku
+model: auto-fast
 memoryBlocks: human, persona
 mode: stateless
 ---
@@ -5772,7 +5772,7 @@ var general_purpose_default = `---
 name: general-purpose
 description: Full-capability agent for research, planning, and implementation
 tools: Bash, TaskOutput, Edit, Glob, Grep, KillBash, LS, MultiEdit, Read, TodoWrite, Write
-model: sonnet
+model: auto
 memoryBlocks: all
 mode: stateful
 ---
@@ -5813,7 +5813,7 @@ name: history-analyzer
 description: Analyze Claude Code or Codex conversation history and directly update agent memory files with insights
 tools: Read, Write, Bash, Glob, Grep
 skills: migrating-from-codex-and-claude-code
-model: sonnet
+model: auto
 memoryBlocks: none
 mode: stateless
 permissionMode: bypassPermissions
@@ -5943,7 +5943,7 @@ var init_default = `---
 name: init
 description: Fast initialization of agent memory — reads key project files and creates a minimal memory hierarchy
 tools: Read, Write, Edit, Bash, Glob
-model: haiku
+model: auto-fast
 memoryBlocks: none
 permissionMode: bypassPermissions
 ---
@@ -6041,7 +6041,7 @@ var memory_default = `---
 name: memory
 description: Decompose and reorganize memory files into focused, single-purpose files using \`/\` naming
 tools: Read, Edit, Write, Glob, Grep, Bash, TaskOutput
-model: sonnet
+model: auto
 memoryBlocks: none
 permissionMode: bypassPermissions
 ---
@@ -6395,7 +6395,7 @@ var reflection_default = `---
 name: reflection
 description: Background agent that reflects on recent conversations and updates memory files
 tools: Read, Edit, Write, Glob, Grep, Bash, TaskOutput
-model: sonnet
+model: auto
 memoryBlocks: none
 mode: stateless
 permissionMode: bypassPermissions
@@ -32716,13 +32716,24 @@ var import_react16, IS_LINUX, CSI_U_WITH_TRAILING_NEWLINE_PATTERN, CSI_PROTOCOL_
             9: "tab",
             13: "return",
             27: "escape",
+            32: "space",
             127: "backspace"
           };
+          const csiUSeqMap = {
+            9: "\t",
+            13: "\r",
+            27: "\x1B",
+            32: " ",
+            127: ""
+          };
           let name = csiUKeyMap[keycode] || "";
+          let seq2 = csiUSeqMap[keycode] || data;
           if (!name && keycode >= 97 && keycode <= 122) {
             name = String.fromCharCode(keycode);
+            seq2 = String.fromCharCode(keycode);
           } else if (!name && keycode >= 65 && keycode <= 90) {
             name = String.fromCharCode(keycode + 32);
+            seq2 = String.fromCharCode(keycode + 32);
           }
           if (name) {
             keypress = {
@@ -32731,7 +32742,7 @@ var import_react16, IS_LINUX, CSI_U_WITH_TRAILING_NEWLINE_PATTERN, CSI_PROTOCOL_
               meta: !!(modifier & 10),
               shift: !!(modifier & 1),
               option: false,
-              sequence: data,
+              sequence: seq2,
               raw: data
             };
           }
@@ -36931,10 +36942,17 @@ var init_byok_providers = __esm(async () => {
     {
       id: "zai",
       displayName: "zAI API",
-      description: "Connect a zAI key or coding plan",
+      description: "Connect a zAI API key",
       providerType: "zai",
       providerName: "lc-zai"
     },
+    {
+      id: "zai-coding",
+      displayName: "zAI Coding Plan",
+      description: "Connect a zAI Coding plan key",
+      providerType: "zai_coding",
+      providerName: "lc-zai-coding"
+    },
     {
       id: "minimax",
       displayName: "MiniMax API",
@@ -36993,7 +37011,9 @@ var init_byok_providers = __esm(async () => {
 
 // src/cli/commands/connect-normalize.ts
 function canonicalToByokId(canonical) {
-  return canonical === "chatgpt" ? "codex" : canonical;
+  if (canonical === "chatgpt")
+    return "codex";
+  return canonical;
 }
 function resolveConnectProvider(providerToken) {
   if (!providerToken) {
@@ -37039,6 +37059,9 @@ function isConnectBedrockProvider(provider) {
 function isConnectApiKeyProvider(provider) {
   return !isConnectOAuthProvider(provider) && !isConnectBedrockProvider(provider);
 }
+function isConnectZaiBaseProvider(provider) {
+  return provider.canonical === "zai";
+}
 var ALIAS_TO_CANONICAL, CANONICAL_ORDER;
 var init_connect_normalize = __esm(async () => {
   await init_byok_providers();
@@ -37048,6 +37071,7 @@ var init_connect_normalize = __esm(async () => {
     anthropic: "anthropic",
     openai: "openai",
     zai: "zai",
+    "zai-coding": "zai-coding",
     minimax: "minimax",
     gemini: "gemini",
     openrouter: "openrouter",
@@ -37058,6 +37082,7 @@ var init_connect_normalize = __esm(async () => {
     "anthropic",
     "openai",
     "zai",
+    "zai-coding",
     "minimax",
     "gemini",
     "openrouter",
@@ -40149,7 +40174,8 @@ async function executeSingleDecision(decision, onChunk, options) {
         tool_return: decision.precomputedResult.toolReturn,
         status: decision.precomputedResult.status,
         stdout: decision.precomputedResult.stdout,
-        stderr: decision.precomputedResult.stderr
+        stderr: decision.precomputedResult.stderr,
+        reason: decision.reason
       };
     }
     try {
@@ -40187,7 +40213,8 @@ async function executeSingleDecision(decision, onChunk, options) {
         tool_return: toolResult.toolReturn,
         status: toolResult.status,
         stdout: toolResult.stdout,
-        stderr: toolResult.stderr
+        stderr: toolResult.stderr,
+        reason: decision.reason
       };
     } catch (e) {
       const isAbortError2 = e instanceof Error && (e.name === "AbortError" || e.message === "The operation was aborted");
@@ -40206,7 +40233,8 @@ async function executeSingleDecision(decision, onChunk, options) {
         type: "tool",
         tool_call_id: decision.approval.toolCallId,
         tool_return: errorMessage,
-        status: "error"
+        status: "error",
+        reason: decision.reason
       };
     }
   }
@@ -68015,6 +68043,7 @@ var init_manager3 = __esm(async () => {
     "Glob",
     "Grep",
     "TaskStop",
+    "memory",
     "Read",
     "Skill",
     "Task",
@@ -68024,6 +68053,7 @@ var init_manager3 = __esm(async () => {
   OPENAI_DEFAULT_TOOLS = [
     "shell_command",
     "apply_patch",
+    "memory",
     "update_plan",
     "view_image"
   ];
@@ -68033,6 +68063,7 @@ var init_manager3 = __esm(async () => {
     "list_directory",
     "glob_gemini",
     "search_file_content",
+    "memory",
     "replace",
     "write_file_gemini",
     "write_todos",
@@ -68044,6 +68075,7 @@ var init_manager3 = __esm(async () => {
     "AskUserQuestion",
     "EnterPlanMode",
     "ExitPlanMode",
+    "memory",
     "Task",
     "TaskOutput",
     "TaskStop",
@@ -68057,6 +68089,7 @@ var init_manager3 = __esm(async () => {
     "AskUserQuestion",
     "EnterPlanMode",
     "ExitPlanMode",
+    "memory",
     "Skill",
     "Task",
     "RunShellCommand",
@@ -68147,82 +68180,157 @@ function sendTerminalMessage(socket, message) {
     socket.send(JSON.stringify(message));
   }
 }
+function makeOutputBatcher(onFlush) {
+  let buffer = "";
+  let timer = null;
+  const flush = () => {
+    if (timer) {
+      clearTimeout(timer);
+      timer = null;
+    }
+    if (buffer.length > 0) {
+      onFlush(buffer);
+      buffer = "";
+    }
+  };
+  return (chunk) => {
+    buffer += chunk;
+    if (buffer.length >= MAX_BUFFER_BYTES) {
+      flush();
+    } else if (!timer) {
+      timer = setTimeout(flush, FLUSH_INTERVAL_MS);
+    }
+  };
+}
+function spawnBun(shell2, cwd2, cols, rows, terminal_id, socket) {
+  const handleData = makeOutputBatcher((data) => sendTerminalMessage(socket, { type: "terminal_output", terminal_id, data }));
+  const proc2 = Bun.spawn([shell2], {
+    cwd: cwd2,
+    env: { ...process.env, TERM: "xterm-256color", COLORTERM: "truecolor" },
+    terminal: {
+      cols: cols || 80,
+      rows: rows || 24,
+      data: (_t, chunk) => handleData(new TextDecoder().decode(chunk))
+    }
+  });
+  const terminal = proc2.terminal;
+  if (!terminal) {
+    throw new Error("Bun.spawn terminal object missing — API unavailable");
+  }
+  proc2.exited.then((exitCode) => {
+    const current = terminals.get(terminal_id);
+    if (current && current.pid === proc2.pid) {
+      terminals.delete(terminal_id);
+      sendTerminalMessage(socket, {
+        type: "terminal_exited",
+        terminal_id,
+        exitCode: exitCode ?? 0
+      });
+    }
+  });
+  return {
+    write: (d) => {
+      try {
+        terminal.write(d);
+      } catch {}
+    },
+    resize: (c, r) => {
+      try {
+        terminal.resize(c, r);
+      } catch {}
+    },
+    kill: () => {
+      try {
+        terminal.close();
+      } catch {}
+      try {
+        proc2.kill();
+      } catch {}
+    },
+    pid: proc2.pid,
+    terminalId: terminal_id,
+    spawnedAt: Date.now()
+  };
+}
+function spawnNodePty(shell2, cwd2, cols, rows, terminal_id, socket) {
+  const pty = __require("node-pty");
+  const handleData = makeOutputBatcher((data) => sendTerminalMessage(socket, { type: "terminal_output", terminal_id, data }));
+  const ptyProcess = pty.spawn(shell2, [], {
+    name: "xterm-256color",
+    cols: cols || 80,
+    rows: rows || 24,
+    cwd: cwd2,
+    env: {
+      ...process.env,
+      TERM: "xterm-256color",
+      COLORTERM: "truecolor"
+    }
+  });
+  ptyProcess.onData(handleData);
+  ptyProcess.onExit(({ exitCode }) => {
+    const current = terminals.get(terminal_id);
+    if (current && current.pid === ptyProcess.pid) {
+      terminals.delete(terminal_id);
+      sendTerminalMessage(socket, {
+        type: "terminal_exited",
+        terminal_id,
+        exitCode: exitCode ?? 0
+      });
+    }
+  });
+  return {
+    write: (d) => {
+      try {
+        ptyProcess.write(d);
+      } catch {}
+    },
+    resize: (c, r) => {
+      try {
+        ptyProcess.resize(c, r);
+      } catch {}
+    },
+    kill: () => {
+      try {
+        ptyProcess.kill();
+      } catch {}
+    },
+    pid: ptyProcess.pid,
+    terminalId: terminal_id,
+    spawnedAt: Date.now()
+  };
+}
 function handleTerminalSpawn(msg, socket, cwd2) {
   const { terminal_id, cols, rows } = msg;
-  killTerminal(terminal_id);
-  const shell2 = getDefaultShell();
-  console.log(`[Terminal] Spawning PTY: shell=${shell2}, cwd=${cwd2}, cols=${cols}, rows=${rows}`);
-  try {
-    const proc2 = Bun.spawn([shell2], {
-      cwd: cwd2,
-      env: {
-        ...process.env,
-        TERM: "xterm-256color",
-        COLORTERM: "truecolor"
-      },
-      terminal: {
-        cols: cols || 80,
-        rows: rows || 24,
-        data: (() => {
-          let buffer = "";
-          let flushTimer = null;
-          return (_terminal, data) => {
-            buffer += new TextDecoder().decode(data);
-            if (!flushTimer) {
-              flushTimer = setTimeout(() => {
-                if (buffer.length > 0) {
-                  sendTerminalMessage(socket, {
-                    type: "terminal_output",
-                    terminal_id,
-                    data: buffer
-                  });
-                  buffer = "";
-                }
-                flushTimer = null;
-              }, 16);
-            }
-          };
-        })()
-      }
-    });
-    const terminal = proc2.terminal;
-    console.log(`[Terminal] proc.pid=${proc2.pid}, terminal=${typeof terminal}, keys=${Object.keys(proc2).join(",")}`);
-    if (!terminal) {
-      console.error("[Terminal] terminal object is undefined on proc — Bun.Terminal API may not be available");
+  const existing = terminals.get(terminal_id);
+  if (existing && Date.now() - existing.spawnedAt < 2000) {
+    let alive = true;
+    try {
+      existing.write("\r");
+    } catch {
+      alive = false;
+    }
+    if (alive) {
+      console.log(`[Terminal] Reusing session (age=${Date.now() - existing.spawnedAt}ms), pid=${existing.pid}`);
       sendTerminalMessage(socket, {
-        type: "terminal_exited",
+        type: "terminal_spawned",
         terminal_id,
-        exitCode: 1
+        pid: existing.pid
       });
       return;
     }
-    const session = {
-      process: proc2,
-      terminal,
-      terminalId: terminal_id,
-      spawnedAt: Date.now()
-    };
+    terminals.delete(terminal_id);
+  }
+  killTerminal(terminal_id);
+  const shell2 = getDefaultShell();
+  console.log(`[Terminal] Spawning PTY (${IS_BUN ? "bun" : "node-pty"}): shell=${shell2}, cwd=${cwd2}, cols=${cols}, rows=${rows}`);
+  try {
+    const session = IS_BUN ? spawnBun(shell2, cwd2, cols, rows, terminal_id, socket) : spawnNodePty(shell2, cwd2, cols, rows, terminal_id, socket);
     terminals.set(terminal_id, session);
-    console.log(`[Terminal] Session stored for terminal_id=${terminal_id}, map size=${terminals.size}`);
-    const myPid = proc2.pid;
-    proc2.exited.then((exitCode) => {
-      const current = terminals.get(terminal_id);
-      if (current && current.process.pid === myPid) {
-        console.log(`[Terminal] PTY process exited: terminal_id=${terminal_id}, pid=${myPid}, exitCode=${exitCode}`);
-        terminals.delete(terminal_id);
-        sendTerminalMessage(socket, {
-          type: "terminal_exited",
-          terminal_id,
-          exitCode: exitCode ?? 0
-        });
-      } else {
-        console.log(`[Terminal] Stale PTY exit ignored: terminal_id=${terminal_id}, pid=${myPid} (current pid=${current?.process.pid})`);
-      }
-    });
+    console.log(`[Terminal] Session stored for terminal_id=${terminal_id}, pid=${session.pid}`);
     sendTerminalMessage(socket, {
       type: "terminal_spawned",
       terminal_id,
-      pid: proc2.pid
+      pid: session.pid
     });
   } catch (error) {
     console.error("[Terminal] Failed to spawn PTY:", error);
@@ -68234,16 +68342,10 @@ function handleTerminalSpawn(msg, socket, cwd2) {
   }
 }
 function handleTerminalInput(msg) {
-  const session = terminals.get(msg.terminal_id);
-  if (session) {
-    session.terminal.write(msg.data);
-  }
+  terminals.get(msg.terminal_id)?.write(msg.data);
 }
 function handleTerminalResize(msg) {
-  const session = terminals.get(msg.terminal_id);
-  if (session) {
-    session.terminal.resize(msg.cols, msg.rows);
-  }
+  terminals.get(msg.terminal_id)?.resize(msg.cols, msg.rows);
 }
 function handleTerminalKill(msg) {
   const session = terminals.get(msg.terminal_id);
@@ -68256,11 +68358,8 @@ function handleTerminalKill(msg) {
 function killTerminal(terminalId) {
   const session = terminals.get(terminalId);
   if (session) {
-    console.log(`[Terminal] killTerminal: terminalId=${terminalId}, pid=${session.process.pid}`);
-    try {
-      session.terminal.close();
-    } catch {}
-    session.process.kill();
+    console.log(`[Terminal] killTerminal: terminalId=${terminalId}, pid=${session.pid}`);
+    session.kill();
     terminals.delete(terminalId);
   }
 }
@@ -68269,8 +68368,10 @@ function killAllTerminals() {
     killTerminal(id);
   }
 }
-var terminals;
+var IS_BUN, FLUSH_INTERVAL_MS = 16, MAX_BUFFER_BYTES, terminals;
 var init_terminalHandler = __esm(() => {
+  IS_BUN = typeof Bun !== "undefined";
+  MAX_BUFFER_BYTES = 64 * 1024;
   terminals = new Map;
 });
 
@@ -68448,7 +68549,25 @@ function getPermissionModeScopeKey(agentId, conversationId) {
 }
 function getConversationPermissionModeState(runtime, agentId, conversationId) {
   const scopeKey = getPermissionModeScopeKey(agentId, conversationId);
-  return runtime.permissionModeByConversation.get(scopeKey) ?? {
+  const normalizedConversationId = normalizeConversationId(conversationId);
+  const direct = runtime.permissionModeByConversation.get(scopeKey);
+  if (direct) {
+    return direct;
+  }
+  if (normalizedConversationId === "default") {
+    const legacyDefaultKey = getPermissionModeScopeKey(null, "default");
+    const legacyDefault = runtime.permissionModeByConversation.get(legacyDefaultKey);
+    if (legacyDefault) {
+      if (normalizeCwdAgentId(agentId)) {
+        runtime.permissionModeByConversation.set(scopeKey, {
+          ...legacyDefault
+        });
+        runtime.permissionModeByConversation.delete(legacyDefaultKey);
+      }
+      return legacyDefault;
+    }
+  }
+  return {
     mode: permissionMode.getMode(),
     planFilePath: null,
     modeBeforePlan: null
@@ -69077,9 +69196,10 @@ function isValidApprovalResponseBody(value) {
   }
   const decision = maybeResponse.decision;
   if (decision.behavior === "allow") {
+    const hasMessage = decision.message === undefined || typeof decision.message === "string";
     const hasUpdatedInput = decision.updated_input === undefined || decision.updated_input === null || typeof decision.updated_input === "object";
     const hasUpdatedPermissions = decision.updated_permissions === undefined || Array.isArray(decision.updated_permissions) && decision.updated_permissions.every((entry) => typeof entry === "string");
-    return hasUpdatedInput && hasUpdatedPermissions;
+    return hasMessage && hasUpdatedInput && hasUpdatedPermissions;
   }
   if (decision.behavior === "deny") {
     return typeof decision.message === "string";
@@ -69125,7 +69245,7 @@ function resolvePendingApprovalResolver(runtime, response) {
   runtime.pendingApprovalResolvers.delete(requestId);
   runtime.listener.approvalRuntimeKeyByRequestId.delete(requestId);
   if (runtime.pendingApprovalResolvers.size === 0) {
-    setLoopStatus(runtime, runtime.isProcessing ? "PROCESSING_API_RESPONSE" : "WAITING_ON_INPUT");
+    setLoopStatus(runtime, "WAITING_ON_INPUT");
   }
   pending.resolve(response);
   emitLoopStatusIfOpen(runtime.listener, {
@@ -69149,7 +69269,7 @@ function rejectPendingApprovalResolvers(runtime, reason) {
       runtime.listener.approvalRuntimeKeyByRequestId.delete(requestId);
     }
   }
-  setLoopStatus(runtime, runtime.isProcessing ? "PROCESSING_API_RESPONSE" : "WAITING_ON_INPUT");
+  setLoopStatus(runtime, "WAITING_ON_INPUT");
   emitLoopStatusIfOpen(runtime.listener, {
     agent_id: runtime.agentId,
     conversation_id: runtime.conversationId
@@ -69214,23 +69334,62 @@ function normalizeToolReturnText(value) {
     return String(value);
   }
 }
+function isToolReturnContent(value) {
+  if (typeof value === "string")
+    return true;
+  if (!Array.isArray(value))
+    return false;
+  return value.every((part) => !!part && typeof part === "object" && ("type" in part) && (part.type === "text" && ("text" in part) && typeof part.text === "string" || part.type === "image" && ("data" in part) && typeof part.data === "string" && ("mimeType" in part) && typeof part.mimeType === "string"));
+}
+function prependApprovalComment(toolReturn, reason) {
+  const trimmedReason = reason?.trim();
+  if (!trimmedReason) {
+    return toolReturn;
+  }
+  const commentPart = {
+    type: "text",
+    text: `${APPROVAL_COMMENT_PREFIX} "${trimmedReason}"`
+  };
+  if (typeof toolReturn === "string") {
+    return [commentPart, { type: "text", text: toolReturn }];
+  }
+  return [commentPart, ...toolReturn];
+}
 function normalizeApprovalResultsForPersistence(approvals, options = {}) {
   if (!approvals || approvals.length === 0)
     return approvals ?? [];
   const interruptedSet = new Set(options.interruptedToolCallIds ?? []);
   return approvals.map((approval) => {
+    if (approval && typeof approval === "object" && "type" in approval && approval.type === "approval" && "approve" in approval && approval.approve === true && "tool_return" in approval && isToolReturnContent(approval.tool_return)) {
+      return {
+        type: "tool",
+        tool_call_id: "tool_call_id" in approval && typeof approval.tool_call_id === "string" ? approval.tool_call_id : "",
+        tool_return: approval.tool_return,
+        status: "status" in approval && approval.status === "error" ? "error" : "success",
+        stdout: "stdout" in approval && Array.isArray(approval.stdout) ? approval.stdout : undefined,
+        stderr: "stderr" in approval && Array.isArray(approval.stderr) ? approval.stderr : undefined
+      };
+    }
     if (!approval || typeof approval !== "object" || !("type" in approval) || approval.type !== "tool") {
       return approval;
     }
     const toolCallId = "tool_call_id" in approval && typeof approval.tool_call_id === "string" ? approval.tool_call_id : "";
+    const toolReturn = prependApprovalComment(approval.tool_return, "reason" in approval && typeof approval.reason === "string" ? approval.reason : undefined);
     const interruptedByStructuredId = toolCallId.length > 0 && interruptedSet.has(toolCallId);
     const interruptedByLegacyText = options.allowInterruptTextFallback ? normalizeToolReturnText("tool_return" in approval ? approval.tool_return : "") === INTERRUPTED_BY_USER : false;
     if ((interruptedByStructuredId || interruptedByLegacyText) && "status" in approval && approval.status !== "error") {
       return {
         ...approval,
+        tool_return: toolReturn,
         status: "error"
       };
     }
+    if (toolReturn !== approval.tool_return) {
+      return {
+        ...approval,
+        tool_return: toolReturn
+      };
+    }
     return approval;
   });
 }
@@ -69248,6 +69407,7 @@ function normalizeOutgoingApprovalMessages(messages, options = {}) {
     };
   });
 }
+var APPROVAL_COMMENT_PREFIX = "The user approved the tool execution with the following comment:";
 var init_approval_result_normalization = __esm(() => {
   init_constants();
 });
@@ -69770,12 +69930,19 @@ function mergeQueuedTurnInput(queued, options) {
 
 // src/websocket/helpers/listenerQueueAdapter.ts
 function getListenerBlockedReason(c) {
-  if (c.pendingApprovalsLen > 0)
-    return "pending_approvals";
   if (c.cancelRequested)
     return "interrupt_in_progress";
+  if (c.pendingApprovalsLen > 0)
+    return "pending_approvals";
   if (c.isRecoveringApprovals)
     return "runtime_busy";
+  if (c.loopStatus === "WAITING_ON_APPROVAL")
+    return "pending_approvals";
+  if (c.loopStatus === "EXECUTING_COMMAND")
+    return "command_running";
+  if (c.loopStatus === "SENDING_API_REQUEST" || c.loopStatus === "RETRYING_API_REQUEST" || c.loopStatus === "WAITING_FOR_API_RESPONSE" || c.loopStatus === "PROCESSING_API_RESPONSE" || c.loopStatus === "EXECUTING_CLIENT_SIDE_TOOL") {
+    return "streaming";
+  }
   if (c.isProcessing)
     return "runtime_busy";
   return null;
@@ -69789,7 +69956,8 @@ __export(exports_queue, {
   normalizeMessageContentImages: () => normalizeMessageContentImages,
   normalizeInboundMessages: () => normalizeInboundMessages,
   getQueueItemsScope: () => getQueueItemsScope,
-  getQueueItemScope: () => getQueueItemScope
+  getQueueItemScope: () => getQueueItemScope,
+  consumeQueuedTurn: () => consumeQueuedTurn
 });
 function getQueueItemScope(item) {
   if (!item) {
@@ -69808,6 +69976,9 @@ function getQueueItemsScope(items) {
   const sameScope = items.every((item) => (item.agentId ?? null) === (first.agentId ?? null) && (item.conversationId ?? null) === (first.conversationId ?? null));
   return sameScope ? getQueueItemScope(first) : {};
 }
+function hasSameQueueScope(a, b) {
+  return (a.agentId ?? null) === (b.agentId ?? null) && (a.conversationId ?? null) === (b.conversationId ?? null);
+}
 function mergeDequeuedBatchContent(items) {
   const queuedInputs = [];
   for (const item of items) {
@@ -69925,12 +70096,46 @@ function buildQueuedTurnMessage(runtime, batch) {
 function shouldQueueInboundMessage(parsed) {
   return parsed.messages.some((payload) => ("content" in payload));
 }
+function consumeQueuedTurn(runtime) {
+  const queuedItems = runtime.queueRuntime.peek();
+  const firstQueuedItem = queuedItems[0];
+  if (!firstQueuedItem || !isCoalescable(firstQueuedItem.kind)) {
+    return null;
+  }
+  let queueLen = 0;
+  let hasMessage = false;
+  for (const item of queuedItems) {
+    if (!isCoalescable(item.kind) || !hasSameQueueScope(firstQueuedItem, item)) {
+      break;
+    }
+    queueLen += 1;
+    if (item.kind === "message") {
+      hasMessage = true;
+    }
+  }
+  if (!hasMessage || queueLen === 0) {
+    return null;
+  }
+  const dequeuedBatch = runtime.queueRuntime.consumeItems(queueLen);
+  if (!dequeuedBatch) {
+    return null;
+  }
+  const queuedTurn = buildQueuedTurnMessage(runtime, dequeuedBatch);
+  if (!queuedTurn) {
+    return null;
+  }
+  return {
+    dequeuedBatch,
+    queuedTurn
+  };
+}
 function computeListenerQueueBlockedReason(runtime) {
   const activeScope = resolveRuntimeScope(runtime.listener, {
     agent_id: runtime.agentId,
     conversation_id: runtime.conversationId
   });
   return getListenerBlockedReason({
+    loopStatus: runtime.loopStatus,
     isProcessing: runtime.isProcessing,
     pendingApprovalsLen: activeScope ? getPendingControlRequestCount(runtime.listener, activeScope) : 0,
     cancelRequested: runtime.cancelRequested,
@@ -69952,18 +70157,11 @@ async function drainQueuedMessages(runtime, socket, opts, processQueuedTurn) {
         runtime.queueRuntime.tryDequeue(blockedReason);
         return;
       }
-      const queueLen = runtime.queueRuntime.length;
-      if (queueLen === 0) {
-        return;
-      }
-      const dequeuedBatch = runtime.queueRuntime.consumeItems(queueLen);
-      if (!dequeuedBatch) {
+      const consumedQueuedTurn = consumeQueuedTurn(runtime);
+      if (!consumedQueuedTurn) {
         return;
       }
-      const queuedTurn = buildQueuedTurnMessage(runtime, dequeuedBatch);
-      if (!queuedTurn) {
-        continue;
-      }
+      const { dequeuedBatch, queuedTurn } = consumedQueuedTurn;
       emitDequeuedUserMessage(socket, runtime, queuedTurn, dequeuedBatch);
       const preTurnStatus = getListenerStatus(runtime.listener) === "processing" ? "processing" : "receiving";
       if (opts.connectionId && runtime.listener.lastEmittedStatus !== preTurnStatus) {
@@ -69998,6 +70196,7 @@ function scheduleQueuePump(runtime, socket, opts, processQueuedTurn) {
   });
 }
 var init_queue = __esm(async () => {
+  init_queueRuntime();
   init_runtime();
   await __promiseAll([
     init_imageResize(),
@@ -71422,7 +71621,7 @@ var init_interactivePolicy = __esm(() => {
     "ExitPlanMode"
   ]);
   RUNTIME_USER_INPUT_TOOLS = new Set(["AskUserQuestion", "ExitPlanMode"]);
-  HEADLESS_AUTO_ALLOW_TOOLS = new Set(["EnterPlanMode"]);
+  HEADLESS_AUTO_ALLOW_TOOLS = new Set(["EnterPlanMode", "ExitPlanMode"]);
 });
 
 // src/cli/helpers/toolNameMapping.ts
@@ -74570,7 +74769,8 @@ async function resolveRecoveredApprovalResponse(runtime, socket, response, proce
           approval: decision.updated_input ? {
             ...entry.approval,
             toolArgs: JSON.stringify(decision.updated_input)
-          } : entry.approval
+          } : entry.approval,
+          reason: decision.message
         });
       } else {
         decisions.push({
@@ -74622,17 +74822,26 @@ async function resolveRecoveredApprovalResponse(runtime, socket, response, proce
     runtime.activeAbortController = null;
     setLoopStatus(runtime, "SENDING_API_REQUEST", scope);
     emitRuntimeStateUpdates(runtime, scope);
+    const continuationMessages = [
+      {
+        type: "approval",
+        approvals: approvalResults
+      }
+    ];
+    let continuationBatchId = `batch-recovered-${crypto.randomUUID()}`;
+    const consumedQueuedTurn = consumeQueuedTurn(runtime);
+    if (consumedQueuedTurn) {
+      const { dequeuedBatch, queuedTurn } = consumedQueuedTurn;
+      continuationBatchId = dequeuedBatch.batchId;
+      continuationMessages.push(...queuedTurn.messages);
+      emitDequeuedUserMessage(socket, runtime, queuedTurn, dequeuedBatch);
+    }
     await processTurn({
       type: "message",
       agentId: recovered.agentId,
       conversationId: recovered.conversationId,
-      messages: [
-        {
-          type: "approval",
-          approvals: approvalResults
-        }
-      ]
-    }, socket, runtime, opts?.onStatusChange, opts?.connectionId, `batch-recovered-${crypto.randomUUID()}`);
+      messages: continuationMessages
+    }, socket, runtime, opts?.onStatusChange, opts?.connectionId, continuationBatchId);
     clearRecoveredApprovalState(runtime);
     return true;
   } catch (error) {
@@ -74665,7 +74874,8 @@ var init_recovery = __esm(async () => {
     init_stream(),
     init_approval(),
     init_interrupts(),
-    init_protocol_outbound()
+    init_protocol_outbound(),
+    init_queue()
   ]);
 });
 
@@ -74789,9 +74999,10 @@ function markAwaitingAcceptedApprovalContinuationRunId(runtime, input) {
     runtime.activeRunId = null;
   }
 }
-async function resolveStaleApprovals(runtime, socket, abortSignal) {
+async function resolveStaleApprovals(runtime, socket, abortSignal, deps = {}) {
   if (!runtime.agentId)
     return null;
+  const getResumeDataImpl = deps.getResumeData ?? getResumeData2;
   const client = await getClient2();
   let agent;
   try {
@@ -74805,7 +75016,7 @@ async function resolveStaleApprovals(runtime, socket, abortSignal) {
   const requestedConversationId = runtime.conversationId !== "default" ? runtime.conversationId : undefined;
   let resumeData;
   try {
-    resumeData = await getResumeData2(client, agent, requestedConversationId, {
+    resumeData = await getResumeDataImpl(client, agent, requestedConversationId, {
       includeMessageHistory: false
     });
   } catch (err) {
@@ -74882,7 +75093,8 @@ async function resolveStaleApprovals(runtime, socket, abortSignal) {
               approval: response.updated_input ? {
                 ...ac.approval,
                 toolArgs: JSON.stringify(response.updated_input)
-              } : ac.approval
+              } : ac.approval,
+              reason: response.message
             });
           } else {
             decisions.push({
@@ -74925,7 +75137,19 @@ async function resolveStaleApprovals(runtime, socket, abortSignal) {
         conversationId: recoveryConversationId
       });
       emitInterruptToolReturnMessage(socket, runtime, approvalResults, runtime.activeRunId ?? undefined, "tool-return");
-      const recoveryStream = await sendApprovalContinuationWithRetry(recoveryConversationId, [{ type: "approval", approvals: approvalResults }], {
+      const continuationMessages = [
+        {
+          type: "approval",
+          approvals: approvalResults
+        }
+      ];
+      const consumedQueuedTurn = consumeQueuedTurn(runtime);
+      if (consumedQueuedTurn) {
+        const { dequeuedBatch, queuedTurn } = consumedQueuedTurn;
+        continuationMessages.push(...queuedTurn.messages);
+        emitDequeuedUserMessage(socket, runtime, queuedTurn, dequeuedBatch);
+      }
+      const recoveryStream = await sendApprovalContinuationWithRetry(recoveryConversationId, continuationMessages, {
         agentId: runtime.agentId ?? undefined,
         streamTokens: true,
         background: true,
@@ -74934,6 +75158,7 @@ async function resolveStaleApprovals(runtime, socket, abortSignal) {
       if (!recoveryStream) {
         throw new Error("Approval recovery send resolved without a continuation stream");
       }
+      setLoopStatus(runtime, "PROCESSING_API_RESPONSE", scope);
       const drainResult = await drainRecoveryStreamWithEmission(recoveryStream, socket, runtime, {
         agentId: runtime.agentId ?? undefined,
         conversationId: recoveryConversationId,
@@ -75228,6 +75453,7 @@ var init_send = __esm(async () => {
     init_approval(),
     init_interrupts(),
     init_protocol_outbound(),
+    init_queue(),
     init_recovery()
   ]);
 });
@@ -76066,6 +76292,7 @@ async function handleApprovalStop(params) {
       terminated: true,
       stream: null,
       currentInput,
+      dequeuedBatchId,
       pendingNormalizationInterruptedToolCallIds: [],
       turnToolContextId,
       lastExecutionResults: null,
@@ -76129,7 +76356,11 @@ async function handleApprovalStop(params) {
             ...ac.approval,
             toolArgs: JSON.stringify(response.updated_input)
           } : ac.approval;
-          decisions.push({ type: "approve", approval: finalApproval });
+          decisions.push({
+            type: "approve",
+            approval: finalApproval,
+            reason: response.message
+          });
         } else {
           decisions.push({
             type: "deny",
@@ -76138,11 +76369,10 @@ async function handleApprovalStop(params) {
           });
         }
       } else {
-        const denyReason = responseBody.error;
         decisions.push({
           type: "deny",
           approval: ac.approval,
-          reason: denyReason
+          reason: responseBody.error
         });
       }
     }
@@ -76157,7 +76387,7 @@ async function handleApprovalStop(params) {
     agent_id: agentId,
     conversation_id: conversationId
   });
-  const executionRunId = runId || runtime.activeRunId || params.msgRunIds[params.msgRunIds.length - 1];
+  const executionRunId = runId || runtime.activeRunId || msgRunIds[msgRunIds.length - 1];
   emitToolExecutionStartedEvents(socket, runtime, {
     toolCallIds: lastExecutingToolCallIds,
     runId: executionRunId,
@@ -76189,6 +76419,14 @@ async function handleApprovalStop(params) {
       approvals: persistedExecutionResults
     }
   ];
+  let continuationBatchId = dequeuedBatchId;
+  const consumedQueuedTurn = consumeQueuedTurn(runtime);
+  if (consumedQueuedTurn) {
+    const { dequeuedBatch, queuedTurn } = consumedQueuedTurn;
+    continuationBatchId = dequeuedBatch.batchId;
+    nextInput.push(...queuedTurn.messages);
+    emitDequeuedUserMessage(socket, runtime, queuedTurn, dequeuedBatch);
+  }
   setLoopStatus(runtime, "SENDING_API_REQUEST", {
     agent_id: agentId,
     conversation_id: conversationId
@@ -76199,6 +76437,7 @@ async function handleApprovalStop(params) {
       terminated: true,
       stream: null,
       currentInput: nextInput,
+      dequeuedBatchId: continuationBatchId,
       pendingNormalizationInterruptedToolCallIds: [],
       turnToolContextId,
       lastExecutionResults,
@@ -76232,6 +76471,7 @@ async function handleApprovalStop(params) {
     terminated: false,
     stream: stream2,
     currentInput: nextInput,
+    dequeuedBatchId: continuationBatchId,
     pendingNormalizationInterruptedToolCallIds: [],
     turnToolContextId: null,
     lastExecutionResults,
@@ -76249,6 +76489,7 @@ var init_turn_approval = __esm(async () => {
     init_approval(),
     init_interrupts(),
     init_protocol_outbound(),
+    init_queue(),
     init_recovery(),
     init_send()
   ]);
@@ -76269,6 +76510,7 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
   let llmApiErrorRetries = 0;
   let emptyResponseRetries = 0;
   let lastApprovalContinuationAccepted = false;
+  let activeDequeuedBatchId = dequeuedBatchId;
   let lastExecutionResults = null;
   let lastExecutingToolCallIds = [];
   let lastNeedsUserInputToolCallIds = [];
@@ -76630,7 +76872,7 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
         conversationId,
         turnWorkingDirectory,
         turnPermissionModeState,
-        dequeuedBatchId,
+        dequeuedBatchId: activeDequeuedBatchId,
         runId,
         msgRunIds,
         currentInput,
@@ -76643,6 +76885,7 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
       }
       stream2 = approvalResult.stream;
       currentInput = approvalResult.currentInput;
+      activeDequeuedBatchId = approvalResult.dequeuedBatchId;
       pendingNormalizationInterruptedToolCallIds = approvalResult.pendingNormalizationInterruptedToolCallIds;
       turnToolContextId = approvalResult.turnToolContextId;
       lastExecutionResults = approvalResult.lastExecutionResults;
@@ -76718,6 +76961,10 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
     }
   } finally {
     setConversationPermissionModeState(runtime.listener, normalizedAgentId, conversationId, turnPermissionModeState);
+    emitDeviceStatusIfOpen(runtime, {
+      agent_id: agentId || null,
+      conversation_id: conversationId
+    });
     runtime.activeAbortController = null;
     runtime.cancelRequested = false;
     runtime.isRecoveringApprovals = false;
@@ -76860,6 +77107,51 @@ async function handleApprovalResponseInput(listener, params, deps = {
   }
   return false;
 }
+async function handleChangeDeviceStateInput(listener, params, deps = {}) {
+  const resolvedDeps = {
+    getActiveRuntime,
+    getOrCreateScopedRuntime,
+    getPendingControlRequestCount,
+    setLoopStatus,
+    handleModeChange,
+    handleCwdChange,
+    emitDeviceStatusUpdate,
+    scheduleQueuePump,
+    ...deps
+  };
+  if (listener !== resolvedDeps.getActiveRuntime() || listener.intentionallyClosed) {
+    return false;
+  }
+  const scope = {
+    agent_id: params.command.payload.agent_id ?? params.command.runtime.agent_id ?? undefined,
+    conversation_id: params.command.payload.conversation_id ?? params.command.runtime.conversation_id ?? undefined
+  };
+  const scopedRuntime = resolvedDeps.getOrCreateScopedRuntime(listener, scope.agent_id, scope.conversation_id);
+  const shouldTrackCommand = !scopedRuntime.isProcessing && resolvedDeps.getPendingControlRequestCount(listener, scope) === 0;
+  if (shouldTrackCommand) {
+    resolvedDeps.setLoopStatus(scopedRuntime, "EXECUTING_COMMAND", scope);
+  }
+  try {
+    if (params.command.payload.mode) {
+      resolvedDeps.handleModeChange({ mode: params.command.payload.mode }, params.socket, listener, scope);
+    }
+    if (params.command.payload.cwd) {
+      await resolvedDeps.handleCwdChange({
+        agentId: scope.agent_id ?? null,
+        conversationId: scope.conversation_id ?? null,
+        cwd: params.command.payload.cwd
+      }, params.socket, scopedRuntime);
+    } else if (!params.command.payload.mode) {
+      resolvedDeps.emitDeviceStatusUpdate(params.socket, listener, scope);
+    }
+  } finally {
+    if (shouldTrackCommand) {
+      resolvedDeps.setLoopStatus(scopedRuntime, "WAITING_ON_INPUT", scope);
+      resolvedDeps.scheduleQueuePump(scopedRuntime, params.socket, params.opts, params.processQueuedTurn);
+    }
+  }
+  return true;
+}
 async function handleCwdChange(msg, socket, runtime) {
   const conversationId = normalizeConversationId(msg.conversationId);
   const agentId = normalizeCwdAgentId(msg.agentId);
@@ -77144,36 +77436,15 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
       return;
     }
     if (parsed.type === "change_device_state") {
-      if (runtime !== getActiveRuntime() || runtime.intentionallyClosed) {
-        return;
-      }
-      const scope = {
-        agent_id: parsed.payload.agent_id ?? parsed.runtime.agent_id ?? undefined,
-        conversation_id: parsed.payload.conversation_id ?? parsed.runtime.conversation_id ?? undefined
-      };
-      const scopedRuntime = getOrCreateScopedRuntime(runtime, scope.agent_id, scope.conversation_id);
-      const shouldTrackCommand = !scopedRuntime.isProcessing && getPendingControlRequestCount(runtime, scope) === 0;
-      if (shouldTrackCommand) {
-        setLoopStatus(scopedRuntime, "EXECUTING_COMMAND", scope);
-      }
-      try {
-        if (parsed.payload.mode) {
-          handleModeChange({ mode: parsed.payload.mode }, socket, runtime, scope);
-        }
-        if (parsed.payload.cwd) {
-          await handleCwdChange({
-            agentId: scope.agent_id ?? null,
-            conversationId: scope.conversation_id ?? null,
-            cwd: parsed.payload.cwd
-          }, socket, scopedRuntime);
-        } else if (!parsed.payload.mode) {
-          emitDeviceStatusUpdate(socket, runtime, scope);
-        }
-      } finally {
-        if (shouldTrackCommand) {
-          setLoopStatus(scopedRuntime, "WAITING_ON_INPUT", scope);
-        }
-      }
+      await handleChangeDeviceStateInput(runtime, {
+        command: parsed,
+        socket,
+        opts: {
+          onStatusChange: opts.onStatusChange,
+          connectionId: opts.connectionId
+        },
+        processQueuedTurn
+      });
       return;
     }
     if (parsed.type === "abort_message") {
@@ -77529,10 +77800,13 @@ var init_client4 = __esm(async () => {
     shouldAttemptPostStopApprovalRecovery,
     getApprovalContinuationRecoveryDisposition,
     markAwaitingAcceptedApprovalContinuationRunId,
+    resolveStaleApprovals,
     normalizeMessageContentImages,
     normalizeInboundMessages,
+    consumeQueuedTurn,
     handleIncomingMessage,
     handleApprovalResponseInput,
+    handleChangeDeviceStateInput,
     scheduleQueuePump,
     recoverApprovalStateForSync,
     clearRecoveredApprovalStateForScope: (runtime, scope) => clearRecoveredApprovalStateForScope(asListenerRuntimeForTests(runtime), scope),
@@ -102019,6 +102293,7 @@ var init_StaticPlanApproval = __esm(async () => {
     onApproveAndAcceptEdits,
     onKeepPlanning,
     onCancel,
+    showAcceptEditsOption = true,
     isFocused = true,
     planContent,
     planFilePath,
@@ -102046,9 +102321,10 @@ var init_StaticPlanApproval = __esm(async () => {
         setTimeout(() => setBrowserStatus(""), 5000);
       });
     }, [planContent, planFilePath, agentName]);
-    const customOptionIndex = 2;
+    const customOptionIndex = showAcceptEditsOption ? 2 : 1;
     const maxOptionIndex = customOptionIndex;
-    const isOnCustomOption = selectedOption === customOptionIndex;
+    const effectiveSelectedOption = Math.min(selectedOption, maxOptionIndex);
+    const isOnCustomOption = effectiveSelectedOption === customOptionIndex;
     const customOptionPlaceholder = "Type here to tell Letta Code what to change";
     use_input_default((input, key) => {
       if (!isFocused)
@@ -102088,9 +102364,9 @@ var init_StaticPlanApproval = __esm(async () => {
           return;
       }
       if (key.return) {
-        if (selectedOption === 0) {
+        if (showAcceptEditsOption && effectiveSelectedOption === 0) {
           onApproveAndAcceptEdits();
-        } else if (selectedOption === 1) {
+        } else {
           onApprove();
         }
         return;
@@ -102100,10 +102376,14 @@ var init_StaticPlanApproval = __esm(async () => {
         return;
       }
       if (input === "1") {
-        onApproveAndAcceptEdits();
+        if (showAcceptEditsOption) {
+          onApproveAndAcceptEdits();
+        } else {
+          onApprove();
+        }
         return;
       }
-      if (input === "2") {
+      if (showAcceptEditsOption && input === "2") {
         onApprove();
         return;
       }
@@ -102129,9 +102409,9 @@ var init_StaticPlanApproval = __esm(async () => {
                   width: 5,
                   flexShrink: 0,
                   children: /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text2, {
-                    color: selectedOption === 0 ? colors.approval.header : undefined,
+                    color: effectiveSelectedOption === 0 ? colors.approval.header : undefined,
                     children: [
-                      selectedOption === 0 ? "❯" : " ",
+                      effectiveSelectedOption === 0 ? "❯" : " ",
                       " 1."
                     ]
                   }, undefined, true, undefined, this)
@@ -102141,22 +102421,22 @@ var init_StaticPlanApproval = __esm(async () => {
                   width: Math.max(0, columns - 5),
                   children: /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text2, {
                     wrap: "wrap",
-                    color: selectedOption === 0 ? colors.approval.header : undefined,
-                    children: "Yes, and auto-accept edits"
+                    color: effectiveSelectedOption === 0 ? colors.approval.header : undefined,
+                    children: showAcceptEditsOption ? "Yes, and auto-accept edits" : "Yes, proceed (bypassPermissions / yolo mode)"
                   }, undefined, false, undefined, this)
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Box_default, {
+            showAcceptEditsOption && /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Box_default, {
               flexDirection: "row",
               children: [
                 /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Box_default, {
                   width: 5,
                   flexShrink: 0,
                   children: /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text2, {
-                    color: selectedOption === 1 ? colors.approval.header : undefined,
+                    color: effectiveSelectedOption === 1 ? colors.approval.header : undefined,
                     children: [
-                      selectedOption === 1 ? "❯" : " ",
+                      effectiveSelectedOption === 1 ? "❯" : " ",
                       " 2."
                     ]
                   }, undefined, true, undefined, this)
@@ -102166,7 +102446,7 @@ var init_StaticPlanApproval = __esm(async () => {
                   width: Math.max(0, columns - 5),
                   children: /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(Text2, {
                     wrap: "wrap",
-                    color: selectedOption === 1 ? colors.approval.header : undefined,
+                    color: effectiveSelectedOption === 1 ? colors.approval.header : undefined,
                     children: "Yes, and manually approve edits"
                   }, undefined, false, undefined, this)
                 }, undefined, false, undefined, this)
@@ -102182,7 +102462,9 @@ var init_StaticPlanApproval = __esm(async () => {
                     color: isOnCustomOption ? colors.approval.header : undefined,
                     children: [
                       isOnCustomOption ? "❯" : " ",
-                      " 3."
+                      " ",
+                      customOptionIndex + 1,
+                      "."
                     ]
                   }, undefined, true, undefined, this)
                 }, undefined, false, undefined, this),
@@ -102298,6 +102580,7 @@ function getQuestions(approval) {
 }
 var import_react48, jsx_dev_runtime25, ApprovalSwitch;
 var init_ApprovalSwitch = __esm(async () => {
+  init_mode();
   await __promiseAll([
     init_toolNameMapping(),
     init_InlineBashApproval(),
@@ -102334,11 +102617,13 @@ var init_ApprovalSwitch = __esm(async () => {
   }) => {
     const toolName = approval.toolName;
     if (toolName === "ExitPlanMode" && onPlanApprove && onPlanKeepPlanning) {
+      const showAcceptEditsOption = permissionMode.getMode() === "plan" && permissionMode.getModeBeforePlan() !== "bypassPermissions";
       return /* @__PURE__ */ jsx_dev_runtime25.jsxDEV(StaticPlanApproval, {
         onApprove: () => onPlanApprove(false),
         onApproveAndAcceptEdits: () => onPlanApprove(true),
         onKeepPlanning: onPlanKeepPlanning,
         onCancel: onCancel ?? (() => {}),
+        showAcceptEditsOption,
         isFocused,
         planContent,
         planFilePath,
@@ -124500,6 +124785,18 @@ function formatApiKeyUsage(provider) {
   ].join(`
 `);
 }
+function formatZaiCodingPlanPrompt(apiKey) {
+  const keyHint = apiKey ? ` ${apiKey}` : " <api_key>";
+  return [
+    "Connect to Z.ai",
+    "",
+    "Do you have a Z.ai Coding plan?",
+    "",
+    `  • Coding plan:  /connect zai-coding${keyHint}`,
+    `  • Regular API:  /connect zai${keyHint}`
+  ].join(`
+`);
+}
 async function handleConnectChatGPT(ctx, msg) {
   const existingProvider = await isChatGPTOAuthConnected();
   if (existingProvider) {
@@ -124608,7 +124905,11 @@ async function handleConnect(ctx, msg) {
   if (isConnectApiKeyProvider(provider)) {
     const apiKey = parts.slice(2).join("");
     if (!apiKey) {
-      addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, formatApiKeyUsage(provider), false);
+      if (isConnectZaiBaseProvider(provider)) {
+        addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, formatZaiCodingPlanPrompt(), false);
+      } else {
+        addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, formatApiKeyUsage(provider), false);
+      }
       return;
     }
     await handleConnectApiKeyProvider(ctx, msg, provider, apiKey);
@@ -131010,10 +131311,12 @@ ${SYSTEM_REMINDER_CLOSE}
               refreshDerived();
               const recoveryApprovalResults = [
                 ...autoAllowedResults.map((ar) => ({
-                  type: "approval",
+                  type: "tool",
                   tool_call_id: ar.toolCallId,
-                  approve: true,
-                  tool_return: ar.result.toolReturn
+                  tool_return: ar.result.toolReturn,
+                  status: ar.result.status,
+                  stdout: ar.result.stdout,
+                  stderr: ar.result.stderr
                 })),
                 ...autoDeniedResults
               ];
@@ -132470,7 +132773,8 @@ ${guidance}`);
     }
     const currentMode = permissionMode.getMode();
     if (currentMode === "plan") {
-      const restoreMode = acceptEdits ? "acceptEdits" : permissionMode.getModeBeforePlan() ?? "default";
+      const previousMode = permissionMode.getModeBeforePlan();
+      const restoreMode = previousMode === "bypassPermissions" ? "bypassPermissions" : acceptEdits ? "acceptEdits" : previousMode ?? "default";
       permissionMode.setMode(restoreMode);
       setUiPermissionMode(restoreMode);
     } else {
@@ -132551,12 +132855,10 @@ ${guidance}`);
       const fallbackPlanPath = lastPlanFilePathRef.current;
       const hasUsablePlan = planFileExists(fallbackPlanPath);
       if (mode !== "plan") {
+        if (hasUsablePlan) {
+          return;
+        }
         if (mode === "bypassPermissions") {
-          if (hasUsablePlan) {
-            lastAutoHandledExitPlanToolCallIdRef.current = approval.toolCallId;
-            handlePlanApprove();
-            return;
-          }
           const planFilePath = activePlanPath ?? fallbackPlanPath;
           const plansDir = join44(homedir34(), ".letta", "plans");
           handlePlanKeepPlanning(`You must write your plan to a plan file before exiting plan mode.
@@ -132564,9 +132866,6 @@ ${guidance}`);
 ` : "") + `Use a write tool to create your plan in ${plansDir}, then use ExitPlanMode to present the plan to the user.`);
           return;
         }
-        if (hasUsablePlan) {
-          return;
-        }
         const statusId = uid5("status");
         buffersRef.current.byId.set(statusId, {
           kind: "status",
@@ -132605,7 +132904,6 @@ ${guidance}`);
   }, [
     pendingApprovals,
     approvalResults.length,
-    handlePlanApprove,
     handlePlanKeepPlanning,
     refreshDerived,
     queueApprovalResults
@@ -138580,6 +138878,12 @@ async function runConnectSubcommand(argv, deps = {}) {
   }
   if (isConnectApiKeyProvider(provider)) {
     let apiKey = readStringOption(parsed.values["api-key"]) ?? restPositionals[0] ?? "";
+    if (!apiKey && isConnectZaiBaseProvider(provider)) {
+      io.stdout(`Do you have a Z.ai Coding plan?
+` + `  • Coding plan:  letta connect zai-coding [--api-key <key>]
+` + "  • Regular API:  letta connect zai [--api-key <key>]");
+      return 0;
+    }
     if (!apiKey) {
       if (!io.isTTY()) {
         io.stderr(`Missing API key for ${provider.canonical}. Pass as positional arg or --api-key.`);
@@ -141064,6 +141368,7 @@ var ANTHROPIC_DEFAULT_TOOLS2 = [
   "Glob",
   "Grep",
   "TaskStop",
+  "memory",
   "Read",
   "Skill",
   "Task",
@@ -141074,6 +141379,7 @@ var OPENAI_PASCAL_TOOLS2 = [
   "AskUserQuestion",
   "EnterPlanMode",
   "ExitPlanMode",
+  "memory",
   "Task",
   "TaskOutput",
   "TaskStop",
@@ -141087,6 +141393,7 @@ var GEMINI_PASCAL_TOOLS2 = [
   "AskUserQuestion",
   "EnterPlanMode",
   "ExitPlanMode",
+  "memory",
   "Skill",
   "Task",
   "RunShellCommand",
@@ -142845,4 +143152,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=795EEAC4C0962C6964756E2164756E21
+//# debugId=D1C8E311510A3C4964756E2164756E21