@letta-ai/letta-code 0.9.0-next.1 → 0.10.0

package/letta.js

@@ -3233,7 +3233,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.9.0-next.1",
+    version: "0.10.0",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -27886,11 +27886,11 @@ var init_colors = __esm(() => {
     },
     link: {
       text: "cyan",
-      url: "blue"
+      url: brandColors.primaryAccent
     },
     heading: {
       primary: "cyan",
-      secondary: "blue"
+      secondary: brandColors.primaryAccent
     },
     status: {
       error: brandColors.statusError,
@@ -27930,7 +27930,7 @@ var init_colors = __esm(() => {
     },
     info: {
       border: brandColors.primaryAccent,
-      prompt: "blue"
+      prompt: brandColors.primaryAccent
     },
     diff: {
       addedLineBg: "#1a4d1a",
@@ -27939,7 +27939,7 @@ var init_colors = __esm(() => {
       removedWordBg: "#7a2d2d",
       contextLineBg: undefined,
       textOnDark: "white",
-      textOnHighlight: "black",
+      textOnHighlight: "white",
       symbolAdd: "green",
       symbolRemove: "red",
       symbolContext: undefined
@@ -33347,16 +33347,26 @@ class PermissionModeManager2 {
           "Write",
           "Edit",
           "MultiEdit",
-          "NotebookEdit",
           "apply_patch",
-          "ApplyPatch"
+          "ApplyPatch",
+          "write_file_gemini",
+          "WriteFileGemini",
+          "replace",
+          "Replace"
         ];
         if (allowedInPlan.includes(toolName)) {
           return "allow";
         }
         if (writeTools.includes(toolName)) {
           const planFilePath = this.getPlanFilePath();
-          const targetPath = toolArgs?.file_path || toolArgs?.path;
+          let targetPath = toolArgs?.file_path || toolArgs?.path;
+          if ((toolName === "ApplyPatch" || toolName === "apply_patch") && toolArgs?.input) {
+            const input = toolArgs.input;
+            const match = input.match(/\*\*\* (?:Add|Update|Delete) File:\s*(.+)/);
+            if (match?.[1]) {
+              targetPath = match[1].trim();
+            }
+          }
           if (planFilePath && targetPath && targetPath === planFilePath) {
             return "allow";
           }
@@ -48385,13 +48395,9 @@ function SetupUI({ onComplete }) {
       setDeviceCode(deviceData.device_code);
       setUserCode(deviceData.user_code);
       setVerificationUri(deviceData.verification_uri_complete);
-      try {
-        const { default: open2 } = await Promise.resolve().then(() => (init_open(), exports_open));
-        const subprocess = await open2(deviceData.verification_uri_complete, {
-          wait: false
-        });
+      Promise.resolve().then(() => (init_open(), exports_open)).then(({ default: open2 }) => open2(deviceData.verification_uri_complete, { wait: false })).then((subprocess) => {
         subprocess.on("error", () => {});
-      } catch (_openErr) {}
+      }).catch(() => {});
       const deviceId = settingsManager.getOrCreateDeviceId();
       const deviceName = hostname3();
       pollForToken(deviceData.device_code, deviceData.interval, deviceData.expires_in, deviceId, deviceName).then((tokens) => {
@@ -48485,7 +48491,7 @@ function SetupUI({ onComplete }) {
         /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
           dimColor: true,
           children: [
-            "URL: ",
+            "If browser didn't open, visit: ",
             verificationUri
           ]
         }, undefined, true, undefined, this),
@@ -52358,9 +52364,6 @@ class Diff {
 }
 
 // node_modules/diff/libesm/diff/character.js
-function diffChars(oldStr, newStr, options) {
-  return characterDiff.diff(oldStr, newStr, options);
-}
 var CharacterDiff, characterDiff;
 var init_character = __esm(() => {
   CharacterDiff = class CharacterDiff extends Diff {
@@ -53027,11 +53030,429 @@ function computeAdvancedDiff(input, opts) {
   }));
   return { mode: "advanced", fileName, oldStr, newStr, hunks };
 }
+function parsePatchToAdvancedDiff(patchLines, filePath) {
+  const fileName = basename2(filePath);
+  const hunks = [];
+  let currentHunk = null;
+  let oldLine = 1;
+  let newLine = 1;
+  for (const line of patchLines) {
+    if (line.startsWith("@@")) {
+      if (currentHunk && currentHunk.lines.length > 0) {
+        hunks.push(currentHunk);
+      }
+      const match3 = line.match(/@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/);
+      currentHunk = {
+        oldStart: match3?.[1] ? parseInt(match3[1], 10) : oldLine,
+        newStart: match3?.[2] ? parseInt(match3[2], 10) : newLine,
+        lines: []
+      };
+      continue;
+    }
+    if (!currentHunk) {
+      currentHunk = { oldStart: 1, newStart: 1, lines: [] };
+    }
+    if (line.length === 0) {
+      currentHunk.lines.push({ raw: " " });
+      oldLine++;
+      newLine++;
+    } else {
+      const prefix = line[0];
+      if (prefix === " " || prefix === "-" || prefix === "+") {
+        currentHunk.lines.push({ raw: line });
+        if (prefix === " " || prefix === "-")
+          oldLine++;
+        if (prefix === " " || prefix === "+")
+          newLine++;
+      }
+    }
+  }
+  if (currentHunk && currentHunk.lines.length > 0) {
+    hunks.push(currentHunk);
+  }
+  if (hunks.length === 0)
+    return null;
+  return {
+    mode: "advanced",
+    fileName,
+    oldStr: "",
+    newStr: "",
+    hunks
+  };
+}
 var ADV_DIFF_CONTEXT_LINES = 1, ADV_DIFF_IGNORE_WHITESPACE = true;
 var init_diff2 = __esm(() => {
   init_libesm();
 });
 
+// src/cli/helpers/toolNameMapping.ts
+function getDisplayToolName(rawName) {
+  if (rawName === "write")
+    return "Write";
+  if (rawName === "edit" || rawName === "multi_edit")
+    return "Update";
+  if (rawName === "read")
+    return "Read";
+  if (rawName === "bash")
+    return "Bash";
+  if (rawName === "grep")
+    return "Grep";
+  if (rawName === "glob")
+    return "Glob";
+  if (rawName === "ls")
+    return "LS";
+  if (rawName === "todo_write" || rawName === "TodoWrite")
+    return "TODO";
+  if (rawName === "EnterPlanMode" || rawName === "ExitPlanMode")
+    return "Planning";
+  if (rawName === "AskUserQuestion")
+    return "Question";
+  if (rawName === "update_plan")
+    return "Planning";
+  if (rawName === "shell_command" || rawName === "shell")
+    return "Bash";
+  if (rawName === "read_file")
+    return "Read";
+  if (rawName === "list_dir")
+    return "LS";
+  if (rawName === "grep_files")
+    return "Grep";
+  if (rawName === "apply_patch")
+    return "Patch";
+  if (rawName === "UpdatePlan")
+    return "Planning";
+  if (rawName === "ShellCommand" || rawName === "Shell")
+    return "Bash";
+  if (rawName === "ReadFile")
+    return "Read";
+  if (rawName === "ListDir")
+    return "LS";
+  if (rawName === "GrepFiles")
+    return "Grep";
+  if (rawName === "ApplyPatch")
+    return "Patch";
+  if (rawName === "run_shell_command")
+    return "Bash";
+  if (rawName === "read_file_gemini")
+    return "Read";
+  if (rawName === "list_directory")
+    return "LS";
+  if (rawName === "glob_gemini")
+    return "Glob";
+  if (rawName === "search_file_content")
+    return "Grep";
+  if (rawName === "write_file_gemini")
+    return "Write";
+  if (rawName === "write_todos")
+    return "TODO";
+  if (rawName === "read_many_files")
+    return "Read Multiple";
+  if (rawName === "RunShellCommand")
+    return "Bash";
+  if (rawName === "ReadFileGemini")
+    return "Read";
+  if (rawName === "ListDirectory")
+    return "LS";
+  if (rawName === "GlobGemini")
+    return "Glob";
+  if (rawName === "SearchFileContent")
+    return "Grep";
+  if (rawName === "WriteFileGemini")
+    return "Write";
+  if (rawName === "WriteTodos")
+    return "TODO";
+  if (rawName === "ReadManyFiles")
+    return "Read Multiple";
+  if (rawName === "Replace" || rawName === "replace")
+    return "Update";
+  if (rawName === "WriteFile" || rawName === "write_file")
+    return "Write";
+  if (rawName === "KillBash")
+    return "Kill Bash";
+  if (rawName === "BashOutput")
+    return "Shell Output";
+  if (rawName === "MultiEdit")
+    return "Update";
+  return rawName;
+}
+function isTaskTool(name) {
+  return name === "Task" || name === "task";
+}
+function isTodoTool(rawName, displayName) {
+  return rawName === "todo_write" || rawName === "TodoWrite" || rawName === "write_todos" || rawName === "WriteTodos" || displayName === "TODO";
+}
+function isPlanTool(rawName, displayName) {
+  return rawName === "update_plan" || rawName === "UpdatePlan" || displayName === "Planning";
+}
+function isFancyUITool(name) {
+  return name === "AskUserQuestion" || name === "EnterPlanMode" || name === "ExitPlanMode";
+}
+function isMemoryTool(name) {
+  return name === "memory" || name === "memory_apply_patch";
+}
+function isFileEditTool(name) {
+  return name === "edit" || name === "Edit" || name === "multi_edit" || name === "MultiEdit" || name === "Replace" || name === "replace";
+}
+function isFileWriteTool(name) {
+  return name === "write" || name === "Write" || name === "WriteFile" || name === "write_file" || name === "write_file_gemini" || name === "WriteFileGemini";
+}
+function isFileReadTool(name) {
+  return name === "read" || name === "Read" || name === "ReadFile" || name === "read_file" || name === "read_file_gemini" || name === "ReadFileGemini" || name === "read_many_files" || name === "ReadManyFiles";
+}
+function isPatchTool(name) {
+  return name === "apply_patch" || name === "ApplyPatch";
+}
+function isShellTool(name) {
+  return name === "bash" || name === "Bash" || name === "shell" || name === "Shell" || name === "shell_command" || name === "ShellCommand" || name === "run_shell_command" || name === "RunShellCommand";
+}
+
+// src/cli/helpers/formatArgsDisplay.ts
+import { relative as relative2 } from "node:path";
+function formatDisplayPath(filePath) {
+  const cwd2 = process.cwd();
+  const relativePath = relative2(cwd2, filePath);
+  if (relativePath.startsWith("..")) {
+    return filePath;
+  }
+  return relativePath;
+}
+function parsePatchInput(input) {
+  if (!input)
+    return null;
+  const addMatch = /\*\*\* Add File:\s*(.+)/.exec(input);
+  if (addMatch?.[1]) {
+    return { kind: "add", path: addMatch[1].trim() };
+  }
+  const updateMatch = /\*\*\* Update File:\s*(.+)/.exec(input);
+  if (updateMatch?.[1]) {
+    return { kind: "update", path: updateMatch[1].trim() };
+  }
+  const deleteMatch = /\*\*\* Delete File:\s*(.+)/.exec(input);
+  if (deleteMatch?.[1]) {
+    return { kind: "delete", path: deleteMatch[1].trim() };
+  }
+  return null;
+}
+function parsePatchOperations(input) {
+  if (!input)
+    return [];
+  const lines = input.split(/\r?\n/);
+  const beginIdx = lines.findIndex((l) => l.trim() === "*** Begin Patch");
+  const endIdx = lines.findIndex((l) => l.trim() === "*** End Patch");
+  const startIdx = beginIdx === -1 ? 0 : beginIdx + 1;
+  const stopIdx = endIdx === -1 ? lines.length : endIdx;
+  const operations = [];
+  let i = startIdx;
+  while (i < stopIdx) {
+    const line = lines[i]?.trim();
+    if (!line) {
+      i++;
+      continue;
+    }
+    if (line.startsWith("*** Add File:")) {
+      const path17 = line.replace("*** Add File:", "").trim();
+      i++;
+      const contentLines = [];
+      const patchLines = [];
+      while (i < stopIdx) {
+        const raw = lines[i];
+        if (raw === undefined || raw.startsWith("*** "))
+          break;
+        patchLines.push(raw);
+        if (raw.startsWith("+")) {
+          contentLines.push(raw.slice(1));
+        }
+        i++;
+      }
+      operations.push({
+        kind: "add",
+        path: path17,
+        content: contentLines.join(`
+`),
+        patchLines
+      });
+      continue;
+    }
+    if (line.startsWith("*** Update File:")) {
+      const path17 = line.replace("*** Update File:", "").trim();
+      i++;
+      if (i < stopIdx && lines[i]?.startsWith("*** Move to:")) {
+        i++;
+      }
+      const oldParts = [];
+      const newParts = [];
+      const patchLines = [];
+      while (i < stopIdx) {
+        const hLine = lines[i];
+        if (hLine === undefined || hLine.startsWith("*** "))
+          break;
+        patchLines.push(hLine);
+        if (hLine.startsWith("@@")) {
+          i++;
+          continue;
+        }
+        if (hLine === "") {
+          oldParts.push("");
+          newParts.push("");
+        } else {
+          const prefix = hLine[0];
+          const text = hLine.slice(1);
+          if (prefix === " ") {
+            oldParts.push(text);
+            newParts.push(text);
+          } else if (prefix === "-") {
+            oldParts.push(text);
+          } else if (prefix === "+") {
+            newParts.push(text);
+          }
+        }
+        i++;
+      }
+      operations.push({
+        kind: "update",
+        path: path17,
+        oldString: oldParts.join(`
+`),
+        newString: newParts.join(`
+`),
+        patchLines
+      });
+      continue;
+    }
+    if (line.startsWith("*** Delete File:")) {
+      const path17 = line.replace("*** Delete File:", "").trim();
+      operations.push({ kind: "delete", path: path17 });
+      i++;
+      continue;
+    }
+    i++;
+  }
+  return operations;
+}
+function formatArgsDisplay(argsJson, toolName) {
+  let parsed = {};
+  let display = "…";
+  try {
+    if (argsJson?.trim()) {
+      const p = JSON.parse(argsJson);
+      if (isRecord4(p)) {
+        const clone = { ...p };
+        if ("request_heartbeat" in clone)
+          delete clone.request_heartbeat;
+        parsed = clone;
+        if (toolName) {
+          if (isPatchTool(toolName) && typeof parsed.input === "string") {
+            const patchInfo = parsePatchInput(parsed.input);
+            if (patchInfo) {
+              display = formatDisplayPath(patchInfo.path);
+              return { display, parsed };
+            }
+            display = "…";
+            return { display, parsed };
+          }
+          if (isFileEditTool(toolName) && parsed.file_path) {
+            const filePath = String(parsed.file_path);
+            display = formatDisplayPath(filePath);
+            return { display, parsed };
+          }
+          if (isFileWriteTool(toolName) && parsed.file_path) {
+            const filePath = String(parsed.file_path);
+            display = formatDisplayPath(filePath);
+            return { display, parsed };
+          }
+          if (isFileReadTool(toolName) && parsed.file_path) {
+            const filePath = String(parsed.file_path);
+            const relativePath = formatDisplayPath(filePath);
+            const otherArgs = [];
+            for (const [k, v] of Object.entries(parsed)) {
+              if (k === "file_path")
+                continue;
+              if (v === undefined || v === null)
+                continue;
+              if (typeof v === "boolean" || typeof v === "number") {
+                otherArgs.push(`${k}=${v}`);
+              } else if (typeof v === "string" && v.length <= 30) {
+                otherArgs.push(`${k}="${v}"`);
+              }
+            }
+            if (otherArgs.length > 0) {
+              display = `${relativePath}, ${otherArgs.join(", ")}`;
+            } else {
+              display = relativePath;
+            }
+            return { display, parsed };
+          }
+          if (isShellTool(toolName) && parsed.command) {
+            if (Array.isArray(parsed.command)) {
+              const cmd = parsed.command;
+              if (cmd.length >= 3 && (cmd[0] === "bash" || cmd[0] === "sh") && (cmd[1] === "-c" || cmd[1] === "-lc")) {
+                display = cmd.slice(2).join(" ");
+              } else {
+                display = cmd.join(" ");
+              }
+            } else {
+              display = String(parsed.command);
+            }
+            return { display, parsed };
+          }
+        }
+        const keys = Object.keys(parsed);
+        const firstKey = keys[0];
+        if (keys.length === 1 && firstKey && [
+          "query",
+          "path",
+          "file_path",
+          "target_file",
+          "target_directory",
+          "command",
+          "label",
+          "pattern"
+        ].includes(firstKey)) {
+          const v = parsed[firstKey];
+          display = typeof v === "string" ? v : String(v);
+        } else {
+          display = Object.entries(parsed).map(([k, v]) => {
+            if (v === undefined || v === null)
+              return `${k}=${v}`;
+            if (typeof v === "boolean" || typeof v === "number")
+              return `${k}=${v}`;
+            if (typeof v === "string")
+              return v.length > 50 ? `${k}=…` : `${k}="${v}"`;
+            if (Array.isArray(v))
+              return `${k}=[${v.length} items]`;
+            if (typeof v === "object")
+              return `${k}={${Object.keys(v).length} props}`;
+            const str = JSON.stringify(v);
+            return str.length > 50 ? `${k}=…` : `${k}=${str}`;
+          }).join(", ");
+        }
+      }
+    }
+  } catch {
+    try {
+      const s = argsJson || "";
+      const fp = /"file_path"\s*:\s*"([^"]+)"/.exec(s);
+      const old = /"old_string"\s*:\s*"([\s\S]*?)"\s*(,|\})/.exec(s);
+      const neu = /"new_string"\s*:\s*"([\s\S]*?)"\s*(,|\})/.exec(s);
+      const cont = /"content"\s*:\s*"([\s\S]*?)"\s*(,|\})/.exec(s);
+      const parts = [];
+      if (fp)
+        parts.push(`file_path="${fp[1]}"`);
+      if (old)
+        parts.push(`old_string=…`);
+      if (neu)
+        parts.push(`new_string=…`);
+      if (cont)
+        parts.push(`content=…`);
+      if (parts.length)
+        display = parts.join(", ");
+    } catch {}
+  }
+  return { display, parsed };
+}
+var isRecord4 = (v) => typeof v === "object" && v !== null;
+var init_formatArgsDisplay = () => {};
+
 // src/cli/helpers/pasteRegistry.ts
 function allocatePaste(content) {
   const id = nextId++;
@@ -53151,12 +53572,12 @@ var init_pasteRegistry = __esm(() => {
 });
 
 // src/cli/components/DiffRenderer.tsx
-import { relative as relative2 } from "node:path";
-function formatRelativePath(filePath) {
+import { relative as relative3 } from "node:path";
+function formatDisplayPath2(filePath) {
   const cwd2 = process.cwd();
-  const relativePath = relative2(cwd2, filePath);
-  if (!relativePath.startsWith("..")) {
-    return `./${relativePath}`;
+  const relativePath = relative3(cwd2, filePath);
+  if (relativePath.startsWith("..")) {
+    return filePath;
   }
   return relativePath;
 }
@@ -53170,84 +53591,158 @@ function DiffLine({
   lineNumber,
   type,
   content,
-  compareContent
+  compareContent,
+  columns,
+  showLineNumbers = true
 }) {
   const prefix = type === "add" ? "+" : "-";
   const lineBg = type === "add" ? colors.diff.addedLineBg : colors.diff.removedLineBg;
   const wordBg = type === "add" ? colors.diff.addedWordBg : colors.diff.removedWordBg;
+  const gutterWidth = 4;
+  const contentWidth = Math.max(0, columns - gutterWidth);
+  const linePrefix = showLineNumbers ? `${lineNumber} ${prefix}  ` : `${prefix} `;
   if (compareContent !== undefined && content.trim() && compareContent.trim()) {
     const wordDiffs = type === "add" ? diffWords(compareContent, content) : diffWords(content, compareContent);
     return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+      flexDirection: "row",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-          children: " "
-        }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-          backgroundColor: lineBg,
-          color: colors.diff.textOnDark,
-          children: `${lineNumber} ${prefix}  `
+        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+          width: gutterWidth,
+          flexShrink: 0,
+          children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+            children: "    "
+          }, undefined, false, undefined, this)
         }, undefined, false, undefined, this),
-        wordDiffs.map((part, i) => {
-          if (part.added && type === "add") {
-            return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-              backgroundColor: wordBg,
-              color: colors.diff.textOnHighlight,
-              children: part.value
-            }, `word-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
-          } else if (part.removed && type === "remove") {
-            return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-              backgroundColor: wordBg,
-              color: colors.diff.textOnHighlight,
-              children: part.value
-            }, `word-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
-          } else if (!part.added && !part.removed) {
-            return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-              backgroundColor: lineBg,
-              color: colors.diff.textOnDark,
-              children: part.value
-            }, `word-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
-          }
-          return null;
-        })
+        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+          flexGrow: 1,
+          width: contentWidth,
+          children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+            wrap: "wrap",
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                backgroundColor: lineBg,
+                color: colors.diff.textOnDark,
+                children: linePrefix
+              }, undefined, false, undefined, this),
+              wordDiffs.map((part, i) => {
+                if (part.added && type === "add") {
+                  return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                    backgroundColor: wordBg,
+                    color: colors.diff.textOnHighlight,
+                    children: part.value
+                  }, `word-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
+                } else if (part.removed && type === "remove") {
+                  return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                    backgroundColor: wordBg,
+                    color: colors.diff.textOnHighlight,
+                    children: part.value
+                  }, `word-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
+                } else if (!part.added && !part.removed) {
+                  return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                    backgroundColor: lineBg,
+                    color: colors.diff.textOnDark,
+                    children: part.value
+                  }, `word-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
+                }
+                return null;
+              })
+            ]
+          }, undefined, true, undefined, this)
+        }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this);
   }
   return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+    flexDirection: "row",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-        children: " "
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        width: gutterWidth,
+        flexShrink: 0,
+        children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+          children: "    "
+        }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-        backgroundColor: lineBg,
-        color: colors.diff.textOnDark,
-        children: `${lineNumber} ${prefix}  ${content}`
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        flexGrow: 1,
+        width: contentWidth,
+        children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+          backgroundColor: lineBg,
+          color: colors.diff.textOnDark,
+          wrap: "wrap",
+          children: `${linePrefix}${content}`
+        }, undefined, false, undefined, this)
       }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
 function WriteRenderer({ filePath, content }) {
-  const relativePath = formatRelativePath(filePath);
+  const columns = useTerminalWidth();
+  const relativePath = formatDisplayPath2(filePath);
   const lines = content.split(`
 `);
   const lineCount = lines.length;
+  const gutterWidth = 4;
+  const contentWidth = Math.max(0, columns - gutterWidth);
   return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        flexDirection: "row",
         children: [
-          " ",
-          "⎿ Wrote ",
-          lineCount,
-          " line",
-          lineCount !== 1 ? "s" : "",
-          " to ",
-          relativePath
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            width: gutterWidth,
+            flexShrink: 0,
+            children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              children: [
+                "  ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  dimColor: true,
+                  children: "⎿"
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            flexGrow: 1,
+            width: contentWidth,
+            children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              wrap: "wrap",
+              children: [
+                "Wrote ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  bold: true,
+                  children: lineCount
+                }, undefined, false, undefined, this),
+                " line",
+                lineCount !== 1 ? "s" : "",
+                " to ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  bold: true,
+                  children: relativePath
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
+          }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      lines.map((line, i) => /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+      lines.map((line, i) => /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        flexDirection: "row",
         children: [
-          " ",
-          line
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            width: gutterWidth,
+            flexShrink: 0,
+            children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              children: "    "
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            flexGrow: 1,
+            width: contentWidth,
+            children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              wrap: "wrap",
+              children: line
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this)
         ]
       }, `line-${i}-${line.substring(0, 20)}`, true, undefined, this))
     ]
