@letta-ai/letta-code 0.14.14 → 0.14.16

package/letta.js

@@ -3122,7 +3122,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.14.14",
+    version: "0.14.16",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -5649,7 +5649,6 @@ Your memory consists of memory blocks and external memory:
 - Memory Blocks: Stored as memory blocks, each containing a label (title), description (explaining how this block should influence your behavior), and value (the actual content). Memory blocks have size limits. Memory blocks are embedded within your system instructions and remain constantly available in-context.
 - External memory: Additional memory storage that is accessible and that you can bring into context with tools when needed.
 
-Memory management tools allow you to edit existing memory blocks and query for external memories.
 Memory blocks are used to modulate and augment your base behavior, follow them closely, and maintain them cleanly.
 They are the foundation which makes you *you*.
 
@@ -29235,6 +29234,12 @@ var create = (stream, { showCursor = false } = {}) => {
   let previousLineCount = 0;
   let previousOutput = "";
   let hasHiddenCursor = false;
+  const renderWithClearedLineEnds = (output) => {
+    const lines = output.split(`
+`);
+    return lines.map((line) => line + exports_base.eraseEndLine).join(`
+`);
+  };
   const render = (str) => {
     if (!showCursor && !hasHiddenCursor) {
       cli_cursor_default.hide();
@@ -29245,10 +29250,17 @@ var create = (stream, { showCursor = false } = {}) => {
     if (output === previousOutput) {
       return;
     }
-    previousOutput = output;
-    stream.write(exports_base.eraseLines(previousLineCount) + output);
-    previousLineCount = output.split(`
+    const nextLineCount = output.split(`
 `).length;
+    if (previousLineCount > 1) {
+      stream.write(exports_base.cursorUp(previousLineCount - 1));
+    }
+    stream.write(renderWithClearedLineEnds(output));
+    if (nextLineCount < previousLineCount) {
+      stream.write(exports_base.eraseDown);
+    }
+    previousOutput = output;
+    previousLineCount = nextLineCount;
   };
   render.clear = () => {
     stream.write(exports_base.eraseLines(previousLineCount));
@@ -31103,7 +31115,7 @@ var init_colors = __esm(() => {
       inline: "green"
     },
     link: {
-      text: "cyan",
+      text: brandColors.primaryAccentLight,
       url: brandColors.primaryAccent
     },
     heading: {
@@ -33160,7 +33172,8 @@ var init_models2 = __esm(() => {
       isFeatured: true,
       free: true,
       updateArgs: {
-        context_window: 180000
+        context_window: 160000,
+        max_output_tokens: 64000
       }
     },
     {
@@ -33169,7 +33182,8 @@ var init_models2 = __esm(() => {
       label: "Minimax M2",
       description: "Minimax's latest model",
       updateArgs: {
-        context_window: 196000
+        context_window: 160000,
+        max_output_tokens: 64000
       }
     },
     {
@@ -38450,6 +38464,10 @@ var init_EnterPlanMode2 = __esm(() => {
 
 // src/tools/impl/ExitPlanMode.ts
 async function exit_plan_mode() {
+  if (permissionMode2.getMode() === "plan") {
+    const restoredMode = permissionMode2.getModeBeforePlan() ?? "default";
+    permissionMode2.setMode(restoredMode);
+  }
   return {
     message: `User has approved your plan. You can now start coding.
 ` + `Start with updating your todo list if applicable.
@@ -38457,6 +38475,9 @@ async function exit_plan_mode() {
 ` + "Tip: If this plan will be referenced in the future by your future-self, " + "other agents, or humans, consider renaming the plan file to something easily " + "identifiable with a timestamp (e.g., `2026-01-auth-refactor.md`) rather than the random name."
   };
 }
+var init_ExitPlanMode2 = __esm(() => {
+  init_mode();
+});
 
 // src/tools/impl/Glob.ts
 import { execFile } from "node:child_process";
@@ -54856,12 +54877,14 @@ async function executeSubagent(type, config, model, userPrompt, baseURL, subagen
           return executeSubagent(type, config, primaryModel, userPrompt, baseURL, subagentId, true, signal, undefined, undefined, maxTurns);
         }
       }
+      const propagatedError = state.finalError?.trim();
+      const fallbackError = stderr || `Subagent exited with code ${exitCode}`;
       return {
         agentId: state.agentId || "",
         conversationId: state.conversationId || undefined,
         report: "",
         success: false,
-        error: stderr || `Subagent exited with code ${exitCode}`
+        error: propagatedError || fallbackError
       };
     }
     if (state.finalResult !== null) {
@@ -55053,6 +55076,34 @@ function extractTaskNotificationsForDisplay(message) {
 }
 
 // src/tools/impl/Task.ts
+function buildTaskResultHeader(subagentType, result) {
+  return [
+    `subagent_type=${subagentType}`,
+    result.agentId ? `agent_id=${result.agentId}` : undefined,
+    result.conversationId ? `conversation_id=${result.conversationId}` : undefined
+  ].filter(Boolean).join(" ");
+}
+function writeTaskTranscriptStart(outputFile, description, subagentType) {
+  appendToOutputFile(outputFile, `[Task started: ${description}]
+[subagent_type: ${subagentType}]
+
+`);
+}
+function writeTaskTranscriptResult(outputFile, result, header) {
+  if (result.success) {
+    appendToOutputFile(outputFile, `${header}
+
+${result.report}
+
+[Task completed]
+`);
+    return;
+  }
+  appendToOutputFile(outputFile, `[error] ${result.error || "Subagent execution failed"}
+
+[Task failed]
+`);
+}
 async function task(args) {
   const { command = "run", model, toolCallId, signal } = args;
   if (command === "refresh") {
@@ -55091,7 +55142,7 @@ async function task(args) {
   registerSubagent(subagentId, subagent_type, description, toolCallId, isBackground);
   if (isBackground) {
     const taskId = getNextTaskId();
-    const outputFile = createBackgroundOutputFile(taskId);
+    const outputFile2 = createBackgroundOutputFile(taskId);
     const abortController = new AbortController;
     const bgTask = {
       description,
@@ -55100,37 +55151,21 @@ async function task(args) {
       status: "running",
       output: [],
       startTime: new Date,
-      outputFile,
+      outputFile: outputFile2,
       abortController
     };
     backgroundTasks.set(taskId, bgTask);
-    appendToOutputFile(outputFile, `[Task started: ${description}]
-[subagent_type: ${subagent_type}]
-
-`);
+    writeTaskTranscriptStart(outputFile2, description, subagent_type);
     spawnSubagent(subagent_type, prompt, model, subagentId, abortController.signal, args.agent_id, args.conversation_id, args.max_turns).then((result) => {
       bgTask.status = result.success ? "completed" : "failed";
       if (result.error) {
         bgTask.error = result.error;
       }
-      const header = [
-        `subagent_type=${subagent_type}`,
-        result.agentId ? `agent_id=${result.agentId}` : undefined,
-        result.conversationId ? `conversation_id=${result.conversationId}` : undefined
-      ].filter(Boolean).join(" ");
+      const header = buildTaskResultHeader(subagent_type, result);
+      writeTaskTranscriptResult(outputFile2, result, header);
       if (result.success) {
-        appendToOutputFile(outputFile, `${header}
-
-${result.report}
-`);
         bgTask.output.push(result.report || "");
-      } else {
-        appendToOutputFile(outputFile, `[error] ${result.error || "Subagent execution failed"}
-`);
       }
-      appendToOutputFile(outputFile, `
-[Task ${result.success ? "completed" : "failed"}]
-`);
       completeSubagent(subagentId, {
         success: result.success,
         error: result.error,
@@ -55149,7 +55184,7 @@ ${result.report || ""}` : result.error || "Subagent execution failed";
         status: result.success ? "completed" : "failed",
         summary: `Agent "${description}" ${result.success ? "completed" : "failed"}`,
         result: truncatedResult,
-        outputFile,
+        outputFile: outputFile2,
         usage: {
           totalTokens: result.totalTokens,
           toolUses,
@@ -55162,7 +55197,7 @@ ${result.report || ""}` : result.error || "Subagent execution failed";
       const errorMessage = error instanceof Error ? error.message : String(error);
       bgTask.status = "failed";
       bgTask.error = errorMessage;
-      appendToOutputFile(outputFile, `[error] ${errorMessage}
+      appendToOutputFile(outputFile2, `[error] ${errorMessage}
 `);
       completeSubagent(subagentId, { success: false, error: errorMessage });
       const subagentSnapshot = getSnapshot2();
@@ -55173,7 +55208,7 @@ ${result.report || ""}` : result.error || "Subagent execution failed";
         status: "failed",
         summary: `Agent "${description}" failed`,
         result: errorMessage,
-        outputFile,
+        outputFile: outputFile2,
         usage: {
           toolUses,
           durationMs
@@ -55183,8 +55218,11 @@ ${result.report || ""}` : result.error || "Subagent execution failed";
       runSubagentStopHooks(subagent_type, subagentId, false, errorMessage, args.agent_id, args.conversation_id).catch(() => {});
     });
     return `Task running in background with ID: ${taskId}
-Output file: ${outputFile}`;
+Output file: ${outputFile2}`;
   }
+  const foregroundTaskId = getNextTaskId();
+  const outputFile = createBackgroundOutputFile(foregroundTaskId);
+  writeTaskTranscriptStart(outputFile, description, subagent_type);
   try {
     const result = await spawnSubagent(subagent_type, prompt, model, subagentId, signal, args.agent_id, args.conversation_id, args.max_turns);
     completeSubagent(subagentId, {
@@ -55194,24 +55232,34 @@ Output file: ${outputFile}`;
     });
     runSubagentStopHooks(subagent_type, subagentId, result.success, result.error, result.agentId, result.conversationId).catch(() => {});
     if (!result.success) {
-      return `Error: ${result.error || "Subagent execution failed"}`;
+      const errorMessage = result.error || "Subagent execution failed";
+      const failedResult = {
+        ...result,
+        error: errorMessage
+      };
+      writeTaskTranscriptResult(outputFile, failedResult, "");
+      return `Error: ${errorMessage}
+Output file: ${outputFile}`;
     }
-    const header = [
-      `subagent_type=${subagent_type}`,
-      result.agentId ? `agent_id=${result.agentId}` : undefined,
-      result.conversationId ? `conversation_id=${result.conversationId}` : undefined
-    ].filter(Boolean).join(" ");
+    const header = buildTaskResultHeader(subagent_type, result);
     const fullOutput = `${header}
 
 ${result.report}`;
+    writeTaskTranscriptResult(outputFile, result, header);
     const userCwd = process.env.USER_CWD || process.cwd();
     const { content: truncatedOutput } = truncateByChars(fullOutput, LIMITS.TASK_OUTPUT_CHARS, "Task", { workingDirectory: userCwd, toolName: "Task" });
-    return truncatedOutput;
+    return `${truncatedOutput}
+Output file: ${outputFile}`;
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     completeSubagent(subagentId, { success: false, error: errorMessage });
     runSubagentStopHooks(subagent_type, subagentId, false, errorMessage, args.agent_id, args.conversation_id).catch(() => {});
-    return `Error: ${errorMessage}`;
+    appendToOutputFile(outputFile, `[error] ${errorMessage}
+
+[Task failed]
+`);
+    return `Error: ${errorMessage}
+Output file: ${outputFile}`;
   }
 }
 var VALID_DEPLOY_TYPES;
@@ -55584,7 +55632,7 @@ var init_EnterPlanMode3 = __esm(() => {
 
 // src/tools/schemas/ExitPlanMode.json
 var ExitPlanMode_default2;
-var init_ExitPlanMode2 = __esm(() => {
+var init_ExitPlanMode3 = __esm(() => {
   ExitPlanMode_default2 = {
     type: "object",
     properties: {},
@@ -56535,6 +56583,7 @@ var init_toolDefinitions = __esm(async () => {
   init_BashOutput2();
   init_Edit2();
   init_EnterPlanMode2();
+  init_ExitPlanMode2();
   init_Glob2();
   init_GlobGemini2();
   init_Grep2();
@@ -56559,7 +56608,7 @@ var init_toolDefinitions = __esm(async () => {
   init_BashOutput3();
   init_Edit3();
   init_EnterPlanMode3();
-  init_ExitPlanMode2();
+  init_ExitPlanMode3();
   init_Glob3();
   init_GlobGemini3();
   init_Grep3();
@@ -58591,6 +58640,7 @@ var exports_analyzer = {};
 __export(exports_analyzer, {
   analyzeApprovalContext: () => analyzeApprovalContext
 });
+import { homedir as homedir11 } from "node:os";
 import { dirname as dirname8, resolve as resolve15 } from "node:path";
 function analyzeApprovalContext(toolName, toolArgs, workingDirectory) {
   const resolveFilePath = () => {
@@ -58691,7 +58741,85 @@ function containsDangerousCommand(command) {
   }
   return false;
 }
-function analyzeBashApproval(command, _workingDir) {
+function escapeRegex(text) {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function normalizePathSeparators(path18) {
+  return path18.replace(/\\/g, "/");
+}
+function parseAbsoluteCommandPaths(command) {
+  const normalized = command.replace(/\\"/g, '"').replace(/\\'/g, "'");
+  const candidates = [];
+  const quotedRegex = /["']((?:[A-Za-z]:)?\/[^"']+)["']/g;
+  let quotedMatch = quotedRegex.exec(normalized);
+  while (quotedMatch) {
+    if (quotedMatch[1]) {
+      candidates.push(normalizePathSeparators(quotedMatch[1]));
+    }
+    quotedMatch = quotedRegex.exec(normalized);
+  }
+  const tokens = normalized.split(/\s+/);
+  for (const token of tokens) {
+    const cleaned = token.replace(/^["'`([{]+/, "").replace(/["'`),;|\]}]+$/g, "");
+    if (/^(?:[A-Za-z]:)?\//.test(cleaned)) {
+      candidates.push(normalizePathSeparators(cleaned));
+    }
+  }
+  return Array.from(new Set(candidates));
+}
+function detectSkillScript(command, workingDir) {
+  const pathCandidates = parseAbsoluteCommandPaths(command);
+  if (pathCandidates.length === 0) {
+    return null;
+  }
+  const normalizedWorkingDir = normalizePathSeparators(workingDir).replace(/\/$/, "");
+  const normalizedHomeDir = normalizePathSeparators(homedir11()).replace(/\/$/, "");
+  const detect = (source, regex2) => {
+    for (const candidate of pathCandidates) {
+      const match3 = candidate.match(regex2);
+      if (!match3?.[1]) {
+        continue;
+      }
+      const skillName = match3[1];
+      const skillRootPath = match3[0].replace(/\/scripts\/$/, "");
+      return { source, skillName, skillRootPath };
+    }
+    return null;
+  };
+  const projectRegex = new RegExp(`^${escapeRegex(normalizedWorkingDir)}/\\.skills/(.+?)/scripts/`);
+  const projectSkill = detect("project", projectRegex);
+  if (projectSkill) {
+    return projectSkill;
+  }
+  const agentRegex = new RegExp(`^${escapeRegex(normalizedHomeDir)}/\\.letta/agents/[^/]+/skills/(.+?)/scripts/`);
+  const agentSkill = detect("agent-scoped", agentRegex);
+  if (agentSkill) {
+    return agentSkill;
+  }
+  const globalRegex = new RegExp(`^${escapeRegex(normalizedHomeDir)}/\\.letta/skills/(.+?)/scripts/`);
+  const globalSkill = detect("global", globalRegex);
+  if (globalSkill) {
+    return globalSkill;
+  }
+  const bundledSkill = detect("bundled", /\/skills\/builtin\/([^/]+)\/scripts\//);
+  if (bundledSkill) {
+    return bundledSkill;
+  }
+  return null;
+}
+function buildSkillScriptRule(command, skillRootPath) {
+  const normalizedCommand = normalizePathSeparators(command).trim();
+  const rootIndex = normalizedCommand.indexOf(skillRootPath);
+  if (rootIndex === -1) {
+    return `Bash(${normalizedCommand})`;
+  }
+  const rulePrefix = normalizedCommand.slice(0, rootIndex + skillRootPath.length);
+  return `Bash(${rulePrefix}:*)`;
+}
+function getSkillApprovalText(source, skillName) {
+  return `Yes, and don't ask again for scripts in ${source} skill '${skillName}'`;
+}
+function analyzeBashApproval(command, workingDir) {
   const parts = command.trim().split(/\s+/);
   const baseCommand = parts[0] || "";
   const firstArg = parts[1] || "";
@@ -58715,6 +58843,18 @@ function analyzeBashApproval(command, _workingDir) {
       safetyLevel: "dangerous"
     };
   }
+  const skillScript = detectSkillScript(command, workingDir);
+  if (skillScript) {
+    const { source, skillName, skillRootPath } = skillScript;
+    return {
+      recommendedRule: buildSkillScriptRule(command, skillRootPath),
+      ruleDescription: `scripts in ${source} skill '${skillName}'`,
+      approveAlwaysText: getSkillApprovalText(source, skillName),
+      defaultScope: "project",
+      allowPersistence: true,
+      safetyLevel: "moderate"
+    };
+  }
   if (baseCommand === "git") {
     const gitSubcommand = firstArg;
     const safeGitCommands = ["status", "diff", "log", "show", "branch"];
@@ -58995,25 +59135,32 @@ var init_filter = __esm(() => {
 var exports_manager2 = {};
 __export(exports_manager2, {
   waitForToolsetReady: () => waitForToolsetReady,
+  setExternalToolExecutor: () => setExternalToolExecutor,
   savePermissionRule: () => savePermissionRule2,
   requiresApproval: () => requiresApproval,
+  registerExternalTools: () => registerExternalTools,
   loadTools: () => loadTools,
   loadSpecificTools: () => loadSpecificTools,
   isToolsetSwitchInProgress: () => isToolsetSwitchInProgress,
   isOpenAIModel: () => isOpenAIModel,
   isGeminiModel: () => isGeminiModel,
+  isExternalTool: () => isExternalTool,
   getToolSchemas: () => getToolSchemas,
   getToolSchema: () => getToolSchema,
   getToolPermissions: () => getToolPermissions,
   getToolNames: () => getToolNames,
   getServerToolName: () => getServerToolName,
   getInternalToolName: () => getInternalToolName,
+  getExternalToolsAsClientTools: () => getExternalToolsAsClientTools,
+  getExternalToolDefinition: () => getExternalToolDefinition,
   getClientToolsFromRegistry: () => getClientToolsFromRegistry,
   getAllLettaToolNames: () => getAllLettaToolNames,
   executeTool: () => executeTool,
+  executeExternalTool: () => executeExternalTool,
   clipToolReturn: () => clipToolReturn,
   clearToolsWithLock: () => clearToolsWithLock,
   clearTools: () => clearTools,
+  clearExternalTools: () => clearExternalTools,
   checkToolPermission: () => checkToolPermission,
   analyzeToolApproval: () => analyzeToolApproval,
   TOOL_NAMES: () => TOOL_NAMES,
@@ -59087,8 +59234,65 @@ function resolveInternalToolName(name) {
   }
   return;
 }
+function getExternalToolsRegistry() {
+  const global2 = globalThis;
+  if (!global2[EXTERNAL_TOOLS_KEY]) {
+    global2[EXTERNAL_TOOLS_KEY] = new Map;
+  }
+  return global2[EXTERNAL_TOOLS_KEY];
+}
+function registerExternalTools(tools) {
+  const registry = getExternalToolsRegistry();
+  for (const tool of tools) {
+    registry.set(tool.name, tool);
+  }
+}
+function setExternalToolExecutor(executor) {
+  globalThis[EXTERNAL_EXECUTOR_KEY] = executor;
+}
+function clearExternalTools() {
+  getExternalToolsRegistry().clear();
+  delete globalThis[EXTERNAL_EXECUTOR_KEY];
+}
+function isExternalTool(name) {
+  return getExternalToolsRegistry().has(name);
+}
+function getExternalToolDefinition(name) {
+  return getExternalToolsRegistry().get(name);
+}
+function getExternalToolsAsClientTools() {
+  return Array.from(getExternalToolsRegistry().values()).map((tool) => ({
+    name: tool.name,
+    description: tool.description,
+    parameters: tool.parameters
+  }));
+}
+async function executeExternalTool(toolCallId, toolName, input) {
+  const executor = globalThis[EXTERNAL_EXECUTOR_KEY];
+  if (!executor) {
+    return {
+      toolReturn: `External tool executor not set for tool: ${toolName}`,
+      status: "error"
+    };
+  }
+  try {
+    const result = await executor(toolCallId, toolName, input);
+    const textContent = result.content.filter((c) => c.type === "text" && c.text).map((c) => c.text).join(`
+`);
+    return {
+      toolReturn: textContent || JSON.stringify(result.content),
+      status: result.isError ? "error" : "success"
+    };
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    return {
+      toolReturn: `External tool execution error: ${errorMessage}`,
+      status: "error"
+    };
+  }
+}
 function getClientToolsFromRegistry() {
-  return Array.from(toolRegistry.entries()).map(([name, tool]) => {
+  const builtInTools = Array.from(toolRegistry.entries()).map(([name, tool]) => {
     const serverName = getServerToolName(name);
     return {
       name: serverName,
@@ -59096,6 +59300,8 @@ function getClientToolsFromRegistry() {
       parameters: tool.schema.input_schema
     };
   });
+  const externalTools = getExternalToolsAsClientTools();
+  return [...builtInTools, ...externalTools];
 }
 function getToolPermissions(toolName) {
   return TOOL_PERMISSIONS[toolName] || { requiresApproval: false };
@@ -59357,6 +59563,9 @@ ${files.join(`
   return JSON.stringify(result);
 }
 async function executeTool(name, args, options) {
+  if (isExternalTool(name)) {
+    return executeExternalTool(options?.toolCallId ?? `ext-${Date.now()}`, name, args);
+  }
   const internalName = resolveInternalToolName(name);
   if (!internalName) {
     return {
@@ -59523,7 +59732,7 @@ function clearToolsWithLock() {
     releaseSwitchLock();
   }
 }
-var TOOL_NAMES, STREAMING_SHELL_TOOLS, TOOL_NAME_MAPPINGS, ANTHROPIC_DEFAULT_TOOLS, OPENAI_DEFAULT_TOOLS, GEMINI_DEFAULT_TOOLS, OPENAI_PASCAL_TOOLS, GEMINI_PASCAL_TOOLS, TOOL_PERMISSIONS, REGISTRY_KEY, SWITCH_LOCK_KEY, toolRegistry;
+var TOOL_NAMES, STREAMING_SHELL_TOOLS, TOOL_NAME_MAPPINGS, ANTHROPIC_DEFAULT_TOOLS, OPENAI_DEFAULT_TOOLS, GEMINI_DEFAULT_TOOLS, OPENAI_PASCAL_TOOLS, GEMINI_PASCAL_TOOLS, TOOL_PERMISSIONS, REGISTRY_KEY, SWITCH_LOCK_KEY, toolRegistry, EXTERNAL_TOOLS_KEY, EXTERNAL_EXECUTOR_KEY;
 var init_manager3 = __esm(async () => {
   init_model();
   init_subagents();
@@ -59685,6 +59894,8 @@ var init_manager3 = __esm(async () => {
   REGISTRY_KEY = Symbol.for("@letta/toolRegistry");
   SWITCH_LOCK_KEY = Symbol.for("@letta/toolSwitchLock");
   toolRegistry = getRegistry();
+  EXTERNAL_TOOLS_KEY = Symbol.for("@letta/externalTools");
+  EXTERNAL_EXECUTOR_KEY = Symbol.for("@letta/externalToolExecutor");
 });
 
 // src/agent/approval-execution.ts
@@ -61980,6 +62191,23 @@ function isConversationBusyError(detail) {
     return false;
   return detail.toLowerCase().includes(CONVERSATION_BUSY_DETAIL_FRAGMENT);
 }
+function classifyPreStreamConflict(detail) {
+  if (isApprovalPendingError(detail))
+    return "approval_pending";
+  if (isConversationBusyError(detail))
+    return "conversation_busy";
+  return null;
+}
+function getPreStreamErrorAction(detail, conversationBusyRetries, maxConversationBusyRetries) {
+  const kind = classifyPreStreamConflict(detail);
+  if (kind === "approval_pending") {
+    return "resolve_approval_pending";
+  }
+  if (kind === "conversation_busy" && conversationBusyRetries < maxConversationBusyRetries) {
+    return "retry_conversation_busy";
+  }
+  return "rethrow";
+}
 async function fetchRunErrorDetail(runId) {
   if (!runId)
     return null;
@@ -61992,7 +62220,7 @@ async function fetchRunErrorDetail(runId) {
     return null;
   }
 }
-var INVALID_TOOL_CALL_IDS_FRAGMENT = "invalid tool call ids", APPROVAL_PENDING_DETAIL_FRAGMENT = "cannot send a new message", CONVERSATION_BUSY_DETAIL_FRAGMENT = "another request is currently being processed";
+var INVALID_TOOL_CALL_IDS_FRAGMENT = "invalid tool call ids", APPROVAL_PENDING_DETAIL_FRAGMENT = "waiting for approval", CONVERSATION_BUSY_DETAIL_FRAGMENT = "another request is currently being processed";
 var init_approval_recovery = __esm(async () => {
   await init_client2();
 });
@@ -62224,7 +62452,7 @@ function buildModelSettings(modelHandle, updateArgs) {
   } else {
     settings = {};
   }
-  if (typeof updateArgs?.max_output_tokens === "number") {
+  if (typeof updateArgs?.max_output_tokens === "number" && "provider_type" in settings) {
     settings.max_output_tokens = updateArgs.max_output_tokens;
   }
   return settings;
@@ -62237,7 +62465,10 @@ async function updateAgentLLMConfig(agentId, modelHandle, updateArgs) {
   await client.agents.update(agentId, {
     model: modelHandle,
     ...hasModelSettings && { model_settings: modelSettings },
-    ...contextWindow && { context_window_limit: contextWindow }
+    ...contextWindow && { context_window_limit: contextWindow },
+    ...typeof updateArgs?.max_output_tokens === "number" && {
+      max_tokens: updateArgs.max_output_tokens
+    }
   });
   const finalAgent = await client.agents.retrieve(agentId);
   return finalAgent.llm_config;
@@ -63117,6 +63348,181 @@ function findLastSafeSplitPoint(content) {
 }
 var MIN_SPLIT_LENGTH = 1500;
 
+// src/tools/interactivePolicy.ts
+function isInteractiveApprovalTool(toolName) {
+  return INTERACTIVE_APPROVAL_TOOLS.has(toolName);
+}
+function isHeadlessAutoAllowTool(toolName) {
+  return HEADLESS_AUTO_ALLOW_TOOLS.has(toolName);
+}
+var INTERACTIVE_APPROVAL_TOOLS, RUNTIME_USER_INPUT_TOOLS, HEADLESS_AUTO_ALLOW_TOOLS;
+var init_interactivePolicy = __esm(() => {
+  INTERACTIVE_APPROVAL_TOOLS = new Set([
+    "AskUserQuestion",
+    "EnterPlanMode",
+    "ExitPlanMode"
+  ]);
+  RUNTIME_USER_INPUT_TOOLS = new Set(["AskUserQuestion", "ExitPlanMode"]);
+  HEADLESS_AUTO_ALLOW_TOOLS = new Set(["EnterPlanMode"]);
+});
+
+// src/tools/toolset.ts
+var exports_toolset = {};
+__export(exports_toolset, {
+  switchToolsetForModel: () => switchToolsetForModel,
+  reattachMemoryTool: () => reattachMemoryTool,
+  forceToolsetSwitch: () => forceToolsetSwitch,
+  ensureCorrectMemoryTool: () => ensureCorrectMemoryTool,
+  detachMemoryTools: () => detachMemoryTools,
+  MEMORY_TOOL_NAMES: () => MEMORY_TOOL_NAMES
+});
+async function ensureCorrectMemoryTool(agentId, modelIdentifier, useMemoryPatch) {
+  const resolvedModel = resolveModel(modelIdentifier) ?? modelIdentifier;
+  const client = await getClient2();
+  const shouldUsePatch = useMemoryPatch !== undefined ? useMemoryPatch : isOpenAIModel(resolvedModel);
+  try {
+    const agentWithTools = await client.agents.retrieve(agentId, {
+      include: ["agent.tools"]
+    });
+    const currentTools = agentWithTools.tools || [];
+    const mapByName = new Map(currentTools.map((t) => [t.name, t.id]));
+    const hasAnyMemoryTool = mapByName.has("memory") || mapByName.has("memory_apply_patch");
+    if (!hasAnyMemoryTool) {
+      return;
+    }
+    const desiredMemoryTool = shouldUsePatch ? "memory_apply_patch" : "memory";
+    const otherMemoryTool = desiredMemoryTool === "memory" ? "memory_apply_patch" : "memory";
+    let desiredId = mapByName.get(desiredMemoryTool);
+    if (!desiredId) {
+      const resp = await client.tools.list({ name: desiredMemoryTool });
+      desiredId = resp.items[0]?.id;
+    }
+    if (!desiredId) {
+      return;
+    }
+    const otherId = mapByName.get(otherMemoryTool);
+    if (mapByName.has(desiredMemoryTool) && !otherId) {
+      return;
+    }
+    const currentIds = currentTools.map((t) => t.id).filter((id) => typeof id === "string");
+    const newIds = new Set(currentIds);
+    if (otherId)
+      newIds.delete(otherId);
+    newIds.add(desiredId);
+    const updatedRules = (agentWithTools.tool_rules || []).map((r) => r.tool_name === otherMemoryTool ? { ...r, tool_name: desiredMemoryTool } : r);
+    await client.agents.update(agentId, {
+      tool_ids: Array.from(newIds),
+      tool_rules: updatedRules
+    });
+  } catch (err) {
+    console.warn(`Warning: Failed to sync memory tool: ${err instanceof Error ? err.message : String(err)}`);
+  }
+}
+async function detachMemoryTools(agentId) {
+  const client = await getClient2();
+  try {
+    const agentWithTools = await client.agents.retrieve(agentId, {
+      include: ["agent.tools"]
+    });
+    const currentTools = agentWithTools.tools || [];
+    let detachedAny = false;
+    for (const tool of currentTools) {
+      if (tool.name && MEMORY_TOOL_NAMES.has(tool.name)) {
+        if (tool.id) {
+          await client.agents.tools.detach(tool.id, { agent_id: agentId });
+          detachedAny = true;
+        }
+      }
+    }
+    return detachedAny;
+  } catch (err) {
+    console.warn(`Warning: Failed to detach memory tools: ${err instanceof Error ? err.message : String(err)}`);
+    return false;
+  }
+}
+async function reattachMemoryTool(agentId, modelIdentifier) {
+  const resolvedModel = resolveModel(modelIdentifier) ?? modelIdentifier;
+  const client = await getClient2();
+  const shouldUsePatch = isOpenAIModel(resolvedModel);
+  try {
+    const agentWithTools = await client.agents.retrieve(agentId, {
+      include: ["agent.tools"]
+    });
+    const currentTools = agentWithTools.tools || [];
+    const mapByName = new Map(currentTools.map((t) => [t.name, t.id]));
+    const desiredMemoryTool = shouldUsePatch ? "memory_apply_patch" : "memory";
+    if (mapByName.has(desiredMemoryTool)) {
+      return;
+    }
+    const resp = await client.tools.list({ name: desiredMemoryTool });
+    const toolId = resp.items[0]?.id;
+    if (!toolId) {
+      console.warn(`Memory tool "${desiredMemoryTool}" not found on server`);
+      return;
+    }
+    await client.agents.tools.attach(toolId, { agent_id: agentId });
+  } catch (err) {
+    console.warn(`Warning: Failed to reattach memory tool: ${err instanceof Error ? err.message : String(err)}`);
+  }
+}
+async function forceToolsetSwitch(toolsetName, agentId) {
+  let modelForLoading;
+  if (toolsetName === "none") {
+    clearToolsWithLock();
+    return;
+  } else if (toolsetName === "codex") {
+    await loadSpecificTools([...CODEX_TOOLS]);
+    modelForLoading = "openai/gpt-4";
+  } else if (toolsetName === "codex_snake") {
+    await loadTools("openai/gpt-4");
+    modelForLoading = "openai/gpt-4";
+  } else if (toolsetName === "gemini") {
+    await loadSpecificTools([...GEMINI_TOOLS]);
+    modelForLoading = "google_ai/gemini-3-pro-preview";
+  } else if (toolsetName === "gemini_snake") {
+    await loadTools("google_ai/gemini-3-pro-preview");
+    modelForLoading = "google_ai/gemini-3-pro-preview";
+  } else {
+    await loadTools("anthropic/claude-sonnet-4");
+    modelForLoading = "anthropic/claude-sonnet-4";
+  }
+  const useMemoryPatch = toolsetName === "codex" || toolsetName === "codex_snake";
+  await ensureCorrectMemoryTool(agentId, modelForLoading, useMemoryPatch);
+}
+async function switchToolsetForModel(modelIdentifier, agentId) {
+  const resolvedModel = resolveModel(modelIdentifier) ?? modelIdentifier;
+  await loadTools(resolvedModel);
+  const loadedAfterPrimary = getToolNames().length;
+  if (loadedAfterPrimary === 0 && !toolFilter.isActive()) {
+    await loadTools();
+    if (getToolNames().length === 0) {
+      throw new Error(`Failed to load any Letta tools for model "${resolvedModel}".`);
+    }
+  }
+  await ensureCorrectMemoryTool(agentId, resolvedModel);
+  const { isGeminiModel: isGeminiModel3 } = await init_manager3().then(() => exports_manager2);
+  const toolsetName = isOpenAIModel(resolvedModel) ? "codex" : isGeminiModel3(resolvedModel) ? "gemini" : "default";
+  return toolsetName;
+}
+var CODEX_TOOLS, GEMINI_TOOLS, MEMORY_TOOL_NAMES;
+var init_toolset = __esm(async () => {
+  init_model();
+  init_filter();
+  await __promiseAll([
+    init_client2(),
+    init_manager3()
+  ]);
+  CODEX_TOOLS = OPENAI_PASCAL_TOOLS;
+  GEMINI_TOOLS = GEMINI_PASCAL_TOOLS;
+  MEMORY_TOOL_NAMES = new Set([
+    "memory",
+    "memory_apply_patch",
+    "memory_insert",
+    "memory_replace",
+    "memory_rethink"
+  ]);
+});
+
 // src/cli/helpers/toolNameMapping.ts
 function getDisplayToolName(rawName) {
   if (rawName === "write")
@@ -63219,10 +63625,10 @@ function isPlanTool(rawName, displayName) {
   return rawName === "update_plan" || rawName === "UpdatePlan" || displayName === "Planning";
 }
 function alwaysRequiresUserInput(name) {
-  return name === "AskUserQuestion" || name === "EnterPlanMode" || name === "ExitPlanMode";
+  return isInteractiveApprovalTool(name);
 }
 function isMemoryTool(name) {
-  return name === "memory" || name === "memory_apply_patch";
+  return MEMORY_TOOL_NAMES.has(name);
 }
 function isFileEditTool(name) {
   return name === "edit" || name === "Edit" || name === "multi_edit" || name === "MultiEdit" || name === "Replace" || name === "replace";
@@ -63246,6 +63652,10 @@ function isSearchTool(name) {
 function isGlobTool(name) {
   return name === "glob" || name === "Glob" || name === "glob_gemini" || name === "GlobGemini";
 }
+var init_toolNameMapping = __esm(async () => {
+  init_interactivePolicy();
+  await init_toolset();
+});
 
 // src/cli/helpers/accumulator.ts
 function appendStreamingOutput(state, chunk, startTime, isStderr = false) {
@@ -63705,6 +64115,11 @@ function onChunk(b, chunk, ctx) {
           eventData: eventChunk.event_data || {},
           phase: "running"
         }));
+        if (eventType === "compaction") {
+          runPreCompactHooks(ctx?.lastContextTokens, undefined, b.agentId, undefined).catch((error) => {
+            debugLog("hooks", "PreCompact hook error (accumulator)", error);
+          });
+        }
         break;
       }
       break;
@@ -63749,7 +64164,10 @@ var init_accumulator = __esm(async () => {
   init_constants();
   init_debug();
   init_backfill();
-  await init_hooks();
+  await __promiseAll([
+    init_hooks(),
+    init_toolNameMapping()
+  ]);
   CANCEL_REASON_TEXT = {
     user_interrupt: INTERRUPTED_BY_USER,
     stream_error: "Stream error",
@@ -63864,6 +64282,49 @@ var init_errorContext = __esm(() => {
 });
 
 // src/cli/helpers/errorFormatter.ts
+function extractReasonList(value) {
+  if (!Array.isArray(value))
+    return [];
+  return value.filter((reason) => typeof reason === "string").map((reason) => reason.toLowerCase());
+}
+function getErrorReasons(e) {
+  const reasons = new Set;
+  const errorBody = e.error;
+  if (errorBody && typeof errorBody === "object") {
+    const body = errorBody;
+    for (const reason of extractReasonList(body.reasons)) {
+      reasons.add(reason);
+    }
+    if (body.error && typeof body.error === "object") {
+      const nested = body.error;
+      for (const reason of extractReasonList(nested.reasons)) {
+        reasons.add(reason);
+      }
+    }
+  }
+  const message = e.message?.toLowerCase() ?? "";
+  for (const knownReason of [
+    "not-enough-credits",
+    "model-unknown",
+    "byok-not-available-on-free-tier",
+    "free-usage-exceeded",
+    "premium-usage-exceeded",
+    "standard-usage-exceeded",
+    "basic-usage-exceeded",
+    "context-window-size-not-supported",
+    "agents-limit-exceeded",
+    "exceeded-quota"
+  ]) {
+    if (message.includes(knownReason)) {
+      reasons.add(knownReason);
+    }
+  }
+  return Array.from(reasons);
+}
+function hasErrorReason(e, reason, reasons) {
+  const allReasons = reasons ?? getErrorReasons(e);
+  return allReasons.includes(reason.toLowerCase());
+}
 function getRateLimitResetMs(e) {
   if (e.status !== 429)
     return;
@@ -63917,52 +64378,87 @@ function getResourceLimitMessage(e) {
   }
   return;
 }
-function isAgentLimitError(e) {
+function isAgentLimitError(e, reasons) {
   if (e.status !== 429)
     return false;
-  const errorBody = e.error;
-  if (errorBody && typeof errorBody === "object") {
-    if ("reasons" in errorBody && Array.isArray(errorBody.reasons)) {
-      if (errorBody.reasons.includes("agents-limit-exceeded")) {
-        return true;
-      }
-    }
-  }
-  return false;
+  return hasErrorReason(e, "agents-limit-exceeded", reasons);
 }
-function isCreditExhaustedError(e) {
+function isCreditExhaustedError(e, reasons) {
   if (e.status !== 402)
     return false;
-  const errorBody = e.error;
-  if (errorBody && typeof errorBody === "object") {
-    if ("reasons" in errorBody && Array.isArray(errorBody.reasons)) {
-      if (errorBody.reasons.includes("not-enough-credits")) {
-        return true;
+  return hasErrorReason(e, "not-enough-credits", reasons);
+}
+function findEncryptedContentDetail(e) {
+  if (typeof e !== "object" || e === null)
+    return;
+  const obj = e;
+  if (typeof obj.detail === "string" && obj.detail.includes("invalid_encrypted_content")) {
+    return obj.detail;
+  }
+  if (obj.error && typeof obj.error === "object") {
+    const errObj = obj.error;
+    if (errObj.error && typeof errObj.error === "object") {
+      const inner = errObj.error;
+      if (typeof inner.detail === "string" && inner.detail.includes("invalid_encrypted_content")) {
+        return inner.detail;
       }
     }
-    if ("error" in errorBody && typeof errorBody.error === "object") {
-      const nested = errorBody.error;
-      if ("reasons" in nested && Array.isArray(nested.reasons)) {
-        if (nested.reasons.includes("not-enough-credits")) {
-          return true;
-        }
-      }
+    if (typeof errObj.detail === "string" && errObj.detail.includes("invalid_encrypted_content")) {
+      return errObj.detail;
     }
   }
-  if (e.message?.includes("not-enough-credits")) {
-    return true;
+  return;
+}
+function checkEncryptedContentError(e) {
+  const detail = findEncryptedContentDetail(e);
+  if (!detail) {
+    try {
+      const errorStr = typeof e === "string" ? e : JSON.stringify(e);
+      if (!errorStr.includes("invalid_encrypted_content"))
+        return;
+    } catch {
+      return;
+    }
+    return "OpenAI error: Encrypted content could not be verified — organization mismatch." + ENCRYPTED_CONTENT_HINT;
   }
-  return false;
+  try {
+    const jsonStart = detail.indexOf("{");
+    if (jsonStart >= 0) {
+      const parsed = JSON.parse(detail.slice(jsonStart));
+      const innerError = parsed.error || parsed;
+      if (innerError.code === "invalid_encrypted_content") {
+        const msg = String(innerError.message || "Encrypted content verification failed.").replaceAll('"', "\\\"");
+        return [
+          "OpenAI error:",
+          "  {",
+          `    type: "${innerError.type || "invalid_request_error"}",`,
+          `    code: "${innerError.code}",`,
+          `    message: "${msg}"`,
+          "  }",
+          ENCRYPTED_CONTENT_HINT
+        ].join(`
+`);
+      }
+    }
+  } catch {}
+  return "OpenAI error: Encrypted content could not be verified — organization mismatch." + ENCRYPTED_CONTENT_HINT;
+}
+function isEncryptedContentError(e) {
+  return findEncryptedContentDetail(e) !== undefined;
 }
 function formatErrorDetails(e, agentId, conversationId) {
   let runId;
+  const encryptedContentMsg = checkEncryptedContentError(e);
+  if (encryptedContentMsg)
+    return encryptedContentMsg;
   if (e instanceof APIError2) {
+    const reasons = getErrorReasons(e);
     const rateLimitResetMs = getRateLimitResetMs(e);
     if (rateLimitResetMs !== undefined) {
       const resetInfo = rateLimitResetMs > 0 ? formatResetTime(rateLimitResetMs) : "Try again later";
       return `You've hit your usage limit. ${resetInfo}. View usage: ${LETTA_USAGE_URL}`;
     }
-    if (isAgentLimitError(e)) {
+    if (isAgentLimitError(e, reasons)) {
       const { billingTier } = getErrorContext();
       if (billingTier?.toLowerCase() === "free") {
         return `You've reached the agent limit (3) for the Free Plan. Delete agents at: ${LETTA_AGENTS_URL}
@@ -63971,6 +64467,12 @@ Or upgrade to Pro for unlimited agents at: ${LETTA_USAGE_URL}`;
       return `You've reached your agent limit. Delete agents at: ${LETTA_AGENTS_URL}
 Or check your plan at: ${LETTA_USAGE_URL}`;
     }
+    if (hasErrorReason(e, "model-unknown", reasons)) {
+      return `The selected model is not currently available for this account or provider. Run /model and press R to refresh available models, then choose an available model or connect a provider with /connect.`;
+    }
+    if (hasErrorReason(e, "context-window-size-not-supported", reasons)) {
+      return `The selected context window is not supported for this model. Switch models with /model or pick a model with a larger context window.`;
+    }
     const resourceLimitMsg = getResourceLimitMessage(e);
     if (resourceLimitMsg) {
       const match3 = resourceLimitMsg.match(/limit for (\w+)/);
@@ -63979,13 +64481,19 @@ Or check your plan at: ${LETTA_USAGE_URL}`;
 Upgrade at: ${LETTA_USAGE_URL}
 Delete ${resourceType} at: ${LETTA_AGENTS_URL}`;
     }
-    if (isCreditExhaustedError(e)) {
-      const { billingTier, modelDisplayName } = getErrorContext();
-      if (billingTier?.toLowerCase() === "free") {
-        const modelInfo = modelDisplayName ? ` (${modelDisplayName})` : "";
-        return `Selected hosted model${modelInfo} not available on Free plan. Switch to a free model with /model (glm-4.7 or minimax-m2.1), upgrade your account at ${LETTA_USAGE_URL}, or connect your own API keys with /connect.`;
-      }
-      return `Your account is out of credits. Redeem additional credits or configure auto-recharge on your account page: ${LETTA_USAGE_URL}`;
+    if (isCreditExhaustedError(e, reasons)) {
+      return `Your account is out of credits for hosted inference. Add credits, enable auto-recharge, or upgrade at ${LETTA_USAGE_URL}. You can also connect your own provider keys with /connect.`;
+    }
+    if (hasErrorReason(e, "premium-usage-exceeded", reasons) || hasErrorReason(e, "standard-usage-exceeded", reasons) || hasErrorReason(e, "basic-usage-exceeded", reasons)) {
+      return `You've reached your hosted model usage limit. View your plan and usage at ${LETTA_USAGE_URL}, or connect your own provider keys with /connect.`;
+    }
+    if (hasErrorReason(e, "byok-not-available-on-free-tier", reasons)) {
+      const { modelDisplayName } = getErrorContext();
+      const modelInfo = modelDisplayName ? ` (${modelDisplayName})` : "";
+      return `Selected BYOK model${modelInfo} is not available on the Free plan. Switch to a free hosted model with /model (glm-4.7 or minimax-m2.1), or upgrade at ${LETTA_USAGE_URL}.`;
+    }
+    if (hasErrorReason(e, "free-usage-exceeded", reasons)) {
+      return `You've reached the Free plan hosted model usage limit. Switch to free hosted models with /model (glm-4.7 or minimax-m2.1), upgrade at ${LETTA_USAGE_URL}, or connect your own provider keys with /connect.`;
     }
     if (e.error && typeof e.error === "object" && "error" in e.error) {
       const errorData = e.error.error;
@@ -64041,10 +64549,18 @@ function createAgentLink(runId, agentId, conversationId) {
   const url = `https://app.letta.com/agents/${agentId}${conversationId ? `?conversation=${conversationId}` : ""}`;
   return `View agent: \x1B]8;;${url}\x1B\\${agentId}\x1B]8;;\x1B\\ (run: ${runId})`;
 }
-var LETTA_USAGE_URL = "https://app.letta.com/settings/organization/usage", LETTA_AGENTS_URL = "https://app.letta.com/projects/default-project/agents";
+var LETTA_USAGE_URL = "https://app.letta.com/settings/organization/usage", LETTA_AGENTS_URL = "https://app.letta.com/projects/default-project/agents", ENCRYPTED_CONTENT_HINT;
 var init_errorFormatter = __esm(() => {
   init_error();
   init_errorContext();
+  ENCRYPTED_CONTENT_HINT = [
+    "",
+    "This occurs when the conversation contains messages with encrypted",
+    "reasoning from a different OpenAI authentication scope (e.g. switching",
+    "between ChatGPT OAuth and an OpenAI API key).",
+    "Use /clear to start a new conversation."
+  ].join(`
+`);
 });
 
 // src/cli/helpers/streamProcessor.ts
@@ -64317,155 +64833,6 @@ var init_stream = __esm(async () => {
   ]);
 });
 
-// src/tools/toolset.ts
-var exports_toolset = {};
-__export(exports_toolset, {
-  switchToolsetForModel: () => switchToolsetForModel,
-  reattachMemoryTool: () => reattachMemoryTool,
-  forceToolsetSwitch: () => forceToolsetSwitch,
-  ensureCorrectMemoryTool: () => ensureCorrectMemoryTool,
-  detachMemoryTools: () => detachMemoryTools
-});
-async function ensureCorrectMemoryTool(agentId, modelIdentifier, useMemoryPatch) {
-  const resolvedModel = resolveModel(modelIdentifier) ?? modelIdentifier;
-  const client = await getClient2();
-  const shouldUsePatch = useMemoryPatch !== undefined ? useMemoryPatch : isOpenAIModel(resolvedModel);
-  try {
-    const agentWithTools = await client.agents.retrieve(agentId, {
-      include: ["agent.tools"]
-    });
-    const currentTools = agentWithTools.tools || [];
-    const mapByName = new Map(currentTools.map((t) => [t.name, t.id]));
-    const hasAnyMemoryTool = mapByName.has("memory") || mapByName.has("memory_apply_patch");
-    if (!hasAnyMemoryTool) {
-      return;
-    }
-    const desiredMemoryTool = shouldUsePatch ? "memory_apply_patch" : "memory";
-    const otherMemoryTool = desiredMemoryTool === "memory" ? "memory_apply_patch" : "memory";
-    let desiredId = mapByName.get(desiredMemoryTool);
-    if (!desiredId) {
-      const resp = await client.tools.list({ name: desiredMemoryTool });
-      desiredId = resp.items[0]?.id;
-    }
-    if (!desiredId) {
-      return;
-    }
-    const otherId = mapByName.get(otherMemoryTool);
-    if (mapByName.has(desiredMemoryTool) && !otherId) {
-      return;
-    }
-    const currentIds = currentTools.map((t) => t.id).filter((id) => typeof id === "string");
-    const newIds = new Set(currentIds);
-    if (otherId)
-      newIds.delete(otherId);
-    newIds.add(desiredId);
-    const updatedRules = (agentWithTools.tool_rules || []).map((r) => r.tool_name === otherMemoryTool ? { ...r, tool_name: desiredMemoryTool } : r);
-    await client.agents.update(agentId, {
-      tool_ids: Array.from(newIds),
-      tool_rules: updatedRules
-    });
-  } catch (err) {
-    console.warn(`Warning: Failed to sync memory tool: ${err instanceof Error ? err.message : String(err)}`);
-  }
-}
-async function detachMemoryTools(agentId) {
-  const client = await getClient2();
-  try {
-    const agentWithTools = await client.agents.retrieve(agentId, {
-      include: ["agent.tools"]
-    });
-    const currentTools = agentWithTools.tools || [];
-    let detachedAny = false;
-    for (const tool of currentTools) {
-      if (tool.name === "memory" || tool.name === "memory_apply_patch") {
-        if (tool.id) {
-          await client.agents.tools.detach(tool.id, { agent_id: agentId });
-          detachedAny = true;
-        }
-      }
-    }
-    return detachedAny;
-  } catch (err) {
-    console.warn(`Warning: Failed to detach memory tools: ${err instanceof Error ? err.message : String(err)}`);
-    return false;
-  }
-}
-async function reattachMemoryTool(agentId, modelIdentifier) {
-  const resolvedModel = resolveModel(modelIdentifier) ?? modelIdentifier;
-  const client = await getClient2();
-  const shouldUsePatch = isOpenAIModel(resolvedModel);
-  try {
-    const agentWithTools = await client.agents.retrieve(agentId, {
-      include: ["agent.tools"]
-    });
-    const currentTools = agentWithTools.tools || [];
-    const mapByName = new Map(currentTools.map((t) => [t.name, t.id]));
-    const desiredMemoryTool = shouldUsePatch ? "memory_apply_patch" : "memory";
-    if (mapByName.has(desiredMemoryTool)) {
-      return;
-    }
-    const resp = await client.tools.list({ name: desiredMemoryTool });
-    const toolId = resp.items[0]?.id;
-    if (!toolId) {
-      console.warn(`Memory tool "${desiredMemoryTool}" not found on server`);
-      return;
-    }
-    await client.agents.tools.attach(toolId, { agent_id: agentId });
-  } catch (err) {
-    console.warn(`Warning: Failed to reattach memory tool: ${err instanceof Error ? err.message : String(err)}`);
-  }
-}
-async function forceToolsetSwitch(toolsetName, agentId) {
-  let modelForLoading;
-  if (toolsetName === "none") {
-    clearToolsWithLock();
-    return;
-  } else if (toolsetName === "codex") {
-    await loadSpecificTools([...CODEX_TOOLS]);
-    modelForLoading = "openai/gpt-4";
-  } else if (toolsetName === "codex_snake") {
-    await loadTools("openai/gpt-4");
-    modelForLoading = "openai/gpt-4";
-  } else if (toolsetName === "gemini") {
-    await loadSpecificTools([...GEMINI_TOOLS]);
-    modelForLoading = "google_ai/gemini-3-pro-preview";
-  } else if (toolsetName === "gemini_snake") {
-    await loadTools("google_ai/gemini-3-pro-preview");
-    modelForLoading = "google_ai/gemini-3-pro-preview";
-  } else {
-    await loadTools("anthropic/claude-sonnet-4");
-    modelForLoading = "anthropic/claude-sonnet-4";
-  }
-  const useMemoryPatch = toolsetName === "codex" || toolsetName === "codex_snake";
-  await ensureCorrectMemoryTool(agentId, modelForLoading, useMemoryPatch);
-}
-async function switchToolsetForModel(modelIdentifier, agentId) {
-  const resolvedModel = resolveModel(modelIdentifier) ?? modelIdentifier;
-  await loadTools(resolvedModel);
-  const loadedAfterPrimary = getToolNames().length;
-  if (loadedAfterPrimary === 0 && !toolFilter.isActive()) {
-    await loadTools();
-    if (getToolNames().length === 0) {
-      throw new Error(`Failed to load any Letta tools for model "${resolvedModel}".`);
-    }
-  }
-  await ensureCorrectMemoryTool(agentId, resolvedModel);
-  const { isGeminiModel: isGeminiModel3 } = await init_manager3().then(() => exports_manager2);
-  const toolsetName = isOpenAIModel(resolvedModel) ? "codex" : isGeminiModel3(resolvedModel) ? "gemini" : "default";
-  return toolsetName;
-}
-var CODEX_TOOLS, GEMINI_TOOLS;
-var init_toolset = __esm(async () => {
-  init_model();
-  init_filter();
-  await __promiseAll([
-    init_client2(),
-    init_manager3()
-  ]);
-  CODEX_TOOLS = OPENAI_PASCAL_TOOLS;
-  GEMINI_TOOLS = GEMINI_PASCAL_TOOLS;
-});
-
 // src/agent/github-utils.ts
 var exports_github_utils = {};
 __export(exports_github_utils, {
@@ -64501,6 +64868,7 @@ function parseDirNames(entries) {
 // src/agent/import.ts
 var exports_import = {};
 __export(exports_import, {
+  importAgentFromRegistry: () => importAgentFromRegistry,
   importAgentFromFile: () => importAgentFromFile,
   extractSkillsFromAf: () => extractSkillsFromAf
 });
@@ -64608,6 +64976,45 @@ async function downloadGitHubDirectory(entries, destDir, owner, repo, branch, ba
     }
   }
 }
+function parseRegistryHandle(handle) {
+  const normalized = handle.startsWith("@") ? handle.slice(1) : handle;
+  const parts = normalized.split("/");
+  if (parts.length !== 2 || !parts[0] || !parts[1]) {
+    throw new Error(`Invalid import handle "${handle}". Use format: @author/agentname`);
+  }
+  return { author: parts[0], name: parts[1] };
+}
+async function importAgentFromRegistry(options) {
+  const { tmpdir: tmpdir2 } = await import("node:os");
+  const { join: join20 } = await import("node:path");
+  const { writeFile: writeFile5, unlink: unlink2 } = await import("node:fs/promises");
+  const { author, name } = parseRegistryHandle(options.handle);
+  const rawUrl = `https://raw.githubusercontent.com/${AGENT_REGISTRY_OWNER}/${AGENT_REGISTRY_REPO}/refs/heads/${AGENT_REGISTRY_BRANCH}/agents/@${author}/${name}/${name}.af`;
+  const response = await fetch(rawUrl);
+  if (!response.ok) {
+    if (response.status === 404) {
+      throw new Error(`Agent @${author}/${name} not found in registry. Check that the agent exists at https://github.com/${AGENT_REGISTRY_OWNER}/${AGENT_REGISTRY_REPO}/tree/${AGENT_REGISTRY_BRANCH}/agents/@${author}/${name}`);
+    }
+    throw new Error(`Failed to download agent @${author}/${name}: ${response.statusText}`);
+  }
+  const afContent = await response.text();
+  const tempPath = join20(tmpdir2(), `letta-import-${author}-${name}-${Date.now()}.af`);
+  await writeFile5(tempPath, afContent, "utf-8");
+  try {
+    const result = await importAgentFromFile({
+      filePath: tempPath,
+      modelOverride: options.modelOverride,
+      stripMessages: options.stripMessages ?? true,
+      stripSkills: options.stripSkills ?? false
+    });
+    return result;
+  } finally {
+    try {
+      await unlink2(tempPath);
+    } catch {}
+  }
+}
+var AGENT_REGISTRY_OWNER = "letta-ai", AGENT_REGISTRY_REPO = "agent-file", AGENT_REGISTRY_BRANCH = "main";
 var init_import = __esm(async () => {
   init_model();
   await __promiseAll([
@@ -65059,6 +65466,7 @@ In headless mode, use:
       process.exit(1);
     }
   }
+  let isRegistryImport = false;
   if (fromAfFile) {
     if (specifiedAgentId) {
       console.error("Error: --from-af cannot be used with --agent");
@@ -65072,6 +65480,15 @@ In headless mode, use:
       console.error("Error: --from-af cannot be used with --new");
       process.exit(1);
     }
+    if (fromAfFile.startsWith("@")) {
+      isRegistryImport = true;
+      const normalized = fromAfFile.slice(1);
+      const parts = normalized.split("/");
+      if (parts.length !== 2 || !parts[0] || !parts[1]) {
+        console.error(`Error: Invalid registry handle "${fromAfFile}". Use format: @author/agentname`);
+        process.exit(1);
+      }
+    }
   }
   if (initBlocksRaw && !forceNew) {
     console.error("Error: --init-blocks can only be used together with --new to control initial memory blocks.");
@@ -65154,13 +65571,24 @@ In headless mode, use:
     }
   }
   if (!agent && fromAfFile) {
-    const { importAgentFromFile: importAgentFromFile2 } = await init_import().then(() => exports_import);
-    const result = await importAgentFromFile2({
-      filePath: fromAfFile,
-      modelOverride: model,
-      stripMessages: true,
-      stripSkills: false
-    });
+    let result;
+    if (isRegistryImport) {
+      const { importAgentFromRegistry: importAgentFromRegistry2 } = await init_import().then(() => exports_import);
+      result = await importAgentFromRegistry2({
+        handle: fromAfFile,
+        modelOverride: model,
+        stripMessages: true,
+        stripSkills: false
+      });
+    } else {
+      const { importAgentFromFile: importAgentFromFile2 } = await init_import().then(() => exports_import);
+      result = await importAgentFromFile2({
+        filePath: fromAfFile,
+        modelOverride: model,
+        stripMessages: true,
+        stripSkills: false
+      });
+    }
     agent = result.agent;
     isNewlyCreatedAgent = true;
     if (result.skills && result.skills.length > 0) {
@@ -65363,8 +65791,11 @@ In headless mode, use:
     console.error(`Error: Invalid input format "${inputFormat}". Valid formats: stream-json`);
     process.exit(1);
   }
+  const { getClientToolsFromRegistry: getClientToolsFromRegistry2 } = await init_manager3().then(() => exports_manager2);
+  const loadedToolNames = getClientToolsFromRegistry2().map((t) => t.name);
+  const availableTools = loadedToolNames.length > 0 ? loadedToolNames : agent.tools?.map((t) => t.name).filter((n) => !!n) || [];
   if (isBidirectionalMode) {
-    await runBidirectionalMode(agent, conversationId, client, outputFormat, includePartialMessages);
+    await runBidirectionalMode(agent, conversationId, client, outputFormat, includePartialMessages, availableTools);
     return;
   }
   const buffers = createBuffers(agent.id);
@@ -65378,7 +65809,7 @@ In headless mode, use:
       agent_id: agent.id,
       conversation_id: conversationId,
       model: agent.llm_config?.model ?? "",
-      tools: agent.tools?.map((t) => t.name).filter((n) => !!n) || [],
+      tools: availableTools,
       cwd: process.cwd(),
       mcp_servers: [],
       permission_mode: "",
@@ -65404,6 +65835,7 @@ In headless mode, use:
       if (pendingApprovals.length === 0)
         break;
       const { autoAllowed, autoDenied } = await classifyApprovals(pendingApprovals, {
+        alwaysRequiresUserInput: isInteractiveApprovalTool,
         treatAskAsDeny: true,
         denyReasonForAsk: "Tool requires approval (headless mode)",
         requireArgsForAutoApprove: true,
@@ -65583,7 +66015,24 @@ ${SYSTEM_REMINDER_CLOSE}
         if (!errorDetail && preStreamError instanceof Error) {
           errorDetail = preStreamError.message;
         }
-        if (isConversationBusyError(errorDetail) && conversationBusyRetries < CONVERSATION_BUSY_MAX_RETRIES) {
+        const preStreamAction = getPreStreamErrorAction(errorDetail, conversationBusyRetries, CONVERSATION_BUSY_MAX_RETRIES);
+        if (preStreamAction === "resolve_approval_pending") {
+          if (outputFormat === "stream-json") {
+            const recoveryMsg = {
+              type: "recovery",
+              recovery_type: "approval_pending",
+              message: "Detected pending approval conflict on send; resolving before retry",
+              session_id: sessionId,
+              uuid: `recovery-pre-stream-${crypto.randomUUID()}`
+            };
+            console.log(JSON.stringify(recoveryMsg));
+          } else {
+            console.error("Pending approval detected, resolving before retry...");
+          }
+          await resolveAllPendingApprovals();
+          continue;
+        }
+        if (preStreamAction === "retry_conversation_busy") {
           conversationBusyRetries += 1;
           if (outputFormat === "stream-json") {
             const retryMsg = {
@@ -65656,6 +66105,7 @@ ${SYSTEM_REMINDER_CLOSE}
           }
           if (updatedApproval && !autoApprovalEmitted.has(updatedApproval.toolCallId)) {
             const { autoAllowed } = await classifyApprovals([updatedApproval], {
+              alwaysRequiresUserInput: isInteractiveApprovalTool,
               requireArgsForAutoApprove: true,
               missingNameReason: "Tool call incomplete - missing name"
             });
@@ -65734,9 +66184,8 @@ ${SYSTEM_REMINDER_CLOSE}
           console.error("Unexpected empty approvals array");
           process.exit(1);
         }
-        const { autoAllowed, autoDenied } = await classifyApprovals(approvals, {
-          treatAskAsDeny: true,
-          denyReasonForAsk: "Tool requires approval (headless mode)",
+        const { autoAllowed, autoDenied, needsUserInput } = await classifyApprovals(approvals, {
+          alwaysRequiresUserInput: isInteractiveApprovalTool,
           requireArgsForAutoApprove: true,
           missingNameReason: "Tool call incomplete - missing name"
         });
@@ -65745,6 +66194,19 @@ ${SYSTEM_REMINDER_CLOSE}
             type: "approve",
             approval: ac.approval
           })),
+          ...needsUserInput.map((ac) => {
+            if (isHeadlessAutoAllowTool(ac.approval.toolName)) {
+              return {
+                type: "approve",
+                approval: ac.approval
+              };
+            }
+            return {
+              type: "deny",
+              approval: ac.approval,
+              reason: "Tool requires approval (headless mode)"
+            };
+          }),
           ...autoDenied.map((ac) => {
             const fallback = "matchedRule" in ac.permission && ac.permission.matchedRule ? `Permission denied: ${ac.permission.matchedRule}` : ac.permission.reason ? `Permission denied: ${ac.permission.reason}` : "Permission denied: Unknown reason";
             return {
@@ -66007,7 +66469,7 @@ ${SYSTEM_REMINDER_CLOSE}
   markMilestone("HEADLESS_COMPLETE");
   reportAllMilestones();
 }
-async function runBidirectionalMode(agent, conversationId, _client, _outputFormat, includePartialMessages) {
+async function runBidirectionalMode(agent, conversationId, client, _outputFormat, includePartialMessages, availableTools) {
   const sessionId = agent.id;
   const readline = await import("node:readline");
   const initEvent = {
@@ -66017,12 +66479,74 @@ async function runBidirectionalMode(agent, conversationId, _client, _outputForma
     agent_id: agent.id,
     conversation_id: conversationId,
     model: agent.llm_config?.model,
-    tools: agent.tools?.map((t) => t.name) || [],
+    tools: availableTools,
     cwd: process.cwd(),
     uuid: `init-${agent.id}`
   };
   console.log(JSON.stringify(initEvent));
   let currentAbortController = null;
+  const resolveAllPendingApprovals = async () => {
+    const { getResumeData: getResumeData3 } = await Promise.resolve().then(() => (init_check_approval(), exports_check_approval));
+    while (true) {
+      const freshAgent = await client.agents.retrieve(agent.id);
+      let resume;
+      try {
+        resume = await getResumeData3(client, freshAgent, conversationId);
+      } catch (error) {
+        if (error instanceof APIError2 && (error.status === 404 || error.status === 422)) {
+          break;
+        }
+        throw error;
+      }
+      const pendingApprovals = resume.pendingApprovals || [];
+      if (pendingApprovals.length === 0)
+        break;
+      const { autoAllowed, autoDenied } = await classifyApprovals(pendingApprovals, {
+        treatAskAsDeny: true,
+        denyReasonForAsk: "Tool requires approval (headless mode)",
+        requireArgsForAutoApprove: true,
+        missingNameReason: "Tool call incomplete - missing name"
+      });
+      const decisions = [
+        ...autoAllowed.map((ac) => ({
+          type: "approve",
+          approval: ac.approval,
+          reason: ac.permission.reason || "Allowed by permission rule",
+          matchedRule: "matchedRule" in ac.permission && ac.permission.matchedRule ? ac.permission.matchedRule : "auto-approved"
+        })),
+        ...autoDenied.map((ac) => {
+          const fallback = "matchedRule" in ac.permission && ac.permission.matchedRule ? `Permission denied: ${ac.permission.matchedRule}` : ac.permission.reason ? `Permission denied: ${ac.permission.reason}` : "Permission denied: Unknown reason";
+          return {
+            type: "deny",
+            approval: ac.approval,
+            reason: ac.denyReason ?? fallback
+          };
+        })
+      ];
+      const { executeApprovalBatch: executeApprovalBatch2 } = await init_approval_execution().then(() => exports_approval_execution);
+      const executedResults = await executeApprovalBatch2(decisions);
+      const approvalInput = {
+        type: "approval",
+        approvals: executedResults
+      };
+      const approvalMessages = [approvalInput];
+      {
+        const { consumeQueuedSkillContent: consumeQueuedSkillContent2 } = await Promise.resolve().then(() => (init_skillContentRegistry(), exports_skillContentRegistry));
+        const skillContents = consumeQueuedSkillContent2();
+        if (skillContents.length > 0) {
+          approvalMessages.push({
+            role: "user",
+            content: skillContents.map((sc) => ({
+              type: "text",
+              text: sc.content
+            }))
+          });
+        }
+      }
+      const approvalStream = await sendMessageStream(conversationId, approvalMessages, { agentId: agent.id });
+      await drainStreamWithResume(approvalStream, createBuffers(agent.id), () => {});
+    }
+  };
   const rl = readline.createInterface({
     input: process.stdin,
     terminal: false
@@ -66142,7 +66666,7 @@ async function runBidirectionalMode(agent, conversationId, _client, _outputForma
             response: {
               agent_id: agent.id,
               model: agent.llm_config?.model,
-              tools: agent.tools?.map((t) => t.name) || []
+              tools: availableTools
             }
           },
           session_id: sessionId,
@@ -66164,6 +66688,54 @@ async function runBidirectionalMode(agent, conversationId, _client, _outputForma
           uuid: crypto.randomUUID()
         };
         console.log(JSON.stringify(interruptResponse));
+      } else if (subtype === "register_external_tools") {
+        const toolsRequest = message.request;
+        const tools = toolsRequest.tools ?? [];
+        registerExternalTools(tools);
+        setExternalToolExecutor(async (toolCallId, toolName, input) => {
+          const execRequest = {
+            type: "control_request",
+            request_id: `ext-${toolCallId}`,
+            request: {
+              subtype: "execute_external_tool",
+              tool_call_id: toolCallId,
+              tool_name: toolName,
+              input
+            }
+          };
+          console.log(JSON.stringify(execRequest));
+          while (true) {
+            const line2 = await getNextLine();
+            if (line2 === null) {
+              return {
+                content: [{ type: "text", text: "stdin closed" }],
+                isError: true
+              };
+            }
+            if (!line2.trim())
+              continue;
+            try {
+              const msg = JSON.parse(line2);
+              if (msg.type === "control_response" && msg.response?.subtype === "external_tool_result" && msg.response?.tool_call_id === toolCallId) {
+                return {
+                  content: msg.response.content ?? [{ type: "text", text: "" }],
+                  isError: msg.response.is_error ?? false
+                };
+              }
+            } catch {}
+          }
+        });
+        const registerResponse = {
+          type: "control_response",
+          response: {
+            subtype: "success",
+            request_id: requestId ?? "",
+            response: { registered: tools.length }
+          },
+          session_id: sessionId,
+          uuid: crypto.randomUUID()
+        };
+        console.log(JSON.stringify(registerResponse));
       } else {
         const errorResponse = {
           type: "control_response",
@@ -66232,9 +66804,40 @@ ${enrichedContent}`;
               ];
             }
           }
-          const stream2 = await sendMessageStream(conversationId, currentInput, {
-            agentId: agent.id
-          });
+          let stream2;
+          try {
+            stream2 = await sendMessageStream(conversationId, currentInput, {
+              agentId: agent.id
+            });
+          } catch (preStreamError) {
+            let errorDetail = "";
+            if (preStreamError instanceof APIError2 && preStreamError.error && typeof preStreamError.error === "object") {
+              const errObj = preStreamError.error;
+              if (errObj.error && typeof errObj.error === "object" && "detail" in errObj.error) {
+                const nested = errObj.error;
+                errorDetail = typeof nested.detail === "string" ? nested.detail : "";
+              }
+              if (!errorDetail && typeof errObj.detail === "string") {
+                errorDetail = errObj.detail;
+              }
+            }
+            if (!errorDetail && preStreamError instanceof Error) {
+              errorDetail = preStreamError.message;
+            }
+            if (isApprovalPendingError(errorDetail)) {
+              const recoveryMsg = {
+                type: "recovery",
+                recovery_type: "approval_pending",
+                message: "Detected pending approval conflict on send; resolving before retry",
+                session_id: sessionId,
+                uuid: `recovery-bidir-${crypto.randomUUID()}`
+              };
+              console.log(JSON.stringify(recoveryMsg));
+              await resolveAllPendingApprovals();
+              continue;
+            }
+            throw preStreamError;
+          }
           const streamJsonHook = ({
             chunk,
             shouldOutput,
@@ -66302,6 +66905,7 @@ ${enrichedContent}`;
               break;
             }
             const { autoAllowed, autoDenied, needsUserInput } = await classifyApprovals(approvals, {
+              alwaysRequiresUserInput: isInteractiveApprovalTool,
               requireArgsForAutoApprove: true,
               missingNameReason: "Tool call incomplete - missing name"
             });
@@ -66459,6 +67063,7 @@ var init_headless = __esm(async () => {
   init_model();
   init_errorFormatter();
   init_constants();
+  init_interactivePolicy();
   init_timing();
   await __promiseAll([
     init_approval_recovery(),
@@ -66469,7 +67074,8 @@ var init_headless = __esm(async () => {
     init_accumulator(),
     init_approvalClassification(),
     init_stream(),
-    init_settings_manager()
+    init_settings_manager(),
+    init_manager3()
   ]);
 });
 
@@ -66720,10 +67326,10 @@ __export(exports_settings, {
   loadProjectSettings: () => loadProjectSettings,
   getSetting: () => getSetting
 });
-import { homedir as homedir12 } from "node:os";
+import { homedir as homedir13 } from "node:os";
 import { join as join20 } from "node:path";
 function getSettingsPath() {
-  return join20(homedir12(), ".letta", "settings.json");
+  return join20(homedir13(), ".letta", "settings.json");
 }
 async function loadSettings() {
   const settingsPath = getSettingsPath();
@@ -68371,7 +68977,9 @@ function formatArgsDisplay(argsJson, toolName) {
   return { display, parsed };
 }
 var isRecord3 = (v) => typeof v === "object" && v !== null;
-var init_formatArgsDisplay = () => {};
+var init_formatArgsDisplay = __esm(async () => {
+  await init_toolNameMapping();
+});
 
 // node_modules/diff/libesm/diff/base.js
 class Diff {
@@ -70249,11 +70857,11 @@ function getFileEditHeader(toolName, toolArgs) {
 }
 var import_react33, jsx_dev_runtime14, SOLID_LINE5 = "─", DOTTED_LINE2 = "╌", ApprovalPreview;
 var init_ApprovalPreview = __esm(async () => {
-  init_formatArgsDisplay();
   init_useTerminalWidth();
   init_colors();
   await __promiseAll([
     init_build2(),
+    init_formatArgsDisplay(),
     init_AdvancedDiffRenderer(),
     init_BashPreview(),
     init_PlanPreview(),
@@ -70962,13 +71570,13 @@ function getDiffKind(toolName) {
 var import_react38, jsx_dev_runtime17, SOLID_LINE8 = "─", DOTTED_LINE3 = "╌", InlineFileEditApproval;
 var init_InlineFileEditApproval = __esm(async () => {
   init_diff2();
-  init_formatArgsDisplay();
   init_useProgressIndicator();
   init_useTerminalWidth();
   init_useTextInputCursor();
   init_colors();
   await __promiseAll([
     init_build2(),
+    init_formatArgsDisplay(),
     init_AdvancedDiffRenderer(),
     init_Text2()
   ]);
@@ -72543,6 +73151,7 @@ function getQuestions(approval) {
 var import_react43, jsx_dev_runtime22, ApprovalSwitch;
 var init_ApprovalSwitch = __esm(async () => {
   await __promiseAll([
+    init_toolNameMapping(),
     init_InlineBashApproval(),
     init_InlineEnterPlanModeApproval(),
     init_InlineFileEditApproval(),
@@ -72717,8 +73326,9 @@ function AnimationProvider({
   children,
   shouldAnimate
 }) {
+  const contextValue = import_react45.useMemo(() => ({ shouldAnimate }), [shouldAnimate]);
   return /* @__PURE__ */ jsx_dev_runtime24.jsxDEV(AnimationContext.Provider, {
-    value: { shouldAnimate },
+    value: contextValue,
     children
   }, undefined, false, undefined, this);
 }
@@ -72774,11 +73384,18 @@ var init_CollapsedOutputDisplay = __esm(async () => {
   jsx_dev_runtime26 = __toESM(require_jsx_dev_runtime(), 1);
   CollapsedOutputDisplay = import_react47.memo(({
     output,
-    maxLines = DEFAULT_COLLAPSED_LINES
+    maxLines = DEFAULT_COLLAPSED_LINES,
+    maxChars
   }) => {
     const columns = useTerminalWidth();
     const contentWidth = Math.max(0, columns - PREFIX_WIDTH);
-    const lines = output.split(`
+    let displayOutput = output;
+    let clippedByChars = false;
+    if (typeof maxChars === "number" && maxChars > 0 && output.length > maxChars) {
+      displayOutput = `${output.slice(0, maxChars)}…`;
+      clippedByChars = true;
+    }
+    const lines = displayOutput.split(`
 `);
     if (lines.length > 0 && lines[lines.length - 1] === "") {
       lines.pop();
@@ -72853,6 +73470,26 @@ var init_CollapsedOutputDisplay = __esm(async () => {
               }, undefined, true, undefined, this)
             }, undefined, false, undefined, this)
           ]
+        }, undefined, true, undefined, this),
+        clippedByChars && /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Box_default, {
+          flexDirection: "row",
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Box_default, {
+              width: PREFIX_WIDTH,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text2, {
+                children: "     "
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime26.jsxDEV(Text2, {
+                dimColor: true,
+                children: "… output clipped"
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this)
+          ]
         }, undefined, true, undefined, this)
       ]
     }, undefined, true, undefined, this);
@@ -74896,7 +75533,7 @@ import {
   readFileSync as readFileSync6,
   writeFileSync as writeFileSync5
 } from "node:fs";
-import { homedir as homedir13, platform as platform3 } from "node:os";
+import { homedir as homedir14, platform as platform3 } from "node:os";
 import { dirname as dirname12, join as join22 } from "node:path";
 function detectTerminalType() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
@@ -74929,7 +75566,7 @@ function getKeybindingsPath(terminal) {
   }[terminal];
   const os5 = platform3();
   if (os5 === "darwin") {
-    return join22(homedir13(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join22(homedir14(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os5 === "win32") {
     const appData = process.env.APPDATA;
@@ -74938,7 +75575,7 @@ function getKeybindingsPath(terminal) {
     return join22(appData, appName, "User", "keybindings.json");
   }
   if (os5 === "linux") {
-    return join22(homedir13(), ".config", appName, "User", "keybindings.json");
+    return join22(homedir14(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -75095,10 +75732,10 @@ function getWezTermConfigPath() {
     if (existsSync13(xdgPath))
       return xdgPath;
   }
-  const configPath = join22(homedir13(), ".config", "wezterm", "wezterm.lua");
+  const configPath = join22(homedir14(), ".config", "wezterm", "wezterm.lua");
   if (existsSync13(configPath))
     return configPath;
-  return join22(homedir13(), ".wezterm.lua");
+  return join22(homedir14(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists(configPath) {
   if (!existsSync13(configPath))
@@ -80501,9 +81138,15 @@ function SlashCommandAutocomplete({
     manageActiveState: false
   });
   import_react64.useLayoutEffect(() => {
-    const isActive = matches.length > 0 || showNoMatches;
+    const queryLength = queryInfo?.query.length ?? 0;
+    const isActive = !hideAutocomplete && (matches.length > 0 || queryLength > 0);
     onActiveChange?.(isActive);
-  }, [matches.length, showNoMatches, onActiveChange]);
+  }, [
+    hideAutocomplete,
+    matches.length,
+    onActiveChange,
+    queryInfo?.query.length
+  ]);
   if (!currentInput.startsWith("/")) {
     return null;
   }
@@ -80725,7 +81368,8 @@ var init_ShimmerText = __esm(async () => {
     color = colors.status.processing,
     boldPrefix,
     message,
-    shimmerOffset
+    shimmerOffset,
+    wrap
   }) {
     const fullText = `${boldPrefix ? `${boldPrefix} ` : ""}${message}…`;
     const prefixLength = boldPrefix ? boldPrefix.length + 1 : 0;
@@ -80740,6 +81384,7 @@ var init_ShimmerText = __esm(async () => {
       return isInPrefix ? source_default.bold(styledChar) : styledChar;
     }).join("");
     return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text2, {
+      wrap,
       children: shimmerText
     }, undefined, false, undefined, this);
   });
@@ -80748,6 +81393,15 @@ var init_ShimmerText = __esm(async () => {
 // src/cli/components/InputRich.tsx
 import { EventEmitter as EventEmitter5 } from "node:events";
 import { stdin } from "node:process";
+function truncateEnd(value, maxChars) {
+  if (maxChars <= 0)
+    return "";
+  if (value.length <= maxChars)
+    return value;
+  if (maxChars <= 3)
+    return value.slice(0, maxChars);
+  return `${value.slice(0, maxChars - 3)}...`;
+}
 function getVisualLines(text, lineWidth) {
   const lines = [];
   let lineStart = 0;
@@ -80813,7 +81467,9 @@ function Input({
   onPasteError,
   restoredInput,
   onRestoredInputConsumed,
-  networkPhase = null
+  networkPhase = null,
+  terminalWidth,
+  shouldAnimate = true
 }) {
   const [value, setValue] = import_react68.useState("");
   const [escapePressed, setEscapePressed] = import_react68.useState(false);
@@ -80825,7 +81481,7 @@ function Input({
   const [isAutocompleteActive, setIsAutocompleteActive] = import_react68.useState(false);
   const [cursorPos, setCursorPos] = import_react68.useState(undefined);
   const [currentCursorPosition, setCurrentCursorPosition] = import_react68.useState(0);
-  const columns = useTerminalWidth();
+  const columns = terminalWidth;
   const contentWidth = Math.max(0, columns - 2);
   const interactionEnabled = visible && inputEnabled;
   const reserveInputSpace = !collapseInputWhenDisabled;
@@ -80834,6 +81490,38 @@ function Input({
     return Math.max(1, getVisualLines(value, contentWidth).length);
   }, [value, contentWidth]);
   const inputChromeHeight = inputRowLines + 3;
+  const computedFooterRightColumnWidth = import_react68.useMemo(() => Math.max(28, Math.min(72, Math.floor(columns * 0.45))), [columns]);
+  const [footerRightColumnWidth, setFooterRightColumnWidth] = import_react68.useState(computedFooterRightColumnWidth);
+  const debugFlicker = process.env.LETTA_DEBUG_FLICKER === "1";
+  import_react68.useEffect(() => {
+    if (!streaming) {
+      setFooterRightColumnWidth(computedFooterRightColumnWidth);
+      return;
+    }
+    if (computedFooterRightColumnWidth >= footerRightColumnWidth) {
+      const growthDelta = computedFooterRightColumnWidth - footerRightColumnWidth;
+      if (debugFlicker && growthDelta >= FOOTER_WIDTH_STREAMING_DELTA) {
+        console.error(`[debug:flicker:footer-width] defer growth ${footerRightColumnWidth} -> ${computedFooterRightColumnWidth} (delta=${growthDelta})`);
+      }
+      return;
+    }
+    const shrinkDelta = footerRightColumnWidth - computedFooterRightColumnWidth;
+    if (shrinkDelta < FOOTER_WIDTH_STREAMING_DELTA) {
+      if (debugFlicker && shrinkDelta > 0) {
+        console.error(`[debug:flicker:footer-width] ignore minor shrink ${footerRightColumnWidth} -> ${computedFooterRightColumnWidth} (delta=${shrinkDelta})`);
+      }
+      return;
+    }
+    if (debugFlicker) {
+      console.error(`[debug:flicker:footer-width] shrink ${footerRightColumnWidth} -> ${computedFooterRightColumnWidth} (delta=${shrinkDelta})`);
+    }
+    setFooterRightColumnWidth(computedFooterRightColumnWidth);
+  }, [
+    streaming,
+    computedFooterRightColumnWidth,
+    footerRightColumnWidth,
+    debugFlicker
+  ]);
   const [history, setHistory] = import_react68.useState([]);
   const [historyIndex, setHistoryIndex] = import_react68.useState(-1);
   const [temporaryInput, setTemporaryInput] = import_react68.useState("");
@@ -80849,18 +81537,18 @@ function Input({
       onRestoredInputConsumed?.();
     }
   }, [restoredInput, value, onRestoredInputConsumed]);
-  const handleBangAtEmpty = () => {
+  const handleBangAtEmpty = import_react68.useCallback(() => {
     if (isBashMode)
       return false;
     setIsBashMode(true);
     return true;
-  };
-  const handleBackspaceAtEmpty = () => {
+  }, [isBashMode]);
+  const handleBackspaceAtEmpty = import_react68.useCallback(() => {
     if (!isBashMode)
       return false;
     setIsBashMode(false);
     return true;
-  };
+  }, [isBashMode]);
   import_react68.useEffect(() => {
     if (cursorPos !== undefined) {
       const timer = setTimeout(() => setCursorPos(undefined), 0);
@@ -80881,9 +81569,6 @@ function Input({
       setCurrentMode(externalMode);
     }
   }, [externalMode]);
-  const [shimmerOffset, setShimmerOffset] = import_react68.useState(-3);
-  const [elapsedMs, setElapsedMs] = import_react68.useState(0);
-  const streamStartRef = import_react68.useRef(null);
   import_react68.useEffect(() => {
     if (!interactionEnabled) {
       setIsAutocompleteActive(false);
@@ -81102,35 +81787,7 @@ function Input({
         clearTimeout(ctrlCTimerRef.current);
     };
   }, []);
-  import_react68.useEffect(() => {
-    if (!streaming || !visible)
-      return;
-    const id = setInterval(() => {
-      setShimmerOffset((prev) => {
-        const prefixLen = agentName ? agentName.length + 1 : 0;
-        const len = prefixLen + thinkingMessage.length;
-        const next = prev + 1;
-        return next > len + 3 ? -3 : next;
-      });
-    }, 120);
-    return () => clearInterval(id);
-  }, [streaming, thinkingMessage, visible, agentName]);
-  import_react68.useEffect(() => {
-    if (streaming && visible) {
-      if (streamStartRef.current === null) {
-        streamStartRef.current = performance.now();
-      }
-      const id = setInterval(() => {
-        if (streamStartRef.current !== null) {
-          setElapsedMs(performance.now() - streamStartRef.current);
-        }
-      }, 1000);
-      return () => clearInterval(id);
-    }
-    streamStartRef.current = null;
-    setElapsedMs(0);
-  }, [streaming, visible]);
-  const handleSubmit = async () => {
+  const handleSubmit = import_react68.useCallback(async () => {
     if (isAutocompleteActive) {
       return;
     }
@@ -81140,9 +81797,11 @@ function Input({
         return;
       if (bashRunning)
         return;
-      if (previousValue.trim() !== history[history.length - 1]) {
-        setHistory([...history, previousValue]);
-      }
+      setHistory((prev) => {
+        if (previousValue.trim() === prev[prev.length - 1])
+          return prev;
+        return [...prev, previousValue];
+      });
       setHistoryIndex(-1);
       setTemporaryInput("");
       setValue("");
@@ -81151,8 +81810,12 @@ function Input({
       }
       return;
     }
-    if (previousValue.trim() && previousValue !== history[history.length - 1]) {
-      setHistory([...history, previousValue]);
+    if (previousValue.trim()) {
+      setHistory((prev) => {
+        if (previousValue === prev[prev.length - 1])
+          return prev;
+        return [...prev, previousValue];
+      });
     }
     setHistoryIndex(-1);
     setTemporaryInput("");
@@ -81161,8 +81824,15 @@ function Input({
     if (!result.submitted) {
       setValue(previousValue);
     }
-  };
-  const handleFileSelect = (selectedPath) => {
+  }, [
+    isAutocompleteActive,
+    value,
+    isBashMode,
+    bashRunning,
+    onBashSubmit,
+    onSubmit
+  ]);
+  const handleFileSelect = import_react68.useCallback((selectedPath) => {
     const atIndex = value.lastIndexOf("@");
     if (atIndex === -1)
       return;
@@ -81181,21 +81851,25 @@ function Input({
     }
     setValue(newValue);
     setCursorPos(newCursorPos);
-  };
-  const handleCommandSelect = async (selectedCommand) => {
+  }, [value]);
+  const handleCommandSelect = import_react68.useCallback(async (selectedCommand) => {
     const commandToSubmit = selectedCommand.trim();
-    if (commandToSubmit && commandToSubmit !== history[history.length - 1]) {
-      setHistory([...history, commandToSubmit]);
+    if (commandToSubmit) {
+      setHistory((prev) => {
+        if (commandToSubmit === prev[prev.length - 1])
+          return prev;
+        return [...prev, commandToSubmit];
+      });
     }
     setHistoryIndex(-1);
     setTemporaryInput("");
     setValue("");
     await onSubmit(commandToSubmit);
-  };
-  const handleCommandAutocomplete = (selectedCommand) => {
+  }, [onSubmit]);
+  const handleCommandAutocomplete = import_react68.useCallback((selectedCommand) => {
     setValue(selectedCommand);
     setCursorPos(selectedCommand.length);
-  };
+  }, []);
   const modeInfo = import_react68.useMemo(() => {
     if (ralphPending) {
       if (ralphPendingYolo) {
@@ -81237,164 +81911,145 @@ function Input({
         return null;
     }
   }, [ralphPending, ralphPendingYolo, ralphActive, currentMode]);
-  const estimatedTokens = charsToTokens(tokenCount);
-  const totalElapsedMs = elapsedBaseMs + elapsedMs;
-  const shouldShowTokenCount = streaming && estimatedTokens > TOKEN_DISPLAY_THRESHOLD;
-  const shouldShowElapsed = streaming && totalElapsedMs > ELAPSED_DISPLAY_THRESHOLD_MS;
-  const elapsedLabel = formatElapsedLabel(totalElapsedMs);
-  const networkArrow = import_react68.useMemo(() => {
-    if (!networkPhase)
-      return "";
-    if (networkPhase === "upload")
-      return "↑";
-    if (networkPhase === "download")
-      return "↑";
-    return "↑̸";
-  }, [networkPhase]);
-  const showErrorArrow = networkArrow === "↑̸";
-  const statusHintText = import_react68.useMemo(() => {
-    const hintColor = source_default.hex(colors.subagent.hint);
-    const hintBold = hintColor.bold;
-    const parts = [];
-    if (shouldShowElapsed) {
-      parts.push(elapsedLabel);
-    }
-    if (shouldShowTokenCount) {
-      parts.push(`${formatCompact(estimatedTokens)}${networkArrow ? ` ${networkArrow}` : ""}`);
-    } else if (showErrorArrow) {
-      parts.push(networkArrow);
-    }
-    const suffix = `${parts.length > 0 ? ` · ${parts.join(" · ")}` : ""})`;
-    if (interruptRequested) {
-      return hintColor(` (interrupting${suffix}`);
-    }
-    return hintColor(" (") + hintBold("esc") + hintColor(` to interrupt${suffix}`);
+  const horizontalLine = import_react68.useMemo(() => "─".repeat(columns), [columns]);
+  const lowerPane = import_react68.useMemo(() => {
+    return /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(jsx_dev_runtime45.Fragment, {
+      children: [
+        messageQueue && messageQueue.length > 0 && /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(QueuedMessages, {
+          messages: messageQueue
+        }, undefined, false, undefined, this),
+        interactionEnabled ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+          flexDirection: "column",
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+              dimColor: !isBashMode,
+              color: isBashMode ? colors.bash.border : undefined,
+              children: horizontalLine
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+              flexDirection: "row",
+              children: [
+                /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+                  width: 2,
+                  flexShrink: 0,
+                  children: [
+                    /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+                      color: isBashMode ? colors.bash.prompt : colors.input.prompt,
+                      children: isBashMode ? "!" : ">"
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+                      children: " "
+                    }, undefined, false, undefined, this)
+                  ]
+                }, undefined, true, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+                  flexGrow: 1,
+                  width: contentWidth,
+                  children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(PasteAwareTextInput, {
+                    value,
+                    onChange: setValue,
+                    onSubmit: handleSubmit,
+                    cursorPosition: cursorPos,
+                    onCursorMove: setCurrentCursorPosition,
+                    focus: interactionEnabled && !onEscapeCancel,
+                    onBangAtEmpty: handleBangAtEmpty,
+                    onBackspaceAtEmpty: handleBackspaceAtEmpty,
+                    onPasteError
+                  }, undefined, false, undefined, this)
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+              dimColor: !isBashMode,
+              color: isBashMode ? colors.bash.border : undefined,
+              children: horizontalLine
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(InputAssist, {
+              currentInput: value,
+              cursorPosition: currentCursorPosition,
+              onFileSelect: handleFileSelect,
+              onCommandSelect: handleCommandSelect,
+              onCommandAutocomplete: handleCommandAutocomplete,
+              onAutocompleteActiveChange: setIsAutocompleteActive,
+              agentId,
+              agentName,
+              serverUrl,
+              workingDirectory: process.cwd(),
+              conversationId
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(InputFooter, {
+              ctrlCPressed,
+              escapePressed,
+              isBashMode,
+              modeName: modeInfo?.name ?? null,
+              modeColor: modeInfo?.color ?? null,
+              showExitHint: ralphActive || ralphPending,
+              agentName,
+              currentModel,
+              isOpenAICodexProvider: currentModelProvider === OPENAI_CODEX_PROVIDER_NAME,
+              isByokProvider: currentModelProvider?.startsWith("lc-") || currentModelProvider === OPENAI_CODEX_PROVIDER_NAME,
+              hideFooter,
+              rightColumnWidth: footerRightColumnWidth
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this) : reserveInputSpace ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+          height: inputChromeHeight
+        }, undefined, false, undefined, this) : null
+      ]
+    }, undefined, true, undefined, this);
   }, [
-    shouldShowElapsed,
-    elapsedLabel,
-    shouldShowTokenCount,
-    estimatedTokens,
-    interruptRequested,
-    networkArrow,
-    showErrorArrow
+    messageQueue,
+    interactionEnabled,
+    isBashMode,
+    horizontalLine,
+    contentWidth,
+    value,
+    handleSubmit,
+    cursorPos,
+    onEscapeCancel,
+    handleBangAtEmpty,
+    handleBackspaceAtEmpty,
+    onPasteError,
+    currentCursorPosition,
+    handleFileSelect,
+    handleCommandSelect,
+    handleCommandAutocomplete,
+    agentId,
+    agentName,
+    serverUrl,
+    conversationId,
+    ctrlCPressed,
+    escapePressed,
+    modeInfo?.name,
+    modeInfo?.color,
+    ralphActive,
+    ralphPending,
+    currentModel,
+    currentModelProvider,
+    hideFooter,
+    footerRightColumnWidth,
+    reserveInputSpace,
+    inputChromeHeight
   ]);
-  const horizontalLine = import_react68.useMemo(() => "─".repeat(columns), [columns]);
   if (!visible) {
     return null;
   }
   return /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      streaming && /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-        flexDirection: "row",
-        marginBottom: 1,
-        children: [
-          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-            width: 2,
-            flexShrink: 0,
-            children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-              color: colors.status.processing,
-              children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Spinner2, {
-                type: "layer"
-              }, undefined, false, undefined, this)
-            }, undefined, false, undefined, this)
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-            flexGrow: 1,
-            flexDirection: "row",
-            children: [
-              /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(ShimmerText, {
-                boldPrefix: agentName || undefined,
-                message: thinkingMessage,
-                shimmerOffset
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-                children: statusHintText
-              }, undefined, false, undefined, this)
-            ]
-          }, undefined, true, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
-      messageQueue && messageQueue.length > 0 && /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(QueuedMessages, {
-        messages: messageQueue
+      /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(StreamingStatus, {
+        streaming,
+        visible,
+        tokenCount,
+        elapsedBaseMs,
+        thinkingMessage,
+        agentName,
+        interruptRequested,
+        networkPhase,
+        terminalWidth: columns,
+        shouldAnimate
       }, undefined, false, undefined, this),
-      interactionEnabled ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-        flexDirection: "column",
-        children: [
-          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-            dimColor: !isBashMode,
-            color: isBashMode ? colors.bash.border : undefined,
-            children: horizontalLine
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-            flexDirection: "row",
-            children: [
-              /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-                width: 2,
-                flexShrink: 0,
-                children: [
-                  /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-                    color: isBashMode ? colors.bash.prompt : colors.input.prompt,
-                    children: isBashMode ? "!" : ">"
-                  }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-                    children: " "
-                  }, undefined, false, undefined, this)
-                ]
-              }, undefined, true, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-                flexGrow: 1,
-                width: contentWidth,
-                children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(PasteAwareTextInput, {
-                  value,
-                  onChange: setValue,
-                  onSubmit: handleSubmit,
-                  cursorPosition: cursorPos,
-                  onCursorMove: setCurrentCursorPosition,
-                  focus: interactionEnabled && !onEscapeCancel,
-                  onBangAtEmpty: handleBangAtEmpty,
-                  onBackspaceAtEmpty: handleBackspaceAtEmpty,
-                  onPasteError
-                }, undefined, false, undefined, this)
-              }, undefined, false, undefined, this)
-            ]
-          }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-            dimColor: !isBashMode,
-            color: isBashMode ? colors.bash.border : undefined,
-            children: horizontalLine
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(InputAssist, {
-            currentInput: value,
-            cursorPosition: currentCursorPosition,
-            onFileSelect: handleFileSelect,
-            onCommandSelect: handleCommandSelect,
-            onCommandAutocomplete: handleCommandAutocomplete,
-            onAutocompleteActiveChange: setIsAutocompleteActive,
-            agentId,
-            agentName,
-            serverUrl,
-            workingDirectory: process.cwd(),
-            conversationId
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(InputFooter, {
-            ctrlCPressed,
-            escapePressed,
-            isBashMode,
-            modeName: modeInfo?.name ?? null,
-            modeColor: modeInfo?.color ?? null,
-            showExitHint: ralphActive || ralphPending,
-            agentName,
-            currentModel,
-            isOpenAICodexProvider: currentModelProvider === OPENAI_CODEX_PROVIDER_NAME,
-            isByokProvider: currentModelProvider?.startsWith("lc-") || currentModelProvider === OPENAI_CODEX_PROVIDER_NAME,
-            isAutocompleteActive,
-            hideFooter
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this) : reserveInputSpace ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-        height: inputChromeHeight
-      }, undefined, false, undefined, this) : null
+      lowerPane
     ]
   }, undefined, true, undefined, this);
 }
@@ -81417,14 +82072,13 @@ function formatElapsedLabel(ms) {
   }
   return seconds > 0 ? `${minutes}m ${seconds}s` : `${minutes}m`;
 }
-var import_react68, jsx_dev_runtime45, Spinner2, ESC_CLEAR_WINDOW_MS = 2500, InputFooter;
+var import_react68, jsx_dev_runtime45, Spinner2, ESC_CLEAR_WINDOW_MS = 2500, FOOTER_WIDTH_STREAMING_DELTA = 2, InputFooter, StreamingStatus;
 var init_InputRich = __esm(async () => {
   init_source();
   init_oauth();
   init_constants();
   init_mode();
   init_mode2();
-  init_useTerminalWidth();
   init_colors();
   await __promiseAll([
     init_build2(),
@@ -81451,78 +82105,249 @@ var init_InputRich = __esm(async () => {
     currentModel,
     isOpenAICodexProvider,
     isByokProvider,
-    isAutocompleteActive,
-    hideFooter
+    hideFooter,
+    rightColumnWidth
+  }) {
+    const hideFooterContent = hideFooter;
+    const maxAgentChars = Math.max(10, Math.floor(rightColumnWidth * 0.45));
+    const displayAgentName = truncateEnd(agentName || "Unnamed", maxAgentChars);
+    const byokExtraChars = isByokProvider ? 2 : 0;
+    const reservedChars = displayAgentName.length + byokExtraChars + 4;
+    const maxModelChars = Math.max(8, rightColumnWidth - reservedChars);
+    const displayModel = truncateEnd(currentModel ?? "unknown", maxModelChars);
+    const rightTextLength = displayAgentName.length + displayModel.length + byokExtraChars + 3;
+    const rightPrefixSpaces = Math.max(0, rightColumnWidth - rightTextLength);
+    const rightLabel = import_react68.useMemo(() => {
+      const parts = [];
+      parts.push(" ".repeat(rightPrefixSpaces));
+      parts.push(source_default.hex(colors.footer.agentName)(displayAgentName));
+      parts.push(source_default.dim(" ["));
+      parts.push(source_default.dim(displayModel));
+      if (isByokProvider) {
+        parts.push(source_default.dim(" "));
+        parts.push(isOpenAICodexProvider ? source_default.hex("#74AA9C")("▲") : source_default.yellow("▲"));
+      }
+      parts.push(source_default.dim("]"));
+      return parts.join("");
+    }, [
+      rightPrefixSpaces,
+      displayAgentName,
+      displayModel,
+      isByokProvider,
+      isOpenAICodexProvider
+    ]);
+    return /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+      flexDirection: "row",
+      marginBottom: 1,
+      children: [
+        /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+          flexGrow: 1,
+          paddingRight: 1,
+          children: hideFooterContent ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+            children: " "
+          }, undefined, false, undefined, this) : ctrlCPressed ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+            dimColor: true,
+            children: "Press CTRL-C again to exit"
+          }, undefined, false, undefined, this) : escapePressed ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+            dimColor: true,
+            children: "Press Esc again to clear"
+          }, undefined, false, undefined, this) : isBashMode ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+                color: colors.bash.prompt,
+                children: "⏵⏵ bash mode"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+                color: colors.bash.prompt,
+                dimColor: true,
+                children: [
+                  " ",
+                  "(backspace to exit)"
+                ]
+              }, undefined, true, undefined, this)
+            ]
+          }, undefined, true, undefined, this) : modeName && modeColor ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+                color: modeColor,
+                children: [
+                  "⏵⏵ ",
+                  modeName
+                ]
+              }, undefined, true, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+                color: modeColor,
+                dimColor: true,
+                children: [
+                  " ",
+                  "(shift+tab to ",
+                  showExitHint ? "exit" : "cycle",
+                  ")"
+                ]
+              }, undefined, true, undefined, this)
+            ]
+          }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+            dimColor: true,
+            children: "Press / for commands"
+          }, undefined, false, undefined, this)
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+          width: rightColumnWidth,
+          flexShrink: 0,
+          children: hideFooterContent ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+            children: " ".repeat(rightColumnWidth)
+          }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+            children: rightLabel
+          }, undefined, false, undefined, this)
+        }, undefined, false, undefined, this)
+      ]
+    }, undefined, true, undefined, this);
+  });
+  StreamingStatus = import_react68.memo(function StreamingStatus2({
+    streaming,
+    visible,
+    tokenCount,
+    elapsedBaseMs,
+    thinkingMessage,
+    agentName,
+    interruptRequested,
+    networkPhase,
+    terminalWidth,
+    shouldAnimate
   }) {
-    if (hideFooter || isAutocompleteActive) {
+    const [shimmerOffset, setShimmerOffset] = import_react68.useState(-3);
+    const [elapsedMs, setElapsedMs] = import_react68.useState(0);
+    const streamStartRef = import_react68.useRef(null);
+    import_react68.useEffect(() => {
+      if (!streaming || !visible || !shouldAnimate)
+        return;
+      const id = setInterval(() => {
+        setShimmerOffset((prev) => {
+          const prefixLen = agentName ? agentName.length + 1 : 0;
+          const len = prefixLen + thinkingMessage.length;
+          const next = prev + 1;
+          return next > len + 3 ? -3 : next;
+        });
+      }, 120);
+      return () => clearInterval(id);
+    }, [streaming, thinkingMessage, visible, agentName, shouldAnimate]);
+    import_react68.useEffect(() => {
+      if (!shouldAnimate) {
+        setShimmerOffset(-3);
+      }
+    }, [shouldAnimate]);
+    import_react68.useEffect(() => {
+      if (streaming && visible) {
+        if (streamStartRef.current === null) {
+          streamStartRef.current = performance.now();
+        }
+        const id = setInterval(() => {
+          if (streamStartRef.current !== null) {
+            setElapsedMs(performance.now() - streamStartRef.current);
+          }
+        }, 1000);
+        return () => clearInterval(id);
+      }
+      streamStartRef.current = null;
+      setElapsedMs(0);
+    }, [streaming, visible]);
+    const estimatedTokens = charsToTokens(tokenCount);
+    const totalElapsedMs = elapsedBaseMs + elapsedMs;
+    const shouldShowTokenCount = streaming && estimatedTokens > TOKEN_DISPLAY_THRESHOLD;
+    const shouldShowElapsed = streaming && totalElapsedMs > ELAPSED_DISPLAY_THRESHOLD_MS;
+    const elapsedLabel = formatElapsedLabel(totalElapsedMs);
+    const networkArrow = import_react68.useMemo(() => {
+      if (!networkPhase)
+        return "";
+      if (networkPhase === "upload")
+        return "↑";
+      if (networkPhase === "download")
+        return "↑";
+      return "↑̸";
+    }, [networkPhase]);
+    const showErrorArrow = networkArrow === "↑̸";
+    const statusContentWidth = Math.max(0, terminalWidth - 2);
+    const minMessageWidth = 12;
+    const statusHintParts = import_react68.useMemo(() => {
+      const parts = [];
+      if (shouldShowElapsed) {
+        parts.push(elapsedLabel);
+      }
+      if (shouldShowTokenCount) {
+        parts.push(`${formatCompact(estimatedTokens)}${networkArrow ? ` ${networkArrow}` : ""}`);
+      } else if (showErrorArrow) {
+        parts.push(networkArrow);
+      }
+      return parts;
+    }, [
+      shouldShowElapsed,
+      elapsedLabel,
+      shouldShowTokenCount,
+      estimatedTokens,
+      networkArrow,
+      showErrorArrow
+    ]);
+    const statusHintSuffix = statusHintParts.length ? ` · ${statusHintParts.join(" · ")}` : "";
+    const statusHintPlain = interruptRequested ? ` (interrupting${statusHintSuffix})` : ` (esc to interrupt${statusHintSuffix})`;
+    const statusHintWidth = Array.from(statusHintPlain).length;
+    const maxHintWidth = Math.max(0, statusContentWidth - minMessageWidth);
+    const hintColumnWidth = Math.max(0, Math.min(statusHintWidth, maxHintWidth));
+    const maxMessageWidth = Math.max(0, statusContentWidth - hintColumnWidth);
+    const statusLabel = `${agentName ? `${agentName} ` : ""}${thinkingMessage}…`;
+    const statusLabelWidth = Array.from(statusLabel).length;
+    const messageColumnWidth = Math.max(0, Math.min(maxMessageWidth, Math.max(minMessageWidth, statusLabelWidth)));
+    const statusHintText = import_react68.useMemo(() => {
+      const hintColor = source_default.hex(colors.subagent.hint);
+      const hintBold = hintColor.bold;
+      const suffix = `${statusHintSuffix})`;
+      if (interruptRequested) {
+        return hintColor(` (interrupting${suffix}`);
+      }
+      return hintColor(" (") + hintBold("esc") + hintColor(` to interrupt${suffix}`);
+    }, [interruptRequested, statusHintSuffix]);
+    if (!streaming || !visible) {
       return null;
     }
     return /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-      justifyContent: "space-between",
+      flexDirection: "row",
       marginBottom: 1,
       children: [
-        ctrlCPressed ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-          dimColor: true,
-          children: "Press CTRL-C again to exit"
-        }, undefined, false, undefined, this) : escapePressed ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-          dimColor: true,
-          children: "Press Esc again to clear"
-        }, undefined, false, undefined, this) : isBashMode ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-          children: [
-            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-              color: colors.bash.prompt,
-              children: "⏵⏵ bash mode"
-            }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-              color: colors.bash.prompt,
-              dimColor: true,
-              children: [
-                " ",
-                "(backspace to exit)"
-              ]
-            }, undefined, true, undefined, this)
-          ]
-        }, undefined, true, undefined, this) : modeName && modeColor ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-          children: [
-            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-              color: modeColor,
-              children: [
-                "⏵⏵ ",
-                modeName
-              ]
-            }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-              color: modeColor,
-              dimColor: true,
-              children: [
-                " ",
-                "(shift+tab to ",
-                showExitHint ? "exit" : "cycle",
-                ")"
-              ]
-            }, undefined, true, undefined, this)
-          ]
-        }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-          dimColor: true,
-          children: "Press / for commands"
+        /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+          width: 2,
+          flexShrink: 0,
+          children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+            color: colors.status.processing,
+            children: shouldAnimate ? /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Spinner2, {
+              type: "layer"
+            }, undefined, false, undefined, this) : "●"
+          }, undefined, false, undefined, this)
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+        /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+          width: statusContentWidth,
+          flexShrink: 0,
+          flexDirection: "row",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-              color: colors.footer.agentName,
-              children: agentName || "Unnamed"
+            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+              width: messageColumnWidth,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(ShimmerText, {
+                boldPrefix: agentName || undefined,
+                message: thinkingMessage,
+                shimmerOffset: shouldAnimate ? shimmerOffset : -3,
+                wrap: "truncate-end"
+              }, undefined, false, undefined, this)
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-              dimColor: true,
-              children: [
-                ` [${currentModel ?? "unknown"}`,
-                isByokProvider && /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
-                  color: isOpenAICodexProvider ? "#74AA9C" : "yellow",
-                  children: " ▲"
-                }, undefined, false, undefined, this),
-                "]"
-              ]
-            }, undefined, true, undefined, this)
+            hintColumnWidth > 0 && /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+              width: hintColumnWidth,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
+                wrap: "truncate-end",
+                children: statusHintText
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+              flexGrow: 1
+            }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this)
       ]
@@ -84640,22 +85465,22 @@ function ModelSelector({
   };
   const getCategoryDescription = (cat) => {
     if (cat === "server-recommended") {
-      return "Recommended models on the server";
+      return "Recommended models currently available for this account";
     }
     if (cat === "server-all") {
-      return "All models on the server";
+      return "All models currently available for this account";
     }
     if (cat === "supported") {
-      return isFreeTier ? "Upgrade your account to access more models" : "Recommended models on the Letta API";
+      return isFreeTier ? "Upgrade your account to access more models" : "Recommended Letta API models currently available for this account";
     }
     if (cat === "byok")
-      return "Recommended models via your API keys (use /connect to add more)";
+      return "Recommended models via your connected API keys (use /connect to add more)";
     if (cat === "byok-all")
-      return "All models via your API keys (use /connect to add more)";
+      return "All models via your connected API keys (use /connect to add more)";
     if (cat === "all") {
-      return isFreeTier ? "Upgrade your account to access more models" : "All models on the Letta API";
+      return isFreeTier ? "Upgrade your account to access more models" : "All Letta API models currently available for this account";
     }
-    return "All models on the Letta API";
+    return "All Letta API models currently available for this account";
   };
   const renderTabBar = () => /* @__PURE__ */ jsx_dev_runtime51.jsxDEV(Box_default, {
     flexDirection: "row",
@@ -84815,7 +85640,7 @@ function ModelSelector({
               currentList.length,
               " models",
               isCached ? " · cached" : "",
-              " · R to refresh"
+              " · R to refresh availability"
             ]
           }, undefined, true, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime51.jsxDEV(Text2, {
@@ -85431,11 +86256,11 @@ var init_byok_providers = __esm(async () => {
 
 // src/utils/aws-credentials.ts
 import { readFile as readFile12 } from "node:fs/promises";
-import { homedir as homedir14 } from "node:os";
+import { homedir as homedir15 } from "node:os";
 import { join as join26 } from "node:path";
 async function parseAwsCredentials() {
-  const credentialsPath = join26(homedir14(), ".aws", "credentials");
-  const configPath = join26(homedir14(), ".aws", "config");
+  const credentialsPath = join26(homedir15(), ".aws", "credentials");
+  const configPath = join26(homedir15(), ".aws", "config");
   const profiles = new Map;
   try {
     const content = await readFile12(credentialsPath, "utf-8");
@@ -88406,13 +89231,14 @@ function isShellTool2(name) {
 var import_react85, jsx_dev_runtime65, ToolCallMessage;
 var init_ToolCallMessageRich = __esm(async () => {
   init_constants();
-  init_formatArgsDisplay();
   init_subagentState();
   init_useTerminalWidth();
   init_colors();
   await __promiseAll([
     init_build2(),
     init_manager3(),
+    init_formatArgsDisplay(),
+    init_toolNameMapping(),
     init_Text2(),
     init_AdvancedDiffRenderer(),
     init_BlinkDot(),
@@ -89153,7 +89979,8 @@ var init_ToolCallMessageRich = __esm(async () => {
           streaming: line.streaming
         }, undefined, false, undefined, this),
         isShellTool2(rawName) && line.phase === "finished" && line.resultText && line.resultOk !== false && /* @__PURE__ */ jsx_dev_runtime65.jsxDEV(CollapsedOutputDisplay, {
-          output: line.resultText
+          output: line.resultText,
+          maxChars: 300
         }, undefined, false, undefined, this),
         (() => {
           const showDefaultResult = !isShellTool2(rawName) || line.phase === "finished" && line.resultOk === false || line.phase !== "running" && line.phase !== "finished";
@@ -90240,8 +91067,9 @@ function createSubagentGroupItem(taskToolCalls) {
     agents
   };
 }
-var init_subagentAggregation = __esm(() => {
+var init_subagentAggregation = __esm(async () => {
   init_subagentState();
+  await init_toolNameMapping();
 });
 
 // src/cli/helpers/subagentTurnStart.ts
@@ -90414,7 +91242,7 @@ __export(exports_shellAliases, {
   clearAliasCache: () => clearAliasCache
 });
 import { existsSync as existsSync16, readFileSync as readFileSync8 } from "node:fs";
-import { homedir as homedir15 } from "node:os";
+import { homedir as homedir16 } from "node:os";
 import { join as join27 } from "node:path";
 function parseAliasesFromFile(filePath) {
   const aliases = new Map;
@@ -90484,7 +91312,7 @@ function loadAliases(forceReload = false) {
   if (aliasCache && !forceReload) {
     return aliasCache;
   }
-  const home = homedir15();
+  const home = homedir16();
   const allAliases = new Map;
   for (const file of ALIAS_FILES) {
     const filePath = join27(home, file);
@@ -91105,21 +91933,6 @@ Use /disconnect codex to remove the current connection first.`, false);
   ctx.setCommandRunning(true);
   const cmdId = addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, "Checking account eligibility...", true, "running");
   try {
-    const eligibility = await checkOpenAICodexEligibility();
-    if (!eligibility.eligible) {
-      updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✗ ChatGPT OAuth requires a Pro or Enterprise plan
-
-` + `This feature is only available for Letta Pro or Enterprise customers.
-` + `Current plan: ${eligibility.billing_tier}
-
-` + `To upgrade your plan, visit:
-
-` + `  https://app.letta.com/settings/organization/usage
-
-` + `If you have an OpenAI API key, you can use it directly by setting:
-` + `  export OPENAI_API_KEY=your-key`, false, "finished");
-      return;
-    }
     updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `Starting OAuth flow...
 A browser window will open for authorization.`, true, "running");
     const { authorizationUrl, state, codeVerifier, redirectUri } = await startOpenAIOAuth(OPENAI_OAUTH_CONFIG.defaultPort);
@@ -91173,20 +91986,7 @@ Your ChatGPT Plus/Pro subscription is now linked.`, true, "finished");
   } catch (error) {
     settingsManager.clearOAuthState();
     const errorMessage = getErrorMessage2(error);
-    let displayMessage;
-    if (errorMessage === "PLAN_UPGRADE_REQUIRED") {
-      displayMessage = `✗ ChatGPT OAuth requires a Pro or Enterprise plan
-
-` + `This feature is only available for Letta Pro or Enterprise customers.
-To upgrade your plan, visit:
-
-  https://app.letta.com/settings/organization/usage
-
-If you have an OpenAI API key, you can use it directly by setting:
-  export OPENAI_API_KEY=your-key`;
-    } else {
-      displayMessage = `✗ Failed to connect: ${errorMessage}`;
-    }
+    const displayMessage = `✗ Failed to connect: ${errorMessage}`;
     updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, displayMessage, false, "finished");
   } finally {
     ctx.setCommandRunning(false);
@@ -91495,7 +92295,7 @@ async function packageSkills(agentId, skillsDir) {
           console.warn(`Skipping invalid skill ${entry.name}: missing SKILL.md`);
           continue;
         }
-        const sourceUrl = await findSkillSourceUrl(entry.name);
+        const sourceUrl = skillsDir ? null : await findSkillSourceUrl(entry.name);
         const skill2 = { name: entry.name };
         if (sourceUrl) {
           skill2.source_url = sourceUrl;
@@ -91571,7 +92371,7 @@ __export(exports_App, {
   default: () => App2
 });
 import { existsSync as existsSync17, readFileSync as readFileSync9, renameSync, writeFileSync as writeFileSync6 } from "node:fs";
-import { homedir as homedir16, tmpdir as tmpdir3 } from "node:os";
+import { homedir as homedir17, tmpdir as tmpdir3 } from "node:os";
 import { join as join28 } from "node:path";
 function getErrorHintForStopReason(stopReason, currentModelId) {
   if (currentModelId === "opus" && stopReason === "llm_api_error" && getModelInfo("bedrock-opus")) {
@@ -92228,18 +93028,93 @@ function App2({
       setCommandRunning(false);
     }
   }, [setCommandRunning]);
-  const columns = useTerminalWidth();
+  const rawColumns = useTerminalWidth();
   const terminalRows = useTerminalRows();
-  const prevColumnsRef = import_react91.useRef(columns);
-  const lastClearedColumnsRef = import_react91.useRef(columns);
+  const [stableColumns, setStableColumns] = import_react91.useState(rawColumns);
+  const stableColumnsTimeoutRef = import_react91.useRef(null);
+  const prevColumnsRef = import_react91.useRef(rawColumns);
+  const lastClearedColumnsRef = import_react91.useRef(rawColumns);
   const pendingResizeRef = import_react91.useRef(false);
   const pendingResizeColumnsRef = import_react91.useRef(null);
   const [staticRenderEpoch, setStaticRenderEpoch] = import_react91.useState(0);
   const resizeClearTimeout = import_react91.useRef(null);
+  const lastClearAtRef = import_react91.useRef(0);
   const isInitialResizeRef = import_react91.useRef(true);
+  const columns = stableColumns;
+  const debugFlicker = process.env.LETTA_DEBUG_FLICKER === "1";
+  import_react91.useEffect(() => {
+    if (rawColumns === stableColumns) {
+      if (stableColumnsTimeoutRef.current) {
+        clearTimeout(stableColumnsTimeoutRef.current);
+        stableColumnsTimeoutRef.current = null;
+      }
+      return;
+    }
+    const delta = Math.abs(rawColumns - stableColumns);
+    if (delta >= MIN_RESIZE_DELTA) {
+      if (stableColumnsTimeoutRef.current) {
+        clearTimeout(stableColumnsTimeoutRef.current);
+        stableColumnsTimeoutRef.current = null;
+      }
+      setStableColumns(rawColumns);
+      return;
+    }
+    if (stableColumnsTimeoutRef.current) {
+      clearTimeout(stableColumnsTimeoutRef.current);
+    }
+    stableColumnsTimeoutRef.current = setTimeout(() => {
+      stableColumnsTimeoutRef.current = null;
+      setStableColumns(rawColumns);
+    }, STABLE_WIDTH_SETTLE_MS);
+  }, [rawColumns, stableColumns]);
+  const clearAndRemount = import_react91.useCallback((targetColumns) => {
+    if (debugFlicker) {
+      console.error(`[debug:flicker:clear-remount] target=${targetColumns} previousCleared=${lastClearedColumnsRef.current} raw=${prevColumnsRef.current}`);
+    }
+    if (typeof process !== "undefined" && process.stdout && "write" in process.stdout && process.stdout.isTTY) {
+      process.stdout.write(CLEAR_SCREEN_AND_HOME);
+    }
+    setStaticRenderEpoch((epoch) => epoch + 1);
+    lastClearedColumnsRef.current = targetColumns;
+    lastClearAtRef.current = Date.now();
+  }, [debugFlicker]);
+  const scheduleResizeClear = import_react91.useCallback((targetColumns) => {
+    if (targetColumns === lastClearedColumnsRef.current) {
+      return;
+    }
+    if (resizeClearTimeout.current) {
+      clearTimeout(resizeClearTimeout.current);
+      resizeClearTimeout.current = null;
+    }
+    const elapsedSinceClear = Date.now() - lastClearAtRef.current;
+    const rateLimitDelay = elapsedSinceClear >= MIN_CLEAR_INTERVAL_MS ? 0 : MIN_CLEAR_INTERVAL_MS - elapsedSinceClear;
+    const delay = Math.max(RESIZE_SETTLE_MS, rateLimitDelay);
+    if (debugFlicker) {
+      console.error(`[debug:flicker:resize-schedule] target=${targetColumns} delay=${delay}ms elapsedSinceClear=${elapsedSinceClear}ms`);
+    }
+    resizeClearTimeout.current = setTimeout(() => {
+      resizeClearTimeout.current = null;
+      if (prevColumnsRef.current !== targetColumns) {
+        if (debugFlicker) {
+          console.error(`[debug:flicker:resize-skip] stale target=${targetColumns} currentRaw=${prevColumnsRef.current}`);
+        }
+        return;
+      }
+      if (targetColumns === lastClearedColumnsRef.current) {
+        if (debugFlicker) {
+          console.error(`[debug:flicker:resize-skip] already-cleared target=${targetColumns}`);
+        }
+        return;
+      }
+      if (debugFlicker) {
+        console.error(`[debug:flicker:resize-fire] clear target=${targetColumns}`);
+      }
+      clearAndRemount(targetColumns);
+    }, delay);
+  }, [clearAndRemount, debugFlicker]);
   import_react91.useEffect(() => {
     const prev = prevColumnsRef.current;
-    if (columns === prev)
+    if (rawColumns === prev)
       return;
     if (resizeClearTimeout.current) {
       clearTimeout(resizeClearTimeout.current);
@@ -92247,52 +93122,38 @@ function App2({
     }
     if (isInitialResizeRef.current) {
       isInitialResizeRef.current = false;
-      prevColumnsRef.current = columns;
-      lastClearedColumnsRef.current = columns;
+      prevColumnsRef.current = rawColumns;
+      lastClearedColumnsRef.current = rawColumns;
       return;
     }
-    const delta = Math.abs(columns - prev);
+    const delta = Math.abs(rawColumns - prev);
     const isMinorJitter = delta > 0 && delta < MIN_RESIZE_DELTA;
+    if (isMinorJitter) {
+      prevColumnsRef.current = rawColumns;
+      return;
+    }
     if (streaming) {
-      if (isMinorJitter) {
-        prevColumnsRef.current = columns;
-        return;
-      }
       pendingResizeRef.current = true;
-      pendingResizeColumnsRef.current = columns;
-      prevColumnsRef.current = columns;
+      pendingResizeColumnsRef.current = rawColumns;
+      prevColumnsRef.current = rawColumns;
       return;
     }
-    if (columns === lastClearedColumnsRef.current) {
+    if (rawColumns === lastClearedColumnsRef.current) {
       pendingResizeRef.current = false;
       pendingResizeColumnsRef.current = null;
-      prevColumnsRef.current = columns;
+      prevColumnsRef.current = rawColumns;
       return;
     }
-    const scheduledColumns = columns;
-    resizeClearTimeout.current = setTimeout(() => {
-      resizeClearTimeout.current = null;
-      if (typeof process !== "undefined" && process.stdout && "write" in process.stdout && process.stdout.isTTY) {
-        process.stdout.write(CLEAR_SCREEN_AND_HOME);
-      }
-      setStaticRenderEpoch((epoch) => epoch + 1);
-      lastClearedColumnsRef.current = scheduledColumns;
-    }, 150);
-    prevColumnsRef.current = columns;
-    return () => {
-      if (resizeClearTimeout.current) {
-        clearTimeout(resizeClearTimeout.current);
-        resizeClearTimeout.current = null;
-      }
-    };
-  }, [columns, streaming]);
+    scheduleResizeClear(rawColumns);
+    prevColumnsRef.current = rawColumns;
+  }, [rawColumns, streaming, scheduleResizeClear]);
   import_react91.useEffect(() => {
     if (streaming) {
       if (resizeClearTimeout.current) {
         clearTimeout(resizeClearTimeout.current);
         resizeClearTimeout.current = null;
         pendingResizeRef.current = true;
-        pendingResizeColumnsRef.current = columns;
+        pendingResizeColumnsRef.current = rawColumns;
       }
       return;
     }
@@ -92305,12 +93166,20 @@ function App2({
       return;
     if (pendingColumns === lastClearedColumnsRef.current)
       return;
-    if (typeof process !== "undefined" && process.stdout && "write" in process.stdout && process.stdout.isTTY) {
-      process.stdout.write(CLEAR_SCREEN_AND_HOME);
-    }
-    setStaticRenderEpoch((epoch) => epoch + 1);
-    lastClearedColumnsRef.current = pendingColumns;
-  }, [columns, streaming]);
+    scheduleResizeClear(pendingColumns);
+  }, [rawColumns, streaming, scheduleResizeClear]);
+  import_react91.useEffect(() => {
+    return () => {
+      if (resizeClearTimeout.current) {
+        clearTimeout(resizeClearTimeout.current);
+        resizeClearTimeout.current = null;
+      }
+      if (stableColumnsTimeoutRef.current) {
+        clearTimeout(stableColumnsTimeoutRef.current);
+        stableColumnsTimeoutRef.current = null;
+      }
+    };
+  }, []);
   const deferredToolCallCommitsRef = import_react91.useRef(new Map);
   const [deferredCommitAt, setDeferredCommitAt] = import_react91.useState(null);
   const resetDeferredToolCallCommits = import_react91.useCallback(() => {
@@ -92909,7 +93778,7 @@ function App2({
         continue;
       if (!line.toolCallId || !line.name)
         continue;
-      if (line.name !== "memory" && line.name !== "memory_apply_patch")
+      if (!isMemoryTool(line.name))
         continue;
       if (memorySyncProcessedToolCallsRef.current.has(line.toolCallId))
         continue;
@@ -93980,7 +94849,9 @@ ${feedback}
               };
               const errorDetails = formatErrorDetails(errorObject, agentIdRef.current);
               appendError(errorDetails, true);
-              appendError(getErrorHintForStopReason(stopReasonToHandle, currentModelId), true);
+              if (!isEncryptedContentError(errorObject)) {
+                appendError(getErrorHintForStopReason(stopReasonToHandle, currentModelId), true);
+              }
             } else {
               appendError(`An error occurred during agent execution
 (run_id: ${lastRunId}, stop_reason: ${stopReason})`, true);
@@ -96852,8 +97723,9 @@ ${SYSTEM_REMINDER_CLOSE}
         };
       }
       if (!selectedModel) {
-        const cmd = overlayCommand ?? commandRunner.start("/model", `Model not found: ${modelId}`);
-        cmd.fail(`Model not found: ${modelId}`);
+        const output = `Model not found: ${modelId}. Run /model and press R to refresh available models.`;
+        const cmd = overlayCommand ?? commandRunner.start("/model", output);
+        cmd.fail(output);
         return;
       }
       const model = selectedModel;
@@ -96902,8 +97774,11 @@ Consider switching to a different system prompt using /system to match.` : null;
       });
     } catch (error) {
       const errorDetails = formatErrorDetails(error, agentId);
-      const cmd = overlayCommand ?? commandRunner.start("/model", "Failed to switch model.");
-      cmd.fail(`Failed to switch model: ${errorDetails}`);
+      const modelLabel = selectedModel?.label ?? modelId;
+      const guidance = "Run /model and press R to refresh available models. If the model is still unavailable, choose another model or connect a provider with /connect.";
+      const cmd = overlayCommand ?? commandRunner.start("/model", `Failed to switch model to ${modelLabel}.`);
+      cmd.fail(`Failed to switch model to ${modelLabel}: ${errorDetails}
+${guidance}`);
     }
   }, [
     agentId,
@@ -97070,9 +97945,9 @@ Consider switching to a different system prompt using /system to match.` : null;
     commandRunner.start
   ]);
   const handleFeedbackSubmit = import_react91.useCallback(async (message) => {
+    const overlayCommand = consumeOverlayCommand("feedback");
     closeOverlay();
     await withCommandLock(async () => {
-      const overlayCommand = consumeOverlayCommand("feedback");
       const cmd = overlayCommand ?? commandRunner.start("/feedback", "Sending feedback...");
       try {
         const resolvedMessage = resolvePlaceholders(message);
@@ -97279,7 +98154,7 @@ Consider switching to a different system prompt using /system to match.` : null;
       }
       if (!planFileExists()) {
         const planFilePath = permissionMode2.getPlanFilePath();
-        const plansDir = join28(homedir16(), ".letta", "plans");
+        const plansDir = join28(homedir17(), ".letta", "plans");
         handlePlanKeepPlanning(`You must write your plan to a plan file before exiting plan mode.
 ` + (planFilePath ? `Plan file path: ${planFilePath}
 ` : "") + `Use a write tool to create your plan in ${plansDir}, then use ExitPlanMode to present the plan to the user.`);
@@ -97435,7 +98310,7 @@ Plan file path: ${planFilePath}`;
     deferredCommitAt
   ]);
   const { agents: subagents } = import_react91.useSyncExternalStore(subscribe2, getSnapshot2);
-  const shouldAnimate = import_react91.useMemo(() => {
+  const estimatedLiveHeight = import_react91.useMemo(() => {
     const countLines4 = (text) => {
       if (!text)
         return 0;
@@ -97459,8 +98334,23 @@ Plan file path: ${planFilePath}`;
     const subagentsHeight = subagents.length * LINES_PER_SUBAGENT;
     const FIXED_BUFFER = 20;
     const estimatedHeight = liveItemsHeight + subagentsHeight + FIXED_BUFFER;
-    return estimatedHeight < terminalRows;
-  }, [liveItems, terminalRows, subagents.length]);
+    return estimatedHeight;
+  }, [liveItems, subagents.length]);
+  const [shouldAnimate, setShouldAnimate] = import_react91.useState(() => estimatedLiveHeight < terminalRows);
+  import_react91.useEffect(() => {
+    if (terminalRows <= 0) {
+      setShouldAnimate(false);
+      return;
+    }
+    const disableThreshold = terminalRows;
+    const resumeThreshold = Math.max(0, terminalRows - ANIMATION_RESUME_HYSTERESIS_ROWS);
+    setShouldAnimate((prev) => {
+      if (prev) {
+        return estimatedLiveHeight < disableThreshold;
+      }
+      return estimatedLiveHeight < resumeThreshold;
+    });
+  }, [estimatedLiveHeight, terminalRows]);
   import_react91.useEffect(() => {
     if (loadingState === "ready" && !welcomeCommittedRef.current && messageHistory.length === 0) {
       if (!continueSession && !agentProvenance) {
@@ -97813,7 +98703,9 @@ Plan file path: ${planFilePath}`;
                   onPasteError: handlePasteError,
                   restoredInput,
                   onRestoredInputConsumed: () => setRestoredInput(null),
-                  networkPhase
+                  networkPhase,
+                  terminalWidth: columns,
+                  shouldAnimate
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
               activeOverlay === "model" && /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ModelSelector, {
@@ -98319,7 +99211,7 @@ Open /mcp to attach or detach tools for this server.`, true);
     ]
   }, resumeKey, true, undefined, this);
 }
-var import_react91, jsx_dev_runtime69, CLEAR_SCREEN_AND_HOME = "\x1B[2J\x1B[H", MIN_RESIZE_DELTA = 2, TOOL_CALL_COMMIT_DEFER_MS = 50, EAGER_CANCEL = true, LLM_API_ERROR_MAX_RETRIES2 = 3, CONVERSATION_BUSY_MAX_RETRIES2 = 3, CONVERSATION_BUSY_RETRY_BASE_DELAY_MS = 2500, INTERRUPT_MESSAGE = "Interrupted – tell the agent what to do differently. Something went wrong? Use /feedback to report issues.", ERROR_FEEDBACK_HINT = "Something went wrong? Use /feedback to report issues.", OPUS_BEDROCK_FALLBACK_HINT = "Downstream provider issues? Use /model to switch to Bedrock Opus 4.5", PROVIDER_FALLBACK_HINT = "Downstream provider issues? Use /model to switch to another provider", INTERACTIVE_SLASH_COMMANDS, NON_STATE_COMMANDS, APPROVAL_OPTIONS_HEIGHT = 8, APPROVAL_PREVIEW_BUFFER = 4, MIN_WRAP_WIDTH = 10, TEXT_WRAP_GUTTER = 6, DIFF_WRAP_GUTTER = 12;
+var import_react91, jsx_dev_runtime69, CLEAR_SCREEN_AND_HOME = "\x1B[2J\x1B[H", MIN_RESIZE_DELTA = 2, RESIZE_SETTLE_MS = 250, MIN_CLEAR_INTERVAL_MS = 750, STABLE_WIDTH_SETTLE_MS = 180, TOOL_CALL_COMMIT_DEFER_MS = 50, ANIMATION_RESUME_HYSTERESIS_ROWS = 2, EAGER_CANCEL = true, LLM_API_ERROR_MAX_RETRIES2 = 3, CONVERSATION_BUSY_MAX_RETRIES2 = 3, CONVERSATION_BUSY_RETRY_BASE_DELAY_MS = 2500, INTERRUPT_MESSAGE = "Interrupted – tell the agent what to do differently. Something went wrong? Use /feedback to report issues.", ERROR_FEEDBACK_HINT = "Something went wrong? Use /feedback to report issues.", OPUS_BEDROCK_FALLBACK_HINT = "Downstream provider issues? Use /model to switch to Bedrock Opus 4.5", PROVIDER_FALLBACK_HINT = "Downstream provider issues? Use /model to switch to another provider", INTERACTIVE_SLASH_COMMANDS, NON_STATE_COMMANDS, APPROVAL_OPTIONS_HEIGHT = 8, APPROVAL_PREVIEW_BUFFER = 4, MIN_WRAP_WIDTH = 10, TEXT_WRAP_GUTTER = 6, DIFF_WRAP_GUTTER = 12;
 var init_App2 = __esm(async () => {
   init_error();
   init_check_approval();
@@ -98341,12 +99233,10 @@ var init_App2 = __esm(async () => {
   init_diff2();
   init_errorContext();
   init_errorFormatter();
-  init_formatArgsDisplay();
   init_messageQueueBridge();
   init_pasteRegistry();
   init_planName();
   init_queuedMessageParts();
-  init_subagentAggregation();
   init_subagentState();
   init_thinkingMessages();
   init_useSyncedState();
@@ -98404,9 +99294,13 @@ var init_App2 = __esm(async () => {
     init_WelcomeScreen(),
     init_accumulator(),
     init_approvalClassification(),
+    init_formatArgsDisplay(),
     init_memoryReminder(),
     init_sessionContext(),
     init_stream(),
+    init_subagentAggregation(),
+    init_toolNameMapping(),
+    init_toolNameMapping(),
     init_useSuspend()
   ]);
   import_react91 = __toESM(require_react(), 1);
@@ -98466,7 +99360,7 @@ import {
   readFileSync as readFileSync10,
   writeFileSync as writeFileSync7
 } from "node:fs";
-import { homedir as homedir17, platform as platform5 } from "node:os";
+import { homedir as homedir18, platform as platform5 } from "node:os";
 import { dirname as dirname14, join as join29 } from "node:path";
 function detectTerminalType2() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
@@ -98499,7 +99393,7 @@ function getKeybindingsPath2(terminal) {
   }[terminal];
   const os6 = platform5();
   if (os6 === "darwin") {
-    return join29(homedir17(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join29(homedir18(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os6 === "win32") {
     const appData = process.env.APPDATA;
@@ -98508,7 +99402,7 @@ function getKeybindingsPath2(terminal) {
     return join29(appData, appName, "User", "keybindings.json");
   }
   if (os6 === "linux") {
-    return join29(homedir17(), ".config", appName, "User", "keybindings.json");
+    return join29(homedir18(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -98665,10 +99559,10 @@ function getWezTermConfigPath2() {
     if (existsSync18(xdgPath))
       return xdgPath;
   }
-  const configPath = join29(homedir17(), ".config", "wezterm", "wezterm.lua");
+  const configPath = join29(homedir18(), ".config", "wezterm", "wezterm.lua");
   if (existsSync18(configPath))
     return configPath;
-  return join29(homedir17(), ".wezterm.lua");
+  return join29(homedir18(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists2(configPath) {
   if (!existsSync18(configPath))
@@ -98766,10 +99660,10 @@ __export(exports_settings2, {
   loadProjectSettings: () => loadProjectSettings2,
   getSetting: () => getSetting2
 });
-import { homedir as homedir18 } from "node:os";
+import { homedir as homedir19 } from "node:os";
 import { join as join30 } from "node:path";
 function getSettingsPath2() {
-  return join30(homedir18(), ".letta", "settings.json");
+  return join30(homedir19(), ".letta", "settings.json");
 }
 async function loadSettings2() {
   const settingsPath = getSettingsPath2();
@@ -99278,6 +100172,7 @@ var init_create3 = __esm(async () => {
 // src/agent/import.ts
 var exports_import2 = {};
 __export(exports_import2, {
+  importAgentFromRegistry: () => importAgentFromRegistry2,
   importAgentFromFile: () => importAgentFromFile2,
   extractSkillsFromAf: () => extractSkillsFromAf2
 });
@@ -99385,6 +100280,45 @@ async function downloadGitHubDirectory2(entries, destDir, owner, repo, branch, b
     }
   }
 }
+function parseRegistryHandle2(handle) {
+  const normalized = handle.startsWith("@") ? handle.slice(1) : handle;
+  const parts = normalized.split("/");
+  if (parts.length !== 2 || !parts[0] || !parts[1]) {
+    throw new Error(`Invalid import handle "${handle}". Use format: @author/agentname`);
+  }
+  return { author: parts[0], name: parts[1] };
+}
+async function importAgentFromRegistry2(options) {
+  const { tmpdir: tmpdir4 } = await import("node:os");
+  const { join: join31 } = await import("node:path");
+  const { writeFile: writeFile6, unlink: unlink2 } = await import("node:fs/promises");
+  const { author, name } = parseRegistryHandle2(options.handle);
+  const rawUrl = `https://raw.githubusercontent.com/${AGENT_REGISTRY_OWNER2}/${AGENT_REGISTRY_REPO2}/refs/heads/${AGENT_REGISTRY_BRANCH2}/agents/@${author}/${name}/${name}.af`;
+  const response = await fetch(rawUrl);
+  if (!response.ok) {
+    if (response.status === 404) {
+      throw new Error(`Agent @${author}/${name} not found in registry. Check that the agent exists at https://github.com/${AGENT_REGISTRY_OWNER2}/${AGENT_REGISTRY_REPO2}/tree/${AGENT_REGISTRY_BRANCH2}/agents/@${author}/${name}`);
+    }
+    throw new Error(`Failed to download agent @${author}/${name}: ${response.statusText}`);
+  }
+  const afContent = await response.text();
+  const tempPath = join31(tmpdir4(), `letta-import-${author}-${name}-${Date.now()}.af`);
+  await writeFile6(tempPath, afContent, "utf-8");
+  try {
+    const result = await importAgentFromFile2({
+      filePath: tempPath,
+      modelOverride: options.modelOverride,
+      stripMessages: options.stripMessages ?? true,
+      stripSkills: options.stripSkills ?? false
+    });
+    return result;
+  } finally {
+    try {
+      await unlink2(tempPath);
+    } catch {}
+  }
+}
+var AGENT_REGISTRY_OWNER2 = "letta-ai", AGENT_REGISTRY_REPO2 = "agent-file", AGENT_REGISTRY_BRANCH2 = "main";
 var init_import2 = __esm(async () => {
   init_model();
   await __promiseAll([
@@ -99485,7 +100419,7 @@ function buildModelSettings2(modelHandle, updateArgs) {
   } else {
     settings = {};
   }
-  if (typeof updateArgs?.max_output_tokens === "number") {
+  if (typeof updateArgs?.max_output_tokens === "number" && "provider_type" in settings) {
     settings.max_output_tokens = updateArgs.max_output_tokens;
   }
   return settings;
@@ -99498,7 +100432,10 @@ async function updateAgentLLMConfig2(agentId, modelHandle, updateArgs) {
   await client.agents.update(agentId, {
     model: modelHandle,
     ...hasModelSettings && { model_settings: modelSettings },
-    ...contextWindow && { context_window_limit: contextWindow }
+    ...contextWindow && { context_window_limit: contextWindow },
+    ...typeof updateArgs?.max_output_tokens === "number" && {
+      max_tokens: updateArgs.max_output_tokens
+    }
   });
   const finalAgent = await client.agents.retrieve(agentId);
   return finalAgent.llm_config;
@@ -103326,6 +104263,8 @@ function releaseSwitchLock2() {
     lock.resolve = null;
   }
 }
+var EXTERNAL_TOOLS_KEY2 = Symbol.for("@letta/externalTools");
+var EXTERNAL_EXECUTOR_KEY2 = Symbol.for("@letta/externalToolExecutor");
 function replaceRegistry2(newTools) {
   toolRegistry2.clear();
   for (const [key, value] of newTools) {
@@ -103524,6 +104463,7 @@ OPTIONS
   --skills <path>       Custom path to skills directory (default: .skills in current directory)
   --sleeptime           Enable sleeptime memory management (only for new agents)
   --from-af <path>      Create agent from an AgentFile (.af) template
+                        Use @author/name to import from the agent registry
   --memfs               Enable memory filesystem for this agent
   --no-memfs            Disable memory filesystem for this agent
 
@@ -103973,6 +104913,7 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
       process.exit(1);
     }
   }
+  let isRegistryImport = false;
   if (fromAfFile) {
     if (specifiedAgentId) {
       console.error("Error: --from-af cannot be used with --agent");
@@ -103990,12 +104931,22 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
       console.error("Error: --from-af cannot be used with --new");
       process.exit(1);
     }
-    const { resolve: resolve23 } = await import("path");
-    const { existsSync: existsSync19 } = await import("fs");
-    const resolvedPath = resolve23(fromAfFile);
-    if (!existsSync19(resolvedPath)) {
-      console.error(`Error: AgentFile not found: ${resolvedPath}`);
-      process.exit(1);
+    if (fromAfFile.startsWith("@")) {
+      isRegistryImport = true;
+      const normalized = fromAfFile.slice(1);
+      const parts = normalized.split("/");
+      if (parts.length !== 2 || !parts[0] || !parts[1]) {
+        console.error(`Error: Invalid registry handle "${fromAfFile}". Use format: @author/agentname`);
+        process.exit(1);
+      }
+    } else {
+      const { resolve: resolve23 } = await import("path");
+      const { existsSync: existsSync19 } = await import("fs");
+      const resolvedPath = resolve23(fromAfFile);
+      if (!existsSync19(resolvedPath)) {
+        console.error(`Error: AgentFile not found: ${resolvedPath}`);
+        process.exit(1);
+      }
     }
   }
   if (specifiedAgentName) {
@@ -104139,7 +105090,8 @@ Error: ${message}`);
     systemPromptPreset: systemPromptPreset2,
     toolset,
     skillsDirectory: skillsDirectory2,
-    fromAfFile: fromAfFile2
+    fromAfFile: fromAfFile2,
+    isRegistryImport: isRegistryImport2
   }) {
     const [showKeybindingSetup, setShowKeybindingSetup] = useState45(null);
     const [loadingState, setLoadingState] = useState45("selecting");
@@ -104436,13 +105388,24 @@ Error: ${message}`);
         let isNewlyCreatedAgent = false;
         if (fromAfFile2) {
           setLoadingState("importing");
-          const { importAgentFromFile: importAgentFromFile3 } = await init_import2().then(() => exports_import2);
-          const result = await importAgentFromFile3({
-            filePath: fromAfFile2,
-            modelOverride: model,
-            stripMessages: true,
-            stripSkills: false
-          });
+          let result;
+          if (isRegistryImport2) {
+            const { importAgentFromRegistry: importAgentFromRegistry3 } = await init_import2().then(() => exports_import2);
+            result = await importAgentFromRegistry3({
+              handle: fromAfFile2,
+              modelOverride: model,
+              stripMessages: true,
+              stripSkills: false
+            });
+          } else {
+            const { importAgentFromFile: importAgentFromFile3 } = await init_import2().then(() => exports_import2);
+            result = await importAgentFromFile3({
+              filePath: fromAfFile2,
+              modelOverride: model,
+              stripMessages: true,
+              stripSkills: false
+            });
+          }
           agent = result.agent;
           isNewlyCreatedAgent = true;
           setAgentProvenance({
@@ -104802,11 +105765,12 @@ Error during initialization: ${message}`);
     systemPromptPreset,
     toolset: specifiedToolset,
     skillsDirectory,
-    fromAfFile
+    fromAfFile,
+    isRegistryImport
   }), {
     exitOnCtrlC: false
   });
 }
 main();
 
-//# debugId=8B604F61633624E964756E2164756E21
+//# debugId=333508E0ED33A45564756E2164756E21