@letta-ai/letta-code 0.12.6 → 0.12.8

package/letta.js

@@ -3237,7 +3237,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.12.6",
+    version: "0.12.8",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -32126,7 +32126,7 @@ __export(exports_subagents, {
 });
 import { existsSync as existsSync3 } from "node:fs";
 import { readdir, readFile as readFile2 } from "node:fs/promises";
-import { join as join3 } from "node:path";
+import { join as join4 } from "node:path";
 function isValidName(name) {
   return /^[a-z][a-z0-9-]*$/.test(name);
 }
@@ -32217,7 +32217,7 @@ async function discoverSubagentsFromDir(agentsDir, seenNames, subagents, errors)
       if (!entry.isFile() || !entry.name.endsWith(".md")) {
         continue;
       }
-      const filePath = join3(agentsDir, entry.name);
+      const filePath = join4(agentsDir, entry.name);
       try {
         const config = await parseSubagentFile(filePath);
         if (config) {
@@ -32249,7 +32249,7 @@ async function discoverSubagents(workingDirectory = process.cwd()) {
   const subagents = [];
   const seenNames = new Set;
   await discoverSubagentsFromDir(GLOBAL_AGENTS_DIR, seenNames, subagents, errors);
-  const projectAgentsDir = join3(workingDirectory, AGENTS_DIR);
+  const projectAgentsDir = join4(workingDirectory, AGENTS_DIR);
   await discoverSubagentsFromDir(projectAgentsDir, seenNames, subagents, errors);
   return { subagents, errors };
 }
@@ -32288,7 +32288,7 @@ var init_subagents = __esm(() => {
     plan_default,
     recall_default
   ];
-  GLOBAL_AGENTS_DIR = join3(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents");
+  GLOBAL_AGENTS_DIR = join4(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents");
   VALID_MEMORY_BLOCKS = new Set(MEMORY_BLOCK_LABELS);
   cache3 = {
     builtins: null,
@@ -34566,8 +34566,8 @@ String: ${old_string}`);
 var init_Edit2 = () => {};
 
 // src/cli/helpers/planName.ts
-import { homedir as homedir5 } from "node:os";
-import { join as join5 } from "node:path";
+import { homedir as homedir6 } from "node:os";
+import { join as join6 } from "node:path";
 function randomElement(arr) {
   return arr[Math.floor(Math.random() * arr.length)];
 }
@@ -34579,7 +34579,7 @@ function generatePlanName() {
 }
 function generatePlanFilePath() {
   const name = generatePlanName();
-  return join5(homedir5(), ".letta", "plans", `${name}.md`);
+  return join6(homedir6(), ".letta", "plans", `${name}.md`);
 }
 var adjectives, nouns;
 var init_planName = __esm(() => {
@@ -34688,6 +34688,8 @@ var exports_mode = {};
 __export(exports_mode, {
   permissionMode: () => permissionMode2
 });
+import { homedir as homedir7 } from "node:os";
+import { join as join7 } from "node:path";
 function getGlobalMode2() {
   const global2 = globalThis;
   if (!global2[MODE_KEY2]) {
@@ -34790,7 +34792,7 @@ class PermissionModeManager2 {
           return "allow";
         }
         if (writeTools.includes(toolName)) {
-          const planFilePath = this.getPlanFilePath();
+          const plansDir = join7(homedir7(), ".letta", "plans");
           let targetPath = toolArgs?.file_path || toolArgs?.path;
           if ((toolName === "ApplyPatch" || toolName === "apply_patch") && toolArgs?.input) {
             const input = toolArgs.input;
@@ -34799,7 +34801,7 @@ class PermissionModeManager2 {
               targetPath = match[1].trim();
             }
           }
-          if (planFilePath && targetPath && targetPath === planFilePath) {
+          if (targetPath && targetPath.startsWith(plansDir) && targetPath.endsWith(".md")) {
             return "allow";
           }
         }
@@ -34891,7 +34893,9 @@ var init_EnterPlanMode2 = __esm(() => {
 async function exit_plan_mode() {
   return {
     message: `User has approved your plan. You can now start coding.
-Start with updating your todo list if applicable`
+` + `Start with updating your todo list if applicable.
+
+` + "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."
   };
 }
 
@@ -36809,7 +36813,7 @@ var init_LS2 = __esm(() => {
 
 // src/tools/impl/LS.ts
 import { readdir as readdir2, stat } from "node:fs/promises";
-import { join as join7, resolve as resolve6 } from "node:path";
+import { join as join9, resolve as resolve6 } from "node:path";
 async function ls(args) {
   validateRequiredParams(args, ["path"], "LS");
   validateParamTypes(args, LS_default2, "LS");
@@ -36819,7 +36823,7 @@ async function ls(args) {
     const items = await readdir2(dirPath);
     const filteredItems = items.filter((item) => !ignore.some((pattern) => import_picomatch.default.isMatch(item, pattern)));
     const fileInfos = await Promise.all(filteredItems.map(async (item) => {
-      const fullPath = join7(dirPath, item);
+      const fullPath = join9(dirPath, item);
       try {
         const stats = await stat(fullPath);
         return {
@@ -43650,14 +43654,14 @@ __export(exports_skills, {
 });
 import { existsSync as existsSync5 } from "node:fs";
 import { readdir as readdir4, readFile as readFile3 } from "node:fs/promises";
-import { dirname as dirname4, join as join8 } from "node:path";
+import { dirname as dirname4, join as join10 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 function getBundledSkillsPath() {
   const thisDir = dirname4(fileURLToPath6(import.meta.url));
   if (thisDir.includes("src/agent") || thisDir.includes("src\\agent")) {
-    return join8(thisDir, "../skills/builtin");
+    return join10(thisDir, "../skills/builtin");
   }
-  return join8(thisDir, "skills");
+  return join10(thisDir, "skills");
 }
 async function getBundledSkills() {
   const bundledPath = getBundledSkillsPath();
@@ -43680,7 +43684,7 @@ async function discoverSkillsFromDir(skillsPath, source) {
   }
   return { skills, errors };
 }
-async function discoverSkills(projectSkillsPath = join8(process.cwd(), SKILLS_DIR)) {
+async function discoverSkills(projectSkillsPath = join10(process.cwd(), SKILLS_DIR)) {
   const allErrors = [];
   const skillsById = new Map;
   const bundledSkills = await getBundledSkills();
@@ -43706,7 +43710,7 @@ async function findSkillFiles(currentPath, rootPath, skills, errors, source) {
   try {
     const entries = await readdir4(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join8(currentPath, entry.name);
+      const fullPath = join10(currentPath, entry.name);
       if (entry.isDirectory()) {
         await findSkillFiles(fullPath, rootPath, skills, errors, source);
       } else if (entry.isFile() && entry.name.toUpperCase() === "SKILL.MD") {
@@ -43892,13 +43896,13 @@ function formatSkillsForMemory(skills, skillsDirectory) {
 }
 var SKILLS_DIR = ".skills", GLOBAL_SKILLS_DIR, SKILLS_BLOCK_CHAR_LIMIT = 20000;
 var init_skills2 = __esm(() => {
-  GLOBAL_SKILLS_DIR = join8(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
+  GLOBAL_SKILLS_DIR = join10(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
 });
 
 // src/tools/impl/Skill.ts
 import { readdirSync as readdirSync3 } from "node:fs";
 import { readFile as readFile4 } from "node:fs/promises";
-import { dirname as dirname5, join as join9 } from "node:path";
+import { dirname as dirname5, join as join11 } from "node:path";
 function parseLoadedSkills(value) {
   const skillMap = new Map;
   const skillHeaderRegex = /# Skill: ([^\n]+)/g;
@@ -43973,19 +43977,19 @@ async function readSkillContent(skillId, skillsDir) {
       return { content, path: bundledSkill.path };
     } catch {}
   }
-  const globalSkillPath = join9(GLOBAL_SKILLS_DIR, skillId, "SKILL.md");
+  const globalSkillPath = join11(GLOBAL_SKILLS_DIR, skillId, "SKILL.md");
   try {
     const content = await readFile4(globalSkillPath, "utf-8");
     return { content, path: globalSkillPath };
   } catch {}
-  const projectSkillPath = join9(skillsDir, skillId, "SKILL.md");
+  const projectSkillPath = join11(skillsDir, skillId, "SKILL.md");
   try {
     const content = await readFile4(projectSkillPath, "utf-8");
     return { content, path: projectSkillPath };
   } catch (primaryError) {
     try {
-      const bundledSkillsDir = join9(process.cwd(), "skills", "skills");
-      const bundledSkillPath = join9(bundledSkillsDir, skillId, "SKILL.md");
+      const bundledSkillsDir = join11(process.cwd(), "skills", "skills");
+      const bundledSkillPath = join11(bundledSkillsDir, skillId, "SKILL.md");
       const content = await readFile4(bundledSkillPath, "utf-8");
       return { content, path: bundledSkillPath };
     } catch {
@@ -44006,7 +44010,7 @@ async function getResolvedSkillsDir(client, agentId) {
     } catch {}
   }
   if (!skillsDir) {
-    skillsDir = join9(process.cwd(), SKILLS_DIR);
+    skillsDir = join11(process.cwd(), SKILLS_DIR);
   }
   return skillsDir;
 }
@@ -46324,14 +46328,14 @@ __export(exports_skills2, {
 });
 import { existsSync as existsSync6 } from "node:fs";
 import { readdir as readdir5, readFile as readFile5 } from "node:fs/promises";
-import { dirname as dirname7, join as join10 } from "node:path";
+import { dirname as dirname7, join as join12 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 function getBundledSkillsPath2() {
   const thisDir = dirname7(fileURLToPath7(import.meta.url));
   if (thisDir.includes("src/agent") || thisDir.includes("src\\agent")) {
-    return join10(thisDir, "../skills/builtin");
+    return join12(thisDir, "../skills/builtin");
   }
-  return join10(thisDir, "skills");
+  return join12(thisDir, "skills");
 }
 async function getBundledSkills2() {
   const bundledPath = getBundledSkillsPath2();
@@ -46354,7 +46358,7 @@ async function discoverSkillsFromDir2(skillsPath, source) {
   }
   return { skills, errors };
 }
-async function discoverSkills2(projectSkillsPath = join10(process.cwd(), SKILLS_DIR2)) {
+async function discoverSkills2(projectSkillsPath = join12(process.cwd(), SKILLS_DIR2)) {
   const allErrors = [];
   const skillsById = new Map;
   const bundledSkills = await getBundledSkills2();
@@ -46380,7 +46384,7 @@ async function findSkillFiles2(currentPath, rootPath, skills, errors, source) {
   try {
     const entries = await readdir5(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join10(currentPath, entry.name);
+      const fullPath = join12(currentPath, entry.name);
       if (entry.isDirectory()) {
         await findSkillFiles2(fullPath, rootPath, skills, errors, source);
       } else if (entry.isFile() && entry.name.toUpperCase() === "SKILL.MD") {
@@ -46566,7 +46570,7 @@ function formatSkillsForMemory2(skills, skillsDirectory) {
 }
 var SKILLS_DIR2 = ".skills", GLOBAL_SKILLS_DIR2, SKILLS_BLOCK_CHAR_LIMIT2 = 20000;
 var init_skills3 = __esm(() => {
-  GLOBAL_SKILLS_DIR2 = join10(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
+  GLOBAL_SKILLS_DIR2 = join12(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
 });
 
 // src/utils/fs.ts
@@ -47046,7 +47050,7 @@ __export(exports_subagents2, {
 });
 import { existsSync as existsSync8 } from "node:fs";
 import { readdir as readdir6, readFile as readFile7 } from "node:fs/promises";
-import { join as join11 } from "node:path";
+import { join as join13 } from "node:path";
 function isValidName2(name) {
   return /^[a-z][a-z0-9-]*$/.test(name);
 }
@@ -47137,7 +47141,7 @@ async function discoverSubagentsFromDir2(agentsDir, seenNames, subagents, errors
       if (!entry.isFile() || !entry.name.endsWith(".md")) {
         continue;
       }
-      const filePath = join11(agentsDir, entry.name);
+      const filePath = join13(agentsDir, entry.name);
       try {
         const config = await parseSubagentFile2(filePath);
         if (config) {
@@ -47169,7 +47173,7 @@ async function discoverSubagents2(workingDirectory = process.cwd()) {
   const subagents = [];
   const seenNames = new Set;
   await discoverSubagentsFromDir2(GLOBAL_AGENTS_DIR2, seenNames, subagents, errors);
-  const projectAgentsDir = join11(workingDirectory, AGENTS_DIR2);
+  const projectAgentsDir = join13(workingDirectory, AGENTS_DIR2);
   await discoverSubagentsFromDir2(projectAgentsDir, seenNames, subagents, errors);
   return { subagents, errors };
 }
@@ -47208,7 +47212,7 @@ var init_subagents2 = __esm(() => {
     plan_default,
     recall_default
   ];
-  GLOBAL_AGENTS_DIR2 = join11(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents");
+  GLOBAL_AGENTS_DIR2 = join13(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents");
   VALID_MEMORY_BLOCKS2 = new Set(MEMORY_BLOCK_LABELS);
   cache4 = {
     builtins: null,
@@ -47789,6 +47793,7 @@ function SetupUI({ onComplete }) {
             refreshToken: tokens.refresh_token,
             tokenExpiresAt: now + tokens.expires_in * 1000
           });
+          await settingsManager.flush();
           setMode("done");
           setTimeout(() => onComplete(), 1000);
         } catch (err) {
@@ -49522,8 +49527,8 @@ function matchesFilePattern(query, pattern, workingDirectory) {
     globPattern = globPattern.slice(2);
   }
   if (globPattern.startsWith("~/")) {
-    const homedir6 = __require("node:os").homedir();
-    globPattern = globPattern.replace(/^~/, homedir6);
+    const homedir8 = __require("node:os").homedir();
+    globPattern = globPattern.replace(/^~/, homedir8);
   }
   if (globPattern.startsWith("//")) {
     globPattern = globPattern.slice(1);
@@ -49901,8 +49906,8 @@ __export(exports_loader, {
   savePermissionRule: () => savePermissionRule,
   loadPermissions: () => loadPermissions
 });
-import { homedir as homedir6 } from "node:os";
-import { join as join12 } from "node:path";
+import { homedir as homedir8 } from "node:os";
+import { join as join14 } from "node:path";
 async function loadPermissions(workingDirectory = process.cwd()) {
   const merged = {
     allow: [],
@@ -49911,10 +49916,10 @@ async function loadPermissions(workingDirectory = process.cwd()) {
     additionalDirectories: []
   };
   const sources = [
-    join12(process.env.XDG_CONFIG_HOME || join12(homedir6(), ".config"), "letta", "settings.json"),
-    join12(homedir6(), ".letta", "settings.json"),
-    join12(workingDirectory, ".letta", "settings.json"),
-    join12(workingDirectory, ".letta", "settings.local.json")
+    join14(process.env.XDG_CONFIG_HOME || join14(homedir8(), ".config"), "letta", "settings.json"),
+    join14(homedir8(), ".letta", "settings.json"),
+    join14(workingDirectory, ".letta", "settings.json"),
+    join14(workingDirectory, ".letta", "settings.local.json")
   ];
   for (const settingsPath of sources) {
     try {
@@ -49950,13 +49955,13 @@ async function savePermissionRule(rule, ruleType, scope, workingDirectory = proc
   let settingsPath;
   switch (scope) {
     case "user":
-      settingsPath = join12(process.env.XDG_CONFIG_HOME || join12(homedir6(), ".config"), "letta", "settings.json");
+      settingsPath = join14(process.env.XDG_CONFIG_HOME || join14(homedir8(), ".config"), "letta", "settings.json");
       break;
     case "project":
-      settingsPath = join12(workingDirectory, ".letta", "settings.json");
+      settingsPath = join14(workingDirectory, ".letta", "settings.json");
       break;
     case "local":
-      settingsPath = join12(workingDirectory, ".letta", "settings.local.json");
+      settingsPath = join14(workingDirectory, ".letta", "settings.local.json");
       break;
   }
   let settings = {};
@@ -49981,7 +49986,7 @@ async function savePermissionRule(rule, ruleType, scope, workingDirectory = proc
   }
 }
 async function ensureLocalSettingsIgnored(workingDirectory) {
-  const gitignorePath = join12(workingDirectory, ".gitignore");
+  const gitignorePath = join14(workingDirectory, ".gitignore");
   const pattern = ".letta/settings.local.json";
   try {
     let content = "";
@@ -50588,6 +50593,9 @@ ${after}`;
 function clipToolReturn(text, maxLines = 3, maxChars = 300) {
   if (!text)
     return text;
+  if (text.includes("request to call tool denied")) {
+    return text;
+  }
   let clipped = text;
   if (text.length > maxChars) {
     clipped = text.slice(0, maxChars);
@@ -50887,7 +50895,7 @@ var init_manager4 = __esm(async () => {
 });
 
 // src/agent/create.ts
-import { join as join13 } from "node:path";
+import { join as join15 } from "node:path";
 async function createAgent(nameOrOptions = DEFAULT_AGENT_NAME, model, embeddingModel = "openai/text-embedding-3-small", updateArgs, skillsDirectory, parallelToolCalls = true, enableSleeptime = false, systemPromptPreset, initBlocks, baseTools) {
   let options;
   if (typeof nameOrOptions === "object") {
@@ -50982,7 +50990,7 @@ async function createAgent(nameOrOptions = DEFAULT_AGENT_NAME, model, embeddingM
       }
     }
   }
-  const resolvedSkillsDirectory = options.skillsDirectory || join13(process.cwd(), SKILLS_DIR);
+  const resolvedSkillsDirectory = options.skillsDirectory || join15(process.cwd(), SKILLS_DIR);
   try {
     const { skills, errors } = await discoverSkills(resolvedSkillsDirectory);
     if (errors.length > 0) {
@@ -51931,6 +51939,10 @@ var exports_check_approval = {};
 __export(exports_check_approval, {
   getResumeData: () => getResumeData2
 });
+function isBackfillEnabled2() {
+  const val = process.env.LETTA_BACKFILL;
+  return val !== "0" && val !== "false";
+}
 async function getResumeData2(client, agent) {
   try {
     const messagesPage = await client.agents.messages.list(agent.id);
@@ -51953,6 +51965,13 @@ async function getResumeData2(client, agent) {
     const inContextLastMessageId = agent.message_ids && agent.message_ids.length > 0 ? agent.message_ids[agent.message_ids.length - 1] : null;
     if (!inContextLastMessageId) {
       debugWarn("check-approval", `No in-context messages (message_ids empty/null) - no pending approvals`);
+      if (!isBackfillEnabled2()) {
+        return {
+          pendingApproval: null,
+          pendingApprovals: [],
+          messageHistory: []
+        };
+      }
       const historyCount2 = Math.min(MESSAGE_HISTORY_LIMIT2, messages.length);
       let messageHistory2 = messages.slice(-historyCount2);
       if (messageHistory2[0]?.message_type === "tool_return_message") {
@@ -52003,6 +52022,9 @@ async function getResumeData2(client, agent) {
         }
       }
     }
+    if (!isBackfillEnabled2()) {
+      return { pendingApproval, pendingApprovals, messageHistory: [] };
+    }
     const historyCount = Math.min(MESSAGE_HISTORY_LIMIT2, messages.length);
     let messageHistory = messages.slice(-historyCount);
     if (messageHistory[0]?.message_type === "tool_return_message") {
@@ -52556,8 +52578,8 @@ async function handleHeadlessCommand(argv, model, skillsDirectory) {
   await initializeLoadedSkillsFlag2();
   try {
     const { discoverSkills: discoverSkills3, formatSkillsForMemory: formatSkillsForMemory3, SKILLS_DIR: SKILLS_DIR3 } = await Promise.resolve().then(() => (init_skills2(), exports_skills));
-    const { join: join14 } = await import("node:path");
-    const resolvedSkillsDirectory = skillsDirectory || join14(process.cwd(), SKILLS_DIR3);
+    const { join: join16 } = await import("node:path");
+    const resolvedSkillsDirectory = skillsDirectory || join16(process.cwd(), SKILLS_DIR3);
     const { skills, errors } = await discoverSkills3(resolvedSkillsDirectory);
     if (errors.length > 0) {
       console.warn("Errors encountered during skill discovery:");
@@ -53008,7 +53030,17 @@ async function handleHeadlessCommand(argv, model, skillsDirectory) {
         }
         process.exit(1);
       }
-      if (stopReason === "error" && lastRunId && llmApiErrorRetries < LLM_API_ERROR_MAX_RETRIES) {
+      const nonRetriableReasons = [
+        "cancelled",
+        "requires_approval",
+        "max_steps",
+        "max_tokens_exceeded",
+        "context_window_overflow_in_system_prompt",
+        "end_turn",
+        "tool_rule",
+        "no_tool_call"
+      ];
+      if (nonRetriableReasons.includes(stopReason)) {} else if (lastRunId && llmApiErrorRetries < LLM_API_ERROR_MAX_RETRIES) {
         try {
           const run = await client.runs.retrieve(lastRunId);
           const metaError = run.metadata?.error;
@@ -53019,9 +53051,10 @@ async function handleHeadlessCommand(argv, model, skillsDirectory) {
             "OpenAI API error",
             "Google Vertex API error",
             "overloaded",
-            "api_error"
+            "api_error",
+            "Network error"
           ];
-          const isLlmErrorFromDetail = errorType === "internal_error" && llmProviderPatterns.some((pattern) => detail.includes(pattern));
+          const isLlmErrorFromDetail = llmProviderPatterns.some((pattern) => detail.includes(pattern));
           if (errorType === "llm_error" || isLlmErrorFromDetail) {
             const attempt = llmApiErrorRetries + 1;
             const baseDelayMs = 1000;
@@ -53854,10 +53887,10 @@ __export(exports_settings, {
   loadProjectSettings: () => loadProjectSettings,
   getSetting: () => getSetting
 });
-import { homedir as homedir7 } from "node:os";
-import { join as join14 } from "node:path";
+import { homedir as homedir9 } from "node:os";
+import { join as join16 } from "node:path";
 function getSettingsPath() {
-  return join14(homedir7(), ".letta", "settings.json");
+  return join16(homedir9(), ".letta", "settings.json");
 }
 async function loadSettings() {
   const settingsPath = getSettingsPath();
@@ -53894,7 +53927,7 @@ async function getSetting(key) {
   return settings[key];
 }
 function getProjectSettingsPath() {
-  return join14(process.cwd(), ".letta", "settings.local.json");
+  return join16(process.cwd(), ".letta", "settings.local.json");
 }
 async function loadProjectSettings() {
   const settingsPath = getProjectSettingsPath();
@@ -53912,7 +53945,7 @@ async function loadProjectSettings() {
 }
 async function saveProjectSettings(settings) {
   const settingsPath = getProjectSettingsPath();
-  const dirPath = join14(process.cwd(), ".letta");
+  const dirPath = join16(process.cwd(), ".letta");
   try {
     if (!exists(dirPath)) {
       await mkdir(dirPath, { recursive: true });
@@ -57510,12 +57543,18 @@ var init_BlinkDot = __esm(async () => {
 });
 
 // src/cli/components/CollapsedOutputDisplay.tsx
-var import_react35, jsx_dev_runtime15, COLLAPSED_LINES = 3, CollapsedOutputDisplay;
+var import_react35, jsx_dev_runtime15, COLLAPSED_LINES = 3, PREFIX_WIDTH = 5, CollapsedOutputDisplay;
 var init_CollapsedOutputDisplay = __esm(async () => {
-  await init_build2();
+  init_useTerminalWidth();
+  await __promiseAll([
+    init_build2(),
+    init_MarkdownDisplay()
+  ]);
   import_react35 = __toESM(require_react(), 1);
   jsx_dev_runtime15 = __toESM(require_jsx_dev_runtime(), 1);
   CollapsedOutputDisplay = import_react35.memo(({ output }) => {
+    const columns = useTerminalWidth();
+    const contentWidth = Math.max(0, columns - PREFIX_WIDTH);
     const lines = output.split(`
 `);
     if (lines.length > 0 && lines[lines.length - 1] === "") {
@@ -57530,28 +57569,65 @@ var init_CollapsedOutputDisplay = __esm(async () => {
       flexDirection: "column",
       children: [
         /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+          flexDirection: "row",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
-              children: "  ⎿  "
+            /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+              width: PREFIX_WIDTH,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+                children: "  ⎿  "
+              }, undefined, false, undefined, this)
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
-              children: visibleLines[0]
+            /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(MarkdownDisplay, {
+                text: visibleLines[0] ?? ""
+              }, undefined, false, undefined, this)
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        visibleLines.slice(1).map((line, i) => /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+        visibleLines.slice(1).map((line, i) => /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+          flexDirection: "row",
           children: [
-            "     ",
-            line
+            /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+              width: PREFIX_WIDTH,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+                children: "     "
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(MarkdownDisplay, {
+                text: line
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this)
           ]
         }, i, true, undefined, this)),
-        hiddenCount > 0 && /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
-          dimColor: true,
+        hiddenCount > 0 && /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+          flexDirection: "row",
           children: [
-            "     ",
-            "… +",
-            hiddenCount,
-            " lines"
+            /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+              width: PREFIX_WIDTH,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+                children: "     "
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+                dimColor: true,
+                children: [
+                  "… +",
+                  hiddenCount,
+                  " lines"
+                ]
+              }, undefined, true, undefined, this)
+            }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this)
       ]
@@ -58741,8 +58817,8 @@ import {
   readFileSync as readFileSync3,
   writeFileSync as writeFileSync2
 } from "node:fs";
-import { homedir as homedir8, platform as platform3 } from "node:os";
-import { dirname as dirname10, join as join15 } from "node:path";
+import { homedir as homedir10, platform as platform3 } from "node:os";
+import { dirname as dirname10, join as join17 } from "node:path";
 function detectTerminalType() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
     return "cursor";
@@ -58774,16 +58850,16 @@ function getKeybindingsPath(terminal) {
   }[terminal];
   const os4 = platform3();
   if (os4 === "darwin") {
-    return join15(homedir8(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join17(homedir10(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os4 === "win32") {
     const appData = process.env.APPDATA;
     if (!appData)
       return null;
-    return join15(appData, appName, "User", "keybindings.json");
+    return join17(appData, appName, "User", "keybindings.json");
   }
   if (os4 === "linux") {
-    return join15(homedir8(), ".config", appName, "User", "keybindings.json");
+    return join17(homedir10(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -58936,14 +59012,14 @@ function getWezTermConfigPath() {
   }
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
-    const xdgPath = join15(xdgConfig, "wezterm", "wezterm.lua");
+    const xdgPath = join17(xdgConfig, "wezterm", "wezterm.lua");
     if (existsSync10(xdgPath))
       return xdgPath;
   }
-  const configPath = join15(homedir8(), ".config", "wezterm", "wezterm.lua");
+  const configPath = join17(homedir10(), ".config", "wezterm", "wezterm.lua");
   if (existsSync10(configPath))
     return configPath;
-  return join15(homedir8(), ".wezterm.lua");
+  return join17(homedir10(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists(configPath) {
   if (!existsSync10(configPath))
@@ -59265,14 +59341,14 @@ Location: ${keybindingsPath}`;
       }
     },
     "/connect": {
-      desc: "Connect an existing Claude account (/connect claude)",
+      desc: "Connect an existing account (/connect zai <api-key>)",
       order: 40,
       handler: () => {
-        return "Initiating OAuth connection...";
+        return "Initiating account connection...";
       }
     },
     "/disconnect": {
-      desc: "Disconnect from Claude OAuth",
+      desc: "Disconnect an existing account (/disconnect zai)",
       order: 41,
       handler: () => {
         return "Disconnecting...";
@@ -59379,7 +59455,7 @@ __export(exports_custom, {
 });
 import { existsSync as existsSync11 } from "node:fs";
 import { readdir as readdir7, readFile as readFile8 } from "node:fs/promises";
-import { basename as basename3, dirname as dirname11, join as join16 } from "node:path";
+import { basename as basename3, dirname as dirname11, join as join18 } from "node:path";
 async function getCustomCommands() {
   if (cachedCommands !== null) {
     return cachedCommands;
@@ -59390,7 +59466,7 @@ async function getCustomCommands() {
 function refreshCustomCommands() {
   cachedCommands = null;
 }
-async function discoverCustomCommands(projectPath = join16(process.cwd(), COMMANDS_DIR)) {
+async function discoverCustomCommands(projectPath = join18(process.cwd(), COMMANDS_DIR)) {
   const commandsById = new Map;
   const userCommands = await discoverFromDirectory(GLOBAL_COMMANDS_DIR, "user");
   for (const cmd of userCommands) {
@@ -59422,7 +59498,7 @@ async function findCommandFiles(currentPath, rootPath, commands2, source) {
   try {
     const entries = await readdir7(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join16(currentPath, entry.name);
+      const fullPath = join18(currentPath, entry.name);
       if (entry.isDirectory()) {
         await findCommandFiles(fullPath, rootPath, commands2, source);
       } else if (entry.isFile() && entry.name.endsWith(".md")) {
@@ -59507,7 +59583,7 @@ async function findCustomCommand(commandName) {
 }
 var COMMANDS_DIR = ".commands", GLOBAL_COMMANDS_DIR, cachedCommands = null;
 var init_custom = __esm(() => {
-  GLOBAL_COMMANDS_DIR = join16(process.env.HOME || process.env.USERPROFILE || "~", ".letta/commands");
+  GLOBAL_COMMANDS_DIR = join18(process.env.HOME || process.env.USERPROFILE || "~", ".letta/commands");
 });
 
 // src/cli/components/HelpDialog.tsx
@@ -64479,7 +64555,7 @@ var init_AgentInfoBar = __esm(async () => {
 
 // src/cli/helpers/fileSearch.ts
 import { readdirSync as readdirSync4, statSync as statSync3 } from "node:fs";
-import { join as join17, resolve as resolve19 } from "node:path";
+import { join as join19, resolve as resolve19 } from "node:path";
 function searchDirectoryRecursive(dir, pattern, maxResults = 200, results = []) {
   if (results.length >= maxResults) {
     return results;
@@ -64491,7 +64567,7 @@ function searchDirectoryRecursive(dir, pattern, maxResults = 200, results = [])
         continue;
       }
       try {
-        const fullPath = join17(dir, entry);
+        const fullPath = join19(dir, entry);
         const stats = statSync3(fullPath);
         const relativePath = fullPath.startsWith(process.cwd()) ? fullPath.slice(process.cwd().length + 1) : fullPath;
         const matches = pattern.length === 0 || relativePath.toLowerCase().includes(pattern.toLowerCase());
@@ -64543,7 +64619,7 @@ async function searchFiles(query, deep = false) {
       const matchingEntries = searchPattern.length === 0 ? entries : entries.filter((entry) => entry.toLowerCase().includes(searchPattern.toLowerCase()));
       for (const entry of matchingEntries.slice(0, 50)) {
         try {
-          const fullPath = join17(searchDir, entry);
+          const fullPath = join19(searchDir, entry);
           const stats = statSync3(fullPath);
           const relativePath = fullPath.startsWith(process.cwd()) ? fullPath.slice(process.cwd().length + 1) : fullPath;
           results.push({
@@ -68994,6 +69070,7 @@ var init_StaticPlanApproval = __esm(async () => {
     onApprove,
     onApproveAndAcceptEdits,
     onKeepPlanning,
+    onCancel,
     isFocused = true
   }) => {
     const [selectedOption, setSelectedOption] = import_react71.useState(0);
@@ -69013,7 +69090,7 @@ var init_StaticPlanApproval = __esm(async () => {
       if (!isFocused)
         return;
       if (key.ctrl && input === "c") {
-        onKeepPlanning("User pressed CTRL-C to cancel");
+        onCancel();
         return;
       }
       if (key.upArrow) {
@@ -72135,10 +72212,86 @@ var init_useSyncedState = __esm(() => {
   import_react81 = __toESM(require_react(), 1);
 });
 
+// src/providers/zai-provider.ts
+async function getLettaConfig2() {
+  const settings = await settingsManager.getSettingsWithSecureTokens();
+  const baseUrl = process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL || LETTA_CLOUD_API_URL;
+  const apiKey = process.env.LETTA_API_KEY || settings.env?.LETTA_API_KEY || "";
+  return { baseUrl, apiKey };
+}
+async function providersRequest2(method, path20, body) {
+  const { baseUrl, apiKey } = await getLettaConfig2();
+  const url = `${baseUrl}${path20}`;
+  const response = await fetch(url, {
+    method,
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${apiKey}`,
+      "X-Letta-Source": "letta-code"
+    },
+    ...body && { body: JSON.stringify(body) }
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Provider API error (${response.status}): ${errorText}`);
+  }
+  const text = await response.text();
+  if (!text) {
+    return {};
+  }
+  return JSON.parse(text);
+}
+async function listProviders2() {
+  try {
+    const response = await providersRequest2("GET", "/v1/providers");
+    return response;
+  } catch {
+    return [];
+  }
+}
+async function getZaiProvider() {
+  const providers = await listProviders2();
+  return providers.find((p) => p.name === ZAI_PROVIDER_NAME) || null;
+}
+async function createZaiProvider(apiKey) {
+  return providersRequest2("POST", "/v1/providers", {
+    name: ZAI_PROVIDER_NAME,
+    provider_type: "zai",
+    api_key: apiKey
+  });
+}
+async function updateZaiProvider(providerId, apiKey) {
+  return providersRequest2("PATCH", `/v1/providers/${providerId}`, {
+    api_key: apiKey
+  });
+}
+async function createOrUpdateZaiProvider(apiKey) {
+  const existing = await getZaiProvider();
+  if (existing) {
+    return updateZaiProvider(existing.id, apiKey);
+  }
+  return createZaiProvider(apiKey);
+}
+async function deleteZaiProvider(providerId) {
+  await providersRequest2("DELETE", `/v1/providers/${providerId}`);
+}
+async function removeZaiProvider() {
+  const existing = await getZaiProvider();
+  if (existing) {
+    await deleteZaiProvider(existing.id);
+  }
+}
+var ZAI_PROVIDER_NAME = "zai-coding-plan";
+var init_zai_provider = __esm(async () => {
+  init_oauth();
+  await init_settings_manager();
+});
+
 // src/cli/commands/connect.ts
 var exports_connect = {};
 __export(exports_connect, {
   handleDisconnect: () => handleDisconnect,
+  handleConnectZai: () => handleConnectZai,
   handleConnect: () => handleConnect
 });
 function uid3(prefix) {
@@ -72176,16 +72329,22 @@ async function handleConnect(ctx, msg) {
   const provider = parts[1]?.toLowerCase();
   const authCode = parts.slice(2).join("");
   if (!provider) {
-    addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, `Usage: /connect claude
+    addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, `Usage: /connect <provider> [options]
 
-Connect to Claude via OAuth to authenticate without an API key.`, false);
+Available providers:
+  • claude          - Connect via OAuth to authenticate without an API key
+  • zai <api_key>   - Connect to Zai with your API key`, false);
     return;
   }
-  if (provider !== "claude") {
+  if (provider !== "claude" && provider !== "zai") {
     addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, `Error: Unknown provider "${provider}"
 
-Currently only 'claude' provider is supported.
-Usage: /connect claude`, false);
+Available providers: claude, zai
+Usage: /connect <provider> [options]`, false);
+    return;
+  }
+  if (provider === "zai") {
+    await handleConnectZai(ctx, msg);
     return;
   }
   if (authCode && authCode.length > 0) {
@@ -72305,13 +72464,26 @@ If you have an Anthropic API key, you can use it directly by setting:
 async function handleDisconnect(ctx, msg) {
   const parts = msg.trim().split(/\s+/);
   const provider = parts[1]?.toLowerCase();
-  if (provider && provider !== "claude") {
-    addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, `Error: Unknown provider "${provider}"
+  if (!provider) {
+    addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, `Usage: /disconnect <provider>
 
-Currently only 'claude' provider is supported.
-Usage: /disconnect`, false);
+Available providers: claude, zai`, false);
+    return;
+  }
+  if (provider === "zai") {
+    await handleDisconnectZai(ctx, msg);
     return;
   }
+  if (provider === "claude") {
+    await handleDisconnectClaude(ctx, msg);
+    return;
+  }
+  addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, `Error: Unknown provider "${provider}"
+
+Available providers: claude, zai
+Usage: /disconnect <provider>`, false);
+}
+async function handleDisconnectClaude(ctx, msg) {
   if (!settingsManager.hasAnthropicOAuth()) {
     addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, `Not currently connected to Claude via OAuth.
 
@@ -72336,10 +72508,58 @@ Your local OAuth tokens have been removed.`, true, "finished");
     ctx.setCommandRunning(false);
   }
 }
+async function handleDisconnectZai(ctx, msg) {
+  const existing = await getZaiProvider();
+  if (!existing) {
+    addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, `Not currently connected to Zai.
+
+Use /connect zai <api_key> to connect.`, false);
+    return;
+  }
+  const cmdId = addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, "Disconnecting from Zai...", true, "running");
+  ctx.setCommandRunning(true);
+  try {
+    await removeZaiProvider();
+    updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✓ Disconnected from Zai.
+
+` + `Provider '${ZAI_PROVIDER_NAME}' removed from Letta.`, true, "finished");
+  } catch (error) {
+    updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✗ Failed to disconnect from Zai: ${getErrorMessage(error)}`, false, "finished");
+  } finally {
+    ctx.setCommandRunning(false);
+  }
+}
+async function handleConnectZai(ctx, msg) {
+  const parts = msg.trim().split(/\s+/);
+  const apiKey = parts.slice(2).join("");
+  if (!apiKey || apiKey.length === 0) {
+    addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, `Usage: /connect zai <api_key>
+
+Connect to Zai by providing your API key.
+
+Example: /connect zai <api_key>...`, false);
+    return;
+  }
+  const cmdId = addCommandResult3(ctx.buffersRef, ctx.refreshDerived, msg, "Creating Zai coding plan provider...", true, "running");
+  ctx.setCommandRunning(true);
+  try {
+    await createOrUpdateZaiProvider(apiKey);
+    updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✓ Successfully connected to Zai!
+
+` + `Provider '${ZAI_PROVIDER_NAME}' created in Letta.
+
+` + `The models are populated in /model → "All Available Models"`, true, "finished");
+  } catch (error) {
+    updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✗ Failed to create Zai provider: ${getErrorMessage(error)}`, false, "finished");
+  } finally {
+    ctx.setCommandRunning(false);
+  }
+}
 var init_connect = __esm(async () => {
   init_anthropic_oauth();
   await __promiseAll([
     init_anthropic_provider(),
+    init_zai_provider(),
     init_settings_manager()
   ]);
 });
@@ -72520,6 +72740,8 @@ __export(exports_App, {
   default: () => App2
 });
 import { existsSync as existsSync12, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "node:fs";
+import { homedir as homedir11 } from "node:os";
+import { join as join20 } from "node:path";
 function uid4(prefix) {
   return `${prefix}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
 }
@@ -72529,7 +72751,19 @@ function sendDesktopNotification() {
 async function isRetriableError(stopReason, lastRunId) {
   if (stopReason === "llm_api_error")
     return true;
-  if (stopReason === "error" && lastRunId) {
+  const nonRetriableReasons = [
+    "cancelled",
+    "requires_approval",
+    "max_steps",
+    "max_tokens_exceeded",
+    "context_window_overflow_in_system_prompt",
+    "end_turn",
+    "tool_rule",
+    "no_tool_call"
+  ];
+  if (nonRetriableReasons.includes(stopReason))
+    return false;
+  if (lastRunId) {
     try {
       const client = await getClient2();
       const run = await client.runs.retrieve(lastRunId);
@@ -72543,9 +72777,10 @@ async function isRetriableError(stopReason, lastRunId) {
         "OpenAI API error",
         "Google Vertex API error",
         "overloaded",
-        "api_error"
+        "api_error",
+        "Network error"
       ];
-      if (errorType === "internal_error" && llmProviderPatterns.some((pattern) => detail.includes(pattern))) {
+      if (llmProviderPatterns.some((pattern) => detail.includes(pattern))) {
         return true;
       }
       return false;
@@ -74460,6 +74695,15 @@ ${newState.originalPrompt}`
         const parts = msg.trim().split(/\s+/);
         const provider = parts[1]?.toLowerCase();
         const hasCode = parts.length > 2;
+        if (provider === "zai") {
+          const { handleConnectZai: handleConnectZai2 } = await init_connect().then(() => exports_connect);
+          await handleConnectZai2({
+            buffersRef,
+            refreshDerived,
+            setCommandRunning
+          }, msg);
+          return { submitted: true };
+        }
         if (provider === "claude" && !hasCode) {
           setActiveOverlay("oauth");
           return { submitted: true };
@@ -76501,13 +76745,47 @@ Consider switching to a different system prompt using /system to match.` : null;
   import_react82.useEffect(() => {
     const currentIndex = approvalResults.length;
     const approval = pendingApprovals[currentIndex];
-    if (approval?.toolName === "ExitPlanMode" && !planFileExists()) {
-      const planFilePath = permissionMode2.getPlanFilePath();
-      handlePlanKeepPlanning(`You must write your plan to the plan file before exiting plan mode.
-` + `Plan file path: ${planFilePath || "not set"}
-` + `Use a write tool (e.g. Write, ApplyPatch, etc.) to create your plan, then call ExitPlanMode again.`);
+    if (approval?.toolName === "ExitPlanMode") {
+      if (permissionMode2.getMode() !== "plan") {
+        const statusId = uid4("status");
+        buffersRef.current.byId.set(statusId, {
+          kind: "status",
+          id: statusId,
+          lines: ["⚠️ Plan mode session expired (use /plan to re-enter)"]
+        });
+        buffersRef.current.order.push(statusId);
+        const denialResults = [
+          {
+            type: "approval",
+            tool_call_id: approval.toolCallId,
+            approve: false,
+            reason: "Plan mode session expired (CLI restarted). Use EnterPlanMode to re-enter plan mode, or request the user to re-enter plan mode."
+          }
+        ];
+        setQueuedApprovalResults(denialResults);
+        markIncompleteToolsAsCancelled(buffersRef.current);
+        refreshDerived();
+        setPendingApprovals([]);
+        setApprovalContexts([]);
+        setApprovalResults([]);
+        setAutoHandledResults([]);
+        setAutoDeniedApprovals([]);
+        return;
+      }
+      if (!planFileExists()) {
+        const planFilePath = permissionMode2.getPlanFilePath();
+        const plansDir = join20(homedir11(), ".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.`);
+      }
     }
-  }, [pendingApprovals, approvalResults.length, handlePlanKeepPlanning]);
+  }, [
+    pendingApprovals,
+    approvalResults.length,
+    handlePlanKeepPlanning,
+    refreshDerived
+  ]);
   const handleQuestionSubmit = import_react82.useCallback(async (answers) => {
     const currentIndex = approvalResults.length;
     const approval = pendingApprovals[currentIndex];
@@ -76537,6 +76815,9 @@ Consider switching to a different system prompt using /system to match.` : null;
     });
     setThinkingMessage(getRandomThinkingVerb());
     refreshDerived();
+    if (approval.toolCallId) {
+      eagerCommittedPreviewsRef.current.add(approval.toolCallId);
+    }
     const decision = {
       type: "approve",
       approval,
@@ -76710,11 +76991,13 @@ Plan file path: ${planFilePath}`;
       });
       buffersRef.current.order.push(statusId);
       refreshDerived();
+      commitEligibleLines(buffersRef.current);
     }
   }, [
     loadingState,
     continueSession,
     messageHistory.length,
+    commitEligibleLines,
     columns,
     agentProvenance,
     agentState,
@@ -76784,6 +77067,9 @@ Plan file path: ${planFilePath}`;
                       if (ln.kind === "tool_call" && ln.name && isTaskTool(ln.name) && ln.toolCallId && !pendingIds.has(ln.toolCallId)) {
                         return null;
                       }
+                      if (ln.kind === "tool_call" && ln.toolCallId && eagerCommittedPreviewsRef.current.has(ln.toolCallId) && ln.toolCallId !== currentApproval?.toolCallId) {
+                        return null;
+                      }
                       const isExitPlanModeApproval = ln.kind === "tool_call" && currentApproval?.toolName === "ExitPlanMode" && ln.toolCallId === currentApproval?.toolCallId;
                       const isFileEditApproval = ln.kind === "tool_call" && currentApproval && (isFileEditTool(currentApproval.toolName) || isFileWriteTool(currentApproval.toolName) || isPatchTool(currentApproval.toolName)) && ln.toolCallId === currentApproval.toolCallId;
                       const isBashApproval = ln.kind === "tool_call" && currentApproval && isShellTool(currentApproval.toolName) && ln.toolCallId === currentApproval.toolCallId;
@@ -76867,6 +77153,7 @@ Plan file path: ${planFilePath}`;
                           onApprove: () => handlePlanApprove(false),
                           onApproveAndAcceptEdits: () => handlePlanApprove(true),
                           onKeepPlanning: handlePlanKeepPlanning,
+                          onCancel: handleCancelApprovals,
                           isFocused: true
                         }, undefined, false, undefined, this) : isFileEditApproval && fileEditInfo ? /* @__PURE__ */ jsx_dev_runtime59.jsxDEV(InlineFileEditApproval, {
                           fileEdit: fileEditInfo,
@@ -76946,6 +77233,20 @@ Plan file path: ${planFilePath}`;
                       }, ln.id, false, undefined, this);
                     })
                   }, undefined, false, undefined, this),
+                  liveItems.length === 0 && currentApproval && /* @__PURE__ */ jsx_dev_runtime59.jsxDEV(Box_default, {
+                    flexDirection: "column",
+                    children: /* @__PURE__ */ jsx_dev_runtime59.jsxDEV(InlineGenericApproval, {
+                      toolName: currentApproval.toolName,
+                      toolArgs: currentApproval.toolArgs,
+                      onApprove: () => handleApproveCurrent(),
+                      onApproveAlways: (scope) => handleApproveAlways(scope),
+                      onDeny: (reason) => handleDenyCurrent(reason),
+                      onCancel: handleCancelApprovals,
+                      isFocused: true,
+                      approveAlwaysText: currentApprovalContext?.approveAlwaysText,
+                      allowPersistence: currentApprovalContext?.allowPersistence ?? true
+                    }, undefined, false, undefined, this)
+                  }, undefined, false, undefined, this),
                   /* @__PURE__ */ jsx_dev_runtime59.jsxDEV(SubagentGroupDisplay, {}, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this),
@@ -77254,8 +77555,8 @@ import {
   readFileSync as readFileSync5,
   writeFileSync as writeFileSync4
 } from "node:fs";
-import { homedir as homedir9, platform as platform5 } from "node:os";
-import { dirname as dirname12, join as join18 } from "node:path";
+import { homedir as homedir12, platform as platform5 } from "node:os";
+import { dirname as dirname12, join as join21 } from "node:path";
 function detectTerminalType2() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
     return "cursor";
@@ -77287,16 +77588,16 @@ function getKeybindingsPath2(terminal) {
   }[terminal];
   const os5 = platform5();
   if (os5 === "darwin") {
-    return join18(homedir9(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join21(homedir12(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os5 === "win32") {
     const appData = process.env.APPDATA;
     if (!appData)
       return null;
-    return join18(appData, appName, "User", "keybindings.json");
+    return join21(appData, appName, "User", "keybindings.json");
   }
   if (os5 === "linux") {
-    return join18(homedir9(), ".config", appName, "User", "keybindings.json");
+    return join21(homedir12(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -77449,14 +77750,14 @@ function getWezTermConfigPath2() {
   }
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
-    const xdgPath = join18(xdgConfig, "wezterm", "wezterm.lua");
+    const xdgPath = join21(xdgConfig, "wezterm", "wezterm.lua");
     if (existsSync13(xdgPath))
       return xdgPath;
   }
-  const configPath = join18(homedir9(), ".config", "wezterm", "wezterm.lua");
+  const configPath = join21(homedir12(), ".config", "wezterm", "wezterm.lua");
   if (existsSync13(configPath))
     return configPath;
-  return join18(homedir9(), ".wezterm.lua");
+  return join21(homedir12(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists2(configPath) {
   if (!existsSync13(configPath))
@@ -77554,10 +77855,10 @@ __export(exports_settings2, {
   loadProjectSettings: () => loadProjectSettings2,
   getSetting: () => getSetting2
 });
-import { homedir as homedir10 } from "node:os";
-import { join as join19 } from "node:path";
+import { homedir as homedir13 } from "node:os";
+import { join as join22 } from "node:path";
 function getSettingsPath2() {
-  return join19(homedir10(), ".letta", "settings.json");
+  return join22(homedir13(), ".letta", "settings.json");
 }
 async function loadSettings2() {
   const settingsPath = getSettingsPath2();
@@ -77594,7 +77895,7 @@ async function getSetting2(key) {
   return settings[key];
 }
 function getProjectSettingsPath2() {
-  return join19(process.cwd(), ".letta", "settings.local.json");
+  return join22(process.cwd(), ".letta", "settings.local.json");
 }
 async function loadProjectSettings2() {
   const settingsPath = getProjectSettingsPath2();
@@ -77612,7 +77913,7 @@ async function loadProjectSettings2() {
 }
 async function saveProjectSettings2(settings) {
   const settingsPath = getProjectSettingsPath2();
-  const dirPath = join19(process.cwd(), ".letta");
+  const dirPath = join22(process.cwd(), ".letta");
   try {
     if (!exists(dirPath)) {
       await mkdir(dirPath, { recursive: true });
@@ -77644,7 +77945,7 @@ var exports_create = {};
 __export(exports_create, {
   createAgent: () => createAgent2
 });
-import { join as join20 } from "node:path";
+import { join as join23 } from "node:path";
 async function createAgent2(nameOrOptions = DEFAULT_AGENT_NAME, model, embeddingModel = "openai/text-embedding-3-small", updateArgs, skillsDirectory, parallelToolCalls = true, enableSleeptime = false, systemPromptPreset, initBlocks, baseTools) {
   let options;
   if (typeof nameOrOptions === "object") {
@@ -77739,7 +78040,7 @@ async function createAgent2(nameOrOptions = DEFAULT_AGENT_NAME, model, embedding
       }
     }
   }
-  const resolvedSkillsDirectory = options.skillsDirectory || join20(process.cwd(), SKILLS_DIR);
+  const resolvedSkillsDirectory = options.skillsDirectory || join23(process.cwd(), SKILLS_DIR);
   try {
     const { skills, errors } = await discoverSkills(resolvedSkillsDirectory);
     if (errors.length > 0) {
@@ -78104,6 +78405,10 @@ import { parseArgs as parseArgs2 } from "util";
 
 // src/agent/check-approval.ts
 var MESSAGE_HISTORY_LIMIT = 15;
+function isBackfillEnabled() {
+  const val = process.env.LETTA_BACKFILL;
+  return val !== "0" && val !== "false";
+}
 async function getResumeData(client, agent) {
   try {
     const messagesPage = await client.agents.messages.list(agent.id);
@@ -78126,6 +78431,13 @@ async function getResumeData(client, agent) {
     const inContextLastMessageId = agent.message_ids && agent.message_ids.length > 0 ? agent.message_ids[agent.message_ids.length - 1] : null;
     if (!inContextLastMessageId) {
       debugWarn("check-approval", `No in-context messages (message_ids empty/null) - no pending approvals`);
+      if (!isBackfillEnabled()) {
+        return {
+          pendingApproval: null,
+          pendingApprovals: [],
+          messageHistory: []
+        };
+      }
       const historyCount2 = Math.min(MESSAGE_HISTORY_LIMIT, messages.length);
       let messageHistory2 = messages.slice(-historyCount2);
       if (messageHistory2[0]?.message_type === "tool_return_message") {
@@ -78176,6 +78488,9 @@ async function getResumeData(client, agent) {
         }
       }
     }
+    if (!isBackfillEnabled()) {
+      return { pendingApproval, pendingApprovals, messageHistory: [] };
+    }
     const historyCount = Math.min(MESSAGE_HISTORY_LIMIT, messages.length);
     let messageHistory = messages.slice(-historyCount);
     if (messageHistory[0]?.message_type === "tool_return_message") {
@@ -78560,6 +78875,8 @@ function ProfileSelectionInline({
 
 // src/permissions/mode.ts
 init_readOnlyShell();
+import { homedir as homedir3 } from "node:os";
+import { join as join2 } from "node:path";
 var MODE_KEY = Symbol.for("@letta/permissionMode");
 var PLAN_FILE_KEY = Symbol.for("@letta/planFilePath");
 function getGlobalMode() {
@@ -78664,7 +78981,7 @@ class PermissionModeManager {
           return "allow";
         }
         if (writeTools.includes(toolName)) {
-          const planFilePath = this.getPlanFilePath();
+          const plansDir = join2(homedir3(), ".letta", "plans");
           let targetPath = toolArgs?.file_path || toolArgs?.path;
           if ((toolName === "ApplyPatch" || toolName === "apply_patch") && toolArgs?.input) {
             const input = toolArgs.input;
@@ -78673,7 +78990,7 @@ class PermissionModeManager {
               targetPath = match[1].trim();
             }
           }
-          if (planFilePath && targetPath && targetPath === planFilePath) {
+          if (targetPath && targetPath.startsWith(plansDir) && targetPath.endsWith(".md")) {
             return "allow";
           }
         }
@@ -78729,8 +79046,8 @@ var permissionMode = new PermissionModeManager;
 // src/settings-manager.ts
 init_fs();
 await init_secrets();
-import { homedir as homedir3 } from "node:os";
-import { join as join2 } from "node:path";
+import { homedir as homedir4 } from "node:os";
+import { join as join3 } from "node:path";
 var DEFAULT_SETTINGS2 = {
   lastAgent: null,
   tokenStreaming: false,
@@ -78976,8 +79293,8 @@ class SettingsManager2 {
     if (!this.settings)
       return;
     const settingsPath = this.getSettingsPath();
-    const home = process.env.HOME || homedir3();
-    const dirPath = join2(home, ".letta");
+    const home = process.env.HOME || homedir4();
+    const dirPath = join3(home, ".letta");
     try {
       if (!exists(dirPath)) {
         await mkdir(dirPath, { recursive: true });
@@ -78993,7 +79310,7 @@ class SettingsManager2 {
     if (!settings)
       return;
     const settingsPath = this.getProjectSettingsPath(workingDirectory);
-    const dirPath = join2(workingDirectory, ".letta");
+    const dirPath = join3(workingDirectory, ".letta");
     try {
       let existingSettings = {};
       if (exists(settingsPath)) {
@@ -79014,14 +79331,14 @@ class SettingsManager2 {
     }
   }
   getSettingsPath() {
-    const home = process.env.HOME || homedir3();
-    return join2(home, ".letta", "settings.json");
+    const home = process.env.HOME || homedir4();
+    return join3(home, ".letta", "settings.json");
   }
   getProjectSettingsPath(workingDirectory) {
-    return join2(workingDirectory, ".letta", "settings.json");
+    return join3(workingDirectory, ".letta", "settings.json");
   }
   getLocalProjectSettingsPath(workingDirectory) {
-    return join2(workingDirectory, ".letta", "settings.local.json");
+    return join3(workingDirectory, ".letta", "settings.local.json");
   }
   async loadLocalProjectSettings(workingDirectory = process.cwd()) {
     const cached = this.localProjectSettings.get(workingDirectory);
@@ -79072,7 +79389,7 @@ class SettingsManager2 {
     if (!settings)
       return;
     const settingsPath = this.getLocalProjectSettingsPath(workingDirectory);
-    const dirPath = join2(workingDirectory, ".letta");
+    const dirPath = join3(workingDirectory, ".letta");
     try {
       if (!exists(dirPath)) {
         await mkdir(dirPath, { recursive: true });
@@ -79182,7 +79499,7 @@ class SettingsManager2 {
     console.warn("unpinProfile is deprecated, use unpinLocal(agentId) instead");
   }
   hasLocalLettaDir(workingDirectory = process.cwd()) {
-    const dirPath = join2(workingDirectory, ".letta");
+    const dirPath = join3(workingDirectory, ".letta");
     return exists(dirPath);
   }
   storeAnthropicTokens(tokens) {
@@ -79773,12 +80090,12 @@ EXAMPLES
   console.log(usage);
 }
 async function printInfo() {
-  const { join: join21 } = await import("path");
+  const { join: join24 } = await import("path");
   const { getVersion: getVersion3 } = await Promise.resolve().then(() => (init_version2(), exports_version));
   const { SKILLS_DIR: SKILLS_DIR3 } = await Promise.resolve().then(() => (init_skills3(), exports_skills2));
   const { exists: exists3 } = await Promise.resolve().then(() => (init_fs2(), exports_fs));
   const cwd2 = process.cwd();
-  const skillsDir = join21(cwd2, SKILLS_DIR3);
+  const skillsDir = join24(cwd2, SKILLS_DIR3);
   const skillsExist = exists3(skillsDir);
   await settingsManager2.loadLocalProjectSettings(cwd2);
   const localPinned = settingsManager2.getLocalPinnedAgents(cwd2);
@@ -80437,8 +80754,8 @@ Error: ${message}`);
         await initializeLoadedSkillsFlag();
         try {
           const { discoverSkills: discoverSkills3, formatSkillsForMemory: formatSkillsForMemory3, SKILLS_DIR: SKILLS_DIR3 } = await Promise.resolve().then(() => (init_skills3(), exports_skills2));
-          const { join: join21 } = await import("path");
-          const resolvedSkillsDirectory = skillsDirectory2 || join21(process.cwd(), SKILLS_DIR3);
+          const { join: join24 } = await import("path");
+          const resolvedSkillsDirectory = skillsDirectory2 || join24(process.cwd(), SKILLS_DIR3);
           const { skills, errors } = await discoverSkills3(resolvedSkillsDirectory);
           if (errors.length > 0) {
             console.warn("Errors encountered during skill discovery:");
@@ -80582,4 +80899,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=FBA441943F68A1FC64756E2164756E21
+//# debugId=C1C8E8CD6D145E1A64756E2164756E21