@@ -53256,9 +53751,11 @@ function WriteRenderer({ filePath, content }) {
 function EditRenderer({
   filePath,
   oldString,
-  newString
+  newString,
+  showLineNumbers = true
 }) {
-  const relativePath = formatRelativePath(filePath);
+  const columns = useTerminalWidth();
+  const relativePath = formatDisplayPath2(filePath);
   const oldLines = oldString.split(`
 `);
   const newLines = newString.split(`
@@ -53266,63 +53763,142 @@ function EditRenderer({
   const additions = newLines.length;
   const removals = oldLines.length;
   const singleLineEdit = oldLines.length === 1 && newLines.length === 1;
+  const gutterWidth = 4;
+  const contentWidth = Math.max(0, columns - gutterWidth);
   return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        flexDirection: "row",
         children: [
-          " ",
-          "⎿ Updated ",
-          relativePath,
-          " with ",
-          additions,
-          " addition",
-          additions !== 1 ? "s" : "",
-          " and ",
-          removals,
-          " removal",
-          removals !== 1 ? "s" : ""
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            width: gutterWidth,
+            flexShrink: 0,
+            children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              children: [
+                "  ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  dimColor: true,
+                  children: "⎿"
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            flexGrow: 1,
+            width: contentWidth,
+            children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              wrap: "wrap",
+              children: [
+                "Updated ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  bold: true,
+                  children: relativePath
+                }, undefined, false, undefined, this),
+                " with",
+                " ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  bold: true,
+                  children: additions
+                }, undefined, false, undefined, this),
+                " addition",
+                additions !== 1 ? "s" : "",
+                " and ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  bold: true,
+                  children: removals
+                }, undefined, false, undefined, this),
+                " ",
+                "removal",
+                removals !== 1 ? "s" : ""
+              ]
+            }, undefined, true, undefined, this)
+          }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
       oldLines.map((line, i) => /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(DiffLine, {
         lineNumber: i + 1,
         type: "remove",
         content: line,
-        compareContent: singleLineEdit ? newLines[0] : undefined
+        compareContent: singleLineEdit ? newLines[0] : undefined,
+        columns,
+        showLineNumbers
       }, `old-${i}-${line.substring(0, 20)}`, false, undefined, this)),
       newLines.map((line, i) => /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(DiffLine, {
         lineNumber: i + 1,
         type: "add",
         content: line,
-        compareContent: singleLineEdit ? oldLines[0] : undefined
+        compareContent: singleLineEdit ? oldLines[0] : undefined,
+        columns,
+        showLineNumbers
       }, `new-${i}-${line.substring(0, 20)}`, false, undefined, this))
     ]
   }, undefined, true, undefined, this);
 }
-function MultiEditRenderer({ filePath, edits }) {
-  const relativePath = formatRelativePath(filePath);
+function MultiEditRenderer({
+  filePath,
+  edits,
+  showLineNumbers = true
+}) {
+  const columns = useTerminalWidth();
+  const relativePath = formatDisplayPath2(filePath);
   let totalAdditions = 0;
   let totalRemovals = 0;
   edits.forEach((edit2) => {
     totalAdditions += countLines(edit2.new_string);
     totalRemovals += countLines(edit2.old_string);
   });
+  const gutterWidth = 4;
+  const contentWidth = Math.max(0, columns - gutterWidth);
   return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        flexDirection: "row",
         children: [
-          " ",
-          "⎿ Updated ",
-          relativePath,
-          " with ",
-          totalAdditions,
-          " addition",
-          totalAdditions !== 1 ? "s" : "",
-          " and ",
-          totalRemovals,
-          " removal",
-          totalRemovals !== 1 ? "s" : ""
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            width: gutterWidth,
+            flexShrink: 0,
+            children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              children: [
+                "  ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  dimColor: true,
+                  children: "⎿"
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            flexGrow: 1,
+            width: contentWidth,
+            children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              wrap: "wrap",
+              children: [
+                "Updated ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  bold: true,
+                  children: relativePath
+                }, undefined, false, undefined, this),
+                " with",
+                " ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  bold: true,
+                  children: totalAdditions
+                }, undefined, false, undefined, this),
+                " addition",
+                totalAdditions !== 1 ? "s" : "",
+                " and",
+                " ",
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  bold: true,
+                  children: totalRemovals
+                }, undefined, false, undefined, this),
+                " removal",
+                totalRemovals !== 1 ? "s" : ""
+              ]
+            }, undefined, true, undefined, this)
+          }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
       edits.map((edit2, index) => {
@@ -53338,13 +53914,17 @@ function MultiEditRenderer({ filePath, edits }) {
               lineNumber: i + 1,
               type: "remove",
               content: line,
-              compareContent: singleLineEdit && i === 0 ? newLines[0] : undefined
+              compareContent: singleLineEdit && i === 0 ? newLines[0] : undefined,
+              columns,
+              showLineNumbers
             }, `old-${index}-${i}-${line.substring(0, 20)}`, false, undefined, this)),
             newLines.map((line, i) => /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(DiffLine, {
               lineNumber: i + 1,
               type: "add",
               content: line,
-              compareContent: singleLineEdit && i === 0 ? oldLines[0] : undefined
+              compareContent: singleLineEdit && i === 0 ? oldLines[0] : undefined,
+              columns,
+              showLineNumbers
             }, `new-${index}-${i}-${line.substring(0, 20)}`, false, undefined, this))
           ]
         }, `edit-${index}-${edit2.old_string.substring(0, 20)}-${edit2.new_string.substring(0, 20)}`, true, undefined, this);
@@ -53355,62 +53935,77 @@ function MultiEditRenderer({ filePath, edits }) {
 var jsx_dev_runtime5;
 var init_DiffRenderer = __esm(async () => {
   init_libesm();
+  init_useTerminalWidth();
   init_colors();
   await init_build2();
   jsx_dev_runtime5 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
 // src/cli/components/AdvancedDiffRenderer.tsx
-import { relative as relative3 } from "node:path";
-function formatRelativePath2(filePath) {
+import { relative as relative4 } from "node:path";
+function formatRelativePath(filePath) {
   const cwd2 = process.cwd();
-  const relativePath = relative3(cwd2, filePath);
+  const relativePath = relative4(cwd2, filePath);
   return relativePath.startsWith("..") ? relativePath : `./${relativePath}`;
 }
 function padLeft(n, width) {
   const s = String(n);
   return s.length >= width ? s : " ".repeat(width - s.length) + s;
 }
+function wordSimilarity(a, b) {
+  const wordsA = new Set(a.toLowerCase().split(/\s+/).filter(Boolean));
+  const wordsB = new Set(b.toLowerCase().split(/\s+/).filter(Boolean));
+  if (wordsA.size === 0 && wordsB.size === 0)
+    return 1;
+  if (wordsA.size === 0 || wordsB.size === 0)
+    return 0;
+  const intersection = [...wordsA].filter((w) => wordsB.has(w)).length;
+  const union = new Set([...wordsA, ...wordsB]).size;
+  return intersection / union;
+}
 function Line({
   kind,
   displayNo,
   text,
   pairText,
   gutterWidth,
-  contentWidth,
+  columns,
   enableWord
 }) {
   const symbol = kind === "add" ? "+" : kind === "remove" ? "-" : " ";
   const symbolColor = kind === "add" ? colors.diff.symbolAdd : kind === "remove" ? colors.diff.symbolRemove : colors.diff.symbolContext;
   const bgLine = kind === "add" ? colors.diff.addedLineBg : kind === "remove" ? colors.diff.removedLineBg : colors.diff.contextLineBg;
   const bgWord = kind === "add" ? colors.diff.addedWordBg : kind === "remove" ? colors.diff.removedWordBg : undefined;
-  const charParts = enableWord && pairText && (kind === "add" || kind === "remove") && pairText !== text ? kind === "add" ? diffChars(pairText, text) : diffChars(text, pairText) : null;
-  const textWidth = Math.max(0, contentWidth - gutterWidth - 2);
+  const similarity = enableWord && pairText ? wordSimilarity(text, pairText) : 0;
+  const charParts = enableWord && pairText && (kind === "add" || kind === "remove") && pairText !== text && similarity >= WORD_SIMILARITY_THRESHOLD ? kind === "add" ? diffWordsWithSpace(pairText, text) : diffWordsWithSpace(text, pairText) : null;
+  const linePrefix = `${padLeft(displayNo, gutterWidth)} ${symbol} `;
+  const prefixWidth = linePrefix.length;
+  const contentWidth = Math.max(0, columns - prefixWidth);
   return /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
-    width: contentWidth,
+    flexDirection: "row",
     children: [
       /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
-        width: gutterWidth,
+        width: prefixWidth,
+        flexShrink: 0,
         children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
-          dimColor: true,
-          children: padLeft(displayNo, gutterWidth)
-        }, undefined, false, undefined, this)
+          dimColor: kind === "context",
+          children: [
+            padLeft(displayNo, gutterWidth),
+            " ",
+            /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+              color: symbolColor,
+              children: symbol
+            }, undefined, false, undefined, this),
+            " "
+          ]
+        }, undefined, true, undefined, this)
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
-        width: 2,
-        children: [
-          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
-            color: symbolColor,
-            children: symbol
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
-            children: " "
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
-        width: textWidth,
+        flexGrow: 1,
+        width: contentWidth,
         children: charParts ? /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+          wrap: "wrap",
+          backgroundColor: bgLine,
           children: charParts.map((p, i) => {
             if (kind === "remove") {
               if (p.removed)
@@ -53443,11 +54038,11 @@ function Line({
               return null;
             }
             return /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
-              backgroundColor: bgLine,
               children: p.value
             }, `context-${i}-${p.value.substring(0, 10)}`, false, undefined, this);
           })
         }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+          wrap: "wrap",
           backgroundColor: bgLine,
           color: kind === "context" ? undefined : colors.diff.textOnDark,
           children: text
@@ -53507,19 +54102,39 @@ function AdvancedDiffRenderer(props) {
     }, undefined, false, undefined, this);
   }
   if (result.mode === "unpreviewable") {
+    const gutterWidth2 = 4;
     return /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
-      flexDirection: "column",
-      children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
-        dimColor: true,
-        children: [
-          " ⎿ Cannot preview changes: ",
-          result.reason
-        ]
-      }, undefined, true, undefined, this)
-    }, undefined, false, undefined, this);
+      flexDirection: "row",
+      children: [
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+          width: gutterWidth2,
+          flexShrink: 0,
+          children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+            children: [
+              "  ",
+              /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                dimColor: true,
+                children: "⎿"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this)
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+          flexGrow: 1,
+          children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+            wrap: "wrap",
+            dimColor: true,
+            children: [
+              "Cannot preview changes: ",
+              result.reason
+            ]
+          }, undefined, true, undefined, this)
+        }, undefined, false, undefined, this)
+      ]
+    }, undefined, true, undefined, this);
   }
   const { hunks } = result;
-  const relative4 = formatRelativePath2(props.filePath);
+  const relative5 = formatRelativePath(props.filePath);
   const enableWord = props.kind !== "multi_edit";
   const rows = [];
   for (const h of hunks) {
@@ -53597,36 +54212,151 @@ function AdvancedDiffRenderer(props) {
   }
   const maxDisplayNo = rows.reduce((m, r) => Math.max(m, r.displayNo), 1);
   const gutterWidth = String(maxDisplayNo).length;
-  const header = props.kind === "write" ? `Wrote changes to ${relative4}` : `Updated ${relative4}`;
-  const panelInnerWidth = Math.max(20, columns - 8);
+  const header = props.kind === "write" ? `Wrote changes to ${relative5}` : `Updated ${relative5}`;
+  if (rows.length === 0) {
+    const noChangesGutter = 4;
+    return /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+      flexDirection: "column",
+      children: [
+        showHeader ? /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+          flexDirection: "row",
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+              width: noChangesGutter,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                children: [
+                  "  ",
+                  /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                    dimColor: true,
+                    children: "⎿"
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+              flexGrow: 1,
+              children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                wrap: "wrap",
+                children: header
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this) : null,
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+          flexDirection: "row",
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+              width: noChangesGutter,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                children: "    "
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+              flexGrow: 1,
+              children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                dimColor: true,
+                children: [
+                  "No changes to ",
+                  /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                    bold: true,
+                    children: relative5
+                  }, undefined, false, undefined, this),
+                  " (file content identical)"
+                ]
+              }, undefined, true, undefined, this)
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this)
+      ]
+    }, undefined, true, undefined, this);
+  }
+  const toolResultGutter = 4;
   return /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
     flexDirection: "column",
-    width: panelInnerWidth,
     children: [
       showHeader ? /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(jsx_dev_runtime6.Fragment, {
         children: [
-          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
-            children: header
+          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+            flexDirection: "row",
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+                width: toolResultGutter,
+                flexShrink: 0,
+                children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                  children: [
+                    "  ",
+                    /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                      dimColor: true,
+                      children: "⎿"
+                    }, undefined, false, undefined, this)
+                  ]
+                }, undefined, true, undefined, this)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+                flexGrow: 1,
+                children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                  wrap: "wrap",
+                  children: header
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+            flexDirection: "row",
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+                width: toolResultGutter,
+                flexShrink: 0,
+                children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                  children: "    "
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+                flexGrow: 1,
+                children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+                  dimColor: true,
+                  children: `Showing ~${ADV_DIFF_CONTEXT_LINES} context line${ADV_DIFF_CONTEXT_LINES === 1 ? "" : "s"}`
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this) : null,
+      rows.map((r, idx) => showHeader ? /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+        flexDirection: "row",
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+            width: toolResultGutter,
+            flexShrink: 0,
+            children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+              children: "    "
+            }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
-            dimColor: true,
-            children: `Showing ~${ADV_DIFF_CONTEXT_LINES} context line${ADV_DIFF_CONTEXT_LINES === 1 ? "" : "s"}`
+          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Line, {
+            kind: r.kind,
+            displayNo: r.displayNo,
+            text: r.text,
+            pairText: r.pairText,
+            gutterWidth,
+            columns: columns - toolResultGutter,
+            enableWord
           }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this) : null,
-      rows.map((r, idx) => /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Line, {
+      }, `row-${idx}-${r.kind}-${r.displayNo || idx}`, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Line, {
         kind: r.kind,
         displayNo: r.displayNo,
         text: r.text,
         pairText: r.pairText,
         gutterWidth,
-        contentWidth: panelInnerWidth,
+        columns,
         enableWord
       }, `row-${idx}-${r.kind}-${r.displayNo || idx}`, false, undefined, this))
     ]
   }, undefined, true, undefined, this);
 }
-var import_react27, jsx_dev_runtime6;
+var import_react27, jsx_dev_runtime6, WORD_SIMILARITY_THRESHOLD = 0.3;
 var init_AdvancedDiffRenderer = __esm(async () => {
   init_libesm();
   init_diff2();
@@ -54327,7 +55057,9 @@ var import_react30, jsx_dev_runtime8, OptionsRenderer, DynamicPreview = ({
   toolName,
   toolArgs,
   parsedArgs,
-  precomputedDiff
+  precomputedDiff,
+  allDiffs,
+  toolCallId
 }) => {
   const t = toolName.toLowerCase();
   if (t === "bash" || t === "shell_command" || t === "shellcommand" || t === "run_shell_command" || t === "runshellcommand") {
@@ -54430,13 +55162,91 @@ var import_react30, jsx_dev_runtime8, OptionsRenderer, DynamicPreview = ({
   }
   if (t === "apply_patch" || t === "applypatch") {
     const inputVal = parsedArgs?.input;
-    const patchPreview = typeof inputVal === "string" && inputVal.length > 100 ? `${inputVal.slice(0, 100)}...` : typeof inputVal === "string" ? inputVal : "(no patch content)";
+    if (typeof inputVal === "string") {
+      const operations = parsePatchOperations(inputVal);
+      if (operations.length > 0) {
+        const { relative: relative5 } = __require("node:path");
+        const cwd2 = process.cwd();
+        return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
+          flexDirection: "column",
+          paddingLeft: 2,
+          children: operations.map((op, idx) => {
+            const relPath = relative5(cwd2, op.path);
+            const displayPath = relPath.startsWith("..") ? op.path : relPath;
+            const diffKey = toolCallId ? `${toolCallId}:${op.path}` : undefined;
+            const opDiff = diffKey ? allDiffs.get(diffKey) : undefined;
+            if (op.kind === "add") {
+              return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
+                flexDirection: "column",
+                children: [
+                  idx > 0 && /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
+                    height: 1
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
+                    dimColor: true,
+                    children: displayPath
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(AdvancedDiffRenderer, {
+                    precomputed: opDiff,
+                    kind: "write",
+                    filePath: op.path,
+                    content: op.content,
+                    showHeader: false
+                  }, undefined, false, undefined, this)
+                ]
+              }, `patch-add-${op.path}`, true, undefined, this);
+            }
+            if (op.kind === "update") {
+              return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
+                flexDirection: "column",
+                children: [
+                  idx > 0 && /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
+                    height: 1
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
+                    dimColor: true,
+                    children: displayPath
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(AdvancedDiffRenderer, {
+                    precomputed: opDiff,
+                    kind: "edit",
+                    filePath: op.path,
+                    oldString: op.oldString,
+                    newString: op.newString,
+                    showHeader: false
+                  }, undefined, false, undefined, this)
+                ]
+              }, `patch-update-${op.path}`, true, undefined, this);
+            }
+            if (op.kind === "delete") {
+              return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
+                flexDirection: "column",
+                children: [
+                  idx > 0 && /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
+                    height: 1
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
+                    dimColor: true,
+                    children: displayPath
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
+                    color: "red",
+                    children: "File will be deleted"
+                  }, undefined, false, undefined, this)
+                ]
+              }, `patch-delete-${op.path}`, true, undefined, this);
+            }
+            return null;
+          })
+        }, undefined, false, undefined, this);
+      }
+    }
     return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
       flexDirection: "column",
       paddingLeft: 2,
       children: /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
         dimColor: true,
-        children: patchPreview
+        children: typeof inputVal === "string" && inputVal.length > 100 ? `${inputVal.slice(0, 100)}...` : typeof inputVal === "string" ? inputVal : "(no patch content)"
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this);
   }
@@ -54637,6 +55447,7 @@ var import_react30, jsx_dev_runtime8, OptionsRenderer, DynamicPreview = ({
 }, ApprovalDialog;
 var init_ApprovalDialogRich = __esm(async () => {
   init_diff2();
+  init_formatArgsDisplay();
   init_pasteRegistry();
   init_colors();
   await __promiseAll([
@@ -54704,22 +55515,6 @@ var init_ApprovalDialogRich = __esm(async () => {
       setIsEnteringReason(false);
       setDenyReason("");
     }, [progress?.current]);
-    const options = import_react30.useMemo(() => {
-      const approvalLabel = progress && progress.total > 1 ? "Yes, approve this tool" : "Yes, just this once";
-      const opts = [{ label: approvalLabel, action: onApproveAll }];
-      if (approvalContext?.allowPersistence) {
-        opts.push({
-          label: approvalContext.approveAlwaysText,
-          action: () => onApproveAlways(approvalContext.defaultScope === "user" ? "session" : approvalContext.defaultScope)
-        });
-      }
-      const denyLabel = progress && progress.total > 1 ? "No, deny this tool (esc)" : "No, and tell Letta what to do differently (esc)";
-      opts.push({
-        label: denyLabel,
-        action: () => {}
-      });
-      return opts;
-    }, [progress, approvalContext, onApproveAll, onApproveAlways]);
     use_input_default((_input, key) => {
       if (isExecuting)
         return;
@@ -54804,10 +55599,134 @@ var init_ApprovalDialogRich = __esm(async () => {
       }
       return null;
     }, [approvalRequest, parsedArgs]);
+    const allDiffs = import_react30.useMemo(() => {
+      const diffs = new Map;
+      const toolCallId = approvalRequest?.toolCallId;
+      if (!toolCallId)
+        return diffs;
+      if (precomputedDiff) {
+        diffs.set(toolCallId, precomputedDiff);
+        return diffs;
+      }
+      const t = approvalRequest.toolName.toLowerCase();
+      if ((t === "apply_patch" || t === "applypatch") && parsedArgs?.input) {
+        const operations = parsePatchOperations(parsedArgs.input);
+        for (const op of operations) {
+          const key = `${toolCallId}:${op.path}`;
+          if (op.kind === "add" || op.kind === "update") {
+            const result = parsePatchToAdvancedDiff(op.patchLines, op.path);
+            if (result) {
+              diffs.set(key, result);
+            }
+          }
+        }
+      }
+      return diffs;
+    }, [approvalRequest, parsedArgs, precomputedDiff]);
+    const options = import_react30.useMemo(() => {
+      const approvalLabel = progress && progress.total > 1 ? "Yes, approve this tool" : "Yes, just this once";
+      const opts = [
+        {
+          label: approvalLabel,
+          action: () => onApproveAll(allDiffs.size > 0 ? allDiffs : undefined)
+        }
+      ];
+      if (approvalContext?.allowPersistence) {
+        opts.push({
+          label: approvalContext.approveAlwaysText,
+          action: () => onApproveAlways(approvalContext.defaultScope === "user" ? "session" : approvalContext.defaultScope, allDiffs.size > 0 ? allDiffs : undefined)
+        });
+      }
+      const denyLabel = progress && progress.total > 1 ? "No, deny this tool (esc)" : "No, and tell Letta Code what to do differently (esc)";
+      opts.push({
+        label: denyLabel,
+        action: () => {}
+      });
+      return opts;
+    }, [progress, approvalContext, onApproveAll, onApproveAlways, allDiffs]);
+    const headerLabel = import_react30.useMemo(() => {
+      if (!approvalRequest)
+        return "";
+      const t = approvalRequest.toolName.toLowerCase();
+      if (t === "apply_patch" || t === "applypatch") {
+        if (parsedArgs?.input && typeof parsedArgs.input === "string") {
+          const operations = parsePatchOperations(parsedArgs.input);
+          if (operations.length > 0) {
+            const isMulti = operations.length > 1;
+            const firstOp = operations[0];
+            if (firstOp?.kind === "add")
+              return isMulti ? "Write Files" : "Write File";
+            if (firstOp?.kind === "update")
+              return isMulti ? "Edit Files" : "Edit File";
+            if (firstOp?.kind === "delete")
+              return isMulti ? "Delete Files" : "Delete File";
+          }
+        }
+        return "Apply Patch";
+      }
+      if (t === "write" || t === "write_file" || t === "writefile" || t === "write_file_gemini" || t === "writefilegemini") {
+        const filePath = parsedArgs?.file_path;
+        if (filePath) {
+          try {
+            const { existsSync: existsSync10 } = __require("node:fs");
+            if (existsSync10(filePath)) {
+              return "Overwrite File";
+            }
+          } catch {}
+        }
+        return "Write File";
+      }
+      return getHeaderLabel(approvalRequest.toolName);
+    }, [approvalRequest, parsedArgs]);
+    const questionText = import_react30.useMemo(() => {
+      if (!approvalRequest || !parsedArgs) {
+        return { text: "Do you want to proceed?" };
+      }
+      const t = approvalRequest.toolName.toLowerCase();
+      if (t === "write" || t === "write_file" || t === "writefile" || t === "write_file_gemini" || t === "writefilegemini") {
+        const filePath = parsedArgs.file_path;
+        if (filePath) {
+          const { existsSync: existsSync10 } = __require("node:fs");
+          const { relative: relative5 } = __require("node:path");
+          const cwd2 = process.cwd();
+          const relPath = relative5(cwd2, filePath);
+          const displayPath = relPath.startsWith("..") ? filePath : relPath;
+          try {
+            if (existsSync10(filePath)) {
+              return { text: "Overwrite", boldPath: `${displayPath}?` };
+            }
+          } catch {}
+          return { text: "Write to", boldPath: `${displayPath}?` };
+        }
+      }
+      if ((t === "apply_patch" || t === "applypatch") && parsedArgs.input) {
+        const operations = parsePatchOperations(parsedArgs.input);
+        if (operations.length > 0) {
+          const { relative: relative5 } = __require("node:path");
+          const cwd2 = process.cwd();
+          const paths = operations.map((op) => {
+            const relPath = relative5(cwd2, op.path);
+            return relPath.startsWith("..") ? op.path : relPath;
+          });
+          if (paths.length === 1) {
+            const op = operations[0];
+            if (op?.kind === "add") {
+              return { text: "Write to", boldPath: `${paths[0]}?` };
+            } else if (op?.kind === "update") {
+              return { text: "Update", boldPath: `${paths[0]}?` };
+            } else if (op?.kind === "delete") {
+              return { text: "Delete", boldPath: `${paths[0]}?` };
+            }
+          } else {
+            return { text: "Apply patch to", boldPath: `${paths.length} files?` };
+          }
+        }
+      }
+      return { text: "Do you want to proceed?" };
+    }, [approvalRequest, parsedArgs]);
     if (!approvalRequest) {
       return null;
     }
-    const headerLabel = getHeaderLabel(approvalRequest.toolName);
     if (isEnteringReason) {
       return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
         flexDirection: "column",
@@ -54821,7 +55740,7 @@ var init_ApprovalDialogRich = __esm(async () => {
             children: [
               /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
                 bold: true,
-                children: "What should Letta do differently? (esc to cancel):"
+                children: "What should I do differently? (esc to cancel):"
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
                 height: 1
@@ -54883,15 +55802,28 @@ var init_ApprovalDialogRich = __esm(async () => {
               toolName: approvalRequest.toolName,
               toolArgs: approvalRequest.toolArgs,
               parsedArgs,
-              precomputedDiff
+              precomputedDiff,
+              allDiffs,
+              toolCallId: approvalRequest.toolCallId
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
               height: 1
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
               bold: true,
-              children: "Do you want to proceed?"
-            }, undefined, false, undefined, this),
+              children: [
+                questionText.text,
+                questionText.boldPath ? /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(jsx_dev_runtime8.Fragment, {
+                  children: [
+                    " ",
+                    /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
+                      bold: true,
+                      children: questionText.boldPath
+                    }, undefined, false, undefined, this)
+                  ]
+                }, undefined, true, undefined, this) : null
+              ]
+            }, undefined, true, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
               height: 1
             }, undefined, false, undefined, this),
@@ -55716,7 +56648,7 @@ function FeedbackDialog({
         children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
           color: colors.approval.header,
           bold: true,
-          children: "Send Feedback to Letta Team"
+          children: "Send Feedback to the Letta Team"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
@@ -59347,10 +60279,6 @@ function AgentInfoBar({
     children: [
       /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
         children: [
-          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-            color: "gray",
-            children: "Current agent: "
-          }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
             bold: true,
             children: agentName || "Unnamed"
@@ -59358,6 +60286,9 @@ function AgentInfoBar({
           isPinned ? /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
             color: "green",
             children: " (pinned ✓)"
+          }, undefined, false, undefined, this) : agentName === DEFAULT_AGENT_NAME || !agentName ? /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+            color: "gray",
+            children: " (type /pin to give your agent a real name!)"
           }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
             color: "gray",
             children: " (type /pin to pin agent)"
@@ -59410,6 +60341,7 @@ function AgentInfoBar({
 }
 var import_react40, jsx_dev_runtime19;
 var init_AgentInfoBar = __esm(async () => {
+  init_constants();
   init_settings_manager();
   init_colors();
   await __promiseAll([
@@ -59573,7 +60505,6 @@ function AutocompleteBox({ header, children }) {
     borderStyle: "round",
     borderColor: colors.command.border,
     paddingX: 1,
-    marginBottom: 1,
     children: [
       /* @__PURE__ */ jsx_dev_runtime20.jsxDEV(Text, {
         dimColor: true,
@@ -59891,7 +60822,7 @@ function SlashCommandAutocomplete({
   const showScrollUp = startIndex > 0;
   const showScrollDown = startIndex + VISIBLE_COMMANDS < totalMatches;
   return /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(AutocompleteBox, {
-    header: "↑↓ navigate, Tab autocomplete, Enter execute",
+    header: "↑↓ navigate, Tab to autocomplete, Enter to execute",
     children: [
       showScrollUp && /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
         dimColor: true,
@@ -59923,6 +60854,23 @@ function SlashCommandAutocomplete({
           totalMatches - startIndex - VISIBLE_COMMANDS,
           " more below"
         ]
+      }, undefined, true, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+        children: " "
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+        dimColor: true,
+        children: [
+          "Having issues? Report bugs with /feedback or",
+          " ",
+          /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(dist_default4, {
+            url: "https://discord.gg/letta",
+            children: /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+              color: colors.link.text,
+              children: "join our Discord ↗"
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this)
+        ]
       }, undefined, true, undefined, this)
     ]
   }, undefined, true, undefined, this);
@@ -59931,8 +60879,10 @@ var import_react43, jsx_dev_runtime22, VISIBLE_COMMANDS = 8, _allCommands;
 var init_SlashCommandAutocomplete = __esm(async () => {
   init_settings_manager();
   init_registry();
+  init_colors();
   await __promiseAll([
     init_build2(),
+    init_dist4(),
     init_useAutocompleteNavigation(),
     init_Autocomplete()
   ]);
@@ -64251,6 +65201,7 @@ function formatToolArgs(argsStr) {
 var import_react60, jsx_dev_runtime40, AgentRow, GroupHeader, SubagentGroupDisplay;
 var init_SubagentGroupDisplay = __esm(async () => {
   init_subagentState();
+  init_useTerminalWidth();
   init_colors();
   await __promiseAll([
     init_build2(),
@@ -64260,6 +65211,9 @@ var init_SubagentGroupDisplay = __esm(async () => {
   jsx_dev_runtime40 = __toESM(require_jsx_dev_runtime(), 1);
   AgentRow = import_react60.memo(({ agent, isLast, expanded }) => {
     const { treeChar, continueChar } = getTreeChars(isLast);
+    const columns = useTerminalWidth();
+    const gutterWidth = 6;
+    const contentWidth = Math.max(0, columns - gutterWidth);
     const getDotElement = () => {
       switch (agent.status) {
         case "pending":
@@ -64335,17 +65289,34 @@ var init_SubagentGroupDisplay = __esm(async () => {
         agent.agentURL && /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Box_default, {
           flexDirection: "row",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
-              color: colors.subagent.treeChar,
-              children: continueChar
+            /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Box_default, {
+              width: gutterWidth,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                children: [
+                  /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                    color: colors.subagent.treeChar,
+                    children: continueChar
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                    dimColor: true,
+                    children: " ⎿  "
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
-              dimColor: true,
-              children: [
-                " ⎿  Subagent: ",
-                agent.agentURL
-              ]
-            }, undefined, true, undefined, this)
+            /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                wrap: "wrap",
+                dimColor: true,
+                children: [
+                  "Subagent: ",
+                  agent.agentURL
+                ]
+              }, undefined, true, undefined, this)
+            }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
         expanded && agent.toolCalls.map((tc) => {
@@ -64372,32 +65343,72 @@ var init_SubagentGroupDisplay = __esm(async () => {
         }),
         /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Box_default, {
           flexDirection: "row",
-          children: [
-            /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
-              color: colors.subagent.treeChar,
-              children: continueChar
-            }, undefined, false, undefined, this),
-            agent.status === "completed" ? /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
-              dimColor: true,
-              children: " ⎿  Done"
-            }, undefined, false, undefined, this) : agent.status === "error" ? /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
-              color: colors.subagent.error,
-              children: [
-                " ⎿  ",
-                agent.error
-              ]
-            }, undefined, true, undefined, this) : lastTool ? /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
-              dimColor: true,
-              children: [
-                " ⎿  ",
-                lastTool.name
-              ]
-            }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
-              dimColor: true,
-              children: " ⎿  Starting..."
-            }, undefined, false, undefined, this)
-          ]
-        }, undefined, true, undefined, this)
+          children: agent.status === "completed" ? /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(jsx_dev_runtime40.Fragment, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                color: colors.subagent.treeChar,
+                children: continueChar
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                dimColor: true,
+                children: " ⎿  Done"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this) : agent.status === "error" ? /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(jsx_dev_runtime40.Fragment, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Box_default, {
+                width: gutterWidth,
+                flexShrink: 0,
+                children: /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                  children: [
+                    /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                      color: colors.subagent.treeChar,
+                      children: continueChar
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                      dimColor: true,
+                      children: " ⎿  "
+                    }, undefined, false, undefined, this)
+                  ]
+                }, undefined, true, undefined, this)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Box_default, {
+                flexGrow: 1,
+                width: contentWidth,
+                children: /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                  wrap: "wrap",
+                  color: colors.subagent.error,
+                  children: agent.error
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this) : lastTool ? /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(jsx_dev_runtime40.Fragment, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                color: colors.subagent.treeChar,
+                children: continueChar
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                dimColor: true,
+                children: [
+                  " ⎿  ",
+                  lastTool.name
+                ]
+              }, undefined, true, undefined, this)
+            ]
+          }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(jsx_dev_runtime40.Fragment, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                color: colors.subagent.treeChar,
+                children: continueChar
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime40.jsxDEV(Text, {
+                dimColor: true,
+                children: " ⎿  Starting..."
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this)
+        }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this);
   });
@@ -64467,12 +65478,16 @@ var init_SubagentGroupDisplay = __esm(async () => {
 // src/cli/components/SubagentGroupStatic.tsx
 var import_react61, jsx_dev_runtime41, AgentRow2, SubagentGroupStatic;
 var init_SubagentGroupStatic = __esm(async () => {
+  init_useTerminalWidth();
   init_colors();
   await init_build2();
   import_react61 = __toESM(require_react(), 1);
   jsx_dev_runtime41 = __toESM(require_jsx_dev_runtime(), 1);
   AgentRow2 = import_react61.memo(({ agent, isLast }) => {
     const { treeChar, continueChar } = getTreeChars(isLast);
+    const columns = useTerminalWidth();
+    const gutterWidth = 6;
+    const contentWidth = Math.max(0, columns - gutterWidth);
     const dotColor = agent.status === "completed" ? colors.subagent.completed : colors.subagent.error;
     const stats = formatStats(agent.toolCount, agent.totalTokens);
     return /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Box_default, {
@@ -64524,38 +65539,79 @@ var init_SubagentGroupStatic = __esm(async () => {
         agent.agentURL && /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Box_default, {
           flexDirection: "row",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
-              color: colors.subagent.treeChar,
-              children: continueChar
+            /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Box_default, {
+              width: gutterWidth,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                children: [
+                  /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                    color: colors.subagent.treeChar,
+                    children: continueChar
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                    dimColor: true,
+                    children: " ⎿  "
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
-              dimColor: true,
-              children: [
-                " ⎿  Subagent: ",
-                agent.agentURL
-              ]
-            }, undefined, true, undefined, this)
+            /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                wrap: "wrap",
+                dimColor: true,
+                children: [
+                  "Subagent: ",
+                  agent.agentURL
+                ]
+              }, undefined, true, undefined, this)
+            }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Box_default, {
           flexDirection: "row",
-          children: [
-            /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
-              color: colors.subagent.treeChar,
-              children: continueChar
-            }, undefined, false, undefined, this),
-            agent.status === "completed" ? /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
-              dimColor: true,
-              children: " ⎿  Done"
-            }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
-              color: colors.subagent.error,
-              children: [
-                " ⎿  ",
-                agent.error
-              ]
-            }, undefined, true, undefined, this)
-          ]
-        }, undefined, true, undefined, this)
+          children: agent.status === "completed" ? /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(jsx_dev_runtime41.Fragment, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                color: colors.subagent.treeChar,
+                children: continueChar
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                dimColor: true,
+                children: " ⎿  Done"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(jsx_dev_runtime41.Fragment, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Box_default, {
+                width: gutterWidth,
+                flexShrink: 0,
+                children: /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                  children: [
+                    /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                      color: colors.subagent.treeChar,
+                      children: continueChar
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                      dimColor: true,
+                      children: " ⎿  "
+                    }, undefined, false, undefined, this)
+                  ]
+                }, undefined, true, undefined, this)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Box_default, {
+                flexGrow: 1,
+                width: contentWidth,
+                children: /* @__PURE__ */ jsx_dev_runtime41.jsxDEV(Text, {
+                  wrap: "wrap",
+                  color: colors.subagent.error,
+                  children: agent.error
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this)
+        }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this);
   });
@@ -64865,185 +65921,12 @@ var init_SystemPromptSelector = __esm(async () => {
   jsx_dev_runtime43 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
-// src/cli/helpers/formatArgsDisplay.ts
-function formatArgsDisplay(argsJson) {
-  let parsed = {};
-  let display = "…";
-  try {
-    if (argsJson?.trim()) {
-      const p = JSON.parse(argsJson);
-      if (isRecord4(p)) {
-        const clone = { ...p };
-        if ("request_heartbeat" in clone)
-          delete clone.request_heartbeat;
-        parsed = clone;
-        const keys = Object.keys(parsed);
-        const firstKey = keys[0];
-        if (keys.length === 1 && firstKey && [
-          "query",
-          "path",
-          "file_path",
-          "target_file",
-          "target_directory",
-          "command",
-          "label",
-          "pattern"
-        ].includes(firstKey)) {
-          const v = parsed[firstKey];
-          display = typeof v === "string" ? v : String(v);
-        } else {
-          display = Object.entries(parsed).map(([k, v]) => {
-            if (v === undefined || v === null)
-              return `${k}=${v}`;
-            if (typeof v === "boolean" || typeof v === "number")
-              return `${k}=${v}`;
-            if (typeof v === "string")
-              return v.length > 50 ? `${k}=…` : `${k}="${v}"`;
-            if (Array.isArray(v))
-              return `${k}=[${v.length} items]`;
-            if (typeof v === "object")
-              return `${k}={${Object.keys(v).length} props}`;
-            const str = JSON.stringify(v);
-            return str.length > 50 ? `${k}=…` : `${k}=${str}`;
-          }).join(", ");
-        }
-      }
-    }
-  } catch {
-    try {
-      const s = argsJson || "";
-      const fp = /"file_path"\s*:\s*"([^"]+)"/.exec(s);
-      const old = /"old_string"\s*:\s*"([\s\S]*?)"\s*(,|\})/.exec(s);
-      const neu = /"new_string"\s*:\s*"([\s\S]*?)"\s*(,|\})/.exec(s);
-      const cont = /"content"\s*:\s*"([\s\S]*?)"\s*(,|\})/.exec(s);
-      const parts = [];
-      if (fp)
-        parts.push(`file_path="${fp[1]}"`);
-      if (old)
-        parts.push(`old_string=…`);
-      if (neu)
-        parts.push(`new_string=…`);
-      if (cont)
-        parts.push(`content=…`);
-      if (parts.length)
-        display = parts.join(", ");
-    } catch {}
-  }
-  return { display, parsed };
-}
-var isRecord4 = (v) => typeof v === "object" && v !== null;
-
-// src/cli/helpers/toolNameMapping.ts
-function getDisplayToolName(rawName) {
-  if (rawName === "write")
-    return "Write";
-  if (rawName === "edit" || rawName === "multi_edit")
-    return "Edit";
-  if (rawName === "read")
-    return "Read";
-  if (rawName === "bash")
-    return "Bash";
-  if (rawName === "grep")
-    return "Grep";
-  if (rawName === "glob")
-    return "Glob";
-  if (rawName === "ls")
-    return "LS";
-  if (rawName === "todo_write" || rawName === "TodoWrite")
-    return "TODO";
-  if (rawName === "EnterPlanMode" || rawName === "ExitPlanMode")
-    return "Planning";
-  if (rawName === "AskUserQuestion")
-    return "Question";
-  if (rawName === "update_plan")
-    return "Planning";
-  if (rawName === "shell_command" || rawName === "shell")
-    return "Shell";
-  if (rawName === "read_file")
-    return "Read";
-  if (rawName === "list_dir")
-    return "LS";
-  if (rawName === "grep_files")
-    return "Grep";
-  if (rawName === "apply_patch")
-    return "Patch";
-  if (rawName === "UpdatePlan")
-    return "Planning";
-  if (rawName === "ShellCommand" || rawName === "Shell")
-    return "Shell";
-  if (rawName === "ReadFile")
-    return "Read";
-  if (rawName === "ListDir")
-    return "LS";
-  if (rawName === "GrepFiles")
-    return "Grep";
-  if (rawName === "ApplyPatch")
-    return "Patch";
-  if (rawName === "run_shell_command")
-    return "Shell";
-  if (rawName === "read_file_gemini")
-    return "Read";
-  if (rawName === "list_directory")
-    return "LS";
-  if (rawName === "glob_gemini")
-    return "Glob";
-  if (rawName === "search_file_content")
-    return "Grep";
-  if (rawName === "write_file_gemini")
-    return "Write";
-  if (rawName === "write_todos")
-    return "TODO";
-  if (rawName === "read_many_files")
-    return "Read Multiple";
-  if (rawName === "RunShellCommand")
-    return "Shell";
-  if (rawName === "ReadFileGemini")
-    return "Read";
-  if (rawName === "ListDirectory")
-    return "LS";
-  if (rawName === "GlobGemini")
-    return "Glob";
-  if (rawName === "SearchFileContent")
-    return "Grep";
-  if (rawName === "WriteFileGemini")
-    return "Write";
-  if (rawName === "WriteTodos")
-    return "TODO";
-  if (rawName === "ReadManyFiles")
-    return "Read Multiple";
-  if (rawName === "Replace" || rawName === "replace")
-    return "Edit";
-  if (rawName === "WriteFile" || rawName === "write_file")
-    return "Write";
-  if (rawName === "KillBash")
-    return "Kill Shell";
-  if (rawName === "BashOutput")
-    return "Shell Output";
-  if (rawName === "MultiEdit")
-    return "Edit";
-  return rawName;
-}
-function isTaskTool(name) {
-  return name === "Task" || name === "task";
-}
-function isTodoTool(rawName, displayName) {
-  return rawName === "todo_write" || rawName === "TodoWrite" || rawName === "write_todos" || rawName === "WriteTodos" || displayName === "TODO";
-}
-function isPlanTool(rawName, displayName) {
-  return rawName === "update_plan" || rawName === "UpdatePlan" || displayName === "Planning";
-}
-function isFancyUITool(name) {
-  return name === "AskUserQuestion" || name === "EnterPlanMode" || name === "ExitPlanMode";
-}
-function isMemoryTool(name) {
-  return name === "memory" || name === "memory_apply_patch";
-}
-
 // src/cli/components/MemoryDiffRenderer.tsx
 function MemoryDiffRenderer({
   argsText,
   toolName
 }) {
+  const columns = useTerminalWidth();
   try {
     const args = JSON.parse(argsText);
     if (toolName === "memory_apply_patch") {
@@ -65051,7 +65934,8 @@ function MemoryDiffRenderer({
       const patch = args.patch || "";
       return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(PatchDiffRenderer, {
         label,
-        patch
+        patch,
+        columns
       }, undefined, false, undefined, this);
     }
     const command = args.command;
@@ -65064,41 +65948,73 @@ function MemoryDiffRenderer({
         return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(MemoryStrReplaceDiff, {
           blockName,
           oldStr,
-          newStr
+          newStr,
+          columns
         }, undefined, false, undefined, this);
       }
       case "insert": {
         const insertText = args.insert_text || "";
         const insertLine = args.insert_line;
+        const prefixWidth = 4;
+        const contentWidth = Math.max(0, columns - prefixWidth);
         return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
           flexDirection: "column",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              flexDirection: "row",
               children: [
-                "  ",
-                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                  dimColor: true,
-                  children: "⎿"
-                }, undefined, false, undefined, this),
-                " Inserted into memory block",
-                " ",
-                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                  color: colors.tool.memoryName,
-                  children: blockName
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                  width: prefixWidth,
+                  flexShrink: 0,
+                  children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    children: [
+                      "  ",
+                      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                        dimColor: true,
+                        children: "⎿"
+                      }, undefined, false, undefined, this)
+                    ]
+                  }, undefined, true, undefined, this)
                 }, undefined, false, undefined, this),
-                insertLine !== undefined && ` at line ${insertLine}`
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                  flexGrow: 1,
+                  width: contentWidth,
+                  children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    wrap: "wrap",
+                    children: [
+                      "Inserted into memory block",
+                      " ",
+                      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                        bold: true,
+                        color: colors.tool.memoryName,
+                        children: blockName
+                      }, undefined, false, undefined, this),
+                      insertLine !== undefined && ` at line ${insertLine}`
+                    ]
+                  }, undefined, true, undefined, this)
+                }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
             insertText.split(`
 `).map((line, i) => /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              flexDirection: "row",
               children: [
-                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                  children: " "
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                  width: prefixWidth,
+                  flexShrink: 0,
+                  children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    children: "    "
+                  }, undefined, false, undefined, this)
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                  backgroundColor: colors.diff.addedLineBg,
-                  color: colors.diff.textOnDark,
-                  children: `+ ${line}`
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                  flexGrow: 1,
+                  width: contentWidth,
+                  children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    backgroundColor: colors.diff.addedLineBg,
+                    color: colors.diff.textOnDark,
+                    wrap: "wrap",
+                    children: `+ ${line}`
+                  }, undefined, false, undefined, this)
                 }, undefined, false, undefined, this)
               ]
             }, `insert-${i}-${line.substring(0, 20)}`, true, undefined, this))
@@ -65108,41 +66024,72 @@ function MemoryDiffRenderer({
       case "create": {
         const description = args.description || "";
         const fileText = args.file_text || "";
+        const prefixWidth = 4;
+        const contentWidth = Math.max(0, columns - prefixWidth);
         return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
           flexDirection: "column",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              flexDirection: "row",
               children: [
-                "  ",
-                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                  dimColor: true,
-                  children: "⎿"
-                }, undefined, false, undefined, this),
-                " Created memory block",
-                " ",
-                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                  color: colors.tool.memoryName,
-                  children: blockName
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                  width: prefixWidth,
+                  flexShrink: 0,
+                  children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    children: [
+                      "  ",
+                      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                        dimColor: true,
+                        children: "⎿"
+                      }, undefined, false, undefined, this)
+                    ]
+                  }, undefined, true, undefined, this)
                 }, undefined, false, undefined, this),
-                description && /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                  dimColor: true,
-                  children: [
-                    " - ",
-                    truncate(description, 40)
-                  ]
-                }, undefined, true, undefined, this)
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                  flexGrow: 1,
+                  width: contentWidth,
+                  children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    wrap: "wrap",
+                    children: [
+                      "Created memory block",
+                      " ",
+                      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                        bold: true,
+                        color: colors.tool.memoryName,
+                        children: blockName
+                      }, undefined, false, undefined, this),
+                      description && /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                        dimColor: true,
+                        children: [
+                          " - ",
+                          truncate(description, 40)
+                        ]
+                      }, undefined, true, undefined, this)
+                    ]
+                  }, undefined, true, undefined, this)
+                }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
             fileText?.split(`
 `).slice(0, 3).map((line, i) => /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              flexDirection: "row",
               children: [
-                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                  children: " "
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                  width: prefixWidth,
+                  flexShrink: 0,
+                  children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    children: "    "
+                  }, undefined, false, undefined, this)
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                  backgroundColor: colors.diff.addedLineBg,
-                  color: colors.diff.textOnDark,
-                  children: `+ ${truncate(line, 60)}`
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                  flexGrow: 1,
+                  width: contentWidth,
+                  children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    backgroundColor: colors.diff.addedLineBg,
+                    color: colors.diff.textOnDark,
+                    wrap: "wrap",
+                    children: `+ ${truncate(line, 60)}`
+                  }, undefined, false, undefined, this)
                 }, undefined, false, undefined, this)
               ]
             }, `create-${i}-${line.substring(0, 20)}`, true, undefined, this)),
@@ -65161,18 +66108,39 @@ function MemoryDiffRenderer({
         }, undefined, true, undefined, this);
       }
       case "delete": {
-        return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+        const prefixWidth = 4;
+        const contentWidth = Math.max(0, columns - prefixWidth);
+        return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+          flexDirection: "row",
           children: [
-            "  ",
-            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              dimColor: true,
-              children: "⎿"
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              width: prefixWidth,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                children: [
+                  "  ",
+                  /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    dimColor: true,
+                    children: "⎿"
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
             }, undefined, false, undefined, this),
-            " Deleted memory block",
-            " ",
-            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              color: colors.tool.memoryName,
-              children: blockName
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                wrap: "wrap",
+                children: [
+                  "Deleted memory block",
+                  " ",
+                  /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    bold: true,
+                    color: colors.tool.memoryName,
+                    children: blockName
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this);
@@ -65181,63 +66149,127 @@ function MemoryDiffRenderer({
         const newPath = args.new_path || "";
         const newBlockName = newPath.split("/").pop() || newPath;
         const description = args.description;
+        const prefixWidth = 4;
+        const contentWidth = Math.max(0, columns - prefixWidth);
         if (description) {
-          return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+          return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+            flexDirection: "row",
             children: [
-              "  ",
-              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                dimColor: true,
-                children: "⎿"
+              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                width: prefixWidth,
+                flexShrink: 0,
+                children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  children: [
+                    "  ",
+                    /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                      dimColor: true,
+                      children: "⎿"
+                    }, undefined, false, undefined, this)
+                  ]
+                }, undefined, true, undefined, this)
               }, undefined, false, undefined, this),
-              " Updated description of",
-              " ",
-              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                color: colors.tool.memoryName,
-                children: blockName
+              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                flexGrow: 1,
+                width: contentWidth,
+                children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  wrap: "wrap",
+                  children: [
+                    "Updated description of",
+                    " ",
+                    /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                      bold: true,
+                      color: colors.tool.memoryName,
+                      children: blockName
+                    }, undefined, false, undefined, this)
+                  ]
+                }, undefined, true, undefined, this)
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this);
         }
-        return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+        return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+          flexDirection: "row",
           children: [
-            "  ",
-            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              dimColor: true,
-              children: "⎿"
-            }, undefined, false, undefined, this),
-            " Renamed",
-            " ",
-            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              color: colors.tool.memoryName,
-              children: blockName
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              width: prefixWidth,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                children: [
+                  "  ",
+                  /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    dimColor: true,
+                    children: "⎿"
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
             }, undefined, false, undefined, this),
-            " to",
-            " ",
-            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              color: colors.tool.memoryName,
-              children: newBlockName
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                wrap: "wrap",
+                children: [
+                  "Renamed",
+                  " ",
+                  /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    bold: true,
+                    color: colors.tool.memoryName,
+                    children: blockName
+                  }, undefined, false, undefined, this),
+                  " ",
+                  "to",
+                  " ",
+                  /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    bold: true,
+                    color: colors.tool.memoryName,
+                    children: newBlockName
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this);
       }
-      default:
-        return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+      default: {
+        const defaultPrefixWidth = 4;
+        const defaultContentWidth = Math.max(0, columns - defaultPrefixWidth);
+        return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+          flexDirection: "row",
           children: [
-            "  ",
-            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              dimColor: true,
-              children: "⎿"
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              width: defaultPrefixWidth,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                children: [
+                  "  ",
+                  /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    dimColor: true,
+                    children: "⎿"
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
             }, undefined, false, undefined, this),
-            " Memory operation: ",
-            command,
-            " on",
-            " ",
-            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              color: colors.tool.memoryName,
-              children: blockName
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: defaultContentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                wrap: "wrap",
+                children: [
+                  "Memory operation: ",
+                  command,
+                  " on",
+                  " ",
+                  /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    bold: true,
+                    color: colors.tool.memoryName,
+                    children: blockName
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this);
+      }
     }
   } catch {
     return null;
@@ -65246,50 +66278,100 @@ function MemoryDiffRenderer({
 function MemoryStrReplaceDiff({
   blockName,
   oldStr,
-  newStr
+  newStr,
+  columns
 }) {
-  const oldLines = oldStr.split(`
-`);
-  const newLines = newStr.split(`
+  const lineDiffs = diffLines(oldStr, newStr);
+  const rows = [];
+  for (let i = 0;i < lineDiffs.length; i++) {
+    const part = lineDiffs[i];
+    if (!part)
+      continue;
+    if (!part.added && !part.removed)
+      continue;
+    const lines = part.value.replace(/\n$/, "").split(`
 `);
-  const singleLine = oldLines.length === 1 && newLines.length === 1;
-  const maxLines = 5;
-  const oldTruncated = oldLines.slice(0, maxLines);
-  const newTruncated = newLines.slice(0, maxLines);
-  const hasMore = oldLines.length > maxLines || newLines.length > maxLines;
+    if (part.removed) {
+      const nextPart = lineDiffs[i + 1];
+      const nextIsAdd = nextPart?.added;
+      const nextLines = nextIsAdd ? nextPart.value.replace(/\n$/, "").split(`
+`) : [];
+      lines.forEach((line, lineIdx) => {
+        rows.push({
+          type: "remove",
+          content: line,
+          pairContent: nextIsAdd && lines.length === nextLines.length ? nextLines[lineIdx] : undefined
+        });
+      });
+    } else if (part.added) {
+      const prevPart = lineDiffs[i - 1];
+      const prevIsRemove = prevPart?.removed;
+      const prevLines = prevIsRemove ? prevPart.value.replace(/\n$/, "").split(`
+`) : [];
+      lines.forEach((line, lineIdx) => {
+        rows.push({
+          type: "add",
+          content: line,
+          pairContent: prevIsRemove && lines.length === prevLines.length ? prevLines[lineIdx] : undefined
+        });
+      });
+    }
+  }
+  const maxRows = 10;
+  const displayRows = rows.slice(0, maxRows);
+  const hasMore = rows.length > maxRows;
+  const prefixWidth = 4;
+  const contentWidth = Math.max(0, columns - prefixWidth);
   return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+        flexDirection: "row",
         children: [
-          "  ",
-          /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-            dimColor: true,
-            children: "⎿"
+          /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+            width: prefixWidth,
+            flexShrink: 0,
+            children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+              children: [
+                "  ",
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  dimColor: true,
+                  children: "⎿"
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
           }, undefined, false, undefined, this),
-          " Updated memory block",
-          " ",
-          /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-            color: colors.tool.memoryName,
-            children: blockName
+          /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+            flexGrow: 1,
+            width: contentWidth,
+            children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+              wrap: "wrap",
+              children: [
+                "Updated memory block",
+                " ",
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  bold: true,
+                  color: colors.tool.memoryName,
+                  children: blockName
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      oldTruncated.map((line, i) => /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(DiffLine2, {
-        type: "remove",
-        content: line,
-        compareContent: singleLine ? newLines[0] : undefined
-      }, `old-${i}-${line.substring(0, 20)}`, false, undefined, this)),
-      newTruncated.map((line, i) => /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(DiffLine2, {
-        type: "add",
-        content: line,
-        compareContent: singleLine ? oldLines[0] : undefined
-      }, `new-${i}-${line.substring(0, 20)}`, false, undefined, this)),
+      displayRows.map((row, i) => /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(DiffLine2, {
+        type: row.type,
+        content: row.content,
+        compareContent: row.pairContent,
+        columns
+      }, `diff-${i}-${row.type}-${row.content.substring(0, 20)}`, false, undefined, this)),
       hasMore && /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
         dimColor: true,
         children: [
           "    ",
-          "... diff truncated"
+          "... ",
+          rows.length - maxRows,
+          " more lines"
         ]
       }, undefined, true, undefined, this)
     ]
@@ -65298,57 +66380,84 @@ function MemoryStrReplaceDiff({
 function DiffLine2({
   type,
   content,
-  compareContent
+  compareContent,
+  columns
 }) {
   const prefix = type === "add" ? "+" : "-";
   const lineBg = type === "add" ? colors.diff.addedLineBg : colors.diff.removedLineBg;
   const wordBg = type === "add" ? colors.diff.addedWordBg : colors.diff.removedWordBg;
+  const prefixWidth = 4;
+  const contentWidth = Math.max(0, columns - prefixWidth);
   if (compareContent !== undefined && content.trim() && compareContent.trim()) {
     const wordDiffs = type === "add" ? diffWords(compareContent, content) : diffWords(content, compareContent);
     return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+      flexDirection: "row",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-          children: "    "
-        }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-          backgroundColor: lineBg,
-          color: colors.diff.textOnDark,
-          children: `${prefix} `
+        /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+          width: prefixWidth,
+          flexShrink: 0,
+          children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+            children: "    "
+          }, undefined, false, undefined, this)
         }, undefined, false, undefined, this),
