pybao-cli 1.5.37 → 1.5.39

package/dist/{chunk-T5VIUVWS.js → chunk-K6USRWZZ.js}

@@ -2,17 +2,17 @@ import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
 import {
   loadPybAgentSessionMessages
-} from "./chunk-LQ3YSDHE.js";
+} from "./chunk-E2O5ZNMG.js";
 import {
   appendSessionCustomTitleRecord,
   appendSessionJsonlFromMessage,
   appendSessionTagRecord,
   listPybAgentSessions
-} from "./chunk-37VT7CBN.js";
+} from "./chunk-WU3KYQFA.js";
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-EXOVGTTX.js";
+} from "./chunk-OQV3ASGW.js";
 import {
   ConversationTracker,
   appendFinishState,
@@ -20,10 +20,10 @@ import {
   getConversationTrackerForContext,
   isFinishComplete,
   mapFinishReason
-} from "./chunk-K53ERJZE.js";
+} from "./chunk-JZ7UEGNN.js";
 import {
   FileSystemConversationPersistence
-} from "./chunk-HS72NWQM.js";
+} from "./chunk-B6KK6QP2.js";
 import {
   beginReplSessionScope
 } from "./chunk-F4AXICO7.js";
@@ -38,7 +38,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-UBR4EMJG.js";
+} from "./chunk-4L2R7COO.js";
 import {
   DEFAULT_OUTPUT_STYLE,
   getAvailableOutputStyles,
@@ -47,11 +47,11 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-JRCCJJTK.js";
+} from "./chunk-C2XL4PP4.js";
 import {
   fetchCustomModels,
   getModelFeatures
-} from "./chunk-CWEWMSYK.js";
+} from "./chunk-YGMNRXWM.js";
 import {
   getCurrentSessionId,
   getSessionState
@@ -60,7 +60,7 @@ import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-HKC3XNTU.js";
+} from "./chunk-TNVELATG.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -75,7 +75,7 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-ORTVYWVH.js";
+} from "./chunk-K6ZSF4XV.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -88,11 +88,11 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-XYD26HOU.js";
+} from "./chunk-K5F6WOED.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-TM2IQSS6.js";
+} from "./chunk-M74TFPOY.js";
 import {
   applyToolPermissionContextUpdate,
   applyToolPermissionContextUpdates,
@@ -103,14 +103,14 @@ import {
   generateSystemReminders,
   resetReminderSession,
   systemReminderService
-} from "./chunk-DNJ2EUI4.js";
+} from "./chunk-TPEX7GP6.js";
 import {
   clearAgentCache,
   getActiveAgents,
   getAgentByType,
   getAllAgents,
   getAvailableAgentTypes
-} from "./chunk-6EUA3JLK.js";
+} from "./chunk-N4KEHLUE.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -147,7 +147,7 @@ import {
   reorderMessages,
   resetAutoCompactTelemetry,
   stripSystemMessages
-} from "./chunk-SFFHKLKV.js";
+} from "./chunk-RF4TLZ2G.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -179,7 +179,7 @@ import {
   normalizeFilePath,
   readTextContent,
   writeTextContent
-} from "./chunk-2OX2HGKH.js";
+} from "./chunk-OXMRNROM.js";
 import {
   parseBlockEdits
 } from "./chunk-QWIBSCDN.js";
@@ -190,18 +190,18 @@ import {
   formatDiagnosticsPretty,
   initParser,
   loadLanguage
-} from "./chunk-X2LEA5WZ.js";
+} from "./chunk-YQX2PZMK.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback,
   readSettingsFile
-} from "./chunk-66IQQBOM.js";
+} from "./chunk-25DI6YMP.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-PJMRV734.js";
+} from "./chunk-UIHCMY35.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
@@ -210,7 +210,7 @@ import {
   buildModelProfileKey,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-Q6ADAH2V.js";
+} from "./chunk-3YYZBLYE.js";
 import {
   getCodeStyle,
   getContext,
@@ -218,16 +218,16 @@ import {
   getIsGit,
   getProjectDocs,
   getProjectStructureStatisticsBlock
-} from "./chunk-T5T43XFI.js";
+} from "./chunk-7A7AGNEX.js";
 import {
   getRipgrepPath,
   getRipgrepPolicyMode,
   resolveRipgrepPolicy,
   ripGrep
-} from "./chunk-PKMXJDHS.js";
+} from "./chunk-IOJSVTJI.js";
 import {
   getTheme
-} from "./chunk-GAHOCTVO.js";
+} from "./chunk-XQZYIKQG.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -240,7 +240,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-BV4JBKPK.js";
+} from "./chunk-CARZ3VV2.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -249,7 +249,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-6UJ2IX6O.js";
+} from "./chunk-UXJEDV2F.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -293,10 +293,10 @@ import {
   setCwd,
   shouldApplyToolOutputTruncation,
   truncateToolOutput
-} from "./chunk-GBRPRP4C.js";
+} from "./chunk-6ZXSYUC4.js";
 import {
   MACRO
-} from "./chunk-VNJSOVCS.js";
+} from "./chunk-J6RVV73S.js";
 import {
   __export
 } from "./chunk-I3J4JYES.js";
@@ -477,7 +477,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-YTSS25IN.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-S4UIKFEI.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -4279,7 +4279,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-YTSS25IN.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-S4UIKFEI.js");
   const queryLLMFn = args.queryLLMOverride ?? queryLLM2;
   const messages = [
     {
@@ -6672,7 +6672,7 @@ var FileEditTool = {
     const originalFileContent = currentFileContent;
     let totalPatch = [];
     const { SmartEdit } = await import("./smart-edit-AWHJDSU6.js");
-    const { findLspAnchor } = await import("./lspAnchor-ACLDKRMF.js");
+    const { findLspAnchor } = await import("./lspAnchor-FM5VJH4Y.js");
     for (const op of editOperations) {
       const normalizedSearch = normalizeLineEndings(op.search);
       const normalizedReplace = normalizeLineEndings(op.replace);
@@ -6773,7 +6773,7 @@ Suggestion: fix errors or rerun with verify=false.`);
 };
 
 // src/tools/filesystem/FileReadTool/FileReadTool.tsx
-import { statSync as statSync7 } from "fs";
+import { readdirSync, statSync as statSync7 } from "fs";
 import { Box as Box12, Text as Text13 } from "ink";
 import * as path5 from "node:path";
 import { extname as extname4, relative as relative6 } from "node:path";
@@ -6783,8 +6783,8 @@ import { z as z4 } from "zod";
 // src/tools/filesystem/FileReadTool/prompt.ts
 var MAX_LINES_TO_READ = 2e3;
 var MAX_LINE_LENGTH = 2e3;
-var DESCRIPTION3 = "Read a file from the local filesystem.";
-var PROMPT3 = `Reads a file from the local filesystem. You can access any file directly by using this tool.Assume this tool is able to read all files on the machine. If the User provides a path to a file assume that path is valid; otherwise, Ensure the path is confirmed by Glob/Grep before reading.
+var DESCRIPTION3 = "Read a file or directory from the local filesystem.";
+var PROMPT3 = `Reads a file or directory from the local filesystem. You can access any file or directory directly by using this tool.Assume this tool is able to read all files on the machine. If the User provides a path to a file assume that path is valid; otherwise, Ensure the path is confirmed by Glob/Grep before reading.
 
 ## Best Practice
 - **Read vs Analyze**: Use this tool when you need to inspect full implementation details.
@@ -6798,16 +6798,20 @@ var PROMPT3 = `Reads a file from the local filesystem. You can access any file d
 
 ## Usage Details
 - The file_path parameter must be an absolute path, not a relative path
-- By default, it reads up to ${MAX_LINES_TO_READ} lines starting from the beginning of the file
+- This tool supports both file mode and directory mode
+- In directory mode, offset/limit are 1-based entry pagination and offset>=1 is required
+- In file mode, offset/limit are 1-based line pagination; offset=1 starts from the first line shown in cat -n output
+- By default, file mode reads up to ${MAX_LINES_TO_READ} lines starting from the beginning of the file
 - You can optionally specify a line offset and limit (especially handy for long files). **Smart Truncation is active**: If your limit cuts a function or class in the middle, the tool will automatically extend the read range to include the full semantic block (up to 500 extra lines).
-- Offset/limit are 1-based line positions (offset=1 starts at the first line shown in cat -n output)
+- Directory mode returns a one-level tree structure using \u251C\u2500\u2500/\u2514\u2500\u2500 and supports pagination continuation hints
 - For large files, iterate in chunks: offset=1 limit=200, then offset=201 limit=200, and so on until the needed region is covered
+- File text truncation is capped at 50KB per result and 2000 lines; 50KB is file text truncation and not a directory access gate
 - Any lines longer than ${MAX_LINE_LENGTH} characters will be truncated
 - Results are returned using cat -n format, with line numbers starting at 1
 - This tool allows reading images (eg PNG, JPG, etc). When reading an image file the contents are presented visually.
 - This tool can read PDF files and return them as document blocks for analysis.
 - This tool can read Jupyter notebooks (.ipynb files) and returns all cells with their outputs, combining code, text, and visualizations.
-- This tool can only read files, not directories. To list files in a directory, use the 'Glob' tool.
+- For wide repository exploration, still prefer Glob first, then use Read for focused file/directory inspection.
 - You can call multiple tools in a single response. It is always better to speculatively read multiple potentially useful files in parallel.
 - You will regularly be asked to read screenshots. If the user provides a path to a screenshot, ALWAYS use this tool to view the file at the path. This tool will work with all temporary file paths.
 - If you read a file that exists but has empty contents you will receive a system reminder warning in place of file contents.
@@ -6825,9 +6829,17 @@ var PROMPT3 = `Reads a file from the local filesystem. You can access any file d
  <example>
   user: Check the database configuration
   assistant: [uses Glob tool with pattern="**/config*.{ts,js,json}"]
-  [uses Grep tool with pattern="database|db_" to find config files with db settings]                                                                       \u2502
+  [uses Grep tool with pattern="database|db_" to find config files with db settings]
   [reads the confirmed config file]
  </example>
+
+### Example 3: Read Directory Structure Then Read File
+ <example>
+  user: Check the API module layout and read router implementation
+  assistant: [uses Glob tool with pattern="**/api*"]
+  [reads the confirmed api directory path to get one-level tree structure with Read]
+  [reads the router file path found in that directory tree]
+ </example>
 `.trim();
 
 // src/utils/fs/secureFile.ts
@@ -7465,7 +7477,25 @@ function toSmartTruncationFallbackEvent(input) {
 // src/tools/filesystem/FileReadTool/FileReadTool.tsx
 var MAX_LINES_TO_RENDER = 0;
 var MAX_LINE_LENGTH2 = 2e3;
-var MAX_OUTPUT_SIZE = 0.25 * 1024 * 1024;
+var MAX_TEXT_OUTPUT_BYTES = 50 * 1024;
+var MAX_TEXT_OUTPUT_LINES = 2e3;
+var DIRECTORY_DEFAULT_LIMIT = 200;
+var BINARY_SAMPLE_BYTES = 4096;
+var NON_PRINTABLE_THRESHOLD = 0.3;
+var TEXT_LIKE_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".txt",
+  ".md",
+  ".ts",
+  ".tsx",
+  ".js",
+  ".jsx",
+  ".json",
+  ".yml",
+  ".yaml",
+  ".toml",
+  ".ini",
+  ".env"
+]);
 var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".webp"]);
 var MAX_WIDTH = 2e3;
 var MAX_HEIGHT = 2e3;
@@ -7548,6 +7578,13 @@ var BINARY_EXTENSIONS = /* @__PURE__ */ new Set([
   ".swf",
   ".fla"
 ]);
+var binaryDetectionStats = {
+  totalChecks: 0,
+  extensionHitCount: 0,
+  samplingHitCount: 0,
+  degradationTriggerCount: 0,
+  suspectedMisclassificationCount: 0
+};
 var inputSchema4 = z4.strictObject({
   file_path: z4.string().describe("The absolute path to the file to read"),
   offset: z4.number().optional().describe(
@@ -7608,6 +7645,8 @@ var FileReadTool = {
           }
         ), !verbose && numLines > MAX_LINES_TO_RENDER && /* @__PURE__ */ React13.createElement(Text13, { color: getTheme().secondaryText }, "... (+", numLines - MAX_LINES_TO_RENDER, " lines)"))));
       }
