pybao-cli 1.3.97 → 1.3.99

package/dist/{chunk-HZQ5D4KE.js → chunk-M2J4YYEX.js}

@@ -3,18 +3,18 @@ const require = __pybCreateRequire(import.meta.url);
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-W7CPW6S2.js";
+} from "./chunk-BXOS6YEB.js";
 import {
   loadPybAgentSessionMessages
-} from "./chunk-LGG56SIC.js";
+} from "./chunk-CGHZ2VAY.js";
 import {
   listPybAgentSessions
-} from "./chunk-TQAQR7CB.js";
+} from "./chunk-EY2TENGG.js";
 import {
   appendSessionCustomTitleRecord,
   appendSessionJsonlFromMessage,
   appendSessionTagRecord
-} from "./chunk-GVQW5V5E.js";
+} from "./chunk-U5J6MTAO.js";
 import {
   drainHookSystemPromptAdditions,
   getHookTranscriptPath,
@@ -26,7 +26,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-D7EHET2A.js";
+} from "./chunk-3HVYGUQ7.js";
 import {
   DEFAULT_OUTPUT_STYLE,
   getAvailableOutputStyles,
@@ -35,16 +35,16 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-7ZK32QRX.js";
+} from "./chunk-4NRDC2MN.js";
 import {
   fetchCustomModels,
   getModelFeatures
-} from "./chunk-VCS4L3LA.js";
+} from "./chunk-2WVYPGFK.js";
 import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-FMZTGW27.js";
+} from "./chunk-HN63ZGCX.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -58,7 +58,7 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-SRPG24JR.js";
+} from "./chunk-W3RWB5JG.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -71,11 +71,11 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-WHWTXVZ4.js";
+} from "./chunk-XLOFU6ZK.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-IGEQR5ET.js";
+} from "./chunk-47PFBKB5.js";
 import {
   applyToolPermissionContextUpdate,
   createDefaultToolPermissionContext
@@ -88,7 +88,7 @@ import {
   resetReminderSession,
   setTodos,
   systemReminderService
-} from "./chunk-DFGDXB5I.js";
+} from "./chunk-2ULPCMQN.js";
 import {
   getSessionState
 } from "./chunk-ERMQRV55.js";
@@ -97,7 +97,7 @@ import {
   getActiveAgents,
   getAgentByType,
   getAllAgents
-} from "./chunk-BNTZKC47.js";
+} from "./chunk-X6KY4AMW.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -127,7 +127,7 @@ import {
   processUserInput,
   reorderMessages,
   stripSystemMessages
-} from "./chunk-ILVR3OKO.js";
+} from "./chunk-WWYDMHKU.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -137,6 +137,13 @@ import {
   getPybAgentSessionId,
   setPybAgentSessionId
 } from "./chunk-B6IMQJZM.js";
+import {
+  formatTotalCost,
+  getTotalAPIDuration,
+  getTotalCost,
+  getTotalDuration,
+  wrapText
+} from "./chunk-OUXHGDLH.js";
 import {
   addLineNumbers,
   detectFileEncoding,
@@ -150,10 +157,7 @@ import {
   normalizeFilePath,
   readTextContent,
   writeTextContent
-} from "./chunk-T7MGCO5Q.js";
-import {
-  ripGrep
-} from "./chunk-T4CDNQDK.js";
+} from "./chunk-ZFDSP2ES.js";
 import {
   parseBlockEdits
 } from "./chunk-QWIBSCDN.js";
@@ -163,17 +167,17 @@ import {
   ParserRegistry,
   initParser,
   loadLanguage
-} from "./chunk-X7NKBF4S.js";
+} from "./chunk-VYINZ75I.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback
-} from "./chunk-GW4FHFLN.js";
+} from "./chunk-YOK3FML7.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-VU4GCLM2.js";
+} from "./chunk-B6YMKCYD.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
@@ -181,18 +185,21 @@ import {
   ModelManager,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-JQ7U4FNJ.js";
+} from "./chunk-L5MUGKPW.js";
 import {
-  clearContextCache,
   getCodeStyle,
   getContext,
   getGitState,
   getIsGit,
-  getProjectDocs
-} from "./chunk-SHKXEYZX.js";
+  getProjectDocs,
+  getProjectStructureStatisticsBlock
+} from "./chunk-JFW7GGFH.js";
+import {
+  ripGrep
+} from "./chunk-VWENSRU2.js";
 import {
   getTheme
-} from "./chunk-T6MZIN3Y.js";
+} from "./chunk-Q6XLF2PE.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -205,7 +212,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-VBDYRFAI.js";
+} from "./chunk-ZI6CKPRG.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -214,7 +221,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-IBMWS4VP.js";
+} from "./chunk-T4EFAH55.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -253,17 +260,10 @@ import {
   setCwd,
   shouldApplyToolOutputTruncation,
   truncateToolOutput
-} from "./chunk-4UESJIJZ.js";
+} from "./chunk-CMQGXFRW.js";
 import {
   MACRO
-} from "./chunk-DSHUCMWX.js";
-import {
-  formatTotalCost,
-  getTotalAPIDuration,
-  getTotalCost,
-  getTotalDuration,
-  wrapText
-} from "./chunk-OUXHGDLH.js";
+} from "./chunk-5ON6SGBK.js";
 import {
   __export
 } from "./chunk-I3J4JYES.js";