-        wordDiffs.map((part, i) => {
-          if (part.added && type === "add") {
-            return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              backgroundColor: wordBg,
-              color: colors.diff.textOnHighlight,
-              children: part.value
-            }, `w-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
-          } else if (part.removed && type === "remove") {
-            return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              backgroundColor: wordBg,
-              color: colors.diff.textOnHighlight,
-              children: part.value
-            }, `w-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
-          } else if (!part.added && !part.removed) {
-            return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              backgroundColor: lineBg,
-              color: colors.diff.textOnDark,
-              children: part.value
-            }, `w-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
-          }
-          return null;
-        })
+        /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+          flexGrow: 1,
+          width: contentWidth,
+          children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+            wrap: "wrap",
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                backgroundColor: lineBg,
+                color: colors.diff.textOnDark,
+                children: `${prefix} `
+              }, undefined, false, undefined, this),
+              wordDiffs.map((part, i) => {
+                if (part.added && type === "add") {
+                  return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    backgroundColor: wordBg,
+                    color: colors.diff.textOnHighlight,
+                    children: part.value
+                  }, `w-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
+                } else if (part.removed && type === "remove") {
+                  return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    backgroundColor: wordBg,
+                    color: colors.diff.textOnHighlight,
+                    children: part.value
+                  }, `w-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
+                } else if (!part.added && !part.removed) {
+                  return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                    backgroundColor: lineBg,
+                    color: colors.diff.textOnDark,
+                    children: part.value
+                  }, `w-${i}-${part.value.substring(0, 10)}`, false, undefined, this);
+                }
+                return null;
+              })
+            ]
+          }, undefined, true, undefined, this)
+        }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this);
   }
   return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+    flexDirection: "row",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-        children: "    "
+      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+        width: prefixWidth,
+        flexShrink: 0,
+        children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+          children: "    "
+        }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-        backgroundColor: lineBg,
-        color: colors.diff.textOnDark,
-        children: `${prefix} ${content}`
+      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+        flexGrow: 1,
+        width: contentWidth,
+        children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+          backgroundColor: lineBg,
+          color: colors.diff.textOnDark,
+          wrap: "wrap",
+          children: `${prefix} ${content}`
+        }, undefined, false, undefined, this)
       }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
@@ -65358,27 +66467,52 @@ function truncate(str, maxLen) {
     return str;
   return `${str.slice(0, maxLen - 1)}…`;
 }
-function PatchDiffRenderer({ label, patch }) {
+function PatchDiffRenderer({
+  label,
+  patch,
+  columns
+}) {
   const lines = patch.split(`
 `);
   const maxLines = 8;
   const displayLines = lines.slice(0, maxLines);
   const hasMore = lines.length > maxLines;
+  const prefixWidth = 4;
+  const contentWidth = Math.max(0, columns - prefixWidth);
   return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+        flexDirection: "row",
         children: [
-          "  ",
-          /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-            dimColor: true,
-            children: "⎿"
+          /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+            width: prefixWidth,
+            flexShrink: 0,
+            children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+              children: [
+                "  ",
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  dimColor: true,
+                  children: "⎿"
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
           }, undefined, false, undefined, this),
-          " Patched memory block",
-          " ",
-          /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-            color: colors.tool.memoryName,
-            children: label
+          /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+            flexGrow: 1,
+            width: contentWidth,
+            children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+              wrap: "wrap",
+              children: [
+                "Patched memory block",
+                " ",
+                /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  bold: true,
+                  color: colors.tool.memoryName,
+                  children: label
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
@@ -65390,46 +66524,94 @@ function PatchDiffRenderer({ label, patch }) {
         const content = line.slice(1);
         if (firstChar === "+") {
           return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+            flexDirection: "row",
             children: [
-              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                children: "    "
+              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                width: prefixWidth,
+                flexShrink: 0,
+                children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  children: "    "
+                }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                backgroundColor: colors.diff.addedLineBg,
-                color: colors.diff.textOnDark,
-                children: `+ ${content}`
+              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                flexGrow: 1,
+                width: contentWidth,
+                children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  backgroundColor: colors.diff.addedLineBg,
+                  color: colors.diff.textOnDark,
+                  wrap: "wrap",
+                  children: `+ ${content}`
+                }, undefined, false, undefined, this)
               }, undefined, false, undefined, this)
             ]
           }, `patch-${i}-${line.substring(0, 20)}`, true, undefined, this);
         } else if (firstChar === "-") {
           return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+            flexDirection: "row",
             children: [
-              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                children: "    "
+              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                width: prefixWidth,
+                flexShrink: 0,
+                children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  children: "    "
+                }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-                backgroundColor: colors.diff.removedLineBg,
-                color: colors.diff.textOnDark,
-                children: `- ${content}`
+              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                flexGrow: 1,
+                width: contentWidth,
+                children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  backgroundColor: colors.diff.removedLineBg,
+                  color: colors.diff.textOnDark,
+                  wrap: "wrap",
+                  children: `- ${content}`
+                }, undefined, false, undefined, this)
               }, undefined, false, undefined, this)
             ]
           }, `patch-${i}-${line.substring(0, 20)}`, true, undefined, this);
         } else if (firstChar === " ") {
           return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
-            children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-              dimColor: true,
-              children: [
-                "      ",
-                content
-              ]
-            }, undefined, true, undefined, this)
-          }, `patch-${i}-${line.substring(0, 20)}`, false, undefined, this);
+            flexDirection: "row",
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                width: prefixWidth + 2,
+                flexShrink: 0,
+                children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  dimColor: true,
+                  children: "      "
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+                flexGrow: 1,
+                width: Math.max(0, columns - prefixWidth - 2),
+                children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                  dimColor: true,
+                  wrap: "wrap",
+                  children: content
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this)
+            ]
+          }, `patch-${i}-${line.substring(0, 20)}`, true, undefined, this);
         }
-        return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
-          dimColor: true,
+        return /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+          flexDirection: "row",
           children: [
-            "    ",
-            line
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              width: prefixWidth,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                dimColor: true,
+                children: "    "
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: /* @__PURE__ */ jsx_dev_runtime44.jsxDEV(Text, {
+                dimColor: true,
+                wrap: "wrap",
+                children: line
+              }, undefined, false, undefined, this)
+            }, undefined, false, undefined, this)
           ]
         }, `patch-${i}-${line.substring(0, 20)}`, true, undefined, this);
       }),
@@ -65448,6 +66630,7 @@ function PatchDiffRenderer({ label, patch }) {
 var jsx_dev_runtime44;
 var init_MemoryDiffRenderer = __esm(async () => {
   init_libesm();
+  init_useTerminalWidth();
   init_colors();
   await init_build2();
   jsx_dev_runtime44 = __toESM(require_jsx_dev_runtime(), 1);
@@ -65458,18 +66641,31 @@ var jsx_dev_runtime45, PlanRenderer = ({
   plan,
   explanation
 }) => {
+  const columns = useTerminalWidth();
+  const prefixWidth = 5;
+  const contentWidth = Math.max(0, columns - prefixWidth);
   return /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
       explanation && /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+        flexDirection: "row",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text, {
-            children: "  ⎿  "
+          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+            width: prefixWidth,
+            flexShrink: 0,
+            children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text, {
+              children: "  ⎿  "
+            }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text, {
-            italic: true,
-            dimColor: true,
-            children: explanation
+          /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+            flexGrow: 1,
+            width: contentWidth,
+            children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text, {
+              italic: true,
+              dimColor: true,
+              wrap: "wrap",
+              children: explanation
+            }, undefined, false, undefined, this)
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
@@ -65480,6 +66676,7 @@ var jsx_dev_runtime45, PlanRenderer = ({
           textElement = /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text, {
             color: colors.todo.completed,
             strikethrough: true,
+            wrap: "wrap",
             children: [
               checkbox,
               " ",
@@ -65490,6 +66687,7 @@ var jsx_dev_runtime45, PlanRenderer = ({
           textElement = /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text, {
             color: colors.todo.inProgress,
             bold: true,
+            wrap: "wrap",
             children: [
               checkbox,
               " ",
@@ -65498,6 +66696,7 @@ var jsx_dev_runtime45, PlanRenderer = ({
           }, undefined, true, undefined, this);
         } else {
           textElement = /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text, {
+            wrap: "wrap",
             children: [
               checkbox,
               " ",
@@ -65507,11 +66706,20 @@ var jsx_dev_runtime45, PlanRenderer = ({
         }
         const prefix = index === 0 && !explanation ? "  ⎿  " : "     ";
         return /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+          flexDirection: "row",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text, {
-              children: prefix
+            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+              width: prefixWidth,
+              flexShrink: 0,
+              children: /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text, {
+                children: prefix
+              }, undefined, false, undefined, this)
             }, undefined, false, undefined, this),
-            textElement
+            /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
+              flexGrow: 1,
+              width: contentWidth,
+              children: textElement
+            }, undefined, false, undefined, this)
           ]
         }, `${index}-${item.step.slice(0, 20)}`, true, undefined, this);
       })
@@ -65519,6 +66727,7 @@ var jsx_dev_runtime45, PlanRenderer = ({
   }, undefined, true, undefined, this);
 };
 var init_PlanRenderer = __esm(async () => {
+  init_useTerminalWidth();
   init_colors();
   await init_build2();
   jsx_dev_runtime45 = __toESM(require_jsx_dev_runtime(), 1);
@@ -65526,6 +66735,9 @@ var init_PlanRenderer = __esm(async () => {
 
 // src/cli/components/TodoRenderer.tsx
 var jsx_dev_runtime46, TodoRenderer = ({ todos }) => {
+  const columns = useTerminalWidth();
+  const prefixWidth = 5;
+  const contentWidth = Math.max(0, columns - prefixWidth);
   return /* @__PURE__ */ jsx_dev_runtime46.jsxDEV(Box_default, {
     flexDirection: "column",
     children: todos.map((todo, index) => {
@@ -65535,6 +66747,7 @@ var jsx_dev_runtime46, TodoRenderer = ({ todos }) => {
         textElement = /* @__PURE__ */ jsx_dev_runtime46.jsxDEV(Text, {
           color: colors.todo.completed,
           strikethrough: true,
+          wrap: "wrap",
           children: [
             checkbox,
             " ",
@@ -65545,6 +66758,7 @@ var jsx_dev_runtime46, TodoRenderer = ({ todos }) => {
         textElement = /* @__PURE__ */ jsx_dev_runtime46.jsxDEV(Text, {
           color: colors.todo.inProgress,
           bold: true,
+          wrap: "wrap",
           children: [
             checkbox,
             " ",
@@ -65553,6 +66767,7 @@ var jsx_dev_runtime46, TodoRenderer = ({ todos }) => {
         }, undefined, true, undefined, this);
       } else {
         textElement = /* @__PURE__ */ jsx_dev_runtime46.jsxDEV(Text, {
+          wrap: "wrap",
           children: [
             checkbox,
             " ",
@@ -65562,17 +66777,27 @@ var jsx_dev_runtime46, TodoRenderer = ({ todos }) => {
       }
       const prefix = index === 0 ? "  ⎿  " : "     ";
       return /* @__PURE__ */ jsx_dev_runtime46.jsxDEV(Box_default, {
+        flexDirection: "row",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime46.jsxDEV(Text, {
-            children: prefix
+          /* @__PURE__ */ jsx_dev_runtime46.jsxDEV(Box_default, {
+            width: prefixWidth,
+            flexShrink: 0,
+            children: /* @__PURE__ */ jsx_dev_runtime46.jsxDEV(Text, {
+              children: prefix
+            }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          textElement
+          /* @__PURE__ */ jsx_dev_runtime46.jsxDEV(Box_default, {
+            flexGrow: 1,
+            width: contentWidth,
+            children: textElement
+          }, undefined, false, undefined, this)
         ]
       }, todo.id || index, true, undefined, this);
     })
   }, undefined, false, undefined, this);
 };
 var init_TodoRenderer = __esm(async () => {
+  init_useTerminalWidth();
   init_colors();
   await init_build2();
   jsx_dev_runtime46 = __toESM(require_jsx_dev_runtime(), 1);
@@ -65583,11 +66808,14 @@ var import_react64, jsx_dev_runtime47, ToolCallMessage;
 var init_ToolCallMessageRich = __esm(async () => {
   init_constants();
   init_manager3();
+  init_formatArgsDisplay();
   init_useTerminalWidth();
   init_colors();
   await __promiseAll([
     init_build2(),
+    init_AdvancedDiffRenderer(),
     init_BlinkDot(),
+    init_DiffRenderer(),
     init_MarkdownDisplay(),
     init_MemoryDiffRenderer(),
     init_PlanRenderer(),
@@ -65595,7 +66823,10 @@ var init_ToolCallMessageRich = __esm(async () => {
   ]);
   import_react64 = __toESM(require_react(), 1);
   jsx_dev_runtime47 = __toESM(require_jsx_dev_runtime(), 1);
-  ToolCallMessage = import_react64.memo(({ line }) => {
+  ToolCallMessage = import_react64.memo(({
+    line,
+    precomputedDiffs
+  }) => {
     const columns = useTerminalWidth();
     const rawName = line.name ?? "?";
     const argsText = line.argsText ?? "...";
@@ -65605,8 +66836,24 @@ var init_ToolCallMessageRich = __esm(async () => {
         return null;
       }
     }
-    const displayName = getDisplayToolName(rawName);
-    const formatted = formatArgsDisplay(argsText);
+    let displayName = getDisplayToolName(rawName);
+    if (isPatchTool(rawName)) {
+      try {
+        const parsedArgs = JSON.parse(argsText);
+        if (parsedArgs.input) {
+          const patchInfo = parsePatchInput(parsedArgs.input);
+          if (patchInfo) {
+            if (patchInfo.kind === "add")
+              displayName = "Write";
+            else if (patchInfo.kind === "update")
+              displayName = "Update";
+            else if (patchInfo.kind === "delete")
+              displayName = "Delete";
+          }
+        }
+      } catch {}
+    }
+    const formatted = formatArgsDisplay(argsText, rawName);
     const args = `(${formatted.display})`;
     const rightWidth = Math.max(0, columns - 2);
     const fallback = displayName.length >= rightWidth;
@@ -65739,6 +66986,154 @@ var init_ToolCallMessageRich = __esm(async () => {
           return memoryDiff;
         }
       }
+      if (isFileEditTool(rawName) && line.resultOk !== false && line.argsText) {
+        const diff2 = line.toolCallId ? precomputedDiffs?.get(line.toolCallId) : undefined;
+        try {
+          const parsedArgs = JSON.parse(line.argsText);
+          const filePath = parsedArgs.file_path || "";
+          if (diff2) {
+            if (parsedArgs.edits && Array.isArray(parsedArgs.edits)) {
+              const edits = parsedArgs.edits.map((e) => ({
+                old_string: e.old_string || "",
+                new_string: e.new_string || "",
+                replace_all: e.replace_all
+              }));
+              return /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(AdvancedDiffRenderer, {
+                precomputed: diff2,
+                kind: "multi_edit",
+                filePath,
+                edits
+              }, undefined, false, undefined, this);
+            }
+            return /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(AdvancedDiffRenderer, {
+              precomputed: diff2,
+              kind: "edit",
+              filePath,
+              oldString: parsedArgs.old_string || "",
+              newString: parsedArgs.new_string || "",
+              replaceAll: parsedArgs.replace_all
+            }, undefined, false, undefined, this);
+          }
+          if (parsedArgs.edits && Array.isArray(parsedArgs.edits)) {
+            const edits = parsedArgs.edits.map((e) => ({
+              old_string: e.old_string || "",
+              new_string: e.new_string || ""
+            }));
+            return /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(MultiEditRenderer, {
+              filePath,
+              edits,
+              showLineNumbers: false
+            }, undefined, false, undefined, this);
+          }
+          if (parsedArgs.old_string !== undefined) {
+            return /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(EditRenderer, {
+              filePath,
+              oldString: parsedArgs.old_string || "",
+              newString: parsedArgs.new_string || "",
+              showLineNumbers: false
+            }, undefined, false, undefined, this);
+          }
+        } catch {}
+      }
+      if (isFileWriteTool(rawName) && line.resultOk !== false && line.argsText) {
+        const diff2 = line.toolCallId ? precomputedDiffs?.get(line.toolCallId) : undefined;
+        try {
+          const parsedArgs = JSON.parse(line.argsText);
+          const filePath = parsedArgs.file_path || "";
+          const content = parsedArgs.content || "";
+          if (filePath && content) {
+            if (diff2) {
+              return /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(AdvancedDiffRenderer, {
+                precomputed: diff2,
+                kind: "write",
+                filePath,
+                content
+              }, undefined, false, undefined, this);
+            }
+            return /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(WriteRenderer, {
+              filePath,
+              content
+            }, undefined, false, undefined, this);
+          }
+        } catch {}
+      }
+      if (isPatchTool(rawName) && line.resultOk !== false && line.argsText) {
+        try {
+          const parsedArgs = JSON.parse(line.argsText);
+          if (parsedArgs.input) {
+            const operations = parsePatchOperations(parsedArgs.input);
+            if (operations.length > 0) {
+              return /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Box_default, {
+                flexDirection: "column",
+                children: operations.map((op) => {
+                  const key = `${line.toolCallId}:${op.path}`;
+                  const diff2 = precomputedDiffs?.get(key);
+                  if (op.kind === "add") {
+                    return diff2 ? /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(AdvancedDiffRenderer, {
+                      precomputed: diff2,
+                      kind: "write",
+                      filePath: op.path,
+                      content: op.content
+                    }, `patch-add-${op.path}`, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(WriteRenderer, {
+                      filePath: op.path,
+                      content: op.content
+                    }, `patch-add-${op.path}`, false, undefined, this);
+                  }
+                  if (op.kind === "update") {
+                    return diff2 ? /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(AdvancedDiffRenderer, {
+                      precomputed: diff2,
+                      kind: "edit",
+                      filePath: op.path,
+                      oldString: op.oldString,
+                      newString: op.newString
+                    }, `patch-update-${op.path}`, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(EditRenderer, {
+                      filePath: op.path,
+                      oldString: op.oldString,
+                      newString: op.newString,
+                      showLineNumbers: false
+                    }, `patch-update-${op.path}`, false, undefined, this);
+                  }
+                  if (op.kind === "delete") {
+                    const gutterWidth = 4;
+                    return /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Box_default, {
+                      flexDirection: "row",
+                      children: [
+                        /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Box_default, {
+                          width: gutterWidth,
+                          flexShrink: 0,
+                          children: /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Text, {
+                            children: [
+                              "  ",
+                              /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Text, {
+                                dimColor: true,
+                                children: "⎿"
+                              }, undefined, false, undefined, this)
+                            ]
+                          }, undefined, true, undefined, this)
+                        }, undefined, false, undefined, this),
+                        /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Box_default, {
+                          flexGrow: 1,
+                          children: /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Text, {
+                            wrap: "wrap",
+                            children: [
+                              "Deleted ",
+                              /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Text, {
+                                bold: true,
+                                children: op.path
+                              }, undefined, false, undefined, this)
+                            ]
+                          }, undefined, true, undefined, this)
+                        }, undefined, false, undefined, this)
+                      ]
+                    }, `patch-delete-${op.path}`, true, undefined, this);
+                  }
+                  return null;
+                })
+              }, undefined, false, undefined, this);
+            }
+          }
+        } catch {}
+      }
       const isError = line.resultOk === false;
       let displayText = displayResultText;
       try {
@@ -65797,16 +67192,26 @@ var init_ToolCallMessageRich = __esm(async () => {
                 children: isMemoryTool(rawName) ? /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(jsx_dev_runtime47.Fragment, {
                   children: [
                     /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Text, {
+                      bold: true,
                       color: colors.tool.memoryName,
                       children: displayName
                     }, undefined, false, undefined, this),
                     args
                   ]
-                }, undefined, true, undefined, this) : `${displayName}${args}`
+                }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(jsx_dev_runtime47.Fragment, {
+                  children: [
+                    /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Text, {
+                      bold: true,
+                      children: displayName
+                    }, undefined, false, undefined, this),
+                    args
+                  ]
+                }, undefined, true, undefined, this)
               }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Box_default, {
                 flexDirection: "row",
                 children: [
                   /* @__PURE__ */ jsx_dev_runtime47.jsxDEV(Text, {
+                    bold: true,
                     color: isMemoryTool(rawName) ? colors.tool.memoryName : undefined,
                     children: displayName
                   }, undefined, false, undefined, this),
@@ -67083,7 +68488,7 @@ function getPlanModeReminder() {
 Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits (with the exception of the plan file mentioned below), run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supercedes any other instructions you have received.
 
 ## Plan File Info:
-${planFilePath ? `No plan file exists yet. You should create your plan at ${planFilePath} using the Write tool.` : "No plan file path assigned."}
+${planFilePath ? `No plan file exists yet. You should create your plan at ${planFilePath} using a write tool (e.g. Write, ApplyPatch, etc. depending on your toolset).` : "No plan file path assigned."}
 
 You should build your plan incrementally by writing to or editing this file. NOTE that this is the only file you are allowed to edit - other than this you are only allowed to take READ-ONLY actions.
 
@@ -67337,6 +68742,7 @@ function App2({
   const [lines, setLines] = import_react69.useState([]);
   const buffersRef = import_react69.useRef(createBuffers());
   const hasBackfilledRef = import_react69.useRef(false);
+  const precomputedDiffsRef = import_react69.useRef(new Map);
   const refreshDerived = import_react69.useCallback(() => {
     const b = buffersRef.current;
     setTokenCount(b.tokenCount);
@@ -67655,6 +69061,62 @@ function App2({
               autoAllowed.push(ac);
             }
           }
+          for (const ac of autoAllowed) {
+            const toolName = ac.approval.toolName;
+            const toolCallId = ac.approval.toolCallId;
+            try {
+              const args = JSON.parse(ac.approval.toolArgs || "{}");
+              if (isFileWriteTool(toolName)) {
+                const filePath = args.file_path;
+                if (filePath) {
+                  const result = computeAdvancedDiff({
+                    kind: "write",
+                    filePath,
+                    content: args.content || ""
+                  });
+                  if (result.mode === "advanced") {
+                    precomputedDiffsRef.current.set(toolCallId, result);
+                  }
+                }
+              } else if (isFileEditTool(toolName)) {
+                const filePath = args.file_path;
+                if (filePath) {
+                  if (args.edits && Array.isArray(args.edits)) {
+                    const result = computeAdvancedDiff({
+                      kind: "multi_edit",
+                      filePath,
+                      edits: args.edits
+                    });
+                    if (result.mode === "advanced") {
+                      precomputedDiffsRef.current.set(toolCallId, result);
+                    }
+                  } else {
+                    const result = computeAdvancedDiff({
+                      kind: "edit",
+                      filePath,
+                      oldString: args.old_string || "",
+                      newString: args.new_string || "",
+                      replaceAll: args.replace_all
+                    });
+                    if (result.mode === "advanced") {
+                      precomputedDiffsRef.current.set(toolCallId, result);
+                    }
+                  }
+                }
+              } else if (isPatchTool(toolName) && args.input) {
+                const operations = parsePatchOperations(args.input);
+                for (const op of operations) {
+                  const key = `${toolCallId}:${op.path}`;
+                  if (op.kind === "add" || op.kind === "update") {
+                    const result = parsePatchToAdvancedDiff(op.patchLines, op.path);
+                    if (result) {
+                      precomputedDiffsRef.current.set(key, result);
+                    }
+                  }
+                }
+              }
+            } catch {}
+          }
           const autoAllowedResults = await executeAutoAllowedTools(autoAllowed, (chunk) => onChunk(buffersRef.current, chunk));
           const autoDeniedResults = autoDenied.map((ac) => {
             const reason = ac.permission.reason ? `Permission denied: ${ac.permission.reason}` : ("matchedRule" in ac.permission) && ac.permission.matchedRule ? `Permission denied by rule: ${ac.permission.matchedRule}` : "Permission denied: Unknown reason";
@@ -69397,6 +70859,62 @@ DO NOT respond to these messages or otherwise consider them in your response unl
             }
           }
           if (needsUserInput.length === 0) {
+            for (const ac of autoAllowed) {
+              const toolName = ac.approval.toolName;
+              const toolCallId = ac.approval.toolCallId;
+              try {
+                const args = JSON.parse(ac.approval.toolArgs || "{}");
+                if (isFileWriteTool(toolName)) {
+                  const filePath = args.file_path;
+                  if (filePath) {
+                    const result = computeAdvancedDiff({
+                      kind: "write",
+                      filePath,
+                      content: args.content || ""
+                    });
+                    if (result.mode === "advanced") {
+                      precomputedDiffsRef.current.set(toolCallId, result);
+                    }
+                  }
+                } else if (isFileEditTool(toolName)) {
+                  const filePath = args.file_path;
+                  if (filePath) {
+                    if (args.edits && Array.isArray(args.edits)) {
+                      const result = computeAdvancedDiff({
+                        kind: "multi_edit",
+                        filePath,
+                        edits: args.edits
+                      });
+                      if (result.mode === "advanced") {
+                        precomputedDiffsRef.current.set(toolCallId, result);
+                      }
+                    } else {
+                      const result = computeAdvancedDiff({
+                        kind: "edit",
+                        filePath,
+                        oldString: args.old_string || "",
+                        newString: args.new_string || "",
+                        replaceAll: args.replace_all
+                      });
+                      if (result.mode === "advanced") {
+                        precomputedDiffsRef.current.set(toolCallId, result);
+                      }
+                    }
+                  }
+                } else if (isPatchTool(toolName) && args.input) {
+                  const operations = parsePatchOperations(args.input);
+                  for (const op of operations) {
+                    const key = `${toolCallId}:${op.path}`;
+                    if (op.kind === "add" || op.kind === "update") {
+                      const result = parsePatchToAdvancedDiff(op.patchLines, op.path);
+                      if (result) {
+                        precomputedDiffsRef.current.set(key, result);
+                      }
+                    }
+                  }
+                }
+              } catch {}
+            }
             const autoAllowedResults = await executeAutoAllowedTools(autoAllowed, (chunk) => onChunk(buffersRef.current, chunk));
             const autoDeniedResults = autoDenied.map((ac) => {
               const reason = ac.permission.reason ? `Permission denied: ${ac.permission.reason}` : ("matchedRule" in ac.permission) && ac.permission.matchedRule ? `Permission denied by rule: ${ac.permission.matchedRule}` : "Permission denied: Unknown";
@@ -69450,6 +70968,62 @@ DO NOT respond to these messages or otherwise consider them in your response unl
             setStreaming(false);
             setPendingApprovals(needsUserInput.map((ac) => ac.approval));
             setApprovalContexts(needsUserInput.map((ac) => ac.context).filter(Boolean));
+            for (const ac of autoAllowed) {
+              const toolName = ac.approval.toolName;
+              const toolCallId = ac.approval.toolCallId;
+              try {
+                const args = JSON.parse(ac.approval.toolArgs || "{}");
+                if (isFileWriteTool(toolName)) {
+                  const filePath = args.file_path;
+                  if (filePath) {
+                    const result = computeAdvancedDiff({
+                      kind: "write",
+                      filePath,
+                      content: args.content || ""
+                    });
+                    if (result.mode === "advanced") {
+                      precomputedDiffsRef.current.set(toolCallId, result);
+                    }
+                  }
+                } else if (isFileEditTool(toolName)) {
+                  const filePath = args.file_path;
+                  if (filePath) {
+                    if (args.edits && Array.isArray(args.edits)) {
+                      const result = computeAdvancedDiff({
+                        kind: "multi_edit",
+                        filePath,
+                        edits: args.edits
+                      });
+                      if (result.mode === "advanced") {
+                        precomputedDiffsRef.current.set(toolCallId, result);
+                      }
+                    } else {
+                      const result = computeAdvancedDiff({
+                        kind: "edit",
+                        filePath,
+                        oldString: args.old_string || "",
+                        newString: args.new_string || "",
+                        replaceAll: args.replace_all
+                      });
+                      if (result.mode === "advanced") {
+                        precomputedDiffsRef.current.set(toolCallId, result);
+                      }
+                    }
+                  }
+                } else if (isPatchTool(toolName) && args.input) {
+                  const operations = parsePatchOperations(args.input);
+                  for (const op of operations) {
+                    const key = `${toolCallId}:${op.path}`;
+                    if (op.kind === "add" || op.kind === "update") {
+                      const result = parsePatchToAdvancedDiff(op.patchLines, op.path);
+                      if (result) {
+                        precomputedDiffsRef.current.set(key, result);
+                      }
+                    }
+                  }
+                }
+              } catch {}
+            }
             const autoAllowedWithResults = await executeAutoAllowedTools(autoAllowed, (chunk) => onChunk(buffersRef.current, chunk));
             const autoDeniedWithReasons = autoDenied.map((ac) => {
               const reason = ac.permission.reason ? `Permission denied: ${ac.permission.reason}` : ("matchedRule" in ac.permission) && ac.permission.matchedRule ? `Permission denied by rule: ${ac.permission.matchedRule}` : "Permission denied: Unknown";
@@ -69633,13 +71207,18 @@ DO NOT respond to these messages or otherwise consider them in your response unl
     appendError,
     setStreaming
   ]);
-  const handleApproveCurrent = import_react69.useCallback(async () => {
+  const handleApproveCurrent = import_react69.useCallback(async (diffs) => {
     if (isExecutingTool)
       return;
     const currentIndex = approvalResults.length;
     const currentApproval2 = pendingApprovals[currentIndex];
     if (!currentApproval2)
       return;
+    if (diffs) {
+      for (const [key, diff2] of diffs) {
+        precomputedDiffsRef.current.set(key, diff2);
+      }
+    }
     setIsExecutingTool(true);
     try {
       const decision = {
@@ -69667,7 +71246,7 @@ DO NOT respond to these messages or otherwise consider them in your response unl
     isExecutingTool,
     setStreaming
   ]);
-  const handleApproveAlways = import_react69.useCallback(async (scope) => {
+  const handleApproveAlways = import_react69.useCallback(async (scope, diffs) => {
     if (isExecutingTool)
       return;
     if (pendingApprovals.length === 0 || approvalContexts.length === 0)
@@ -69689,7 +71268,7 @@ DO NOT respond to these messages or otherwise consider them in your response unl
     });
     buffersRef.current.order.push(cmdId);
     refreshDerived();
-    await handleApproveCurrent();
+    await handleApproveCurrent(diffs);
   }, [
     approvalResults,
     approvalContexts,
@@ -70107,7 +71686,7 @@ Consider switching to a different system prompt using /system to match.` : null;
       const planFilePath = permissionMode2.getPlanFilePath();
       handlePlanKeepPlanning(`You must write your plan to the plan file before exiting plan mode.
 ` + `Plan file path: ${planFilePath || "not set"}
-` + `Use the Write tool to create your plan, then call ExitPlanMode again.`);
+` + `Use a write tool (e.g. Write, ApplyPatch, etc.) to create your plan, then call ExitPlanMode again.`);
     }
   }, [pendingApprovals, approvalResults.length, handlePlanKeepPlanning]);
   const handleQuestionSubmit = import_react69.useCallback(async (answers) => {
@@ -70303,7 +71882,8 @@ Plan file path: ${planFilePath}`;
           }, undefined, false, undefined, this) : item.kind === "assistant" ? /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(AssistantMessage, {
             line: item
           }, undefined, false, undefined, this) : item.kind === "tool_call" ? /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(ToolCallMessage, {
-            line: item
+            line: item,
+            precomputedDiffs: precomputedDiffsRef.current
           }, undefined, false, undefined, this) : item.kind === "subagent_group" ? /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(SubagentGroupStatic, {
             agents: item.agents
           }, undefined, false, undefined, this) : item.kind === "error" ? /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(ErrorMessage, {
@@ -70342,7 +71922,8 @@ Plan file path: ${planFilePath}`;
                   }, undefined, false, undefined, this) : ln.kind === "assistant" ? /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(AssistantMessage, {
                     line: ln
                   }, undefined, false, undefined, this) : ln.kind === "tool_call" ? /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(ToolCallMessage, {
-                    line: ln
+                    line: ln,
+                    precomputedDiffs: precomputedDiffsRef.current
                   }, undefined, false, undefined, this) : ln.kind === "error" ? /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(ErrorMessage, {
                     line: ln
                   }, undefined, false, undefined, this) : ln.kind === "status" ? /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(StatusMessage, {
@@ -70355,11 +71936,9 @@ Plan file path: ${planFilePath}`;
                 }, ln.id, false, undefined, this))
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(SubagentGroupDisplay, {}, undefined, false, undefined, this),
-              liveItems.length === 0 && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Box_default, {
-                height: 1
-              }, undefined, false, undefined, this),
               showExitStats && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Box_default, {
                 flexDirection: "column",
+                marginTop: 1,
                 children: [
                   /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Text, {
                     dimColor: true,
@@ -70372,7 +71951,7 @@ Plan file path: ${planFilePath}`;
                     children: "Resume this agent with:"
                   }, undefined, false, undefined, this),
                   /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Text, {
-                    color: "blue",
+                    color: colors.link.url,
                     children: [
                       "letta --agent ",
                       agentId
@@ -70380,25 +71959,28 @@ Plan file path: ${planFilePath}`;
                   }, undefined, true, undefined, this)
                 ]
               }, undefined, true, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Input, {
-                visible: !showExitStats && pendingApprovals.length === 0 && !anySelectorOpen,
-                streaming: streaming && !abortControllerRef.current?.signal.aborted,
-                tokenCount,
-                thinkingMessage,
-                onSubmit,
-                onBashSubmit: handleBashSubmit,
-                permissionMode: uiPermissionMode,
-                onPermissionModeChange: handlePermissionModeChange,
-                onExit: handleExit,
-                onInterrupt: handleInterrupt,
-                interruptRequested,
-                agentId,
-                agentName,
-                currentModel: currentModelDisplay,
-                currentModelProvider,
-                messageQueue,
-                onEnterQueueEditMode: handleEnterQueueEditMode,
-                onEscapeCancel: profileConfirmPending ? handleProfileEscapeCancel : undefined
+              /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Box_default, {
+                marginTop: liveItems.length > 0 ? 0 : 1,
+                children: /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Input, {
+                  visible: !showExitStats && pendingApprovals.length === 0 && !anySelectorOpen,
+                  streaming: streaming && !abortControllerRef.current?.signal.aborted,
+                  tokenCount,
+                  thinkingMessage,
+                  onSubmit,
+                  onBashSubmit: handleBashSubmit,
+                  permissionMode: uiPermissionMode,
+                  onPermissionModeChange: handlePermissionModeChange,
+                  onExit: handleExit,
+                  onInterrupt: handleInterrupt,
+                  interruptRequested,
+                  agentId,
+                  agentName,
+                  currentModel: currentModelDisplay,
+                  currentModelProvider,
+                  messageQueue,
+                  onEnterQueueEditMode: handleEnterQueueEditMode,
+                  onEscapeCancel: profileConfirmPending ? handleProfileEscapeCancel : undefined
+                }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
               activeOverlay === "model" && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(ModelSelector, {
                 currentModelId: currentModelId ?? undefined,
@@ -70571,64 +72153,36 @@ Plan file path: ${planFilePath}`;
                 },
                 onCancel: closeOverlay
               }, undefined, false, undefined, this),
-              currentApproval?.toolName === "ExitPlanMode" && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(jsx_dev_runtime50.Fragment, {
-                children: [
-                  /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Box_default, {
-                    height: 1
-                  }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(PlanModeDialog, {
-                    plan: readPlanFile(),
-                    onApprove: () => handlePlanApprove(false),
-                    onApproveAndAcceptEdits: () => handlePlanApprove(true),
-                    onKeepPlanning: handlePlanKeepPlanning
-                  }, undefined, false, undefined, this)
-                ]
-              }, undefined, true, undefined, this),
-              currentApproval?.toolName === "AskUserQuestion" && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(jsx_dev_runtime50.Fragment, {
-                children: [
-                  /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Box_default, {
-                    height: 1
-                  }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(QuestionDialog, {
-                    questions: getQuestionsFromApproval(currentApproval),
-                    onSubmit: handleQuestionSubmit
-                  }, undefined, false, undefined, this)
-                ]
-              }, undefined, true, undefined, this),
-              currentApproval?.toolName === "EnterPlanMode" && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(jsx_dev_runtime50.Fragment, {
-                children: [
-                  /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Box_default, {
-                    height: 1
-                  }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(EnterPlanModeDialog, {
-                    onApprove: handleEnterPlanModeApprove,
-                    onReject: handleEnterPlanModeReject
-                  }, undefined, false, undefined, this)
-                ]
-              }, undefined, true, undefined, this),
-              currentApproval && !isFancyUITool(currentApproval.toolName) && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(jsx_dev_runtime50.Fragment, {
-                children: [
-                  /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(Box_default, {
-                    height: 1
-                  }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(ApprovalDialog, {
-                    approvals: [currentApproval],
-                    approvalContexts: approvalContexts[approvalResults.length] ? [
-                      approvalContexts[approvalResults.length]
-                    ] : [],
-                    progress: {
-                      current: approvalResults.length + 1,
-                      total: pendingApprovals.length
-                    },
-                    totalTools: autoHandledResults.length + pendingApprovals.length,
-                    isExecuting: isExecutingTool,
-                    onApproveAll: handleApproveCurrent,
-                    onApproveAlways: handleApproveAlways,
-                    onDenyAll: handleDenyCurrent,
-                    onCancel: handleCancelApprovals
-                  }, undefined, false, undefined, this)
-                ]
-              }, undefined, true, undefined, this)
+              currentApproval?.toolName === "ExitPlanMode" && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(PlanModeDialog, {
+                plan: readPlanFile(),
+                onApprove: () => handlePlanApprove(false),
+                onApproveAndAcceptEdits: () => handlePlanApprove(true),
+                onKeepPlanning: handlePlanKeepPlanning
+              }, undefined, false, undefined, this),
+              currentApproval?.toolName === "AskUserQuestion" && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(QuestionDialog, {
+                questions: getQuestionsFromApproval(currentApproval),
+                onSubmit: handleQuestionSubmit
+              }, undefined, false, undefined, this),
+              currentApproval?.toolName === "EnterPlanMode" && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(EnterPlanModeDialog, {
+                onApprove: handleEnterPlanModeApprove,
+                onReject: handleEnterPlanModeReject
+              }, undefined, false, undefined, this),
+              currentApproval && !isFancyUITool(currentApproval.toolName) && /* @__PURE__ */ jsx_dev_runtime50.jsxDEV(ApprovalDialog, {
+                approvals: [currentApproval],
+                approvalContexts: approvalContexts[approvalResults.length] ? [
+                  approvalContexts[approvalResults.length]
+                ] : [],
+                progress: {
+                  current: approvalResults.length + 1,
+                  total: pendingApprovals.length
+                },
+                totalTools: autoHandledResults.length + pendingApprovals.length,
+                isExecuting: isExecutingTool,
+                onApproveAll: handleApproveCurrent,
+                onApproveAlways: handleApproveAlways,
+                onDenyAll: handleDenyCurrent,
+                onCancel: handleCancelApprovals
+              }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this)
         ]
@@ -70653,9 +72207,12 @@ var init_App2 = __esm(async () => {
   init_manager3();
   init_mcp();
   init_profile();
+  init_colors();
   init_SessionStats();
   init_accumulator();
+  init_diff2();
   init_errorFormatter();
+  init_formatArgsDisplay();
   init_memoryReminder();
   init_pasteRegistry();
   init_planName();
@@ -71909,16 +73466,26 @@ class PermissionModeManager {
           "Write",
           "Edit",
           "MultiEdit",
-          "NotebookEdit",
           "apply_patch",
-          "ApplyPatch"
+          "ApplyPatch",
+          "write_file_gemini",
+          "WriteFileGemini",
+          "replace",
+          "Replace"
         ];
         if (allowedInPlan.includes(toolName)) {
           return "allow";
         }
         if (writeTools.includes(toolName)) {
           const planFilePath = this.getPlanFilePath();
-          const targetPath = toolArgs?.file_path || toolArgs?.path;
+          let targetPath = toolArgs?.file_path || toolArgs?.path;
+          if ((toolName === "ApplyPatch" || toolName === "apply_patch") && toolArgs?.input) {
+            const input = toolArgs.input;
+            const match = input.match(/\*\*\* (?:Add|Update|Delete) File:\s*(.+)/);
+            if (match?.[1]) {
+              targetPath = match[1].trim();
+            }
+          }
           if (planFilePath && targetPath && targetPath === planFilePath) {
             return "allow";
           }
@@ -73304,4 +74871,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=36BBA221BCCDEE8B64756E2164756E21
+//# debugId=87E9178478E6BF4964756E2164756E21