+      case "directory":
+        return /* @__PURE__ */ React13.createElement(Box12, { justifyContent: "space-between", overflowX: "hidden", width: "100%" }, /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "row" }, /* @__PURE__ */ React13.createElement(Text13, null, "\xA0\xA0\u23BF \xA0"), /* @__PURE__ */ React13.createElement(Text13, null, "Read directory")));
     }
   },
   renderToolUseRejectedMessage() {
@@ -7633,7 +7672,7 @@ var FileReadTool = {
         if (similarFilename) {
           message += ` Did you mean ${similarFilename}?`;
         }
-        message += "\nSuggestion: If the path came from search results,ensure the path is confirmed by Glob/Grep or Glob `dir/*` before reading. Avoid any read that is not confirmed by Glob/Grep or Glob. `dir/*`";
+        message += "\nSuggestion: If the path came from search results, confirm it with Glob/Grep first; for directory structure, read the directory path directly with Read (offset>=1, optional limit) before reading target files.";
         message += "\nSuggestion: in multi-repo or multi-branch environments, confirm the current working directory and branch before locating.";
       } else if (error.includes("too long")) {
         message = "Path too long (max 4096 characters). Please provide a shorter path.";
@@ -7646,11 +7685,26 @@ var FileReadTool = {
       };
     }
     const ext = path5.extname(fullFilePath).toLowerCase();
+    const isDirectory = fileCheck.stats?.isDirectory ?? false;
+    if (isDirectory) {
+      if (offset !== void 0 && offset < 1) {
+        return {
+          result: false,
+          message: "Invalid offset. For directory reads, offset must be >= 1."
+        };
+      }
+      return { result: true };
+    }
     const fileSize = fileCheck.stats?.size ?? 0;
     if (BINARY_EXTENSIONS.has(ext)) {
+      recordBinaryDetection({
+        mode: "extension",
+        detail: `extension:${ext}`,
+        ext
+      });
       return {
         result: false,
-        message: `This tool cannot read binary files. The file appears to be a binary ${ext} file. Please use appropriate tools for binary file analysis.`
+        message: `This tool cannot read binary files. The file appears to be a binary ${ext} file (extension-based detection). Please use appropriate tools for binary file analysis.`
       };
     }
     if (fileSize === 0 && IMAGE_EXTENSIONS.has(ext)) {
@@ -7659,22 +7713,43 @@ var FileReadTool = {
         message: "Empty image files cannot be processed."
       };
     }
-    const isNotebook = ext === ".ipynb";
-    const isPdf = ext === ".pdf";
-    const isImage = IMAGE_EXTENSIONS.has(ext);
-    if (!isImage && !isNotebook && !isPdf) {
-      if (fileSize > MAX_OUTPUT_SIZE && !offset && !limit) {
+    const isSpecialFileType = IMAGE_EXTENSIONS.has(ext) || ext === ".pdf" || ext === ".ipynb";
+    if (!isSpecialFileType) {
+      const sampleResult = await detectBinaryBySampling(fullFilePath, fileSize);
+      if (sampleResult.isBinary) {
+        recordBinaryDetection({
+          mode: "sampling",
+          detail: sampleResult.detail,
+          ext
+        });
         return {
           result: false,
-          message: formatFileSizeError(fileSize)
+          message: `This tool cannot read binary files. The file was identified as binary by content-sampling detection (${sampleResult.detail}). Please use appropriate tools for binary file analysis.`
         };
       }
+      recordBinaryDetection({ mode: "none", ext });
     }
     return { result: true };
   },
   async *call({ file_path, offset = 1, limit = void 0, symbol_name }, { readFileTimestamps }) {
     const ext = path5.extname(file_path).toLowerCase();
     const fullFilePath = normalizeFilePath(file_path);
+    const fileInfo = secureFileService.safeGetFileInfo(fullFilePath);
+    if (!fileInfo.success || !fileInfo.stats) {
+      throw new Error(fileInfo.error || "Failed to access file");
+    }
+    if (fileInfo.stats.isDirectory) {
+      if (offset < 1) {
+        throw new Error("Invalid offset. For directory reads, offset must be >= 1.");
+      }
+      const directoryData = readDirectoryPage(fullFilePath, file_path, offset, limit);
+      yield {
+        type: "result",
+        data: directoryData,
+        resultForAssistant: this.renderResultForAssistant(directoryData)
+      };
+      return;
+    }
     let startLine = offset;
     let finalLimit = limit;
     if (symbol_name) {
@@ -7700,8 +7775,12 @@ var FileReadTool = {
         if (!symbol) {
           throw new Error(`Symbol '${symbol_name}' not found in file. Use offset/limit or LspTool instead.`);
         }
-        startLine = symbol.range.start.line + 1;
-        finalLimit = symbol.range.end.line - symbol.range.start.line + 1;
+        const range = getSymbolRange(symbol);
+        if (!range) {
+          throw new Error(`Symbol '${symbol_name}' has no valid range information`);
+        }
+        startLine = range.start.line + 1;
+        finalLimit = range.end.line - range.start.line + 1;
       } catch (e) {
         throw new Error(`Symbol reading failed: ${e.message}`);
       }
@@ -7764,6 +7843,20 @@ var FileReadTool = {
       };
       return;
     }
+    if (BINARY_EXTENSIONS.has(ext)) {
+      throw new Error(
+        `This tool cannot read binary files. The file appears to be a binary ${ext} file (extension-based detection). Please use appropriate tools for binary file analysis.`
+      );
+    }
+    const sampleResult = await detectBinaryBySampling(
+      fullFilePath,
+      fileInfo.stats.size ?? 0
+    );
+    if (sampleResult.isBinary) {
+      throw new Error(
+        `This tool cannot read binary files. The file was identified as binary by content-sampling detection (${sampleResult.detail}). Please use appropriate tools for binary file analysis.`
+      );
+    }
     let zeroBasedOffset = startLine === 0 ? 0 : startLine - 1;
     if (limit && !symbol_name) {
       try {
@@ -7788,7 +7881,7 @@ var FileReadTool = {
         );
       }
     }
-    const { content, lineCount, totalLines } = readTextContent(
+    const { content, totalLines } = readTextContent(
       fullFilePath,
       zeroBasedOffset,
       finalLimit
@@ -7796,19 +7889,21 @@ var FileReadTool = {
     const truncatedLines = content.split(/\r?\n/).map(
       (line) => line.length > MAX_LINE_LENGTH2 ? line.slice(0, MAX_LINE_LENGTH2) : line
     ).join("\n");
-    if (Buffer.byteLength(truncatedLines, "utf8") > MAX_OUTPUT_SIZE) {
-      throw new Error(
-        formatFileSizeError(Buffer.byteLength(truncatedLines, "utf8"))
-      );
-    }
+    const textPage = capTextOutput(truncatedLines, {
+      startLine,
+      maxLines: MAX_TEXT_OUTPUT_LINES,
+      maxBytes: MAX_TEXT_OUTPUT_BYTES
+    });
     const data = {
       type: "text",
       file: {
         filePath: file_path,
-        content: truncatedLines,
-        numLines: lineCount,
+        content: textPage.content,
+        numLines: textPage.lineCount,
         startLine,
-        totalLines
+        totalLines,
+        truncated: textPage.truncated,
+        nextOffset: textPage.nextOffset
       }
     };
     yield {
@@ -7848,10 +7943,190 @@ var FileReadTool = {
           content: data.file.content,
           startLine: data.file.startLine
         });
+      case "directory":
+        return data.file.content;
     }
   }
 };
-var formatFileSizeError = (sizeInBytes) => `File content (${Math.round(sizeInBytes / 1024)}KB) exceeds maximum allowed size (${Math.round(MAX_OUTPUT_SIZE / 1024)}KB). Please use offset and limit parameters to read specific portions of the file, or use the Grep tool to search for specific content.`;
+function readDirectoryPage(fullFilePath, sourceFilePath, offset, limit) {
+  const entries = readdirSync(fullFilePath, { withFileTypes: true });
+  const items = entries.map((entry) => ({
+    name: entry.name,
+    isDir: isDirectoryEntry(fullFilePath, entry)
+  })).sort((a, b) => {
+    if (a.isDir !== b.isDir) {
+      return a.isDir ? -1 : 1;
+    }
+    return a.name.localeCompare(b.name);
+  });
+  const startIndex = Math.max(0, offset - 1);
+  const pageSize = Math.max(1, limit ?? DIRECTORY_DEFAULT_LIMIT);
+  if (items.length > 0 && startIndex >= items.length) {
+    throw new Error(
+      `Directory pagination offset out of range: offset=${offset}, totalEntries=${items.length}.`
+    );
+  }
+  const pageItems = items.slice(startIndex, startIndex + pageSize);
+  const truncated = startIndex + pageSize < items.length;
+  const nextOffset = truncated ? startIndex + pageItems.length + 1 : void 0;
+  const content = renderDirectoryTreePage(
+    fullFilePath,
+    pageItems,
+    truncated,
+    nextOffset,
+    pageSize
+  );
+  return {
+    type: "directory",
+    file: {
+      filePath: sourceFilePath,
+      content,
+      numEntries: pageItems.length,
+      startEntry: offset,
+      totalEntries: items.length,
+      truncated,
+      nextOffset
+    }
+  };
+}
+function isDirectoryEntry(fullFilePath, entry) {
+  if (entry.isDirectory()) {
+    return true;
+  }
+  try {
+    return statSync7(path5.join(fullFilePath, entry.name)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function renderDirectoryTreePage(rootPath, pageItems, truncated, nextOffset, pageSize) {
+  const rootLabel = rootPath.endsWith(path5.sep) ? rootPath : `${rootPath}${path5.sep}`;
+  const lines = [rootLabel];
+  for (let i = 0; i < pageItems.length; i++) {
+    const connector = i === pageItems.length - 1 ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
+    const suffix = pageItems[i].isDir ? path5.sep : "";
+    lines.push(`${connector}${pageItems[i].name}${suffix}`);
+  }
+  if (truncated && nextOffset) {
+    lines.push(`
+Use offset=${nextOffset} limit=${pageSize} to continue`);
+  } else {
+    lines.push("\nEnd of directory");
+  }
+  return lines.join("\n");
+}
+function getSymbolRange(symbol) {
+  const directRange = symbol?.range;
+  if (typeof directRange?.start?.line === "number" && typeof directRange?.end?.line === "number") {
+    return directRange;
+  }
+  const locationRange = symbol?.location?.range;
+  if (typeof locationRange?.start?.line === "number" && typeof locationRange?.end?.line === "number") {
+    return locationRange;
+  }
+  return null;
+}
+function capTextOutput(content, options) {
+  const lines = content.split(/\r?\n/);
+  const limitedByLines = lines.slice(0, options.maxLines);
+  const bytes = [];
+  let currentBytes = 0;
+  for (let i = 0; i < limitedByLines.length; i++) {
+    const segment = i === 0 ? limitedByLines[i] : `
+${limitedByLines[i]}`;
+    const segmentBytes = Buffer.byteLength(segment, "utf8");
+    if (currentBytes + segmentBytes > options.maxBytes) {
+      break;
+    }
+    bytes.push(limitedByLines[i]);
+    currentBytes += segmentBytes;
+  }
+  const lineCount = bytes.length;
+  const truncated = lineCount < lines.length;
+  const nextOffset = truncated ? options.startLine + lineCount : void 0;
+  return {
+    content: bytes.join("\n"),
+    lineCount,
+    truncated,
+    nextOffset
+  };
+}
+async function detectBinaryBySampling(filePath, fileSize) {
+  if (fileSize <= 0) {
+    return { isBinary: false };
+  }
+  const sampleSize = Math.min(BINARY_SAMPLE_BYTES, fileSize);
+  try {
+    const buffer = await Bun.file(filePath).slice(0, sampleSize).arrayBuffer();
+    const bytes = new Uint8Array(buffer);
+    if (bytes.length === 0) {
+      return { isBinary: false };
+    }
+    let nonPrintableCount = 0;
+    for (let i = 0; i < bytes.length; i++) {
+      const byte = bytes[i];
+      if (byte === 0) {
+        return { isBinary: true, detail: "null-byte" };
+      }
+      if (byte < 9 || byte > 13 && byte < 32) {
+        nonPrintableCount++;
+      }
+    }
+    const ratio = nonPrintableCount / bytes.length;
+    if (ratio > NON_PRINTABLE_THRESHOLD) {
+      return { isBinary: true, detail: "non-printable-ratio" };
+    }
+    return { isBinary: false };
+  } catch (error) {
+    recordBinaryDetection({
+      mode: "none",
+      detail: "sampling-read-error",
+      degraded: true,
+      ext: path5.extname(filePath).toLowerCase()
+    });
+    logError(error);
+    return { isBinary: false };
+  }
+}
+function recordBinaryDetection({
+  mode,
+  detail,
+  degraded = false,
+  ext
+}) {
+  binaryDetectionStats.totalChecks++;
+  if (mode === "extension") {
+    binaryDetectionStats.extensionHitCount++;
+  }
+  if (mode === "sampling") {
+    binaryDetectionStats.samplingHitCount++;
+    if (ext && TEXT_LIKE_EXTENSIONS.has(ext)) {
+      binaryDetectionStats.suspectedMisclassificationCount++;
+    }
+  }
+  if (degraded) {
+    binaryDetectionStats.degradationTriggerCount++;
+  }
+  emitTelemetryEvent({
+    channel: "tool.read.binary_detection",
+    phase: "decision",
+    timestamp: Date.now(),
+    data: {
+      mode,
+      detail: detail || null,
+      degraded,
+      ext: ext || null,
+      totalChecks: binaryDetectionStats.totalChecks,
+      extensionHitCount: binaryDetectionStats.extensionHitCount,
+      samplingHitCount: binaryDetectionStats.samplingHitCount,
+      degradationTriggerCount: binaryDetectionStats.degradationTriggerCount,
+      suspectedMisclassificationCount: binaryDetectionStats.suspectedMisclassificationCount,
+      samplingHitRate: binaryDetectionStats.totalChecks > 0 ? Number(
+        (binaryDetectionStats.samplingHitCount / binaryDetectionStats.totalChecks).toFixed(4)
+      ) : 0
+    }
+  });
+}
 var isSecurityError = (error) => {
   const patterns = [
     "outside allowed directories",
@@ -8174,16 +8449,9 @@ var DESCRIPTION4 = `Fast file pattern matching tool that works with any codebase
   - 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.
 
-  ## Listing Directory Contents (One Level)
-  - Use pattern \`dir/*\` to list files and directories directly inside a directory (one level only)
-  - This is useful for exploring directory structure without deep recursion
-  - Example: \`src/*\` lists immediate children of src/ (like src/index.ts, src/components/, src/utils/)
-  - Example: \`src/components/*\` lists immediate children of src/components/
-  - Use this instead of bash \`ls\` command for directory exploration
-  - **Pattern variations for one-level listing**:
-    - \`dir/*\` matches both files and directories at one level (most common)
-    - \`dir/*.ts\` matches only .ts files at one level
-    - \`dir/*/\` matches only directories at one level (trailing slash filters to directories)
+  ## Directory Structure Guidance
+  - For one-level directory structure, use Read directly on the directory path (offset>=1, optional limit)
+  - Use Glob for file-path discovery and candidate narrowing, not as the primary one-level directory listing workflow
 
   ## Search Strategy
   - **Broad-to-Narrow Pattern**: Start with a broad pattern, then narrow based on results.
@@ -8191,20 +8459,19 @@ var DESCRIPTION4 = `Fast file pattern matching tool that works with any codebase
     - Step 2: Analyze results and refine with more specific patterns
     - Example: "\`**/*.test.ts\`" \u2192 too many results \u2192 "src/**/auth*.test.ts"
   - **Pattern Selection Guide**:
-    - Unknown structure? Start with \`dir/*\` to list top-level, or \`**/*.{ext}\` to discover layout
+    - Unknown structure? Start with \`**/*.{ext}\` to discover layout, then use Read on specific directory paths for one-level structure
     - Looking for specific type? Use descriptive names: \`**/test*\`, \`**/config*\`
     - In a specific area? Combine path + pattern: \`src/auth/**/*.ts\`
   - **Discovery Workflow**: For unfamiliar codebases, run these in parallel:
-    - \`*\` (list root directory), \`**/package.json\`, \`**/*.{ts,js,tsx,jsx}\`, \`**/README*\`
+    - \`**/package.json\`, \`**/*.{ts,js,tsx,jsx}\`, \`**/README*\`, \`**/*config*.{ts,js,json}\`
     - Analyze structure \u2192 refine search \u2192 read key files
   - **Tool Collaboration**:
-    - Glob \`dir/*\` \u2192 List immediate directory contents for structure exploration
+    - Read \`directory_path\` \u2192 Get one-level directory tree structure
     - Grep \u2192 After Glob finds files, use Grep to search content
     - Read \u2192 Read the found file contents
 
   ## Usage Details
   - Supports glob patterns like "**/*.js" or "src/**/*.ts"
-  - Use \`dir/*\` pattern to list immediate children of a directory (single level, non-recursive)
   - Returns absolute file paths sorted by modification time (most recent first)
   - Use this tool when you need to find files by name patterns
   - Powered by ripgrep with \`--files\` mode for fast pattern matching
@@ -8216,40 +8483,33 @@ var DESCRIPTION4 = `Fast file pattern matching tool that works with any codebase
   - **Truncated Results**: When results are truncated (limited to 100 files), narrow down using:
     1. Add a more specific path: \`src/core/**/*.ts\` instead of \`**/*.ts\`
     2. Use file extension filter: \`src/**/*.test.ts\` instead of \`src/**/*.ts\`
-    3. Use \`dir/*\` first to understand structure, then target specific directories
+    3. Use Read on a specific directory path to confirm one-level structure, then target specific directories with Glob
 
   ## Typical Usage Examples
 
-  ### Example 1: List Directory Contents (One Level)
-  <example>
-  user: list files in the directory src/
-  assistant: [uses Glob tool with pattern="src/*" to list immediate children]
-  Result: src/index.ts, src/components/, src/utils/, src/App.tsx
-  </example>
-
-  ### Example 2: Project Structure Discovery (Unknown Codebase)
+  ### Example 1: Project Structure Discovery (Unknown Codebase)
   <example>
   user: I'm new to this project, what's the structure?       
-  assistant: [uses Glob tool with pattern="*" to list root directory]
-  [uses Glob tool with pattern="src/*" to see source layout]
-  [uses Glob tool with pattern="**/package.json" to find project roots]
+  assistant: [uses Glob tool with pattern="**/package.json" to find project roots]
+  [reads the confirmed source directory path to inspect one-level tree structure]
+  [uses Glob tool with pattern="**/*.{ts,tsx,js,jsx}" to locate major source areas]
   </example>
 
-  ### Example 3: Find Files by Type in Specific Area
+  ### Example 2: Find Files by Type in Specific Area
   <example>
   user: Find all test files in the auth module
   assistant: [uses Glob tool with pattern="src/auth/**/*.test.ts"]
   [uses Read tool to examine specific test files]
   </example>
 
-  ### Example 4: Config File Location (Deterministic)        
+  ### Example 3: Config File Location (Deterministic)        
   <example>
   user: Where is the webpack configuration?
   assistant: [uses Glob tool with pattern="**/webpack*.{js,ts,json}"]
   [uses Read tool on the matched config file]
   </example>
 
-  ### Example 5: Parallel Discovery for Entry Points
+  ### Example 4: Parallel Discovery for Entry Points
   <example>
   user: What are the main entry points of this application?
   assistant: [uses Glob tool with pattern="**/index.{ts,js}"]
@@ -8258,7 +8518,7 @@ var DESCRIPTION4 = `Fast file pattern matching tool that works with any codebase
   [uses Read tool to examine the entry point files]
   </example>
 
-  ### Example 6: Narrow Down After Broad Results
+  ### Example 5: Narrow Down After Broad Results
   <example>
   user: Find all TypeScript files in the project
   assistant: [uses Glob tool with pattern="**/*.ts" - returns 500+ files, truncated]
@@ -8269,7 +8529,7 @@ var DESCRIPTION4 = `Fast file pattern matching tool that works with any codebase
 
 // src/tools/filesystem/GlobTool/GlobTool.tsx
 import { existsSync as existsSync6, statSync as statSync9 } from "fs";
-import { isAbsolute as isAbsolute6, join as join4, relative as relative8, resolve as resolve6 } from "path";
+import { isAbsolute as isAbsolute6, join as join5, relative as relative8, resolve as resolve6 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var inputSchema6 = z6.strictObject({
   pattern: z6.string().describe("The glob pattern to match files against"),
@@ -8356,7 +8616,7 @@ var GlobTool = {
       searchPath,
       abortController.signal
     );
-    let files = raw.map((p) => isAbsolute6(p) ? p : join4(searchPath, p));
+    let files = raw.map((p) => isAbsolute6(p) ? p : join5(searchPath, p));
     const scopedPath = resolve6(searchPath);
     let semanticNotice;
     if (semantic && files.length === 0) {
@@ -8403,9 +8663,9 @@ var GlobTool = {
   renderResultForAssistant(output) {
     let result = output.filenames.join("\n");
     if (output.filenames.length === 0) {
-      result = 'No files found\nSuggestion: Use Glob with pattern "dir/*" to confirm directory structure, then try a broader pattern (e.g., src/**/*) or verify the path exists.';
+      result = "No files found\nSuggestion: Verify the search path, broaden the pattern (e.g., src/**/*), and if you need structure clues read the target directory path directly with Read.";
     } else if (output.truncated) {
-      result += '\n(Results truncated to 100 files. Narrow down: 1) Add specific path like "src/core/**/*" 2) Filter by extension like "*.test.ts" 3) Use "dir/*" first to explore structure.)';
+      result += '\n(Results truncated to 100 files. Narrow down: 1) Add specific path like "src/core/**/*" 2) Filter by extension like "*.test.ts" 3) Read a target directory path with Read for structure confirmation.)';
     }
     if (output.semanticNotice) {
       return `${result}
@@ -8449,7 +8709,7 @@ var DESCRIPTION5 = `A powerful fast content search tool that works with any code
     - No results? Broaden pattern, try case-insensitive (\`-i\`), or try alternative keywords
     - Wrong results? Adjust pattern, check regex syntax, try alternative keywords
   - **Tool Collaboration**:
-    - Glob "dir/*" \u2192 Confirm directory structure for search scope
+    - Read "directory_path" \u2192 Confirm one-level directory structure for search scope
     - Glob "file_path" \u2192 Confirm file path existence
     - Read \u2192 Read specific content of matched files
     - LspTool \u2192 Trace definitions and references (replace manual Grep tracing)
@@ -8679,14 +8939,14 @@ var GrepTool = {
 
 ${result.semanticNotice}` : base;
     if (result.mode === "content") {
-      const base = result.content && result.content.length > 0 ? truncateToCharBudget(result.content) : 'No matches found\nSuggestion: Use Glob "dir/*" to confirm directory structure and search scope, then broaden matching conditions (case/regex/keyword variants, semantic=true), and if needed switch to content mode or expand the file set before searching again.';
+      const base = result.content && result.content.length > 0 ? truncateToCharBudget(result.content) : "No matches found\nSuggestion: Read the target directory path to confirm one-level structure and search scope, then broaden matching conditions (case/regex/keyword variants, semantic=true), and if needed switch to content mode or expand the file set before searching again.";
       const withPagination = pagination ? `${base}
 
 [Showing results with pagination = ${pagination}]` : base;
       return appendNotice(withPagination);
     }
     if (result.mode === "count") {
-      const base = result.content && result.content.length > 0 ? truncateToCharBudget(result.content) : 'No matches found\nSuggestion: Use Glob "dir/*" to confirm directory structure and search scope, then broaden matching conditions (case/regex/keyword variants, semantic=true), and if needed switch to content mode or expand the file set before searching again.';
+      const base = result.content && result.content.length > 0 ? truncateToCharBudget(result.content) : "No matches found\nSuggestion: Read the target directory path to confirm one-level structure and search scope, then broaden matching conditions (case/regex/keyword variants, semantic=true), and if needed switch to content mode or expand the file set before searching again.";
       const numMatches = result.numMatches ?? 0;
       const numFiles = result.numFiles ?? 0;
       const summary = base + `
@@ -8696,7 +8956,7 @@ Found ${numMatches} total ${numMatches === 1 ? "occurrence" : "occurrences"} acr
     }
     if (result.numFiles === 0) {
       return appendNotice(
-        'No files found\nSuggestion: Use Glob "dir/*" to confirm directory structure and search scope, then broaden matching conditions (case/regex/keyword variants, semantic=true), and if needed switch to content mode or expand the file set before searching again.'
+        "No files found\nSuggestion: Read the target directory path to confirm one-level structure and search scope, then broaden matching conditions (case/regex/keyword variants, semantic=true), and if needed switch to content mode or expand the file set before searching again."
       );
     }
     const header = `Found ${result.numFiles} file${result.numFiles === 1 ? "" : "s"}${pagination ? ` ${pagination}` : ""}
@@ -11052,7 +11312,7 @@ function PressEnterToContinue() {
 }
 
 // src/services/stability/runtimeAssetHealth/checks/ripgrep.ts
-import { join as join5, sep as sep3 } from "node:path";
+import { join as join6, sep as sep4 } from "node:path";
 import envPaths from "env-paths";
 async function resolveRipgrepPath() {
   return getRipgrepPath();
@@ -11065,7 +11325,7 @@ function detectRipgrepSource(resolvedPath) {
   if (explicit && normalizePath(explicit) === normalizePath(resolvedPath)) {
     return "explicit";
   }
-  if (resolvedPath.includes(`${sep3}resources${sep3}ripgrep${sep3}`)) {
+  if (resolvedPath.includes(`${sep4}resources${sep4}ripgrep${sep4}`)) {
     return "vendor";
   }
   const cacheRoot = getRipgrepCacheRoot();
@@ -11111,14 +11371,14 @@ function resolveRipgrepPolicyVisibility() {
 function getRipgrepCacheRoot() {
   const override = process.env.PYB_RIPGREP_CACHE_DIR?.trim();
   if (override) return override;
-  return join5(envPaths("pyb").cache, "ripgrep");
+  return join6(envPaths("pyb").cache, "ripgrep");
 }
 function normalizePath(value) {
-  return value.replaceAll("/", sep3).replaceAll("\\", sep3).toLowerCase();
+  return value.replaceAll("/", sep4).replaceAll("\\", sep4).toLowerCase();
 }
 function isLikelyPathResolved(value) {
   const normalized = normalizePath(value);
-  return normalized.includes(`${sep3}bin${sep3}`) || normalized.endsWith(`${sep3}rg`);
+  return normalized.includes(`${sep4}bin${sep4}`) || normalized.endsWith(`${sep4}rg`);
 }
 
 // src/services/stability/runtimeAssetHealth/diagnostics.ts
@@ -11541,7 +11801,7 @@ var help_default = help;
 import * as React28 from "react";
 import { Box as Box21, Text as Text24 } from "ink";
 import { existsSync as existsSync8 } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 import { homedir as homedir6 } from "os";
 
 // src/constants/releaseNotes.ts
@@ -11589,7 +11849,7 @@ function ProjectOnboarding({
   if (!showOnboarding && !hasReleaseNotes) {
     return null;
   }
-  const workspaceHasProjectGuide = existsSync8(join6(workspaceDir, PROJECT_FILE));
+  const workspaceHasProjectGuide = existsSync8(join7(workspaceDir, PROJECT_FILE));
   const isWorkspaceDirEmpty = isDirEmpty(workspaceDir);
   const shouldRecommendProjectGuide = !workspaceHasProjectGuide && !isWorkspaceDirEmpty;
   const theme = getTheme();
@@ -11744,8 +12004,8 @@ function getReplStaticPrefixLength(orderedMessages, allMessages, unresolvedToolU
 }
 
 // src/commands/messages-debug.ts
-import { existsSync as existsSync9, readdirSync, readFileSync as readFileSync6, statSync as statSync10 } from "fs";
-import { join as join7 } from "path";
+import { existsSync as existsSync9, readdirSync as readdirSync2, readFileSync as readFileSync6, statSync as statSync10 } from "fs";
+import { join as join8 } from "path";
 function isDebugMode() {
   return process.argv.includes("--debug") || process.argv.includes("--debug-verbose");
 }
@@ -11777,11 +12037,11 @@ function getProgressText(message) {
 function getLatestMessagesLogFile() {
   const dir = CACHE_PATHS.messages();
   if (!existsSync9(dir)) return null;
-  const files = readdirSync(dir).filter((f) => f.endsWith(".json"));
+  const files = readdirSync2(dir).filter((f) => f.endsWith(".json"));
   if (files.length === 0) return null;
   let best = null;
   for (const file of files) {
-    const fullPath = join7(dir, file);
+    const fullPath = join8(dir, file);
     let mtimeMs = 0;
     try {
       mtimeMs = statSync10(fullPath).mtimeMs;
@@ -12175,7 +12435,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-YTSS25IN.js");
+        const { resetAnthropicClient } = await import("./llm-S4UIKFEI.js");
         resetAnthropicClient();
       } catch {
       }
@@ -16599,7 +16859,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-7ZEORM4F.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-HAYCLP4K.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -17274,7 +17534,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-URPSX5FV.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-NJI57V4I.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -18251,7 +18511,7 @@ function resolveAutoMemoryFlags(env2 = process.env) {
 
 // src/services/memory/inject.ts
 import { existsSync as existsSync10, readFileSync as readFileSync7 } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 
 // src/services/memory/paths.ts
 import { isAbsolute as isAbsolute8, relative as relative10, resolve as resolve8 } from "path";
@@ -18371,7 +18631,7 @@ function getMemoryFilePath(input) {
     agentId,
     agentType: input.agentType
   });
-  return join8(agentMemoryDir, "MEMORY.md");
+  return join9(agentMemoryDir, "MEMORY.md");
 }
 function truncateByLines(content, maxLines) {
   return content.split("\n").slice(0, maxLines).join("\n");
@@ -18740,12 +19000,12 @@ import {
   mkdirSync as mkdirSync5,
   openSync,
   readFileSync as readFileSync8,
-  readdirSync as readdirSync2,
+  readdirSync as readdirSync3,
   renameSync as renameSync2,
   rmSync,
   writeFileSync as writeFileSync3
 } from "fs";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 import { homedir as homedir7 } from "os";
 import { randomUUID as randomUUID3 } from "crypto";
 import { AsyncLocalStorage } from "async_hooks";
@@ -18970,15 +19230,15 @@ function resolveGlobalTaskRootDir() {
   const override = process.env.PYB_CONFIG_DIR ?? process.env.CLAUDE_CONFIG_DIR;
   if (override) return override;
   const home = homedir7();
-  const pybDir = join9(home, ".pyb");
+  const pybDir = join10(home, ".pyb");
   if (existsSync11(pybDir)) return pybDir;
-  const claudeDir = join9(home, ".claude");
+  const claudeDir = join10(home, ".claude");
   if (existsSync11(claudeDir)) return claudeDir;
   return pybDir;
 }
 function findBaseDirWithList(listId, candidates) {
   for (const candidate of candidates) {
-    if (existsSync11(join9(candidate, listId))) return candidate;
+    if (existsSync11(join10(candidate, listId))) return candidate;
   }
   return null;
 }
@@ -19015,39 +19275,39 @@ function getTaskListId(options) {
 }
 function resolveTaskBaseDir(context, cwd) {
   if (context.scope === "project") {
-    const pybDir = join9(cwd, ".pyb");
-    const claudeDir = join9(cwd, ".claude");
+    const pybDir = join10(cwd, ".pyb");
+    const claudeDir = join10(cwd, ".claude");
     const hasProjectPyb = existsSync11(pybDir);
     const hasProjectClaude = existsSync11(claudeDir);
     const projectRoot = hasProjectPyb ? pybDir : hasProjectClaude ? claudeDir : pybDir;
     const override2 = process.env.PYB_CONFIG_DIR ?? process.env.CLAUDE_CONFIG_DIR;
-    const defaultBaseDir2 = !hasProjectPyb && !hasProjectClaude && override2 ? join9(override2, "tasks") : join9(projectRoot, "tasks");
+    const defaultBaseDir2 = !hasProjectPyb && !hasProjectClaude && override2 ? join10(override2, "tasks") : join10(projectRoot, "tasks");
     const candidates2 = [
-      join9(cwd, ".pyb", "tasks"),
-      join9(cwd, ".claude", "tasks"),
-      ...override2 ? [join9(override2, "tasks")] : [],
+      join10(cwd, ".pyb", "tasks"),
+      join10(cwd, ".claude", "tasks"),
+      ...override2 ? [join10(override2, "tasks")] : [],
       resolveXdgDataPath("tasks")
     ];
     return findBaseDirWithList(context.listId, candidates2) ?? defaultBaseDir2;
   }
   const override = process.env.PYB_CONFIG_DIR ?? process.env.CLAUDE_CONFIG_DIR;
-  const globalCandidates = override ? [join9(override, "tasks")] : [
-    join9(homedir7(), ".pyb", "tasks"),
-    join9(homedir7(), ".claude", "tasks")
+  const globalCandidates = override ? [join10(override, "tasks")] : [
+    join10(homedir7(), ".pyb", "tasks"),
+    join10(homedir7(), ".claude", "tasks")
   ];
-  const defaultBaseDir = join9(resolveGlobalTaskRootDir(), "tasks");
+  const defaultBaseDir = join10(resolveGlobalTaskRootDir(), "tasks");
   const candidates = [...globalCandidates, resolveXdgDataPath("tasks")];
   return findBaseDirWithList(context.listId, candidates) ?? defaultBaseDir;
 }
 function buildTaskListPaths(baseDir, listId) {
-  const listDir = join9(baseDir, listId);
+  const listDir = join10(baseDir, listId);
   return {
     listId,
     baseDir,
     listDir,
     tasksDir: listDir,
-    lockPath: join9(listDir, ".lock"),
-    highwatermarkPath: join9(listDir, ".highwatermark")
+    lockPath: join10(listDir, ".lock"),
+    highwatermarkPath: join10(listDir, ".highwatermark")
   };
 }
 function getTaskListPaths(listId) {
@@ -19061,26 +19321,26 @@ function sortReadPaths(paths) {
   return [...paths].sort((a, b) => priority[a.source] - priority[b.source]);
 }
 function resolveSourceForBaseDir(baseDir) {
-  if (baseDir.includes(`${join9(".pyb", "tasks")}`)) return "pyb";
-  if (baseDir.includes(`${join9(".claude", "tasks")}`)) return "claude";
-  if (baseDir.includes(`${join9(".pyb")}`)) return "pyb";
-  if (baseDir.includes(`${join9(".claude")}`)) return "claude";
+  if (baseDir.includes(`${join10(".pyb", "tasks")}`)) return "pyb";
+  if (baseDir.includes(`${join10(".claude", "tasks")}`)) return "claude";
+  if (baseDir.includes(`${join10(".pyb")}`)) return "pyb";
+  if (baseDir.includes(`${join10(".claude")}`)) return "claude";
   return "other";
 }
 function getTaskListReadPaths(listId) {
   const context = getTaskListContext({ listId });
   const cwd = getCwd();
-  const projectPyb = join9(cwd, ".pyb", "tasks");
-  const projectClaude = join9(cwd, ".claude", "tasks");
+  const projectPyb = join10(cwd, ".pyb", "tasks");
+  const projectClaude = join10(cwd, ".claude", "tasks");
   if (context.scope === "project") {
     const existing2 = [];
-    if (existsSync11(join9(projectPyb, context.listId))) {
+    if (existsSync11(join10(projectPyb, context.listId))) {
       existing2.push({
         ...buildTaskListPaths(projectPyb, context.listId),
         source: "pyb"
       });
     }
-    if (existsSync11(join9(projectClaude, context.listId))) {
+    if (existsSync11(join10(projectClaude, context.listId))) {
       existing2.push({
         ...buildTaskListPaths(projectClaude, context.listId),
         source: "claude"
@@ -19091,18 +19351,18 @@ function getTaskListReadPaths(listId) {
   const override = process.env.PYB_CONFIG_DIR ?? process.env.CLAUDE_CONFIG_DIR;
   const globalCandidates = override ? [
     {
-      baseDir: join9(override, "tasks"),
-      source: resolveSourceForBaseDir(join9(override, "tasks"))
+      baseDir: join10(override, "tasks"),
+      source: resolveSourceForBaseDir(join10(override, "tasks"))
     }
   ] : [
-    { baseDir: join9(homedir7(), ".pyb", "tasks"), source: "pyb" },
-    { baseDir: join9(homedir7(), ".claude", "tasks"), source: "claude" }
+    { baseDir: join10(homedir7(), ".pyb", "tasks"), source: "pyb" },
+    { baseDir: join10(homedir7(), ".claude", "tasks"), source: "claude" }
   ];
   const candidates = [
     ...globalCandidates,
     { baseDir: resolveXdgDataPath("tasks"), source: "other" }
   ];
-  const existing = candidates.filter((candidate) => existsSync11(join9(candidate.baseDir, context.listId))).map((candidate) => ({
+  const existing = candidates.filter((candidate) => existsSync11(join10(candidate.baseDir, context.listId))).map((candidate) => ({
     ...buildTaskListPaths(candidate.baseDir, context.listId),
     source: candidate.source
   }));
@@ -19289,7 +19549,7 @@ function persistBlocksForPaths(paths) {
     const prevBlockedBy = normalizeIds(existing?.blockedBy);
     const nextBlockedBy = normalizeIds(task.blockedBy);
     const raw = readJson(
-      join9(paths.tasksDir, `${task.id}.json`)
+      join10(paths.tasksDir, `${task.id}.json`)
     );
     const missingBlocks = !raw || !("blocks" in raw);
     const missingBlockedBy = !raw || !("blockedBy" in raw);
@@ -19299,7 +19559,7 @@ function persistBlocksForPaths(paths) {
       continue;
     updated += 1;
     fixedTaskIdSet.add(task.id);
-    writeJsonAtomic(join9(paths.tasksDir, `${task.id}.json`), serializeTaskRecord(task));
+    writeJsonAtomic(join10(paths.tasksDir, `${task.id}.json`), serializeTaskRecord(task));
   }
   return {
     updated,
@@ -19337,8 +19597,8 @@ function applyLegacyBlocks(tasks) {
 }
 function readTasksFromDisk(paths) {
   if (!existsSync11(paths.tasksDir)) return [];
-  const files = readdirSync2(paths.tasksDir).filter((file) => file.endsWith(".json"));
-  return files.map((file) => readTaskFile(join9(paths.tasksDir, file))).filter(Boolean);
+  const files = readdirSync3(paths.tasksDir).filter((file) => file.endsWith(".json"));
+  return files.map((file) => readTaskFile(join10(paths.tasksDir, file))).filter(Boolean);
 }
 function applyBlocksMap(tasks, map) {
   return tasks.map((task) => ({
@@ -19353,7 +19613,7 @@ function buildTaskListForPaths(paths) {
 var legacyFiles = ["index.json", "meta.json", "events.jsonl"];
 function cleanupLegacyFiles(paths) {
   for (const file of legacyFiles) {
-    const path6 = join9(paths.listDir, file);
+    const path6 = join10(paths.listDir, file);
     if (existsSync11(path6)) {
       rmSync(path6, { force: true });
     }
@@ -19361,7 +19621,7 @@ function cleanupLegacyFiles(paths) {
 }
 function getMaxIdFromTasksDir(paths) {
   if (!existsSync11(paths.tasksDir)) return 0;
-  const files = readdirSync2(paths.tasksDir).filter((file) => file.endsWith(".json"));
+  const files = readdirSync3(paths.tasksDir).filter((file) => file.endsWith(".json"));
   let maxId = 0;
   for (const file of files) {
     const numeric = Number(file.replace(/\.json$/, ""));
@@ -19613,7 +19873,7 @@ function createTask(input, options) {
       blocks: [],
       blockedBy: input.blockedBy ?? []
     };
-    writeJson(join9(paths.tasksDir, `${id}.json`), serializeTaskRecord(record));
+    writeJson(join10(paths.tasksDir, `${id}.json`), serializeTaskRecord(record));
     if ((record.blockedBy ?? []).length > 0) {
       persistBlocksForPaths(paths);
     }
@@ -19625,7 +19885,7 @@ function createTask(input, options) {
 function getTask(id, options) {
   const pathsList = getTaskListReadPaths(options?.listId);
   for (const paths of pathsList) {
-    const taskPath = join9(paths.tasksDir, `${id}.json`);
+    const taskPath = join10(paths.tasksDir, `${id}.json`);
     if (!existsSync11(taskPath)) continue;
     const task = readTaskFile(taskPath);
     if (task) return task;
@@ -19651,7 +19911,7 @@ function updateTask(id, updates, options) {
   }
   const pathsList = getTaskListReadPaths(options?.listId);
   const target = pathsList.find(
-    (paths) => existsSync11(join9(paths.tasksDir, `${id}.json`))
+    (paths) => existsSync11(join10(paths.tasksDir, `${id}.json`))
   );
   if (!target) {
     emitTaskBoundaryTelemetryEvent("TASK_UPDATE_NOT_FOUND_NO_SIDE_EFFECT", {
@@ -19701,18 +19961,18 @@ function updateTask(id, updates, options) {
     }
     for (const task of allAfter) {
       if (forceWriteIds.has(task.id)) {
-        writeJsonAtomic(join9(target.tasksDir, `${task.id}.json`), serializeTaskRecord(task));
+        writeJsonAtomic(join10(target.tasksDir, `${task.id}.json`), serializeTaskRecord(task));
         continue;
       }
       const prev = beforeById.get(task.id);
       if (!prev) {
-        writeJsonAtomic(join9(target.tasksDir, `${task.id}.json`), serializeTaskRecord(task));
+        writeJsonAtomic(join10(target.tasksDir, `${task.id}.json`), serializeTaskRecord(task));
         continue;
       }
       const prevSerialized = JSON.stringify(serializeTaskRecord(prev));
       const nextSerialized = JSON.stringify(serializeTaskRecord(task));
       if (prevSerialized === nextSerialized) continue;
-      writeJsonAtomic(join9(target.tasksDir, `${task.id}.json`), serializeTaskRecord(task));
+      writeJsonAtomic(join10(target.tasksDir, `${task.id}.json`), serializeTaskRecord(task));
     }
     const depsChanged2 = normalizeIds(existing.blockedBy).join(",") !== normalizeIds(updated.blockedBy).join(",") || normalizeIds(existing.blocks).join(",") !== normalizeIds(updated.blocks).join(",");
     if (depsChanged2 || Boolean(unlockResult)) {
@@ -21188,33 +21448,33 @@ async function getMainConversationContextLimit() {
     return 2e5;
   }
 }
-var COMPRESSION_PROMPT2 = `Provide a detailed prompt for continuing our conversation above.
-Focus on information that would be helpful for continuing the conversation, including what we did, what we're doing, which files we're working on, and what we're going to do next.
-The summary that you construct will be used so that another agent can read it and continue the work.
-
-When constructing the summary, try to stick to this template:
----
-## Goal
+var COMPRESSION_PROMPT2 = `Please provide a comprehensive summary of our conversation structured as follows:
 
-[What goal(s) is the user trying to accomplish?]
+## Technical Context
+Development environment, tools, frameworks, and configurations in use. Programming languages, libraries, and technical constraints. File structure, directory organization, and project architecture.
 
-## Instructions
+## Project Overview  
+Main project goals, features, and scope. Key components, modules, and their relationships. Data models, APIs, and integration patterns.
 
-- [What important instructions did the user give you that are relevant]
-- [If there is a plan or spec, include information about it so next agent can continue using it]
+## Code Changes
+Files created, modified, or analyzed during our conversation. Specific code implementations, functions, and algorithms added. Configuration changes and structural modifications.
 
-## Discoveries
+## Debugging & Issues
+Problems encountered and their root causes. Solutions implemented and their effectiveness. Error messages, logs, and diagnostic information.
 
-[What notable things were learned during this conversation that would be useful for the next agent to know when continuing the work]
+## Current Status
+What we just completed successfully. Current state of the codebase and any ongoing work. Test results, validation steps, and verification performed.
 
-## Accomplished
+## Pending Tasks
+Immediate next steps and priorities. Planned features, improvements, and refactoring. Known issues, technical debt, and areas needing attention.
 
-[What work has been completed, what work is still in progress, and what work is left?]
+## User Preferences
+Coding style, formatting, and organizational preferences. Communication patterns and feedback style. Tool choices and workflow preferences.
 
-## Relevant files / directories
+## Key Decisions
+Important technical decisions made and their rationale. Alternative approaches considered and why they were rejected. Trade-offs accepted and their implications.
 
-[Construct a structured list of relevant files that have been read, edited, or created that pertain to the task at hand. If all the files in a directory are relevant, include the path to the directory.]
----`;
+Focus on information essential for continuing the conversation effectively, including specific details about code, files, errors, and plans.`;
 var AUTO_COMPACT_NOTICE = "Context automatically compressed due to token limit.";
 var RECOVERED_FILE_MARKER2 = "**Recovered File:";
 var CONVERSATION_SUMMARY_LIMITS = {
@@ -24340,10 +24600,33 @@ function createErrorToolResultBlock(args) {
 }
 
 // src/app/queryRuntime/toolExecution.ts
-async function consumeGeneratorOutput(generator) {
+var DEFAULT_TOOL_TIMEOUT_MS = 45e3;
+function resolveToolTimeoutMs() {
+  const raw = Number(process.env.PYB_TOOL_TIMEOUT_MS ?? DEFAULT_TOOL_TIMEOUT_MS);
+  if (!Number.isFinite(raw) || raw <= 0) {
+    return DEFAULT_TOOL_TIMEOUT_MS;
+  }
+  return raw;
+}
+async function consumeGeneratorWithTimeout(generator, timeoutMs, toolName) {
   const results = [];
-  for await (const result of generator) {
-    results.push(result);
+  while (true) {
+    let timer;
+    const nextPromise = generator.next();
+    const timeoutPromise = new Promise((_, reject) => {
+      timer = setTimeout(() => {
+        reject(new Error(`TOOL_TIMEOUT:${toolName}:${timeoutMs}`));
+      }, timeoutMs);
+    });
+    const nextResult = await Promise.race([nextPromise, timeoutPromise]).finally(() => {
+      if (timer) {
+        clearTimeout(timer);
+      }
+    });
+    if (nextResult.done) {
+      break;
+    }
+    results.push(nextResult.value);
   }
   return results;
 }
@@ -24674,7 +24957,8 @@ async function* checkPermissionsAndCallTool(args) {
       ...args.context,
       toolUseId: args.toolUseID
     });
-    const results = await consumeGeneratorOutput(generator);
+    const timeoutMs = resolveToolTimeoutMs();
+    const results = await consumeGeneratorWithTimeout(generator, timeoutMs, args.tool.name);
     for (const result of results) {
       switch (result.type) {
         case "result": {
@@ -25970,7 +26254,6 @@ var QueryRunner = class {
     return {
       abortController: this.abortController,
       onQueryLifecycleEvent: (event) => {
-        this.config.onQueryLifecycleEvent?.(event);
       },
       sessionContext: new SessionContext(),
       options: {
@@ -25980,7 +26263,6 @@ var QueryRunner = class {
         tools: [],
         verbose: false,
         safeMode: false,
-        permissionMode: "default",
         maxThinkingTokens: 16e3
       },
       readFileTimestamps: {},
@@ -26211,18 +26493,18 @@ import { z as z11 } from "zod";
 
 // src/utils/session/expertChatStorage.ts
 import { existsSync as existsSync17, readFileSync as readFileSync9, writeFileSync as writeFileSync4, mkdirSync as mkdirSync10 } from "fs";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 import { randomUUID as randomUUID4 } from "crypto";
 function getExpertChatDirectory() {
   const override = process.env.ANYKODE_CONFIG_DIR?.trim();
-  const expertChatDir = override ? join10(override, "expert-chats") : resolveXdgDataPath("expert-chats");
+  const expertChatDir = override ? join11(override, "expert-chats") : resolveXdgDataPath("expert-chats");
   if (!existsSync17(expertChatDir)) {
     mkdirSync10(expertChatDir, { recursive: true });
   }
   return expertChatDir;
 }
 function getSessionFilePath(sessionId) {
-  return join10(getExpertChatDirectory(), `${sessionId}.json`);
+  return join11(getExpertChatDirectory(), `${sessionId}.json`);
 }
 function createExpertChatSession(expertModel) {
   const sessionId = randomUUID4().slice(0, 5);
@@ -27163,7 +27445,7 @@ async function analyzeOutputWithLsp(output, exitCode) {
   if (exitCode !== 0 || errorCount > 0 || warningCount > 0) {
     try {
       const { isAbsolute: isAbsolute11, resolve: resolve16 } = await import("path");
-      const { getSessionRoot: getSessionRoot2 } = await import("./state-M7627Z3G.js");
+      const { getSessionRoot: getSessionRoot2 } = await import("./state-34X5ECUL.js");
       const lines = output.split("\n");
       const uniqueFiles = /* @__PURE__ */ new Set();
       const lspSuggestions = [];
@@ -27533,7 +27815,7 @@ var DeleteTool = {
         }
         if (!force) {
           try {
-            const { LspFacade: LspFacade2 } = await import("./lsp-GS74PXYZ.js");
+            const { LspFacade: LspFacade2 } = await import("./lsp-NRIYSZQ4.js");
             const referenceDetail = await LspFacade2.checkFileReferences(fullPath);
             if (referenceDetail) {
               failedItems.push(
@@ -30922,9 +31204,9 @@ var TaskUpdateTool = {
 };
 
 // src/tools/memory/MemoryReadTool/MemoryReadTool.tsx
-import { existsSync as existsSync21, lstatSync, mkdirSync as mkdirSync11, readdirSync as readdirSync3, readFileSync as readFileSync12 } from "fs";
+import { existsSync as existsSync21, lstatSync, mkdirSync as mkdirSync11, readdirSync as readdirSync4, readFileSync as readFileSync12 } from "fs";
 import { Box as Box45, Text as Text49 } from "ink";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 import * as React57 from "react";
 import { z as z26 } from "zod";
 
@@ -31037,8 +31319,8 @@ var MemoryReadTool = {
       };
       return;
     }
-    const files = readdirSync3(agentMemoryDir, { recursive: true }).map((f) => join11(agentMemoryDir, f.toString())).filter((f) => !lstatSync(f).isDirectory()).map((f) => `- ${f}`).join("\n");
-    const indexPath = join11(agentMemoryDir, "index.md");
+    const files = readdirSync4(agentMemoryDir, { recursive: true }).map((f) => join12(agentMemoryDir, f.toString())).filter((f) => !lstatSync(f).isDirectory()).map((f) => `- ${f}`).join("\n");
+    const indexPath = join12(agentMemoryDir, "index.md");
     const index = existsSync21(indexPath) ? readFileSync12(indexPath, "utf-8") : "";
     const quotes = "'''";
     const content = `Here are the contents of the agent memory file, \`${indexPath}\`:
@@ -31257,6 +31539,68 @@ var getReadOnlyTools = memoize4(async () => {
   return tools.filter((_, index) => isEnabled5[index]);
 });
 
+// src/server/routes/tool.ts
+function createToolRoutes() {
+  const router = new Hono2();
+  router.get("/", async (c) => {
+    const tools = await getTools();
+    return c.json({
+      success: true,
+      data: tools.map((tool) => ({
+        name: tool.name,
+        description: tool.description,
+        inputSchema: tool.inputSchema,
+        category: tool.category ?? "system",
+        requiresPermission: tool.requiresConfirmation ?? false,
+        dangerousLevel: tool.dangerousLevel ?? "safe"
+      }))
+    });
+  });
+  router.post("/:toolName/execute", async (c) => {
+    const toolName = c.req.param("toolName");
+    const body = await c.req.json();
+    const { input, options } = body;
+    const tools = await getTools();
+    const tool = tools.find((item) => item.name === toolName);
+    if (!tool) {
+      return c.json({
+        success: false,
+        error: { code: "TOOL_NOT_FOUND", message: `Tool '${toolName}' not found` }
+      }, 404);
+    }
+    const startTime = Date.now();
+    try {
+      const result = await tool.call(input, {
+        skipPermission: options?.skipPermission
+      });
+      return c.json({
+        success: true,
+        data: {
+          success: true,
+          result: result.resultForAssistant,
+          duration: Date.now() - startTime
+        }
+      });
+    } catch (error) {
+      return c.json({
+        success: true,
+        data: {
+          success: false,
+          error: {
+            code: "TOOL_EXECUTION_ERROR",
+            message: error instanceof Error ? error.message : String(error)
+          },
+          duration: Date.now() - startTime
+        }
+      });
+    }
+  });
+  return router;
+}
+
+// src/server/routes/permission.ts
+import { Hono as Hono3 } from "hono";
+
 // src/server/permission/manager.ts
 import { v4 as uuidv42 } from "uuid";
 var PermissionManager = class {
@@ -31335,174 +31679,7 @@ var PermissionManager = class {
 };
 var permissionManager = new PermissionManager();
 
-// src/server/routes/tool.ts
-function buildServerToolUseContext(args) {
-  return {
-    messageId: void 0,
-    toolUseId: args.toolUseId,
-    sessionId: args.sessionId,
-    abortController: args.abortController ?? new AbortController(),
-    readFileTimestamps: {},
-    options: {
-      tools: args.tools,
-      verbose: false,
-      safeMode: false,
-      permissionMode: "default"
-    }
-  };
-}
-function createToolRoutes() {
-  const router = new Hono2();
-  router.get("/", async (c) => {
-    const tools = await getTools();
-    return c.json({
-      success: true,
-      data: tools.map((tool) => ({
-        name: tool.name,
-        description: tool.description,
-        inputSchema: tool.inputSchema,
-        category: tool.category ?? "system",
-        requiresPermission: tool.requiresConfirmation ?? false,
-        dangerousLevel: tool.dangerousLevel ?? "safe"
-      }))
-    });
-  });
-  router.post("/:toolName/execute", async (c) => {
-    const toolName = c.req.param("toolName");
-    const body = await c.req.json();
-    const { input = {}, options, sessionId } = body;
-    const tools = await getTools();
-    const tool = tools.find((item) => item.name === toolName);
-    if (!tool) {
-      return c.json({
-        success: false,
-        error: { code: "TOOL_NOT_FOUND", message: `Tool '${toolName}' not found` }
-      }, 404);
-    }
-    const startTime = Date.now();
-    const toolUseId = `tool_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
-    const requestSessionId = typeof sessionId === "string" && sessionId.length > 0 ? sessionId : "server_tool_execute";
-    const timeoutMs = typeof options?.timeout === "number" && options.timeout > 0 ? options.timeout : void 0;
-    const requiresPermission = Boolean(tool.requiresConfirmation);
-    const dangerousLevel = tool.dangerousLevel ?? "safe";
-    try {
-      await Bus.publish(ToolEvents.Started, {
-        sessionId: requestSessionId,
-        toolUseId,
-        toolName: tool.name,
-        input,
-        dangerousLevel,
-        requiresPermission
-      });
-      if (requiresPermission && options?.skipPermission !== true) {
-        const decision = await permissionManager.requestPermission(
-          requestSessionId,
-          tool.name,
-          toolUseId,
-          input,
-          dangerousLevel,
-          `Tool ${tool.name} requires permission`,
-          dangerousLevel === "dangerous" ? "deny" : "allow"
-        );
-        if (decision === "deny") {
-          return c.json({
-            success: true,
-            data: {
-              success: false,
-              error: {
-                code: "PERMISSION_DENIED",
-                message: `Tool '${tool.name}' execution was denied by permission decision`
-              },
-              duration: Date.now() - startTime
-            }
-          });
-        }
-      }
-      const abortController = new AbortController();
-      const generator = tool.call(
-        input,
-        buildServerToolUseContext({
-          toolUseId,
-          sessionId: requestSessionId,
-          tools,
-          abortController
-        })
-      );
-      const executionPromise = (async () => {
-        let resultForAssistant2 = void 0;
-        for await (const chunk of generator) {
-          if (chunk?.type === "result") {
-            resultForAssistant2 = chunk.resultForAssistant ?? chunk.data;
-            break;
-          }
-        }
-        return resultForAssistant2;
-      })();
-      let timeoutId;
-      let resultForAssistant = void 0;
-      try {
-        if (timeoutMs !== void 0) {
-          const timeoutPromise = new Promise((_, reject) => {
-            timeoutId = setTimeout(() => {
-              abortController.abort();
-              reject(new Error("TOOL_EXECUTION_TIMEOUT"));
-            }, timeoutMs);
-          });
-          resultForAssistant = await Promise.race([executionPromise, timeoutPromise]);
-        } else {
-          resultForAssistant = await executionPromise;
-        }
-      } finally {
-        if (timeoutId !== void 0) {
-          clearTimeout(timeoutId);
-        }
-      }
-      await Bus.publish(ToolEvents.Completed, {
-        sessionId: requestSessionId,
-        toolUseId,
-        toolName: tool.name,
-        result: typeof resultForAssistant === "string" ? resultForAssistant : JSON.stringify(resultForAssistant ?? null),
-        isError: false,
-        duration: Date.now() - startTime
-      });
-      return c.json({
-        success: true,
-        data: {
-          success: true,
-          result: resultForAssistant,
-          duration: Date.now() - startTime
-        }
-      });
-    } catch (error) {
-      const isTimeout = error instanceof Error && error.message === "TOOL_EXECUTION_TIMEOUT";
-      await Bus.publish(ToolEvents.Error, {
-        sessionId: requestSessionId,
-        toolUseId,
-        toolName: tool.name,
-        error: {
-          code: isTimeout ? "TOOL_EXECUTION_TIMEOUT" : "TOOL_EXECUTION_ERROR",
-          message: isTimeout ? "Tool execution timed out" : error instanceof Error ? error.message : String(error),
-          details: void 0
-        }
-      });
-      return c.json({
-        success: true,
-        data: {
-          success: false,
-          error: {
-            code: isTimeout ? "TOOL_EXECUTION_TIMEOUT" : "TOOL_EXECUTION_ERROR",
-            message: isTimeout ? "Tool execution timed out" : error instanceof Error ? error.message : String(error)
-          },
-          duration: Date.now() - startTime
-        }
-      });
-    }
-  });
-  return router;
-}
-
 // src/server/routes/permission.ts
-import { Hono as Hono3 } from "hono";
 function createPermissionRoutes() {
   const router = new Hono3();
   router.post("/:permissionId/respond", async (c) => {
@@ -31588,6 +31765,7 @@ function createConfigRoutes() {
 // src/server/routes/mcp.ts
 import { Hono as Hono5 } from "hono";
 var knownServers = /* @__PURE__ */ new Set();
+var connectedServers = /* @__PURE__ */ new Set();
 function createMCPRoutes() {
   const router = new Hono5();
   router.get("/servers", async (c) => {
@@ -31595,12 +31773,15 @@ function createMCPRoutes() {
     for (const serverName of Object.keys(servers ?? {})) {
       knownServers.add(serverName);
     }
+    for (const serverName of connectedServers) {
+      knownServers.add(serverName);
+    }
     const serverNames = Array.from(knownServers);
     return c.json({
       success: true,
       data: serverNames.map((name3) => ({
         name: name3,
-        status: getMcprcServerStatus(name3),
+        status: connectedServers.has(name3) ? "connected" : getMcprcServerStatus(name3),
         tools: [],
         resources: [],
         error: void 0
@@ -31610,26 +31791,23 @@ function createMCPRoutes() {
   router.post("/servers/:serverName/connect", async (c) => {
     const serverName = c.req.param("serverName");
     knownServers.add(serverName);
+    connectedServers.add(serverName);
     return c.json({
-      success: false,
-      error: {
-        code: "MCP_CONNECT_NOT_IMPLEMENTED",
-        message: "MCP connect flow is not implemented in current server adapter"
-      },
-      data: { serverName }
-    }, 501);
+      success: true,
+      data: { connected: true, serverName, tools: [] }
+    });
   });
   router.post("/servers/:serverName/disconnect", async (c) => {
     const serverName = c.req.param("serverName");
     knownServers.add(serverName);
+    connectedServers.delete(serverName);
     return c.json({
-      success: false,
-      error: {
-        code: "MCP_DISCONNECT_NOT_IMPLEMENTED",
-        message: "MCP disconnect flow is not implemented in current server adapter"
-      },
-      data: { serverName }
-    }, 501);
+      success: true,
+      data: {
+        disconnected: true,
+        serverName
+      }
+    });
   });
   return router;
 }
@@ -31727,8 +31905,6 @@ function createServer2(options = {}) {
 async function startServer(options = {}) {
   const port = options.port ?? 4096;
   const host = options.host ?? "localhost";
-  const envIdleTimeout = Number(process.env.PYB_SERVER_IDLE_TIMEOUT ?? "");
-  const idleTimeout = options.idleTimeout ?? (Number.isFinite(envIdleTimeout) && envIdleTimeout > 0 ? envIdleTimeout : 120);
   const app = createServer2(options);
   if (typeof Bun === "undefined" || typeof Bun.serve !== "function") {
     throw new Error("Bun runtime is required to start the web server");
@@ -31736,8 +31912,7 @@ async function startServer(options = {}) {
   const server = Bun.serve({
     fetch: app.fetch,
     hostname: host,
-    port,
-    idleTimeout
+    port
   });
   console.log(`PYB-CLI Web Server starting on http://${host}:${port}`);
   return {
@@ -35716,8 +35891,8 @@ function getCompletionContext(args) {
 }
 
 // src/utils/completion/fileSuggestions.ts
-import { existsSync as existsSync26, readdirSync as readdirSync4, statSync as statSync15 } from "fs";
-import { basename as basename4, dirname as dirname14, join as join12, resolve as resolve13 } from "path";
+import { existsSync as existsSync26, readdirSync as readdirSync5, statSync as statSync15 } from "fs";
+import { basename as basename4, dirname as dirname14, join as join13, resolve as resolve13 } from "path";
 function generateFileSuggestions(args) {
   const { prefix, cwd } = args;
   try {
@@ -35745,14 +35920,14 @@ function generateFileSuggestions(args) {
     }
     if (!existsSync26(searchDir)) return [];
     const showHidden = nameFilter.startsWith(".") || userPath.includes("/.");
-    const entries = readdirSync4(searchDir).filter((entry) => {
+    const entries = readdirSync5(searchDir).filter((entry) => {
       if (!showHidden && entry.startsWith(".")) return false;
       if (nameFilter && !entry.toLowerCase().startsWith(nameFilter.toLowerCase()))
         return false;
       return true;
     }).sort((a, b) => {
-      const aPath = join12(searchDir, a);
-      const bPath = join12(searchDir, b);
+      const aPath = join13(searchDir, a);
+      const bPath = join13(searchDir, b);
       const aIsDir = statSync15(aPath).isDirectory();
       const bIsDir = statSync15(bPath).isDirectory();
       if (aIsDir && !bIsDir) return -1;
@@ -35760,7 +35935,7 @@ function generateFileSuggestions(args) {
       return a.toLowerCase().localeCompare(b.toLowerCase());
     }).slice(0, 25);
     return entries.map((entry) => {
-      const entryPath = join12(searchDir, entry);
+      const entryPath = join13(searchDir, entry);
       const isDir = statSync15(entryPath).isDirectory();
       const icon = isDir ? "\u{1F4C1}" : "\u{1F4C4}";
       let value;
@@ -37094,15 +37269,15 @@ function useUnifiedCompletion({
     if (systemCommands.length > 0 || isLoadingCommands) return;
     setIsLoadingCommands(true);
     try {
-      const { readdirSync: readdirSync5, statSync: statSync17 } = await import("fs");
+      const { readdirSync: readdirSync6, statSync: statSync17 } = await import("fs");
       const pathDirs = (process.env.PATH || "").split(":").filter(Boolean);
       const commandSet = /* @__PURE__ */ new Set();
       const essentialCommands = getEssentialCommands();
       essentialCommands.forEach((cmd) => commandSet.add(cmd));
       for (const dir of pathDirs) {
         try {
-          if (readdirSync5 && statSync17) {
-            const entries = readdirSync5(dir);
+          if (readdirSync6 && statSync17) {
+            const entries = readdirSync6(dir);
             for (const entry of entries) {
               try {
                 const fullPath = `${dir}/${entry}`;
@@ -37667,7 +37842,7 @@ function TokenWarning({
 import { spawn, spawnSync } from "child_process";
 import { mkdtempSync, readFileSync as readFileSync17, rmSync as rmSync4, writeFileSync as writeFileSync6 } from "fs";
 import { tmpdir } from "os";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 var isWindows = process.platform === "win32";
 function isCommandAvailable(command4) {
   const checker = isWindows ? "where" : "which";
@@ -37743,8 +37918,8 @@ async function launchExternalEditor(initialText) {
       )
     };
   }
-  const dir = mkdtempSync(join13(tmpdir(), "pyb-edit-"));
-  const filePath = join13(dir, "message.txt");
+  const dir = mkdtempSync(join14(tmpdir(), "pyb-edit-"));
+  const filePath = join14(dir, "message.txt");
   writeFileSync6(filePath, initialText, "utf-8");
   const wasRaw = Boolean(process.stdin.isTTY && process.stdin.isRaw);
   if (process.stdin.isTTY) {
@@ -37801,13 +37976,13 @@ async function launchExternalEditor(initialText) {
 }
 
 // src/utils/commands/hashCommand.ts
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 import { readFileSync as readFileSync18, writeFileSync as writeFileSync7 } from "fs";
 function handleHashCommand(interpreted) {
   try {
     const cwd = process.cwd();
-    const agentsPath = join14(cwd, "AGENTS.md");
-    const legacyPath = join14(cwd, "CLAUDE.md");
+    const agentsPath = join15(cwd, "AGENTS.md");
+    const legacyPath = join15(cwd, "CLAUDE.md");
     const filesToUpdate = [];
     filesToUpdate.push({ path: agentsPath, name: "AGENTS.md" });
     try {
@@ -37955,7 +38130,7 @@ function logStartupProfile(event) {
 import { useEffect as useEffect21, useRef as useRef10, useState as useState25 } from "react";
 
 // src/services/ui/statusline.ts
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 function normalizeString(value) {
   if (typeof value !== "string") return null;
   const trimmed = value.trim();
@@ -37974,7 +38149,7 @@ function getStatusLineCommand(options) {
   const configDir = normalizeString(options?.configDir);
   if (configDir) {
     const settings2 = readSettingsFile(
-      join15(configDir, "settings.json")
+      join16(configDir, "settings.json")
     );
     const command4 = getCommandFromSettings(settings2 ?? {});
     if (command4) return command4;
@@ -38042,7 +38217,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-YTSS25IN.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-S4UIKFEI.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.",
@@ -38355,7 +38530,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-M7627Z3G.js");
+          const { getCwd: getCwd2 } = await import("./state-34X5ECUL.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -39134,12 +39309,12 @@ function createConversationTrackerPersistenceTelemetryEmitter(entrypoint) {
 }
 
 // src/ui/screens/REPL.tsx
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 function getProjectDirSlug(cwd) {
   return cwd.replace(/[^a-zA-Z0-9]/g, "-");
 }
 function getConversationTrackerPersistenceDir(cwd) {
-  return resolveXdgDataPath(join16(getProjectDirSlug(cwd), "conversation-trackers"));
+  return resolveXdgDataPath(join17(getProjectDirSlug(cwd), "conversation-trackers"));
 }
 function REPL({
   commands,
@@ -39919,7 +40094,7 @@ import React111, { useCallback as useCallback17, useEffect as useEffect26, useMe
 import { Box as Box84, Text as Text88, useInput as useInput28 } from "ink";
 import figures9 from "figures";
 import chalk15 from "chalk";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 import { spawn as spawn2 } from "child_process";
 
 // src/commands/agents/tooling.ts
@@ -39979,13 +40154,13 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync8
 } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 import { homedir as homedir8 } from "os";
 
 // src/commands/agents/generation.ts
 import { randomUUID as randomUUID9 } from "crypto";
 async function generateAgentWithClaude(prompt) {
-  const { queryModel } = await import("./llm-YTSS25IN.js");
+  const { queryModel } = await import("./llm-S4UIKFEI.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:
@@ -40169,21 +40344,21 @@ var LEGACY_FOLDER = ".claude";
 var AGENTS_DIR = "agents";
 function getAgentDirectory(location) {
   if (location === "user") {
-    return join17(homedir8(), PRIMARY_FOLDER, AGENTS_DIR);
+    return join18(homedir8(), PRIMARY_FOLDER, AGENTS_DIR);
   }
-  return join17(getCwd(), PRIMARY_FOLDER, AGENTS_DIR);
+  return join18(getCwd(), PRIMARY_FOLDER, AGENTS_DIR);
 }
 function getLegacyAgentDirectory(location) {
   if (location === "user") {
-    return join17(homedir8(), LEGACY_FOLDER, AGENTS_DIR);
+    return join18(homedir8(), LEGACY_FOLDER, AGENTS_DIR);
   }
-  return join17(getCwd(), LEGACY_FOLDER, AGENTS_DIR);
+  return join18(getCwd(), LEGACY_FOLDER, AGENTS_DIR);
 }
 function getPrimaryAgentFilePath(location, agentType) {
-  return join17(getAgentDirectory(location), `${agentType}.md`);
+  return join18(getAgentDirectory(location), `${agentType}.md`);
 }
 function getLegacyAgentFilePath(location, agentType) {
-  return join17(getLegacyAgentDirectory(location), `${agentType}.md`);
+  return join18(getLegacyAgentDirectory(location), `${agentType}.md`);
 }
 function ensureDirectoryExists(location) {
   const dir = getAgentDirectory(location);
@@ -41281,8 +41456,8 @@ function ViewAgent(props) {
     if (props.agent.source === "plugin") return `Plugin: ${props.agent.baseDir ?? "Unknown"}`;
     const baseDir = props.agent.baseDir;
     const file = `${props.agent.filename ?? props.agent.agentType}.md`;
-    if (props.agent.source === "projectSettings") return join18(".claude", "agents", file);
-    if (baseDir) return join18(baseDir, file);
+    if (props.agent.source === "projectSettings") return join19(".claude", "agents", file);
+    if (baseDir) return join19(baseDir, file);
     return props.agent.source;
   })();
   const toolsSummary = () => {
@@ -42901,7 +43076,7 @@ var BashTool = {
         result: false,
         message: `Security Policy: Do not use 'ls' for simple file listing. 
 - To find files: Use the 'Glob' tool.
-- To list directory contents: Use Glob with pattern "dir/*" (e.g., Glob pattern="src/*").
+- To inspect one-level directory structure: Use Read on the directory path (offset>=1, optional limit).
 - To check permissions/metadata: Use 'ls -l' (allowed).`
       };
     }
@@ -43610,7 +43785,7 @@ NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTAN
    - 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. **File System Exploration Priority**:For file system exploration, decide based on intent: if you need global structure/entry points, prefer Glob "dir/*" first; if you have keywords or fuzzy paths, prefer Glob first. If results are too broad, use Glob "dir/*" to narrow structure or combine with Grep/LSP. Only use Bash for executing scripts or binaries.
+4. **File System Exploration Priority**:For file system exploration, decide based on intent: if you need one-level directory structure, read the directory path with Read first; if you have keywords or fuzzy paths, prefer Glob first. If results are too broad, use Read for structure confirmation or combine with Grep/LSP. Only use Bash for executing scripts or binaries.
 5. **Code Analysis & Exploration Priority**:For codebase exploration tasks (e.g., searching across 2 or more directories, requiring more than 3 steps searching iterations, or investigating cross-module patterns), prefer using the Task tool with Explore subagent. This isolates exploration context in a separate transcript.
 6. **File Search Priority**:When doing file search, prefer to use the Task tool for open-ended, multi-step exploration to reduce context usage. For known paths or small scopes, prefer Lsp/Read/Glob/Grep directly.