@letta-ai/letta-code 0.14.7 → 0.14.9

package/letta.js

@@ -166,20 +166,39 @@ var init_error = __esm(() => {
 });
 
 // src/utils/debug.ts
+import { appendFileSync } from "node:fs";
+import { format } from "node:util";
 function isDebugEnabled() {
   const debug = process.env.LETTA_DEBUG;
   return debug === "1" || debug === "true";
 }
+function getDebugFile() {
+  const path = process.env.LETTA_DEBUG_FILE;
+  return path && path.trim().length > 0 ? path : null;
+}
+function writeDebugLine(prefix, message, args) {
+  const debugFile = getDebugFile();
+  const line = `${format(`[${prefix}] ${message}`, ...args)}
+`;
+  if (debugFile) {
+    try {
+      appendFileSync(debugFile, line, { encoding: "utf8" });
+      return;
+    } catch {}
+  }
+  console.log(line.trimEnd());
+}
 function debugLog(prefix, message, ...args) {
   if (isDebugEnabled()) {
-    console.log(`[${prefix}] ${message}`, ...args);
+    writeDebugLine(prefix, message, args);
   }
 }
 function debugWarn(prefix, message, ...args) {
   if (isDebugEnabled()) {
-    console.warn(`[${prefix}] ${message}`, ...args);
+    writeDebugLine(prefix, `WARN: ${message}`, args);
   }
 }
+var init_debug = () => {};
 
 // node_modules/@letta-ai/letta-client/internal/tslib.mjs
 function __classPrivateFieldSet(receiver, state, value, kind, f) {
@@ -493,7 +512,7 @@ function maybe_map(val, fn) {
   }
   return fn(val);
 }
