pybao-cli 1.3.92 → 1.3.94

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

@@ -3,18 +3,18 @@ const require = __pybCreateRequire(import.meta.url);
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-B5HI7CIZ.js";
+} from "./chunk-RQ36RHKE.js";
 import {
   loadPybAgentSessionMessages
-} from "./chunk-5D4LA7MX.js";
+} from "./chunk-5BGDWXLH.js";
 import {
   listPybAgentSessions
-} from "./chunk-DUYRUANR.js";
+} from "./chunk-ERKC3UO6.js";
 import {
   appendSessionCustomTitleRecord,
   appendSessionJsonlFromMessage,
   appendSessionTagRecord
-} from "./chunk-QFZQ4YIM.js";
+} from "./chunk-CBTQYVYS.js";
 import {
   drainHookSystemPromptAdditions,
   getHookTranscriptPath,
@@ -26,7 +26,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-POL6ZPVE.js";
+} from "./chunk-ZCLKXEG7.js";
 import {
   DEFAULT_OUTPUT_STYLE,
   getAvailableOutputStyles,
@@ -35,16 +35,16 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-CNQZQWGS.js";
+} from "./chunk-5KRDMLJL.js";
 import {
   fetchCustomModels,
   getModelFeatures
-} from "./chunk-MNN3BFEZ.js";
+} from "./chunk-PZ3OA5BR.js";
 import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-6PYLF3ET.js";
+} from "./chunk-ABLSL3AG.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -58,7 +58,7 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-BF3QQA6B.js";
+} from "./chunk-FMK7MTHV.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -71,11 +71,11 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-VUVKQMC5.js";
+} from "./chunk-6H74XS5Q.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-4VZVUC7S.js";
+} from "./chunk-EUMJ67M4.js";
 import {
   applyToolPermissionContextUpdate,
   createDefaultToolPermissionContext
@@ -88,7 +88,7 @@ import {
   resetReminderSession,
   setTodos,
   systemReminderService
-} from "./chunk-LS3G24MQ.js";
+} from "./chunk-WDZX6SSG.js";
 import {
   getSessionState
 } from "./chunk-ERMQRV55.js";
@@ -97,7 +97,7 @@ import {
   getActiveAgents,
   getAgentByType,
   getAllAgents
-} from "./chunk-ZZVEO3HS.js";
+} from "./chunk-44LR7MWS.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -127,7 +127,7 @@ import {
   processUserInput,
   reorderMessages,
   stripSystemMessages
-} from "./chunk-CX3J3ZM2.js";
+} from "./chunk-ZPC5H6IJ.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -150,10 +150,10 @@ import {
   normalizeFilePath,
   readTextContent,
   writeTextContent
-} from "./chunk-4KXOAXLT.js";
+} from "./chunk-5ABIX6FW.js";
 import {
   ripGrep
-} from "./chunk-F5MBTGHO.js";
+} from "./chunk-3EWYCNNT.js";
 import {
   parseBlockEdits
 } from "./chunk-QWIBSCDN.js";
@@ -163,17 +163,17 @@ import {
   ParserRegistry,
   initParser,
   loadLanguage
-} from "./chunk-DHVVPKIB.js";
+} from "./chunk-YDROMLPD.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback
-} from "./chunk-Z66NVOKH.js";
+} from "./chunk-IITK54RR.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-BHHLJAAX.js";
+} from "./chunk-F3T5A5NU.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
@@ -181,17 +181,18 @@ import {
   ModelManager,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-YMVHPSJ4.js";
+} from "./chunk-4XVE3R25.js";
 import {
+  clearContextCache,
   getCodeStyle,
   getContext,
   getGitState,
   getIsGit,
   getProjectDocs
-} from "./chunk-NQOZPIZ3.js";
+} from "./chunk-LO35EMX6.js";
 import {
   getTheme
-} from "./chunk-BZJJX5ON.js";
+} from "./chunk-XNLDOVUX.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -204,7 +205,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-HJTLI6VS.js";
+} from "./chunk-YOF7G7XX.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -213,7 +214,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-X4SFGT4J.js";
+} from "./chunk-FILUPMEY.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -252,10 +253,10 @@ import {
   setCwd,
   shouldApplyToolOutputTruncation,
   truncateToolOutput
-} from "./chunk-KDL4PYX2.js";
+} from "./chunk-NIPMKTRR.js";
 import {
   MACRO
-} from "./chunk-YIZ5ZIMX.js";
+} from "./chunk-JXFYURRO.js";
 import {
   formatTotalCost,
   getTotalAPIDuration,
@@ -443,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-N2EGKP4A.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-MQWL2SSO.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -4245,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-N2EGKP4A.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-MQWL2SSO.js");
   const queryLLMFn = args.queryLLMOverride ?? queryLLM2;
   const messages = [
     {
@@ -4625,6 +4626,7 @@ 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";
@@ -4640,18 +4642,20 @@ 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 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
+- 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
 
 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
@@ -4689,8 +4693,8 @@ turndownService.addRule("cleanLinks", {
 });
 function convertHtmlToMarkdown(html) {
   try {
-    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);
+    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);
     return markdown.replace(/\n{3,}/g, "\n\n").replace(/^\s+|\s+$/gm, "").trim();
   } catch (error) {
     throw new Error(
@@ -4745,7 +4749,9 @@ 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().describe("The prompt to run on the fetched content")
+  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)")
 });
 var FETCH_TIMEOUT_MS = 3e4;
 var MAX_URL_LENGTH = 2e3;
@@ -4837,6 +4843,27 @@ 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;
@@ -4947,9 +4974,15 @@ var WebFetchTool = {
     }
     return { result: true };
   },
