pybao-cli 1.3.90 → 1.3.92

package/dist/{chunk-5I3NGMYI.js → chunk-3EAW7NQW.js}

@@ -3,18 +3,18 @@ const require = __pybCreateRequire(import.meta.url);
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-JSJHGZAJ.js";
+} from "./chunk-B5HI7CIZ.js";
 import {
   loadPybAgentSessionMessages
-} from "./chunk-GJOMTRVD.js";
+} from "./chunk-5D4LA7MX.js";
 import {
   listPybAgentSessions
-} from "./chunk-THH3BAIR.js";
+} from "./chunk-DUYRUANR.js";
 import {
   appendSessionCustomTitleRecord,
   appendSessionJsonlFromMessage,
   appendSessionTagRecord
-} from "./chunk-XTGCEFKM.js";
+} from "./chunk-QFZQ4YIM.js";
 import {
   drainHookSystemPromptAdditions,
   getHookTranscriptPath,
@@ -26,7 +26,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-JJHY3UEU.js";
+} from "./chunk-POL6ZPVE.js";
 import {
   DEFAULT_OUTPUT_STYLE,
   getAvailableOutputStyles,
@@ -35,16 +35,16 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-2GNQ423S.js";
+} from "./chunk-CNQZQWGS.js";
 import {
   fetchCustomModels,
   getModelFeatures
-} from "./chunk-GHW7AKG7.js";
+} from "./chunk-MNN3BFEZ.js";
 import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-OJP6IDMT.js";
+} from "./chunk-6PYLF3ET.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -58,7 +58,7 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-QH6MAXC2.js";
+} from "./chunk-BF3QQA6B.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -71,11 +71,11 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-7V77A7PK.js";
+} from "./chunk-VUVKQMC5.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-BS6OG2Q2.js";
+} from "./chunk-4VZVUC7S.js";
 import {
   applyToolPermissionContextUpdate,
   createDefaultToolPermissionContext
@@ -88,7 +88,7 @@ import {
   resetReminderSession,
   setTodos,
   systemReminderService
-} from "./chunk-OB3KNWFR.js";
+} from "./chunk-LS3G24MQ.js";
 import {
   getSessionState
 } from "./chunk-ERMQRV55.js";
@@ -97,7 +97,7 @@ import {
   getActiveAgents,
   getAgentByType,
   getAllAgents
-} from "./chunk-LKJQF6EX.js";
+} from "./chunk-ZZVEO3HS.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -127,7 +127,7 @@ import {
   processUserInput,
   reorderMessages,
   stripSystemMessages
-} from "./chunk-JYYSYOTH.js";
+} from "./chunk-CX3J3ZM2.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -150,11 +150,10 @@ import {
   normalizeFilePath,
   readTextContent,
   writeTextContent
-} from "./chunk-4JBR4ERG.js";
+} from "./chunk-4KXOAXLT.js";
 import {
-  ripGrep,
-  tree
-} from "./chunk-6KWGNHDI.js";
+  ripGrep
+} from "./chunk-F5MBTGHO.js";
 import {
   parseBlockEdits
 } from "./chunk-QWIBSCDN.js";
@@ -164,17 +163,17 @@ import {
   ParserRegistry,
   initParser,
   loadLanguage
-} from "./chunk-VKVTOCU2.js";
+} from "./chunk-DHVVPKIB.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback
-} from "./chunk-UKHXJNHY.js";
+} from "./chunk-Z66NVOKH.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-CH3GOSXY.js";
+} from "./chunk-BHHLJAAX.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
@@ -182,17 +181,17 @@ import {
   ModelManager,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-7XTXGY66.js";
+} from "./chunk-YMVHPSJ4.js";
 import {
   getCodeStyle,
   getContext,
   getGitState,
   getIsGit,
   getProjectDocs
-} from "./chunk-X2GIMPNL.js";
+} from "./chunk-NQOZPIZ3.js";
 import {
   getTheme
-} from "./chunk-NSIDLRDC.js";
+} from "./chunk-BZJJX5ON.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -205,7 +204,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-FDEOTFKS.js";
+} from "./chunk-HJTLI6VS.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -214,7 +213,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-ZHCARYPU.js";
+} from "./chunk-X4SFGT4J.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -253,10 +252,10 @@ import {
   setCwd,
   shouldApplyToolOutputTruncation,
   truncateToolOutput