@@ -444,7 +444,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-KH33MHA2.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-XG5AIU4E.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -4246,7 +4246,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-KH33MHA2.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-XG5AIU4E.js");
   const queryLLMFn = args.queryLLMOverride ?? queryLLM2;
   const messages = [
     {
@@ -4626,7 +4626,6 @@ function getCommandSource(context) {
 import { Box as Box5, Text as Text5 } from "ink";
 import React5 from "react";
 import { z } from "zod";
-import { parse as parse4 } from "node-html-parser";
 
 // src/ui/components/Cost.tsx
 import * as React4 from "react";
@@ -4642,20 +4641,18 @@ function Cost({ costUSD, durationMs, debug: debug2 }) {
 // src/tools/network/WebFetchTool/prompt.ts
 var TOOL_NAME_FOR_PROMPT = "WebFetch";
 var PROMPT = `
-- Fetches content from a specified URL
-- Takes a URL and optional prompt/format as input
-- Fetches the URL content, converts HTML to the requested format
-- Processes the content with the prompt using a small, fast model when provided
-- Returns either the model's response or the formatted content
-- Use this tool when you need to retrieve or analyze web content
+- Fetches content from a specified URL and processes it using an AI model
+- Takes a URL and a prompt as input
+- Fetches the URL content, converts HTML to markdown
+- Processes the content with the prompt using a small, fast model
+- Returns the model's response about the content
+- Use this tool when you need to retrieve and analyze web content
 
 Usage notes:
   - IMPORTANT: If an MCP-provided web fetch tool is available, prefer using that tool instead of this one, as it may have fewer restrictions.
   - The URL must be a fully-formed valid URL
   - HTTP URLs will be automatically upgraded to HTTPS
   - The prompt should describe what information you want to extract from the page
-  - Format options: "markdown" (default), "text", or "html"
-  - Timeout is optional and defaults to 30 seconds
   - This tool is read-only and does not modify any files
   - Results may be summarized if the content is very large
   - Includes a self-cleaning 15-minute cache for faster responses when repeatedly accessing the same URL
@@ -4693,8 +4690,8 @@ turndownService.addRule("cleanLinks", {
 });
 function convertHtmlToMarkdown(html) {
   try {
-    const cleanHtml2 = html.replace(/<script[^>]*>[\s\S]*?<\/script>/gi, "").replace(/<style[^>]*>[\s\S]*?<\/style>/gi, "").replace(/<!--[\s\S]*?-->/g, "").replace(/\s+/g, " ").trim();
-    const markdown = turndownService.turndown(cleanHtml2);
+    const cleanHtml = html.replace(/<script[^>]*>[\s\S]*?<\/script>/gi, "").replace(/<style[^>]*>[\s\S]*?<\/style>/gi, "").replace(/<!--[\s\S]*?-->/g, "").replace(/\s+/g, " ").trim();
+    const markdown = turndownService.turndown(cleanHtml);
     return markdown.replace(/\n{3,}/g, "\n\n").replace(/^\s+|\s+$/gm, "").trim();
   } catch (error) {
     throw new Error(
@@ -4749,9 +4746,7 @@ var urlCache = new URLCache();
 // src/tools/network/WebFetchTool/WebFetchTool.tsx
 var inputSchema = z.strictObject({
   url: z.string().url().describe("The URL to fetch content from"),
-  prompt: z.string().optional().describe("Optional prompt to run on the fetched content"),
-  format: z.enum(["markdown", "html", "text"]).optional().describe("Output format (default: markdown)"),
-  timeout: z.number().optional().describe("Timeout in seconds (default: 30)")
+  prompt: z.string().describe("The prompt to run on the fetched content")
 });
 var FETCH_TIMEOUT_MS = 3e4;
 var MAX_URL_LENGTH = 2e3;
@@ -4843,27 +4838,6 @@ function truncateFetchedContent(content) {
   if (content.length <= MAX_CONTENT_CHARS) return content;
   return `${content.substring(0, MAX_CONTENT_CHARS)}...[content truncated]`;
 }
-function cleanHtml(html) {
-  const root = parse4(html);
-  const elementsToRemove = root.querySelectorAll(
-    "script, style, nav, footer, iframe, noscript, object, embed"
-  );
-  elementsToRemove.forEach((el) => el.remove());
-  return root.toString();
-}
-function convertHtmlToText(html) {
-  const cleaned = cleanHtml(html);
-  const root = parse4(cleaned);
-  return root.textContent.trim();
-}
-function applyFormat(rawContent, contentType, format3) {
-  if (!contentType.toLowerCase().includes("text/html")) {
-    return rawContent;
-  }
-  if (format3 === "html") return cleanHtml(rawContent);
-  if (format3 === "text") return convertHtmlToText(rawContent);
-  return convertHtmlToMarkdown(rawContent);
-}
 function isMarkdownHost(url2, contentType) {
   const lowerContentType = contentType.toLowerCase();
   if (lowerContentType.includes("text/markdown")) return true;
@@ -4974,15 +4948,9 @@ var WebFetchTool = {
     }
     return { result: true };
   },
-  renderToolUseMessage({ url: url2, prompt, format: format3, timeout }, { verbose }) {
+  renderToolUseMessage({ url: url2, prompt }, { verbose }) {
     if (verbose) {
-      const details = [
-        `url: "${url2}"`,
-        prompt ? `prompt: "${prompt}"` : null,
-        format3 ? `format: "${format3}"` : null,
-        timeout ? `timeout: ${timeout}s` : null
-      ].filter(Boolean);
-      return details.join(", ");
+      return `url: "${url2}"${prompt ? `, prompt: "${prompt}"` : ""}`;
     }
     return url2;
   },
@@ -4993,19 +4961,14 @@ var WebFetchTool = {
     return /* @__PURE__ */ React5.createElement(Box5, { justifyContent: "space-between", width: "100%" }, /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "row" }, /* @__PURE__ */ React5.createElement(Text5, null, "\xA0\xA0\u23BF \xA0Received "), /* @__PURE__ */ React5.createElement(Text5, { bold: true }, formatBytes(output.bytes), " "), /* @__PURE__ */ React5.createElement(Text5, null, "(", output.code, " ", output.codeText, ")")), /* @__PURE__ */ React5.createElement(Cost, { costUSD: 0, durationMs: output.durationMs, debug: false }));
   },
   renderResultForAssistant(output) {
-    if (output.mode === "fetch") {
-      return `Content from ${output.url} (Format: ${output.format}):
-
-${output.result}`;
-    }
     return output.result;
   },
-  async *call({ url: url2, prompt, format: format3, timeout }, context) {
+  async *call({ url: url2, prompt }, context) {
     const normalizedUrl = normalizeUrl(url2);
     const start = Date.now();
     const timeoutSignal = createTimeoutSignal(
       context.abortController.signal,
-      Math.max(1, Number.isFinite(timeout) ? Number(timeout) : 30) * 1e3 || FETCH_TIMEOUT_MS
+      FETCH_TIMEOUT_MS
     );
     try {
       const cached = urlCache.get(normalizedUrl);
@@ -5027,10 +4990,7 @@ To complete your request, I need to fetch content from the redirected URL. Pleas
           codeText: codeText2,
           result: result2,
           durationMs: Date.now() - start,
-          url: normalizedUrl,
-          mode: "analysis",
-          format: "markdown",
-          cached: Boolean(cached)
+          url: normalizedUrl
         };
         yield {
           type: "result",
@@ -5042,7 +5002,7 @@ To complete your request, I need to fetch content from the redirected URL. Pleas
       let bytes = cached ? cached.bytes : 0;
       let code = cached ? cached.code : 200;
       let codeText = cached ? cached.codeText : "OK";
-      let rawContent = cached ? cached.rawContent : "";
+      let markdown = cached ? cached.content : "";
       let contentType = cached ? cached.contentType : "";
       if (fetched && fetched.type === "response") {
         const response = fetched.response;
@@ -5051,47 +5011,36 @@ To complete your request, I need to fetch content from the redirected URL. Pleas
         contentType = response.headers.get("content-type") || "";
         const { text: raw, bytes: responseBytes } = await readResponseTextLimited(response, MAX_RESPONSE_BYTES);
         bytes = responseBytes;
-        rawContent = raw;
+        const converted = contentType.toLowerCase().includes("text/html") ? convertHtmlToMarkdown(raw) : raw;
+        markdown = truncateFetchedContent(converted);
         urlCache.set(normalizedUrl, {
           bytes,
           code,
           codeText,
-          rawContent,
+          content: markdown,
           contentType
         });
       }
-      const outputFormat = format3 ?? "markdown";
-      const formatted = truncateFetchedContent(
-        applyFormat(rawContent, contentType, outputFormat)
+      const allowBroaderQuoting = isMarkdownHost(normalizedUrl, contentType);
+      const userPrompt = buildWebFetchApplyPrompt(
+        markdown,
+        prompt,
+        allowBroaderQuoting
       );
-      let result = formatted;
-      let mode = "fetch";
-      if (prompt && prompt.trim()) {
-        const allowBroaderQuoting = isMarkdownHost(normalizedUrl, contentType);
-        const userPrompt = buildWebFetchApplyPrompt(
-          formatted,
-          prompt,
-          allowBroaderQuoting
-        );
-        const aiResponse = await queryQuick({
-          systemPrompt: [],
-          userPrompt,
-          enablePromptCaching: false,
-          signal: timeoutSignal.signal
-        });
-        result = aiResponse.message.content[0]?.text || "No response from model";
-        mode = "analysis";
-      }
+      const aiResponse = await queryQuick({
+        systemPrompt: [],
+        userPrompt,
+        enablePromptCaching: false,
+        signal: timeoutSignal.signal
+      });
+      const result = aiResponse.message.content[0]?.text || "No response from model";
       const output = {
         bytes,
         code,
         codeText,
         result,
         durationMs: Date.now() - start,
-        url: normalizedUrl,
-        mode,
-        format: outputFormat,
-        cached: Boolean(cached)
+        url: normalizedUrl
       };
       yield {
         type: "result",
@@ -5106,10 +5055,7 @@ To complete your request, I need to fetch content from the redirected URL. Pleas
         codeText: "",
         result: `Error processing URL ${normalizedUrl}: ${message}`,
         durationMs: Date.now() - start,
-        url: normalizedUrl,
-        mode: "analysis",
-        format: "markdown",
-        cached: false
+        url: normalizedUrl
       };
       yield {
         type: "result",
@@ -6355,7 +6301,7 @@ Usage:
    \`\`\`
 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. When copying lines from Read output, only copy the text after the line-number prefix. The prefix format is: spaces + line number + tab.
+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. **Verification (Recommended)**: Set \`verify: true\` to enable atomic verification. The tool will check for syntax errors after editing and automatically ROLLBACK if errors are detected. Use this for complex edits or when ensuring stability.
 8. **Thinking**: You can include "thinking" text between blocks; the tool will ignore it.
@@ -6560,7 +6506,7 @@ var FileEditTool = {
     const originalFileContent = currentFileContent;
     let totalPatch = [];
     const { SmartEdit } = await import("./smart-edit-AWHJDSU6.js");
-    const { findLspAnchor } = await import("./lspAnchor-LDTVHYPK.js");
+    const { findLspAnchor } = await import("./lspAnchor-VZAH2A7D.js");
     for (const op of editOperations) {
       const normalizedSearch = normalizeLineEndings(op.search);
       const normalizedReplace = normalizeLineEndings(op.replace);
@@ -7820,29 +7766,25 @@ ${addLineNumbers({
   }
 };
 
-// src/tools/search/GlobTool/GlobTool.tsx
+// src/tools/filesystem/GlobTool/GlobTool.tsx
 import { Box as Box14, Text as Text15 } from "ink";
 import React15 from "react";
 import { z as z6 } from "zod";
 
-// src/tools/search/GlobTool/prompt.ts
+// src/tools/filesystem/GlobTool/prompt.ts
 var TOOL_NAME_FOR_PROMPT2 = "Glob";
 var DESCRIPTION4 = `- Fast file pattern matching tool that works with any codebase size
 - Supports glob patterns like "**/*.js" or "src/**/*.ts"
 - Returns matching file paths sorted by modification time
-- Use this tool when you need to confirm file or directory existence by name patterns after building the index tree with LS
-- Layered enumeration enables multi-level directory/file discovery: use \`*/\` for directories, then for each directory run \`dir/*\` and \`dir/*/\` to expand level by level
-- Layered glob example: run \`*/\` to get top-level directories, then run \`src/*\` and \`src/*/\` to get second-level files and folders
-- You can combine Batch to run multiple Globs in parallel for faster locating, but Glob only matches paths/filenames; use Grep or LSP for content keyword searches
-- Parallel examples: \`*\` + \`*/\` + \`**/package.json\` + \`**/pyproject.toml\` + \`**/README*\`
-- Partition scan: run \`src/*\`, \`docs/*\`, \`tests/*\` in parallel to build a first-level structure snapshot
-- Multi-repo filtering: run \`*/.git\` and \`*/package.json\` in parallel to locate candidate repos
-- Combination strategy: use LS to build the index tree, Glob to confirm existence, then Grep/LSP for content
+- Use this tool when you need to find files by name patterns
+- **Semantic Search**: Set \`semantic: true\` to search for code symbols (classes, functions, variables) instead of just file names. This is powered by LSP and can find files based on their *content* definitions even if the filename is different.
+- \u8BED\u4E49\u641C\u7D22\u4E3A\u663E\u5F0F\u89E6\u53D1\uFF1A\u53EA\u6709\u5728\u5E38\u89C4\u6A21\u5F0F\u65E0\u7ED3\u679C\u6216\u660E\u786E\u9700\u8981\u8BED\u4E49\u5B9A\u4F4D\u65F6\u518D\u542F\u7528
 - When you are doing an open ended search that may require multiple rounds of globbing and grepping, use the Agent tool instead
 - You can call multiple tools in a single response. It is always better to speculatively perform multiple searches in parallel if they are potentially useful.
+- This tool is for FINDING files. To SEE the directory structure tree, use the LS tool.
 `;
 
-// src/tools/search/GlobTool/GlobTool.tsx
+// src/tools/filesystem/GlobTool/GlobTool.tsx
 import { existsSync as existsSync5, statSync as statSync8 } from "fs";
 import { isAbsolute as isAbsolute6, join as join4, relative as relative8, resolve as resolve6 } from "path";
 import { fileURLToPath } from "url";
@@ -7851,7 +7793,7 @@ var inputSchema6 = z6.strictObject({
   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().default(true).describe(
+  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."
   )
 });
@@ -7990,33 +7932,21 @@ var TOOL_NAME_FOR_PROMPT3 = "Grep";
 var DESCRIPTION5 = `A powerful search tool built on ripgrep
 
   Usage:
-  - Use Grep for content search after an index tree is built with LS and paths are confirmed with Glob. NEVER invoke \`grep\` or \`rg\` as a Bash command. The Grep tool has been optimized for correct permissions and access.
+  - ALWAYS use Grep for search tasks. NEVER invoke \`grep\` or \`rg\` as a Bash command. The Grep tool has been optimized for correct permissions and access.
   - Supports full regex syntax (e.g., "log.*Error", "function\\s+\\w+")
   - Filter files with glob parameter (e.g., "*.js", "**/*.tsx") or type parameter (e.g., "js", "py", "rust")
   - Output modes: "content" shows matching lines, "files_with_matches" shows only file paths (default), "count" shows match counts
   - Use Task tool for open-ended searches requiring multiple rounds
   - Pattern syntax: Uses ripgrep (not grep) - literal braces need escaping (use \`interface\\{\\}\` to find \`interface{}\` in Go code)
   - Multiline matching: By default patterns match within single lines only. For cross-line patterns like \`struct \\{[\\s\\S]*?field\`, use \`multiline: true\`
-  - Semantic search: \`semantic\` defaults to true to use LSP workspace symbols when text search yields no results or when you explicitly need symbol-based lookup.
-  - Batch parallel Grep: run multiple independent keywords in parallel when they target different scopes, file types, or regexes.
-  - Multi-keyword single pass: for the same scope, use OR regex (e.g., \`foo|bar|baz\`) to reduce IO.
-  - Tradeoff: parallel Grep speeds discovery but increases IO pressure on large repos.
-  - Practical flow: map with LS, confirm with Glob, then Grep in parallel or OR regex within the scoped paths.
-  - Common usage examples:
-    - Keyword: \`TODO\` in TS files with context: \`pattern="TODO"\`, \`glob="**/*.ts"\`, \`output_mode="content"\`, \`-C=2\`
-    - Regex: find function declarations: \`pattern="function\\s+\\w+"\`, \`glob="**/*.js"\`
-    - Line numbers: errors in logs: \`pattern="error"\`, \`path="logs"\`, \`output_mode="content"\`, \`-n=true\`
-    - Count mode: occurrences per file: \`pattern="panic"\`, \`output_mode="count"\`
-  - Parallel examples (Batch):
-    - \`pattern="TODO"\`, \`glob="**/*.ts"\`
-    - \`pattern="FIXME"\`, \`glob="**/*.ts"\`
-    - \`pattern="deprecated"\`, \`glob="**/*.ts"\`
+  - Semantic search: Set \`semantic: true\` to use LSP workspace symbols when text search yields no results or when you explicitly need symbol-based lookup.
+  - \u8BED\u4E49\u641C\u7D22\u4E3A\u663E\u5F0F\u89E6\u53D1\uFF1A\u53EA\u6709\u5728\u5E38\u89C4\u6A21\u5F0F\u65E0\u7ED3\u679C\u6216\u660E\u786E\u9700\u8981\u8BED\u4E49\u5B9A\u4F4D\u65F6\u518D\u542F\u7528
   - STRATEGY: Use Grep as a "Scout" to *find* entry points based on text patterns.
     - STEP 1: Search for a unique string (e.g., error message, URL route, specific variable name).
     - STEP 2: Once you get a match (File + Line Number), STOP grepping.
-    - STEP 3: Switch to LSP immediately. Use the line number from Grep to jump to definition or find references.
+    - STEP 3: Switch to LspTool immediately. Use the line number from Grep to jump to definition or find references.
     - AVOID: Do not use Grep to trace execution flow (e.g., searching for "functionName" manually). Use LSP for that.
-  - Hotspot strategy: narrow paths first, then paginate or refine; after truncation, focus on hotspot directories to avoid full-repo scans.
+  - \u70ED\u70B9\u5B9A\u4F4D\u7B56\u7565\uFF1A\u5148\u7F29\u5C0F\u8DEF\u5F84\u8303\u56F4\uFF0C\u518D\u5206\u9875\u6216\u8FDB\u4E00\u6B65\u641C\u7D22\uFF1B\u622A\u65AD\u540E\u4F18\u5148\u805A\u7126\u70ED\u70B9\u76EE\u5F55\uFF0C\u907F\u514D\u5168\u5E93\u904D\u5386\u3002
 `;
 
 // src/tools/search/GrepTool/GrepTool.tsx
@@ -8058,7 +7988,7 @@ 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().default(true).describe(
+  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(
@@ -8222,7 +8152,7 @@ ${result.filenames.join("\n")}`;
     head_limit,
     offset = 0,
     multiline = false,
-    semantic = true,
+    semantic = false,
     symbol_type
   }, toolUseContext) {
     const { abortController } = toolUseContext;
@@ -8507,7 +8437,7 @@ IMPORTANT - Use the correct year in search queries:
 `.trim();
 
 // src/tools/network/WebSearchTool/searchProviders.ts
-import { parse as parse5 } from "node-html-parser";
+import { parse as parse4 } from "node-html-parser";
 var duckDuckGoSearchProvider = {
   isEnabled: () => true,
   search: async (query2) => {
@@ -8525,7 +8455,7 @@ var duckDuckGoSearchProvider = {
       );
     }
     const html = await response.text();
-    const root = parse5(html);
+    const root = parse4(html);
     const results = [];
     const resultNodes = root.querySelectorAll(".result.web-result");
     for (const node of resultNodes) {
@@ -9818,7 +9748,7 @@ async function clearConversation(context) {
   await clearTerminal();
   getMessagesSetter()([]);
   context.setForkConvoWithMessagesOnTheNextRender([]);
-  clearContextCache();
+  getContext.cache.clear?.();
   getCodeStyle.cache.clear?.();
   await setCwd(getOriginalCwd());
   resetReminderSession();
@@ -9919,7 +9849,7 @@ var compact = {
       ),
       summaryResponse
     ]);
-    clearContextCache();
+    getContext.cache.clear?.();
     getCodeStyle.cache.clear?.();
     resetFileFreshnessSession();
     resetReminderSession();
@@ -11098,7 +11028,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-KH33MHA2.js");
+        const { resetAnthropicClient } = await import("./llm-XG5AIU4E.js");
         resetAnthropicClient();
       } catch {
       }
@@ -15334,10 +15264,10 @@ var mcp = {
 var mcp_default = mcp;
 
 // src/commands/plugin.ts
-import { parse as parse7 } from "shell-quote";
+import { parse as parse6 } from "shell-quote";
 var PLUGIN_SCOPES = ["user", "project", "local"];
 function parseTokens(input) {
-  const parts = parse7(input);
+  const parts = parse6(input);
   const out = [];
   for (const part of parts) {
     if (typeof part === "string") out.push(part);
@@ -15380,7 +15310,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-ESATQIVZ.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-OPB7TGEW.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -16049,7 +15979,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-T5FSSEGT.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-QA5R6ZTQ.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -16177,7 +16107,16 @@ var EMPTY_STATUS = {
     incomingCalls: [],
     outgoingCalls: [],
     boundary: []
-  }
+  },
+  fastPath: {
+    failuresSummary: {},
+    lastFallback: [],
+    healthSummary: []
+  },
+  metrics: [],
+  requestMetrics: [],
+  compareMetrics: [],
+  tsQualityMetrics: []
 };
 function summarizeDiagnostics(entries) {
   return entries.reduce(
@@ -16230,15 +16169,141 @@ function formatFallbackSummary(status) {
   const countsText = activeCounts.length > 0 ? activeCounts.map(([name2, count]) => `${name2} ${count}`).join(", ") : "none";
   return `Fallbacks: ${countsText}, boundary ${boundaryText}`;
 }
+function formatFastPathFailuresSummary(status) {
+  const summary = status.fastPath?.failuresSummary ?? {};
+  const entries = ["exception", "empty", "timeout", "unsupported"].map((reason) => ({ reason, entry: summary[reason] })).filter((item) => item.entry && item.entry.count > 0);
+  if (entries.length === 0) return "FastPath failures: none";
+  const text = entries.map(({ reason, entry }) => {
+    const lastAt = entry?.lastAt ?? null;
+    const lastText = lastAt === null ? "last n/a" : `last ${lastAt}`;
+    return `${reason} ${entry?.count ?? 0} (${lastText})`;
+  }).join(", ");
+  return `FastPath failures: ${text}`;
+}
+function formatFastPathLastFallbackEntries(status) {
+  const entries = status.fastPath?.lastFallback ?? [];
+  const sorted = [...entries].sort((a, b) => b.at - a.at).slice(0, 10);
+  return sorted.map((entry) => ({
+    key: `${entry.filePath}:${entry.reason}:${entry.at}`,
+    line: `${entry.filePath} ${entry.reason} ${entry.at}`
+  }));
+}
+function formatFastPathHealthEntries(status) {
+  const entries = status.fastPath?.healthSummary ?? [];
+  const sorted = [...entries].sort((a, b) => {
+    const aLast = Math.max(a.lastSuccessAt ?? 0, a.lastFailureAt ?? 0);
+    const bLast = Math.max(b.lastSuccessAt ?? 0, b.lastFailureAt ?? 0);
+    return bLast - aLast;
+  }).slice(0, 10);
+  return sorted.map((entry) => {
+    const lastSuccess = entry.lastSuccessAt ?? "n/a";
+    const lastFailure = entry.lastFailureAt ?? "n/a";
+    const avgDuration = entry.avgDurationMs === null ? "n/a" : `${Math.round(entry.avgDurationMs)}ms`;
+    const downgrade = entry.downgradeUntil === null ? "n/a" : entry.downgradeUntil;
+    return {
+      key: `${entry.filePath}:${lastSuccess}:${lastFailure}:${downgrade}`,
+      line: `${entry.filePath} success ${entry.successCount} failure ${entry.failureCount} timeout ${entry.timeoutCount} lastSuccess ${lastSuccess} lastFailure ${lastFailure} avg ${avgDuration} downgradeUntil ${downgrade}`
+    };
+  });
+}
+function formatMetricsSummary(status) {
+  const spawnCount = status.metrics?.length ?? 0;
+  const requestCount = status.requestMetrics?.length ?? 0;
+  if (spawnCount === 0 && requestCount === 0) return "Metrics: none";
+  const window = status.sampleWindow;
+  const windowText = window && Number.isFinite(window.latencySamples) && Number.isFinite(window.baselineSamples) ? ` window latency ${window.latencySamples} baseline ${window.baselineSamples}` : "";
+  return `Metrics: spawn ${spawnCount}, request ${requestCount}${windowText}`;
+}
+function formatCompareMetricsSummary(status) {
+  const entries = status.compareMetrics ?? [];
+  if (entries.length === 0) return "AST/LSP consistency: none";
+  const totalSamples = entries.reduce((acc, entry) => acc + (entry.samples ?? 0), 0);
+  return `AST/LSP consistency: ${entries.length} languages, ${totalSamples} samples`;
+}
+function formatCompareMetricEntries(status) {
+  const entries = status.compareMetrics ?? [];
+  const sorted = [...entries].sort((a, b) => (b.samples ?? 0) - (a.samples ?? 0));
+  return sorted.slice(0, 10).map((entry) => {
+    const missingRate = Math.round((entry.missingRateAvg ?? 0) * 1e3) / 10;
+    const extraRate = Math.round((entry.extraRateAvg ?? 0) * 1e3) / 10;
+    return {
+      key: `${entry.language}:${entry.samples}:${entry.lastSampleAt ?? "n/a"}`,
+      line: `${entry.language} samples ${entry.samples} missing ${missingRate}% extra ${extraRate}% avgTraversal ${Math.round(entry.traversalAvg ?? 0)} avgQuery ${Math.round(entry.queryAvg ?? 0)}`
+    };
+  });
+}
+function formatQualityMetricsSummary(status) {
+  const entries = status.tsQualityMetrics ?? [];
+  if (entries.length === 0) return "Tree-Sitter quality: none";
+  const totalSamples = entries.reduce((acc, entry) => acc + (entry.samples ?? 0), 0);
+  return `Tree-Sitter quality: ${entries.length} languages, ${totalSamples} samples`;
+}
+function formatQualityMetricEntries(status) {
+  const entries = status.tsQualityMetrics ?? [];
+  const sorted = [...entries].sort((a, b) => (b.samples ?? 0) - (a.samples ?? 0));
+  return sorted.slice(0, 10).map((entry) => {
+    const successRate = Math.round((entry.successRate ?? 0) * 1e3) / 10;
+    const emptyRate = Math.round((entry.emptyRate ?? 0) * 1e3) / 10;
+    const coverage = Math.round((entry.coverageAvg ?? 0) * 1e3) / 10;
+    return {
+      key: `${entry.language}:${entry.samples}:${entry.lastSampleAt ?? "n/a"}`,
+      line: `${entry.language} samples ${entry.samples} success ${successRate}% empty ${emptyRate}% coverage ${coverage}% avgTraversal ${Math.round(entry.traversalAvg ?? 0)} avgQuery ${Math.round(entry.queryAvg ?? 0)}`
+    };
+  });
+}
+function formatParseCacheSummary(status) {
+  const cache = status.parseCache;
+  if (!cache) return "Parse cache: none";
+  return `Parse cache: incremental h${cache.incremental.hits}/m${cache.incremental.misses} size ${cache.incremental.size}, full h${cache.full.hits}/m${cache.full.misses} size ${cache.full.size}, fallback ${cache.fallbackCount}`;
+}
+function formatSpawnMetricEntries(status) {
+  const entries = status.metrics ?? [];
+  return entries.slice(0, 10).map((entry) => {
+    const successRate = Math.round((entry.successRate ?? 0) * 100);
+    const p95 = Math.round(entry.latencyP95Ms ?? 0);
+    return {
+      key: `${entry.server}:${entry.attempts}:${entry.successes}:${p95}`,
+      line: `${entry.server} success ${successRate}% p95 ${p95}ms`
+    };
+  });
+}
+function formatRequestMetricEntries(status) {
+  const entries = status.requestMetrics ?? [];
+  const sorted = [...entries].sort((a, b) => {
+    if (a.regression === b.regression) {
+      return (b.latencyP95Ms ?? 0) - (a.latencyP95Ms ?? 0);
+    }
+    return a.regression ? -1 : 1;
+  });
+  return sorted.slice(0, 10).map((entry) => {
+    const successRate = Math.round((entry.successRate ?? 0) * 100);
+    const p95 = Math.round(entry.latencyP95Ms ?? 0);
+    const regression = entry.regression ? "regression" : "ok";
+    const baseline = entry.baselineSamples > 0 ? ` baseline ${entry.baselineSamples}` : "";
+    return {
+      key: `${entry.server}:${entry.operation}:${p95}:${entry.baselineSamples}`,
+      line: `${entry.operation} ${entry.server} success ${successRate}% p95 ${p95}ms ${regression}${baseline}`
+    };
+  });
+}
 function normalizeStatus(status) {
   if (!status) return EMPTY_STATUS;
   const raw = status;
   const fallbacks = typeof raw.fallbacks === "object" && raw.fallbacks ? raw.fallbacks : void 0;
+  const fastPath = typeof raw.fastPath === "object" && raw.fastPath ? raw.fastPath : void 0;
+  const sampleWindow = typeof raw.sampleWindow === "object" && raw.sampleWindow ? raw.sampleWindow : void 0;
   return {
     clients: Array.isArray(raw.clients) ? raw.clients : [],
     spawning: Array.isArray(raw.spawning) ? raw.spawning : [],
     broken: Array.isArray(raw.broken) ? raw.broken : [],
     diagnostics: Array.isArray(raw.diagnostics) ? raw.diagnostics : [],
+    schemaVersion: typeof raw.schemaVersion === "number" ? raw.schemaVersion : void 0,
+    sampleWindow,
+    metrics: Array.isArray(raw.metrics) ? raw.metrics : [],
+    requestMetrics: Array.isArray(raw.requestMetrics) ? raw.requestMetrics : [],
+    compareMetrics: Array.isArray(raw.compareMetrics) ? raw.compareMetrics : [],
+    tsQualityMetrics: Array.isArray(raw.tsQualityMetrics) ? raw.tsQualityMetrics : [],
+    parseCache: typeof raw.parseCache === "object" && raw.parseCache ? raw.parseCache : void 0,
     fallbacks: {
       documentSymbol: Array.isArray(fallbacks?.documentSymbol) ? fallbacks.documentSymbol : [],
       getScope: Array.isArray(fallbacks?.getScope) ? fallbacks.getScope : [],
@@ -16248,6 +16313,11 @@ function normalizeStatus(status) {
       incomingCalls: Array.isArray(fallbacks?.incomingCalls) ? fallbacks.incomingCalls : [],
       outgoingCalls: Array.isArray(fallbacks?.outgoingCalls) ? fallbacks.outgoingCalls : [],
       boundary: Array.isArray(fallbacks?.boundary) ? fallbacks.boundary : []
+    },
+    fastPath: {
+      failuresSummary: fastPath && typeof fastPath.failuresSummary === "object" && fastPath.failuresSummary ? fastPath.failuresSummary : {},
+      lastFallback: Array.isArray(fastPath?.lastFallback) ? fastPath.lastFallback : [],
+      healthSummary: Array.isArray(fastPath?.healthSummary) ? fastPath.healthSummary : []
     }
   };
 }
@@ -16288,6 +16358,16 @@ function LspStatusDisplay({
   ).sort();
   const allDiagnostics = Array.from(diagnosticsByClient.values()).flat();
   const globalTotals = summarizeDiagnostics(allDiagnostics);
+  const fastPathEntries = formatFastPathLastFallbackEntries(normalized);
+  const fastPathHealthEntries = formatFastPathHealthEntries(normalized);
+  const metricsSummary = formatMetricsSummary(normalized);
+  const compareSummary = formatCompareMetricsSummary(normalized);
+  const qualitySummary = formatQualityMetricsSummary(normalized);
+  const parseCacheSummary = formatParseCacheSummary(normalized);
+  const spawnMetricEntries = formatSpawnMetricEntries(normalized);
+  const requestMetricEntries = formatRequestMetricEntries(normalized);
+  const compareMetricEntries = formatCompareMetricEntries(normalized);
+  const qualityMetricEntries = formatQualityMetricEntries(normalized);
   return /* @__PURE__ */ React45.createElement(
     Box35,
     {
@@ -16302,6 +16382,17 @@ function LspStatusDisplay({
     /* @__PURE__ */ React45.createElement(Text39, null, "Clients: ", normalized.clients.length, " connected,", " ", normalized.spawning.length, " spawning, ", normalized.broken.length, " broken"),
     /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, formatDiagnosticsSummary(globalTotals)),
     /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, formatFallbackSummary(normalized)),
+    /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, formatFastPathFailuresSummary(normalized)),
+    /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, metricsSummary),
+    /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, compareSummary),
+    /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, qualitySummary),
+    /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, parseCacheSummary),
+    fastPathEntries.length > 0 ? /* @__PURE__ */ React45.createElement(Box35, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, "FastPath last fallback:"), fastPathEntries.map((entry) => /* @__PURE__ */ React45.createElement(Box35, { key: entry.key }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, entry.line)))) : null,
+    spawnMetricEntries.length > 0 ? /* @__PURE__ */ React45.createElement(Box35, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, "Spawn metrics:"), spawnMetricEntries.map((entry) => /* @__PURE__ */ React45.createElement(Box35, { key: entry.key }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, entry.line)))) : null,
+    requestMetricEntries.length > 0 ? /* @__PURE__ */ React45.createElement(Box35, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, "Request metrics:"), requestMetricEntries.map((entry) => /* @__PURE__ */ React45.createElement(Box35, { key: entry.key }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, entry.line)))) : null,
+    compareMetricEntries.length > 0 ? /* @__PURE__ */ React45.createElement(Box35, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, "AST/LSP consistency:"), compareMetricEntries.map((entry) => /* @__PURE__ */ React45.createElement(Box35, { key: entry.key }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, entry.line)))) : null,
+    qualityMetricEntries.length > 0 ? /* @__PURE__ */ React45.createElement(Box35, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, "Tree-Sitter quality:"), qualityMetricEntries.map((entry) => /* @__PURE__ */ React45.createElement(Box35, { key: entry.key }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, entry.line)))) : null,
+    fastPathHealthEntries.length > 0 ? /* @__PURE__ */ React45.createElement(Box35, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, "FastPath health summary:"), fastPathHealthEntries.map((entry) => /* @__PURE__ */ React45.createElement(Box35, { key: entry.key }, /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, entry.line)))) : null,
     /* @__PURE__ */ React45.createElement(Text39, null, " "),
     clientNames.length === 0 ? /* @__PURE__ */ React45.createElement(Text39, { color: theme.secondaryText }, "No LSP clients initialized") : /* @__PURE__ */ React45.createElement(Box35, { flexDirection: "column" }, clientNames.map((clientName) => {
       const state = getClientState(clientName, normalized);
@@ -23493,7 +23584,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-KH33MHA2.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-XG5AIU4E.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.",
@@ -23806,7 +23897,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-BESFSMYW.js");
+          const { getCwd: getCwd2 } = await import("./state-BVQ44522.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -24358,6 +24449,7 @@ async function logBinaryFeedbackEvent(_m1, _m2, _choice) {
 var PybContextManager = class _PybContextManager {
   static instance;
   projectDocsCache = "";
+  projectStructureStatsCache = "";
   cacheInitialized = false;
   initPromise = null;
   static getInstance() {
@@ -24370,8 +24462,12 @@ var PybContextManager = class _PybContextManager {
     if (this.initPromise) return this.initPromise;
     this.initPromise = (async () => {
       try {
-        const [projectDocs] = await Promise.all([getProjectDocs()]);
+        const [projectDocs, statsBlock] = await Promise.all([
+          getProjectDocs(),
+          getProjectStructureStatisticsBlock()
+        ]);
         this.projectDocsCache = projectDocs || "";
+        this.projectStructureStatsCache = statsBlock;
         this.cacheInitialized = true;
       } catch (error) {
         logError(error);
@@ -24379,6 +24475,7 @@ var PybContextManager = class _PybContextManager {
           error: error instanceof Error ? error.message : String(error)
         });
         this.projectDocsCache = "";
+        this.projectStructureStatsCache = "";
         this.cacheInitialized = true;
       }
     })();
@@ -24395,7 +24492,8 @@ var PybContextManager = class _PybContextManager {
       return "";
     }
     const context = [
-      this.projectDocsCache
+      this.projectDocsCache,
+      this.projectStructureStatsCache
     ].filter(Boolean).join("\n\n");
     return context;
   }
@@ -24662,7 +24760,7 @@ ${contentWithLines}
     }
   }
   getMessagesSetter()([]);
-  clearContextCache();
+  getContext.cache.clear?.();
   getCodeStyle.cache.clear?.();
   resetFileFreshnessSession();
   return compactedMessages;
@@ -24673,218 +24771,26 @@ function isToolUseLikeBlock(block) {
   return block && typeof block === "object" && (block.type === "tool_use" || block.type === "server_tool_use" || block.type === "mcp_tool_use");
 }
 var __isToolUseLikeBlockForTests = isToolUseLikeBlock;
-function isBatchToolName(name2) {
-  return name2.trim().toLowerCase() === "batch";
-}
-function isMcpToolName(name2) {
-  const trimmed = name2.trim();
-  return trimmed === "mcp" || trimmed.startsWith("mcp__");
-}
-function isMarketplaceToolName(name2) {
-  return name2.trim().startsWith("marketplace__");
-}
-function isSkillToolName(name2) {
-  return name2.trim() === "Skill";
-}
-function normalizeToolCallParameters(input) {
-  if (input && typeof input === "object" && !Array.isArray(input)) {
-    return input;
-  }
-  return {};
-}
-function createAutoBatchToolUse(toolUses, batchIndex) {
-  const seed = toolUses[0]?.id || "auto";
-  return {
-    type: "tool_use",
-    id: `batch_auto_${seed}_${batchIndex + 1}`,
-    name: "Batch",
-    input: {
-      tool_calls: toolUses.map((toolUse) => ({
-        tool: resolveToolNameAlias(toolUse.name).resolvedName,
-        parameters: normalizeToolCallParameters(toolUse.input)
-      }))
-    }
-  };
-}
-function isAutoBatchToolUse(toolUse) {
-  const resolvedName = resolveToolNameAlias(toolUse.name).resolvedName;
-  return isBatchToolName(resolvedName) && typeof toolUse.id === "string" && toolUse.id.startsWith("batch_auto_");
-}
-function getAutoBatchAggregationSummary(toolUseMessages, tools, output, enabled) {
-  const inputCount = toolUseMessages.length;
-  const eligibleCount = toolUseMessages.reduce(
-    (count, toolUse) => count + (canAutoBatchToolUse(toolUse, tools) ? 1 : 0),
-    0
-  );
-  const ineligibleCount = inputCount - eligibleCount;
-  const autoBatchToolUses = output.filter(isAutoBatchToolUse);
-  const autoBatchedToolCount = autoBatchToolUses.reduce((sum, toolUse) => {
-    const input = toolUse.input;
-    const toolCalls = Array.isArray(input?.tool_calls) ? input.tool_calls : [];
-    return sum + toolCalls.length;
-  }, 0);
-  return {
-    enabled,
-    inputCount,
-    eligibleCount,
-    ineligibleCount,
-    outputCount: output.length,
-    autoBatchCount: autoBatchToolUses.length,
-    autoBatchedToolCount
-  };
-}
-function canAutoBatchToolUse(toolUse, tools) {
-  const resolvedName = resolveToolNameAlias(toolUse.name).resolvedName;
-  if (isBatchToolName(resolvedName) || isMcpToolName(resolvedName) || isMarketplaceToolName(resolvedName) || isSkillToolName(resolvedName)) {
-    return false;
-  }
-  const tool = tools.find((t) => t.name === resolvedName);
-  if (!tool) return false;
-  const parsed = tool.inputSchema.safeParse(
-    normalizeToolCallParameters(toolUse.input)
-  );
-  if (!parsed.success) return false;
-  return tool.isReadOnly(parsed.data) && tool.isConcurrencySafe(parsed.data);
-}
-function autoBatchToolUseBlocks(toolUseMessages, tools) {
-  if (toolUseMessages.length < 2) return toolUseMessages;
-  const resolvedNames = toolUseMessages.map(
-    (toolUse) => resolveToolNameAlias(toolUse.name).resolvedName
-  );
-  if (resolvedNames.some(isBatchToolName)) return toolUseMessages;
-  const normalizedToolUses = toolUseMessages.map((toolUse, index) => ({
-    ...toolUse,
-    name: resolvedNames[index]
-  }));
-  const output = [];
-  let batchIndex = 0;
-  let buffer = [];
-  const flushBuffer = () => {
-    if (buffer.length === 0) return;
-    if (buffer.length === 1) {
-      output.push(buffer[0]);
-      buffer = [];
-      return;
-    }
-    for (let i = 0; i < buffer.length; i += 10) {
-      const chunk = buffer.slice(i, i + 10);
-      output.push(createAutoBatchToolUse(chunk, batchIndex));
-      batchIndex += 1;
-    }
-    buffer = [];
-  };
-  for (const toolUse of normalizedToolUses) {
-    if (canAutoBatchToolUse(toolUse, tools)) {
-      buffer.push(toolUse);
-      continue;
-    }
-    flushBuffer();
-    output.push(toolUse);
-  }
-  flushBuffer();
-  return output;
-}
-var __autoBatchToolUseBlocksForTests = autoBatchToolUseBlocks;
-function shouldAutoBatchAggregation() {
-  const config2 = getCurrentProjectConfig();
-  const enabled = config2.experimental?.auto_batch_aggregation;
-  return enabled !== false;
-}
-function applyAutoBatchAggregation(toolUseMessages, tools, options) {
-  const enabled = shouldAutoBatchAggregation();
-  const requestId = getCurrentRequest()?.id;
-  if (!enabled) {
-    const summary = getAutoBatchAggregationSummary(
-      toolUseMessages,
-      tools,
-      toolUseMessages,
-      false
-    );
-    debug.flow(
-      "AUTO_BATCH_AGGREGATION",
-      {
-        ...summary,
-        reason: "disabled"
-      },
-      requestId
-    );
-    return toolUseMessages;
-  }
-  try {
-    if (options?.forceThrow) {
-      throw new Error("forced auto batch failure");
-    }
-    const aggregated = autoBatchToolUseBlocks(toolUseMessages, tools);
-    const summary = getAutoBatchAggregationSummary(
-      toolUseMessages,
-      tools,
-      aggregated,
-      true
-    );
-    debug.flow("AUTO_BATCH_AGGREGATION", summary, requestId);
-    return aggregated;
-  } catch (error) {
-    const summary = getAutoBatchAggregationSummary(
-      toolUseMessages,
-      tools,
-      toolUseMessages,
-      true
-    );
-    debug.flow(
-      "AUTO_BATCH_AGGREGATION_FALLBACK",
-      {
-        ...summary,
-        error: error instanceof Error ? error.message : String(error)
-      },
-      requestId
-    );
-    if (!options?.forceThrow) {
-      logError(error);
-    }
-    return toolUseMessages;
-  }
-}
-var __applyAutoBatchAggregationForTests = applyAutoBatchAggregation;
-function rewriteToolUseBlocksInAssistantMessage(assistantMessage, toolUseMessages) {
-  if (!Array.isArray(assistantMessage.message.content)) return assistantMessage;
-  let nextToolUseIndex = 0;
-  const rewritten = assistantMessage.message.content.flatMap((block) => {
-    if (!isToolUseLikeBlock(block)) return [block];
-    const next = toolUseMessages[nextToolUseIndex];
-    if (!next) return [];
-    nextToolUseIndex += 1;
-    return [next];
-  });
-  for (let i = nextToolUseIndex; i < toolUseMessages.length; i += 1) {
-    rewritten.push(toolUseMessages[i]);
-  }
-  return {
-    ...assistantMessage,
-    message: {
-      ...assistantMessage.message,
-      content: rewritten
-    }
-  };
-}
-var __rewriteToolUseBlocksForTests = rewriteToolUseBlocksInAssistantMessage;
-function createSyntheticToolUseErrorMessage(toolUseId, reason) {
+function createSyntheticToolUseErrorMessage(args) {
+  const { toolUseId, reason, rootToolUseId } = args;
   if (reason === "user_interrupted") {
     return createUserMessage([
-      {
-        type: "tool_result",
+      createErrorToolResultBlock({
+        toolUseId,
         content: REJECT_MESSAGE,
-        is_error: true,
-        tool_use_id: toolUseId
-      }
+        errorCode: "USER_INTERRUPTED",
+        errorClass: "fatal"
+      })
     ]);
   }
   return createUserMessage([
-    {
-      type: "tool_result",
+    createErrorToolResultBlock({
+      toolUseId,
       content: "<tool_use_error>Sibling tool call errored</tool_use_error>",
-      is_error: true,
-      tool_use_id: toolUseId
-    }
+      errorCode: "SIBLING_ERROR",
+      errorClass: "fatal",
+      rootToolUseId
+    })
   ]);
 }
 var ToolUseQueue = class {
@@ -24892,7 +24798,8 @@ var ToolUseQueue = class {
   canUseTool;
   tools = [];
   toolUseContext;
-  hasErrored = false;
+  hasFatalErrored = false;
+  fatalToolUseId;
   progressAvailableResolve;
   siblingToolUseIDs;
   shouldSkipPermissionCheck;
@@ -24954,7 +24861,7 @@ var ToolUseQueue = class {
     }
   }
   getAbortReason() {
-    if (this.hasErrored) return "sibling_error";
+    if (this.hasFatalErrored) return "sibling_error";
     if (this.toolUseContext.abortController.signal.aborted)
       return "user_interrupted";
     return null;
@@ -24966,7 +24873,13 @@ var ToolUseQueue = class {
     const promise = (async () => {
       const abortReason = this.getAbortReason();
       if (abortReason) {
-        results.push(createSyntheticToolUseErrorMessage(entry.id, abortReason));
+        results.push(
+          createSyntheticToolUseErrorMessage({
+            toolUseId: entry.id,
+            reason: abortReason,
+            rootToolUseId: this.fatalToolUseId
+          })
+        );
         entry.results = results;
         entry.contextModifiers = contextModifiers;
         entry.status = "completed";
@@ -24984,13 +24897,32 @@ var ToolUseQueue = class {
       for await (const message of generator) {
         const reason = this.getAbortReason();
         if (reason && !toolErrored) {
-          results.push(createSyntheticToolUseErrorMessage(entry.id, reason));
+          results.push(
+            createSyntheticToolUseErrorMessage({
+              toolUseId: entry.id,
+              reason,
+              rootToolUseId: this.fatalToolUseId
+            })
+          );
           break;
         }
         if (message.type === "user" && Array.isArray(message.message.content) && message.message.content.some(
           (block) => block.type === "tool_result" && block.is_error === true
         )) {
-          this.hasErrored = true;
+          const fatal = message.message.content.some(
+            (block) => block.type === "tool_result" && block.is_error === true && block.error_class === "fatal"
+          );
+          if (fatal) {
+            this.hasFatalErrored = true;
+            if (!this.fatalToolUseId) {
+              const fatalBlock = message.message.content.find(
+                (block) => block.type === "tool_result" && block.is_error === true && block.error_class === "fatal" && typeof block.tool_use_id === "string"
+              );
+              if (fatalBlock) {
+                this.fatalToolUseId = fatalBlock.tool_use_id;
+              }
+            }
+          }
           toolErrored = true;
         }
         if (message.type === "progress") {
@@ -25270,15 +25202,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
     }
     const assistantMessage = result.message;
     const shouldSkipPermissionCheck = result.shouldSkipPermissionCheck;
-    const rawToolUseMessages = assistantMessage.message.content.filter(isToolUseLikeBlock);
-    const toolUseMessages = applyAutoBatchAggregation(
-      rawToolUseMessages,
-      toolUseContext.options?.tools ?? []
-    );
-    const assistantMessageForTools = rewriteToolUseBlocksInAssistantMessage(
-      assistantMessage,
-      toolUseMessages
-    );
+    const toolUseMessages = assistantMessage.message.content.filter(isToolUseLikeBlock);
     if (!toolUseMessages.length) {
       const stopHookEvent = toolUseContext.agentId && toolUseContext.agentId !== "main" ? "SubagentStop" : "Stop";
       const stopReason = assistantMessage.message?.stop_reason || assistantMessage.message?.stopReason || "end_turn";
@@ -25324,7 +25248,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       yield assistantMessage;
       return;
     }
-    yield assistantMessageForTools;
+    yield assistantMessage;
     const siblingToolUseIDs = new Set(toolUseMessages.map((_) => _.id));
     const toolQueue = new ToolUseQueue({
       toolDefinitions: toolUseContext.options.tools,
@@ -25334,7 +25258,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       shouldSkipPermissionCheck
     });
     for (const toolUse of toolUseMessages) {
-      toolQueue.addTool(toolUse, assistantMessageForTools);
+      toolQueue.addTool(toolUse, assistantMessage);
     }
     const toolMessagesForNextTurn = [];
     for await (const message of toolQueue.getRemainingResults()) {
@@ -25396,12 +25320,12 @@ async function* runToolUse(toolUse, siblingToolUseIDs, assistantMessage, canUseT
       requestId: currentRequest?.id
     });
     yield createUserMessage([
-      {
-        type: "tool_result",
+      createErrorToolResultBlock({
+        toolUseId: toolUse.id,
         content: `Error: No such tool available: ${toolName}`,
-        is_error: true,
-        tool_use_id: toolUse.id
-      }
+        errorCode: "TOOL_NOT_FOUND",
+        errorClass: "soft"
+      })
     ]);
     return;
   }
@@ -25428,12 +25352,11 @@ async function* runToolUse(toolUse, siblingToolUseIDs, assistantMessage, canUseT
   } catch (e) {
     logError(e);
     const errorMessage = createUserMessage([
-      {
-        type: "tool_result",
+      createErrorToolResultBlock({
+        toolUseId: toolUse.id,
         content: `Tool execution failed: ${e instanceof Error ? e.message : String(e)}`,
-        is_error: true,
-        tool_use_id: toolUse.id
-      }
+        errorCode: extractErrorCode(e)
+      })
     ]);
     yield errorMessage;
   }
@@ -25483,12 +25406,12 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
       errorMessage = `Error: The Read tool requires a 'file_path' parameter to specify which file to read. Please provide the absolute path to the file you want to read. For example: {"file_path": "/path/to/file.txt"}`;
     }
     yield createUserMessage([
-      {
-        type: "tool_result",
+      createErrorToolResultBlock({
+        toolUseId: toolUseID,
         content: errorMessage,
-        is_error: true,
-        tool_use_id: toolUseID
-      }
+        errorCode: "INPUT_VALIDATION",
+        errorClass: "soft"
+      })
     ]);
     return;
   }
@@ -25499,12 +25422,12 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
   );
   if (isValidCall?.result === false) {
     yield createUserMessage([
-      {
-        type: "tool_result",
+      createErrorToolResultBlock({
+        toolUseId: toolUseID,
         content: isValidCall.message,
-        is_error: true,
-        tool_use_id: toolUseID
-      }
+        errorCode: "INPUT_VALIDATION",
+        errorClass: "soft"
+      })
     ]);
     return;
   }
@@ -25520,12 +25443,12 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
   });
   if (hookOutcome.kind === "block") {
     yield createUserMessage([
-      {
-        type: "tool_result",
+      createErrorToolResultBlock({
+        toolUseId: toolUseID,
         content: hookOutcome.message,
-        is_error: true,
-        tool_use_id: toolUseID
-      }
+        errorCode: "HOOK_BLOCKED",
+        errorClass: "soft"
+      })
     ]);
     return;
   }
@@ -25550,12 +25473,12 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
     const parsed = tool.inputSchema.safeParse(merged);
     if (!parsed.success) {
       yield createUserMessage([
-        {
-          type: "tool_result",
+        createErrorToolResultBlock({
+          toolUseId: toolUseID,
           content: `Hook updatedInput failed validation: ${parsed.error.message}`,
-          is_error: true,
-          tool_use_id: toolUseID
-        }
+          errorCode: "INPUT_VALIDATION",
+          errorClass: "soft"
+        })
       ]);
       return;
     }
@@ -25566,12 +25489,12 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
     );
     if (isValidUpdate?.result === false) {
       yield createUserMessage([
-        {
-          type: "tool_result",
+        createErrorToolResultBlock({
+          toolUseId: toolUseID,
           content: isValidUpdate.message,
-          is_error: true,
-          tool_use_id: toolUseID
-        }
+          errorCode: "INPUT_VALIDATION",
+          errorClass: "soft"
+        })
       ]);
       return;
     }
@@ -25596,12 +25519,12 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
   );
   if (permissionResult.result === false) {
     yield createUserMessage([
-      {
-        type: "tool_result",
+      createErrorToolResultBlock({
+        toolUseId: toolUseID,
         content: permissionResult.message,
-        is_error: true,
-        tool_use_id: toolUseID
-      }
+        errorCode: "PERMISSION_DENIED",
+        errorClass: "soft"
+      })
     ]);
     return;
   }
@@ -25688,12 +25611,11 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
     const content = formatError(error);
     logError(error);
     yield createUserMessage([
-      {
-        type: "tool_result",
+      createErrorToolResultBlock({
+        toolUseId: toolUseID,
         content,
-        is_error: true,
-        tool_use_id: toolUseID
-      }
+        errorCode: extractErrorCode(error)
+      })
     ]);
   }
 }
@@ -25721,6 +25643,52 @@ function formatError(error) {
 
 ${end}`;
 }
+var ERROR_CLASS_BY_CODE = {
+  ENOENT: "soft",
+  EISDIR: "soft",
+  EACCES: "retryable",
+  EPERM: "retryable",
+  EMFILE: "retryable",
+  ENFILE: "retryable",
+  EIO: "fatal",
+  ENODEV: "fatal",
+  EBUSY: "fatal"
+};
+function extractErrorCode(error) {
+  if (!error || typeof error !== "object") {
+    return void 0;
+  }
+  if ("code" in error && typeof error.code === "string") {
+    return error.code;
+  }
+  return void 0;
+}
+function summarizeError(detail) {
+  const line = detail.split("\n").map((part) => part.trim()).find((part) => part.length > 0);
+  const summary = line ?? detail.trim();
+  return summary.length > 200 ? summary.slice(0, 200) : summary;
+}
+function getErrorClassFromCode(errorCode) {
+  if (!errorCode) return "soft";
+  return ERROR_CLASS_BY_CODE[errorCode] ?? "soft";
+}
+function createErrorToolResultBlock(args) {
+  const detail = typeof args.errorDetail === "string" ? args.errorDetail : typeof args.content === "string" ? args.content : JSON.stringify(args.content);
+  const errorCode = args.errorCode;
+  const errorClass = args.errorClass ?? getErrorClassFromCode(errorCode);
+  const summary = detail ? summarizeError(detail) : "";
+  return {
+    type: "tool_result",
+    content: args.content,
+    is_error: true,
+    tool_use_id: args.toolUseId,
+    error_class: errorClass,
+    ...errorCode ? { error_code: errorCode } : {},
+    ...summary ? { error_summary: summary } : {},
+    ...detail ? { error_detail: detail } : {},
+    ...args.rootToolUseId ? { root_tool_use_id: args.rootToolUseId } : {}
+  };
+}
 
 // src/ui/components/binary-feedback/BinaryFeedback.tsx
 import { default as React99, useCallback as useCallback15 } from "react";
@@ -26764,7 +26732,6 @@ function getCoreTools() {
     { name: "LS", description: "List directory contents" },
     { name: "WebFetch", description: "Fetch web content" },
     { name: "WebSearch", description: "Search the web" },
-    { name: "Batch", description: "Execute multiple tool calls in parallel" },
     { name: "TodoWrite", description: "Manage task lists" }
   ];
   return tools.filter((t) => t.name !== "Task" && t.name !== "ExitPlanMode");
@@ -26800,7 +26767,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-KH33MHA2.js");
+  const { queryModel } = await import("./llm-XG5AIU4E.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:
@@ -27096,12 +27063,6 @@ var COLOR_OPTIONS = [
   "pink",
   "cyan"
 ];
-function resolveToolSelection(selected, allToolNames) {
-  if (selected.length === allToolNames.length && allToolNames.every((name2) => selected.includes(name2))) {
-    return void 0;
-  }
-  return selected;
-}
 function openInEditor(filePath) {
   return new Promise((resolve11, reject) => {
     const platform = process.platform;
@@ -27712,7 +27673,8 @@ function ToolPicker(props) {
     });
   };
   const complete = () => {
-    props.onComplete(resolveToolSelection(selected, allToolNames));
+    const next = selected.length === allToolNames.length && allToolNames.every((n) => selected.includes(n)) ? void 0 : selected;
+    props.onComplete(next);
   };
   const categorized = useMemo25(() => {
     const readOnly = /* @__PURE__ */ new Set(["Read", "Glob", "Grep", "LS"]);
@@ -30145,23 +30107,6 @@ Output: Create directory 'foo'`
     "Set this to true to dangerously override sandbox mode and run commands without sandboxing."
   )
 });