-  renderToolUseMessage({ url: url2, prompt }, { verbose }) {
+  renderToolUseMessage({ url: url2, prompt, format: format3, timeout }, { verbose }) {
     if (verbose) {
-      return `url: "${url2}"${prompt ? `, prompt: "${prompt}"` : ""}`;
+      const details = [
+        `url: "${url2}"`,
+        prompt ? `prompt: "${prompt}"` : null,
+        format3 ? `format: "${format3}"` : null,
+        timeout ? `timeout: ${timeout}s` : null
+      ].filter(Boolean);
+      return details.join(", ");
     }
     return url2;
   },
@@ -4960,14 +4993,19 @@ 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 }, context) {
+  async *call({ url: url2, prompt, format: format3, timeout }, context) {
     const normalizedUrl = normalizeUrl(url2);
     const start = Date.now();
     const timeoutSignal = createTimeoutSignal(
       context.abortController.signal,
-      FETCH_TIMEOUT_MS
+      Math.max(1, Number.isFinite(timeout) ? Number(timeout) : 30) * 1e3 || FETCH_TIMEOUT_MS
     );
     try {
       const cached = urlCache.get(normalizedUrl);
@@ -4989,7 +5027,10 @@ To complete your request, I need to fetch content from the redirected URL. Pleas
           codeText: codeText2,
           result: result2,
           durationMs: Date.now() - start,
-          url: normalizedUrl
+          url: normalizedUrl,
+          mode: "analysis",
+          format: "markdown",
+          cached: Boolean(cached)
         };
         yield {
           type: "result",
@@ -5001,7 +5042,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 markdown = cached ? cached.content : "";
+      let rawContent = cached ? cached.rawContent : "";
       let contentType = cached ? cached.contentType : "";
       if (fetched && fetched.type === "response") {
         const response = fetched.response;
@@ -5010,36 +5051,47 @@ 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;
-        const converted = contentType.toLowerCase().includes("text/html") ? convertHtmlToMarkdown(raw) : raw;
-        markdown = truncateFetchedContent(converted);
+        rawContent = raw;
         urlCache.set(normalizedUrl, {
           bytes,
           code,
           codeText,
-          content: markdown,
+          rawContent,
           contentType
         });
       }
-      const allowBroaderQuoting = isMarkdownHost(normalizedUrl, contentType);
-      const userPrompt = buildWebFetchApplyPrompt(
-        markdown,
-        prompt,
-        allowBroaderQuoting
+      const outputFormat = format3 ?? "markdown";
+      const formatted = truncateFetchedContent(
+        applyFormat(rawContent, contentType, outputFormat)
       );
-      const aiResponse = await queryQuick({
-        systemPrompt: [],
-        userPrompt,
-        enablePromptCaching: false,
-        signal: timeoutSignal.signal
-      });
-      const result = aiResponse.message.content[0]?.text || "No response from model";
+      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 output = {
         bytes,
         code,
         codeText,
         result,
         durationMs: Date.now() - start,
-        url: normalizedUrl
+        url: normalizedUrl,
+        mode,
+        format: outputFormat,
+        cached: Boolean(cached)
       };
       yield {
         type: "result",
@@ -5054,7 +5106,10 @@ 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
+        url: normalizedUrl,
+        mode: "analysis",
+        format: "markdown",
+        cached: false
       };
       yield {
         type: "result",
@@ -6300,7 +6355,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.
+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.
 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.
@@ -6505,7 +6560,7 @@ var FileEditTool = {
     const originalFileContent = currentFileContent;
     let totalPatch = [];
     const { SmartEdit } = await import("./smart-edit-AWHJDSU6.js");
-    const { findLspAnchor } = await import("./lspAnchor-QTXVGYX4.js");
+    const { findLspAnchor } = await import("./lspAnchor-ROYOONP6.js");
     for (const op of editOperations) {
       const normalizedSearch = normalizeLineEndings(op.search);
       const normalizedReplace = normalizeLineEndings(op.replace);
@@ -7765,12 +7820,12 @@ ${addLineNumbers({
   }
 };
 
-// src/tools/filesystem/GlobTool/GlobTool.tsx
+// src/tools/search/GlobTool/GlobTool.tsx
 import { Box as Box14, Text as Text15 } from "ink";
 import React15 from "react";
 import { z as z6 } from "zod";
 
-// src/tools/filesystem/GlobTool/prompt.ts
+// src/tools/search/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"
@@ -7788,7 +7843,7 @@ var DESCRIPTION4 = `- Fast file pattern matching tool that works with any codeba
 - 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.
 `;
 
-// src/tools/filesystem/GlobTool/GlobTool.tsx
+// src/tools/search/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";
@@ -8453,7 +8508,7 @@ IMPORTANT - Use the correct year in search queries:
 `.trim();
 
 // src/tools/network/WebSearchTool/searchProviders.ts
-import { parse as parse4 } from "node-html-parser";
+import { parse as parse5 } from "node-html-parser";
 var duckDuckGoSearchProvider = {
   isEnabled: () => true,
   search: async (query2) => {
@@ -8471,7 +8526,7 @@ var duckDuckGoSearchProvider = {
       );
     }
     const html = await response.text();
-    const root = parse4(html);
+    const root = parse5(html);
     const results = [];
     const resultNodes = root.querySelectorAll(".result.web-result");
     for (const node of resultNodes) {
@@ -9764,7 +9819,7 @@ async function clearConversation(context) {
   await clearTerminal();
   getMessagesSetter()([]);
   context.setForkConvoWithMessagesOnTheNextRender([]);
-  getContext.cache.clear?.();
+  clearContextCache();
   getCodeStyle.cache.clear?.();
   await setCwd(getOriginalCwd());
   resetReminderSession();
@@ -9865,7 +9920,7 @@ var compact = {
       ),
       summaryResponse
     ]);
-    getContext.cache.clear?.();
+    clearContextCache();
     getCodeStyle.cache.clear?.();
     resetFileFreshnessSession();
     resetReminderSession();
@@ -11044,7 +11099,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-N2EGKP4A.js");
+        const { resetAnthropicClient } = await import("./llm-MQWL2SSO.js");
         resetAnthropicClient();
       } catch {
       }
@@ -15280,10 +15335,10 @@ var mcp = {
 var mcp_default = mcp;
 
 // src/commands/plugin.ts
-import { parse as parse6 } from "shell-quote";
+import { parse as parse7 } from "shell-quote";
 var PLUGIN_SCOPES = ["user", "project", "local"];
 function parseTokens(input) {
-  const parts = parse6(input);
+  const parts = parse7(input);
   const out = [];
   for (const part of parts) {
     if (typeof part === "string") out.push(part);
@@ -15326,7 +15381,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-EE7QC4ZO.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-MVYLH6Q3.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -15995,7 +16050,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-OJUT7KMM.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-BY6Q3JR2.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -23439,7 +23494,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-N2EGKP4A.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-MQWL2SSO.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.",
@@ -23752,7 +23807,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-BPJBUEMP.js");
+          const { getCwd: getCwd2 } = await import("./state-DZAFEODP.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -24608,7 +24663,7 @@ ${contentWithLines}
     }
   }
   getMessagesSetter()([]);
-  getContext.cache.clear?.();
+  clearContextCache();
   getCodeStyle.cache.clear?.();
   resetFileFreshnessSession();
   return compactedMessages;
@@ -24652,6 +24707,33 @@ function createAutoBatchToolUse(toolUses, batchIndex) {
     }
   };
 }
+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)) {
@@ -24704,6 +24786,66 @@ function autoBatchToolUseBlocks(toolUseMessages, tools) {
   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;
@@ -25130,7 +25272,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 = autoBatchToolUseBlocks(
+    const toolUseMessages = applyAutoBatchAggregation(
       rawToolUseMessages,
       toolUseContext.options?.tools ?? []
     );
@@ -26659,7 +26801,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-N2EGKP4A.js");
+  const { queryModel } = await import("./llm-MQWL2SSO.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:
@@ -30664,20 +30806,9 @@ It is critical that you mark todos as completed as soon as you are done with a t
 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
-- \u6DF7\u5165\u4EFB\u4F55\u975E\u5E76\u53D1\u5B89\u5168\u5DE5\u5177\u4F1A\u5F62\u6210\u5C4F\u969C\uFF1B\u5C4F\u969C\u4E4B\u524D\u5B8C\u6210\u540E\u518D\u7EE7\u7EED
-- 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
+# \u8DEF\u5F84\u5206\u7247\u7B56\u7565
+- \u6839\u2192\u6838\u5FC3\u76EE\u5F55\u2192\u4E8C\u7EA7\u6A21\u5757
+- \u7ED3\u6784\u626B\u63CF\u6309\u4E0A\u8FF0\u987A\u5E8F\u5206\u7247\u6267\u884C
 
 # LSP \u540E\u7F6E\u4E0E\u8303\u56F4\u9650\u5236
 - \u4F18\u5148\u987A\u5E8F\uFF1A\u7ED3\u6784\u6811 -> \u70ED\u70B9\u5B9A\u4F4D -> Read -> LSP
@@ -30897,6 +31028,7 @@ export {
   countTokens,
   __isToolUseLikeBlockForTests,
   __autoBatchToolUseBlocksForTests,
+  __applyAutoBatchAggregationForTests,
   __rewriteToolUseBlocksForTests,
   __ToolUseQueueForTests,
   query,