pybao-cli 1.3.61 → 1.3.63

package/dist/{chunk-YCYQLJZ4.js → chunk-ZQF3JNND.js}

@@ -1,8 +1,25 @@
 import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
+import {
+  loadPybAgentSessionMessages
+} from "./chunk-FZ33A73T.js";
 import {
   listPybAgentSessions
-} from "./chunk-JXPU7KX4.js";
+} from "./chunk-NZMZFOHR.js";
+import {
+  appendSessionCustomTitleRecord,
+  appendSessionJsonlFromMessage,
+  appendSessionTagRecord
+} from "./chunk-SFR3TP23.js";
+import {
+  fetchCustomModels,
+  getModelFeatures
+} from "./chunk-RPBHMFRQ.js";
+import {
+  queryLLM,
+  queryQuick,
+  verifyApiKey
+} from "./chunk-FSIAWTBZ.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -16,11 +33,11 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-TDCCSW57.js";
+} from "./chunk-ZLHQG6DX.js";
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-YH5MHBEP.js";
+} from "./chunk-AKXEHZ7A.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -33,15 +50,55 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-UPM6LKXT.js";
+} from "./chunk-MR6HRZTD.js";
 import {
-  loadPybAgentSessionMessages
-} from "./chunk-Y4MFP2PI.js";
+  emitReminderEvent,
+  generateSystemReminders,
+  getAgentFilePath,
+  getTodos,
+  resetReminderSession,
+  setTodos,
+  systemReminderService
+} from "./chunk-7B65UVZB.js";
 import {
-  appendSessionCustomTitleRecord,
-  appendSessionJsonlFromMessage,
-  appendSessionTagRecord
-} from "./chunk-6PWUBWII.js";
+  getSessionState
+} from "./chunk-ERMQRV55.js";
+import {
+  clearAgentCache,
+  getActiveAgents,
+  getAgentByType,
+  getAllAgents
+} from "./chunk-UDC5YCXW.js";
+import {
+  API_ERROR_MESSAGE_PREFIX,
+  CANCEL_MESSAGE,
+  CREDIT_BALANCE_TOO_LOW_ERROR_MESSAGE,
+  INTERRUPT_MESSAGE,
+  INTERRUPT_MESSAGE_FOR_TOOL_USE,
+  INVALID_API_KEY_ERROR_MESSAGE,
+  NO_CONTENT_MESSAGE,
+  NO_RESPONSE_REQUESTED,
+  PROMPT_TOO_LONG_ERROR_MESSAGE,
+  REJECT_MESSAGE,
+  REJECT_MESSAGE_WITH_FEEDBACK_PREFIX,
+  SYNTHETIC_ASSISTANT_MESSAGES,
+  createAssistantMessage,
+  createProgressMessage,
+  createUserMessage,
+  extractTag,
+  getErroredToolUseMessages,
+  getInProgressToolUseIDs,
+  getLastAssistantMessageId,
+  getToolUseID,
+  getUnresolvedToolUseIDs,
+  isEmptyMessageText,
+  isNotEmptyMessage,
+  normalizeMessages,
+  normalizeMessagesForAPI,
+  processUserInput,
+  reorderMessages,
+  stripSystemMessages
+} from "./chunk-VMXD4DPP.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -58,7 +115,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-TOFBGLUH.js";
+} from "./chunk-B3L6T5WY.js";
 import {
   getPybAgentSessionId,
   setPybAgentSessionId
@@ -71,105 +128,48 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-IIWES7RB.js";
-import {
-  fetchCustomModels,
-  getModelFeatures
-} from "./chunk-IHAFN2IR.js";
-import {
-  queryLLM,
-  queryQuick,
-  verifyApiKey
-} from "./chunk-PBX3ZVXF.js";
+} from "./chunk-GIC3LEOF.js";
 import {
   listAllContentFiles,
   ripGrep,
   tree
-} from "./chunk-6VBVWVVU.js";
+} from "./chunk-EQGVECW5.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-EFIY2OBF.js";
+} from "./chunk-YJQFTMXY.js";
+import {
+  getSessionPlugins
+} from "./chunk-BJSWTHRM.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-UVXNKM7B.js";
+} from "./chunk-4HB7MQDC.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback
-} from "./chunk-GRFWVW5Q.js";
+} from "./chunk-KBZBNDRL.js";
 import {
   applyToolPermissionContextUpdate,
   createDefaultToolPermissionContext
 } from "./chunk-UNNVICVU.js";
-import {
-  emitReminderEvent,
-  generateSystemReminders,
-  getAgentFilePath,
-  getTodos,
-  resetReminderSession,
-  setTodos,
-  systemReminderService
-} from "./chunk-LPZM3TPE.js";
-import {
-  getSessionState
-} from "./chunk-ERMQRV55.js";
-import {
-  clearAgentCache,
-  getActiveAgents,
-  getAgentByType,
-  getAllAgents
-} from "./chunk-WDMJBURS.js";
-import {
-  getSessionPlugins
-} from "./chunk-BJSWTHRM.js";
-import {
-  API_ERROR_MESSAGE_PREFIX,
-  CANCEL_MESSAGE,
-  CREDIT_BALANCE_TOO_LOW_ERROR_MESSAGE,
-  INTERRUPT_MESSAGE,
-  INTERRUPT_MESSAGE_FOR_TOOL_USE,
-  INVALID_API_KEY_ERROR_MESSAGE,
-  NO_CONTENT_MESSAGE,
-  NO_RESPONSE_REQUESTED,
-  PROMPT_TOO_LONG_ERROR_MESSAGE,
-  REJECT_MESSAGE,
-  REJECT_MESSAGE_WITH_FEEDBACK_PREFIX,
-  SYNTHETIC_ASSISTANT_MESSAGES,
-  createAssistantMessage,
-  createProgressMessage,
-  createUserMessage,
-  extractTag,
-  getErroredToolUseMessages,
-  getInProgressToolUseIDs,
-  getLastAssistantMessageId,
-  getToolUseID,
-  getUnresolvedToolUseIDs,
-  isEmptyMessageText,
-  isNotEmptyMessage,
-  normalizeMessages,
-  normalizeMessagesForAPI,
-  processUserInput,
-  reorderMessages,
-  stripSystemMessages
-} from "./chunk-IAEGVIG2.js";
 import {
   ModelManager,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-3NDYIVBC.js";
+} from "./chunk-6OFYDHOG.js";
 import {
   getCodeStyle,
   getContext,
   getGitState,
   getIsGit,
   getProjectDocs
-} from "./chunk-5532VV4Q.js";
+} from "./chunk-5764Z4HA.js";
 import {
   getTheme
-} from "./chunk-2GJIHGW2.js";
+} from "./chunk-QJN2OEN4.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -182,7 +182,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-QQAZYIJT.js";
+} from "./chunk-E4522PV7.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -191,7 +191,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-HNN3HQ4F.js";
+} from "./chunk-NSLPJVLG.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -227,10 +227,10 @@ import {
   renderBashNotification,
   setActivePlanConversationKey,
   setCwd