-} from "./chunk-47AQS2IE.js";
+} from "./chunk-KDL4PYX2.js";
 import {
   MACRO
-} from "./chunk-YV3I6NYR.js";
+} from "./chunk-YIZ5ZIMX.js";
 import {
   formatTotalCost,
   getTotalAPIDuration,
@@ -444,7 +443,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-ANFLVEGA.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-N2EGKP4A.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -4246,7 +4245,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-ANFLVEGA.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-N2EGKP4A.js");
   const queryLLMFn = args.queryLLMOverride ?? queryLLM2;
   const messages = [
     {
@@ -6506,7 +6505,7 @@ var FileEditTool = {
     const originalFileContent = currentFileContent;
     let totalPatch = [];
     const { SmartEdit } = await import("./smart-edit-AWHJDSU6.js");
-    const { findLspAnchor } = await import("./lspAnchor-NJ7QLPRP.js");
+    const { findLspAnchor } = await import("./lspAnchor-QTXVGYX4.js");
     for (const op of editOperations) {
       const normalizedSearch = normalizeLineEndings(op.search);
       const normalizedReplace = normalizeLineEndings(op.replace);
@@ -7065,10 +7064,10 @@ var SmartTruncator = class _SmartTruncator {
     }
     try {
       const parser = await loadLanguage(langKey);
-      const tree2 = parser.parse(code);
+      const tree = parser.parse(code);
       let newStart = startLine;
       let newEnd = endLine;
-      const endNode = tree2.rootNode.descendantForPosition({ row: endLine, column: 1e4 });
+      const endNode = tree.rootNode.descendantForPosition({ row: endLine, column: 1e4 });
       const containers = _SmartTruncator.findContainers(endNode);
       for (const container of containers) {
         if (container.endPosition.row > endLine) {
@@ -7079,7 +7078,7 @@ var SmartTruncator = class _SmartTruncator {
           }
         }
       }
-      const startNode = tree2.rootNode.descendantForPosition({ row: startLine, column: 0 });
+      const startNode = tree.rootNode.descendantForPosition({ row: startLine, column: 0 });
       const startContainers = _SmartTruncator.findContainers(startNode);
       for (const container of startContainers) {
         if (container.startPosition.row < startLine) {
@@ -7777,11 +7776,16 @@ var DESCRIPTION4 = `- Fast file pattern matching tool that works with any codeba
 - Supports glob patterns like "**/*.js" or "src/**/*.ts"
 - Returns matching file paths sorted by modification time
 - 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
+- **Semantic Search**: \`semantic\` defaults to true to search for code symbols (classes, functions, variables) when name matching finds nothing. This is powered by LSP and can find files based on their *content* definitions even if the filename is different.
+- 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 parallel Glob for structure, parallel Grep for content, and for complex projects use Glob to narrow targets before Grep/LSP
 - 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/filesystem/GlobTool/GlobTool.tsx
@@ -7793,7 +7797,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().optional().describe(
+  semantic: z6.boolean().default(true).describe(
     "Enable semantic search using LSP workspace symbols to find relevant files. Useful when you know the symbol name but not the file path."
   )
 });
@@ -7939,14 +7943,26 @@ var DESCRIPTION5 = `A powerful search tool built on ripgrep
   - 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: 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
+  - 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: narrow 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"\`
   - 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 LspTool immediately. Use the line number from Grep to jump to definition or find references.
+    - STEP 3: Switch to LSP 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.
-  - \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
+  - Hotspot strategy: narrow paths first, then paginate or refine; after truncation, focus on hotspot directories to avoid full-repo scans.
 `;
 
 // src/tools/search/GrepTool/GrepTool.tsx
@@ -7988,7 +8004,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().optional().describe(
+  semantic: z7.boolean().default(true).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(
@@ -8152,7 +8168,7 @@ ${result.filenames.join("\n")}`;
     head_limit,
     offset = 0,
     multiline = false,
-    semantic = false,
+    semantic = true,
     symbol_type
   }, toolUseContext) {
     const { abortController } = toolUseContext;
@@ -11028,7 +11044,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-ANFLVEGA.js");
+        const { resetAnthropicClient } = await import("./llm-N2EGKP4A.js");
         resetAnthropicClient();
       } catch {
       }
@@ -15310,7 +15326,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-ET2UJKNE.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-EE7QC4ZO.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -15979,7 +15995,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-KEEPGSL3.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-OJUT7KMM.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -23423,7 +23439,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-ANFLVEGA.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-N2EGKP4A.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.",
@@ -23736,7 +23752,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-HBF5REQ3.js");
+          const { getCwd: getCwd2 } = await import("./state-BPJBUEMP.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -24288,7 +24304,6 @@ async function logBinaryFeedbackEvent(_m1, _m2, _choice) {
 var PybContextManager = class _PybContextManager {
   static instance;
   projectDocsCache = "";
-  treeCache = "";
   cacheInitialized = false;
   initPromise = null;
   static getInstance() {
@@ -24301,12 +24316,8 @@ var PybContextManager = class _PybContextManager {
     if (this.initPromise) return this.initPromise;
     this.initPromise = (async () => {
       try {
-        const [projectDocs, treeStr] = await Promise.all([
-          getProjectDocs(),
-          tree(getCwd(), 50, new AbortController().signal).catch(() => "")
-        ]);
+        const [projectDocs] = await Promise.all([getProjectDocs()]);
         this.projectDocsCache = projectDocs || "";
-        this.treeCache = treeStr;
         this.cacheInitialized = true;
       } catch (error) {
         logError(error);
@@ -24314,7 +24325,6 @@ var PybContextManager = class _PybContextManager {
           error: error instanceof Error ? error.message : String(error)
         });
         this.projectDocsCache = "";
-        this.treeCache = "";
         this.cacheInitialized = true;
       }
     })();
@@ -24331,12 +24341,7 @@ var PybContextManager = class _PybContextManager {
       return "";
     }
     const context = [
-      this.projectDocsCache,
-      this.treeCache ? `
-# Project Structure
-\`\`\`
-${this.treeCache}
-\`\`\`` : ""
+      this.projectDocsCache
     ].filter(Boolean).join("\n\n");
     return context;
   }
@@ -24614,6 +24619,113 @@ 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 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 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) {
   if (reason === "user_interrupted") {
     return createUserMessage([
@@ -25017,7 +25129,15 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
     }
     const assistantMessage = result.message;
     const shouldSkipPermissionCheck = result.shouldSkipPermissionCheck;
-    const toolUseMessages = assistantMessage.message.content.filter(isToolUseLikeBlock);
+    const rawToolUseMessages = assistantMessage.message.content.filter(isToolUseLikeBlock);
+    const toolUseMessages = autoBatchToolUseBlocks(
+      rawToolUseMessages,
+      toolUseContext.options?.tools ?? []
+    );
+    const assistantMessageForTools = rewriteToolUseBlocksInAssistantMessage(
+      assistantMessage,
+      toolUseMessages
+    );
     if (!toolUseMessages.length) {
       const stopHookEvent = toolUseContext.agentId && toolUseContext.agentId !== "main" ? "SubagentStop" : "Stop";
       const stopReason = assistantMessage.message?.stop_reason || assistantMessage.message?.stopReason || "end_turn";
@@ -25063,7 +25183,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       yield assistantMessage;
       return;
     }
-    yield assistantMessage;
+    yield assistantMessageForTools;
     const siblingToolUseIDs = new Set(toolUseMessages.map((_) => _.id));
     const toolQueue = new ToolUseQueue({
       toolDefinitions: toolUseContext.options.tools,
@@ -25073,7 +25193,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       shouldSkipPermissionCheck
     });
     for (const toolUse of toolUseMessages) {
-      toolQueue.addTool(toolUse, assistantMessage);
+      toolQueue.addTool(toolUse, assistantMessageForTools);
     }
     const toolMessagesForNextTurn = [];
     for await (const message of toolQueue.getRemainingResults()) {
@@ -26503,6 +26623,7 @@ 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");
@@ -26538,7 +26659,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-ANFLVEGA.js");
+  const { queryModel } = await import("./llm-N2EGKP4A.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:
@@ -26834,6 +26955,12 @@ 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;
@@ -27444,8 +27571,7 @@ function ToolPicker(props) {
     });
   };
   const complete = () => {
-    const next = selected.length === allToolNames.length && allToolNames.every((n) => selected.includes(n)) ? void 0 : selected;
-    props.onComplete(next);
+    props.onComplete(resolveToolSelection(selected, allToolNames));
   };
   const categorized = useMemo25(() => {
     const readOnly = /* @__PURE__ */ new Set(["Read", "Glob", "Grep", "LS"]);
@@ -29722,8 +29848,8 @@ var BashParser = class {
    * Returns true if safe, throws error if unsafe.
    */
   static async validate(script) {
-    const tree2 = await this.parse(script);
-    const root = tree2.rootNode;
+    const tree = await this.parse(script);
+    const root = tree.rootNode;
     const commands = root.descendantsOfType("command");
     for (const cmd of commands) {
       const nameNode = cmd.childForFieldName("name");
@@ -29740,8 +29866,8 @@ var BashParser = class {
 // src/utils/bash-parser/validator.ts
 import { resolve as resolve9 } from "path";
 async function validateSafety(script, cwd = process.cwd()) {
-  const tree2 = await BashParser.parse(script);
-  const root = tree2.rootNode;
+  const tree = await BashParser.parse(script);
+  const root = tree.rootNode;
   validateNode(root, script, cwd);
 }
 function validateNode(node, script, cwd) {
@@ -30508,6 +30634,7 @@ async function getSystemPrompt(options) {
   const isOutputStyleActive = outputStyle2 !== null;
   const includeCodingInstructions = !isOutputStyleActive || outputStyle2.keepCodingInstructions === true;
   return [
+    `${await getEnvInfo()}`,
     `
 You are an interactive CLI tool that helps users ${isOutputStyleActive ? 'according to your "Output Style" below, which describes how you should respond to user queries.' : "with software engineering tasks."} Use the instructions below and the tools available to you to assist the user.
 
@@ -30532,13 +30659,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 \`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.
-
-# \u8DEF\u5F84\u5206\u7247\u7B56\u7565
-\u5728\u5927\u4ED3\u5E93\u4E2D\u4F7F\u7528\u7ED3\u6784\u6811\u5DE5\u5177\u65F6\uFF0C\u6309\u201C\u6839\u2192\u6838\u5FC3\u76EE\u5F55\u2192\u4E8C\u7EA7\u6A21\u5757\u201D\u987A\u5E8F\u5206\u591A\u6B21\u8C03\u7528\uFF0C\u907F\u514D\u4E00\u6B21\u6027\u5168\u5E93\u626B\u63CF\u3002
+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.
 
 # \u5E76\u53D1\u7B56\u7565\u7EA6\u675F
 - \u540C\u8F6E\u591A\u6B21\u8C03\u7528\u4EC5\u5E76\u53D1\u89E6\u53D1\u201C\u53EA\u8BFB\u4E14\u5E76\u53D1\u5B89\u5168\u201D\u7684\u5DE5\u5177\uFF08isConcurrencySafe=true\uFF09
@@ -30546,6 +30670,15 @@ It is critical that you mark todos as completed as soon as you are done with a t
 - MCP \u5DE5\u5177\u7684\u5E76\u53D1\u5B89\u5168\u6027\u7531 annotations.readOnlyHint \u5224\u5B9A
 - \u5B58\u5728\u4F9D\u8D56\u5173\u7CFB\u7684\u8C03\u7528\u5FC5\u987B\u4E32\u884C\uFF1B\u4EC5\u72EC\u7ACB\u3001\u65E0\u4F9D\u8D56\u7684\u8C03\u7528\u5E76\u53D1
 
+# BatchTool \u4F7F\u7528\u7B56\u7565
+- \u4F55\u65F6\u4F7F\u7528\uFF1A\u591A\u4E2A\u4E92\u4E0D\u4F9D\u8D56\u3001\u53EA\u8BFB\u4E14\u5E76\u53D1\u5B89\u5168\u7684\u5DE5\u5177\u8C03\u7528\uFF0C\u5E0C\u671B\u5E76\u884C\u52A0\u901F\u5E76\u6C47\u603B\u7ED3\u679C
+- \u4F55\u65F6\u4E0D\u4F7F\u7528\uFF1A\u5B58\u5728\u4F9D\u8D56\u6216\u5171\u4EAB\u72B6\u6001\u3001\u9700\u8981\u987A\u5E8F\u3001\u6216\u5DE5\u5177\u975E\u53EA\u8BFB/\u975E\u5E76\u53D1\u5B89\u5168
+- \u62C6\u5206\u89C4\u5219\uFF1A\u6709\u4F9D\u8D56\u7684\u8C03\u7528\u62C6\u6210\u987A\u5E8F batch\uFF08\u524D\u4E00\u6279\u5B8C\u6210\u540E\u518D\u53D1\u4E0B\u4E00\u6279\uFF09
+- \u8303\u56F4\u9650\u5236\uFF1A\u4EC5\u9650\u53EA\u8BFB\u5E76\u53D1\u5B89\u5168\u5DE5\u5177\uFF1BMCP/\u5E02\u573A\u5DE5\u5177\u4E0D\u53EF\u8FDB\u5165 batch
+- \u9650\u5236\uFF1A\u6700\u591A 10 \u4E2A\uFF0C\u7981\u6B62 batch \u5D4C\u5957
+- \u4F18\u5148\u7EA7\uFF1A\u5B58\u5728\u591A\u4E2A\u53EF batch \u7684\u8C03\u7528\u65F6\uFF0C\u4F18\u5148\u4F7F\u7528 BatchTool \u5355\u6B21\u6267\u884C\u800C\u4E0D\u662F\u591A\u6761\u5E76\u884C tool \u8C03\u7528
+- \u53EA\u8BFB\u5E76\u53D1\u4F18\u5148\u4F7F\u7528 BatchTool\uFF0C\u4E0D\u8981\u8F93\u51FA\u591A\u4E2A\u72EC\u7ACB\u7684 Read/Grep
+
 # LSP \u540E\u7F6E\u4E0E\u8303\u56F4\u9650\u5236
 - \u4F18\u5148\u987A\u5E8F\uFF1A\u7ED3\u6784\u6811 -> \u70ED\u70B9\u5B9A\u4F4D -> Read -> LSP
 - workspaceSymbol \u5FC5\u987B\u63D0\u4F9B\u660E\u786E\u7684\u8DEF\u5F84/\u6A21\u5757\u8303\u56F4\uFF0C\u907F\u514D\u5BF9\u5168\u4ED3\u5E93\u65E0\u754C\u67E5\u8BE2
@@ -30664,8 +30797,8 @@ 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: \`GrepTool(pattern: "AuthFeatr", semantic: true)\` will find "AuthFeature".
-   - Example: \`GlobTool(pattern: "tests", semantic: true)\` will find test files based on project structure.
+   - Example: \`Grep(pattern: "AuthFeatr", semantic: true)\` will find "AuthFeature".
+   - Example: \`Glob(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\`.
 
@@ -30684,13 +30817,11 @@ 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 (\`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.
+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.
 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"}
 `,
-    `
-${await getEnvInfo()}`,
     ...sessionStartAdditionalContext ? [`
 ${sessionStartAdditionalContext}`] : [],
     `IMPORTANT: Refuse to write code or explain code that may be used maliciously; even if the user claims it is for educational purposes. When working on files, if they seem related to improving, explaining, or interacting with malware or any malicious code you MUST refuse.
@@ -30700,11 +30831,12 @@ 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() {
@@ -30764,6 +30896,8 @@ export {
   addToHistory,
   countTokens,
   __isToolUseLikeBlockForTests,
+  __autoBatchToolUseBlocksForTests,
+  __rewriteToolUseBlocksForTests,
   __ToolUseQueueForTests,
   query,
   runToolUse,