-var has = (obj, key) => (has = Object.hasOwn ?? Function.prototype.call.bind(Object.prototype.hasOwnProperty), has(obj, key)), hex_table, limit = 1024, encode = (str, _defaultEncoder, charset, _kind, format) => {
+var has = (obj, key) => (has = Object.hasOwn ?? Function.prototype.call.bind(Object.prototype.hasOwnProperty), has(obj, key)), hex_table, limit = 1024, encode = (str, _defaultEncoder, charset, _kind, format2) => {
   if (str.length === 0) {
     return str;
   }
@@ -514,7 +533,7 @@ var has = (obj, key) => (has = Object.hasOwn ?? Function.prototype.call.bind(Obj
     const arr = [];
     for (let i = 0;i < segment.length; ++i) {
       let c = segment.charCodeAt(i);
-      if (c === 45 || c === 46 || c === 95 || c === 126 || c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || format === RFC1738 && (c === 40 || c === 41)) {
+      if (c === 45 || c === 46 || c === 95 || c === 126 || c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || format2 === RFC1738 && (c === 40 || c === 41)) {
         arr[arr.length] = segment.charAt(i);
         continue;
       }
@@ -554,7 +573,7 @@ var init_utils = __esm(() => {
 function is_non_nullish_primitive(v) {
   return typeof v === "string" || typeof v === "number" || typeof v === "boolean" || typeof v === "symbol" || typeof v === "bigint";
 }
-function inner_stringify(object, prefix, generateArrayPrefix, commaRoundTrip, allowEmptyArrays, strictNullHandling, skipNulls, encodeDotInKeys, encoder, filter, sort, allowDots, serializeDate, format, formatter, encodeValuesOnly, charset, sideChannel) {
+function inner_stringify(object, prefix, generateArrayPrefix, commaRoundTrip, allowEmptyArrays, strictNullHandling, skipNulls, encodeDotInKeys, encoder, filter, sort, allowDots, serializeDate, format2, formatter, encodeValuesOnly, charset, sideChannel) {
   let obj = object;
   let tmp_sc = sideChannel;
   let step = 0;
@@ -587,15 +606,15 @@ function inner_stringify(object, prefix, generateArrayPrefix, commaRoundTrip, al
   }
   if (obj === null) {
     if (strictNullHandling) {
-      return encoder && !encodeValuesOnly ? encoder(prefix, defaults.encoder, charset, "key", format) : prefix;
+      return encoder && !encodeValuesOnly ? encoder(prefix, defaults.encoder, charset, "key", format2) : prefix;
     }
     obj = "";
   }
   if (is_non_nullish_primitive(obj) || is_buffer(obj)) {
     if (encoder) {
-      const key_value = encodeValuesOnly ? prefix : encoder(prefix, defaults.encoder, charset, "key", format);
+      const key_value = encodeValuesOnly ? prefix : encoder(prefix, defaults.encoder, charset, "key", format2);
       return [
-        formatter?.(key_value) + "=" + formatter?.(encoder(obj, defaults.encoder, charset, "value", format))
+        formatter?.(key_value) + "=" + formatter?.(encoder(obj, defaults.encoder, charset, "value", format2))
       ];
     }
     return [formatter?.(prefix) + "=" + formatter?.(String(obj))];
@@ -632,7 +651,7 @@ function inner_stringify(object, prefix, generateArrayPrefix, commaRoundTrip, al
     sideChannel.set(object, step);
     const valueSideChannel = new WeakMap;
     valueSideChannel.set(sentinel, sideChannel);
-    push_to_array(values, inner_stringify(value, key_prefix, generateArrayPrefix, commaRoundTrip, allowEmptyArrays, strictNullHandling, skipNulls, encodeDotInKeys, generateArrayPrefix === "comma" && encodeValuesOnly && isArray(obj) ? null : encoder, filter, sort, allowDots, serializeDate, format, formatter, encodeValuesOnly, charset, valueSideChannel));
+    push_to_array(values, inner_stringify(value, key_prefix, generateArrayPrefix, commaRoundTrip, allowEmptyArrays, strictNullHandling, skipNulls, encodeDotInKeys, generateArrayPrefix === "comma" && encodeValuesOnly && isArray(obj) ? null : encoder, filter, sort, allowDots, serializeDate, format2, formatter, encodeValuesOnly, charset, valueSideChannel));
   }
   return values;
 }
@@ -650,14 +669,14 @@ function normalize_stringify_options(opts = defaults) {
   if (typeof opts.charset !== "undefined" && opts.charset !== "utf-8" && opts.charset !== "iso-8859-1") {
     throw new TypeError("The charset option must be either utf-8, iso-8859-1, or undefined");
   }
-  let format = default_format;
+  let format2 = default_format;
   if (typeof opts.format !== "undefined") {
     if (!has(formatters, opts.format)) {
       throw new TypeError("Unknown format option provided.");
     }
-    format = opts.format;
+    format2 = opts.format;
   }
-  const formatter = formatters[format];
+  const formatter = formatters[format2];
   let filter = defaults.filter;
   if (typeof opts.filter === "function" || isArray(opts.filter)) {
     filter = opts.filter;
@@ -688,7 +707,7 @@ function normalize_stringify_options(opts = defaults) {
     encoder: typeof opts.encoder === "function" ? opts.encoder : defaults.encoder,
     encodeValuesOnly: typeof opts.encodeValuesOnly === "boolean" ? opts.encodeValuesOnly : defaults.encodeValuesOnly,
     filter,
-    format,
+    format: format2,
     formatter,
     serializeDate: typeof opts.serializeDate === "function" ? opts.serializeDate : defaults.serializeDate,
     skipNulls: typeof opts.skipNulls === "boolean" ? opts.skipNulls : defaults.skipNulls,
@@ -3108,7 +3127,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.14.7",
+    version: "0.14.9",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -3170,7 +3189,7 @@ var init_package = __esm(() => {
       check: "bun run scripts/check.js",
       dev: "bun --loader:.md=text --loader:.mdx=text --loader:.txt=text run src/index.ts",
       build: "node scripts/postinstall-patches.js && bun run build.js",
-      prepare: "bun run build",
+      prepublishOnly: "bun run build",
       postinstall: "node scripts/postinstall-patches.js"
     },
     "lint-staged": {
@@ -3570,7 +3589,7 @@ class SettingsManager {
             }
             this.settings = updatedSettings;
             await this.persistSettings();
-            console.log("Successfully migrated tokens to secrets");
+            debugWarn("settings", "Successfully migrated tokens to secrets");
           } catch (error) {
             console.warn("Failed to migrate tokens to secrets:", error);
             console.warn("Tokens will remain in settings file for persistence");
@@ -4287,6 +4306,7 @@ class SettingsManager {
 }
 var DEFAULT_SETTINGS, DEFAULT_PROJECT_SETTINGS, DEFAULT_LOCAL_PROJECT_SETTINGS, DEFAULT_LETTA_API_URL = "https://api.letta.com", settingsManager;
 var init_settings_manager = __esm(async () => {
+  init_debug();
   init_fs();
   await init_secrets();
   DEFAULT_SETTINGS = {
@@ -7367,38 +7387,38 @@ var require_react_development = __commonJS((exports, module) => {
         ReactSharedInternals.ReactDebugCurrentFrame = ReactDebugCurrentFrame;
         ReactSharedInternals.ReactCurrentActQueue = ReactCurrentActQueue;
       }
-      function warn(format) {
+      function warn(format2) {
         {
           {
             for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1;_key < _len; _key++) {
               args[_key - 1] = arguments[_key];
             }
-            printWarning("warn", format, args);
+            printWarning("warn", format2, args);
           }
         }
       }
-      function error(format) {
+      function error(format2) {
         {
           {
             for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1;_key2 < _len2; _key2++) {
               args[_key2 - 1] = arguments[_key2];
             }
-            printWarning("error", format, args);
+            printWarning("error", format2, args);
           }
         }
       }
-      function printWarning(level, format, args) {
+      function printWarning(level, format2, args) {
         {
           var ReactDebugCurrentFrame2 = ReactSharedInternals.ReactDebugCurrentFrame;
           var stack = ReactDebugCurrentFrame2.getStackAddendum();
           if (stack !== "") {
-            format += "%s";
+            format2 += "%s";
             args = args.concat([stack]);
           }
           var argsWithFormat = args.map(function(item) {
             return String(item);
           });
-          argsWithFormat.unshift("Warning: " + format);
+          argsWithFormat.unshift("Warning: " + format2);
           Function.prototype.apply.call(console[level], console, argsWithFormat);
         }
       }
@@ -11750,38 +11770,38 @@ var require_react_reconciler_development = __commonJS((exports, module) => {
           suppressWarning = newSuppressWarning;
         }
       }
-      function warn(format) {
+      function warn(format2) {
         {
           if (!suppressWarning) {
             for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1;_key < _len; _key++) {
               args[_key - 1] = arguments[_key];
             }
-            printWarning("warn", format, args);
+            printWarning("warn", format2, args);
           }
         }
       }
-      function error(format) {
+      function error(format2) {
         {
           if (!suppressWarning) {
             for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1;_key2 < _len2; _key2++) {
               args[_key2 - 1] = arguments[_key2];
             }
-            printWarning("error", format, args);
+            printWarning("error", format2, args);
           }
         }
       }
-      function printWarning(level, format, args) {
+      function printWarning(level, format2, args) {
         {
           var ReactDebugCurrentFrame2 = ReactSharedInternals.ReactDebugCurrentFrame;
           var stack = ReactDebugCurrentFrame2.getStackAddendum();
           if (stack !== "") {
-            format += "%s";
+            format2 += "%s";
             args = args.concat([stack]);
           }
           var argsWithFormat = args.map(function(item) {
             return String(item);
           });
-          argsWithFormat.unshift("Warning: " + format);
+          argsWithFormat.unshift("Warning: " + format2);
           Function.prototype.apply.call(console[level], console, argsWithFormat);
         }
       }
@@ -30620,11 +30640,22 @@ var import_react16, useInput = (inputHandler, options = {}) => {
       }
       let keypress = parse_keypress_default(data);
       if (!keypress.name && typeof data === "string") {
+        let keycode = null;
+        let modifier = 0;
+        let event = 1;
         const csiUMatch = data.match(/^\x1b\[(\d+)(?:;(\d+))?(?::(\d+))?u$/);
         if (csiUMatch) {
-          const keycode = parseInt(csiUMatch[1], 10);
-          const modifier = parseInt(csiUMatch[2] || "1", 10) - 1;
-          const event = csiUMatch[3] ? parseInt(csiUMatch[3], 10) : 1;
+          keycode = parseInt(csiUMatch[1], 10);
+          modifier = parseInt(csiUMatch[2] || "1", 10) - 1;
+          event = csiUMatch[3] ? parseInt(csiUMatch[3], 10) : 1;
+        } else {
+          const modifyOtherKeysMatch = data.match(/^\x1b\[27;(\d+);(\d+)~$/);
+          if (modifyOtherKeysMatch) {
+            modifier = parseInt(modifyOtherKeysMatch[1], 10) - 1;
+            keycode = parseInt(modifyOtherKeysMatch[2], 10);
+          }
+        }
+        if (keycode !== null) {
           if (event === 3) {
             return;
           }
@@ -30660,7 +30691,7 @@ var import_react16, useInput = (inputHandler, options = {}) => {
         rightArrow: keypress.name === "right",
         pageDown: keypress.name === "pagedown",
         pageUp: keypress.name === "pageup",
-        return: keypress.name === "return",
+        return: keypress.name === "return" || keypress.name === "enter",
         escape: keypress.name === "escape",
         ctrl: keypress.ctrl,
         shift: keypress.shift,
@@ -31094,28 +31125,28 @@ var require_react_jsx_dev_runtime_development = __commonJS((exports) => {
         return null;
       }
       var ReactSharedInternals = React10.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-      function error(format) {
+      function error(format2) {
         {
           {
             for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1;_key2 < _len2; _key2++) {
               args[_key2 - 1] = arguments[_key2];
             }
-            printWarning("error", format, args);
+            printWarning("error", format2, args);
           }
         }
       }
-      function printWarning(level, format, args) {
+      function printWarning(level, format2, args) {
         {
           var ReactDebugCurrentFrame2 = ReactSharedInternals.ReactDebugCurrentFrame;
           var stack = ReactDebugCurrentFrame2.getStackAddendum();
           if (stack !== "") {
-            format += "%s";
+            format2 += "%s";
             args = args.concat([stack]);
           }
           var argsWithFormat = args.map(function(item) {
             return String(item);
           });
-          argsWithFormat.unshift("Warning: " + format);
+          argsWithFormat.unshift("Warning: " + format2);
           Function.prototype.apply.call(console[level], console, argsWithFormat);
         }
       }
@@ -33252,10 +33283,11 @@ function getSnapshot() {
   return tick;
 }
 function AnimatedLogo({
-  color = colors.welcome.accent
+  color = colors.welcome.accent,
+  animate = true
 }) {
   const tick2 = import_react24.useSyncExternalStore(subscribe, getSnapshot);
-  const frame = tick2 % logoFrames.length;
+  const frame = animate ? tick2 % logoFrames.length : 0;
   const logoLines = logoFrames[frame]?.split(`
 `) ?? [];
   return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(jsx_dev_runtime5.Fragment, {
@@ -33409,7 +33441,8 @@ function WelcomeScreen({
         paddingLeft: 1,
         paddingRight: 2,
         children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(AnimatedLogo, {
-          color: colors.welcome.accent
+          color: colors.welcome.accent,
+          animate: loadingState !== "ready"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
@@ -34598,13 +34631,19 @@ function windowsLaunchers(command) {
     return [];
   const launchers = [];
   const seen = new Set;
+  const powerShellCommand = trimmed.startsWith("&") || trimmed.startsWith('"') || trimmed.startsWith("'") ? trimmed.startsWith("&") ? trimmed : `& ${trimmed}` : trimmed;
   pushUnique(launchers, seen, [
     "powershell.exe",
     "-NoProfile",
     "-Command",
-    trimmed
+    powerShellCommand
+  ]);
+  pushUnique(launchers, seen, [
+    "pwsh",
+    "-NoProfile",
+    "-Command",
+    powerShellCommand
   ]);
-  pushUnique(launchers, seen, ["pwsh", "-NoProfile", "-Command", trimmed]);
   const envComSpecRaw = process.env.ComSpec || process.env.COMSPEC;
   const envComSpec = envComSpecRaw?.trim();
   if (envComSpec) {
@@ -34667,6 +34706,7 @@ var init_types = __esm(() => {
   TOOL_EVENTS = new Set([
     "PreToolUse",
     "PostToolUse",
+    "PostToolUseFailure",
     "PermissionRequest"
   ]);
 });
@@ -34737,8 +34777,10 @@ function executeWithLauncher(launcher, inputJson, workingDirectory, input, timeo
     const safeResolve = (result) => {
       if (!resolved) {
         resolved = true;
-        const exitLabel = result.exitCode === 0 /* ALLOW */ ? "\x1B[32m✓ allowed\x1B[0m" : result.exitCode === 2 /* BLOCK */ ? "\x1B[31m✗ blocked\x1B[0m" : "\x1B[33m⚠ error\x1B[0m";
-        console.log(`\x1B[90m[hook] ${command}\x1B[0m`);
+        const exitCode = result.exitCode === 0 /* ALLOW */ ? 0 : result.exitCode === 2 /* BLOCK */ ? 2 : 1;
+        const exitColor = result.exitCode === 0 /* ALLOW */ ? "\x1B[32m" : result.exitCode === 2 /* BLOCK */ ? "\x1B[31m" : "\x1B[33m";
+        const exitLabel = result.timedOut ? `${exitColor}timeout\x1B[0m` : `${exitColor}exit ${exitCode}\x1B[0m`;
+        console.log(`\x1B[90m[hook:${input.event_type}] ${command}\x1B[0m`);
         console.log(`\x1B[90m  ⎿ ${exitLabel} (${result.durationMs}ms)\x1B[0m`);
         if (result.stdout) {
           console.log(`\x1B[90m  ⎿ (stdout)\x1B[0m`);
@@ -34908,7 +34950,8 @@ var init_executor = __esm(() => {
 function loadGlobalHooks() {
   try {
     return settingsManager.getSettings().hooks || {};
-  } catch {
+  } catch (error) {
+    debugLog("hooks", "loadGlobalHooks: Settings not initialized yet", error);
     return {};
   }
 }
@@ -34920,7 +34963,8 @@ async function loadProjectHooks(workingDirectory = process.cwd()) {
       await settingsManager.loadProjectSettings(workingDirectory);
     }
     return settingsManager.getProjectSettings(workingDirectory)?.hooks || {};
-  } catch {
+  } catch (error) {
+    debugLog("hooks", "loadProjectHooks: Settings not available", error);
     return {};
   }
 }
@@ -34932,7 +34976,8 @@ async function loadProjectLocalHooks(workingDirectory = process.cwd()) {
       await settingsManager.loadLocalProjectSettings(workingDirectory);
     }
     return settingsManager.getLocalProjectSettings(workingDirectory)?.hooks || {};
-  } catch {
+  } catch (error) {
+    debugLog("hooks", "loadProjectLocalHooks: Settings not available", error);
     return {};
   }
 }
@@ -34983,7 +35028,8 @@ function matchesTool(pattern, toolName) {
   try {
     const regex2 = new RegExp(`^(?:${pattern})$`);
     return regex2.test(toolName);
-  } catch {
+  } catch (error) {
+    debugLog("hooks", `matchesTool: Invalid regex pattern "${pattern}", falling back to exact match`, error);
     return pattern === toolName;
   }
 }
@@ -35026,15 +35072,20 @@ function areHooksDisabled(workingDirectory = process.cwd()) {
       if (projectDisabled === true) {
         return true;
       }
-    } catch {}
+    } catch (error) {
+      debugLog("hooks", "areHooksDisabled: Project settings not loaded, skipping", error);
+    }
     try {
       const localDisabled = settingsManager.getLocalProjectSettings(workingDirectory)?.hooks?.disabled;
       if (localDisabled === true) {
         return true;
       }
-    } catch {}
+    } catch (error) {
+      debugLog("hooks", "areHooksDisabled: Local project settings not loaded, skipping", error);
+    }
     return false;
-  } catch {
+  } catch (error) {
+    debugLog("hooks", "areHooksDisabled: Failed to check hooks disabled status", error);
     return false;
   }
 }
@@ -35046,6 +35097,7 @@ async function getHooksForEvent(event, toolName, workingDirectory = process.cwd(
   return getMatchingHooks(config, event, toolName);
 }
 var init_loader = __esm(async () => {
+  init_debug();
   init_types();
   await init_settings_manager();
 });
@@ -35084,6 +35136,31 @@ async function runPostToolUseHooks(toolName, toolInput, toolResult, toolCallId,
   };
   return executeHooksParallel(hooks, input, workingDirectory);
 }
+async function runPostToolUseFailureHooks(toolName, toolInput, errorMessage, errorType, toolCallId, workingDirectory = process.cwd(), agentId, precedingReasoning, precedingAssistantMessage) {
+  const hooks = await getHooksForEvent("PostToolUseFailure", toolName, workingDirectory);
+  if (hooks.length === 0) {
+    return { blocked: false, errored: false, feedback: [], results: [] };
+  }
+  const input = {
+    event_type: "PostToolUseFailure",
+    working_directory: workingDirectory,
+    tool_name: toolName,
+    tool_input: toolInput,
+    tool_call_id: toolCallId,
+    error_message: errorMessage,
+    error_type: errorType,
+    agent_id: agentId,
+    preceding_reasoning: precedingReasoning,
+    preceding_assistant_message: precedingAssistantMessage
+  };
+  const result = await executeHooksParallel(hooks, input, workingDirectory);
+  return {
+    blocked: false,
+    errored: result.errored,
+    feedback: result.feedback,
+    results: result.results
+  };
+}
 async function runPermissionRequestHooks(toolName, toolInput, permissionType, scope, workingDirectory = process.cwd()) {
   const hooks = await getHooksForEvent("PermissionRequest", toolName, workingDirectory);
   if (hooks.length === 0) {
@@ -35194,7 +35271,19 @@ async function runSessionStartHooks(isNewSession, agentId, agentName, conversati
     agent_name: agentName,
     conversation_id: conversationId
   };
-  return executeHooks(hooks, input, workingDirectory);
+  const result = await executeHooks(hooks, input, workingDirectory);
+  const feedback = [];
+  for (const hookResult of result.results) {
+    if (hookResult.stdout?.trim()) {
+      feedback.push(hookResult.stdout.trim());
+    }
+  }
+  return {
+    blocked: false,
+    errored: result.errored,
+    feedback,
+    results: result.results
+  };
 }
 async function runSessionEndHooks(durationMs, messageCount, toolCallCount, agentId, conversationId, workingDirectory = process.cwd()) {
   const hooks = await getHooksForEvent("SessionEnd", undefined, workingDirectory);
@@ -36939,8 +37028,8 @@ function getShellEnv() {
   const env3 = { ...process.env };
   const rgBinDir = getRipgrepBinDir();
   if (rgBinDir) {
-    const currentPath = env3.PATH || "";
-    env3.PATH = `${rgBinDir}${path3.delimiter}${currentPath}`;
+    const pathKey = Object.keys(env3).find((k) => k.toUpperCase() === "PATH") || "PATH";
+    env3[pathKey] = `${rgBinDir}${path3.delimiter}${env3[pathKey] || ""}`;
   }
   try {
     env3.LETTA_AGENT_ID = getCurrentAgentId();
@@ -39701,11 +39790,11 @@ var require_picomatch = __commonJS((exports, module) => {
       return { isMatch: false, output: "" };
     }
     const opts = options || {};
-    const format = opts.format || (posix ? utils.toPosixSlashes : null);
+    const format2 = opts.format || (posix ? utils.toPosixSlashes : null);
     let match = input === glob2;
-    let output = match && format ? format(input) : input;
+    let output = match && format2 ? format2(input) : input;
     if (match === false) {
-      output = format ? format(input) : input;
+      output = format2 ? format2(input) : input;
       match = output === glob2;
     }
     if (match === false || opts.capture === true) {
@@ -39979,14 +40068,14 @@ async function getImageDimensions(buffer) {
     const output = execSync(`magick identify -format "%w %h %m" "${tempInput}"`, {
       encoding: "utf-8"
     });
-    const [width, height, format] = output.trim().split(" ");
-    if (!width || !height || !format) {
+    const [width, height, format2] = output.trim().split(" ");
+    if (!width || !height || !format2) {
       throw new Error("Failed to get image dimensions");
     }
     return {
       width: parseInt(width, 10),
       height: parseInt(height, 10),
-      format: format.toLowerCase()
+      format: format2.toLowerCase()
     };
   } finally {
     unlinkSync2(tempInput);
@@ -40055,9 +40144,9 @@ async function compressToFitByteLimit(buffer, currentWidth, currentHeight) {
   }
 }
 async function resizeImageIfNeeded(buffer, inputMediaType) {
-  const { width, height, format } = await getImageDimensions(buffer);
+  const { width, height, format: format2 } = await getImageDimensions(buffer);
   const needsResize = width > MAX_IMAGE_WIDTH || height > MAX_IMAGE_HEIGHT;
-  const isPassthroughFormat = format === "png" || format === "jpeg" || format === "jpg";
+  const isPassthroughFormat = format2 === "png" || format2 === "jpeg" || format2 === "jpg";
   if (!needsResize && isPassthroughFormat) {
     const compressed = await compressToFitByteLimit(buffer, width, height);
     if (compressed) {
@@ -40078,7 +40167,7 @@ async function resizeImageIfNeeded(buffer, inputMediaType) {
       const tempOutput2 = join12(tmpdir(), `resize-output-${Date.now()}-${Math.random().toString(36).slice(2)}`);
       let outputBuffer2;
       let outputMediaType;
-      if (format === "jpeg" || format === "jpg") {
+      if (format2 === "jpeg" || format2 === "jpg") {
         execSync(`magick "${tempInput}" -resize ${MAX_IMAGE_WIDTH}x${MAX_IMAGE_HEIGHT}> -quality 85 "${tempOutput2}.jpg"`, {
           stdio: "ignore"
         });
@@ -45680,10 +45769,10 @@ var require_output = __commonJS((exports, module) => {
     }
     return this;
   }
-  function toFormat(format, options) {
-    const actualFormat = formats.get((is.object(format) && is.string(format.id) ? format.id : format).toLowerCase());
+  function toFormat(format2, options) {
+    const actualFormat = formats.get((is.object(format2) && is.string(format2.id) ? format2.id : format2).toLowerCase());
     if (!actualFormat) {
-      throw is.invalidParameterError("format", `one of: ${[...formats.keys()].join(", ")}`, format);
+      throw is.invalidParameterError("format", `one of: ${[...formats.keys()].join(", ")}`, format2);
     }
     return this[actualFormat](options);
   }
@@ -46405,11 +46494,11 @@ var require_utility = __commonJS((exports, module) => {
   var sharp = require_sharp();
   var runtimePlatform = runtimePlatformArch();
   var libvipsVersion = sharp.libvipsVersion();
-  var format = sharp.format();
-  format.heif.output.alias = ["avif", "heic"];
-  format.jpeg.output.alias = ["jpe", "jpg"];
-  format.tiff.output.alias = ["tif"];
-  format.jp2k.output.alias = ["j2c", "j2k", "jp2", "jpx"];
+  var format2 = sharp.format();
+  format2.heif.output.alias = ["avif", "heic"];
+  format2.jpeg.output.alias = ["jpe", "jpg"];
+  format2.tiff.output.alias = ["tif"];
+  format2.jp2k.output.alias = ["j2c", "j2k", "jp2", "jpx"];
   var interpolators = {
     nearest: "nearest",
     bilinear: "bilinear",
@@ -46437,9 +46526,9 @@ var require_utility = __commonJS((exports, module) => {
     }
   }
   versions.sharp = require_package().version;
-  if (versions.heif && format.heif) {
-    format.heif.input.fileSuffix = [".avif"];
-    format.heif.output.alias = ["avif"];
+  if (versions.heif && format2.heif) {
+    format2.heif.input.fileSuffix = [".avif"];
+    format2.heif.output.alias = ["avif"];
   }
   function cache4(options) {
     if (is.bool(options)) {
@@ -46497,7 +46586,7 @@ var require_utility = __commonJS((exports, module) => {
     Sharp.concurrency = concurrency;
     Sharp.counters = counters;
     Sharp.simd = simd;
-    Sharp.format = format;
+    Sharp.format = format2;
     Sharp.interpolators = interpolators;
     Sharp.versions = versions;
     Sharp.queue = queue;
@@ -46576,9 +46665,9 @@ async function resizeImageIfNeeded2(buffer, inputMediaType) {
   const metadata = await image2.metadata();
   const width = metadata.width ?? 0;
   const height = metadata.height ?? 0;
-  const format = metadata.format;
+  const format2 = metadata.format;
   const needsResize = width > MAX_IMAGE_WIDTH2 || height > MAX_IMAGE_HEIGHT2;
-  const isPassthroughFormat = format === "png" || format === "jpeg";
+  const isPassthroughFormat = format2 === "png" || format2 === "jpeg";
   if (!needsResize && isPassthroughFormat) {
     const compressed2 = await compressToFitByteLimit2(buffer, width, height);
     if (compressed2) {
@@ -46599,7 +46688,7 @@ async function resizeImageIfNeeded2(buffer, inputMediaType) {
     });
     let outputBuffer2;
     let outputMediaType;
-    if (format === "jpeg") {
+    if (format2 === "jpeg") {
       outputBuffer2 = await resized.jpeg({ quality: 85 }).toBuffer();
       outputMediaType = "image/jpeg";
     } else {
@@ -54363,7 +54452,10 @@ async function getAvailableModelHandles(options) {
 function prefetchAvailableModelHandles() {
   getAvailableModelHandles().catch(() => {});
 }
-function getModelContextWindow(handle) {
+async function getModelContextWindow(handle) {
+  if (!cache4) {
+    await getAvailableModelHandles();
+  }
   return cache4?.contextWindows.get(handle);
 }
 var CACHE_TTL_MS, cache4 = null, inflight = null;
@@ -57621,19 +57713,22 @@ var init_esm7 = __esm(() => {
 
 // src/permissions/matcher.ts
 import { resolve as resolve13 } from "node:path";
+function normalizePath(p) {
+  return p.replace(/\\/g, "/");
+}
 function matchesFilePattern(query, pattern, workingDirectory) {
   const queryMatch = query.match(/^([^(]+)\((.+)\)$/);
   if (!queryMatch || !queryMatch[1] || !queryMatch[2]) {
     return false;
   }
   const queryTool = queryMatch[1];
-  const filePath = queryMatch[2];
+  const filePath = normalizePath(queryMatch[2]);
   const patternMatch = pattern.match(/^([^(]+)\((.+)\)$/);
   if (!patternMatch || !patternMatch[1] || !patternMatch[2]) {
     return false;
   }
   const patternTool = patternMatch[1];
-  let globPattern = patternMatch[2];
+  let globPattern = normalizePath(patternMatch[2]);
   if (queryTool !== patternTool) {
     return false;
   }
@@ -57647,11 +57742,12 @@ function matchesFilePattern(query, pattern, workingDirectory) {
   if (globPattern.startsWith("//")) {
     globPattern = globPattern.slice(1);
   }
-  const absoluteFilePath = resolve13(workingDirectory, filePath);
+  const absoluteFilePath = normalizePath(resolve13(workingDirectory, filePath));
   if (globPattern.startsWith("/")) {
     return minimatch2(absoluteFilePath, globPattern);
   }
-  const relativeFilePath = filePath.startsWith("/") ? absoluteFilePath.replace(`${workingDirectory}/`, "") : filePath;
+  const normalizedWorkingDir = normalizePath(workingDirectory);
+  const relativeFilePath = filePath.startsWith("/") ? absoluteFilePath.replace(`${normalizedWorkingDir}/`, "") : filePath;
   return minimatch2(relativeFilePath, globPattern) || minimatch2(absoluteFilePath, globPattern);
 }
 function extractActualCommand(command) {
@@ -58971,10 +59067,51 @@ async function executeTool(name, args, options) {
     const responseSize = typeof flattenedResponse === "string" ? flattenedResponse.length : JSON.stringify(flattenedResponse).length;
     telemetry2.trackToolUsage(internalName, toolStatus === "success", duration, responseSize, toolStatus === "error" ? "tool_error" : undefined, stderr ? stderr.join(`
 `) : undefined);
-    runPostToolUseHooks(internalName, args, {
-      status: toolStatus,
-      output: getDisplayableToolReturn(flattenedResponse)
-    }, options?.toolCallId, undefined, undefined, undefined, undefined).catch(() => {});
+    let postToolUseFeedback = [];
+    try {
+      const postHookResult = await runPostToolUseHooks(internalName, args, {
+        status: toolStatus,
+        output: getDisplayableToolReturn(flattenedResponse)
+      }, options?.toolCallId, undefined, undefined, undefined, undefined);
+      postToolUseFeedback = postHookResult.feedback;
+    } catch (error) {
+      debugLog("hooks", "PostToolUse hook error (success path)", error);
+    }
+    let postToolUseFailureFeedback = [];
+    if (toolStatus === "error") {
+      const errorOutput = typeof flattenedResponse === "string" ? flattenedResponse : JSON.stringify(flattenedResponse);
+      try {
+        const failureHookResult = await runPostToolUseFailureHooks(internalName, args, errorOutput, "tool_error", options?.toolCallId, undefined, undefined, undefined, undefined);
+        postToolUseFailureFeedback = failureHookResult.feedback;
+      } catch (error) {
+        debugLog("hooks", "PostToolUseFailure hook error (tool returned error)", error);
+      }
+    }
+    const allFeedback = [...postToolUseFeedback, ...postToolUseFailureFeedback];
+    if (allFeedback.length > 0) {
+      const feedbackMessage = `
+
+[Hook feedback]:
+${allFeedback.join(`
+`)}`;
+      let finalToolReturn;
+      if (typeof flattenedResponse === "string") {
+        finalToolReturn = flattenedResponse + feedbackMessage;
+      } else if (Array.isArray(flattenedResponse)) {
+        finalToolReturn = [
+          ...flattenedResponse,
+          { type: "text", text: feedbackMessage }
+        ];
+      } else {
+        finalToolReturn = flattenedResponse;
+      }
+      return {
+        toolReturn: finalToolReturn,
+        status: toolStatus,
+        ...stdout && { stdout },
+        ...stderr && { stderr }
+      };
+    }
     return {
       toolReturn: flattenedResponse,
       status: toolStatus,
@@ -58987,9 +59124,28 @@ async function executeTool(name, args, options) {
     const errorType = isAbort ? "abort" : error instanceof Error ? error.name : "unknown";
     const errorMessage = isAbort ? INTERRUPTED_BY_USER : error instanceof Error ? error.message : String(error);
     telemetry2.trackToolUsage(internalName, false, duration, errorMessage.length, errorType, errorMessage);
-    runPostToolUseHooks(internalName, args, { status: "error", output: errorMessage }, options?.toolCallId, undefined, undefined, undefined, undefined).catch(() => {});
+    let postToolUseFeedback = [];
+    try {
+      const postHookResult = await runPostToolUseHooks(internalName, args, { status: "error", output: errorMessage }, options?.toolCallId, undefined, undefined, undefined, undefined);
+      postToolUseFeedback = postHookResult.feedback;
+    } catch (error2) {
+      debugLog("hooks", "PostToolUse hook error (error path)", error2);
+    }
+    let postToolUseFailureFeedback = [];
+    try {
+      const failureHookResult = await runPostToolUseFailureHooks(internalName, args, errorMessage, errorType, options?.toolCallId, undefined, undefined, undefined, undefined);
+      postToolUseFailureFeedback = failureHookResult.feedback;
+    } catch (error2) {
+      debugLog("hooks", "PostToolUseFailure hook error (exception path)", error2);
+    }
+    const allFeedback = [...postToolUseFeedback, ...postToolUseFailureFeedback];
+    const finalErrorMessage = allFeedback.length > 0 ? `${errorMessage}
+
+[Hook feedback]:
+${allFeedback.join(`
+`)}` : errorMessage;
     return {
-      toolReturn: errorMessage,
+      toolReturn: finalErrorMessage,
       status: "error"
     };
   }
@@ -59025,6 +59181,7 @@ var init_manager3 = __esm(async () => {
   init_model();
   init_subagents();
   init_constants();
+  init_debug();
   await __promiseAll([
     init_approval_execution(),
     init_hooks(),
@@ -61856,7 +62013,7 @@ function buildModelSettings(modelHandle, updateArgs) {
 async function updateAgentLLMConfig(agentId, modelHandle, updateArgs) {
   const client = await getClient2();
   const modelSettings = buildModelSettings(modelHandle, updateArgs);
-  const contextWindow = updateArgs?.context_window;
+  const contextWindow = updateArgs?.context_window ?? await getModelContextWindow(modelHandle);
   const hasModelSettings = Object.keys(modelSettings).length > 0;
   await client.agents.update(agentId, {
     model: modelHandle,
@@ -61938,6 +62095,7 @@ async function updateAgentSystemPromptMemfs(agentId, enableMemfs) {
 var init_modify = __esm(async () => {
   await __promiseAll([
     init_openai_codex_provider(),
+    init_available_models(),
     init_client2()
   ]);
 });
@@ -62109,7 +62267,7 @@ async function createAgent(nameOrOptions = DEFAULT_AGENT_NAME, model, embeddingM
     blockProvenance.push({ label: blockId, source: "shared" });
   }
   const modelUpdateArgs = getModelUpdateArgs(modelHandle);
-  const contextWindow = modelUpdateArgs?.context_window;
+  const contextWindow = modelUpdateArgs?.context_window ?? await getModelContextWindow(modelHandle);
   let systemPromptContent;
   if (options.systemPromptCustom) {
     systemPromptContent = options.systemPromptCustom;
@@ -62182,6 +62340,7 @@ var init_create = __esm(async () => {
   init_promptAssets();
   init_skills2();
   await __promiseAll([
+    init_available_models(),
     init_client2(),
     init_modify()
   ]);
@@ -62853,16 +63012,6 @@ function isGlobTool(name) {
 }
 
 // src/cli/helpers/accumulator.ts
-var exports_accumulator = {};
-__export(exports_accumulator, {
-  toLines: () => toLines,
-  setToolCallsRunning: () => setToolCallsRunning,
-  onChunk: () => onChunk,
-  markIncompleteToolsAsCancelled: () => markIncompleteToolsAsCancelled,
-  markCurrentLineAsFinished: () => markCurrentLineAsFinished,
-  createBuffers: () => createBuffers,
-  appendStreamingOutput: () => appendStreamingOutput
-});
 function appendStreamingOutput(state, chunk, startTime, isStderr = false) {
   const current = state || {
     tailLines: [],
@@ -62963,7 +63112,7 @@ function markCurrentLineAsFinished(b) {
   if (!b.lastOtid) {
     return;
   }
-  const prev = b.byId.get(b.lastOtid) || b.byId.get(`${b.lastOtid}-tool`);
+  const prev = b.byId.get(b.lastOtid);
   if (prev && (prev.kind === "assistant" || prev.kind === "reasoning")) {
     markAsFinished(b, b.lastOtid);
   } else {}
@@ -63109,48 +63258,33 @@ function onChunk(b, chunk) {
     }
     case "tool_call_message":
     case "approval_request_message": {
-      let id = chunk.otid;
+      handleOtidTransition(b, chunk.otid ?? undefined);
       const toolCall = chunk.tool_call || (Array.isArray(chunk.tool_calls) && chunk.tool_calls.length > 0 ? chunk.tool_calls[0] : null);
-      const toolCallId = toolCall?.tool_call_id;
-      const name = toolCall?.name;
-      const argsText = toolCall?.arguments;
-      if (toolCallId && b.toolCallIdToLineId.has(toolCallId)) {
-        const existingId = b.toolCallIdToLineId.get(toolCallId);
-        if (existingId) {
-          id = existingId;
-        }
-        handleOtidTransition(b, chunk.otid ?? undefined);
-      } else {
-        if (id && b.byId.has(id)) {
-          const existing = b.byId.get(id);
-          if (existing && existing.kind === "reasoning") {
-            markAsFinished(b, id);
-            id = `${id}-tool`;
-          } else if (existing && existing.kind === "tool_call") {
-            if (toolCallId) {
-              id = `${id}-${toolCallId.slice(-8)}`;
-            } else {
-              id = `${id}-${Date.now().toString(36)}`;
-            }
-          }
-        }
-        handleOtidTransition(b, id ?? undefined);
-        if (!id) {
-          break;
-        }
-        if (toolCallId)
-          b.toolCallIdToLineId.set(toolCallId, id);
-      }
-      if (!id)
+      if (!toolCall || !toolCall.tool_call_id)
         break;
+      const toolCallId = toolCall.tool_call_id;
+      const name = toolCall.name;
+      const argsText = toolCall.arguments;
+      const id = b.toolCallIdToLineId.get(toolCallId) ?? toolCallId;
+      if (!b.toolCallIdToLineId.has(toolCallId)) {
+        b.toolCallIdToLineId.set(toolCallId, id);
+      }
       const desiredPhase = "ready";
-      const line = ensure(b, id, () => ({
+      let line = ensure(b, id, () => ({
         kind: "tool_call",
         id,
-        toolCallId: toolCallId ?? undefined,
+        toolCallId,
         name: name ?? undefined,
         phase: desiredPhase
       }));
+      if (name && !line.name || line.toolCallId !== toolCallId) {
+        line = {
+          ...line,
+          toolCallId,
+          name: line.name ?? name ?? undefined
+        };
+        b.byId.set(id, line);
+      }
       if (chunk.message_type === "approval_request_message" && line.phase !== "finished") {
         b.byId.set(id, { ...line, phase: "ready" });
       }
@@ -63182,7 +63316,9 @@ function onChunk(b, chunk) {
               parsedArgs = JSON.parse(toolInfo.toolArgs);
             }
           } catch {}
-          runPreToolUseHooks(toolInfo.toolName, parsedArgs, toolCallId, undefined, b.agentId).catch(() => {});
+          runPreToolUseHooks(toolInfo.toolName, parsedArgs, toolCallId, undefined, b.agentId).catch((error) => {
+            debugLog("hooks", "PreToolUse hook error (accumulator)", error);
+          });
         }
       }
       break;
@@ -63231,7 +63367,9 @@ function onChunk(b, chunk) {
             runPostToolUseHooks(serverToolInfo.toolName, parsedArgs, {
               status: status === "success" ? "success" : "error",
               output: resultText
-            }, toolCallId, undefined, b.agentId, precedingReasoning, precedingAssistantMessage).catch(() => {});
+            }, toolCallId, undefined, b.agentId, precedingReasoning, precedingAssistantMessage).catch((error) => {
+              debugLog("hooks", "PostToolUse hook error (accumulator)", error);
+            });
             b.serverToolCalls.delete(toolCallId);
           }
         }
@@ -63337,6 +63475,7 @@ function setToolCallsRunning(b, toolCallIds) {
 var MAX_TAIL_LINES = 5, MAX_BUFFER_SIZE = 1e5, CANCEL_REASON_TEXT;
 var init_accumulator = __esm(async () => {
   init_constants();
+  init_debug();
   init_backfill();
   await init_hooks();
   CANCEL_REASON_TEXT = {
@@ -63347,6 +63486,99 @@ var init_accumulator = __esm(async () => {
   };
 });
 
+// src/cli/helpers/safeJsonParse.ts
+function safeJsonParse(json) {
+  try {
+    const data = JSON.parse(json);
+    return { success: true, data };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+function safeJsonParseOr(json, defaultValue) {
+  const result = safeJsonParse(json);
+  return result.success ? result.data : defaultValue;
+}
+
+// src/cli/helpers/approvalClassification.ts
+async function getMissingRequiredArgs(toolName, parsedArgs) {
+  const schema = getToolSchema(toolName);
+  const required = schema?.input_schema?.required || [];
+  return required.filter((key) => !(key in parsedArgs) || parsedArgs[key] == null);
+}
+async function classifyApprovals(approvals, opts = {}) {
+  const needsUserInput = [];
+  const autoAllowed = [];
+  const autoDenied = [];
+  const denyReasonForAsk = opts.denyReasonForAsk ?? "Tool requires approval (headless mode)";
+  const missingNameReason = opts.missingNameReason ?? "Tool call incomplete - missing name";
+  for (const approval of approvals) {
+    const toolName = approval.toolName;
+    if (!toolName) {
+      autoDenied.push({
+        approval,
+        permission: { decision: "deny", reason: missingNameReason },
+        context: null,
+        parsedArgs: {},
+        denyReason: missingNameReason
+      });
+      continue;
+    }
+    const parsedArgs = safeJsonParseOr(approval.toolArgs || "{}", {});
+    const permission = await checkToolPermission(toolName, parsedArgs);
+    const context3 = opts.getContext ? await opts.getContext(toolName, parsedArgs) : null;
+    let decision = permission.decision;
+    if (opts.alwaysRequiresUserInput?.(toolName) && decision === "allow") {
+      decision = "ask";
+    }
+    if (decision === "ask" && opts.treatAskAsDeny) {
+      autoDenied.push({
+        approval,
+        permission,
+        context: context3,
+        parsedArgs,
+        denyReason: denyReasonForAsk
+      });
+      continue;
+    }
+    if (decision === "allow" && opts.requireArgsForAutoApprove) {
+      const missingRequiredArgs = await getMissingRequiredArgs(toolName, parsedArgs);
+      if (missingRequiredArgs.length > 0) {
+        const denyReason = opts.missingArgsReason ? opts.missingArgsReason(missingRequiredArgs) : `Missing required parameter${missingRequiredArgs.length > 1 ? "s" : ""}: ${missingRequiredArgs.join(", ")}`;
+        autoDenied.push({
+          approval,
+          permission,
+          context: context3,
+          parsedArgs,
+          missingRequiredArgs,
+          denyReason
+        });
+        continue;
+      }
+    }
+    const entry = {
+      approval,
+      permission,
+      context: context3,
+      parsedArgs
+    };
+    if (decision === "ask") {
+      needsUserInput.push(entry);
+    } else if (decision === "deny") {
+      autoDenied.push(entry);
+    } else {
+      autoAllowed.push(entry);
+    }
+  }
+  return { needsUserInput, autoAllowed, autoDenied };
+}
+var init_approvalClassification = __esm(async () => {
+  await init_manager3();
+});
+
 // src/cli/helpers/errorContext.ts
 function setErrorContext(context3) {
   currentContext = { ...currentContext, ...context3 };
@@ -63543,23 +63775,6 @@ var init_errorFormatter = __esm(() => {
   init_errorContext();
 });
 
-// src/cli/helpers/safeJsonParse.ts
-function safeJsonParse(json) {
-  try {
-    const data = JSON.parse(json);
-    return { success: true, data };
-  } catch (error) {
-    return {
-      success: false,
-      error: error instanceof Error ? error.message : String(error)
-    };
-  }
-}
-function safeJsonParseOr(json, defaultValue) {
-  const result = safeJsonParse(json);
-  return result.success ? result.data : defaultValue;
-}
-
 // src/cli/helpers/streamProcessor.ts
 class StreamProcessor {
   pendingApprovals = new Map;
@@ -63567,7 +63782,6 @@ class StreamProcessor {
   lastRunId = null;
   lastSeqId = null;
   stopReason = null;
-  lastApprovalId = null;
   processChunk(chunk) {
     let errorInfo;
     let updatedApproval;
@@ -63607,21 +63821,13 @@ class StreamProcessor {
         this.pendingApprovals.delete(chunk.tool_call_id);
       }
     }
-    if (chunk.message_type === "approval_request_message") {
-      this.lastApprovalId = chunk.id;
-    }
     if (chunk.message_type === "approval_request_message") {
       const toolCalls = Array.isArray(chunk.tool_calls) ? chunk.tool_calls : chunk.tool_call ? [chunk.tool_call] : [];
       for (const toolCall of toolCalls) {
-        let id = toolCall?.tool_call_id ?? this.lastApprovalId;
-        if (!id) {
-          if (this.pendingApprovals.size === 1) {
-            id = Array.from(this.pendingApprovals.keys())[0] ?? null;
-          }
-        }
-        if (!id)
+        const toolCallId = toolCall?.tool_call_id;
+        if (!toolCallId)
           continue;
-        this.lastApprovalId = id;
+        const id = toolCallId;
         const existing = this.pendingApprovals.get(id) || {
           toolCallId: id,
           toolName: "",
@@ -63652,7 +63858,7 @@ class StreamProcessor {
 }
 
 // src/cli/helpers/stream.ts
-async function drainStream(stream2, buffers, refresh, abortSignal, onFirstMessage) {
+async function drainStream(stream2, buffers, refresh, abortSignal, onFirstMessage, onChunkProcessed) {
   const startTime = performance.now();
   const requestStartTime = stream2[STREAM_REQUEST_START_TIME];
   let hasLoggedTTFT = false;
@@ -63702,17 +63908,44 @@ async function drainStream(stream2, buffers, refresh, abortSignal, onFirstMessag
         const ttft = performance.now() - requestStartTime;
         logTiming(`TTFT: ${formatDuration(ttft)} (from POST to first content)`);
       }
-      const { shouldOutput } = streamProcessor.processChunk(chunk);
+      const { shouldOutput, errorInfo, updatedApproval } = streamProcessor.processChunk(chunk);
       if (abortSignal?.aborted) {
         stopReason = "cancelled";
         markIncompleteToolsAsCancelled(buffers, true, "user_interrupt");
         queueMicrotask(refresh);
         break;
       }
-      if (shouldOutput) {
+      let shouldOutputChunk = shouldOutput;
+      let shouldAccumulate = shouldOutput;
+      if (onChunkProcessed) {
+        const hookResult = await onChunkProcessed({
+          chunk,
+          shouldOutput: shouldOutputChunk,
+          errorInfo,
+          updatedApproval,
+          streamProcessor
+        });
+        if (hookResult?.shouldOutput !== undefined) {
+          shouldOutputChunk = hookResult.shouldOutput;
+        }
+        if (hookResult?.shouldAccumulate !== undefined) {
+          shouldAccumulate = hookResult.shouldAccumulate;
+        } else {
+          shouldAccumulate = shouldOutputChunk;
+        }
+        if (hookResult?.stopReason) {
+          stopReason = hookResult.stopReason;
+        }
+      } else {
+        shouldAccumulate = shouldOutputChunk;
+      }
+      if (shouldAccumulate) {
         onChunk(buffers, chunk);
         queueMicrotask(refresh);
       }
+      if (stopReason) {
+        break;
+      }
     }
   } catch (e) {
     const errorMessage = e instanceof Error ? e.message : String(e);
@@ -63779,9 +64012,9 @@ async function drainStream(stream2, buffers, refresh, abortSignal, onFirstMessag
     fallbackError
   };
 }
-async function drainStreamWithResume(stream2, buffers, refresh, abortSignal, onFirstMessage) {
+async function drainStreamWithResume(stream2, buffers, refresh, abortSignal, onFirstMessage, onChunkProcessed) {
   const overallStartTime = performance.now();
-  let result = await drainStream(stream2, buffers, refresh, abortSignal, onFirstMessage);
+  let result = await drainStream(stream2, buffers, refresh, abortSignal, onFirstMessage, onChunkProcessed);
   if (result.stopReason === "error" && result.lastRunId && result.lastSeqId !== null && abortSignal && !abortSignal.aborted) {
     const originalFallbackError = result.fallbackError;
     try {
@@ -63792,7 +64025,7 @@ async function drainStreamWithResume(stream2, buffers, refresh, abortSignal, onF
         starting_after: result.lastSeqId,
         batch_size: 1000
       });
-      const resumeResult = await drainStream(resumeStream, buffers, refresh, abortSignal);
+      const resumeResult = await drainStream(resumeStream, buffers, refresh, abortSignal, undefined, onChunkProcessed);
       result = resumeResult;
     } catch (_e) {
       result.fallbackError = originalFallbackError;
@@ -63803,6 +64036,7 @@ async function drainStreamWithResume(stream2, buffers, refresh, abortSignal, onF
 }
 var init_stream = __esm(async () => {
   init_error();
+  init_debug();
   init_timing();
   await __promiseAll([
     init_client2(),
@@ -64227,6 +64461,7 @@ async function getResumeData2(client, agent, conversationId) {
 var MESSAGE_HISTORY_LIMIT2 = 15;
 var init_check_approval = __esm(() => {
   init_error();
+  init_debug();
 });
 
 // src/headless.ts
@@ -64313,6 +64548,13 @@ async function handleHeadlessCommand(argv, model, skillsDirectory) {
   }
   const inputFormat = values["input-format"];
   const isBidirectionalMode = inputFormat === "stream-json";
+  process.stdout.on("error", (err) => {
+    const code = typeof err === "object" && err !== null && "code" in err ? err.code : undefined;
+    if (code === "EPIPE") {
+      process.exit(0);
+    }
+    throw err;
+  });
   let prompt = positionals.slice(2).join(" ");
   if (!prompt && !isBidirectionalMode) {
     if (!process.stdin.isTTY) {
@@ -64617,10 +64859,7 @@ In headless mode, use:
   const noSkillsFlag = values["no-skills"];
   const isSubagent = process.env.LETTA_CODE_AGENT_ROLE === "subagent";
   if (!noSkillsFlag && !isSubagent) {
-    const createdBlocks = await ensureSkillsBlocks(agent.id);
-    if (createdBlocks.length > 0) {
-      console.log("Created missing skills blocks for agent compatibility");
-    }
+    await ensureSkillsBlocks(agent.id);
   }
   if (memfsFlag) {
     settingsManager.setMemfsEnabled(agent.id, true);
@@ -64628,6 +64867,8 @@ In headless mode, use:
     settingsManager.setMemfsEnabled(agent.id, false);
   } else if (isNewlyCreatedAgent && !isSubagent) {
     settingsManager.setMemfsEnabled(agent.id, true);
+  } else if (specifiedAgentId && !isSubagent) {
+    settingsManager.setMemfsEnabled(agent.id, true);
   }
   if (settingsManager.isMemfsEnabled(agent.id)) {
     try {
@@ -64638,9 +64879,6 @@ In headless mode, use:
         process.exit(1);
       }
       await updateMemoryFilesystemBlock(agent.id);
-      if (syncResult.updatedBlocks.length > 0 || syncResult.createdBlocks.length > 0 || syncResult.deletedBlocks.length > 0 || syncResult.updatedFiles.length > 0 || syncResult.createdFiles.length > 0 || syncResult.deletedFiles.length > 0) {
-        console.log(formatMemorySyncSummary(syncResult));
-      }
     } catch (error) {
       console.error(`Memory filesystem sync failed: ${error instanceof Error ? error.message : String(error)}`);
       process.exit(1);
@@ -64771,39 +65009,28 @@ In headless mode, use:
       const pendingApprovals = resume.pendingApprovals || [];
       if (pendingApprovals.length === 0)
         break;
-      const decisions = [];
-      for (const currentApproval of pendingApprovals) {
-        const { toolName, toolArgs } = currentApproval;
-        const parsedArgs = safeJsonParseOr(toolArgs || "{}", {});
-        const permission = await checkToolPermission(toolName, parsedArgs);
-        if (permission.decision === "deny" || permission.decision === "ask") {
-          const denyReason = permission.decision === "ask" ? "Tool requires approval (headless mode)" : `Permission denied: ${permission.matchedRule || permission.reason}`;
-          decisions.push({
-            type: "deny",
-            approval: currentApproval,
-            reason: denyReason
-          });
-          continue;
-        }
-        const { getToolSchema: getToolSchema2 } = await init_manager3().then(() => exports_manager2);
-        const schema = getToolSchema2(toolName);
-        const required = schema?.input_schema?.required || [];
-        const missing = required.filter((key) => !(key in parsedArgs) || parsedArgs[key] == null);
-        if (missing.length > 0) {
-          decisions.push({
-            type: "deny",
-            approval: currentApproval,
-            reason: `Missing required parameter${missing.length > 1 ? "s" : ""}: ${missing.join(", ")}`
-          });
-          continue;
-        }
-        decisions.push({
+      const { autoAllowed, autoDenied } = await classifyApprovals(pendingApprovals, {
+        treatAskAsDeny: true,
+        denyReasonForAsk: "Tool requires approval (headless mode)",
+        requireArgsForAutoApprove: true,
+        missingNameReason: "Tool call incomplete - missing name"
+      });
+      const decisions = [
+        ...autoAllowed.map((ac) => ({
           type: "approve",
-          approval: currentApproval,
-          reason: permission.reason || "Allowed by permission rule",
-          matchedRule: permission.matchedRule || "auto-approved"
-        });
-      }
+          approval: ac.approval,
+          reason: ac.permission.reason || "Allowed by permission rule",
+          matchedRule: "matchedRule" in ac.permission && ac.permission.matchedRule ? ac.permission.matchedRule : "auto-approved"
+        })),
+        ...autoDenied.map((ac) => {
+          const fallback = "matchedRule" in ac.permission && ac.permission.matchedRule ? `Permission denied: ${ac.permission.matchedRule}` : ac.permission.reason ? `Permission denied: ${ac.permission.reason}` : "Permission denied: Unknown reason";
+          return {
+            type: "deny",
+            approval: ac.approval,
+            reason: ac.denyReason ?? fallback
+          };
+        })
+      ];
       const { executeApprovalBatch: executeApprovalBatch2 } = await init_approval_execution().then(() => exports_approval_execution);
       if (outputFormat === "stream-json") {
         for (const decision of decisions) {
@@ -64923,12 +65150,16 @@ ${SYSTEM_REMINDER_CLOSE}
       let approvals = [];
       let apiDurationMs;
       let lastRunId = null;
+      let approvalPendingRecovery = false;
       if (outputFormat === "stream-json") {
-        const startTime = performance.now();
         const autoApprovalEmitted = new Set;
-        const streamProcessor = new StreamProcessor;
-        for await (const chunk of stream2) {
-          const { shouldOutput, errorInfo, updatedApproval } = streamProcessor.processChunk(chunk);
+        const streamJsonHook = async ({
+          chunk,
+          shouldOutput,
+          errorInfo,
+          updatedApproval
+        }) => {
+          let shouldOutputChunk = shouldOutput;
           if (errorInfo && shouldOutput) {
             const errorEvent = {
               type: "error",
@@ -64948,52 +65179,45 @@ ${SYSTEM_REMINDER_CLOSE}
               }
             };
             console.log(JSON.stringify(errorEvent));
-            const { onChunk: accumulatorOnChunk } = await init_accumulator().then(() => exports_accumulator);
-            accumulatorOnChunk(buffers, chunk);
-            continue;
+            shouldOutputChunk = false;
           }
           if (isApprovalPendingError(errorInfo?.detail) || isApprovalPendingError(errorInfo?.message)) {
-            if (outputFormat === "stream-json") {
-              const recoveryMsg = {
-                type: "recovery",
-                recovery_type: "approval_pending",
-                message: "Detected pending approval conflict; auto-denying stale approval and retrying",
-                run_id: lastRunId ?? undefined,
+            const recoveryRunId = errorInfo?.run_id;
+            const recoveryMsg = {
+              type: "recovery",
+              recovery_type: "approval_pending",
+              message: "Detected pending approval conflict; auto-denying stale approval and retrying",
+              run_id: recoveryRunId ?? undefined,
+              session_id: sessionId,
+              uuid: `recovery-${recoveryRunId || crypto.randomUUID()}`
+            };
+            console.log(JSON.stringify(recoveryMsg));
+            approvalPendingRecovery = true;
+            return { stopReason: "error", shouldAccumulate: true };
+          }
+          if (updatedApproval && !autoApprovalEmitted.has(updatedApproval.toolCallId)) {
+            const { autoAllowed } = await classifyApprovals([updatedApproval], {
+              requireArgsForAutoApprove: true,
+              missingNameReason: "Tool call incomplete - missing name"
+            });
+            const [approval] = autoAllowed;
+            if (approval) {
+              const permission = approval.permission;
+              shouldOutputChunk = false;
+              const autoApprovalMsg = {
+                type: "auto_approval",
+                tool_call: {
+                  name: approval.approval.toolName,
+                  tool_call_id: approval.approval.toolCallId,
+                  arguments: approval.approval.toolArgs || "{}"
+                },
+                reason: permission.reason || "Allowed by permission rule",
+                matched_rule: "matchedRule" in permission && permission.matchedRule ? permission.matchedRule : "auto-approved",
                 session_id: sessionId,
-                uuid: `recovery-${lastRunId || crypto.randomUUID()}`
+                uuid: `auto-approval-${approval.approval.toolCallId}`
               };
-              console.log(JSON.stringify(recoveryMsg));
-            }
-            await resolveAllPendingApprovals();
-            stopReason = "error";
-            break;
-          }
-          let shouldOutputChunk = shouldOutput;
-          if (updatedApproval && !autoApprovalEmitted.has(updatedApproval.toolCallId) && updatedApproval.toolName) {
-            const parsedArgs = safeJsonParseOr(updatedApproval.toolArgs || "{}", null);
-            const permission = await checkToolPermission(updatedApproval.toolName, parsedArgs || {});
-            if (permission.decision === "allow" && parsedArgs) {
-              const { getToolSchema: getToolSchema2 } = await init_manager3().then(() => exports_manager2);
-              const schema = getToolSchema2(updatedApproval.toolName);
-              const required = schema?.input_schema?.required || [];
-              const missing = required.filter((key) => !(key in parsedArgs) || parsedArgs[key] == null);
-              if (missing.length === 0) {
-                shouldOutputChunk = false;
-                const autoApprovalMsg = {
-                  type: "auto_approval",
-                  tool_call: {
-                    name: updatedApproval.toolName,
-                    tool_call_id: updatedApproval.toolCallId,
-                    arguments: updatedApproval.toolArgs || "{}"
-                  },
-                  reason: permission.reason || "Allowed by permission rule",
-                  matched_rule: permission.matchedRule || "auto-approved",
-                  session_id: sessionId,
-                  uuid: `auto-approval-${updatedApproval.toolCallId}`
-                };
-                console.log(JSON.stringify(autoApprovalMsg));
-                autoApprovalEmitted.add(updatedApproval.toolCallId);
-              }
+              console.log(JSON.stringify(autoApprovalMsg));
+              autoApprovalEmitted.add(approval.approval.toolCallId);
             }
           }
           if (shouldOutputChunk) {
@@ -65017,17 +65241,15 @@ ${SYSTEM_REMINDER_CLOSE}
               console.log(JSON.stringify(msg));
             }
           }
-          const { onChunk: onChunk2 } = await init_accumulator().then(() => exports_accumulator);
-          onChunk2(buffers, chunk);
-        }
-        stopReason = stopReason || streamProcessor.stopReason || "error";
-        apiDurationMs = performance.now() - startTime;
-        approvals = streamProcessor.getApprovals();
-        lastRunId = streamProcessor.lastRunId;
+          return { shouldOutput: shouldOutputChunk, shouldAccumulate: true };
+        };
+        const result = await drainStreamWithResume(stream2, buffers, () => {}, undefined, undefined, streamJsonHook);
+        stopReason = result.stopReason;
+        approvals = result.approvals || [];
+        apiDurationMs = result.apiDurationMs;
+        lastRunId = result.lastRunId || null;
         if (lastRunId)
           lastKnownRunId = lastRunId;
-        const { markCurrentLineAsFinished: markCurrentLineAsFinished2 } = await init_accumulator().then(() => exports_accumulator);
-        markCurrentLineAsFinished2(buffers);
       } else {
         const result = await drainStreamWithResume(stream2, buffers, () => {});
         stopReason = result.stopReason;
@@ -65038,6 +65260,10 @@ ${SYSTEM_REMINDER_CLOSE}
           lastKnownRunId = lastRunId;
       }
       sessionStats.endTurn(apiDurationMs);
+      if (approvalPendingRecovery) {
+        await resolveAllPendingApprovals();
+        continue;
+      }
       if (stopReason === "end_turn") {
         llmApiErrorRetries = 0;
         conversationBusyRetries = 0;
@@ -65048,45 +65274,26 @@ ${SYSTEM_REMINDER_CLOSE}
           console.error("Unexpected empty approvals array");
           process.exit(1);
         }
-        const decisions = [];
-        for (const currentApproval of approvals) {
-          const { toolName, toolArgs } = currentApproval;
-          const parsedArgs = safeJsonParseOr(toolArgs, {});
-          const permission = await checkToolPermission(toolName, parsedArgs);
-          if (permission.decision === "deny") {
-            const denyReason = `Permission denied: ${permission.matchedRule || permission.reason}`;
-            decisions.push({
-              type: "deny",
-              approval: currentApproval,
-              reason: denyReason
-            });
-            continue;
-          }
-          if (permission.decision === "ask") {
-            decisions.push({
-              type: "deny",
-              approval: currentApproval,
-              reason: "Tool requires approval (headless mode)"
-            });
-            continue;
-          }
-          const { getToolSchema: getToolSchema2 } = await init_manager3().then(() => exports_manager2);
-          const schema = getToolSchema2(toolName);
-          const required = schema?.input_schema?.required || [];
-          const missing = required.filter((key) => !(key in parsedArgs) || parsedArgs[key] == null);
-          if (missing.length > 0) {
-            decisions.push({
-              type: "deny",
-              approval: currentApproval,
-              reason: `Missing required parameter${missing.length > 1 ? "s" : ""}: ${missing.join(", ")}`
-            });
-            continue;
-          }
-          decisions.push({
+        const { autoAllowed, autoDenied } = await classifyApprovals(approvals, {
+          treatAskAsDeny: true,
+          denyReasonForAsk: "Tool requires approval (headless mode)",
+          requireArgsForAutoApprove: true,
+          missingNameReason: "Tool call incomplete - missing name"
+        });
+        const decisions = [
+          ...autoAllowed.map((ac) => ({
             type: "approve",
-            approval: currentApproval
-          });
-        }
+            approval: ac.approval
+          })),
+          ...autoDenied.map((ac) => {
+            const fallback = "matchedRule" in ac.permission && ac.permission.matchedRule ? `Permission denied: ${ac.permission.matchedRule}` : ac.permission.reason ? `Permission denied: ${ac.permission.reason}` : "Permission denied: Unknown reason";
+            return {
+              type: "deny",
+              approval: ac.approval,
+              reason: ac.denyReason ?? fallback
+            };
+          })
+        ];
         const { executeApprovalBatch: executeApprovalBatch2 } = await init_approval_execution().then(() => exports_approval_execution);
         const executedResults = await executeApprovalBatch2(decisions);
         currentInput = [
@@ -65505,6 +65712,8 @@ async function runBidirectionalMode(agent, conversationId, _client, _outputForma
         const buffers = createBuffers(agent.id);
         const startTime = performance.now();
         let numTurns = 0;
+        let lastStopReason = null;
+        let sawStreamError = false;
         let currentInput = [
           { role: "user", content: userContent }
         ];
@@ -65516,109 +65725,138 @@ async function runBidirectionalMode(agent, conversationId, _client, _outputForma
           const stream2 = await sendMessageStream(conversationId, currentInput, {
             agentId: agent.id
           });
-          const streamProcessor = new StreamProcessor;
-          for await (const chunk of stream2) {
-            if (currentAbortController?.signal.aborted) {
-              break;
+          const streamJsonHook = ({
+            chunk,
+            shouldOutput,
+            errorInfo
+          }) => {
+            if (errorInfo && shouldOutput) {
+              sawStreamError = true;
+              const errorEvent = {
+                type: "error",
+                message: errorInfo.message,
+                stop_reason: "error",
+                run_id: errorInfo.run_id,
+                session_id: sessionId,
+                uuid: crypto.randomUUID(),
+                ...errorInfo.error_type && errorInfo.run_id && {
+                  api_error: {
+                    message_type: "error_message",
+                    message: errorInfo.message,
+                    error_type: errorInfo.error_type,
+                    detail: errorInfo.detail,
+                    run_id: errorInfo.run_id
+                  }
+                }
+              };
+              console.log(JSON.stringify(errorEvent));
+              return { shouldAccumulate: true };
             }
-            const { shouldOutput } = streamProcessor.processChunk(chunk);
-            if (shouldOutput) {
-              const chunkWithIds = chunk;
-              const uuid = chunkWithIds.otid || chunkWithIds.id;
-              if (includePartialMessages) {
-                const streamEvent = {
-                  type: "stream_event",
-                  event: chunk,
-                  session_id: sessionId,
-                  uuid: uuid || crypto.randomUUID()
-                };
-                console.log(JSON.stringify(streamEvent));
-              } else {
-                const msg = {
-                  type: "message",
-                  ...chunk,
-                  session_id: sessionId,
-                  uuid: uuid || crypto.randomUUID()
-                };
-                console.log(JSON.stringify(msg));
-              }
+            if (!shouldOutput) {
+              return { shouldAccumulate: true };
             }
-            const { onChunk: onChunk2 } = await init_accumulator().then(() => exports_accumulator);
-            onChunk2(buffers, chunk);
-          }
-          const stopReason = streamProcessor.stopReason || "error";
+            const chunkWithIds = chunk;
+            const uuid = chunkWithIds.otid || chunkWithIds.id;
+            if (includePartialMessages) {
+              const streamEvent = {
+                type: "stream_event",
+                event: chunk,
+                session_id: sessionId,
+                uuid: uuid || crypto.randomUUID()
+              };
+              console.log(JSON.stringify(streamEvent));
+            } else {
+              const msg = {
+                type: "message",
+                ...chunk,
+                session_id: sessionId,
+                uuid: uuid || crypto.randomUUID()
+              };
+              console.log(JSON.stringify(msg));
+            }
+            return { shouldAccumulate: true };
+          };
+          const result = await drainStreamWithResume(stream2, buffers, () => {}, currentAbortController?.signal, undefined, streamJsonHook);
+          const stopReason = result.stopReason;
+          lastStopReason = stopReason;
+          const approvals = result.approvals || [];
           if (stopReason === "end_turn") {
             break;
           }
-          if (currentAbortController?.signal.aborted) {
+          if (currentAbortController?.signal.aborted || stopReason === "cancelled") {
             break;
           }
           if (stopReason === "requires_approval") {
-            const approvals = streamProcessor.getApprovals();
             if (approvals.length === 0) {
+              lastStopReason = "error";
               break;
             }
-            const decisions = [];
-            for (const approval of approvals) {
-              const parsedArgs = safeJsonParseOr(approval.toolArgs, {});
-              const permission = await checkToolPermission(approval.toolName, parsedArgs);
-              if (permission.decision === "allow") {
+            const { autoAllowed, autoDenied, needsUserInput } = await classifyApprovals(approvals, {
+              requireArgsForAutoApprove: true,
+              missingNameReason: "Tool call incomplete - missing name"
+            });
+            const decisions = [
+              ...autoAllowed.map((ac) => ({
+                type: "approve",
+                approval: ac.approval,
+                matchedRule: "matchedRule" in ac.permission && ac.permission.matchedRule ? ac.permission.matchedRule : "auto-approved"
+              })),
+              ...autoDenied.map((ac) => {
+                const fallback = "matchedRule" in ac.permission && ac.permission.matchedRule ? `Permission denied: ${ac.permission.matchedRule}` : ac.permission.reason ? `Permission denied: ${ac.permission.reason}` : "Permission denied: Unknown reason";
+                return {
+                  type: "deny",
+                  approval: ac.approval,
+                  reason: ac.denyReason ?? fallback
+                };
+              })
+            ];
+            for (const approvalItem of autoAllowed) {
+              const permission = approvalItem.permission;
+              const autoApprovalMsg = {
+                type: "auto_approval",
+                tool_call: {
+                  name: approvalItem.approval.toolName,
+                  tool_call_id: approvalItem.approval.toolCallId,
+                  arguments: approvalItem.approval.toolArgs
+                },
+                reason: permission.reason || "auto-approved",
+                matched_rule: "matchedRule" in permission && permission.matchedRule ? permission.matchedRule : "auto-approved",
+                session_id: sessionId,
+                uuid: `auto-approval-${approvalItem.approval.toolCallId}`
+              };
+              console.log(JSON.stringify(autoApprovalMsg));
+            }
+            for (const ac of needsUserInput) {
+              const permResponse = await requestPermission(ac.approval.toolCallId, ac.approval.toolName, ac.parsedArgs);
+              if (permResponse.decision === "allow") {
+                const finalApproval = permResponse.updatedInput ? {
+                  ...ac.approval,
+                  toolArgs: JSON.stringify(permResponse.updatedInput)
+                } : ac.approval;
                 decisions.push({
                   type: "approve",
-                  approval,
-                  matchedRule: permission.matchedRule || "auto-approved"
+                  approval: finalApproval,
+                  matchedRule: "SDK callback approved"
                 });
                 const autoApprovalMsg = {
                   type: "auto_approval",
                   tool_call: {
-                    name: approval.toolName,
-                    tool_call_id: approval.toolCallId,
-                    arguments: approval.toolArgs
+                    name: finalApproval.toolName,
+                    tool_call_id: finalApproval.toolCallId,
+                    arguments: finalApproval.toolArgs
                   },
-                  reason: permission.reason || "auto-approved",
-                  matched_rule: permission.matchedRule || "auto-approved",
+                  reason: permResponse.reason || "SDK callback approved",
+                  matched_rule: "canUseTool callback",
                   session_id: sessionId,
-                  uuid: `auto-approval-${approval.toolCallId}`
+                  uuid: `auto-approval-${ac.approval.toolCallId}`
                 };
                 console.log(JSON.stringify(autoApprovalMsg));
-              } else if (permission.decision === "deny") {
+              } else {
                 decisions.push({
                   type: "deny",
-                  approval,
-                  reason: `Permission denied: ${permission.matchedRule || permission.reason}`
+                  approval: ac.approval,
+                  reason: permResponse.reason || "Denied by SDK callback"
                 });
-              } else {
-                const permResponse = await requestPermission(approval.toolCallId, approval.toolName, parsedArgs);
-                if (permResponse.decision === "allow") {
-                  const finalApproval = permResponse.updatedInput ? {
-                    ...approval,
-                    toolArgs: JSON.stringify(permResponse.updatedInput)
-                  } : approval;
-                  decisions.push({
-                    type: "approve",
-                    approval: finalApproval,
-                    matchedRule: "SDK callback approved"
-                  });
-                  const autoApprovalMsg = {
-                    type: "auto_approval",
-                    tool_call: {
-                      name: finalApproval.toolName,
-                      tool_call_id: finalApproval.toolCallId,
-                      arguments: finalApproval.toolArgs
-                    },
-                    reason: permResponse.reason || "SDK callback approved",
-                    matched_rule: "canUseTool callback",
-                    session_id: sessionId,
-                    uuid: `auto-approval-${approval.toolCallId}`
-                  };
-                  console.log(JSON.stringify(autoApprovalMsg));
-                } else {
-                  decisions.push({
-                    type: "deny",
-                    approval,
-                    reason: permResponse.reason || "Denied by SDK callback"
-                  });
-                }
               }
             }
             const { executeApprovalBatch: executeApprovalBatch2 } = await init_approval_execution().then(() => exports_approval_execution);
@@ -65640,9 +65878,12 @@ async function runBidirectionalMode(agent, conversationId, _client, _outputForma
         const lastReasoning = reversed.find((line2) => line2.kind === "reasoning" && ("text" in line2) && typeof line2.text === "string" && line2.text.trim().length > 0);
         const lastToolResult = reversed.find((line2) => line2.kind === "tool_call" && ("resultText" in line2) && typeof line2.resultText === "string" && (line2.resultText ?? "").trim().length > 0);
         const resultText = lastAssistant?.text || lastReasoning?.text || lastToolResult?.resultText || "";
+        const isAborted = currentAbortController?.signal.aborted;
+        const isError = sawStreamError || lastStopReason && lastStopReason !== "end_turn" && lastStopReason !== "requires_approval";
+        const subtype = isAborted ? "interrupted" : isError ? "error" : "success";
         const resultMsg = {
           type: "result",
-          subtype: currentAbortController?.signal.aborted ? "interrupted" : "success",
+          subtype,
           session_id: sessionId,
           duration_ms: Math.round(durationMs),
           duration_api_ms: 0,
@@ -65652,18 +65893,38 @@ async function runBidirectionalMode(agent, conversationId, _client, _outputForma
           conversation_id: conversationId,
           run_ids: [],
           usage: null,
-          uuid: `result-${agent.id}-${Date.now()}`
+          uuid: `result-${agent.id}-${Date.now()}`,
+          ...subtype === "error" && {
+            stop_reason: lastStopReason && lastStopReason !== "end_turn" ? lastStopReason : "error"
+          }
         };
         console.log(JSON.stringify(resultMsg));
       } catch (error) {
+        const errorDetails = formatErrorDetails(error, agent.id);
         const errorMsg2 = {
           type: "error",
-          message: error instanceof Error ? error.message : "Unknown error occurred",
+          message: errorDetails,
           stop_reason: "error",
           session_id: sessionId,
           uuid: crypto.randomUUID()
         };
         console.log(JSON.stringify(errorMsg2));
+        const errorResultMsg = {
+          type: "result",
+          subtype: "error",
+          session_id: sessionId,
+          duration_ms: 0,
+          duration_api_ms: 0,
+          num_turns: 0,
+          result: null,
+          agent_id: agent.id,
+          conversation_id: conversationId,
+          run_ids: [],
+          usage: null,
+          uuid: `result-error-${agent.id}-${Date.now()}`,
+          stop_reason: "error"
+        };
+        console.log(JSON.stringify(errorResultMsg));
       } finally {
         currentAbortController = null;
       }
@@ -65696,9 +65957,9 @@ var init_headless = __esm(async () => {
     init_memoryFilesystem(),
     init_message(),
     init_accumulator(),
+    init_approvalClassification(),
     init_stream(),
-    init_settings_manager(),
-    init_manager3()
+    init_settings_manager()
   ]);
 });
 
@@ -69710,7 +69971,8 @@ var init_InlineBashApproval = __esm(async () => {
     onCancel,
     isFocused = true,
     approveAlwaysText,
-    allowPersistence = true
+    allowPersistence = true,
+    showPreview = true
   }) => {
     const [selectedOption, setSelectedOption] = import_react36.useState(0);
     const {
@@ -69768,6 +70030,15 @@ var init_InlineBashApproval = __esm(async () => {
       }
       if (key.escape) {
         onCancel?.();
+        return;
+      }
+      if (input === "1") {
+        onApprove();
+        return;
+      }
+      if (input === "2" && allowPersistence) {
+        onApproveAlways("project");
+        return;
       }
     }, { isActive: isFocused });
     const solidLine = SOLID_LINE6.repeat(Math.max(columns, 10));
@@ -69801,12 +70072,13 @@ var init_InlineBashApproval = __esm(async () => {
       ]
     }, undefined, true, undefined, this), [bashInfo.command, bashInfo.description, solidLine]);
     const hintText = isOnCustomOption ? customReason ? "Enter to submit · Esc to clear" : "Type reason · Esc to cancel" : "Enter to select · Esc to cancel";
+    const optionsMarginTop = showPreview ? 1 : 0;
     return /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        memoizedCommandContent,
+        showPreview && memoizedCommandContent,
         /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
-          marginTop: 1,
+          marginTop: optionsMarginTop,
           flexDirection: "column",
           children: [
             /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Box_default, {
@@ -70126,7 +70398,8 @@ var init_InlineFileEditApproval = __esm(async () => {
     onCancel,
     isFocused = true,
     approveAlwaysText,
-    allowPersistence = true
+    allowPersistence = true,
+    showPreview = true
   }) => {
     const [selectedOption, setSelectedOption] = import_react38.useState(0);
     const {
@@ -70217,6 +70490,15 @@ var init_InlineFileEditApproval = __esm(async () => {
       }
       if (key.escape) {
         onCancel?.();
+        return;
+      }
+      if (input === "1") {
+        onApprove(diffsToPass.size > 0 ? diffsToPass : undefined);
+        return;
+      }
+      if (input === "2" && allowPersistence) {
+        onApproveAlways("project", diffsToPass.size > 0 ? diffsToPass : undefined);
+        return;
       }
     }, { isActive: isFocused });
     const solidLine = SOLID_LINE8.repeat(Math.max(columns, 10));
@@ -70354,12 +70636,13 @@ var init_InlineFileEditApproval = __esm(async () => {
       diffKind
     ]);
     const hintText = isOnCustomOption ? customReason ? "Enter to submit · Esc to clear" : "Type reason · Esc to cancel" : "Enter to select · Esc to cancel";
+    const optionsMarginTop = showPreview ? 1 : 0;
     return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        memoizedDiffContent,
+        showPreview && memoizedDiffContent,
         /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
-          marginTop: 1,
+          marginTop: optionsMarginTop,
           flexDirection: "column",
           children: [
             /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
@@ -70499,7 +70782,8 @@ var init_InlineGenericApproval = __esm(async () => {
     onCancel,
     isFocused = true,
     approveAlwaysText,
-    allowPersistence = true
+    allowPersistence = true,
+    showPreview = true
   }) => {
     const [selectedOption, setSelectedOption] = import_react39.useState(0);
     const {
@@ -70557,6 +70841,15 @@ var init_InlineGenericApproval = __esm(async () => {
       }
       if (key.escape) {
         onCancel?.();
+        return;
+      }
+      if (input === "1") {
+        onApprove();
+        return;
+      }
+      if (input === "2" && allowPersistence) {
+        onApproveAlways("project");
+        return;
       }
     }, { isActive: isFocused });
     const solidLine = SOLID_LINE9.repeat(Math.max(columns, 10));
@@ -70590,12 +70883,13 @@ var init_InlineGenericApproval = __esm(async () => {
       ]
     }, undefined, true, undefined, this), [toolName, formattedArgs, solidLine]);
     const hintText = isOnCustomOption ? customReason ? "Enter to submit · Esc to clear" : "Type reason · Esc to cancel" : "Enter to select · Esc to cancel";
+    const optionsMarginTop = showPreview ? 1 : 0;
     return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
-        memoizedToolContent,
+        showPreview && memoizedToolContent,
         /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
-          marginTop: 1,
+          marginTop: optionsMarginTop,
           flexDirection: "column",
           children: [
             /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
@@ -71149,6 +71443,15 @@ var init_InlineTaskApproval = __esm(async () => {
       }
       if (key.escape) {
         onCancel?.();
+        return;
+      }
+      if (input === "1") {
+        onApprove();
+        return;
+      }
+      if (input === "2" && allowPersistence) {
+        onApproveAlways("session");
+        return;
       }
     }, { isActive: isFocused });
     const solidLine = SOLID_LINE11.repeat(Math.max(columns, 10));
@@ -71453,6 +71756,15 @@ var init_StaticPlanApproval = __esm(async () => {
       }
       if (key.escape) {
         onKeepPlanning("User cancelled");
+        return;
+      }
+      if (input === "1") {
+        onApproveAndAcceptEdits();
+        return;
+      }
+      if (input === "2") {
+        onApprove();
+        return;
       }
     }, { isActive: isFocused });
     const hintText = isOnCustomOption ? customReason ? "Enter to submit · Esc to clear" : "Type feedback · Esc to cancel" : "Enter to select · Esc to cancel";
@@ -71670,7 +71982,8 @@ var init_ApprovalSwitch = __esm(async () => {
     onEnterPlanModeApprove,
     onEnterPlanModeReject,
     precomputedDiff,
-    allDiffs
+    allDiffs,
+    showPreview = true
   }) => {
     const toolName = approval.toolName;
     if (toolName === "ExitPlanMode" && onPlanApprove && onPlanKeepPlanning) {
@@ -71695,7 +72008,8 @@ var init_ApprovalSwitch = __esm(async () => {
           onCancel,
           isFocused,
           approveAlwaysText,
-          allowPersistence
+          allowPersistence,
+          showPreview
         }, undefined, false, undefined, this);
       }
     }
@@ -71710,7 +72024,8 @@ var init_ApprovalSwitch = __esm(async () => {
           onCancel,
           isFocused,
           approveAlwaysText,
-          allowPersistence
+          allowPersistence,
+          showPreview
         }, undefined, false, undefined, this);
       }
     }
@@ -71723,12 +72038,14 @@ var init_ApprovalSwitch = __esm(async () => {
     }
     if (toolName === "AskUserQuestion" && onQuestionSubmit) {
       const questions = getQuestions(approval);
-      return /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(InlineQuestionApproval, {
-        questions,
-        onSubmit: onQuestionSubmit,
-        onCancel,
-        isFocused
-      }, undefined, false, undefined, this);
+      if (questions.length > 0) {
+        return /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(InlineQuestionApproval, {
+          questions,
+          onSubmit: onQuestionSubmit,
+          onCancel,
+          isFocused
+        }, undefined, false, undefined, this);
+      }
     }
     if (isTaskTool(toolName)) {
       const taskInfo = getTaskInfo(approval);
@@ -71754,7 +72071,8 @@ var init_ApprovalSwitch = __esm(async () => {
       onCancel,
       isFocused,
       approveAlwaysText,
-      allowPersistence
+      allowPersistence,
+      showPreview
     }, undefined, false, undefined, this);
   });
   ApprovalSwitch.displayName = "ApprovalSwitch";
@@ -71762,9 +72080,9 @@ var init_ApprovalSwitch = __esm(async () => {
 
 // src/cli/components/AssistantMessageRich.tsx
 var import_react44, jsx_dev_runtime23, normalize6 = (s) => s.replace(/\r\n/g, `
-`).replace(/[ \t]+$/gm, "").replace(/\n{3,}/g, `
+`).replace(/\n{3,}/g, `
 
-`).replace(/^\n+|\n+$/g, ""), AssistantMessage;
+`).replace(/^\n+/g, ""), AssistantMessage;
 var init_AssistantMessageRich = __esm(async () => {
   init_useTerminalWidth();
   await __promiseAll([
@@ -72900,14 +73218,6 @@ var init_EventMessage = __esm(async () => {
       color: colors.tool.completed,
       children: "●"
     }, undefined, false, undefined, this);
-    const formatArgs2 = () => {
-      const stats = line.stats;
-      if (stats?.messagesCountBefore !== undefined && stats?.messagesCountAfter !== undefined) {
-        return `${stats.messagesCountBefore} → ${stats.messagesCountAfter} messages`;
-      }
-      return "...";
-    };
-    const argsDisplay = formatArgs2();
     return /* @__PURE__ */ jsx_dev_runtime33.jsxDEV(Box_default, {
       flexDirection: "column",
       children: [
@@ -72924,16 +73234,12 @@ var init_EventMessage = __esm(async () => {
               width: rightWidth,
               children: isRunning ? /* @__PURE__ */ jsx_dev_runtime33.jsxDEV(CompactingAnimation, {}, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime33.jsxDEV(Text2, {
                 bold: true,
-                children: [
-                  "Compact(",
-                  argsDisplay,
-                  ")"
-                ]
-              }, undefined, true, undefined, this)
+                children: "Conversation compacted"
+              }, undefined, false, undefined, this)
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        !isRunning && line.summary && /* @__PURE__ */ jsx_dev_runtime33.jsxDEV(jsx_dev_runtime33.Fragment, {
+        !isRunning && line.summary && (process.env.LETTA_DEBUG === "1" || process.env.LETTA_DEBUG === "true") && /* @__PURE__ */ jsx_dev_runtime33.jsxDEV(jsx_dev_runtime33.Fragment, {
           children: [
             /* @__PURE__ */ jsx_dev_runtime33.jsxDEV(Box_default, {
               flexDirection: "row",
@@ -74389,10 +74695,10 @@ var init_registry = __esm(() => {
       }
     },
     "/rename": {
-      desc: "Rename the current agent (/rename <name>)",
+      desc: "Rename agent or conversation (/rename agent|convo <name>)",
       order: 24,
       handler: () => {
-        return "Renaming agent...";
+        return "Renaming...";
       }
     },
     "/description": {
@@ -75052,7 +75358,8 @@ function loadHooksFromLocation(location, workingDirectory = process.cwd()) {
       case "project-local":
         return settingsManager.getLocalProjectSettings(workingDirectory)?.hooks || {};
     }
-  } catch {
+  } catch (error) {
+    debugLog("hooks", "loadHooksFromLocation: Settings not loaded yet", error);
     return {};
   }
 }
@@ -75204,7 +75511,8 @@ function countHooksForEvent(event, workingDirectory = process.cwd()) {
 function isUserHooksDisabled() {
   try {
     return settingsManager.getSettings().hooks?.disabled === true;
-  } catch {
+  } catch (error) {
+    debugLog("hooks", "isUserHooksDisabled: Failed to check user hooks disabled status", error);
     return false;
   }
 }
@@ -75218,6 +75526,7 @@ function setHooksDisabled(disabled) {
   });
 }
 var init_writer = __esm(async () => {
+  init_debug();
   init_types();
   await init_settings_manager();
 });
@@ -75261,6 +75570,7 @@ var init_HooksManager = __esm(async () => {
   HOOK_EVENTS = [
     { event: "PreToolUse", description: "Before tool execution" },
     { event: "PostToolUse", description: "After tool execution" },
+    { event: "PostToolUseFailure", description: "After tool execution fails" },
     { event: "PermissionRequest", description: "When permission is requested" },
     { event: "UserPromptSubmit", description: "When user submits a prompt" },
     { event: "Notification", description: "When notifications are sent" },
@@ -77738,28 +78048,28 @@ var require_react_jsx_runtime_development = __commonJS((exports) => {
         return null;
       }
       var ReactSharedInternals = React14.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-      function error(format) {
+      function error(format2) {
         {
           {
             for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1;_key2 < _len2; _key2++) {
               args[_key2 - 1] = arguments[_key2];
             }
-            printWarning("error", format, args);
+            printWarning("error", format2, args);
           }
         }
       }
-      function printWarning(level, format, args) {
+      function printWarning(level, format2, args) {
         {
           var ReactDebugCurrentFrame2 = ReactSharedInternals.ReactDebugCurrentFrame;
           var stack = ReactDebugCurrentFrame2.getStackAddendum();
           if (stack !== "") {
-            format += "%s";
+            format2 += "%s";
             args = args.concat([stack]);
           }
           var argsWithFormat = args.map(function(item) {
             return String(item);
           });
-          argsWithFormat.unshift("Warning: " + format);
+          argsWithFormat.unshift("Warning: " + format2);
           Function.prototype.apply.call(console[level], console, argsWithFormat);
         }
       }
@@ -85409,9 +85719,9 @@ var init_ProviderSelector = __esm(async () => {
 
 // src/cli/components/ReasoningMessageRich.tsx
 var import_react79, jsx_dev_runtime56, normalize7 = (s) => s.replace(/\r\n/g, `
-`).replace(/[ \t]+$/gm, "").replace(/\n{3,}/g, `
+`).replace(/\n{3,}/g, `
 
-`).replace(/^\n+|\n+$/g, ""), ReasoningMessage;
+`).replace(/^\n+/g, ""), ReasoningMessage;
 var init_ReasoningMessageRich = __esm(async () => {
   init_useTerminalWidth();
   await __promiseAll([
@@ -87386,38 +87696,21 @@ var init_ToolCallMessageRich = __esm(async () => {
       }
     }
     const fallback = displayName.length >= rightWidth;
-    const getDotElement = () => {
+    const dotColor = (() => {
       switch (line.phase) {
         case "streaming":
-          return /* @__PURE__ */ jsx_dev_runtime65.jsxDEV(Text2, {
-            color: colors.tool.streaming,
-            children: "●"
-          }, undefined, false, undefined, this);
+          return colors.tool.streaming;
         case "ready":
-          return /* @__PURE__ */ jsx_dev_runtime65.jsxDEV(BlinkDot, {
-            color: colors.tool.pending
-          }, undefined, false, undefined, this);
+          return colors.tool.pending;
         case "running":
-          return /* @__PURE__ */ jsx_dev_runtime65.jsxDEV(BlinkDot, {
-            color: colors.tool.running
-          }, undefined, false, undefined, this);
+          return colors.tool.running;
         case "finished":
-          if (line.resultOk === false) {
-            return /* @__PURE__ */ jsx_dev_runtime65.jsxDEV(Text2, {
-              color: colors.tool.error,
-              children: "●"
-            }, undefined, false, undefined, this);
-          }
-          return /* @__PURE__ */ jsx_dev_runtime65.jsxDEV(Text2, {
-            color: colors.tool.completed,
-            children: "●"
-          }, undefined, false, undefined, this);
+          return line.resultOk === false ? colors.tool.error : colors.tool.completed;
         default:
-          return /* @__PURE__ */ jsx_dev_runtime65.jsxDEV(Text2, {
-            children: "●"
-          }, undefined, false, undefined, this);
+          return;
       }
-    };
+    })();
+    const dotShouldAnimate = line.phase === "ready" || line.phase === "running";
     const getResultElement = () => {
       if (!line.resultText)
         return null;
@@ -88003,7 +88296,10 @@ var init_ToolCallMessageRich = __esm(async () => {
               width: 2,
               flexShrink: 0,
               children: [
-                getDotElement(),
+                /* @__PURE__ */ jsx_dev_runtime65.jsxDEV(BlinkDot, {
+                  color: dotColor,
+                  shouldAnimate: dotShouldAnimate
+                }, undefined, false, undefined, this),
                 /* @__PURE__ */ jsx_dev_runtime65.jsxDEV(Text2, {}, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
@@ -90008,12 +90304,48 @@ function isNonStateCommand(msg) {
   }
   return false;
 }
+function countWrappedLines(text, width) {
+  if (!text)
+    return 0;
+  const wrapWidth = Math.max(1, width);
+  return text.split(/\r?\n/).reduce((sum, line) => {
+    const len = line.length;
+    const wrapped = Math.max(1, Math.ceil(len / wrapWidth));
+    return sum + wrapped;
+  }, 0);
+}
+function countWrappedLinesFromList(lines, width) {
+  if (!lines.length)
+    return 0;
+  const wrapWidth = Math.max(1, width);
+  return lines.reduce((sum, line) => {
+    const len = line.length;
+    const wrapped = Math.max(1, Math.ceil(len / wrapWidth));
+    return sum + wrapped;
+  }, 0);
+}
+function estimateAdvancedDiffLines(diff2, width) {
+  const wrapWidth = Math.max(1, width);
+  let total = 0;
+  for (const hunk of diff2.hunks) {
+    for (const line of hunk.lines) {
+      const raw = line.raw || "";
+      if (raw.startsWith("\\"))
+        continue;
+      const text = raw.slice(1);
+      total += Math.max(1, Math.ceil(text.length / wrapWidth));
+    }
+  }
+  return total;
+}
 function uid4(prefix) {
   return `${prefix}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
 }
 function sendDesktopNotification(message = "Awaiting your input", level = "info") {
   process.stdout.write("\x07");
-  runNotificationHooks(message, level).catch(() => {});
+  runNotificationHooks(message, level).catch((error) => {
+    debugLog("hooks", "Notification hook error", error);
+  });
 }
 async function isRetriableError(stopReason, lastRunId) {
   if (stopReason === "llm_api_error")
@@ -90498,18 +90830,23 @@ function App2({
     closeTrajectorySegment,
     syncTrajectoryElapsedBase
   ]);
+  const sessionStartFeedbackRef = import_react91.useRef([]);
   import_react91.useEffect(() => {
-    if (agentId && !sessionHooksRanRef.current) {
+    if (agentId && agentId !== "loading" && !sessionHooksRanRef.current) {
       sessionHooksRanRef.current = true;
       const isNewSession = !initialConversationId;
-      runSessionStartHooks(isNewSession, agentId, agentName ?? undefined, conversationIdRef.current ?? undefined).catch(() => {});
+      runSessionStartHooks(isNewSession, agentId, agentName ?? undefined, conversationIdRef.current ?? undefined).then((result) => {
+        if (result.feedback.length > 0) {
+          sessionStartFeedbackRef.current = result.feedback;
+        }
+      }).catch(() => {});
     }
   }, [agentId, agentName, initialConversationId]);
-  import_react91.useEffect(() => {
-    return () => {
-      const durationMs = Date.now() - sessionStartTimeRef.current;
-      runSessionEndHooks(durationMs, undefined, undefined, agentIdRef.current ?? undefined, conversationIdRef.current ?? undefined).catch(() => {});
-    };
+  const runEndHooks = import_react91.useCallback(async () => {
+    const durationMs = Date.now() - sessionStartTimeRef.current;
+    try {
+      await runSessionEndHooks(durationMs, undefined, undefined, agentIdRef.current ?? undefined, conversationIdRef.current ?? undefined);
+    } catch {}
   }, []);
   import_react91.useEffect(() => {
     return () => {
@@ -90652,9 +90989,34 @@ function App2({
     setStaticRenderEpoch((epoch) => epoch + 1);
     lastClearedColumnsRef.current = pendingColumns;
   }, [columns, streaming]);
-  const commitEligibleLines = import_react91.useCallback((b) => {
+  const deferredToolCallCommitsRef = import_react91.useRef(new Map);
+  const [deferredCommitAt, setDeferredCommitAt] = import_react91.useState(null);
+  const resetDeferredToolCallCommits = import_react91.useCallback(() => {
+    deferredToolCallCommitsRef.current.clear();
+    setDeferredCommitAt(null);
+  }, []);
+  const commitEligibleLines = import_react91.useCallback((b, opts) => {
+    const deferToolCalls = opts?.deferToolCalls !== false;
     const newlyCommitted = [];
     let firstTaskIndex = -1;
+    const deferredCommits = deferredToolCallCommitsRef.current;
+    const now = Date.now();
+    let blockedByDeferred = false;
+    const shouldSkipCommittedToolCall = (ln) => {
+      if (ln.kind !== "tool_call")
+        return false;
+      if (!ln.toolCallId || !ln.name)
+        return false;
+      if (ln.phase !== "finished" || ln.resultOk === false)
+        return false;
+      if (!eagerCommittedPreviewsRef.current.has(ln.toolCallId))
+        return false;
+      return isFileEditTool(ln.name) || isFileWriteTool(ln.name) || isPatchTool(ln.name);
+    };
+    if (!deferToolCalls && deferredCommits.size > 0) {
+      deferredCommits.clear();
+      setDeferredCommitAt(null);
+    }
     const hasInProgress = hasInProgressTaskToolCalls(b.order, b.byId, emittedIdsRef.current);
     const finishedTaskToolCalls = collectFinishedTaskToolCalls(b.order, b.byId, emittedIdsRef.current, hasInProgress);
     for (const id of b.order) {
@@ -90695,11 +91057,32 @@ function App2({
         continue;
       }
       if ("phase" in ln && ln.phase === "finished") {
+        if (shouldSkipCommittedToolCall(ln)) {
+          deferredCommits.delete(id);
+          emittedIdsRef.current.add(id);
+          continue;
+        }
+        if (deferToolCalls && ln.kind === "tool_call" && (!ln.name || !isTaskTool(ln.name))) {
+          const commitAt = deferredCommits.get(id);
+          if (commitAt === undefined) {
+            const nextCommitAt = now + TOOL_CALL_COMMIT_DEFER_MS;
+            deferredCommits.set(id, nextCommitAt);
+            setDeferredCommitAt(nextCommitAt);
+            blockedByDeferred = true;
+            break;
+          }
+          if (commitAt > now) {
+            setDeferredCommitAt(commitAt);
+            blockedByDeferred = true;
+            break;
+          }
+          deferredCommits.delete(id);
+        }
         emittedIdsRef.current.add(id);
         newlyCommitted.push({ ...ln });
       }
     }
-    if (finishedTaskToolCalls.length > 0) {
+    if (!blockedByDeferred && finishedTaskToolCalls.length > 0) {
       for (const tc of finishedTaskToolCalls) {
         emittedIdsRef.current.add(tc.lineId);
       }
@@ -90707,6 +91090,9 @@ function App2({
       newlyCommitted.splice(firstTaskIndex >= 0 ? firstTaskIndex : newlyCommitted.length, 0, groupItem);
       clearSubagentsByIds(groupItem.agents.map((a) => a.id));
     }
+    if (deferredCommits.size === 0) {
+      setDeferredCommitAt(null);
+    }
     if (newlyCommitted.length > 0) {
       setStaticItems((prev) => [...prev, ...newlyCommitted]);
     }
@@ -90723,6 +91109,108 @@ function App2({
   const precomputedDiffsRef = import_react91.useRef(new Map);
   const lastPlanFilePathRef = import_react91.useRef(null);
   const eagerCommittedPreviewsRef = import_react91.useRef(new Set);
+  const estimateApprovalPreviewLines = import_react91.useCallback((approval) => {
+    const toolName = approval.toolName;
+    if (!toolName)
+      return 0;
+    const args = safeJsonParseOr(approval.toolArgs || "{}", {});
+    const wrapWidth = Math.max(MIN_WRAP_WIDTH, columns - TEXT_WRAP_GUTTER);
+    const diffWrapWidth = Math.max(MIN_WRAP_WIDTH, columns - DIFF_WRAP_GUTTER);
+    if (isShellTool(toolName)) {
+      const t = toolName.toLowerCase();
+      let command = "(no command)";
+      let description = "";
+      if (t === "shell") {
+        const cmdVal = args.command;
+        command = Array.isArray(cmdVal) ? cmdVal.join(" ") : typeof cmdVal === "string" ? cmdVal : "(no command)";
+        description = typeof args.justification === "string" ? args.justification : "";
+      } else {
+        command = typeof args.command === "string" ? args.command : "(no command)";
+        description = typeof args.description === "string" ? args.description : typeof args.justification === "string" ? args.justification : "";
+      }
+      let lines2 = 3;
+      lines2 += countWrappedLines(command, wrapWidth);
+      if (description) {
+        lines2 += countWrappedLines(description, wrapWidth);
+      }
+      return lines2;
+    }
+    if (isFileEditTool(toolName) || isFileWriteTool(toolName) || isPatchTool(toolName)) {
+      const headerLines = 4;
+      let diffLines2 = 0;
+      const toolCallId = approval.toolCallId;
+      if (isPatchTool(toolName) && typeof args.input === "string") {
+        const operations = parsePatchOperations(args.input);
+        operations.forEach((op, idx) => {
+          if (idx > 0)
+            diffLines2 += 1;
+          diffLines2 += 1;
+          const diffKey = toolCallId ? `${toolCallId}:${op.path}` : undefined;
+          const opDiff = diffKey && precomputedDiffsRef.current.has(diffKey) ? precomputedDiffsRef.current.get(diffKey) : undefined;
+          if (opDiff) {
+            diffLines2 += estimateAdvancedDiffLines(opDiff, diffWrapWidth);
+            return;
+          }
+          if (op.kind === "add") {
+            diffLines2 += countWrappedLines(op.content, wrapWidth);
+            return;
+          }
+          if (op.kind === "update") {
+            if (op.patchLines?.length) {
+              diffLines2 += countWrappedLinesFromList(op.patchLines, wrapWidth);
+            } else {
+              diffLines2 += countWrappedLines(op.oldString || "", wrapWidth);
+              diffLines2 += countWrappedLines(op.newString || "", wrapWidth);
+            }
+            return;
+          }
+          diffLines2 += 1;
+        });
+        return headerLines + diffLines2;
+      }
+      const diff2 = toolCallId && precomputedDiffsRef.current.has(toolCallId) ? precomputedDiffsRef.current.get(toolCallId) : undefined;
+      if (diff2) {
+        diffLines2 += estimateAdvancedDiffLines(diff2, diffWrapWidth);
+        return headerLines + diffLines2;
+      }
+      if (Array.isArray(args.edits)) {
+        for (const edit2 of args.edits) {
+          if (!edit2 || typeof edit2 !== "object")
+            continue;
+          const oldString2 = typeof edit2.old_string === "string" ? edit2.old_string : "";
+          const newString2 = typeof edit2.new_string === "string" ? edit2.new_string : "";
+          diffLines2 += countWrappedLines(oldString2, wrapWidth);
+          diffLines2 += countWrappedLines(newString2, wrapWidth);
+        }
+        return headerLines + diffLines2;
+      }
+      if (typeof args.content === "string") {
+        diffLines2 += countWrappedLines(args.content, wrapWidth);
+        return headerLines + diffLines2;
+      }
+      const oldString = typeof args.old_string === "string" ? args.old_string : "";
+      const newString = typeof args.new_string === "string" ? args.new_string : "";
+      diffLines2 += countWrappedLines(oldString, wrapWidth);
+      diffLines2 += countWrappedLines(newString, wrapWidth);
+      return headerLines + diffLines2;
+    }
+    return 0;
+  }, [columns]);
+  const shouldEagerCommitApprovalPreview = import_react91.useCallback((approval) => {
+    if (!terminalRows)
+      return false;
+    const previewLines = estimateApprovalPreviewLines(approval);
+    if (previewLines === 0)
+      return false;
+    return previewLines + APPROVAL_OPTIONS_HEIGHT + APPROVAL_PREVIEW_BUFFER >= terminalRows;
+  }, [estimateApprovalPreviewLines, terminalRows]);
+  const currentApprovalShouldCommitPreview = import_react91.useMemo(() => {
+    if (!currentApproval)
+      return false;
+    if (currentApproval.toolName === "ExitPlanMode")
+      return false;
+    return shouldEagerCommitApprovalPreview(currentApproval);
+  }, [currentApproval, shouldEagerCommitApprovalPreview]);
   const refreshDerived = import_react91.useCallback(() => {
     const b = buffersRef.current;
     setTokenCount(b.tokenCount);
@@ -90730,6 +91218,16 @@ function App2({
     setLines(newLines);
     commitEligibleLines(b);
   }, [commitEligibleLines]);
+  import_react91.useEffect(() => {
+    if (deferredCommitAt === null)
+      return;
+    const delay = Math.max(0, deferredCommitAt - Date.now());
+    const timer = setTimeout(() => {
+      setDeferredCommitAt(null);
+      refreshDerived();
+    }, delay);
+    return () => clearTimeout(timer);
+  }, [deferredCommitAt, refreshDerived]);
   const streamingRefreshTimeoutRef = import_react91.useRef(null);
   const refreshDerivedStreaming = import_react91.useCallback(() => {
     if (streamingRefreshTimeoutRef.current) {
@@ -90825,6 +91323,31 @@ function App2({
       lastPlanFilePathRef.current = planFilePath;
     } catch {}
   }, [currentApproval]);
+  import_react91.useEffect(() => {
+    if (!currentApproval)
+      return;
+    if (currentApproval.toolName === "ExitPlanMode")
+      return;
+    const toolCallId = currentApproval.toolCallId;
+    if (!toolCallId)
+      return;
+    if (eagerCommittedPreviewsRef.current.has(toolCallId))
+      return;
+    if (!currentApprovalShouldCommitPreview)
+      return;
+    const previewItem = {
+      kind: "approval_preview",
+      id: `approval-preview-${toolCallId}`,
+      toolCallId,
+      toolName: currentApproval.toolName,
+      toolArgs: currentApproval.toolArgs || "{}"
+    };
+    if ((isFileEditTool(currentApproval.toolName) || isFileWriteTool(currentApproval.toolName)) && precomputedDiffsRef.current.has(toolCallId)) {
+      previewItem.precomputedDiff = precomputedDiffsRef.current.get(toolCallId);
+    }
+    setStaticItems((prev) => [...prev, previewItem]);
+    eagerCommittedPreviewsRef.current.add(toolCallId);
+  }, [currentApproval, currentApprovalShouldCommitPreview]);
   import_react91.useEffect(() => {
     if (loadingState === "ready" && messageHistory.length > 0 && !hasBackfilledRef.current) {
       hasBackfilledRef.current = true;
@@ -90886,7 +91409,7 @@ function App2({
       });
       buffersRef.current.order.push(statusId);
       refreshDerived();
-      commitEligibleLines(buffersRef.current);
+      commitEligibleLines(buffersRef.current, { deferToolCalls: false });
     }
   }, [
     loadingState,
@@ -91303,6 +91826,7 @@ ${newState.originalPrompt}`
           }
           if (isConversationBusyError(errorDetail) && conversationBusyRetriesRef.current < CONVERSATION_BUSY_MAX_RETRIES2) {
             conversationBusyRetriesRef.current += 1;
+            const retryDelayMs = CONVERSATION_BUSY_RETRY_BASE_DELAY_MS * 2 ** (conversationBusyRetriesRef.current - 1);
             const statusId = uid4("status");
             buffersRef.current.byId.set(statusId, {
               kind: "status",
@@ -91313,7 +91837,7 @@ ${newState.originalPrompt}`
             refreshDerived();
             let cancelled = false;
             const startTime = Date.now();
-            while (Date.now() - startTime < CONVERSATION_BUSY_RETRY_DELAY_MS2) {
+            while (Date.now() - startTime < retryDelayMs) {
               if (abortControllerRef.current?.signal.aborted || userCancelledRef.current) {
                 cancelled = true;
                 break;
@@ -91616,39 +92140,11 @@ ${feedback}
             refreshDerived();
             return;
           }
-          const approvalResults2 = await Promise.all(approvalsToProcess.map(async (approvalItem) => {
-            if (!approvalItem.toolName) {
-              return {
-                approval: approvalItem,
-                permission: {
-                  decision: "deny",
-                  reason: "Tool call incomplete - missing name or arguments"
-                },
-                context: null
-              };
-            }
-            const parsedArgs = safeJsonParseOr(approvalItem.toolArgs, {});
-            const permission = await checkToolPermission(approvalItem.toolName, parsedArgs);
-            const context3 = await analyzeToolApproval(approvalItem.toolName, parsedArgs);
-            return { approval: approvalItem, permission, context: context3 };
-          }));
-          const needsUserInput = [];
-          const autoDenied = [];
-          const autoAllowed = [];
-          for (const ac of approvalResults2) {
-            const { approval: approval2, permission } = ac;
-            let decision = permission.decision;
-            if (alwaysRequiresUserInput(approval2.toolName) && decision === "allow") {
-              decision = "ask";
-            }
-            if (decision === "ask") {
-              needsUserInput.push(ac);
-            } else if (decision === "deny") {
-              autoDenied.push(ac);
-            } else {
-              autoAllowed.push(ac);
-            }
-          }
+          const { needsUserInput, autoAllowed, autoDenied } = await classifyApprovals(approvalsToProcess, {
+            getContext: analyzeToolApproval,
+            alwaysRequiresUserInput,
+            missingNameReason: "Tool call incomplete - missing name or arguments"
+          });
           for (const ac of [...autoAllowed, ...needsUserInput]) {
             const toolName = ac.approval.toolName;
             const toolCallId = ac.approval.toolCallId;
@@ -92133,6 +92629,7 @@ ${feedback}
   ]);
   const handleExit = import_react91.useCallback(async () => {
     saveLastAgentBeforeExit();
+    await runEndHooks();
     const stats = sessionStatsRef.current.getSnapshot();
     telemetry2.trackSessionEnd(stats, "exit_command");
     await telemetry2.flush();
@@ -92140,7 +92637,7 @@ ${feedback}
     setTimeout(() => {
       process.exit(0);
     }, 100);
-  }, []);
+  }, [runEndHooks]);
   const handleEnterQueueEditMode = import_react91.useCallback(() => {
     setMessageQueue([]);
   }, []);
@@ -92364,6 +92861,7 @@ ${feedback}
       buffersRef.current.order = [];
       buffersRef.current.tokenCount = 0;
       emittedIdsRef.current.clear();
+      resetDeferredToolCallCommits();
       setStaticItems([]);
       setStaticRenderEpoch((e) => e + 1);
       resetTrajectoryBases();
@@ -92421,6 +92919,7 @@ ${feedback}
     agentName,
     setCommandRunning,
     isAgentBusy,
+    resetDeferredToolCallCommits,
     resetTrajectoryBases
   ]);
   const handleCreateNewAgent = import_react91.useCallback(async (name) => {
@@ -92444,6 +92943,7 @@ ${feedback}
       buffersRef.current.order = [];
       buffersRef.current.tokenCount = 0;
       emittedIdsRef.current.clear();
+      resetDeferredToolCallCommits();
       setStaticItems([]);
       setStaticRenderEpoch((e) => e + 1);
       resetTrajectoryBases();
@@ -92487,7 +92987,13 @@ ${feedback}
     } finally {
       setCommandRunning(false);
     }
-  }, [refreshDerived, agentId, setCommandRunning, resetTrajectoryBases]);
+  }, [
+    refreshDerived,
+    agentId,
+    setCommandRunning,
+    resetDeferredToolCallCommits,
+    resetTrajectoryBases
+  ]);
   const handleBashSubmit = import_react91.useCallback(async (command) => {
     if (bashRunning)
       return;
@@ -92592,39 +93098,11 @@ ${expanded.command}` : expanded.command;
       if (!existingApprovals || existingApprovals.length === 0) {
         return { blocked: false };
       }
-      const approvalResults2 = await Promise.all(existingApprovals.map(async (approvalItem) => {
-        if (!approvalItem.toolName) {
-          return {
-            approval: approvalItem,
-            permission: {
-              decision: "deny",
-              reason: "Tool call incomplete - missing name"
-            },
-            context: null
-          };
-        }
-        const parsedArgs = safeJsonParseOr(approvalItem.toolArgs, {});
-        const permission = await checkToolPermission(approvalItem.toolName, parsedArgs);
-        const context3 = await analyzeToolApproval(approvalItem.toolName, parsedArgs);
-        return { approval: approvalItem, permission, context: context3 };
-      }));
-      const needsUserInput = [];
-      const autoAllowed = [];
-      const autoDenied = [];
-      for (const ac of approvalResults2) {
-        const { approval, permission } = ac;
-        let decision = permission.decision;
-        if (alwaysRequiresUserInput(approval.toolName) && decision === "allow") {
-          decision = "ask";
-        }
-        if (decision === "ask") {
-          needsUserInput.push(ac);
-        } else if (decision === "deny") {
-          autoDenied.push(ac);
-        } else {
-          autoAllowed.push(ac);
-        }
-      }
+      const { needsUserInput, autoAllowed, autoDenied } = await classifyApprovals(existingApprovals, {
+        getContext: analyzeToolApproval,
+        alwaysRequiresUserInput,
+        missingNameReason: "Tool call incomplete - missing name"
+      });
       if (needsUserInput.length > 0) {
         setPendingApprovals(needsUserInput.map((ac) => ac.approval));
         setApprovalContexts(needsUserInput.map((ac) => ac.context).filter((ctx) => ctx !== null));
@@ -93181,6 +93659,7 @@ Type your task to begin the loop.`,
         buffersRef.current.order.push(cmdId);
         refreshDerived();
         setCommandRunning(true);
+        await runEndHooks();
         try {
           const client = await getClient2();
           const conversation = await client.conversations.create({
@@ -93194,6 +93673,13 @@ Type your task to begin the loop.`,
             conversationId: conversation.id
           });
           turnCountRef.current = 0;
+          sessionHooksRanRef.current = false;
+          runSessionStartHooks(true, agentId, agentName ?? undefined, conversation.id).then((result2) => {
+            if (result2.feedback.length > 0) {
+              sessionStartFeedbackRef.current = result2.feedback;
+            }
+          }).catch(() => {});
+          sessionHooksRanRef.current = true;
           buffersRef.current.byId.set(cmdId, {
             kind: "command",
             id: cmdId,
@@ -93232,6 +93718,7 @@ Type your task to begin the loop.`,
         buffersRef.current.order.push(cmdId);
         refreshDerived();
         setCommandRunning(true);
+        await runEndHooks();
         try {
           const client = await getClient2();
           await client.agents.messages.reset(agentId, {
@@ -93248,6 +93735,13 @@ Type your task to begin the loop.`,
             conversationId: conversation.id
           });
           turnCountRef.current = 0;
+          sessionHooksRanRef.current = false;
+          runSessionStartHooks(true, agentId, agentName ?? undefined, conversation.id).then((result2) => {
+            if (result2.feedback.length > 0) {
+              sessionStartFeedbackRef.current = result2.feedback;
+            }
+          }).catch(() => {});
+          sessionHooksRanRef.current = true;
           buffersRef.current.byId.set(cmdId, {
             kind: "command",
             id: cmdId,
@@ -93354,14 +93848,29 @@ Type your task to begin the loop.`,
       }
       if (msg.trim().startsWith("/rename")) {
         const parts = msg.trim().split(/\s+/);
-        const newName = parts.slice(1).join(" ");
-        if (!newName) {
+        const subcommand = parts[1]?.toLowerCase();
+        if (!subcommand || subcommand !== "agent" && subcommand !== "convo") {
+          const cmdId2 = uid4("cmd");
+          buffersRef.current.byId.set(cmdId2, {
+            kind: "command",
+            id: cmdId2,
+            input: msg,
+            output: "Usage: /rename agent <name> or /rename convo <summary>",
+            phase: "finished",
+            success: false
+          });
+          buffersRef.current.order.push(cmdId2);
+          refreshDerived();
+          return { submitted: true };
+        }
+        const newValue = parts.slice(2).join(" ");
+        if (!newValue) {
           const cmdId2 = uid4("cmd");
           buffersRef.current.byId.set(cmdId2, {
             kind: "command",
             id: cmdId2,
             input: msg,
-            output: "Please provide a new name: /rename <name>",
+            output: subcommand === "convo" ? "Please provide a summary: /rename convo <summary>" : "Please provide a name: /rename agent <name>",
             phase: "finished",
             success: false
           });
@@ -93369,7 +93878,49 @@ Type your task to begin the loop.`,
           refreshDerived();
           return { submitted: true };
         }
-        const validationError = validateAgentName(newName);
+        if (subcommand === "convo") {
+          const cmdId2 = uid4("cmd");
+          buffersRef.current.byId.set(cmdId2, {
+            kind: "command",
+            id: cmdId2,
+            input: msg,
+            output: `Renaming conversation to "${newValue}"...`,
+            phase: "running"
+          });
+          buffersRef.current.order.push(cmdId2);
+          refreshDerived();
+          setCommandRunning(true);
+          try {
+            const client = await getClient2();
+            await client.conversations.update(conversationId, {
+              summary: newValue
+            });
+            buffersRef.current.byId.set(cmdId2, {
+              kind: "command",
+              id: cmdId2,
+              input: msg,
+              output: `Conversation renamed to "${newValue}"`,
+              phase: "finished",
+              success: true
+            });
+            refreshDerived();
+          } catch (error) {
+            const errorDetails = formatErrorDetails(error, agentId);
+            buffersRef.current.byId.set(cmdId2, {
+              kind: "command",
+              id: cmdId2,
+              input: msg,
+              output: `Failed: ${errorDetails}`,
+              phase: "finished",
+              success: false
+            });
+            refreshDerived();
+          } finally {
+            setCommandRunning(false);
+          }
+          return { submitted: true };
+        }
+        const validationError = validateAgentName(newValue);
         if (validationError) {
           const cmdId2 = uid4("cmd");
           buffersRef.current.byId.set(cmdId2, {
@@ -93389,7 +93940,7 @@ Type your task to begin the loop.`,
           kind: "command",
           id: cmdId,
           input: msg,
-          output: `Renaming agent to "${newName}"...`,
+          output: `Renaming agent to "${newValue}"...`,
           phase: "running"
         });
         buffersRef.current.order.push(cmdId);
@@ -93397,13 +93948,13 @@ Type your task to begin the loop.`,
         setCommandRunning(true);
         try {
           const client = await getClient2();
-          await client.agents.update(agentId, { name: newName });
-          updateAgentName(newName);
+          await client.agents.update(agentId, { name: newValue });
+          updateAgentName(newValue);
           buffersRef.current.byId.set(cmdId, {
             kind: "command",
             id: cmdId,
             input: msg,
-            output: `Agent renamed to "${newName}"`,
+            output: `Agent renamed to "${newValue}"`,
             phase: "finished",
             success: true
           });
@@ -93529,6 +94080,7 @@ Type your task to begin the loop.`,
               buffersRef.current.order = [];
               buffersRef.current.tokenCount = 0;
               emittedIdsRef.current.clear();
+              resetDeferredToolCallCommits();
               setStaticItems([]);
               setStaticRenderEpoch((e) => e + 1);
               resetTrajectoryBases();
@@ -94357,6 +94909,17 @@ ${SYSTEM_REMINDER_CLOSE}`
       });
       hasSentSessionContextRef.current = true;
     }
+    let sessionStartHookFeedback = "";
+    if (sessionStartFeedbackRef.current.length > 0) {
+      sessionStartHookFeedback = `${SYSTEM_REMINDER_OPEN}
+[SessionStart hook context]:
+${sessionStartFeedbackRef.current.join(`
+`)}
+${SYSTEM_REMINDER_CLOSE}
+
+`;
+      sessionStartFeedbackRef.current = [];
+    }
     let bashCommandPrefix = "";
     if (bashCommandCacheRef.current.length > 0) {
       bashCommandPrefix = `${SYSTEM_REMINDER_OPEN}
@@ -94419,7 +94982,7 @@ ${SYSTEM_REMINDER_CLOSE}
 `;
       lastNotifiedModeRef.current = currentMode;
     }
-    const allReminders = sessionContextReminder + permissionModeAlert + planModeReminder + ralphModeReminder + skillUnloadReminder + bashCommandPrefix + userPromptSubmitHookFeedback + memoryReminderContent + memfsConflictReminder;
+    const allReminders = sessionContextReminder + sessionStartHookFeedback + permissionModeAlert + planModeReminder + ralphModeReminder + skillUnloadReminder + bashCommandPrefix + userPromptSubmitHookFeedback + memoryReminderContent + memfsConflictReminder;
     const messageContent = allReminders && typeof contentParts === "string" ? allReminders + contentParts : Array.isArray(contentParts) && allReminders ? [{ type: "text", text: allReminders }, ...contentParts] : contentParts;
     const userId = uid4("user");
     buffersRef.current.byId.set(userId, {
@@ -94467,22 +95030,11 @@ ${SYSTEM_REMINDER_CLOSE}
           return { submitted: false };
         }
         if (existingApprovals && existingApprovals.length > 0) {
-          const approvalResults2 = await Promise.all(existingApprovals.map(async (approvalItem) => {
-            if (!approvalItem.toolName) {
-              return {
-                approval: approvalItem,
-                permission: {
-                  decision: "deny",
-                  reason: "Tool call incomplete - missing name"
-                },
-                context: null
-              };
-            }
-            const parsedArgs = safeJsonParseOr(approvalItem.toolArgs, {});
-            const permission = await checkToolPermission(approvalItem.toolName, parsedArgs);
-            const context3 = await analyzeToolApproval(approvalItem.toolName, parsedArgs);
-            return { approval: approvalItem, permission, context: context3 };
-          }));
+          const { needsUserInput, autoAllowed, autoDenied } = await classifyApprovals(existingApprovals, {
+            getContext: analyzeToolApproval,
+            alwaysRequiresUserInput,
+            missingNameReason: "Tool call incomplete - missing name"
+          });
           if (userCancelledRef.current || abortControllerRef.current?.signal.aborted) {
             buffersRef.current.byId.delete(userId);
             const orderIndex = buffersRef.current.order.indexOf(userId);
@@ -94493,23 +95045,6 @@ ${SYSTEM_REMINDER_CLOSE}
             refreshDerived();
             return { submitted: false };
           }
-          const needsUserInput = [];
-          const autoAllowed = [];
-          const autoDenied = [];
-          for (const ac of approvalResults2) {
-            const { approval, permission } = ac;
-            let decision = permission.decision;
-            if (alwaysRequiresUserInput(approval.toolName) && decision === "allow") {
-              decision = "ask";
-            }
-            if (decision === "ask") {
-              needsUserInput.push(ac);
-            } else if (decision === "deny") {
-              autoDenied.push(ac);
-            } else {
-              autoAllowed.push(ac);
-            }
-          }
           if (needsUserInput.length === 0) {
             for (const ac of [...autoAllowed, ...needsUserInput]) {
               const toolName = ac.approval.toolName;
@@ -94925,8 +95460,12 @@ ${SYSTEM_REMINDER_CLOSE}
         ...approvalResultsSnapshot,
         ...additionalDecision ? [additionalDecision] : []
       ];
-      executingToolCallIdsRef.current = allDecisions.filter((decision) => decision.type === "approve").map((decision) => decision.approval.toolCallId);
-      setToolCallsRunning(buffersRef.current, allDecisions.filter((d) => d.type === "approve").map((d) => d.approval.toolCallId));
+      const approvedDecisions = allDecisions.filter((decision) => decision.type === "approve");
+      const runningDecisions = approvedDecisions.filter((decision) => !decision.precomputedResult);
+      executingToolCallIdsRef.current = runningDecisions.map((decision) => decision.approval.toolCallId);
+      if (runningDecisions.length > 0) {
+        setToolCallsRunning(buffersRef.current, runningDecisions.map((d) => d.approval.toolCallId));
+      }
       refreshDerived();
       const { executeApprovalBatch: executeApprovalBatch2 } = await init_approval_execution().then(() => exports_approval_execution);
       sessionStatsRef.current.startTrajectory();
@@ -95278,7 +95817,7 @@ ${SYSTEM_REMINDER_CLOSE}
         let selectedModel = models2.find((m) => m.id === modelId);
         if (!selectedModel && modelId.includes("/")) {
           const { getModelContextWindow: getModelContextWindow2 } = await init_available_models().then(() => exports_available_models);
-          const apiContextWindow = getModelContextWindow2(modelId);
+          const apiContextWindow = await getModelContextWindow2(modelId);
           selectedModel = {
             id: modelId,
             handle: modelId,
@@ -95942,9 +96481,6 @@ 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,
@@ -96031,6 +96567,8 @@ Plan file path: ${planFilePath}`;
     return lines.filter((ln) => {
       if (!("phase" in ln))
         return false;
+      if (emittedIdsRef.current.has(ln.id))
+        return false;
       if (ln.kind === "command" || ln.kind === "bash_command") {
         return ln.phase === "running";
       }
@@ -96038,7 +96576,7 @@ Plan file path: ${planFilePath}`;
         if (ln.name && isTaskTool(ln.name)) {
           return ln.phase === "ready" || ln.phase === "streaming";
         }
-        return ln.phase !== "finished";
+        return ln.phase !== "finished" || deferredToolCallCommitsRef.current.has(ln.id);
       }
       if (ln.kind === "event") {
         return ln.phase === "running";
@@ -96047,7 +96585,7 @@ Plan file path: ${planFilePath}`;
         return false;
       return ln.phase === "streaming";
     });
-  }, [lines, tokenStreamingEnabled]);
+  }, [lines, tokenStreamingEnabled, staticItems.length, deferredCommitAt]);
   const { agents: subagents } = import_react91.useSyncExternalStore(subscribe2, getSnapshot2);
   const shouldAnimate = import_react91.useMemo(() => {
     const countLines4 = (text) => {
@@ -96125,7 +96663,7 @@ Plan file path: ${planFilePath}`;
       });
       buffersRef.current.order.push(statusId);
       refreshDerived();
-      commitEligibleLines(buffersRef.current);
+      commitEligibleLines(buffersRef.current, { deferToolCalls: false });
     }
   }, [
     loadingState,
@@ -96146,6 +96684,8 @@ Plan file path: ${planFilePath}`;
   const trajectoryTokenDisplay = Math.max(liveTrajectoryTokenBase + runTokenDelta, trajectoryTokenDisplayRef.current);
   const inputVisible = !showExitStats;
   const inputEnabled = !showExitStats && pendingApprovals.length === 0 && !anySelectorOpen;
+  const currentApprovalPreviewCommitted = currentApproval?.toolCallId ? eagerCommittedPreviewsRef.current.has(currentApproval.toolCallId) : false;
+  const showApprovalPreview = !currentApprovalShouldCommitPreview && !currentApprovalPreviewCommitted;
   import_react91.useEffect(() => {
     trajectoryTokenDisplayRef.current = trajectoryTokenDisplay;
   }, [trajectoryTokenDisplay]);
@@ -96155,51 +96695,53 @@ Plan file path: ${planFilePath}`;
       /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Static, {
         items: staticItems,
         style: { flexDirection: "column" },
-        children: (item, index) => /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Box_default, {
-          marginTop: index > 0 ? 1 : 0,
-          children: item.kind === "welcome" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(WelcomeScreen, {
-            loadingState: "ready",
-            ...item.snapshot
-          }, undefined, false, undefined, this) : item.kind === "user" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(UserMessage, {
-            line: item
-          }, undefined, false, undefined, this) : item.kind === "reasoning" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ReasoningMessage, {
-            line: item
-          }, undefined, false, undefined, this) : item.kind === "assistant" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(AssistantMessage, {
-            line: item
-          }, undefined, false, undefined, this) : item.kind === "tool_call" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ToolCallMessage, {
-            line: item,
-            precomputedDiffs: precomputedDiffsRef.current,
-            lastPlanFilePath: lastPlanFilePathRef.current
-          }, undefined, false, undefined, this) : item.kind === "subagent_group" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(SubagentGroupStatic, {
-            agents: item.agents
-          }, undefined, false, undefined, this) : item.kind === "error" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ErrorMessage, {
-            line: item
-          }, undefined, false, undefined, this) : item.kind === "status" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(StatusMessage, {
-            line: item
-          }, undefined, false, undefined, this) : item.kind === "event" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(EventMessage, {
-            line: item
-          }, undefined, false, undefined, this) : item.kind === "separator" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Box_default, {
-            marginTop: 1,
-            children: /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Text2, {
-              dimColor: true,
-              children: "─".repeat(columns)
-            }, undefined, false, undefined, this)
-          }, undefined, false, undefined, this) : item.kind === "command" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(CommandMessage, {
-            line: item
-          }, undefined, false, undefined, this) : item.kind === "bash_command" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(BashCommandMessage, {
-            line: item
-          }, undefined, false, undefined, this) : item.kind === "trajectory_summary" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(TrajectorySummary, {
-            line: item
-          }, undefined, false, undefined, this) : item.kind === "approval_preview" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ApprovalPreview, {
-            toolName: item.toolName,
-            toolArgs: item.toolArgs,
-            precomputedDiff: item.precomputedDiff,
-            allDiffs: precomputedDiffsRef.current,
-            planContent: item.planContent,
-            planFilePath: item.planFilePath,
-            toolCallId: item.toolCallId
-          }, undefined, false, undefined, this) : null
-        }, item.id, false, undefined, this)
+        children: (item, index) => {
+          return /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Box_default, {
+            marginTop: index > 0 ? 1 : 0,
+            children: item.kind === "welcome" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(WelcomeScreen, {
+              loadingState: "ready",
+              ...item.snapshot
+            }, undefined, false, undefined, this) : item.kind === "user" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(UserMessage, {
+              line: item
+            }, undefined, false, undefined, this) : item.kind === "reasoning" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ReasoningMessage, {
+              line: item
+            }, undefined, false, undefined, this) : item.kind === "assistant" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(AssistantMessage, {
+              line: item
+            }, undefined, false, undefined, this) : item.kind === "tool_call" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ToolCallMessage, {
+              line: item,
+              precomputedDiffs: precomputedDiffsRef.current,
+              lastPlanFilePath: lastPlanFilePathRef.current
+            }, undefined, false, undefined, this) : item.kind === "subagent_group" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(SubagentGroupStatic, {
+              agents: item.agents
+            }, undefined, false, undefined, this) : item.kind === "error" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ErrorMessage, {
+              line: item
+            }, undefined, false, undefined, this) : item.kind === "status" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(StatusMessage, {
+              line: item
+            }, undefined, false, undefined, this) : item.kind === "event" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(EventMessage, {
+              line: item
+            }, undefined, false, undefined, this) : item.kind === "separator" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Box_default, {
+              marginTop: 1,
+              children: /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Text2, {
+                dimColor: true,
+                children: "─".repeat(columns)
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this) : item.kind === "command" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(CommandMessage, {
+              line: item
+            }, undefined, false, undefined, this) : item.kind === "bash_command" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(BashCommandMessage, {
+              line: item
+            }, undefined, false, undefined, this) : item.kind === "trajectory_summary" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(TrajectorySummary, {
+              line: item
+            }, undefined, false, undefined, this) : item.kind === "approval_preview" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ApprovalPreview, {
+              toolName: item.toolName,
+              toolArgs: item.toolArgs,
+              precomputedDiff: item.precomputedDiff,
+              allDiffs: precomputedDiffsRef.current,
+              planContent: item.planContent,
+              planFilePath: item.planFilePath,
+              toolCallId: item.toolCallId
+            }, undefined, false, undefined, this) : null
+          }, item.id, false, undefined, this);
+        }
       }, staticRenderEpoch, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Box_default, {
         flexDirection: "column",
@@ -96217,10 +96759,12 @@ Plan file path: ${planFilePath}`;
                   liveItems.length > 0 && /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Box_default, {
                     flexDirection: "column",
                     children: liveItems.map((ln) => {
-                      if (ln.kind === "tool_call" && ln.name && isTaskTool(ln.name) && ln.toolCallId && !pendingIds.has(ln.toolCallId) && ln.toolCallId !== currentApproval?.toolCallId) {
+                      const isFileTool = ln.kind === "tool_call" && ln.name && (isFileEditTool(ln.name) || isFileWriteTool(ln.name) || isPatchTool(ln.name));
+                      const isApprovalTracked = ln.kind === "tool_call" && ln.toolCallId && (ln.toolCallId === currentApproval?.toolCallId || pendingIds.has(ln.toolCallId) || queuedIds.has(ln.toolCallId));
+                      if (isFileTool && !isApprovalTracked) {
                         return null;
                       }
-                      if (ln.kind === "tool_call" && ln.toolCallId && eagerCommittedPreviewsRef.current.has(ln.toolCallId) && ln.toolCallId !== currentApproval?.toolCallId) {
+                      if (ln.kind === "tool_call" && ln.name && isTaskTool(ln.name) && ln.toolCallId && !pendingIds.has(ln.toolCallId) && ln.toolCallId !== currentApproval?.toolCallId) {
                         return null;
                       }
                       const matchesCurrentApproval = ln.kind === "tool_call" && currentApproval && ln.toolCallId === currentApproval.toolCallId;
@@ -96242,7 +96786,8 @@ Plan file path: ${planFilePath}`;
                           allDiffs: precomputedDiffsRef.current,
                           isFocused: true,
                           approveAlwaysText: currentApprovalContext?.approveAlwaysText,
-                          allowPersistence: currentApprovalContext?.allowPersistence ?? true
+                          allowPersistence: currentApprovalContext?.allowPersistence ?? true,
+                          showPreview: showApprovalPreview
                         }, undefined, false, undefined, this) : ln.kind === "user" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(UserMessage, {
                           line: ln
                         }, undefined, false, undefined, this) : ln.kind === "reasoning" ? /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(ReasoningMessage, {
@@ -96291,7 +96836,8 @@ Plan file path: ${planFilePath}`;
                       allDiffs: precomputedDiffsRef.current,
                       isFocused: true,
                       approveAlwaysText: currentApprovalContext?.approveAlwaysText,
-                      allowPersistence: currentApprovalContext?.allowPersistence ?? true
+                      allowPersistence: currentApprovalContext?.allowPersistence ?? true,
+                      showPreview: showApprovalPreview
                     }, undefined, false, undefined, this)
                   }, undefined, false, undefined, this),
                   /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(SubagentGroupDisplay, {}, undefined, false, undefined, this)
@@ -96543,6 +97089,7 @@ Plan file path: ${planFilePath}`;
                       buffersRef.current.order = [];
                       buffersRef.current.tokenCount = 0;
                       emittedIdsRef.current.clear();
+                      resetDeferredToolCallCommits();
                       setStaticItems([]);
                       setStaticRenderEpoch((e) => e + 1);
                       resetTrajectoryBases();
@@ -96665,6 +97212,7 @@ Plan file path: ${planFilePath}`;
                     buffersRef.current.order = [];
                     buffersRef.current.tokenCount = 0;
                     emittedIdsRef.current.clear();
+                    resetDeferredToolCallCommits();
                     setStaticItems([]);
                     setStaticRenderEpoch((e) => e + 1);
                     resetTrajectoryBases();
@@ -96764,6 +97312,7 @@ Plan file path: ${planFilePath}`;
                       buffersRef.current.order = [];
                       buffersRef.current.tokenCount = 0;
                       emittedIdsRef.current.clear();
+                      resetDeferredToolCallCommits();
                       setStaticItems([]);
                       setStaticRenderEpoch((e) => e + 1);
                       resetTrajectoryBases();
@@ -96982,7 +97531,7 @@ Open /mcp to attach or detach tools for this server.`,
     ]
   }, resumeKey, true, undefined, this);
 }
-var import_react91, jsx_dev_runtime69, CLEAR_SCREEN_AND_HOME = "\x1B[2J\x1B[H", MIN_RESIZE_DELTA = 2, EAGER_CANCEL = true, LLM_API_ERROR_MAX_RETRIES2 = 3, CONVERSATION_BUSY_MAX_RETRIES2 = 1, CONVERSATION_BUSY_RETRY_DELAY_MS2 = 2500, INTERRUPT_MESSAGE = "Interrupted – tell the agent what to do differently. Something went wrong? Use /feedback to report issues.", ERROR_FEEDBACK_HINT = "Something went wrong? Use /feedback to report issues.", OPUS_BEDROCK_FALLBACK_HINT = "Downstream provider issues? Use /model to switch to Bedrock Opus 4.5", PROVIDER_FALLBACK_HINT = "Downstream provider issues? Use /model to switch to another provider", INTERACTIVE_SLASH_COMMANDS, NON_STATE_COMMANDS;
+var import_react91, jsx_dev_runtime69, CLEAR_SCREEN_AND_HOME = "\x1B[2J\x1B[H", MIN_RESIZE_DELTA = 2, TOOL_CALL_COMMIT_DEFER_MS = 50, EAGER_CANCEL = true, LLM_API_ERROR_MAX_RETRIES2 = 3, CONVERSATION_BUSY_MAX_RETRIES2 = 3, CONVERSATION_BUSY_RETRY_BASE_DELAY_MS = 2500, INTERRUPT_MESSAGE = "Interrupted – tell the agent what to do differently. Something went wrong? Use /feedback to report issues.", ERROR_FEEDBACK_HINT = "Something went wrong? Use /feedback to report issues.", OPUS_BEDROCK_FALLBACK_HINT = "Downstream provider issues? Use /model to switch to Bedrock Opus 4.5", PROVIDER_FALLBACK_HINT = "Downstream provider issues? Use /model to switch to another provider", INTERACTIVE_SLASH_COMMANDS, NON_STATE_COMMANDS, APPROVAL_OPTIONS_HEIGHT = 8, APPROVAL_PREVIEW_BUFFER = 4, MIN_WRAP_WIDTH = 10, TEXT_WRAP_GUTTER = 6, DIFF_WRAP_GUTTER = 12;
 var init_App2 = __esm(async () => {
   init_error();
   init_check_approval();
@@ -96995,6 +97544,7 @@ var init_App2 = __esm(async () => {
   init_mode();
   init_mode2();
   init_settings();
+  init_debug();
   init_colors();
   init_SessionStats();
   init_AnimationContext();
@@ -97062,6 +97612,7 @@ var init_App2 = __esm(async () => {
     init_UserMessageRich(),
     init_WelcomeScreen(),
     init_accumulator(),
+    init_approvalClassification(),
     init_memoryReminder(),
     init_sessionContext(),
     init_stream(),
@@ -97853,7 +98404,7 @@ async function createAgent2(nameOrOptions = DEFAULT_AGENT_NAME, model, embedding
     blockProvenance.push({ label: blockId, source: "shared" });
   }
   const modelUpdateArgs = getModelUpdateArgs(modelHandle);
-  const contextWindow = modelUpdateArgs?.context_window;
+  const contextWindow = modelUpdateArgs?.context_window ?? await getModelContextWindow(modelHandle);
   let systemPromptContent;
   if (options.systemPromptCustom) {
     systemPromptContent = options.systemPromptCustom;
@@ -97926,6 +98477,7 @@ var init_create3 = __esm(async () => {
   init_promptAssets();
   init_skills2();
   await __promiseAll([
+    init_available_models(),
     init_client2(),
     init_modify()
   ]);
@@ -98069,7 +98621,7 @@ function buildModelSettings2(modelHandle, updateArgs) {
 async function updateAgentLLMConfig2(agentId, modelHandle, updateArgs) {
   const client = await getClient2();
   const modelSettings = buildModelSettings2(modelHandle, updateArgs);
-  const contextWindow = updateArgs?.context_window;
+  const contextWindow = updateArgs?.context_window ?? await getModelContextWindow(modelHandle);
   const hasModelSettings = Object.keys(modelSettings).length > 0;
   await client.agents.update(agentId, {
     model: modelHandle,
@@ -98151,6 +98703,7 @@ async function updateAgentSystemPromptMemfs2(agentId, enableMemfs) {
 var init_modify2 = __esm(async () => {
   await __promiseAll([
     init_openai_codex_provider(),
+    init_available_models(),
     init_client2()
   ]);
 });
@@ -98247,6 +98800,7 @@ class InternalServerError extends APIError {
 
 // src/agent/check-approval.ts
 init_error();
+init_debug();
 var MESSAGE_HISTORY_LIMIT = 15;
 function isBackfillEnabled() {
   const val = process.env.LETTA_BACKFILL;
@@ -100815,6 +101369,7 @@ class PermissionModeManager {
 var permissionMode = new PermissionModeManager;
 
 // src/settings-manager.ts
+init_debug();
 init_fs();
 await init_secrets();
 import { homedir as homedir6 } from "node:os";
@@ -100914,7 +101469,7 @@ class SettingsManager2 {
             }
             this.settings = updatedSettings;
             await this.persistSettings();
-            console.log("Successfully migrated tokens to secrets");
+            debugWarn("settings", "Successfully migrated tokens to secrets");
           } catch (error) {
             console.warn("Failed to migrate tokens to secrets:", error);
             console.warn("Tokens will remain in settings file for persistence");
@@ -101843,6 +102398,7 @@ var telemetry = new TelemetryManager;
 init_model();
 init_subagents();
 init_constants();
+init_debug();
 await __promiseAll([
   init_approval_execution(),
   init_hooks(),
@@ -103415,4 +103971,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=ECD33F3765BB3B7864756E2164756E21
+//# debugId=E6B9011D5A418C2E64756E2164756E21