-} from "./chunk-K27QB3XA.js";
+} from "./chunk-PYJ5LALG.js";
 import {
   MACRO
-} from "./chunk-6LGTEHBU.js";
+} from "./chunk-DGZHUQKC.js";
 import {
   formatTotalCost,
   getTotalAPIDuration,
@@ -245,7 +245,7 @@ import {
 // src/tools/system/BashTool/BashTool.tsx
 import { statSync as statSync12 } from "fs";
 import { EOL as EOL3 } from "os";
-import { isAbsolute as isAbsolute10, relative as relative13, resolve as resolve11 } from "path";
+import { isAbsolute as isAbsolute9, relative as relative13, resolve as resolve10 } from "path";
 import * as React109 from "react";
 import { z as z16 } from "zod";
 
@@ -418,7 +418,7 @@ var getCommandSubcommandPrefix = memoize(
 var getCommandPrefix = memoize(
   async (command4, abortSignal) => {
     const { systemPrompt, userPrompt } = buildBashCommandPrefixDetectionPrompt(command4);
-    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-2R3YDGM5.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-NW2S47DG.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -941,8 +941,8 @@ async function shouldAllowNetworkRequest(query2) {
 }
 async function serializePermissionPrompt(task) {
   let release = null;
-  const next = new Promise((resolve12) => {
-    release = resolve12;
+  const next = new Promise((resolve11) => {
+    release = resolve11;
   });
   const prev = active.permissionPromptChain;
   active.permissionPromptChain = prev.then(() => next);
@@ -975,18 +975,18 @@ async function cleanupSandboxNetworkInfrastructure() {
   active.sessionDeniedHosts.clear();
   active.inflightPermissionRequests.clear();
   await Promise.allSettled([
-    httpServer ? new Promise((resolve12) => {
+    httpServer ? new Promise((resolve11) => {
       try {
-        httpServer.close(() => resolve12());
+        httpServer.close(() => resolve11());
       } catch {
-        resolve12();
+        resolve11();
       }
     }) : Promise.resolve(),
-    socksServer ? new Promise((resolve12) => {
+    socksServer ? new Promise((resolve11) => {
       try {
-        socksServer.close(() => resolve12());
+        socksServer.close(() => resolve11());
       } catch {
-        resolve12();
+        resolve11();
       }
     }) : Promise.resolve()
   ]);
@@ -1176,7 +1176,7 @@ async function startHttpProxy() {
     clientSocket.on("data", onData);
   });
   active.httpProxyServer = server;
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve11, reject) => {
     server.once("error", reject);
     server.once("listening", () => {
       const addr = server.address();
@@ -1185,7 +1185,7 @@ async function startHttpProxy() {
         return;
       }
       server.unref();
-      resolve12(addr.port);
+      resolve11(addr.port);
     });
     server.listen(0, "127.0.0.1");
   });
@@ -1295,7 +1295,7 @@ async function startSocks5Proxy() {
     socket.on("data", onData);
   });
   active.socksProxyServer = server;
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve11, reject) => {
     server.once("error", reject);
     server.once("listening", () => {
       const addr = server.address();
@@ -1304,7 +1304,7 @@ async function startSocks5Proxy() {
         return;
       }
       server.unref();
-      resolve12(addr.port);
+      resolve11(addr.port);
     });
     server.listen(0, "127.0.0.1");
   });
@@ -4458,7 +4458,7 @@ function formatParseError(error) {
   return error instanceof Error ? error.message : String(error);
 }
 async function defaultGateQuery(args) {
-  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-2R3YDGM5.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-NW2S47DG.js");
   const messages = [
     {
       type: "user",
@@ -5645,9 +5645,9 @@ function Select({
 }
 
 // src/tools/filesystem/FileEditTool/FileEditTool.tsx
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, statSync as statSync4 } from "fs";
+import { mkdirSync as mkdirSync2, statSync as statSync4 } from "fs";
 import { Box as Box11, Text as Text12 } from "ink";
-import { dirname as dirname3, isAbsolute as isAbsolute5, relative as relative5, resolve as resolve5 } from "path";
+import { dirname as dirname3, isAbsolute as isAbsolute4, relative as relative5, resolve as resolve4 } from "path";
 import * as React12 from "react";
 import { z as z3 } from "zod";
 
@@ -6498,50 +6498,29 @@ var NotebookEditTool = {
 };
 
 // src/tools/filesystem/FileEditTool/prompt.ts
-var DESCRIPTION2 = `Performs smart string replacements in files. 
+var DESCRIPTION2 = `Performs smart string replacements in files using SEARCH/REPLACE blocks.
 
 Usage:
-- You must use your \`Read\` tool at least once in the conversation before editing. This tool will error if you attempt an edit without reading the file. 
-- When editing text from Read tool output, ensure you preserve the exact indentation (tabs/spaces) as it appears AFTER the line number prefix. The line number prefix format is: spaces + line number + tab. Everything after that tab is the actual file content to match. Never include any part of the line number prefix in the old_string or new_string.
-- **Smart Matching**: The tool uses a 9-layer fuzzy matching engine. It can locate code even if there are minor differences in indentation, whitespace, or even slight typos in the \`old_string\`.
-- **Robustness**: It handles common LLM errors (e.g., mismatched spaces, missing newlines) automatically.
-- ALWAYS prefer editing existing files in the codebase. NEVER write new files unless explicitly required.
-- Only use emojis if the user explicitly requests it. Avoid adding emojis to files unless asked.
-- The edit will FAIL if \`old_string\` is not unique in the file. Either provide a larger string with more surrounding context to make it unique or use \`replace_all\` to change every instance of \`old_string\`. 
-- Use \`replace_all\` for replacing and renaming strings across the file. This parameter is useful if you want to rename a variable for instance.`.trim();
-
-// src/tools/filesystem/FileEditTool/utils.ts
-import { isAbsolute as isAbsolute4, resolve as resolve4 } from "path";
+1. **Read First**: You must use your \`Read\` tool at least once before editing.
+2. **Block Format**: Provide changes as one or more SEARCH/REPLACE blocks.
+   \`\`\`
+   <<<<<<< SEARCH
+   [original code to replace]
+   =======
+   [new code to insert]
+   >>>>>>> REPLACE
+   \`\`\`
+3. **Multiple Edits**: You can provide multiple blocks in a single turn to perform batch edits.
+4. **Context**: Include enough surrounding lines in the SEARCH block to ensure uniqueness.
+5. **Indentation**: Preserve the exact indentation (tabs/spaces) of the original file in your SEARCH block.
+6. **Smart Matching**: The tool uses a fuzzy matching engine and LSP anchoring. It can locate code even if there are minor differences in whitespace or indentation.
+7. **Thinking**: You can include "thinking" text between blocks; the tool will ignore it.
 
-// src/utils/text/diff.ts
-import { structuredPatch } from "diff";
-var CONTEXT_LINES = 3;
-var AMPERSAND_TOKEN = "<<:AMPERSAND_TOKEN:>>";
-var DOLLAR_TOKEN = "<<:DOLLAR_TOKEN:>>";
-function getPatch({
-  filePath,
-  fileContents,
-  oldStr,
-  newStr
-}) {
-  return structuredPatch(
-    filePath,
-    filePath,
-    fileContents.replaceAll("&", AMPERSAND_TOKEN).replaceAll("$", DOLLAR_TOKEN),
-    fileContents.replaceAll("&", AMPERSAND_TOKEN).replaceAll("$", DOLLAR_TOKEN).replace(
-      oldStr.replaceAll("&", AMPERSAND_TOKEN).replaceAll("$", DOLLAR_TOKEN),
-      newStr.replaceAll("&", AMPERSAND_TOKEN).replaceAll("$", DOLLAR_TOKEN)
-    ),
-    void 0,
-    void 0,
-    { context: CONTEXT_LINES }
-  ).hunks.map((_) => ({
-    ..._,
-    lines: _.lines.map(
-      (_2) => _2.replaceAll(AMPERSAND_TOKEN, "&").replaceAll(DOLLAR_TOKEN, "$")
-    )
-  }));
-}
+Notes:
+- The edit will FAIL if the SEARCH block matches multiple locations (ambiguous). Provide more context.
+- To delete code, leave the REPLACE section empty.
+- ALWAYS prefer editing existing files. NEVER write new files unless explicitly required.
+`.trim();
 
 // src/utils/terminal/paste.ts
 function normalizeLineEndings(text) {
@@ -6571,396 +6550,46 @@ function shouldAggregatePasteChunk(input, hasPendingTimeout) {
   return false;
 }
 
-// src/utils/text/smart-edit/levenshtein.ts
-function levenshtein(a, b) {
-  if (a === "" || b === "") {
-    return Math.max(a.length, b.length);
-  }
-  const matrix = Array.from(
-    { length: a.length + 1 },
-    (_, i) => Array.from({ length: b.length + 1 }, (_2, j) => i === 0 ? j : j === 0 ? i : 0)
-  );
-  for (let i = 1; i <= a.length; i++) {
-    for (let j = 1; j <= b.length; j++) {
-      const cost2 = a[i - 1] === b[j - 1] ? 0 : 1;
-      matrix[i][j] = Math.min(matrix[i - 1][j] + 1, matrix[i][j - 1] + 1, matrix[i - 1][j - 1] + cost2);
-    }
-  }
-  return matrix[a.length][b.length];
-}
-
-// src/utils/text/smart-edit/replacers.ts
-var SimpleReplacer = function* (_content, find) {
-  yield find;
-};
-var LineTrimmedReplacer = function* (content, find) {
-  const originalLines = content.split("\n");
-  const searchLines = find.split("\n");
-  if (searchLines[searchLines.length - 1] === "") {
-    searchLines.pop();
-  }
-  for (let i = 0; i <= originalLines.length - searchLines.length; i++) {
-    let matches = true;
-    for (let j = 0; j < searchLines.length; j++) {
-      const originalTrimmed = originalLines[i + j].trim();
-      const searchTrimmed = searchLines[j].trim();
-      if (originalTrimmed !== searchTrimmed) {
-        matches = false;
-        break;
-      }
-    }
-    if (matches) {
-      let matchStartIndex = 0;
-      for (let k = 0; k < i; k++) {
-        matchStartIndex += originalLines[k].length + 1;
-      }
-      let matchEndIndex = matchStartIndex;
-      for (let k = 0; k < searchLines.length; k++) {
-        matchEndIndex += originalLines[i + k].length;
-        if (k < searchLines.length - 1) {
-          matchEndIndex += 1;
-        }
-      }
-      yield content.substring(matchStartIndex, matchEndIndex);
-    }
-  }
-};
-var SINGLE_CANDIDATE_SIMILARITY_THRESHOLD = 0;
-var MULTIPLE_CANDIDATES_SIMILARITY_THRESHOLD = 0.3;
-var WhitespaceNormalizedReplacer = function* (content, find) {
-  const tokens = find.split(/\s+/).filter((t) => t.length > 0);
-  if (tokens.length === 0) return;
-  const pattern = tokens.map((token) => token.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("\\s+");
-  try {
-    const regex = new RegExp(pattern, "g");
-    let match;
-    while ((match = regex.exec(content)) !== null) {
-      yield match[0];
-    }
-  } catch (e) {
-  }
-};
-var BlockAnchorReplacer = function* (content, find) {
-  const originalLines = content.split("\n");
-  const searchLines = find.split("\n");
-  if (searchLines.length < 3) {
-    return;
-  }
-  if (searchLines[searchLines.length - 1] === "") {
-    searchLines.pop();
-  }
-  const firstLineSearch = searchLines[0].trim();
-  const lastLineSearch = searchLines[searchLines.length - 1].trim();
-  const searchBlockSize = searchLines.length;
-  const candidates = [];
-  for (let i = 0; i < originalLines.length; i++) {
-    if (originalLines[i].trim() !== firstLineSearch) {
-      continue;
-    }
-    for (let j = i + 2; j < originalLines.length; j++) {
-      if (originalLines[j].trim() === lastLineSearch) {
-        candidates.push({ startLine: i, endLine: j });
-        break;
-      }
-    }
-  }
-  if (candidates.length === 0) {
-    return;
-  }
-  if (candidates.length === 1) {
-    const { startLine, endLine } = candidates[0];
-    const actualBlockSize = endLine - startLine + 1;
-    let similarity = 0;
-    let linesToCheck = Math.min(searchBlockSize - 2, actualBlockSize - 2);
-    if (linesToCheck > 0) {
-      for (let j = 1; j < searchBlockSize - 1 && j < actualBlockSize - 1; j++) {
-        const originalLine = originalLines[startLine + j].trim();
-        const searchLine = searchLines[j].trim();
-        const maxLen = Math.max(originalLine.length, searchLine.length);
-        if (maxLen === 0) {
-          continue;
-        }
-        const distance = levenshtein(originalLine, searchLine);
-        similarity += (1 - distance / maxLen) / linesToCheck;
-        if (similarity >= SINGLE_CANDIDATE_SIMILARITY_THRESHOLD) {
-          break;
-        }
-      }
-    } else {
-      similarity = 1;
-    }
-    if (similarity >= SINGLE_CANDIDATE_SIMILARITY_THRESHOLD) {
-      let matchStartIndex = 0;
-      for (let k = 0; k < startLine; k++) {
-        matchStartIndex += originalLines[k].length + 1;
-      }
-      let matchEndIndex = matchStartIndex;
-      for (let k = startLine; k <= endLine; k++) {
-        matchEndIndex += originalLines[k].length;
-        if (k < endLine) {
-          matchEndIndex += 1;
-        }
-      }
-      yield content.substring(matchStartIndex, matchEndIndex);
-    }
-    return;
-  }
-  let bestMatch = null;
-  let maxSimilarity = -1;
-  for (const candidate of candidates) {
-    const { startLine, endLine } = candidate;
-    const actualBlockSize = endLine - startLine + 1;
-    let similarity = 0;
-    let linesToCheck = Math.min(searchBlockSize - 2, actualBlockSize - 2);
-    if (linesToCheck > 0) {
-      for (let j = 1; j < searchBlockSize - 1 && j < actualBlockSize - 1; j++) {
-        const originalLine = originalLines[startLine + j].trim();
-        const searchLine = searchLines[j].trim();
-        const maxLen = Math.max(originalLine.length, searchLine.length);
-        if (maxLen === 0) {
-          continue;
-        }
-        const distance = levenshtein(originalLine, searchLine);
-        similarity += 1 - distance / maxLen;
-      }
-      similarity /= linesToCheck;
-    } else {
-      similarity = 1;
-    }
-    if (similarity > maxSimilarity) {
-      maxSimilarity = similarity;
-      bestMatch = candidate;
-    }
-  }
-  if (maxSimilarity >= MULTIPLE_CANDIDATES_SIMILARITY_THRESHOLD && bestMatch) {
-    const { startLine, endLine } = bestMatch;
-    let matchStartIndex = 0;
-    for (let k = 0; k < startLine; k++) {
-      matchStartIndex += originalLines[k].length + 1;
-    }
-    let matchEndIndex = matchStartIndex;
-    for (let k = startLine; k <= endLine; k++) {
-      matchEndIndex += originalLines[k].length;
-      if (k < endLine) {
-        matchEndIndex += 1;
-      }
-    }
-    yield content.substring(matchStartIndex, matchEndIndex);
-  }
-};
-var IndentationFlexibleReplacer = function* (content, find) {
-  const removeIndentation = (text) => {
-    const lines = text.split("\n");
-    const nonEmptyLines = lines.filter((line) => line.trim().length > 0);
-    if (nonEmptyLines.length === 0) return text;
-    const minIndent = Math.min(
-      ...nonEmptyLines.map((line) => {
-        const match = line.match(/^(\s*)/);
-        return match ? match[1].length : 0;
-      })
-    );
-    return lines.map((line) => line.trim().length === 0 ? line : line.slice(minIndent)).join("\n");
-  };
-  const normalizedFind = removeIndentation(find);
-  const contentLines = content.split("\n");
-  const findLines = find.split("\n");
-  for (let i = 0; i <= contentLines.length - findLines.length; i++) {
-    const block = contentLines.slice(i, i + findLines.length).join("\n");
-    if (removeIndentation(block) === normalizedFind) {
-      yield block;
-    }
-  }
-};
-var EscapeNormalizedReplacer = function* (content, find) {
-  const unescapeString = (str) => {
-    return str.replace(/\\(n|t|r|'|"|`|\\|\n|\$)/g, (match, capturedChar) => {
-      switch (capturedChar) {
-        case "n":
-          return "\n";
-        case "t":
-          return "	";
-        case "r":
-          return "\r";
-        case "'":
-          return "'";
-        case '"':
-          return '"';
-        case "`":
-          return "`";
-        case "\\":
-          return "\\";
-        case "\n":
-          return "\n";
-        case "$":
-          return "$";
-        default:
-          return match;
-      }
-    });
-  };
-  const unescapedFind = unescapeString(find);
-  if (content.includes(unescapedFind)) {
-    yield unescapedFind;
-  }
-  const lines = content.split("\n");
-  const findLines = unescapedFind.split("\n");
-  for (let i = 0; i <= lines.length - findLines.length; i++) {
-    const block = lines.slice(i, i + findLines.length).join("\n");
-    const unescapedBlock = unescapeString(block);
-    if (unescapedBlock === unescapedFind) {
-      yield block;
-    }
-  }
-};
-var MultiOccurrenceReplacer = function* (content, find) {
-  let startIndex = 0;
-  while (true) {
-    const index = content.indexOf(find, startIndex);
-    if (index === -1) break;
-    yield find;
-    startIndex = index + find.length;
-  }
-};
-var TrimmedBoundaryReplacer = function* (content, find) {
-  const trimmedFind = find.trim();
-  if (trimmedFind === find) {
-    return;
-  }
-  if (content.includes(trimmedFind)) {
-    yield trimmedFind;
-  }
-  const lines = content.split("\n");
-  const findLines = find.split("\n");
-  for (let i = 0; i <= lines.length - findLines.length; i++) {
-    const block = lines.slice(i, i + findLines.length).join("\n");
-    if (block.trim() === trimmedFind) {
-      yield block;
-    }
-  }
-};
-var ContextAwareReplacer = function* (content, find) {
-  const findLines = find.split("\n");
-  if (findLines.length < 3) {
-    return;
-  }
-  if (findLines[findLines.length - 1] === "") {
-    findLines.pop();
-  }
-  const contentLines = content.split("\n");
-  const firstLine = findLines[0].trim();
-  const lastLine = findLines[findLines.length - 1].trim();
-  for (let i = 0; i < contentLines.length; i++) {
-    if (contentLines[i].trim() !== firstLine) continue;
-    for (let j = i + 2; j < contentLines.length; j++) {
-      if (contentLines[j].trim() === lastLine) {
-        const blockLines = contentLines.slice(i, j + 1);
-        const block = blockLines.join("\n");
-        if (blockLines.length === findLines.length) {
-          let matchingLines = 0;
-          let totalNonEmptyLines = 0;
-          for (let k = 1; k < blockLines.length - 1; k++) {
-            const blockLine = blockLines[k].trim();
-            const findLine = findLines[k].trim();
-            if (blockLine.length > 0 || findLine.length > 0) {
-              totalNonEmptyLines++;
-              if (blockLine === findLine) {
-                matchingLines++;
-              }
-            }
-          }
-          if (totalNonEmptyLines === 0 || matchingLines / totalNonEmptyLines >= 0.5) {
-            yield block;
-            break;
-          }
-        }
-        break;
-      }
-    }
-  }
-};
-
-// src/utils/text/smart-edit/index.ts
-var SmartEdit = {
-  levenshtein,
-  replace: (content, oldString, newString, replaceAll = false) => {
-    if (oldString === newString) {
-      throw new Error("oldString and newString must be different");
-    }
-    let notFound = true;
-    for (const replacer of [
-      SimpleReplacer,
-      LineTrimmedReplacer,
-      BlockAnchorReplacer,
-      WhitespaceNormalizedReplacer,
-      IndentationFlexibleReplacer,
-      EscapeNormalizedReplacer,
-      TrimmedBoundaryReplacer,
-      ContextAwareReplacer,
-      MultiOccurrenceReplacer
-    ]) {
-      for (const search of replacer(content, oldString)) {
-        const index = content.indexOf(search);
-        if (index === -1) continue;
-        notFound = false;
-        if (replaceAll) {
-          return content.replaceAll(search, newString);
-        }
-        return content.substring(0, index) + newString + content.substring(index + search.length);
-      }
-    }
-    if (notFound) {
-      throw new Error("oldString not found in content");
-    }
-    return content;
-  }
-};
-
-// src/tools/filesystem/FileEditTool/utils.ts
-async function applyEdit(file_path, old_string, new_string, replace_all = false) {
-  const fullFilePath = isAbsolute4(file_path) ? file_path : resolve4(getCwd(), file_path);
-  let originalFile;
-  let updatedFile;
-  if (old_string === "") {
-    originalFile = "";
-    updatedFile = normalizeLineEndings(new_string);
-  } else {
-    const fileContent = await readFileBun(fullFilePath);
-    if (!fileContent) {
-      throw new Error("Could not read file");
-    }
-    originalFile = normalizeLineEndings(fileContent);
-    const normalizedOldString = normalizeLineEndings(old_string);
-    const normalizedNewString = normalizeLineEndings(new_string);
-    const oldStringForReplace = normalizedNewString === "" && !normalizedOldString.endsWith("\n") && originalFile.includes(normalizedOldString + "\n") ? normalizedOldString + "\n" : normalizedOldString;
-    updatedFile = SmartEdit.replace(originalFile, oldStringForReplace, normalizedNewString, replace_all);
-    if (updatedFile === originalFile) {
-      throw new Error(
-        "Original and edited file match exactly. Failed to apply edit."
-      );
-    }
-  }
-  const patch = getPatch({
-    filePath: file_path,
-    fileContents: originalFile,
-    oldStr: originalFile,
-    newStr: updatedFile
-  });
-  return { patch, updatedFile };
+// src/utils/text/diff.ts
+import { structuredPatch } from "diff";
+var CONTEXT_LINES = 3;
+var AMPERSAND_TOKEN = "<<:AMPERSAND_TOKEN:>>";
+var DOLLAR_TOKEN = "<<:DOLLAR_TOKEN:>>";
+function getPatch({
+  filePath,
+  fileContents,
+  oldStr,
+  newStr
+}) {
+  return structuredPatch(
+    filePath,
+    filePath,
+    fileContents.replaceAll("&", AMPERSAND_TOKEN).replaceAll("$", DOLLAR_TOKEN),
+    fileContents.replaceAll("&", AMPERSAND_TOKEN).replaceAll("$", DOLLAR_TOKEN).replace(
+      oldStr.replaceAll("&", AMPERSAND_TOKEN).replaceAll("$", DOLLAR_TOKEN),
+      newStr.replaceAll("&", AMPERSAND_TOKEN).replaceAll("$", DOLLAR_TOKEN)
+    ),
+    void 0,
+    void 0,
+    { context: CONTEXT_LINES }
+  ).hunks.map((_) => ({
+    ..._,
+    lines: _.lines.map(
+      (_2) => _2.replaceAll(AMPERSAND_TOKEN, "&").replaceAll(DOLLAR_TOKEN, "$")
+    )
+  }));
 }
 
 // src/tools/filesystem/FileEditTool/FileEditTool.tsx
 var inputSchema3 = z3.strictObject({
   file_path: z3.string().describe("The absolute path to the file to modify"),
-  old_string: z3.string().describe("The text to replace"),
-  new_string: z3.string().describe("The text to replace it with"),
-  replace_all: z3.boolean().optional().describe("Replace all occurences of old_string (default false)"),
-  if_not_contains: z3.string().optional().describe("If this string is present in the file, the edit will be skipped.")
+  edits: z3.string().describe("The SEARCH/REPLACE blocks defining the changes to be made."),
+  verify: z3.boolean().optional().describe("Verify the edit using LSP diagnostics after application. Defaults to false.")
 });
-var N_LINES_SNIPPET = 4;
 var FileEditTool = {
   name: "Edit",
   async description() {
-    return "A tool for editing files";
+    return "A tool for editing files using SEARCH/REPLACE blocks";
   },
   async prompt() {
     return DESCRIPTION2;
@@ -6995,78 +6624,33 @@ var FileEditTool = {
       }
     );
   },
-  renderToolUseRejectedMessage({ file_path, old_string, new_string, replace_all, if_not_contains } = {}, { columns, verbose } = {}) {
+  renderToolUseRejectedMessage({ file_path } = {}, { columns, verbose } = {}) {
     try {
       if (!file_path) {
         return /* @__PURE__ */ React12.createElement(FallbackToolUseRejectedMessage, null);
       }
-      const fullFilePath = isAbsolute5(file_path) ? file_path : resolve5(getCwd(), file_path);
-      let originalFile = "";
-      let updatedFile = "";
-      if (old_string === "") {
-        originalFile = "";
-        updatedFile = normalizeLineEndings(new_string);
-      } else {
-        const enc = detectFileEncoding(fullFilePath);
-        const fileContent = readFileSync2(fullFilePath, enc);
-        originalFile = normalizeLineEndings(fileContent ?? "");
-        const normalizedOldString = normalizeLineEndings(old_string);
-        const normalizedNewString = normalizeLineEndings(new_string);
-        const oldStringForReplace = normalizedNewString === "" && !normalizedOldString.endsWith("\n") && originalFile.includes(normalizedOldString + "\n") ? normalizedOldString + "\n" : normalizedOldString;
-        updatedFile = Boolean(replace_all) ? originalFile.split(oldStringForReplace).join(normalizedNewString) : originalFile.replace(oldStringForReplace, () => normalizedNewString);
-        if (updatedFile === originalFile) {
-          throw new Error(
-            "Original and edited file match exactly. Failed to apply edit."
-          );
-        }
-      }
-      const patch = getPatch({
-        filePath: file_path,
-        fileContents: originalFile,
-        oldStr: originalFile,
-        newStr: updatedFile
-      });
-      return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column" }, /* @__PURE__ */ React12.createElement(Text12, null, "  ", "\u23BF", " ", /* @__PURE__ */ React12.createElement(Text12, { color: getTheme().error }, "User rejected ", old_string === "" ? "write" : "update", " to", " "), /* @__PURE__ */ React12.createElement(Text12, { bold: true }, verbose ? file_path : relative5(getCwd(), file_path))), intersperse(
-        patch.map((patch2) => /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column", paddingLeft: 5, key: patch2.newStart }, /* @__PURE__ */ React12.createElement(StructuredDiff, { patch: patch2, dim: true, width: columns - 12 }))),
-        (i) => /* @__PURE__ */ React12.createElement(Box11, { paddingLeft: 5, key: `ellipsis-${i}` }, /* @__PURE__ */ React12.createElement(Text12, { color: getTheme().secondaryText }, "..."))
-      ));
+      const fullFilePath = isAbsolute4(file_path) ? file_path : resolve4(getCwd(), file_path);
+      return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column" }, /* @__PURE__ */ React12.createElement(Text12, null, "  ", "\u23BF", " ", /* @__PURE__ */ React12.createElement(Text12, { color: getTheme().error }, "User rejected edit to", " "), /* @__PURE__ */ React12.createElement(Text12, { bold: true }, verbose ? file_path : relative5(getCwd(), file_path))));
     } catch (e) {
       logError(e);
       return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column" }, /* @__PURE__ */ React12.createElement(Text12, null, "  ", "\u23BF (No changes)"));
     }
   },
-  async validateInput({ file_path, old_string, new_string, replace_all, if_not_contains }, { readFileTimestamps }) {
-    if (old_string === new_string) {
-      return {
-        result: false,
-        message: "No changes to make: old_string and new_string are exactly the same.",
-        meta: {
-          old_string
+  async validateInput({ file_path, edits, verify }, { readFileTimestamps }) {
+    const fullFilePath = isAbsolute4(file_path) ? file_path : resolve4(getCwd(), file_path);
+    if (!fileExistsBun(fullFilePath)) {
+      if (edits && edits.includes("<<<<<<< SEARCH") && edits.includes("=======") && edits.includes(">>>>>>> REPLACE") && edits.indexOf("<<<<<<< SEARCH") > edits.indexOf("=======")) {
+      } else {
+        const similarFilename = findSimilarFile(fullFilePath);
+        let message = "File does not exist.";
+        if (similarFilename) {
+          message += ` Did you mean ${similarFilename}?`;
         }
-      };
-    }
-    const fullFilePath = isAbsolute5(file_path) ? file_path : resolve5(getCwd(), file_path);
-    if (old_string === "") {
-      if (!fileExistsBun(fullFilePath)) return { result: true };
-      const existingContent = await readFileBun(fullFilePath);
-      if (normalizeLineEndings(existingContent ?? "").trim() !== "") {
         return {
           result: false,
-          message: "Cannot create new file - file already exists."
+          message
         };
       }
-      return { result: true };
-    }
-    if (!fileExistsBun(fullFilePath)) {
-      const similarFilename = findSimilarFile(fullFilePath);
-      let message = "File does not exist.";
-      if (similarFilename) {
-        message += ` Did you mean ${similarFilename}?`;
-      }
-      return {
-        result: false,
-        message
-      };
     }
     if (fullFilePath.endsWith(".ipynb")) {
       return {
@@ -7074,67 +6658,30 @@ var FileEditTool = {
         message: `File is a Jupyter Notebook. Use the ${NotebookEditTool.name} to edit this file.`
       };
     }
-    const readTimestamp = readFileTimestamps[fullFilePath];
-    if (!readTimestamp) {
-      return {
-        result: false,
-        message: "File has not been read yet. Read it first before writing to it.",
-        meta: {
-          isFilePathAbsolute: String(isAbsolute5(file_path))
-        }
-      };
-    }
-    const stats = statSync4(fullFilePath);
-    const lastWriteTime = stats.mtimeMs;
-    if (lastWriteTime > readTimestamp) {
-      return {
-        result: false,
-        message: "File has been modified since read, either by the user or by a linter. Read it again before attempting to write it."
-      };
-    }
-    const file = await readFileBun(fullFilePath);
-    const normalizedFile = normalizeLineEndings(file ?? "");
-    const normalizedOldString = normalizeLineEndings(old_string);
-    if (!file) {
-      return {
-        result: false,
-        message: "Could not read file.",
-        meta: {
-          isFilePathAbsolute: String(isAbsolute5(file_path))
-        }
-      };
-    }
-    if (if_not_contains && normalizedFile.includes(normalizeLineEndings(if_not_contains))) {
-      return {
-        result: false,
-        message: `Modification skipped: The file already contains the string "${if_not_contains}".`
-      };
-    }
-    if (!normalizedFile.includes(normalizedOldString)) {
-      return {
-        result: false,
-        message: `String to replace not found in file.
-String: ${old_string}`,
-        meta: {
-          isFilePathAbsolute: String(isAbsolute5(file_path))
-        }
-      };
-    }
-    const matches = normalizedFile.split(normalizedOldString).length - 1;
-    if (matches > 1 && !replace_all) {
-      return {
-        result: false,
-        message: `Found ${matches} matches of the string to replace, but replace_all is false. To replace all occurrences, set replace_all to true. To replace only one occurrence, please provide more context to uniquely identify the instance.
-String: ${old_string}`,
-        meta: {
-          isFilePathAbsolute: String(isAbsolute5(file_path))
-        }
-      };
+    if (fileExistsBun(fullFilePath)) {
+      const readTimestamp = readFileTimestamps[fullFilePath];
+      if (!readTimestamp) {
+        return {
+          result: false,
+          message: "File has not been read yet. Read it first before writing to it.",
+          meta: {
+            isFilePathAbsolute: String(isAbsolute4(file_path))
+          }
+        };
+      }
+      const stats = statSync4(fullFilePath);
+      const lastWriteTime = stats.mtimeMs;
+      if (lastWriteTime > readTimestamp) {
+        return {
+          result: false,
+          message: "File has been modified since read, either by the user or by a linter. Read it again before attempting to write it."
+        };
+      }
     }
     return { result: true };
   },
-  async *call({ file_path, old_string, new_string, replace_all, if_not_contains }, { readFileTimestamps }) {
-    const fullFilePath = isAbsolute5(file_path) ? file_path : resolve5(getCwd(), file_path);
+  async *call({ file_path, edits, verify }, { readFileTimestamps }) {
+    const fullFilePath = isAbsolute4(file_path) ? file_path : resolve4(getCwd(), file_path);
     if (fileExistsBun(fullFilePath)) {
       const readTimestamp = readFileTimestamps[fullFilePath];
       const lastWriteTime = statSync4(fullFilePath).mtimeMs;
@@ -7144,32 +6691,91 @@ String: ${old_string}`,
         );
       }
     }
-    const { patch, updatedFile } = await applyEdit(
-      file_path,
-      old_string,
-      new_string,
-      replace_all ?? false
-    );
+    let editOperations = [];
+    if (edits) {
+      const { parseBlockEdits } = await import("./blockParser-CFQE5IAN.js");
+      editOperations = parseBlockEdits(edits);
+    }
+    let currentFileContent = fileExistsBun(fullFilePath) ? normalizeLineEndings(await readFileBun(fullFilePath) ?? "") : "";
+    const originalFileContent = currentFileContent;
+    let totalPatch = [];
+    const { SmartEdit } = await import("./smart-edit-J5J4S2TS.js");
+    const { findLspAnchor } = await import("./lspAnchor-2ZRP7RIX.js");
+    for (const op of editOperations) {
+      const normalizedSearch = normalizeLineEndings(op.search);
+      const normalizedReplace = normalizeLineEndings(op.replace);
+      let newContent = "";
+      if (normalizedSearch === "") {
+        newContent = normalizedReplace;
+      } else {
+        newContent = SmartEdit.replace(currentFileContent, normalizedSearch, normalizedReplace, false);
+        if (newContent === currentFileContent) {
+          const anchor = await findLspAnchor(fullFilePath, op.search);
+          if (anchor) {
+            const lines = currentFileContent.split(/\r?\n/);
+            if (anchor.startLine < lines.length) {
+              const endLine = Math.min(anchor.endLine, lines.length - 1);
+              const snippetLines = lines.slice(anchor.startLine, endLine + 1);
+              const snippet = snippetLines.join("\n");
+              try {
+                const newSnippet = SmartEdit.replace(snippet, normalizedSearch, normalizedReplace, false);
+                if (newSnippet !== snippet) {
+                  const before = lines.slice(0, anchor.startLine).join("\n");
+                  const after = lines.slice(endLine + 1).join("\n");
+                  newContent = (before ? before + "\n" : "") + newSnippet + (after ? "\n" + after : "");
+                }
+              } catch (e) {
+              }
+            }
+          }
+        }
+      }
+      if (newContent === currentFileContent && normalizedSearch !== "") {
+        throw new Error(`Could not find match for block:
+${op.search}`);
+      }
+      currentFileContent = newContent;
+    }
+    const updatedFile = currentFileContent;
     const dir = dirname3(fullFilePath);
     mkdirSync2(dir, { recursive: true });
     const enc = fileExistsBun(fullFilePath) ? detectFileEncoding(fullFilePath) : "utf8";
     const endings = fileExistsBun(fullFilePath) ? detectLineEndings(fullFilePath) : "LF";
-    const originalFile = fileExistsBun(fullFilePath) ? normalizeLineEndings(await readFileBun(fullFilePath) ?? "") : "";
     writeTextContent(fullFilePath, updatedFile, enc, endings);
+    if (verify) {
+      const { LspClientManager } = await import("./manager-VXNOOVJ2.js");
+      const client = await LspClientManager.getInstance().getClient(fullFilePath, getCwd());
+      if (client) {
+        const diagnostics = client.getDiagnostics(fullFilePath);
+        const errors = diagnostics.filter((d) => d.severity === 1);
+        if (errors.length > 0) {
+          writeTextContent(fullFilePath, originalFileContent, enc, endings);
+          throw new Error(`Verification Failed: ${errors.length} syntax errors detected. Reverted changes.
+First error: ${errors[0].message}`);
+        }
+      }
+    }
     recordFileEdit(fullFilePath, updatedFile);
     readFileTimestamps[fullFilePath] = statSync4(fullFilePath).mtimeMs;
     emitReminderEvent("file:edited", {
       filePath: fullFilePath,
-      oldString: old_string,
-      newString: new_string,
+      oldString: "BLOCK_EDIT",
+      // Simplified
+      newString: "BLOCK_EDIT",
       timestamp: Date.now(),
-      operation: old_string === "" ? "create" : new_string === "" ? "delete" : "update"
+      operation: "update"
+    });
+    const patch = getPatch({
+      filePath: file_path,
+      fileContents: originalFileContent,
+      oldStr: originalFileContent,
+      newStr: updatedFile
     });
     const data = {
       filePath: file_path,
-      oldString: old_string,
-      newString: new_string,
-      originalFile,
+      oldString: "MULTIPLE_EDITS",
+      newString: "MULTIPLE_EDITS",
+      originalFile: originalFileContent,
       structuredPatch: patch
     };
     yield {
@@ -7179,28 +6785,9 @@ String: ${old_string}`,
     };
   },
   renderResultForAssistant({ filePath, originalFile, oldString, newString }) {
-    const { snippet, startLine } = getSnippet(
-      normalizeLineEndings(originalFile || ""),
-      normalizeLineEndings(oldString),
-      normalizeLineEndings(newString)
-    );
-    return `The file ${filePath} has been updated. Here's the result of running \`cat -n\` on a snippet of the edited file:
-${addLineNumbers({
-      content: snippet,
-      startLine
-    })}`;
+    return `The file ${filePath} has been updated successfully.`;
   }
 };
-function getSnippet(initialText, oldStr, newStr) {
-  const before = initialText.split(oldStr)[0] ?? "";
-  const replacementLine = before.split(/\r?\n/).length - 1;
-  const newFileLines = initialText.replace(oldStr, newStr).split(/\r?\n/);
-  const startLine = Math.max(0, replacementLine - N_LINES_SNIPPET);
-  const endLine = replacementLine + N_LINES_SNIPPET + newStr.split(/\r?\n/).length;
-  const snippetLines = newFileLines.slice(startLine, endLine + 1);
-  const snippet = snippetLines.join("\n");
-  return { snippet, startLine: startLine + 1 };
-}
 
 // src/tools/filesystem/FileReadTool/FileReadTool.tsx
 import { statSync as statSync6 } from "fs";
@@ -7248,10 +6835,10 @@ import {
 import {
   dirname as dirname4,
   normalize as normalize2,
-  resolve as resolve6,
+  resolve as resolve5,
   extname as extname3,
   relative as relative6,
-  isAbsolute as isAbsolute6
+  isAbsolute as isAbsolute5
 } from "node:path";
 import { homedir as homedir5 } from "node:os";
 var SecureFileService = class _SecureFileService {
@@ -7312,14 +6899,14 @@ var SecureFileService = class _SecureFileService {
           };
         }
       }
-      const absolutePath = resolve6(normalizedPath);
+      const absolutePath = resolve5(normalizedPath);
       const isInAllowedPath = Array.from(this.allowedBasePaths).some(
         (basePath) => {
-          const base = resolve6(basePath);
+          const base = resolve5(basePath);
           const rel = relative6(base, absolutePath);
           if (!rel || rel === "") return true;
           if (rel.startsWith("..")) return false;
-          if (isAbsolute6(rel)) return false;
+          if (isAbsolute5(rel)) return false;
           return true;
         }
       );
@@ -7553,7 +7140,7 @@ var SecureFileService = class _SecureFileService {
   }
   addAllowedBasePath(basePath) {
     try {
-      const normalized = normalize2(resolve6(basePath));
+      const normalized = normalize2(resolve5(basePath));
       if (!existsSync5(normalized)) {
         return { success: false, error: "Base path does not exist" };
       }
@@ -7942,6 +7529,9 @@ var inputSchema4 = z4.strictObject({
   ),
   limit: z4.number().optional().describe(
     "The number of lines to read. Only provide if the file is too large to read at once."
+  ),
+  symbol_name: z4.string().optional().describe(
+    "The name of the symbol (class, function, etc.) to read. If provided, the tool will use LSP to find the symbol definition and read the corresponding lines, ignoring offset/limit."
   )
 });
 var FileReadTool = {
@@ -7997,7 +7587,7 @@ var FileReadTool = {
   renderToolUseRejectedMessage() {
     return /* @__PURE__ */ React13.createElement(FallbackToolUseRejectedMessage, null);
   },
-  async validateInput({ file_path, offset, limit }) {
+  async validateInput({ file_path, offset, limit, symbol_name }) {
     const fullFilePath = normalizeFilePath(file_path);
     const fileCheck = secureFileService.safeGetFileInfo(fullFilePath);
     if (!fileCheck.success) {
@@ -8038,9 +7628,42 @@ var FileReadTool = {
     }
     return { result: true };
   },
-  async *call({ file_path, offset = 1, limit = void 0 }, { readFileTimestamps }) {
+  async *call({ file_path, offset = 1, limit = void 0, symbol_name }, { readFileTimestamps }) {
     const ext = path6.extname(file_path).toLowerCase();
     const fullFilePath = normalizeFilePath(file_path);
+    let startLine = offset;
+    let finalLimit = limit;
+    if (symbol_name) {
+      try {
+        const { LspClientManager } = await import("./manager-VXNOOVJ2.js");
+        const client = await LspClientManager.getInstance().getClient(fullFilePath, getCwd());
+        if (!client) {
+          throw new Error(`LSP client not available for ${ext}. Cannot search for symbol '${symbol_name}'.`);
+        }
+        const symbols = await client.documentSymbol(fullFilePath);
+        if (!symbols || symbols.length === 0) {
+          throw new Error(`No symbols found in file.`);
+        }
+        const findSymbol = (syms) => {
+          for (const sym of syms) {
+            if (sym.name === symbol_name) return sym;
+            if (sym.children) {
+              const found = findSymbol(sym.children);
+              if (found) return found;
+            }
+          }
+          return null;
+        };
+        const symbol = findSymbol(symbols);
+        if (!symbol) {
+          throw new Error(`Symbol '${symbol_name}' not found in file.`);
+        }
+        startLine = symbol.range.start.line + 1;
+        finalLimit = symbol.range.end.line - symbol.range.start.line + 1;
+      } catch (e) {
+        throw new Error(`Symbol reading failed: ${e.message}`);
+      }
+    }
     recordFileRead(fullFilePath);
     emitReminderEvent("file:read", {
       filePath: fullFilePath,
@@ -8107,10 +7730,8 @@ var FileReadTool = {
       };
       return;
     }
-    let startLine = offset;
     let zeroBasedOffset = startLine === 0 ? 0 : startLine - 1;
-    let finalLimit = limit;
-    if (limit) {
+    if (limit && !symbol_name) {
       try {
         const fullContent = await readFileBun(fullFilePath);
         if (fullContent) {
@@ -8277,7 +7898,7 @@ async function readImage(filePath, ext) {
 import { mkdirSync as mkdirSync4, readFileSync as readFileSync4, statSync as statSync7 } from "fs";
 import { Box as Box13, Text as Text14 } from "ink";
 import { EOL } from "os";
-import { dirname as dirname5, extname as extname6, isAbsolute as isAbsolute7, relative as relative8, resolve as resolve7 } from "path";
+import { dirname as dirname5, extname as extname6, isAbsolute as isAbsolute6, relative as relative8, resolve as resolve6 } from "path";
 import * as React14 from "react";
 import { z as z5 } from "zod";
 
@@ -8331,7 +7952,7 @@ var FileWriteTool = {
       if (!file_path) {
         return /* @__PURE__ */ React14.createElement(FallbackToolUseRejectedMessage, null);
       }
-      const fullFilePath = isAbsolute7(file_path) ? file_path : resolve7(getCwd(), file_path);
+      const fullFilePath = isAbsolute6(file_path) ? file_path : resolve6(getCwd(), file_path);
       const oldFileExists = fileExistsBun(fullFilePath);
       const enc = oldFileExists ? detectFileEncoding(fullFilePath) : "utf-8";
       const oldContent = oldFileExists ? readFileSync4(fullFilePath, enc) : null;
@@ -8377,7 +7998,7 @@ var FileWriteTool = {
     }
   },
   async validateInput({ file_path }, { readFileTimestamps }) {
-    const fullFilePath = isAbsolute7(file_path) ? file_path : resolve7(getCwd(), file_path);
+    const fullFilePath = isAbsolute6(file_path) ? file_path : resolve6(getCwd(), file_path);
     if (fullFilePath.endsWith(".ipynb")) {
       return {
         result: false,
@@ -8405,7 +8026,7 @@ var FileWriteTool = {
     return { result: true };
   },
   async *call({ file_path, content }, { readFileTimestamps }) {
-    const fullFilePath = isAbsolute7(file_path) ? file_path : resolve7(getCwd(), file_path);
+    const fullFilePath = isAbsolute6(file_path) ? file_path : resolve6(getCwd(), file_path);
     const dir = dirname5(fullFilePath);
     const oldFileExists = fileExistsBun(fullFilePath);
     if (oldFileExists) {
@@ -8495,11 +8116,15 @@ var DESCRIPTION4 = `- Fast file pattern matching tool that works with any codeba
 
 // src/tools/filesystem/GlobTool/GlobTool.tsx
 import { existsSync as existsSync6, statSync as statSync8 } from "fs";
-import { isAbsolute as isAbsolute8, join as join5, relative as relative9, resolve as resolve8 } from "path";
+import { isAbsolute as isAbsolute7, join as join5, relative as relative9, resolve as resolve7 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 var inputSchema6 = z6.strictObject({
   pattern: z6.string().describe("The glob pattern to match files against"),
   path: z6.string().optional().describe(
     'The directory to search in. If not specified, the current working directory will be used. IMPORTANT: Omit this field to use the default directory. DO NOT enter "undefined" or "null" - simply omit it for the default behavior. Must be a valid directory path if provided.'
+  ),
+  semantic: z6.boolean().optional().describe(
+    "Enable semantic search using LSP workspace symbols to find relevant files. Useful when you know the symbol name but not the file path."
   )
 });
 var DEFAULT_LIMIT = 100;
@@ -8529,7 +8154,7 @@ var GlobTool = {
   },
   async validateInput({ path: path7 }) {
     if (!path7) return { result: true };
-    const absolute = isAbsolute8(path7) ? path7 : resolve8(getCwd(), path7);
+    const absolute = isAbsolute7(path7) ? path7 : resolve7(getCwd(), path7);
     if (!existsSync6(absolute)) {
       return {
         result: false,
@@ -8546,10 +8171,13 @@ var GlobTool = {
     }
     return { result: true };
   },
-  renderToolUseMessage({ pattern, path: path7 }, { verbose }) {
-    const absolutePath = path7 ? isAbsolute8(path7) ? path7 : resolve8(getCwd(), path7) : void 0;
+  renderToolUseMessage({ pattern, path: path7, semantic }, { verbose }) {
+    const absolutePath = path7 ? isAbsolute7(path7) ? path7 : resolve7(getCwd(), path7) : void 0;
     const relativePath = absolutePath ? relative9(getCwd(), absolutePath) : void 0;
-    return `pattern: "${pattern}"${relativePath || verbose ? `, path: "${verbose ? absolutePath : relativePath}"` : ""}`;
+    const parts = [`pattern: "${pattern}"`];
+    if (path7) parts.push(`path: "${verbose ? absolutePath : relativePath}"`);
+    if (semantic) parts.push("semantic: true");
+    return parts.join(", ");
   },
   renderToolUseRejectedMessage() {
     return /* @__PURE__ */ React15.createElement(FallbackToolUseRejectedMessage, null);
@@ -8560,9 +8188,9 @@ var GlobTool = {
     }
     return /* @__PURE__ */ React15.createElement(Box14, { justifyContent: "space-between", width: "100%" }, /* @__PURE__ */ React15.createElement(Box14, { flexDirection: "row" }, /* @__PURE__ */ React15.createElement(Text15, null, "\xA0\xA0\u23BF \xA0Found "), /* @__PURE__ */ React15.createElement(Text15, { bold: true }, output.numFiles, " "), /* @__PURE__ */ React15.createElement(Text15, null, output.numFiles === 0 || output.numFiles > 1 ? "files" : "file")), /* @__PURE__ */ React15.createElement(Cost, { costUSD: 0, durationMs: output.durationMs, debug: false }));
   },
-  async *call({ pattern, path: path7 }, { abortController }) {
+  async *call({ pattern, path: path7, semantic }, { abortController }) {
     const start = Date.now();
-    const searchPath = path7 ? isAbsolute8(path7) ? path7 : resolve8(getCwd(), path7) : getCwd();
+    const searchPath = path7 ? isAbsolute7(path7) ? path7 : resolve7(getCwd(), path7) : getCwd();
     const raw = await ripGrep(
       [
         "--files",
@@ -8575,7 +8203,26 @@ var GlobTool = {
       searchPath,
       abortController.signal
     );
-    const files = raw.map((p) => isAbsolute8(p) ? p : join5(searchPath, p));
+    let files = raw.map((p) => isAbsolute7(p) ? p : join5(searchPath, p));
+    if (semantic) {
+      try {
+        const { LspClientManager } = await import("./manager-VXNOOVJ2.js");
+        const symbols = await LspClientManager.getInstance().workspaceSymbol(pattern);
+        const semanticFiles = symbols.map((s) => {
+          let filePath = s.location?.uri || "";
+          if (filePath.startsWith("file://")) {
+            try {
+              filePath = fileURLToPath2(filePath);
+            } catch (e) {
+              filePath = filePath.replace("file://", "");
+            }
+          }
+          return filePath;
+        }).filter(Boolean);
+        files = Array.from(/* @__PURE__ */ new Set([...files, ...semanticFiles]));
+      } catch (e) {
+      }
+    }
     const truncated = files.length > DEFAULT_LIMIT;
     const limitedFiles = files.slice(0, DEFAULT_LIMIT);
     const output = {
@@ -8628,7 +8275,8 @@ var DESCRIPTION5 = `A powerful search tool built on ripgrep
 `;
 
 // src/tools/search/GrepTool/GrepTool.tsx
-import { isAbsolute as isAbsolute9, relative as relative10 } from "path";
+import { isAbsolute as isAbsolute8, relative as relative10 } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
 var inputSchema7 = z7.strictObject({
   pattern: z7.string().describe("The regular expression pattern to search for in file contents"),
   path: z7.string().optional().describe(
@@ -8664,6 +8312,12 @@ var inputSchema7 = z7.strictObject({
   ),
   multiline: z7.boolean().optional().describe(
     "Enable multiline mode where . matches newlines and patterns can span lines (rg -U --multiline-dotall). Default: false."
+  ),
+  semantic: z7.boolean().optional().describe(
+    "Enable semantic search using LSP workspace symbols if text search fails. Useful for finding symbols even with typos."
+  ),
+  symbol_type: z7.string().optional().describe(
+    'Filter semantic search by symbol type (e.g. "class", "function", "variable"). Requires semantic: true.'
   )
 });
 var MAX_RESULT_CHARS = 2e4;
@@ -8690,7 +8344,7 @@ function toProjectRelativeIfPossible(p) {
   const rel = relative10(projectRoot, p);
   if (!rel || rel === "") return p;
   if (rel.startsWith("..")) return p;
-  if (isAbsolute9(rel)) return p;
+  if (isAbsolute8(rel)) return p;
   return rel;
 }
 function formatPagination(limit, offset) {
@@ -8815,7 +8469,9 @@ ${result.filenames.join("\n")}`;
     "-i": caseInsensitive = false,
     head_limit,
     offset = 0,
-    multiline = false
+    multiline = false,
+    semantic = false,
+    symbol_type
   }, toolUseContext) {
     const { abortController } = toolUseContext;
     const start = Date.now();
@@ -8860,6 +8516,94 @@ ${result.filenames.join("\n")}`;
     const lines = await ripGrep(args, absolutePath, abortController.signal, {
       sandbox: sandboxPlan.settings.enabled ? sandboxPlan.bunShellSandboxOptions : void 0
     });
+    if (lines.length === 0 && semantic) {
+      try {
+        const { LspClientManager } = await import("./manager-VXNOOVJ2.js");
+        const symbols = await LspClientManager.getInstance().workspaceSymbol(String(pattern));
+        let filtered = symbols;
+        const symbolType = symbol_type;
+        if (symbolType) {
+          const type3 = symbolType.toLowerCase();
+          const kindMap = {
+            "file": 1,
+            "module": 2,
+            "namespace": 3,
+            "package": 4,
+            "class": 5,
+            "method": 6,
+            "property": 7,
+            "field": 8,
+            "constructor": 9,
+            "enum": 10,
+            "interface": 11,
+            "function": 12,
+            "variable": 13,
+            "constant": 14,
+            "string": 15,
+            "number": 16,
+            "boolean": 17,
+            "array": 18,
+            "object": 19,
+            "key": 20,
+            "null": 21,
+            "enummember": 22,
+            "struct": 23,
+            "event": 24,
+            "operator": 25,
+            "typeparameter": 26
+          };
+          const targetKind = kindMap[type3];
+          if (targetKind) {
+            filtered = symbols.filter((s) => s.kind === targetKind);
+          }
+        }
+        if (filtered.length > 0) {
+          const semanticLines = filtered.map((s) => {
+            let filePath = s.location?.uri || "";
+            if (filePath.startsWith("file://")) {
+              try {
+                filePath = fileURLToPath3(filePath);
+              } catch (e) {
+                filePath = filePath.replace("file://", "");
+              }
+            }
+            const line = (s.location?.range?.start?.line || 0) + 1;
+            const kindNameMap = {
+              1: "File",
+              2: "Module",
+              3: "Namespace",
+              4: "Package",
+              5: "Class",
+              6: "Method",
+              7: "Property",
+              8: "Field",
+              9: "Constructor",
+              10: "Enum",
+              11: "Interface",
+              12: "Function",
+              13: "Variable",
+              14: "Constant",
+              15: "String",
+              16: "Number",
+              17: "Boolean",
+              18: "Array",
+              19: "Object",
+              20: "Key",
+              21: "Null",
+              22: "EnumMember",
+              23: "Struct",
+              24: "Event",
+              25: "Operator",
+              26: "TypeParameter"
+            };
+            const kindName = kindNameMap[s.kind] || "Unknown";
+            return `${filePath}:${line}: ${s.name} (${kindName})`;
+          });
+          lines.push(...semanticLines);
+        }
+      } catch (e) {
+      }
+    }
     if (output_mode === "content") {
       const rewritten = lines.map((line) => {
         const idx = line.indexOf(":");
@@ -10304,9 +10048,9 @@ function setTerminalTitle(title) {
   }
 }
 function clearTerminal() {
-  return new Promise((resolve12) => {
+  return new Promise((resolve11) => {
     process.stdout.write("\x1B[2J\x1B[3J\x1B[H", () => {
-      resolve12();
+      resolve11();
     });
   });
 }
@@ -11424,8 +11168,8 @@ var OAuthService = class {
       await authURLHandler(manualUrl);
       await openBrowser(autoUrl);
     };
-    const { authorizationCode, useManualRedirect } = await new Promise((resolve12, reject) => {
-      this.pendingCodePromise = { resolve: resolve12, reject };
+    const { authorizationCode, useManualRedirect } = await new Promise((resolve11, reject) => {
+      this.pendingCodePromise = { resolve: resolve11, reject };
       this.startLocalServer(state, onReady);
     });
     const {
@@ -11596,7 +11340,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-2R3YDGM5.js");
+        const { resetAnthropicClient } = await import("./llm-NW2S47DG.js");
         resetAnthropicClient();
       } catch {
       }
@@ -13966,7 +13710,7 @@ function ModelSelector({
         setModelLoadError(
           `Attempt ${attempt}/${MAX_RETRIES}: Retrying model discovery...`
         );
-        await new Promise((resolve12) => setTimeout(resolve12, 1e3));
+        await new Promise((resolve11) => setTimeout(resolve11, 1e3));
       }
       try {
         const models = await fetchModels();
@@ -15878,7 +15622,7 @@ async function refreshPluginRuntimeFromInstalls() {
   const existingRoots = getSessionPlugins().map((p) => p.rootDir);
   const dirs = Array.from(/* @__PURE__ */ new Set([...existingRoots, ...installedRoots]));
   if (dirs.length === 0) return [];
-  const { configureSessionPlugins } = await import("./pluginRuntime-EJS6GFVB.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-SHFEMATT.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -16547,7 +16291,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-PYSWBB22.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-4ZGIHII2.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -20606,7 +20350,7 @@ async function launchExternalEditor(initialText) {
     }
   }
   try {
-    await new Promise((resolve12, reject) => {
+    await new Promise((resolve11, reject) => {
       const child = spawn(
         editorCommand.command,
         [...editorCommand.args, filePath],
@@ -20618,7 +20362,7 @@ async function launchExternalEditor(initialText) {
       child.on("error", reject);
       child.on("exit", (code, signal) => {
         if (code === 0 || code === null) {
-          resolve12();
+          resolve11();
         } else {
           reject(
             new Error(
@@ -20669,7 +20413,7 @@ async function launchExternalEditorForFilePath(filePath) {
     }
   }
   try {
-    await new Promise((resolve12, reject) => {
+    await new Promise((resolve11, reject) => {
       const child = spawn(
         editorCommand.command,
         [...editorCommand.args, filePath],
@@ -20681,7 +20425,7 @@ async function launchExternalEditorForFilePath(filePath) {
       child.on("error", reject);
       child.on("exit", (code, signal) => {
         if (code === 0 || code === null) {
-          resolve12();
+          resolve11();
         } else {
           reject(
             new Error(
@@ -21659,7 +21403,7 @@ function getCompletionContext(args) {
 
 // src/utils/completion/fileSuggestions.ts
 import { existsSync as existsSync13, readdirSync as readdirSync3, statSync as statSync11 } from "fs";
-import { basename as basename5, dirname as dirname9, join as join9, resolve as resolve9 } from "path";
+import { basename as basename5, dirname as dirname9, join as join9, resolve as resolve8 } from "path";
 function generateFileSuggestions(args) {
   const { prefix, cwd: cwd2 } = args;
   try {
@@ -21672,7 +21416,7 @@ function generateFileSuggestions(args) {
     } else if (isAbsolutePath) {
       searchPath = userPath;
     } else {
-      searchPath = resolve9(cwd2, userPath);
+      searchPath = resolve8(cwd2, userPath);
     }
     const endsWithSlash = userPath.endsWith("/");
     const searchStat = existsSync13(searchPath) ? statSync11(searchPath) : null;
@@ -23806,7 +23550,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-2R3YDGM5.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-NW2S47DG.js");
     const systemPrompt = [
       "You're helping the user structure notes that will be added to their PYB.md file.",
       "Format the user's input into a well-structured note that will be useful for later reference.",
@@ -24011,7 +23755,7 @@ function PromptInput({
           abortController.abort();
         }
         setIsLoading(false);
-        await new Promise((resolve12) => setTimeout(resolve12, 0));
+        await new Promise((resolve11) => setTimeout(resolve11, 0));
         setIsLoading(true);
         let finalInput2 = cleanInput;
         for (const { placeholder: placeholder2, text } of pastedTexts) {
@@ -24119,7 +23863,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-AKOQ2NMP.js");
+          const { getCwd: getCwd2 } = await import("./state-E53XB637.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -24479,11 +24223,11 @@ import { useCallback as useCallback14 } from "react";
 function useCanUseTool(setToolUseConfirm) {
   return useCallback14(
     async (tool, input, toolUseContext, assistantMessage) => {
-      return new Promise((resolve12) => {
+      return new Promise((resolve11) => {
         function logCancelledEvent() {
         }
         function resolveWithCancelledAndAbortAllToolCalls(message) {
-          resolve12({
+          resolve11({
             result: false,
             message: message ? `${REJECT_MESSAGE_WITH_FEEDBACK_PREFIX}${message}` : REJECT_MESSAGE
           });
@@ -24501,12 +24245,12 @@ function useCanUseTool(setToolUseConfirm) {
           assistantMessage
         ).then(async (result) => {
           if (result.result === true) {
-            resolve12({ result: true });
+            resolve11({ result: true });
             return;
           }
           const deniedResult = result;
           if (deniedResult.shouldPromptUser === false) {
-            resolve12({ result: false, message: deniedResult.message });
+            resolve11({ result: false, message: deniedResult.message });
             return;
           }
           const [description2, commandPrefix] = await Promise.all([
@@ -24538,7 +24282,7 @@ function useCanUseTool(setToolUseConfirm) {
               if (type2 === "permanent") {
               } else {
               }
-              resolve12({ result: true });
+              resolve11({ result: true });
             },
             onReject(rejectionMessage) {
               resolveWithCancelledAndAbortAllToolCalls(rejectionMessage);
@@ -25190,8 +24934,8 @@ var ToolUseQueue = class {
       }
       if (this.hasExecutingTools() && !this.hasCompletedResults() && !this.hasPendingProgress()) {
         const promises = this.tools.filter((t) => t.status === "executing" && t.promise).map((t) => t.promise);
-        const progressPromise = new Promise((resolve12) => {
-          this.progressAvailableResolve = resolve12;
+        const progressPromise = new Promise((resolve11) => {
+          this.progressAvailableResolve = resolve11;
         });
         if (promises.length > 0) {
           await Promise.race([...promises, progressPromise]);
@@ -26056,7 +25800,7 @@ function BinaryFeedbackView({
 function BinaryFeedback({
   m1,
   m2,
-  resolve: resolve12,
+  resolve: resolve11,
   debug: debug2,
   erroredToolUseIDs,
   inProgressToolUseIDs,
@@ -26068,9 +25812,9 @@ function BinaryFeedback({
   const onChoose = useCallback15(
     (choice) => {
       logBinaryFeedbackEvent(m1, m2, choice);
-      resolve12(getBinaryFeedbackResultForChoice(m1, m2, choice));
+      resolve11(getBinaryFeedbackResultForChoice(m1, m2, choice));
     },
-    [m1, m2, resolve12]
+    [m1, m2, resolve11]
   );
   useNotifyAfterTimeout(
     `${PRODUCT_NAME} needs your input on a response comparison`
@@ -26905,7 +26649,7 @@ import { homedir as homedir7 } from "os";
 // src/commands/agents/generation.ts
 import { randomUUID as randomUUID5 } from "crypto";
 async function generateAgentWithClaude(prompt) {
-  const { queryModel } = await import("./llm-2R3YDGM5.js");
+  const { queryModel } = await import("./llm-NW2S47DG.js");
   const systemPrompt = `You are an expert at creating AI agent configurations. Based on the user's description, generate a specialized agent configuration.
 
 Return your response as a JSON object with exactly these fields:
@@ -27202,7 +26946,7 @@ var COLOR_OPTIONS = [
   "cyan"
 ];
 function openInEditor(filePath) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve11, reject) => {
     const platform = process.platform;
     let command4;
     let args;
@@ -27225,7 +26969,7 @@ function openInEditor(filePath) {
     child.on("error", (err) => reject(err));
     child.on(
       "exit",
-      (code) => code === 0 ? resolve12() : reject(new Error(`Editor exited with ${code}`))
+      (code) => code === 0 ? resolve11() : reject(new Error(`Editor exited with ${code}`))
     );
   });
 }
@@ -30104,7 +29848,7 @@ var BashParser = class {
 };
 
 // src/utils/bash-parser/validator.ts
-import { resolve as resolve10 } from "path";
+import { resolve as resolve9 } from "path";
 async function validateSafety(script, cwd2 = process.cwd()) {
   const tree2 = await BashParser.parse(script);
   const root = tree2.rootNode;
@@ -30155,7 +29899,7 @@ function checkCommand(node, script, cwd2) {
     const targetsCritical = args.some((arg) => {
       if (arg.startsWith("-") || arg.startsWith("$")) return false;
       try {
-        const absPath = resolve10(cwd2, arg).replace(/\\/g, "/");
+        const absPath = resolve9(cwd2, arg).replace(/\\/g, "/");
         return criticalPaths.some((critical) => {
           const normalizedCritical = critical.endsWith("/") ? critical : critical + "/";
           if (absPath === critical || absPath === critical.replace(/\/$/, "")) return true;
@@ -30173,7 +29917,7 @@ function checkCommand(node, script, cwd2) {
     const targetsRoot = args.some((arg) => {
       if (arg.startsWith("-") || arg.startsWith("$")) return false;
       try {
-        const absPath = resolve10(cwd2, arg).replace(/\\/g, "/");
+        const absPath = resolve9(cwd2, arg).replace(/\\/g, "/");
         return absPath === "/" || /^[a-z]:\/?$/i.test(absPath);
       } catch {
         return arg === "/" || /^[a-z]:\/?$/i.test(arg);
@@ -30281,7 +30025,7 @@ var BashTool = {
   async validateInput({ command: command4, timeout, dangerouslyDisableSandbox, cwd: cwd2 }, context) {
     const trimmed = command4.trim();
     try {
-      await validateSafety(trimmed, cwd2 ? resolve11(getCwd(), cwd2) : getCwd());
+      await validateSafety(trimmed, cwd2 ? resolve10(getCwd(), cwd2) : getCwd());
     } catch (e) {
       return {
         result: false,
@@ -30321,7 +30065,7 @@ var BashTool = {
       };
     }
     if (cwd2) {
-      const fullTargetDir = isAbsolute10(cwd2) ? cwd2 : resolve11(getCwd(), cwd2);
+      const fullTargetDir = isAbsolute9(cwd2) ? cwd2 : resolve10(getCwd(), cwd2);
       if (!isInDirectory(
         relative13(getOriginalCwd(), fullTargetDir),
         relative13(getCwd(), getOriginalCwd())
@@ -30341,7 +30085,7 @@ var BashTool = {
           continue;
         }
         const targetDir = parts[1].replace(/^['"]|['"]$/g, "");
-        const fullTargetDir = isAbsolute10(targetDir) ? targetDir : resolve11(getCwd(), targetDir);
+        const fullTargetDir = isAbsolute9(targetDir) ? targetDir : resolve10(getCwd(), targetDir);
         if (!isInDirectory(
           relative13(getOriginalCwd(), fullTargetDir),
           relative13(getCwd(), getOriginalCwd())
@@ -30395,13 +30139,39 @@ var BashTool = {
     stderr,
     bashId,
     backgroundTaskId
-  }) {
+  }, command4) {
     let trimmedStdout = stdout;
     if (trimmedStdout) {
       trimmedStdout = trimmedStdout.replace(/^(\s*\n)+/, "");
       trimmedStdout = trimmedStdout.trimEnd();
     }
+    const lines = trimmedStdout.split("\n");
+    if (lines.length > 500) {
+      const errorIndex = lines.findIndex((l) => /Error:|Exception:|Failed/i.test(l));
+      if (errorIndex !== -1) {
+        const start = Math.max(0, errorIndex - 20);
+        const end = Math.min(lines.length, errorIndex + 20);
+        const head = lines.slice(0, 20).join("\n");
+        const errorContext = lines.slice(start, end).join("\n");
+        const tail = lines.slice(-20).join("\n");
+        if (start > 20 && end < lines.length - 20) {
+          trimmedStdout = `${head}
+... [Snip: ${start - 20} lines] ...
+${errorContext}
+... [Snip: ${lines.length - end} lines] ...
+${tail}`;
+        }
+      }
+    }
     let trimmedStderr = stderr.trim();
+    if (trimmedStderr.includes("command not found") && command4) {
+      const cmdParts = command4.trim().split(/\s+/);
+      const prog = cmdParts[0];
+      if (prog === "gti") {
+        trimmedStderr += `
+Did you mean "git ${cmdParts.slice(1).join(" ")}"?`;
+      }
+    }
     if (interrupted) {
       if (trimmedStderr) trimmedStderr += EOL3;
       trimmedStderr += "<error>Command was aborted before completion</error>";
@@ -30426,7 +30196,7 @@ var BashTool = {
     const safeMode = Boolean(context?.safeMode ?? context?.options?.safeMode);
     const userPrompt = typeof context?.options?.lastUserPrompt === "string" ? context.options.lastUserPrompt.trim() : "";
     const commandDescription = typeof description2 === "string" ? description2.trim() : "";
-    const effectiveCwd = cwd2 ? isAbsolute10(cwd2) ? cwd2 : resolve11(getCwd(), cwd2) : getCwd();
+    const effectiveCwd = cwd2 ? isAbsolute9(cwd2) ? cwd2 : resolve10(getCwd(), cwd2) : getCwd();
     try {
       await validateSafety(command4, effectiveCwd);
     } catch (error) {
@@ -30440,7 +30210,7 @@ var BashTool = {
       };
       yield {
         type: "result",
-        resultForAssistant: this.renderResultForAssistant(data),
+        resultForAssistant: this.renderResultForAssistant(data, command4),
         data
       };
       return;
@@ -30462,7 +30232,7 @@ var BashTool = {
       };
       yield {
         type: "result",
-        resultForAssistant: this.renderResultForAssistant(data),
+        resultForAssistant: this.renderResultForAssistant(data, command4),
         data
       };
       return;
@@ -30494,7 +30264,7 @@ var BashTool = {
       };
       yield {
         type: "result",
-        resultForAssistant: this.renderResultForAssistant(data),
+        resultForAssistant: this.renderResultForAssistant(data, command4),
         data
       };
       return;
@@ -30529,7 +30299,7 @@ var BashTool = {
       };
       yield {
         type: "result",
-        resultForAssistant: this.renderResultForAssistant(data),
+        resultForAssistant: this.renderResultForAssistant(data, command4),
         data
       };
       return;
@@ -30576,7 +30346,7 @@ var BashTool = {
           if (abortController.signal.aborted) return false;
           const hostForUrl = host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
           const url2 = `http://${hostForUrl}:${port}/`;
-          return await new Promise((resolve12) => {
+          return await new Promise((resolve11) => {
             const assistantMessage = createAssistantMessage("");
             if (context.messageId) {
               ;
@@ -30592,13 +30362,13 @@ var BashTool = {
               suggestions: void 0,
               riskScore: null,
               onAbort() {
-                resolve12(false);
+                resolve11(false);
               },
               onAllow() {
-                resolve12(true);
+                resolve11(true);
               },
               onReject() {
-                resolve12(false);
+                resolve11(false);
               }
             };
             setToolJSX({
@@ -30631,7 +30401,7 @@ var BashTool = {
       };
       yield {
         type: "result",
-        resultForAssistant: this.renderResultForAssistant(data),
+        resultForAssistant: this.renderResultForAssistant(data, command4),
         data
       };
       return;
@@ -30657,7 +30427,7 @@ var BashTool = {
         };
         yield {
           type: "result",
-          resultForAssistant: this.renderResultForAssistant(data),
+          resultForAssistant: this.renderResultForAssistant(data, command4),
           data
         };
         return;
@@ -30692,8 +30462,8 @@ var BashTool = {
       );
       let backgroundRequested = false;
       let resolveBackground = null;
-      const backgroundPromise = new Promise((resolve12) => {
-        resolveBackground = resolve12;
+      const backgroundPromise = new Promise((resolve11) => {
+        resolveBackground = resolve11;
       });
       const requestBackground = () => {
         if (backgroundRequested) return;
@@ -30736,7 +30506,7 @@ ${footerParts.join(" ")}`;
             bashId
           })),
           new Promise(
-            (resolve12) => setTimeout(() => resolve12({ kind: "tick" }), waitMs)
+            (resolve11) => setTimeout(() => resolve11({ kind: "tick" }), waitMs)
           )
         ]);
         if (race.kind === "background") {
@@ -30751,7 +30521,7 @@ ${footerParts.join(" ")}`;
           };
           yield {
             type: "result",
-            resultForAssistant: this.renderResultForAssistant(data),
+            resultForAssistant: this.renderResultForAssistant(data, command4),
             data
           };
           return;
@@ -30770,7 +30540,7 @@ ${footerParts.join(" ")}`;
           if (process.env.NODE_ENV !== "test") {
             getCommandFilePaths(command4, stdout).then((filePaths) => {
               for (const filePath of filePaths) {
-                const fullFilePath = isAbsolute10(filePath) ? filePath : resolve11(getCwd(), filePath);
+                const fullFilePath = isAbsolute9(filePath) ? filePath : resolve10(getCwd(), filePath);
                 try {
                   readFileTimestamps[fullFilePath] = statSync12(fullFilePath).mtimeMs;
                 } catch (e) {
@@ -30790,7 +30560,7 @@ ${footerParts.join(" ")}`;
           };
           yield {
             type: "result",
-            resultForAssistant: this.renderResultForAssistant(data),
+            resultForAssistant: this.renderResultForAssistant(data, command4),
             data
           };
           return;
@@ -30828,7 +30598,7 @@ ${footerParts.join(" ")}`;
       };
       yield {
         type: "result",
-        resultForAssistant: this.renderResultForAssistant(data),
+        resultForAssistant: this.renderResultForAssistant(data, command4),
         data
       };
     } finally {
@@ -30934,8 +30704,14 @@ assistant: src/foo.c
 </example>
 
 <example>
-user: write tests for new feature
-assistant: [uses grep and glob search tools to find where similar tests are defined, uses concurrent read file tool use blocks in one tool call to read relevant files at the same time, uses edit file tool to write new tests]
+user: change the greeting in hello.ts
+assistant: [uses Read tool to read hello.ts]
+[uses Edit tool with the following input]
+<<<<<<< SEARCH
+console.log("Hello, world!");
+=======
+console.log("Hello, User!");
+>>>>>>> REPLACE
 </example>
 `}
 
@@ -30978,19 +30754,19 @@ NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTAN
 - If the user specifies that they want you to run tools "in parallel", you MUST send a single message with multiple tool use content blocks.
 - It is always better to speculatively read multiple files as a batch that are potentially useful.
 - It is always better to speculatively perform multiple searches as a batch that are potentially useful.
-- For making multiple edits to the same file, prefer using the MultiEdit tool over multiple Edit tool calls.
-
-# File Modification Strategy (Edit vs Patch)
-When you need to modify files, choose the appropriate tool based on the complexity:
-1. **Edit Tool**: Use for single-file, fuzzy-resilient modifications.
-   - Ideal for: Renaming variables, changing specific lines, fixing bugs, or when you are unsure about exact context.
-   - Engine: Powered by a 9-layer fuzzy matching engine that handles indentation/whitespace errors automatically.
-   - Requirement: Read file first to ensure you have the context.
-2. **Patch Tool**: Use for multi-file, atomic, or structural refactoring.
-   - Ideal for: Modifying multiple dependent files (e.g. interface + implementation), applying large structural changes.
-   - Engine: Supports "Smart Context" (fuzzy matching) but enforces "Strict Atomicity" (All or Nothing).
-   - Benefit: Ensures project consistency. If one file fails, everything rolls back, preventing broken states.
-   - Feedback: If it fails, you will get a rich report explaining why. You can then choose to fix the patch or fallback to Edit Tool for specific files.
+
+# File Modification Strategy (The Universal Edit Tool)
+When you need to modify files, rely on the **Edit Tool** for almost all tasks.
+
+1. **Edit Tool**: The primary tool for ALL file modifications.
+   - **Format**: Use the **SEARCH/REPLACE Block** format to specify changes. You can provide multiple blocks in one turn.
+   - **Capabilities**: Supports single edits, multiple edits (batching), and structural changes.
+   - **Safety**: Powered by Atomic Verification. If any part of the edit breaks syntax or fails to match, the entire operation is rolled back.
+   - **Resilience**: Uses a 9-layer fuzzy matching engine and LSP anchoring to find code even if line numbers or indentation are slightly off.
+   - **Requirement**: Always READ the file first to get the context.
+
+2. **Patch Tool**: Use ONLY for massive multi-file refactoring where strict atomicity across files is required.
+   - **Note**: Prefer Edit Tool for 99% of tasks.
 
 # Cognitive Safety & Verification
 1. **Modification Check**: Before editing, you MUST verify if the change is already present (e.g. use \`grep\` or \`read\`). Do not rely on your memory or previous turns.
@@ -31044,14 +30820,6 @@ export {
   hasWritePermission,
   grantReadPermissionForOriginalDir,
   NotebookEditTool,
-  LineTrimmedReplacer,
-  WhitespaceNormalizedReplacer,
-  BlockAnchorReplacer,
-  IndentationFlexibleReplacer,
-  EscapeNormalizedReplacer,
-  MultiOccurrenceReplacer,
-  TrimmedBoundaryReplacer,
-  ContextAwareReplacer,
   FileEditTool,
   ParserRegistry,
   loadLanguage,