@letta-ai/letta-code 0.16.7 → 0.16.9

package/letta.js

@@ -3122,7 +3122,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.16.7",
+    version: "0.16.9",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -3521,7 +3521,7 @@ __export(exports_settings_manager, {
 });
 import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 function isSubagentProcess() {
   return process.env.LETTA_CODE_AGENT_ROLE === "subagent";
 }
@@ -3781,6 +3781,11 @@ class SettingsManager {
     }
   }
   async loadProjectSettings(workingDirectory = process.cwd()) {
+    if (this.isProjectSettingsPathCollidingWithGlobal(workingDirectory)) {
+      const defaults2 = { ...DEFAULT_PROJECT_SETTINGS };
+      this.projectSettings.set(workingDirectory, defaults2);
+      return defaults2;
+    }
     const cached = this.projectSettings.get(workingDirectory);
     if (cached) {
       return { ...cached };
@@ -3816,6 +3821,19 @@ class SettingsManager {
     return { ...cached };
   }
   updateProjectSettings(updates, workingDirectory = process.cwd()) {
+    if (this.isProjectSettingsPathCollidingWithGlobal(workingDirectory)) {
+      const globalUpdates = {};
+      if ("hooks" in updates) {
+        globalUpdates.hooks = updates.hooks;
+      }
+      if ("statusLine" in updates) {
+        globalUpdates.statusLine = updates.statusLine;
+      }
+      if (Object.keys(globalUpdates).length > 0) {
+        this.updateSettings(globalUpdates);
+      }
+      return;
+    }
     const current = this.projectSettings.get(workingDirectory);
     if (!current) {
       throw new Error(`Project settings for ${workingDirectory} not loaded. Call loadProjectSettings() first.`);
@@ -3862,6 +3880,9 @@ class SettingsManager {
     }
   }
   async persistProjectSettings(workingDirectory) {
+    if (this.isProjectSettingsPathCollidingWithGlobal(workingDirectory)) {
+      return;
+    }
     const settings = this.projectSettings.get(workingDirectory);
     if (!settings)
       return;
@@ -3893,6 +3914,9 @@ class SettingsManager {
   getProjectSettingsPath(workingDirectory) {
     return join(workingDirectory, ".letta", "settings.json");
   }
+  isProjectSettingsPathCollidingWithGlobal(workingDirectory) {
+    return resolve(this.getProjectSettingsPath(workingDirectory)) === resolve(this.getSettingsPath());
+  }
   getLocalProjectSettingsPath(workingDirectory) {
     return join(workingDirectory, ".letta", "settings.local.json");
   }
@@ -7138,7 +7162,6 @@ var init_models2 = __esm(() => {
       label: "Bedrock Opus 4.5",
       shortLabel: "Opus 4.5 BR",
       description: "Anthropic's best model (via AWS Bedrock)",
-      isFeatured: true,
       updateArgs: {
         context_window: 180000,
         max_output_tokens: 64000,
@@ -7151,7 +7174,6 @@ var init_models2 = __esm(() => {
       handle: "anthropic/claude-haiku-4-5-20251001",
       label: "Haiku 4.5",
       description: "Anthropic's fastest model",
-      isFeatured: true,
       updateArgs: {
         context_window: 180000,
         max_output_tokens: 64000,
@@ -7451,7 +7473,6 @@ var init_models2 = __esm(() => {
       handle: "openai/gpt-5.2-codex",
       label: "GPT-5.2-Codex",
       description: "GPT-5.2 variant (med reasoning) optimized for coding",
-      isFeatured: true,
       updateArgs: {
         reasoning_effort: "medium",
         verbosity: "medium",
@@ -7556,7 +7577,6 @@ var init_models2 = __esm(() => {
       handle: "openai/gpt-5.1-codex",
       label: "GPT-5.1-Codex",
       description: "GPT-5.1 variant (med reasoning) optimized for coding",
-      isFeatured: true,
       updateArgs: {
         reasoning_effort: "medium",
         verbosity: "medium",
@@ -7712,7 +7732,6 @@ var init_models2 = __esm(() => {
       handle: "zai/glm-4.7",
       label: "GLM-4.7",
       description: "zAI's latest coding model (legacy)",
-      isFeatured: true,
       free: true,
       updateArgs: {
         context_window: 200000,
@@ -7737,7 +7756,6 @@ var init_models2 = __esm(() => {
       handle: "minimax/MiniMax-M2.1",
       label: "MiniMax 2.1",
       description: "MiniMax's latest coding model (legacy)",
-      isFeatured: true,
       free: true,
       updateArgs: {
         context_window: 160000,
@@ -7816,7 +7834,6 @@ var init_models2 = __esm(() => {
       handle: "google_ai/gemini-3-pro-preview",
       label: "Gemini 3 Pro",
       description: "Google's smartest model",
-      isFeatured: true,
       updateArgs: {
         context_window: 180000,
         temperature: 1,
@@ -7828,7 +7845,6 @@ var init_models2 = __esm(() => {
       handle: "google_ai/gemini-3-flash-preview",
       label: "Gemini 3 Flash",
       description: "Google's fastest Gemini 3 model",
-      isFeatured: true,
       updateArgs: {
         context_window: 180000,
         temperature: 1,
@@ -8808,7 +8824,7 @@ async function pollForToken2(deviceCode, interval = 5, expiresIn = 900, deviceId
   const expiresInMs = expiresIn * 1000;
   let pollInterval = interval * 1000;
   while (Date.now() - startTime < expiresInMs) {
-    await new Promise((resolve) => setTimeout(resolve, pollInterval));
+    await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
     try {
       const response = await fetch(`${OAUTH_CONFIG2.authBaseUrl}/api/oauth/token`, {
         method: "POST",
@@ -10551,14 +10567,14 @@ Check the top-level render call using <` + parentName + ">.";
             var thenableResult = result;
             var wasAwaited = false;
             var thenable = {
-              then: function(resolve, reject) {
+              then: function(resolve2, reject) {
                 wasAwaited = true;
                 thenableResult.then(function(returnValue2) {
                   popActScope(prevActScopeDepth);
                   if (actScopeDepth === 0) {
-                    recursivelyFlushAsyncActWork(returnValue2, resolve, reject);
+                    recursivelyFlushAsyncActWork(returnValue2, resolve2, reject);
                   } else {
-                    resolve(returnValue2);
+                    resolve2(returnValue2);
                   }
                 }, function(error2) {
                   popActScope(prevActScopeDepth);
@@ -10587,20 +10603,20 @@ Check the top-level render call using <` + parentName + ">.";
                 ReactCurrentActQueue.current = null;
               }
               var _thenable = {
-                then: function(resolve, reject) {
+                then: function(resolve2, reject) {
                   if (ReactCurrentActQueue.current === null) {
                     ReactCurrentActQueue.current = [];
-                    recursivelyFlushAsyncActWork(returnValue, resolve, reject);
+                    recursivelyFlushAsyncActWork(returnValue, resolve2, reject);
                   } else {
-                    resolve(returnValue);
+                    resolve2(returnValue);
                   }
                 }
               };
               return _thenable;
             } else {
               var _thenable2 = {
-                then: function(resolve, reject) {
-                  resolve(returnValue);
+                then: function(resolve2, reject) {
+                  resolve2(returnValue);
                 }
               };
               return _thenable2;
@@ -10616,7 +10632,7 @@ Check the top-level render call using <` + parentName + ">.";
           actScopeDepth = prevActScopeDepth;
         }
       }
-      function recursivelyFlushAsyncActWork(returnValue, resolve, reject) {
+      function recursivelyFlushAsyncActWork(returnValue, resolve2, reject) {
         {
           var queue = ReactCurrentActQueue.current;
           if (queue !== null) {
@@ -10625,16 +10641,16 @@ Check the top-level render call using <` + parentName + ">.";
               enqueueTask(function() {
                 if (queue.length === 0) {
                   ReactCurrentActQueue.current = null;
-                  resolve(returnValue);
+                  resolve2(returnValue);
                 } else {
-                  recursivelyFlushAsyncActWork(returnValue, resolve, reject);
+                  recursivelyFlushAsyncActWork(returnValue, resolve2, reject);
                 }
               });
             } catch (error2) {
               reject(error2);
             }
           } else {
-            resolve(returnValue);
+            resolve2(returnValue);
           }
         }
       }
@@ -31886,8 +31902,8 @@ class Ink {
     }
   }
   async waitUntilExit() {
-    this.exitPromise ||= new Promise((resolve, reject) => {
-      this.resolveExitPromise = resolve;
+    this.exitPromise ||= new Promise((resolve2, reject) => {
+      this.resolveExitPromise = resolve2;
       this.rejectExitPromise = reject;
     });
     return this.exitPromise;
@@ -39691,7 +39707,7 @@ async function executeCommandHook(hook, input, workingDirectory = process.cwd())
   };
 }
 function executeWithLauncher(launcher, inputJson, workingDirectory, input, timeout, command, startTime) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     let stdout = "";
     let stderr = "";
     let timedOut = false;
@@ -39718,7 +39734,7 @@ function executeWithLauncher(launcher, inputJson, workingDirectory, input, timeo
 `);
           console.log(`\x1B[90m${indented}\x1B[0m`);
         }
-        resolve(result);
+        resolve2(result);
       }
     };
     let child;
@@ -39879,6 +39895,14 @@ var init_executor = __esm(async () => {
 });
 
 // src/hooks/loader.ts
+import { homedir as homedir3 } from "node:os";
+import { resolve as resolve2 } from "node:path";
+function isProjectSettingsPathCollidingWithGlobal(workingDirectory) {
+  const home = process.env.HOME || homedir3();
+  const globalSettingsPath = resolve2(home, ".letta", "settings.json");
+  const projectSettingsPath = resolve2(workingDirectory, ".letta", "settings.json");
+  return globalSettingsPath === projectSettingsPath;
+}
 function loadGlobalHooks() {
   try {
     return settingsManager.getSettings().hooks || {};
@@ -39888,6 +39912,9 @@ function loadGlobalHooks() {
   }
 }
 async function loadProjectHooks(workingDirectory = process.cwd()) {
+  if (isProjectSettingsPathCollidingWithGlobal(workingDirectory)) {
+    return {};
+  }
   try {
     try {
       settingsManager.getProjectSettings(workingDirectory);
@@ -40018,20 +40045,20 @@ function areHooksDisabled(workingDirectory = process.cwd()) {
       if (projectDisabled === true) {
         return true;
       }
-    } catch (error) {
-      debugLog("hooks", "areHooksDisabled: Project settings not loaded, skipping", error);
+    } catch {
+      debugLog("hooks", "areHooksDisabled: Project settings not loaded, skipping");
     }
     try {
       const localDisabled = settingsManager.getLocalProjectSettings(workingDirectory)?.hooks?.disabled;
       if (localDisabled === true) {
         return true;
       }
-    } catch (error) {
-      debugLog("hooks", "areHooksDisabled: Local project settings not loaded, skipping", error);
+    } catch {
+      debugLog("hooks", "areHooksDisabled: Local project settings not loaded, skipping");
     }
     return false;
-  } catch (error) {
-    debugLog("hooks", "areHooksDisabled: Failed to check hooks disabled status", error);
+  } catch {
+    debugLog("hooks", "areHooksDisabled: Failed to check hooks disabled status");
     return false;
   }
 }
@@ -41967,11 +41994,11 @@ import {
   rmSync,
   writeFileSync
 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
+import { homedir as homedir4 } from "node:os";
 import { join as join3 } from "node:path";
 import { promisify } from "node:util";
 function getAgentRootDir(agentId) {
-  return join3(homedir3(), ".letta", "agents", agentId);
+  return join3(homedir4(), ".letta", "agents", agentId);
 }
 function getMemoryRepoDir(agentId) {
   return join3(getAgentRootDir(agentId), "memory");
@@ -42724,15 +42751,15 @@ __export(exports_memoryFilesystem, {
   MEMORY_FS_AGENTS_DIR: () => MEMORY_FS_AGENTS_DIR
 });
 import { existsSync as existsSync5, mkdirSync as mkdirSync3 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
+import { homedir as homedir5 } from "node:os";
 import { join as join4 } from "node:path";
-function getMemoryFilesystemRoot(agentId, homeDir = homedir4()) {
+function getMemoryFilesystemRoot(agentId, homeDir = homedir5()) {
   return join4(homeDir, MEMORY_FS_ROOT, MEMORY_FS_AGENTS_DIR, agentId, MEMORY_FS_MEMORY_DIR);
 }
-function getMemorySystemDir(agentId, homeDir = homedir4()) {
+function getMemorySystemDir(agentId, homeDir = homedir5()) {
   return join4(getMemoryFilesystemRoot(agentId, homeDir), MEMORY_SYSTEM_DIR);
 }
-function ensureMemoryFilesystemDirs(agentId, homeDir = homedir4()) {
+function ensureMemoryFilesystemDirs(agentId, homeDir = homedir5()) {
   const root = getMemoryFilesystemRoot(agentId, homeDir);
   const systemDir = getMemorySystemDir(agentId, homeDir);
   if (!existsSync5(root)) {
@@ -43060,7 +43087,7 @@ var init_shellEnv = __esm(async () => {
 // src/tools/impl/shellRunner.ts
 import { spawn as spawn2 } from "node:child_process";
 function spawnWithLauncher(launcher, options) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve4, reject) => {
     const [executable, ...args] = launcher;
     if (!executable) {
       reject(new ShellExecutionError("Executable is required"));
@@ -43163,7 +43190,7 @@ function spawnWithLauncher(launcher, options) {
         }));
         return;
       }
-      resolve2({ stdout, stderr, exitCode: code });
+      resolve4({ stdout, stderr, exitCode: code });
     });
   });
 }
@@ -43575,7 +43602,7 @@ var init_Bash2 = __esm(async () => {
 
 // src/tools/impl/BashOutput.ts
 function sleep2(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+  return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 function emitNewProcessOutput(proc, onOutput, indexes, filter) {
   const next = { ...indexes };
@@ -43914,7 +43941,7 @@ async function edit(args) {
 var init_Edit2 = () => {};
 
 // src/cli/helpers/planName.ts
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir7 } from "node:os";
 import { join as join7 } from "node:path";
 function randomElement(arr) {
   return arr[Math.floor(Math.random() * arr.length)];
@@ -43927,7 +43954,7 @@ function generatePlanName() {
 }
 function generatePlanFilePath() {
   const name = generatePlanName();
-  return join7(homedir6(), ".letta", "plans", `${name}.md`);
+  return join7(homedir7(), ".letta", "plans", `${name}.md`);
 }
 var adjectives, nouns;
 var init_planName = __esm(() => {
@@ -44032,8 +44059,8 @@ var init_planName = __esm(() => {
 });
 
 // src/permissions/readOnlyShell.ts
-import { homedir as homedir7 } from "node:os";
-import { resolve as resolve3 } from "node:path";
+import { homedir as homedir8 } from "node:os";
+import { resolve as resolve5 } from "node:path";
 function isReadOnlyShellCommand(command) {
   if (!command) {
     return false;
@@ -44197,14 +44224,14 @@ function hasAbsoluteOrTraversalPathArg(value) {
   return /(^|[\\/])\.\.([\\/]|$)/.test(value);
 }
 function getAllowedMemoryPrefixes(agentId) {
-  const home = homedir7();
+  const home = homedir8();
   const prefixes = [
-    normalizeSeparators(resolve3(home, ".letta", "agents", agentId, "memory")),
-    normalizeSeparators(resolve3(home, ".letta", "agents", agentId, "memory-worktrees"))
+    normalizeSeparators(resolve5(home, ".letta", "agents", agentId, "memory")),
+    normalizeSeparators(resolve5(home, ".letta", "agents", agentId, "memory-worktrees"))
   ];
   const parentId = process.env.LETTA_PARENT_AGENT_ID;
   if (parentId && parentId !== agentId) {
-    prefixes.push(normalizeSeparators(resolve3(home, ".letta", "agents", parentId, "memory")), normalizeSeparators(resolve3(home, ".letta", "agents", parentId, "memory-worktrees")));
+    prefixes.push(normalizeSeparators(resolve5(home, ".letta", "agents", parentId, "memory")), normalizeSeparators(resolve5(home, ".letta", "agents", parentId, "memory-worktrees")));
   }
   return prefixes;
 }
@@ -44212,17 +44239,17 @@ function normalizeSeparators(p) {
   return p.replace(/\\/g, "/");
 }
 function expandPath(p) {
-  const home = homedir7();
+  const home = homedir8();
   if (p.startsWith("~/")) {
-    return normalizeSeparators(resolve3(home, p.slice(2)));
+    return normalizeSeparators(resolve5(home, p.slice(2)));
   }
   if (p.startsWith("$HOME/")) {
-    return normalizeSeparators(resolve3(home, p.slice(6)));
+    return normalizeSeparators(resolve5(home, p.slice(6)));
   }
   if (p.startsWith('"$HOME/')) {
-    return normalizeSeparators(resolve3(home, p.slice(7).replace(/"$/, "")));
+    return normalizeSeparators(resolve5(home, p.slice(7).replace(/"$/, "")));
   }
-  return normalizeSeparators(resolve3(p));
+  return normalizeSeparators(resolve5(p));
 }
 function isUnderMemoryDir(path6, prefixes) {
   const resolved = expandPath(path6);
@@ -44255,7 +44282,7 @@ function isMemoryDirCommand(command, agentId) {
     for (const part of pipeParts) {
       const cdTarget = extractCdTarget(part);
       if (cdTarget) {
-        const resolved = cwd2 ? expandPath(resolve3(expandPath(cwd2), cdTarget)) : expandPath(cdTarget);
+        const resolved = cwd2 ? expandPath(resolve5(expandPath(cwd2), cdTarget)) : expandPath(cdTarget);
         if (!isUnderMemoryDir(resolved, prefixes)) {
           return false;
         }
@@ -44273,7 +44300,7 @@ function isMemoryDirCommand(command, agentId) {
             return !isUnderMemoryDir(t, prefixes);
           }
           if (hasAbsoluteOrTraversalPathArg(t)) {
-            const resolved = expandPath(resolve3(expandPath(currentCwd), t));
+            const resolved = expandPath(resolve5(expandPath(currentCwd), t));
             return !isUnderMemoryDir(resolved, prefixes);
           }
           return false;
@@ -44413,8 +44440,8 @@ var exports_mode = {};
 __export(exports_mode, {
   permissionMode: () => permissionMode
 });
-import { homedir as homedir8 } from "node:os";
-import { isAbsolute as isAbsolute3, join as join8, relative, resolve as resolve4 } from "node:path";
+import { homedir as homedir9 } from "node:os";
+import { isAbsolute as isAbsolute3, join as join8, relative, resolve as resolve6 } from "node:path";
 function getGlobalMode() {
   const global2 = globalThis;
   if (!global2[MODE_KEY]) {
@@ -44447,12 +44474,12 @@ function resolvePlanTargetPath(targetPath, workingDirectory) {
   if (!trimmedPath)
     return null;
   if (trimmedPath.startsWith("~/")) {
-    return resolve4(homedir8(), trimmedPath.slice(2));
+    return resolve6(homedir9(), trimmedPath.slice(2));
   }
   if (isAbsolute3(trimmedPath)) {
-    return resolve4(trimmedPath);
+    return resolve6(trimmedPath);
   }
-  return resolve4(workingDirectory, trimmedPath);
+  return resolve6(workingDirectory, trimmedPath);
 }
 function isPathInPlansDir(path6, plansDir) {
   if (!path6.endsWith(".md"))
@@ -44573,7 +44600,7 @@ class PermissionModeManager {
           return "allow";
         }
         if (writeTools.includes(toolName)) {
-          const plansDir = join8(homedir8(), ".letta", "plans");
+          const plansDir = join8(homedir9(), ".letta", "plans");
           const targetPath = toolArgs?.file_path || toolArgs?.path;
           let candidatePaths = [];
           if ((toolName === "ApplyPatch" || toolName === "apply_patch") && toolArgs?.input) {
@@ -46606,12 +46633,12 @@ var init_LS2 = __esm(() => {
 
 // src/tools/impl/LS.ts
 import { readdir as readdir2, stat } from "node:fs/promises";
-import { join as join10, resolve as resolve8 } from "node:path";
+import { join as join10, resolve as resolve10 } from "node:path";
 async function ls(args) {
   validateRequiredParams(args, ["path"], "LS");
   validateParamTypes(args, LS_default2, "LS");
   const { path: inputPath, ignore = [] } = args;
-  const dirPath = resolve8(inputPath);
+  const dirPath = resolve10(inputPath);
   try {
     const items = await readdir2(dirPath);
     const filteredItems = items.filter((item) => !ignore.some((pattern) => import_picomatch.default.isMatch(item, pattern)));
@@ -47038,14 +47065,14 @@ var require_filesystem = __commonJS((exports, module) => {
     fs7.close(fd, () => {});
     return buffer.subarray(0, bytesRead);
   };
-  var readFile3 = (path10) => new Promise((resolve10, reject) => {
+  var readFile3 = (path10) => new Promise((resolve12, reject) => {
     fs7.open(path10, "r", (err, fd) => {
       if (err) {
         reject(err);
       } else {
         const buffer = Buffer.alloc(MAX_LENGTH);
         fs7.read(fd, buffer, 0, MAX_LENGTH, 0, (_, bytesRead) => {
-          resolve10(buffer.subarray(0, bytesRead));
+          resolve12(buffer.subarray(0, bytesRead));
           fs7.close(fd, () => {});
         });
       }
@@ -47106,10 +47133,10 @@ var require_detect_libc = __commonJS((exports, module) => {
   var commandOut = "";
   var safeCommand = () => {
     if (!commandOut) {
-      return new Promise((resolve10) => {
+      return new Promise((resolve12) => {
         childProcess.exec(command, (err, out) => {
           commandOut = err ? " " : out;
-          resolve10(commandOut);
+          resolve12(commandOut);
         });
       });
     }
@@ -49666,14 +49693,14 @@ var require_input = __commonJS((exports, module) => {
       return this;
     } else {
       if (this._isStreamInput()) {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve12, reject) => {
           const finished = () => {
             this._flattenBufferIn();
             sharp.metadata(this.options, (err, metadata2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve10(metadata2);
+                resolve12(metadata2);
               }
             });
           };
@@ -49684,12 +49711,12 @@ var require_input = __commonJS((exports, module) => {
           }
         });
       } else {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve12, reject) => {
           sharp.metadata(this.options, (err, metadata2) => {
             if (err) {
               reject(is.nativeError(err, stack));
             } else {
-              resolve10(metadata2);
+              resolve12(metadata2);
             }
           });
         });
@@ -49722,25 +49749,25 @@ var require_input = __commonJS((exports, module) => {
       return this;
     } else {
       if (this._isStreamInput()) {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve12, reject) => {
           this.on("finish", function() {
             this._flattenBufferIn();
             sharp.stats(this.options, (err, stats2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve10(stats2);
+                resolve12(stats2);
               }
             });
           });
         });
       } else {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve12, reject) => {
           sharp.stats(this.options, (err, stats2) => {
             if (err) {
               reject(is.nativeError(err, stack));
             } else {
-              resolve10(stats2);
+              resolve12(stats2);
             }
           });
         });
@@ -53139,7 +53166,7 @@ var require_output = __commonJS((exports, module) => {
       return this;
     } else {
       if (this._isStreamInput()) {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve12, reject) => {
           this.once("finish", () => {
             this._flattenBufferIn();
             sharp.pipeline(this.options, (err, data, info) => {
@@ -53147,24 +53174,24 @@ var require_output = __commonJS((exports, module) => {
                 reject(is.nativeError(err, stack));
               } else {
                 if (this.options.resolveWithObject) {
-                  resolve10({ data, info });
+                  resolve12({ data, info });
                 } else {
-                  resolve10(data);
+                  resolve12(data);
                 }
               }
             });
           });
         });
       } else {
-        return new Promise((resolve10, reject) => {
+        return new Promise((resolve12, reject) => {
           sharp.pipeline(this.options, (err, data, info) => {
             if (err) {
               reject(is.nativeError(err, stack));
             } else {
               if (this.options.resolveWithObject) {
-                resolve10({ data, info });
+                resolve12({ data, info });
               } else {
-                resolve10(data);
+                resolve12(data);
               }
             }
           });
@@ -53945,7 +53972,7 @@ var init_client3 = __esm(() => {
       this.emit("notification", notification);
     }
     sendRequest(method, params) {
-      return new Promise((resolve11, reject) => {
+      return new Promise((resolve13, reject) => {
         const id = ++this.requestId;
         const request = {
           jsonrpc: "2.0",
@@ -53954,7 +53981,7 @@ var init_client3 = __esm(() => {
           params
         };
         this.pendingRequests.set(id, {
-          resolve: resolve11,
+          resolve: resolve13,
           reject
         });
         this.sendMessage(request);
@@ -54074,14 +54101,14 @@ var init_python = __esm(() => {
         }
         console.log("[LSP] Installing pyright...");
         const { spawn: spawn4 } = await import("node:child_process");
-        return new Promise((resolve11, reject) => {
+        return new Promise((resolve13, reject) => {
           const proc = spawn4("npm", ["install", "-g", "pyright"], {
             stdio: "inherit"
           });
           proc.on("exit", (code) => {
             if (code === 0) {
               console.log("[LSP] Successfully installed pyright");
-              resolve11();
+              resolve13();
             } else {
               reject(new Error(`npm install failed with code ${code}`));
             }
@@ -54123,14 +54150,14 @@ var init_typescript = __esm(() => {
         }
         console.log("[LSP] Installing typescript-language-server and typescript...");
         const { spawn: spawn4 } = await import("node:child_process");
-        return new Promise((resolve11, reject) => {
+        return new Promise((resolve13, reject) => {
           const proc = spawn4("npm", ["install", "-g", "typescript-language-server", "typescript"], {
             stdio: "inherit"
           });
           proc.on("exit", (code) => {
             if (code === 0) {
               console.log("[LSP] Successfully installed typescript-language-server");
-              resolve11();
+              resolve13();
             } else {
               reject(new Error(`npm install failed with code ${code}`));
             }
@@ -54361,7 +54388,7 @@ async function read_lsp(args) {
     const userCwd = process.env.USER_CWD || process.cwd();
     const resolvedPath = path12.default.isAbsolute(args.file_path) ? args.file_path : path12.default.resolve(userCwd, args.file_path);
     await lspManager2.touchFile(resolvedPath, false);
-    await new Promise((resolve12) => setTimeout(resolve12, 100));
+    await new Promise((resolve14) => setTimeout(resolve14, 100));
     const diagnostics = lspManager2.getDiagnostics(resolvedPath);
     if (diagnostics.length > 0) {
       const errors = diagnostics.filter((d) => d.severity === 1);
@@ -57469,10 +57496,10 @@ var init_esm4 = __esm(() => {
       return this[ENCODING] ? buf.join("") : Buffer.concat(buf, buf.dataLength);
     }
     async promise() {
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve14, reject) => {
         this.on(DESTROYED, () => reject(new Error("stream destroyed")));
         this.on("error", (er) => reject(er));
-        this.on("end", () => resolve12());
+        this.on("end", () => resolve14());
       });
     }
     [Symbol.asyncIterator]() {
@@ -57491,7 +57518,7 @@ var init_esm4 = __esm(() => {
           return Promise.resolve({ done: false, value: res });
         if (this[EOF])
           return stop();
-        let resolve12;
+        let resolve14;
         let reject;
         const onerr = (er) => {
           this.off("data", ondata);
@@ -57505,19 +57532,19 @@ var init_esm4 = __esm(() => {
           this.off("end", onend);
           this.off(DESTROYED, ondestroy);
           this.pause();
-          resolve12({ value, done: !!this[EOF] });
+          resolve14({ value, done: !!this[EOF] });
         };
         const onend = () => {
           this.off("error", onerr);
           this.off("data", ondata);
           this.off(DESTROYED, ondestroy);
           stop();
-          resolve12({ done: true, value: undefined });
+          resolve14({ done: true, value: undefined });
         };
         const ondestroy = () => onerr(new Error("stream destroyed"));
         return new Promise((res2, rej) => {
           reject = rej;
-          resolve12 = res2;
+          resolve14 = res2;
           this.once(DESTROYED, ondestroy);
           this.once("error", onerr);
           this.once("end", onend);
@@ -58203,8 +58230,8 @@ var init_esm5 = __esm(() => {
       if (this.#asyncReaddirInFlight) {
         await this.#asyncReaddirInFlight;
       } else {
-        let resolve12 = () => {};
-        this.#asyncReaddirInFlight = new Promise((res) => resolve12 = res);
+        let resolve14 = () => {};
+        this.#asyncReaddirInFlight = new Promise((res) => resolve14 = res);
         try {
           for (const e of await this.#fs.promises.readdir(fullpath, {
             withFileTypes: true
@@ -58217,7 +58244,7 @@ var init_esm5 = __esm(() => {
           children.provisional = 0;
         }
         this.#asyncReaddirInFlight = undefined;
-        resolve12();
+        resolve14();
       }
       return children.slice(0, children.provisional);
     }
@@ -61195,9 +61222,9 @@ async function executeSubagent(type, config, model, userPrompt, baseURL, subagen
     proc2.stderr.on("data", (data) => {
       stderrChunks.push(data);
     });
-    const exitCode = await new Promise((resolve13) => {
-      proc2.on("close", resolve13);
-      proc2.on("error", () => resolve13(null));
+    const exitCode = await new Promise((resolve15) => {
+      proc2.on("close", resolve15);
+      proc2.on("error", () => resolve15(null));
     });
     signal?.removeEventListener("abort", abortHandler);
     if (wasAborted) {
@@ -61452,7 +61479,7 @@ ${result.report}
 `);
 }
 function sleep3(ms) {
-  return new Promise((resolve13) => setTimeout(resolve13, ms));
+  return new Promise((resolve15) => setTimeout(resolve15, ms));
 }
 async function waitForBackgroundSubagentLink(subagentId, timeoutMs = null, signal) {
   const deadline = timeoutMs !== null && timeoutMs > 0 ? Date.now() + timeoutMs : null;
@@ -64538,7 +64565,7 @@ var init_esm7 = __esm(() => {
 });
 
 // src/permissions/matcher.ts
-import { resolve as resolve15 } from "node:path";
+import { resolve as resolve17 } from "node:path";
 function toolForMatch(toolName, options) {
   return options?.canonicalizeToolNames === false ? toolName : canonicalToolName(toolName);
 }
@@ -64593,7 +64620,7 @@ function resolveFilePathForMatching(filePath, workingDirectory, windowsContext)
   if (windowsContext && isWindowsAbsolutePath(filePath)) {
     return canonicalizeWindowsAbsolutePath(filePath);
   }
-  const resolved = normalizePath(resolve15(workingDirectory, filePath));
+  const resolved = normalizePath(resolve17(workingDirectory, filePath));
   return windowsContext ? canonicalizeWindowsAbsolutePath(resolved) : resolved;
 }
 function matchesFilePattern(query, pattern, workingDirectory, options) {
@@ -64622,8 +64649,8 @@ function matchesFilePattern(query, pattern, workingDirectory, options) {
     globPattern = globPattern.slice(2);
   }
   if (globPattern.startsWith("~/")) {
-    const homedir9 = __require("node:os").homedir();
-    globPattern = globPattern.replace(/^~/, homedir9);
+    const homedir10 = __require("node:os").homedir();
+    globPattern = globPattern.replace(/^~/, homedir10);
   }
   globPattern = normalizeAbsolutePattern(globPattern, workingDirectory);
   const windowsContext = isWindowsContext(workingDirectory);
@@ -64706,7 +64733,7 @@ __export(exports_checker, {
   checkPermissionWithHooks: () => checkPermissionWithHooks,
   checkPermission: () => checkPermission
 });
-import { resolve as resolve16 } from "node:path";
+import { resolve as resolve18 } from "node:path";
 function envFlagEnabled(name) {
   const value = process.env[name];
   if (!value)
@@ -64993,13 +65020,13 @@ function extractFilePath(toolArgs) {
   return null;
 }
 function isWithinAllowedDirectories(filePath, permissions, workingDirectory) {
-  const absolutePath = resolve16(workingDirectory, filePath);
+  const absolutePath = resolve18(workingDirectory, filePath);
   if (absolutePath.startsWith(workingDirectory)) {
     return true;
   }
   if (permissions.additionalDirectories) {
     for (const dir of permissions.additionalDirectories) {
-      const resolvedDir = resolve16(workingDirectory, dir);
+      const resolvedDir = resolve18(workingDirectory, dir);
       if (absolutePath.startsWith(resolvedDir)) {
         return true;
       }
@@ -65229,10 +65256,10 @@ __export(exports_loader, {
   loadPermissions: () => loadPermissions,
   getUserSettingsPaths: () => getUserSettingsPaths
 });
-import { homedir as homedir9 } from "node:os";
+import { homedir as homedir10 } from "node:os";
 import { join as join14 } from "node:path";
 function getUserSettingsPaths(options = {}) {
-  const homeDir = options.homeDir || homedir9();
+  const homeDir = options.homeDir || homedir10();
   const xdgConfigHome = options.xdgConfigHome || process.env.XDG_CONFIG_HOME || join14(homeDir, ".config");
   return {
     canonical: join14(homeDir, ".letta", "settings.json"),
@@ -65354,8 +65381,8 @@ var exports_analyzer = {};
 __export(exports_analyzer, {
   analyzeApprovalContext: () => analyzeApprovalContext
 });
-import { homedir as homedir10 } from "node:os";
-import { dirname as dirname7, relative as relative2, resolve as resolve17, win32 as win322 } from "node:path";
+import { homedir as homedir11 } from "node:os";
+import { dirname as dirname7, relative as relative2, resolve as resolve19, win32 as win322 } from "node:path";
 function normalizeOsPath(path18) {
   return path18.replace(/\\/g, "/");
 }
@@ -65364,7 +65391,7 @@ function isWindowsPath(path18) {
 }
 function resolvePathForContext(basePath, targetPath) {
   const windows = isWindowsPath(basePath) || isWindowsPath(targetPath);
-  return windows ? win322.resolve(basePath, targetPath) : resolve17(basePath, targetPath);
+  return windows ? win322.resolve(basePath, targetPath) : resolve19(basePath, targetPath);
 }
 function relativePathForContext(basePath, targetPath) {
   const windows = isWindowsPath(basePath) || isWindowsPath(targetPath);
@@ -65391,7 +65418,7 @@ function formatAbsoluteRulePath(path18) {
   return `//${normalized.replace(/^\/+/, "")}`;
 }
 function formatDisplayPath(path18) {
-  return normalizeOsPath(path18).replace(normalizeOsPath(homedir10()), "~");
+  return normalizeOsPath(path18).replace(normalizeOsPath(homedir11()), "~");
 }
 function analyzeApprovalContext(toolName, toolArgs, workingDirectory) {
   const canonicalTool = canonicalToolName(toolName);
@@ -65530,7 +65557,7 @@ function detectSkillScript(command, workingDir) {
     return null;
   }
   const normalizedWorkingDir = normalizePathSeparators(workingDir).replace(/\/$/, "");
-  const normalizedHomeDir = normalizePathSeparators(homedir10()).replace(/\/$/, "");
+  const normalizedHomeDir = normalizePathSeparators(homedir11()).replace(/\/$/, "");
   const detect = (source, regex2) => {
     for (const candidate of pathCandidates) {
       const match3 = candidate.match(regex2);
@@ -65973,8 +66000,8 @@ function acquireSwitchLock() {
   const lock = getSwitchLock();
   lock.refCount++;
   if (lock.refCount === 1) {
-    lock.promise = new Promise((resolve18) => {
-      lock.resolve = resolve18;
+    lock.promise = new Promise((resolve20) => {
+      lock.resolve = resolve20;
     });
   }
 }
@@ -67113,8 +67140,9 @@ async function fetchConversationBackfillMessages2(client, conversationId) {
   }
   return sortChronological2(collected);
 }
-async function getResumeData2(client, agent, conversationId) {
+async function getResumeData2(client, agent, conversationId, options = {}) {
   try {
+    const includeMessageHistory = options.includeMessageHistory ?? true;
     let inContextMessageIds;
     let messages = [];
     const useConversationsApi = conversationId && conversationId !== "default";
@@ -67126,7 +67154,7 @@ async function getResumeData2(client, agent, conversationId) {
       inContextMessageIds = conversation.in_context_message_ids;
       if (!inContextMessageIds || inContextMessageIds.length === 0) {
         debugWarn("check-approval", "No in-context messages - no pending approvals");
-        if (isBackfillEnabled2()) {
+        if (includeMessageHistory && isBackfillEnabled2()) {
           try {
             const backfill = await fetchConversationBackfillMessages2(client, conversationId);
             return {
@@ -67151,7 +67179,7 @@ async function getResumeData2(client, agent, conversationId) {
         throw new Error("Expected at least one in-context message");
       }
       const retrievedMessages = await client.messages.retrieve(lastInContextId);
-      if (isBackfillEnabled2()) {
+      if (includeMessageHistory && isBackfillEnabled2()) {
         try {
           messages = await fetchConversationBackfillMessages2(client, conversationId);
         } catch (backfillError) {
@@ -67194,7 +67222,7 @@ async function getResumeData2(client, agent, conversationId) {
         throw new Error("Expected at least one in-context message");
       }
       const retrievedMessages = await client.messages.retrieve(lastInContextId);
-      if (isBackfillEnabled2()) {
+      if (includeMessageHistory && isBackfillEnabled2()) {
         try {
           const messagesPage = await client.agents.messages.list(agent.id, {
             limit: BACKFILL_PAGE_LIMIT2,
@@ -68579,7 +68607,7 @@ import {
   unlinkSync as unlinkSync3,
   writeFileSync as writeFileSync5
 } from "node:fs";
-import { homedir as homedir11 } from "node:os";
+import { homedir as homedir12 } from "node:os";
 import { join as join15 } from "node:path";
 function truncateStr(value, maxLen) {
   if (value === null || value === undefined)
@@ -68720,7 +68748,7 @@ class ChunkLog {
 var MAX_ENTRIES = 100, CONTENT_TRUNCATE_LEN = 200, MAX_SESSION_FILES = 5, LOG_BASE_DIR, chunkLog;
 var init_chunkLog = __esm(() => {
   init_debug();
-  LOG_BASE_DIR = join15(homedir11(), ".letta", "logs", "chunk-logs");
+  LOG_BASE_DIR = join15(homedir12(), ".letta", "logs", "chunk-logs");
   chunkLog = new ChunkLog;
 });
 
@@ -69166,8 +69194,8 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
     const delay = Math.min(INITIAL_RETRY_DELAY_MS * 2 ** (attempt - 1), MAX_RETRY_DELAY_MS);
     const maxAttempts = Math.ceil(Math.log2(MAX_RETRY_DURATION_MS / INITIAL_RETRY_DELAY_MS));
     opts.onRetrying?.(attempt, maxAttempts, delay);
-    await new Promise((resolve19) => {
-      runtime.reconnectTimeout = setTimeout(resolve19, delay);
+    await new Promise((resolve21) => {
+      runtime.reconnectTimeout = setTimeout(resolve21, delay);
     });
     runtime.reconnectTimeout = null;
     if (runtime !== activeRuntime || runtime.intentionallyClosed) {
@@ -69703,7 +69731,7 @@ async function queryTerminalBackground(timeoutMs = 100) {
   }
   const wasRaw = process.stdin.isRaw;
   const wasFlowing = process.stdin.readableFlowing;
-  return new Promise((resolve20) => {
+  return new Promise((resolve23) => {
     let response = "";
     let resolved = false;
     const cleanup = () => {
@@ -69720,7 +69748,7 @@ async function queryTerminalBackground(timeoutMs = 100) {
     };
     const timeout = setTimeout(() => {
       cleanup();
-      resolve20(null);
+      resolve23(null);
     }, timeoutMs);
     const onData = (data) => {
       response += data.toString();
@@ -69730,7 +69758,7 @@ async function queryTerminalBackground(timeoutMs = 100) {
       if (match3) {
         clearTimeout(timeout);
         cleanup();
-        resolve20({
+        resolve23({
           r: parseHexComponent(match3[1] ?? "0"),
           g: parseHexComponent(match3[2] ?? "0"),
           b: parseHexComponent(match3[3] ?? "0")
@@ -69745,7 +69773,7 @@ async function queryTerminalBackground(timeoutMs = 100) {
     } catch {
       clearTimeout(timeout);
       cleanup();
-      resolve20(null);
+      resolve23(null);
     }
   });
 }
@@ -71125,14 +71153,14 @@ var execFile9, __dirname2, localXdgOpenPath, platform2, arch, pTryEach = async (
   }
   const subprocess = childProcess.spawn(command, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve21, reject) => {
+    return new Promise((resolve24, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode > 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve21(subprocess);
+        resolve24(subprocess);
       });
     });
   }
@@ -71430,10 +71458,10 @@ __export(exports_setup, {
   runSetup: () => runSetup
 });
 async function runSetup() {
-  return new Promise((resolve21) => {
+  return new Promise((resolve24) => {
     const { waitUntilExit } = render_default(import_react30.default.createElement(SetupUI, {
       onComplete: () => {
-        resolve21();
+        resolve24();
       }
     }));
     waitUntilExit().catch((error) => {
@@ -73469,10 +73497,10 @@ __export(exports_import, {
 });
 import { createReadStream } from "node:fs";
 import { chmod, mkdir as mkdir3, readFile as readFile8, writeFile as writeFile3 } from "node:fs/promises";
-import { dirname as dirname10, resolve as resolve21 } from "node:path";
+import { dirname as dirname10, resolve as resolve24 } from "node:path";
 async function importAgentFromFile(options) {
   const client = await getClient2();
-  const resolvedPath = resolve21(options.filePath);
+  const resolvedPath = resolve24(options.filePath);
   const file = createReadStream(resolvedPath);
   const importResponse = await client.agents.importFile({
     file,
@@ -73507,7 +73535,7 @@ async function extractSkillsFromAf(afPath, destDir) {
     return [];
   }
   for (const skill2 of afData.skills) {
-    const skillDir = resolve21(destDir, skill2.name);
+    const skillDir = resolve24(destDir, skill2.name);
     await mkdir3(skillDir, { recursive: true });
     if (skill2.files) {
       await writeSkillFiles(skillDir, skill2.files);
@@ -73527,7 +73555,7 @@ async function writeSkillFiles(skillDir, files) {
   }
 }
 async function writeSkillFile(skillDir, filePath, content) {
-  const fullPath = resolve21(skillDir, filePath);
+  const fullPath = resolve24(skillDir, filePath);
   await mkdir3(dirname10(fullPath), { recursive: true });
   await writeFile3(fullPath, content, "utf-8");
   const isScript = filePath.startsWith("scripts/") || content.trimStart().startsWith("#!");
@@ -74638,7 +74666,7 @@ ${loadedContents.join(`
           } else {
             console.error(`Conversation is busy, waiting ${CONVERSATION_BUSY_RETRY_DELAY_MS / 1000}s and retrying...`);
           }
-          await new Promise((resolve22) => setTimeout(resolve22, CONVERSATION_BUSY_RETRY_DELAY_MS));
+          await new Promise((resolve25) => setTimeout(resolve25, CONVERSATION_BUSY_RETRY_DELAY_MS));
           continue;
         }
         if (preStreamAction === "retry_transient") {
@@ -74661,7 +74689,7 @@ ${loadedContents.join(`
             const delaySeconds = Math.round(delayMs / 1000);
             console.error(`Transient API error before streaming (attempt ${attempt} of ${LLM_API_ERROR_MAX_RETRIES}), retrying in ${delaySeconds}s...`);
           }
-          await new Promise((resolve22) => setTimeout(resolve22, delayMs));
+          await new Promise((resolve25) => setTimeout(resolve25, delayMs));
           conversationBusyRetries = 0;
           continue;
         }
@@ -74874,7 +74902,7 @@ ${loadedContents.join(`
             const delaySeconds = Math.round(delayMs / 1000);
             console.error(`LLM API error encountered (attempt ${attempt} of ${LLM_API_ERROR_MAX_RETRIES}), retrying in ${delaySeconds}s...`);
           }
-          await new Promise((resolve22) => setTimeout(resolve22, delayMs));
+          await new Promise((resolve25) => setTimeout(resolve25, delayMs));
           continue;
         }
       }
@@ -74950,7 +74978,7 @@ ${loadedContents.join(`
               const delaySeconds = Math.round(delayMs / 1000);
               console.error(`LLM API error encountered (attempt ${attempt} of ${LLM_API_ERROR_MAX_RETRIES}), retrying in ${delaySeconds}s...`);
             }
-            await new Promise((resolve22) => setTimeout(resolve22, delayMs));
+            await new Promise((resolve25) => setTimeout(resolve25, delayMs));
             continue;
           }
         } catch (_e) {}
@@ -75184,18 +75212,18 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
   setMessageQueueAdder((queuedMessage) => {
     const syntheticUserLine = serializeQueuedMessageAsUserLine(queuedMessage);
     if (lineResolver) {
-      const resolve22 = lineResolver;
+      const resolve25 = lineResolver;
       lineResolver = null;
-      resolve22(syntheticUserLine);
+      resolve25(syntheticUserLine);
       return;
     }
     lineQueue.push(syntheticUserLine);
   });
   rl.on("line", (line) => {
     if (lineResolver) {
-      const resolve22 = lineResolver;
+      const resolve25 = lineResolver;
       lineResolver = null;
-      resolve22(line);
+      resolve25(line);
     } else {
       lineQueue.push(line);
     }
@@ -75203,17 +75231,17 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
   rl.on("close", () => {
     setMessageQueueAdder(null);
     if (lineResolver) {
-      const resolve22 = lineResolver;
+      const resolve25 = lineResolver;
       lineResolver = null;
-      resolve22(null);
+      resolve25(null);
     }
   });
   async function getNextLine() {
     if (lineQueue.length > 0) {
       return lineQueue.shift() ?? null;
     }
-    return new Promise((resolve22) => {
-      lineResolver = resolve22;
+    return new Promise((resolve25) => {
+      lineResolver = resolve25;
     });
   }
   async function requestPermission(toolCallId, toolName, toolInput) {
@@ -75383,6 +75411,19 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
         console.log(JSON.stringify(registerResponse));
       } else if (subtype === "bootstrap_session_state") {
         const bootstrapReq = message.request;
+        const { getResumeData: getResumeData3 } = await Promise.resolve().then(() => (init_check_approval(), exports_check_approval));
+        let hasPendingApproval = false;
+        try {
+          const freshAgent = await client.agents.retrieve(agent.id);
+          const resume = await getResumeData3(client, freshAgent, conversationId, {
+            includeMessageHistory: false
+          });
+          hasPendingApproval = (resume.pendingApprovals?.length ?? 0) > 0;
+        } catch (error) {
+          if (!(error instanceof APIError2) || error.status !== 404 && error.status !== 422) {
+            console.warn(`[bootstrap] pending-approval probe failed: ${error instanceof Error ? error.message : String(error)}`);
+          }
+        }
         const bootstrapResp = await handleBootstrapSessionState({
           bootstrapReq,
           sessionContext: {
@@ -75395,7 +75436,7 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
           },
           requestId: requestId ?? "",
           client,
-          hasPendingApproval: false
+          hasPendingApproval
         });
         console.log(JSON.stringify(bootstrapResp));
       } else if (subtype === "list_messages") {
@@ -75563,7 +75604,7 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
                 uuid: `retry-bidir-${randomUUID7()}`
               };
               console.log(JSON.stringify(retryMsg));
-              await new Promise((resolve22) => setTimeout(resolve22, delayMs));
+              await new Promise((resolve25) => setTimeout(resolve25, delayMs));
               continue;
             }
             throw preStreamError;
@@ -75835,10 +75876,10 @@ async function detectAndEnableKittyProtocol() {
     detectionComplete = true;
     return;
   }
-  return new Promise((resolve22) => {
+  return new Promise((resolve25) => {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
       detectionComplete = true;
-      resolve22();
+      resolve25();
       return;
     }
     const originalRawMode = process.stdin.isRaw;
@@ -75871,7 +75912,7 @@ async function detectAndEnableKittyProtocol() {
         console.error("[kitty] protocol query unsupported; enabled anyway (best-effort)");
       }
       detectionComplete = true;
-      resolve22();
+      resolve25();
     };
     const handleData = (data) => {
       if (timeoutId === undefined) {
@@ -76064,10 +76105,10 @@ __export(exports_settings, {
   loadProjectSettings: () => loadProjectSettings,
   getSetting: () => getSetting
 });
-import { homedir as homedir16 } from "node:os";
+import { homedir as homedir17 } from "node:os";
 import { join as join24 } from "node:path";
 function getSettingsPath() {
-  return join24(homedir16(), ".letta", "settings.json");
+  return join24(homedir17(), ".letta", "settings.json");
 }
 async function loadSettings() {
   const settingsPath = getSettingsPath();
@@ -81963,7 +82004,7 @@ var init_plan_viewer_template = () => {};
 
 // src/web/generate-plan-viewer.ts
 import { chmodSync as chmodSync2, existsSync as existsSync14, mkdirSync as mkdirSync10, writeFileSync as writeFileSync7 } from "node:fs";
-import { homedir as homedir17 } from "node:os";
+import { homedir as homedir18 } from "node:os";
 import { join as join25 } from "node:path";
 async function generateAndOpenPlanViewer(planContent, planFilePath, options) {
   const data = {
@@ -81997,7 +82038,7 @@ async function generateAndOpenPlanViewer(planContent, planFilePath, options) {
 var VIEWERS_DIR;
 var init_generate_plan_viewer = __esm(() => {
   init_plan_viewer_template();
-  VIEWERS_DIR = join25(homedir17(), ".letta", "viewers");
+  VIEWERS_DIR = join25(homedir18(), ".letta", "viewers");
 });
 
 // src/cli/components/StaticPlanApproval.tsx
@@ -83995,7 +84036,7 @@ var init_pasteRegistry = __esm(() => {
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { existsSync as existsSync15, readFileSync as readFileSync3, statSync as statSync4, unlinkSync as unlinkSync5 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
-import { basename as basename3, extname as extname5, isAbsolute as isAbsolute16, join as join26, resolve as resolve22 } from "node:path";
+import { basename as basename3, extname as extname5, isAbsolute as isAbsolute16, join as join26, resolve as resolve25 } from "node:path";
 function countLines2(text) {
   return (text.match(/\r\n|\r|\n/g) || []).length + 1;
 }
@@ -84043,7 +84084,7 @@ function translatePasteForImages(paste) {
         } catch {}
       }
       if (!isAbsolute16(filePath))
-        filePath = resolve22(process.cwd(), filePath);
+        filePath = resolve25(process.cwd(), filePath);
       const ext3 = extname5(filePath || "").toLowerCase();
       if (IMAGE_EXTS.has(ext3) && existsSync15(filePath) && statSync4(filePath).isFile()) {
         const buf = readFileSync3(filePath);
@@ -84705,7 +84746,7 @@ import {
   readFileSync as readFileSync4,
   writeFileSync as writeFileSync8
 } from "node:fs";
-import { homedir as homedir18, platform as platform4 } from "node:os";
+import { homedir as homedir19, platform as platform4 } from "node:os";
 import { dirname as dirname11, join as join27 } from "node:path";
 function detectTerminalType() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
@@ -84738,7 +84779,7 @@ function getKeybindingsPath(terminal) {
   }[terminal];
   const os5 = platform4();
   if (os5 === "darwin") {
-    return join27(homedir18(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join27(homedir19(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os5 === "win32") {
     const appData = process.env.APPDATA;
@@ -84747,7 +84788,7 @@ function getKeybindingsPath(terminal) {
     return join27(appData, appName, "User", "keybindings.json");
   }
   if (os5 === "linux") {
-    return join27(homedir18(), ".config", appName, "User", "keybindings.json");
+    return join27(homedir19(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -84904,10 +84945,10 @@ function getWezTermConfigPath() {
     if (existsSync16(xdgPath))
       return xdgPath;
   }
-  const configPath = join27(homedir18(), ".config", "wezterm", "wezterm.lua");
+  const configPath = join27(homedir19(), ".config", "wezterm", "wezterm.lua");
   if (existsSync16(configPath))
     return configPath;
-  return join27(homedir18(), ".wezterm.lua");
+  return join27(homedir19(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists(configPath) {
   if (!existsSync16(configPath))
@@ -85875,12 +85916,23 @@ var init_HelpDialog = __esm(async () => {
 });
 
 // src/hooks/writer.ts
+import { homedir as homedir20 } from "node:os";
+import { resolve as resolve26 } from "node:path";
+function isProjectSettingsPathCollidingWithGlobal2(workingDirectory) {
+  const home = process.env.HOME || homedir20();
+  const globalSettingsPath = resolve26(home, ".letta", "settings.json");
+  const projectSettingsPath = resolve26(workingDirectory, ".letta", "settings.json");
+  return globalSettingsPath === projectSettingsPath;
+}
 function loadHooksFromLocation(location, workingDirectory = process.cwd()) {
   try {
     switch (location) {
       case "user":
         return settingsManager.getSettings().hooks || {};
       case "project":
+        if (isProjectSettingsPathCollidingWithGlobal2(workingDirectory)) {
+          return {};
+        }
         return settingsManager.getProjectSettings(workingDirectory)?.hooks || {};
       case "project-local":
         return settingsManager.getLocalProjectSettings(workingDirectory)?.hooks || {};
@@ -85896,6 +85948,10 @@ async function saveHooksToLocation(hooks, location, workingDirectory = process.c
       settingsManager.updateSettings({ hooks });
       break;
     case "project":
+      if (isProjectSettingsPathCollidingWithGlobal2(workingDirectory)) {
+        settingsManager.updateSettings({ hooks });
+        break;
+      }
       try {
         settingsManager.getProjectSettings(workingDirectory);
       } catch {
@@ -88272,7 +88328,7 @@ var init_AgentInfoBar = __esm(async () => {
 
 // src/cli/helpers/fileSearch.ts
 import { readdirSync as readdirSync6, statSync as statSync5 } from "node:fs";
-import { join as join29, resolve as resolve23 } from "node:path";
+import { join as join29, resolve as resolve27 } from "node:path";
 function shouldExcludeEntry(entry) {
   if (entry.startsWith(".")) {
     return true;
@@ -88321,7 +88377,7 @@ async function searchFiles(query, deep = false) {
       const dirPart = query.slice(0, lastSlashIndex);
       const pattern = query.slice(lastSlashIndex + 1);
       try {
-        const resolvedDir = resolve23(process.cwd(), dirPart);
+        const resolvedDir = resolve27(process.cwd(), dirPart);
         try {
           statSync5(resolvedDir);
           searchDir = resolvedDir;
@@ -94493,7 +94549,7 @@ __export(exports_generate_memory_viewer, {
 });
 import { execFile as execFileCb2 } from "node:child_process";
 import { chmodSync as chmodSync3, existsSync as existsSync19, mkdirSync as mkdirSync13, writeFileSync as writeFileSync10 } from "node:fs";
-import { homedir as homedir19 } from "node:os";
+import { homedir as homedir21 } from "node:os";
 import { join as join32 } from "node:path";
 import { promisify as promisify10 } from "node:util";
 async function runGitSafe(cwd2, args) {
@@ -94807,7 +94863,7 @@ var init_generate_memory_viewer = __esm(async () => {
     init_memoryGit()
   ]);
   execFile10 = promisify10(execFileCb2);
-  VIEWERS_DIR2 = join32(homedir19(), ".letta", "viewers");
+  VIEWERS_DIR2 = join32(homedir21(), ".letta", "viewers");
   REFLECTION_PATTERN = /\(reflection\)|🔮|reflection:/i;
 });
 
@@ -97445,11 +97501,11 @@ var init_byok_providers = __esm(async () => {
 
 // src/utils/aws-credentials.ts
 import { readFile as readFile10 } from "node:fs/promises";
-import { homedir as homedir20 } from "node:os";
+import { homedir as homedir22 } from "node:os";
 import { join as join33 } from "node:path";
 async function parseAwsCredentials() {
-  const credentialsPath = join33(homedir20(), ".aws", "credentials");
-  const configPath = join33(homedir20(), ".aws", "config");
+  const credentialsPath = join33(homedir22(), ".aws", "credentials");
+  const configPath = join33(homedir22(), ".aws", "config");
   const profiles = new Map;
   try {
     const content = await readFile10(credentialsPath, "utf-8");
@@ -102760,7 +102816,7 @@ async function executeStatusLineCommand(command, payload, options) {
   };
 }
 function runWithLauncher(launcher, inputJson, timeout, signal, workingDirectory, startTime) {
-  return new Promise((resolve24, reject) => {
+  return new Promise((resolve28, reject) => {
     const [executable, ...args] = launcher;
     if (!executable) {
       reject(new Error("Empty launcher"));
@@ -102773,7 +102829,7 @@ function runWithLauncher(launcher, inputJson, timeout, signal, workingDirectory,
     const safeResolve = (result) => {
       if (!resolved) {
         resolved = true;
-        resolve24(result);
+        resolve28(result);
       }
     };
     let child;
@@ -103266,7 +103322,7 @@ __export(exports_shellAliases, {
   clearAliasCache: () => clearAliasCache
 });
 import { existsSync as existsSync21, readFileSync as readFileSync7 } from "node:fs";
-import { homedir as homedir21 } from "node:os";
+import { homedir as homedir23 } from "node:os";
 import { join as join34 } from "node:path";
 function parseAliasesFromFile(filePath) {
   const aliases = new Map;
@@ -103336,7 +103392,7 @@ function loadAliases(forceReload = false) {
   if (aliasCache && !forceReload) {
     return aliasCache;
   }
-  const home = homedir21();
+  const home = homedir23();
   const allAliases = new Map;
   for (const file of ALIAS_FILES) {
     const filePath = join34(home, file);
@@ -103519,7 +103575,7 @@ async function generatePKCE() {
   return { codeVerifier, codeChallenge };
 }
 function startLocalOAuthServer(expectedState, port = OPENAI_OAUTH_CONFIG.defaultPort) {
-  return new Promise((resolve24, reject) => {
+  return new Promise((resolve28, reject) => {
     const server = http.createServer((req, res) => {
       const url = new URL(req.url || "", `http://localhost:${port}`);
       if (url.pathname === OPENAI_OAUTH_CONFIG.callbackPath) {
@@ -103565,7 +103621,7 @@ function startLocalOAuthServer(expectedState, port = OPENAI_OAUTH_CONFIG.default
           message: "You can close this window and return to Letta Code.",
           autoClose: true
         }));
-        resolve24({ result: { code, state }, server });
+        resolve28({ result: { code, state }, server });
       } else {
         res.writeHead(404, { "Content-Type": "text/plain" });
         res.end("Not found");
@@ -104487,14 +104543,14 @@ __export(exports_export, {
   packageSkills: () => packageSkills
 });
 import { readdir as readdir10, readFile as readFile11 } from "node:fs/promises";
-import { relative as relative8, resolve as resolve24 } from "node:path";
+import { relative as relative8, resolve as resolve28 } from "node:path";
 async function packageSkills(agentId, skillsDir) {
   const skills = [];
   const skillNames = new Set;
   const dirsToCheck = skillsDir ? [skillsDir] : [
     agentId && getAgentSkillsDir(agentId),
-    resolve24(process.cwd(), ".skills"),
-    resolve24(process.env.HOME || "~", ".letta", "skills")
+    resolve28(process.cwd(), ".skills"),
+    resolve28(process.env.HOME || "~", ".letta", "skills")
   ].filter((dir) => Boolean(dir));
   for (const baseDir of dirsToCheck) {
     try {
@@ -104504,8 +104560,8 @@ async function packageSkills(agentId, skillsDir) {
           continue;
         if (skillNames.has(entry.name))
           continue;
-        const skillDir = resolve24(baseDir, entry.name);
-        const skillMdPath = resolve24(skillDir, "SKILL.md");
+        const skillDir = resolve28(baseDir, entry.name);
+        const skillMdPath = resolve28(skillDir, "SKILL.md");
         try {
           await readFile11(skillMdPath, "utf-8");
         } catch {
@@ -104535,7 +104591,7 @@ async function readSkillFiles(skillDir) {
   async function walk(dir) {
     const entries = await readdir10(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = resolve24(dir, entry.name);
+      const fullPath = resolve28(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(fullPath);
       } else {
@@ -104676,7 +104732,7 @@ __export(exports_App, {
   default: () => App2
 });
 import { existsSync as existsSync22, readFileSync as readFileSync8, renameSync as renameSync2, writeFileSync as writeFileSync11 } from "node:fs";
-import { homedir as homedir22, tmpdir as tmpdir5 } from "node:os";
+import { homedir as homedir24, tmpdir as tmpdir5 } from "node:os";
 import { join as join35 } from "node:path";
 function deriveReasoningEffort(modelSettings, llmConfig) {
   if (modelSettings && "provider_type" in modelSettings) {
@@ -106526,7 +106582,7 @@ ${newState.originalPrompt}`
                 cancelled = true;
                 break;
               }
-              await new Promise((resolve25) => setTimeout(resolve25, 100));
+              await new Promise((resolve29) => setTimeout(resolve29, 100));
             }
             buffersRef.current.byId.delete(statusId);
             buffersRef.current.order = buffersRef.current.order.filter((id) => id !== statusId);
@@ -106557,7 +106613,7 @@ ${newState.originalPrompt}`
                 cancelled = true;
                 break;
               }
-              await new Promise((resolve25) => setTimeout(resolve25, 100));
+              await new Promise((resolve29) => setTimeout(resolve29, 100));
             }
             buffersRef.current.byId.delete(statusId);
             buffersRef.current.order = buffersRef.current.order.filter((id) => id !== statusId);
@@ -107239,7 +107295,7 @@ ${feedback}
               cancelled = true;
               break;
             }
-            await new Promise((resolve25) => setTimeout(resolve25, 100));
+            await new Promise((resolve29) => setTimeout(resolve29, 100));
           }
           buffersRef.current.byId.delete(statusId);
           buffersRef.current.order = buffersRef.current.order.filter((id) => id !== statusId);
@@ -111334,7 +111390,7 @@ ${guidance}`);
       }
       if (!planFileExists()) {
         const planFilePath = permissionMode.getPlanFilePath();
-        const plansDir = join35(homedir22(), ".letta", "plans");
+        const plansDir = join35(homedir24(), ".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.`);
@@ -112646,7 +112702,7 @@ import {
   readFileSync as readFileSync9,
   writeFileSync as writeFileSync12
 } from "node:fs";
-import { homedir as homedir23, platform as platform5 } from "node:os";
+import { homedir as homedir25, platform as platform5 } from "node:os";
 import { dirname as dirname14, join as join36 } from "node:path";
 function detectTerminalType2() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
@@ -112679,7 +112735,7 @@ function getKeybindingsPath2(terminal) {
   }[terminal];
   const os6 = platform5();
   if (os6 === "darwin") {
-    return join36(homedir23(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join36(homedir25(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os6 === "win32") {
     const appData = process.env.APPDATA;
@@ -112688,7 +112744,7 @@ function getKeybindingsPath2(terminal) {
     return join36(appData, appName, "User", "keybindings.json");
   }
   if (os6 === "linux") {
-    return join36(homedir23(), ".config", appName, "User", "keybindings.json");
+    return join36(homedir25(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -112845,10 +112901,10 @@ function getWezTermConfigPath2() {
     if (existsSync23(xdgPath))
       return xdgPath;
   }
-  const configPath = join36(homedir23(), ".config", "wezterm", "wezterm.lua");
+  const configPath = join36(homedir25(), ".config", "wezterm", "wezterm.lua");
   if (existsSync23(configPath))
     return configPath;
-  return join36(homedir23(), ".wezterm.lua");
+  return join36(homedir25(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists2(configPath) {
   if (!existsSync23(configPath))
@@ -112946,10 +113002,10 @@ __export(exports_settings2, {
   loadProjectSettings: () => loadProjectSettings2,
   getSetting: () => getSetting2
 });
-import { homedir as homedir24 } from "node:os";
+import { homedir as homedir26 } from "node:os";
 import { join as join37 } from "node:path";
 function getSettingsPath2() {
-  return join37(homedir24(), ".letta", "settings.json");
+  return join37(homedir26(), ".letta", "settings.json");
 }
 async function loadSettings2() {
   const settingsPath = getSettingsPath2();
@@ -113431,10 +113487,10 @@ __export(exports_import2, {
 });
 import { createReadStream as createReadStream2 } from "node:fs";
 import { chmod as chmod2, mkdir as mkdir4, readFile as readFile12, writeFile as writeFile4 } from "node:fs/promises";
-import { dirname as dirname15, resolve as resolve25 } from "node:path";
+import { dirname as dirname15, resolve as resolve29 } from "node:path";
 async function importAgentFromFile2(options) {
   const client = await getClient2();
-  const resolvedPath = resolve25(options.filePath);
+  const resolvedPath = resolve29(options.filePath);
   const file = createReadStream2(resolvedPath);
   const importResponse = await client.agents.importFile({
     file,
@@ -113469,7 +113525,7 @@ async function extractSkillsFromAf2(afPath, destDir) {
     return [];
   }
   for (const skill2 of afData.skills) {
-    const skillDir = resolve25(destDir, skill2.name);
+    const skillDir = resolve29(destDir, skill2.name);
     await mkdir4(skillDir, { recursive: true });
     if (skill2.files) {
       await writeSkillFiles2(skillDir, skill2.files);
@@ -113489,7 +113545,7 @@ async function writeSkillFiles2(skillDir, files) {
   }
 }
 async function writeSkillFile2(skillDir, filePath, content) {
-  const fullPath = resolve25(skillDir, filePath);
+  const fullPath = resolve29(skillDir, filePath);
   await mkdir4(dirname15(fullPath), { recursive: true });
   await writeFile4(fullPath, content, "utf-8");
   const isScript = filePath.startsWith("scripts/") || content.trimStart().startsWith("#!");
@@ -113596,15 +113652,15 @@ __export(exports_memoryFilesystem2, {
   MEMORY_FS_AGENTS_DIR: () => MEMORY_FS_AGENTS_DIR2
 });
 import { existsSync as existsSync24, mkdirSync as mkdirSync15 } from "node:fs";
-import { homedir as homedir25 } from "node:os";
+import { homedir as homedir27 } from "node:os";
 import { join as join38 } from "node:path";
-function getMemoryFilesystemRoot2(agentId, homeDir = homedir25()) {
+function getMemoryFilesystemRoot2(agentId, homeDir = homedir27()) {
   return join38(homeDir, MEMORY_FS_ROOT2, MEMORY_FS_AGENTS_DIR2, agentId, MEMORY_FS_MEMORY_DIR2);
 }
-function getMemorySystemDir2(agentId, homeDir = homedir25()) {
+function getMemorySystemDir2(agentId, homeDir = homedir27()) {
   return join38(getMemoryFilesystemRoot2(agentId, homeDir), MEMORY_SYSTEM_DIR2);
 }
-function ensureMemoryFilesystemDirs2(agentId, homeDir = homedir25()) {
+function ensureMemoryFilesystemDirs2(agentId, homeDir = homedir27()) {
   const root = getMemoryFilesystemRoot2(agentId, homeDir);
   const systemDir = getMemorySystemDir2(agentId, homeDir);
   if (!existsSync24(root)) {
@@ -113985,8 +114041,9 @@ async function fetchConversationBackfillMessages(client, conversationId) {
   }
   return sortChronological(collected);
 }
-async function getResumeData(client, agent, conversationId) {
+async function getResumeData(client, agent, conversationId, options = {}) {
   try {
+    const includeMessageHistory = options.includeMessageHistory ?? true;
     let inContextMessageIds;
     let messages = [];
     const useConversationsApi = conversationId && conversationId !== "default";
@@ -113998,7 +114055,7 @@ async function getResumeData(client, agent, conversationId) {
       inContextMessageIds = conversation.in_context_message_ids;
       if (!inContextMessageIds || inContextMessageIds.length === 0) {
         debugWarn("check-approval", "No in-context messages - no pending approvals");
-        if (isBackfillEnabled()) {
+        if (includeMessageHistory && isBackfillEnabled()) {
           try {
             const backfill = await fetchConversationBackfillMessages(client, conversationId);
             return {
@@ -114023,7 +114080,7 @@ async function getResumeData(client, agent, conversationId) {
         throw new Error("Expected at least one in-context message");
       }
       const retrievedMessages = await client.messages.retrieve(lastInContextId);
-      if (isBackfillEnabled()) {
+      if (includeMessageHistory && isBackfillEnabled()) {
         try {
           messages = await fetchConversationBackfillMessages(client, conversationId);
         } catch (backfillError) {
@@ -114066,7 +114123,7 @@ async function getResumeData(client, agent, conversationId) {
         throw new Error("Expected at least one in-context message");
       }
       const retrievedMessages = await client.messages.retrieve(lastInContextId);
-      if (isBackfillEnabled()) {
+      if (includeMessageHistory && isBackfillEnabled()) {
         try {
           const messagesPage = await client.agents.messages.list(agent.id, {
             limit: BACKFILL_PAGE_LIMIT,
@@ -116070,7 +116127,7 @@ async function runListenSubcommand(argv) {
 await init_memoryGit();
 import { cpSync, existsSync as existsSync9, mkdirSync as mkdirSync7, rmSync as rmSync2, statSync as statSync2 } from "node:fs";
 import { readdir as readdir5 } from "node:fs/promises";
-import { homedir as homedir12 } from "node:os";
+import { homedir as homedir13 } from "node:os";
 import { join as join16 } from "node:path";
 import { parseArgs as parseArgs4 } from "node:util";
 function printUsage3() {
@@ -116100,10 +116157,10 @@ function getAgentId3(agentFromArgs, agentIdFromArgs) {
   return agentFromArgs || agentIdFromArgs || process.env.LETTA_AGENT_ID || "";
 }
 function getMemoryRoot(agentId) {
-  return join16(homedir12(), ".letta", "agents", agentId, "memory");
+  return join16(homedir13(), ".letta", "agents", agentId, "memory");
 }
 function getAgentRoot(agentId) {
-  return join16(homedir12(), ".letta", "agents", agentId);
+  return join16(homedir13(), ".letta", "agents", agentId);
 }
 function formatBackupTimestamp(date = new Date) {
   const pad = (value) => String(value).padStart(2, "0");
@@ -116478,8 +116535,8 @@ async function runSubcommand(argv) {
 
 // src/permissions/mode.ts
 init_readOnlyShell();
-import { homedir as homedir13 } from "node:os";
-import { isAbsolute as isAbsolute14, join as join17, relative as relative3, resolve as resolve19 } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { isAbsolute as isAbsolute14, join as join17, relative as relative3, resolve as resolve21 } from "node:path";
 var MODE_KEY2 = Symbol.for("@letta/permissionMode");
 var PLAN_FILE_KEY2 = Symbol.for("@letta/planFilePath");
 var MODE_BEFORE_PLAN_KEY2 = Symbol.for("@letta/permissionModeBeforePlan");
@@ -116515,12 +116572,12 @@ function resolvePlanTargetPath2(targetPath, workingDirectory) {
   if (!trimmedPath)
     return null;
   if (trimmedPath.startsWith("~/")) {
-    return resolve19(homedir13(), trimmedPath.slice(2));
+    return resolve21(homedir14(), trimmedPath.slice(2));
   }
   if (isAbsolute14(trimmedPath)) {
-    return resolve19(trimmedPath);
+    return resolve21(trimmedPath);
   }
-  return resolve19(workingDirectory, trimmedPath);
+  return resolve21(workingDirectory, trimmedPath);
 }
 function isPathInPlansDir2(path19, plansDir) {
   if (!path19.endsWith(".md"))
@@ -116641,7 +116698,7 @@ class PermissionModeManager2 {
           return "allow";
         }
         if (writeTools.includes(toolName)) {
-          const plansDir = join17(homedir13(), ".letta", "plans");
+          const plansDir = join17(homedir14(), ".letta", "plans");
           const targetPath = toolArgs?.file_path || toolArgs?.path;
           let candidatePaths = [];
           if ((toolName === "ApplyPatch" || toolName === "apply_patch") && toolArgs?.input) {
@@ -116712,8 +116769,8 @@ init_debug();
 init_fs();
 await init_secrets();
 import { randomUUID as randomUUID3 } from "node:crypto";
-import { homedir as homedir14 } from "node:os";
-import { join as join18 } from "node:path";
+import { homedir as homedir15 } from "node:os";
+import { join as join18, resolve as resolve22 } from "node:path";
 var DEFAULT_SETTINGS2 = {
   lastAgent: null,
   tokenStreaming: false,
@@ -116993,6 +117050,11 @@ class SettingsManager2 {
     }
   }
   async loadProjectSettings(workingDirectory = process.cwd()) {
+    if (this.isProjectSettingsPathCollidingWithGlobal(workingDirectory)) {
+      const defaults4 = { ...DEFAULT_PROJECT_SETTINGS2 };
+      this.projectSettings.set(workingDirectory, defaults4);
+      return defaults4;
+    }
     const cached = this.projectSettings.get(workingDirectory);
     if (cached) {
       return { ...cached };
@@ -117028,6 +117090,19 @@ class SettingsManager2 {
     return { ...cached };
   }
   updateProjectSettings(updates, workingDirectory = process.cwd()) {
+    if (this.isProjectSettingsPathCollidingWithGlobal(workingDirectory)) {
+      const globalUpdates = {};
+      if ("hooks" in updates) {
+        globalUpdates.hooks = updates.hooks;
+      }
+      if ("statusLine" in updates) {
+        globalUpdates.statusLine = updates.statusLine;
+      }
+      if (Object.keys(globalUpdates).length > 0) {
+        this.updateSettings(globalUpdates);
+      }
+      return;
+    }
     const current = this.projectSettings.get(workingDirectory);
     if (!current) {
       throw new Error(`Project settings for ${workingDirectory} not loaded. Call loadProjectSettings() first.`);
@@ -117045,7 +117120,7 @@ class SettingsManager2 {
     if (!this.settings)
       return;
     const settingsPath = this.getSettingsPath();
-    const home = process.env.HOME || homedir14();
+    const home = process.env.HOME || homedir15();
     const dirPath = join18(home, ".letta");
     try {
       if (!exists(dirPath)) {
@@ -117074,6 +117149,9 @@ class SettingsManager2 {
     }
   }
   async persistProjectSettings(workingDirectory) {
+    if (this.isProjectSettingsPathCollidingWithGlobal(workingDirectory)) {
+      return;
+    }
     const settings = this.projectSettings.get(workingDirectory);
     if (!settings)
       return;
@@ -117099,12 +117177,15 @@ class SettingsManager2 {
     }
   }
   getSettingsPath() {
-    const home = process.env.HOME || homedir14();
+    const home = process.env.HOME || homedir15();
     return join18(home, ".letta", "settings.json");
   }
   getProjectSettingsPath(workingDirectory) {
     return join18(workingDirectory, ".letta", "settings.json");
   }
+  isProjectSettingsPathCollidingWithGlobal(workingDirectory) {
+    return resolve22(this.getProjectSettingsPath(workingDirectory)) === resolve22(this.getSettingsPath());
+  }
   getLocalProjectSettingsPath(workingDirectory) {
     return join18(workingDirectory, ".letta", "settings.local.json");
   }
@@ -117897,8 +117978,8 @@ function acquireSwitchLock2() {
   const lock = getSwitchLock2();
   lock.refCount++;
   if (lock.refCount === 1) {
-    lock.promise = new Promise((resolve20) => {
-      lock.resolve = resolve20;
+    lock.promise = new Promise((resolve23) => {
+      lock.resolve = resolve23;
     });
   }
 }
@@ -118408,7 +118489,7 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
     printHelp();
     const helpDelayMs = Number.parseInt(process.env.LETTA_TEST_HELP_EXIT_DELAY_MS ?? "", 10);
     if (Number.isFinite(helpDelayMs) && helpDelayMs > 0) {
-      await new Promise((resolve26) => setTimeout(resolve26, helpDelayMs));
+      await new Promise((resolve30) => setTimeout(resolve30, helpDelayMs));
     }
     process.exit(0);
   }
@@ -118623,9 +118704,9 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
         process.exit(1);
       }
     } else {
-      const { resolve: resolve26 } = await import("path");
+      const { resolve: resolve30 } = await import("path");
       const { existsSync: existsSync25 } = await import("fs");
-      const resolvedPath = resolve26(fromAfFile);
+      const resolvedPath = resolve30(fromAfFile);
       if (!existsSync25(resolvedPath)) {
         console.error(`Error: AgentFile not found: ${resolvedPath}`);
         process.exit(1);
@@ -119493,4 +119574,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=D2C34BE350CF97DA64756E2164756E21
+//# debugId=8C35AC90E5DBC3BE64756E2164756E21