-var FILE_COMMAND_GUIDANCE = {
-  ls: "\u4F7F\u7528 LS \u67E5\u770B\u76EE\u5F55\u7ED3\u6784\uFF0C\u4F7F\u7528 Glob \u641C\u7D22\u6587\u4EF6\u3002",
-  find: "\u4F7F\u7528 Glob \u641C\u7D22\u6587\u4EF6\u3002",
-  grep: "\u4F7F\u7528 Grep \u641C\u7D22\u5185\u5BB9\u3002",
-  rg: "\u4F7F\u7528 Grep \u641C\u7D22\u5185\u5BB9\u3002",
-  cat: "\u4F7F\u7528 Read \u67E5\u770B\u6587\u4EF6\u5185\u5BB9\u3002",
-  head: "\u4F7F\u7528 Read \u67E5\u770B\u6587\u4EF6\u5185\u5BB9\u3002",
-  tail: "\u4F7F\u7528 Read \u67E5\u770B\u6587\u4EF6\u5185\u5BB9\u3002",
-  sed: "\u4F7F\u7528 Edit \u8FDB\u884C\u4FEE\u6539\u3002",
-  awk: "\u4F7F\u7528 Edit \u8FDB\u884C\u4FEE\u6539\u3002",
-  rm: "\u4F7F\u7528 Delete \u5220\u9664\u6587\u4EF6\u6216\u76EE\u5F55\u3002",
-  rmdir: "\u4F7F\u7528 Delete \u5220\u9664\u76EE\u5F55\u3002",
-  del: "\u4F7F\u7528 Delete \u5220\u9664\u6587\u4EF6\u3002",
-  erase: "\u4F7F\u7528 Delete \u5220\u9664\u6587\u4EF6\u3002",
-  mv: "\u4F7F\u7528 Read + Write + Delete \u5B8C\u6210\u79FB\u52A8\u6216\u91CD\u547D\u540D\u3002",
-  cp: "\u4F7F\u7528 Read + Write \u5B8C\u6210\u590D\u5236\u3002"
-};
 var BashTool = {
   name: "Bash",
   cachedDescription: "Run shell command",
@@ -30206,20 +30151,14 @@ var BashTool = {
         message: e.message
       };
     }
-    const commands = splitCommand(command4);
-    for (const cmd of commands) {
-      const parts = cmd.trim().split(/\s+/);
-      const baseCmd = parts[0]?.toLowerCase();
-      if (!baseCmd) continue;
-      const guidance = FILE_COMMAND_GUIDANCE[baseCmd];
-      if (guidance) {
-        return {
-          result: false,
-          message: `BashTool \u89C4\u5219\uFF1A\u4E0D\u8981\u7528 BashTool \u8FDB\u884C\u6587\u4EF6\u8BFB\u5199/\u7F16\u8F91/\u641C\u7D22/\u5220\u9664/\u91CD\u547D\u540D/\u590D\u5236\u3002
-\u68C0\u6D4B\u5230\u547D\u4EE4: ${baseCmd}
-${guidance}`
-        };
-      }
+    if (/^ls(\s+|$)/.test(trimmed) && !trimmed.includes("-")) {
+      return {
+        result: false,
+        message: `Security Policy: Do not use 'ls' for simple file listing. 
+- To find files: Use the 'Glob' tool.
+- To view directory structure: Use the 'LS' tool.
+- To check permissions/metadata: Use 'ls -l' (allowed).`
+      };
     }
     if (timeout !== void 0) {
       if (!Number.isFinite(timeout) || timeout < 0) {
@@ -30256,6 +30195,7 @@ ${guidance}`
         };
       }
     }
+    const commands = splitCommand(command4);
     for (const cmd of commands) {
       const parts = cmd.split(" ");
       const baseCmd = parts[0];
@@ -30822,17 +30762,10 @@ It is critical that you mark todos as completed as soon as you are done with a t
 1. **Modification Check**: Before editing, you MUST verify if the change is already present (e.g. use \`grep\` or \`read\`).
 2. **Precise Targeting**: For code injection, prefer using LSP to find exact function boundaries, or Read the file to get unique context.
 3. **Artifact Verification**: After completing a complex task, verify the artifacts (e.g. check if files exist using \`ls\`).
-4. **LSP Instinct**: Before modifying any code, you MUST use \`LSP.documentSymbol\` or \`LSP.definition\` to confirm the exact location and range of the target symbol. Do NOT rely on line numbers from \`read_file\` alone as they may be outdated.
-5. **Atomic Verification**: When editing code, especially in critical or complex files, you should strongly consider setting \`verify: true\` in the \`FileEdit\`. This enables the tool to automatically detect syntax errors and ROLLBACK changes if they are invalid, preventing you from breaking the build.
-6. **Semantic Search**: When searching for code concepts (e.g. "AuthLogic", "UserHandler") rather than exact filenames, prefer using \`Glob\` with \`semantic: true\`. This leverages LSP to find files by their content definitions.
-7. **Reference Guard**: Be aware that deleting files might be blocked if they are referenced elsewhere. If the \`Delete\` blocks you, check the references it reports. Only use \`force: true\` if you are refactoring and intentionally removing those references.
-
-# Index Tree First Strategy
-- Every analysis must be grounded in a verifiable index tree; avoid blind matching
-- Build the tree in layers: Root \u2192 Core Directories \u2192 Secondary Modules
-- Use LS to map layers, then confirm with Glob before Grep/Read
-- Treat truncated trees as hints only, not for precise paths
-- Use the tree to narrow scope, then locate exact files and symbols
+4. **LSP Instinct**: Before modifying any code, you MUST use \`LSPTool.documentSymbol\` or \`LSPTool.definition\` to confirm the exact location and range of the target symbol. Do NOT rely on line numbers from \`read_file\` alone as they may be outdated.
+5. **Atomic Verification**: When editing code, especially in critical or complex files, you should strongly consider setting \`verify: true\` in the \`FileEditTool\`. This enables the tool to automatically detect syntax errors and ROLLBACK changes if they are invalid, preventing you from breaking the build.
+6. **Semantic Search**: When searching for code concepts (e.g. "AuthLogic", "UserHandler") rather than exact filenames, prefer using \`GlobTool\` with \`semantic: true\`. This leverages LSP to find files by their content definitions.
+7. **Reference Guard**: Be aware that deleting files might be blocked if they are referenced elsewhere. If the \`DeleteTool\` blocks you, check the references it reports. Only use \`force: true\` if you are refactoring and intentionally removing those references.
 
 # LSP \u540E\u7F6E\u4E0E\u8303\u56F4\u9650\u5236
 - \u4F18\u5148\u987A\u5E8F\uFF1A\u7ED3\u6784\u6811 -> \u70ED\u70B9\u5B9A\u4F4D -> Read -> LSP
@@ -30952,11 +30885,10 @@ NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTAN
 
 # Cognitive Search Strategy
 1. **Concept Search**: WHEN searching for high-level concepts (e.g., "Auth Logic", "Payment Flow") OR when you are uncertain about exact naming, you MUST use \`semantic: true\` in Grep/Glob tools. This activates the LSP Workspace Symbol search which is resilient to typos and fuzzy matches.
-   - Example: \`Grep(pattern: "AuthFeatr", semantic: true)\` will find "AuthFeature".
-   - Example: \`Glob(pattern: "tests", semantic: true)\` will find test files based on project structure.
+   - Example: \`GrepTool(pattern: "AuthFeatr", semantic: true)\` will find "AuthFeature".
+   - Example: \`GlobTool(pattern: "tests", semantic: true)\` will find test files based on project structure.
 2. **Exact Identifier**: WHEN you know the precise class/function name (e.g., "UserProfile", "initDatabase"), use standard Grep/Glob without \`semantic\` flag.
 3. **Exploration**: If standard search returns 0 results, AUTOMATICALLY retry with \`semantic: true\`.
-4. **Path Discovery**: If the path is unclear, start from top-level tree, then \`Glob */\`, then \`Glob dir/*\` and \`Glob dir/*/\` to confirm paths before Grep/Read.
 
 # File Modification Strategy (The Universal Edit Tool)
 When you need to modify files, rely on the **Edit Tool** for almost all tasks.
@@ -30973,7 +30905,7 @@ When you need to modify files, rely on the **Edit Tool** for almost all 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.
-2. **Precise Targeting**: For code injection, prefer using LSP (\`LSP.documentSymbol\` or \`LSP.definition\`) to find exact function boundaries or symbol ranges. Do NOT rely on line numbers from \`read_file\` alone as they may be outdated.
+2. **Precise Targeting**: For code injection, prefer using LSP (\`LSPTool.documentSymbol\` or \`LSPTool.definition\`) to find exact function boundaries or symbol ranges. Do NOT rely on line numbers from \`read_file\` alone as they may be outdated.
 3. **Artifact Verification**: After completing a complex task, verify the artifacts (e.g. check if files exist using \`ls\`, or content matches using \`grep\`).
 
 ${isOutputStyleActive ? "" : "\nYou MUST answer concisely with fewer than 4 lines of text (not including tool use or code generation), unless user asks for detail.\n"}
@@ -30987,12 +30919,11 @@ IMPORTANT: Before you begin work, think about what the code you're editing is su
 async function getEnvInfo() {
   const isGit = await getIsGit();
   return `Here is useful information about the environment you are running in:
-
 <env>
-Today's date: ${(/* @__PURE__ */ new Date()).toLocaleDateString()}
-Platform: ${env.platform}
 Working directory: ${getCwd()}
 Is directory a git repo: ${isGit ? "Yes" : "No"}
+Platform: ${env.platform}
+Today's date: ${(/* @__PURE__ */ new Date()).toLocaleDateString()}
 </env>`;
 }
 async function getAgentPrompt() {
@@ -31052,9 +30983,6 @@ export {
   addToHistory,
   countTokens,
   __isToolUseLikeBlockForTests,
-  __autoBatchToolUseBlocksForTests,
-  __applyAutoBatchAggregationForTests,
-  __rewriteToolUseBlocksForTests,
   __ToolUseQueueForTests,
   query,
   runToolUse,