pybao-cli 1.5.11 → 1.5.13

package/dist/{chunk-U6JIGJB4.js → chunk-EN3EFAIN.js}

@@ -2,18 +2,18 @@ import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
 import {
   loadPybAgentSessionMessages
-} from "./chunk-EZ5IMWVJ.js";
+} from "./chunk-SQZQF7FX.js";
 import {
   listPybAgentSessions
-} from "./chunk-2TZLPLK6.js";
+} from "./chunk-2YIYRACC.js";
 import {
   appendSessionCustomTitleRecord,
   appendSessionTagRecord
-} from "./chunk-YV7Q3VHM.js";
+} from "./chunk-5SB6YYVT.js";
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-I7FH3MBS.js";
+} from "./chunk-VLE3RIPA.js";
 import {
   ConversationTracker,
   appendFinishState,
@@ -21,10 +21,10 @@ import {
   getConversationTrackerForContext,
   isFinishComplete,
   mapFinishReason
-} from "./chunk-BQWG5WFV.js";
+} from "./chunk-R5KHOF4Q.js";
 import {
   FileSystemConversationPersistence
-} from "./chunk-6N43IM3F.js";
+} from "./chunk-KHCVAV26.js";
 import {
   beginReplSessionScope
 } from "./chunk-F4AXICO7.js";
@@ -39,7 +39,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-E4QA2SMS.js";
+} from "./chunk-CLDFSJRX.js";
 import {
   DEFAULT_OUTPUT_STYLE,
   getAvailableOutputStyles,
@@ -48,11 +48,11 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-5P4P5CFA.js";
+} from "./chunk-KDWAOC2Y.js";
 import {
   fetchCustomModels,
   getModelFeatures
-} from "./chunk-YKCKLLMA.js";
+} from "./chunk-PMBP2S7T.js";
 import {
   getSessionState
 } from "./chunk-XKYHFZEC.js";
@@ -60,7 +60,7 @@ import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-QMMOGZ7N.js";
+} from "./chunk-GKLF5SMX.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -74,7 +74,7 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-S7PU3TNH.js";
+} from "./chunk-IZKGIVR5.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -87,11 +87,11 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-VH3IQXUR.js";
+} from "./chunk-USAN2W2G.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-M3EVWIF3.js";
+} from "./chunk-DYRNDVME.js";
 import {
   applyToolPermissionContextUpdate,
   applyToolPermissionContextUpdates,
@@ -102,13 +102,13 @@ import {
   generateSystemReminders,
   resetReminderSession,
   systemReminderService
-} from "./chunk-YJ3HLVKX.js";
+} from "./chunk-NMV2Y2OE.js";
 import {
   clearAgentCache,
   getActiveAgents,
   getAgentByType,
   getAllAgents
-} from "./chunk-33QWSQC4.js";
+} from "./chunk-LHETO2A7.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -145,7 +145,7 @@ import {
   reorderMessages,
   resetAutoCompactTelemetry,
   stripSystemMessages
-} from "./chunk-KUQZLTIW.js";
+} from "./chunk-UYEP4HDV.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -175,7 +175,7 @@ import {
   normalizeFilePath,
   readTextContent,
   writeTextContent
-} from "./chunk-PFYRLJXN.js";
+} from "./chunk-6Z7VRZE3.js";
 import {
   parseBlockEdits
 } from "./chunk-QWIBSCDN.js";
@@ -185,18 +185,18 @@ import {
   ParserRegistry,
   initParser,
   loadLanguage
-} from "./chunk-HOGROHYP.js";
+} from "./chunk-V6HDC2AS.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback,
   readSettingsFile
-} from "./chunk-IYPL6KOG.js";
+} from "./chunk-LXKU7CVC.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-L5RH454O.js";
+} from "./chunk-FEEOL2BF.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
@@ -205,7 +205,7 @@ import {
   buildModelProfileKey,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-EV3W3WLB.js";
+} from "./chunk-5AZPIB3O.js";
 import {
   getCodeStyle,
   getContext,
@@ -213,16 +213,16 @@ import {
   getIsGit,
   getProjectDocs,
   getProjectStructureStatisticsBlock
-} from "./chunk-TEGHHNGC.js";
+} from "./chunk-62DRY4WE.js";
 import {
   getRipgrepPath,
   getRipgrepPolicyMode,
   resolveRipgrepPolicy,
   ripGrep
-} from "./chunk-LTHUAMIE.js";
+} from "./chunk-4CTIJSGF.js";
 import {
   getTheme
-} from "./chunk-MQONPL2D.js";
+} from "./chunk-PH2OZGKF.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -235,7 +235,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-4SQ6LXYG.js";
+} from "./chunk-IKZOQVSC.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -244,7 +244,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-WDCDJPYN.js";
+} from "./chunk-HBFOODQT.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -285,10 +285,10 @@ import {
   setCwd,
   shouldApplyToolOutputTruncation,
   truncateToolOutput
-} from "./chunk-7BZ3TT3E.js";
+} from "./chunk-DFQUXY7J.js";
 import {
   MACRO
-} from "./chunk-5MFIJREB.js";
+} from "./chunk-2L7XKUEG.js";
 import {
   __export
 } from "./chunk-I3J4JYES.js";
@@ -469,7 +469,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-257Z7WOJ.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-VL7SVIXR.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -4271,7 +4271,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-257Z7WOJ.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-VL7SVIXR.js");
   const queryLLMFn = args.queryLLMOverride ?? queryLLM2;
   const messages = [
     {
@@ -4679,7 +4679,7 @@ Usage notes:
   - 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", "text", or "html" (choose based on your intent)
+  - Format options: "text" (default, recommended), "markdown", or "html" (choose based on your intent)
   - 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
@@ -4695,16 +4695,16 @@ Requested Format Behavior Examples:
   </article>
 --html
 
-1\uFF1Aformat: "markdown" \u2192 preserves structure (headings/lists/links) for readable summaries and structured quoting:
-    # Title
-    Hello [link](https://example.com)
-    - One
-    - Two
-2\uFF1Aformat: "text" \u2192 plain text only, removes all markup and links to minimize noise:
+1\uFF1Aformat: "text" (default, recommended) \u2192 plain text only, removes all markup and links to minimize noise:
     Title
     Hello link
     One
     Two
+2\uFF1Aformat: "markdown" \u2192 preserves structure (headings/lists/links) for readable summaries and structured quoting:
+    # Title
+    Hello [link](https://example.com)
+    - One
+    - Two
 3\uFF1Aformat: "html" \u2192 cleaned HTML, keeps tags but removes scripts/styles/extra chrome:
     <article><h1>Title</h1><p>Hello <a href="https://example.com">link</a></p><ul><li>One</li><li>Two</li></ul></article>
 `.trim();
@@ -4797,13 +4797,14 @@ var urlCache = new URLCache();
 var inputSchema = z.strictObject({
   url: z.string().url().describe("The URL to fetch content from"),
   prompt: z.string().optional().describe("Optional prompt to run on the fetched content"),
-  format: z.enum(["markdown", "html", "text"]).optional().describe("Output format (default: markdown)"),
+  format: z.enum(["markdown", "html", "text"]).optional().describe("Output format (default: text)"),
   timeout: z.number().optional().describe("Timeout in seconds (default: 30)")
 });
 var FETCH_TIMEOUT_MS = 3e4;
 var CONNECT_TIMEOUT_MS = 5e3;
 var ANALYSIS_TIMEOUT_MS = 15e3;
 var MAX_TIMEOUT_MS = 12e4;
+var READ_CHUNK_TIMEOUT_MS = 2e4;
 var MAX_URL_LENGTH = 2e3;
 var MAX_RESPONSE_BYTES = 5 * 1024 * 1024;
 var MAX_CONTENT_CHARS = 1e5;
@@ -4880,12 +4881,15 @@ function createTimeoutSignal(parent, timeoutMs, onTimeout) {
     }
   };
 }
-async function readResponseTextLimited(response, maxBytes, signal) {
+async function readResponseTextLimited(response, maxBytes, signal, chunkTimeoutMs = READ_CHUNK_TIMEOUT_MS) {
   if (!response.body) return { text: "", bytes: 0 };
   const reader = response.body.getReader();
   const chunks = [];
   let bytes = 0;
   const abortError = new Error("Response reading aborted");
+  const chunkTimeoutError = new Error(
+    `Response chunk read timeout (${chunkTimeoutMs / 1e3}s)`
+  );
   let onAbort = null;
   let abortPromise = null;
   if (signal) {
@@ -4900,20 +4904,39 @@ async function readResponseTextLimited(response, maxBytes, signal) {
   try {
     while (true) {
       const readPromise = reader.read();
-      const { value, done } = abortPromise ? await Promise.race([readPromise, abortPromise]) : await readPromise;
-      if (done) break;
-      if (!value) continue;
-      bytes += value.byteLength;
-      if (bytes > maxBytes) {
-        try {
-          await reader.cancel();
-        } catch {
+      let chunkTimeoutId = null;
+      const chunkTimeoutPromise = new Promise((_, reject) => {
+        chunkTimeoutId = setTimeout(() => {
+          reject(chunkTimeoutError);
+        }, chunkTimeoutMs);
+      });
+      const racePromises = abortPromise ? [readPromise, abortPromise, chunkTimeoutPromise] : [readPromise, chunkTimeoutPromise];
+      try {
+        const { value, done } = await Promise.race(racePromises);
+        if (chunkTimeoutId) {
+          clearTimeout(chunkTimeoutId);
+          chunkTimeoutId = null;
+        }
+        if (done) break;
+        if (!value) continue;
+        bytes += value.byteLength;
+        if (bytes > maxBytes) {
+          try {
+            await reader.cancel();
+          } catch {
+          }
+          throw new Error(
+            `Response exceeded maximum allowed size (${maxBytes} bytes)`
+          );
         }
-        throw new Error(
-          `Response exceeded maximum allowed size (${maxBytes} bytes)`
-        );
+        chunks.push(value);
+      } catch (error) {
+        if (chunkTimeoutId) {
+          clearTimeout(chunkTimeoutId);
+          chunkTimeoutId = null;
+        }
+        throw error;
       }
-      chunks.push(value);
     }
   } catch (error) {
     if (signal?.aborted) {
@@ -4923,6 +4946,13 @@ async function readResponseTextLimited(response, maxBytes, signal) {
       }
       throw abortError;
     }
+    if (error === chunkTimeoutError) {
+      try {
+        await reader.cancel();
+      } catch {
+      }
+      throw chunkTimeoutError;
+    }
     throw error;
   } finally {
     try {
@@ -5200,7 +5230,7 @@ To complete your request, I need to fetch content from the redirected URL. Pleas
           contentType
         });
       }
-      const outputFormat = format3 ?? "markdown";
+      const outputFormat = format3 ?? "text";
       const formatted = truncateFetchedContent(
         applyFormat(rawContent, contentType, outputFormat)
       );
@@ -6634,7 +6664,7 @@ var FileEditTool = {
     const originalFileContent = currentFileContent;
     let totalPatch = [];
     const { SmartEdit } = await import("./smart-edit-AWHJDSU6.js");
-    const { findLspAnchor } = await import("./lspAnchor-5N3KECK7.js");
+    const { findLspAnchor } = await import("./lspAnchor-56RDVJJK.js");
     for (const op of editOperations) {
       const normalizedSearch = normalizeLineEndings(op.search);
       const normalizedReplace = normalizeLineEndings(op.replace);
@@ -8142,6 +8172,10 @@ var DESCRIPTION4 = `Fast file pattern matching tool that works with any codebase
   - 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)
 
   ## Search Strategy
   - **Broad-to-Narrow Pattern**: Start with a broad pattern, then narrow based on results.
@@ -8171,6 +8205,10 @@ var DESCRIPTION4 = `Fast file pattern matching tool that works with any codebase
   - Search ignores .gitignore rules and includes hidden files by default.
   - **Empty Results**: When no files are found, try broader patterns (e.g., src/**/*) or verify path exists.
   - **Error Handling**: Returns error if \`path\` does not exist or is not a valid directory.
+  - **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
 
   ## Typical Usage Examples
 
@@ -8357,9 +8395,9 @@ var GlobTool = {
   renderResultForAssistant(output) {
     let result = output.filenames.join("\n");
     if (output.filenames.length === 0) {
-      result = "No files found\nSuggestion: use LS to confirm directory structure, then use a broader path or a broader glob (e.g., src/**/*), and check ignore rules if needed.";
+      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.';
     } else if (output.truncated) {
-      result += "\n(Results are truncated. Consider using a more specific path or pattern.)";
+      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.)';
     }
     if (output.semanticNotice) {
       return `${result}
@@ -8633,14 +8671,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: confirm search scope (use LS/Glob), 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: 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 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: confirm search scope (use LS/Glob), 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: 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 numMatches = result.numMatches ?? 0;
       const numFiles = result.numFiles ?? 0;
       const summary = base + `
@@ -8650,7 +8688,7 @@ Found ${numMatches} total ${numMatches === 1 ? "occurrence" : "occurrences"} acr
     }
     if (result.numFiles === 0) {
       return appendNotice(
-        "No files found\nSuggestion: confirm search scope (use LS/Glob), 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: 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 header = `Found ${result.numFiles} file${result.numFiles === 1 ? "" : "s"}${pagination ? ` ${pagination}` : ""}
@@ -12111,7 +12149,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-257Z7WOJ.js");
+        const { resetAnthropicClient } = await import("./llm-VL7SVIXR.js");
         resetAnthropicClient();
       } catch {
       }
@@ -16535,7 +16573,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-4AI2VGR6.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-5ZYXGIUZ.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -17210,7 +17248,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-F7IYXNO5.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-JVW7GWZF.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -19052,6 +19090,13 @@ function toConcurrentGroupMeta(toolUseID, messages) {
   if (groupIDs.length <= 1) {
     return null;
   }
+  const groupIDSet = new Set(groupIDs);
+  const hasBash = messages.some(
+    (message) => message.type === "assistant" && message.message.content[0]?.type === "tool_use" && groupIDSet.has(message.message.content[0].id) && resolveToolNameAlias(message.message.content[0].name).resolvedName === "Bash"
+  );
+  if (hasBash) {
+    return null;
+  }
   return {
     groupIDs,
     isLeader: groupIDs[0] === toolUseID
@@ -19071,9 +19116,7 @@ function buildConcurrentSummary(args) {
   const readCount = countByName.get("Read") ?? 0;
   const grepCount = countByName.get("Grep") ?? 0;
   const globCount = countByName.get("Glob") ?? 0;
-  const lsCount = countByName.get("LS") ?? 0;
-  const bashCount = countByName.get("Bash") ?? 0;
-  const knownCount = readCount + grepCount + globCount + lsCount + bashCount;
+  const knownCount = readCount + grepCount + globCount;
   const otherCount = Math.max(groupIDs.length - knownCount, 0);
   const parts = [];
   if (readCount > 0) {
@@ -19085,12 +19128,6 @@ function buildConcurrentSummary(args) {
   if (globCount > 0) {
     parts.push(`matched ${globCount} glob${globCount === 1 ? "" : "s"}`);
   }
-  if (lsCount > 0) {
-    parts.push(`listed ${lsCount} dir${lsCount === 1 ? "" : "s"}`);
-  }
-  if (bashCount > 0) {
-    parts.push(`ran ${bashCount} command${bashCount === 1 ? "" : "s"}`);
-  }
   if (otherCount > 0) {
     parts.push(`ran ${otherCount} other tool${otherCount === 1 ? "" : "s"}`);
   }
@@ -25520,7 +25557,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-257Z7WOJ.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-VL7SVIXR.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.",
@@ -25833,7 +25870,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-BAYDHBR6.js");
+          const { getCwd: getCwd2 } = await import("./state-IB4ZDFMG.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -26009,7 +26046,7 @@ function PromptInput({
       borderRight: false,
       borderColor: mode === "bash" ? theme.bashBorder : mode === "pyb" ? theme.notingBorder : theme.inputBorder,
       borderDimColor: false,
-      borderStyle: "classic",
+      borderStyle: "round",
       marginTop: 1,
       width: "100%"
     },
@@ -27088,10 +27125,46 @@ function startWatchingTaskList(listId) {
   startFallbackWatcher(entry);
 }
 
-// src/services/ai/streamTyped/partStore.ts
-import { existsSync as existsSync17, mkdirSync as mkdirSync7 } from "fs";
-import { dirname as dirname9 } from "path";
-import { createRequire as createRequire2 } from "node:module";
+// src/utils/session/fileRecoveryCore.ts
+var MAX_FILES_TO_RECOVER = 5;
+var MAX_TOKENS_PER_FILE = 1e4;
+var MAX_TOTAL_FILE_TOKENS = 5e4;
+async function selectAndReadFiles() {
+  const importantFiles = fileFreshnessService.getImportantFiles(MAX_FILES_TO_RECOVER);
+  const results = [];
+  let totalTokens = 0;
+  for (const fileInfo of importantFiles) {
+    try {
+      const { content } = readTextContent(fileInfo.path);
+      const estimatedTokens = Math.ceil(content.length * 0.25);
+      let finalContent = content;
+      let truncated = false;
+      if (estimatedTokens > MAX_TOKENS_PER_FILE) {
+        const maxChars = Math.floor(MAX_TOKENS_PER_FILE / 0.25);
+        finalContent = content.substring(0, maxChars);
+        truncated = true;
+      }
+      const finalTokens = Math.min(estimatedTokens, MAX_TOKENS_PER_FILE);
+      if (totalTokens + finalTokens > MAX_TOTAL_FILE_TOKENS) {
+        break;
+      }
+      totalTokens += finalTokens;
+      results.push({
+        path: fileInfo.path,
+        content: finalContent,
+        tokens: finalTokens,
+        truncated
+      });
+    } catch (error) {
+      logError(error);
+      debug.warn("FILE_RECOVERY_READ_FAILED", {
+        path: fileInfo.path,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  return results;
+}
 
 // src/services/ai/streamTyped/partTypes.ts
 import { z as z11 } from "zod";
@@ -27460,201 +27533,6 @@ function createSystemEventPart(input) {
   });
 }
 
-// src/services/ai/streamTyped/partStore.ts
-var requireForSqlite = createRequire2(import.meta.url);
-var cachedDatabaseCtor;
-function getDatabaseCtor() {
-  if (cachedDatabaseCtor !== void 0) return cachedDatabaseCtor;
-  try {
-    const mod = requireForSqlite("bun:sqlite");
-    if (typeof mod?.Database === "function") {
-      cachedDatabaseCtor = mod.Database;
-      return cachedDatabaseCtor;
-    }
-  } catch {
-  }
-  cachedDatabaseCtor = null;
-  return null;
-}
-function getDatabaseCtorOrThrow() {
-  const Database = getDatabaseCtor();
-  if (Database) return Database;
-  const error = new Error(
-    "PYB_TYPED_SQL_UNAVAILABLE: bun:sqlite is unavailable for stream typed storage"
-  );
-  error.code = "PYB_TYPED_SQL_UNAVAILABLE";
-  throw error;
-}
-function getStreamTypedDbFilePath() {
-  const envPath = String(process.env.PYB_STREAM_TYPED_DB_FILE_PATH ?? "").trim();
-  if (envPath) return envPath;
-  return resolveXdgCachePath("telemetry/stream-typed-parts.db");
-}
-function validateTypedPartRecord(record) {
-  return streamTypedPartSchema.safeParse(record).success;
-}
-function applyRuntimePragmas(db) {
-  db.exec(`PRAGMA journal_mode=WAL;`);
-  db.exec(`PRAGMA synchronous=NORMAL;`);
-  db.exec(`PRAGMA busy_timeout=5000;`);
-  db.exec(`PRAGMA foreign_keys=ON;`);
-  db.exec(`PRAGMA cache_size=-20000;`);
-}
-function ensureDbSchema(db) {
-  applyRuntimePragmas(db);
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS message (
-      message_id TEXT PRIMARY KEY,
-      request_id TEXT NOT NULL,
-      updated_at INTEGER NOT NULL
-    );
-  `);
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS part (
-      id TEXT PRIMARY KEY,
-      message_id TEXT NOT NULL,
-      request_id TEXT NOT NULL,
-      part_type TEXT NOT NULL,
-      source TEXT NOT NULL,
-      timestamp INTEGER NOT NULL,
-      data_json TEXT NOT NULL,
-      updated_at INTEGER NOT NULL
-    );
-  `);
-  db.exec(`
-    CREATE INDEX IF NOT EXISTS idx_part_request_timestamp
-    ON part(request_id, timestamp, id);
-  `);
-}
-function upsertTypedPartsToDb(options) {
-  if (!Array.isArray(options.parts) || options.parts.length === 0) {
-    return { upserted: 0 };
-  }
-  if (!existsSync17(dirname9(options.dbFilePath))) {
-    mkdirSync7(dirname9(options.dbFilePath), { recursive: true });
-  }
-  const Database = getDatabaseCtorOrThrow();
-  const db = new Database(options.dbFilePath, { create: true });
-  ensureDbSchema(db);
-  const now = Date.now();
-  const upsertMessage = db.prepare(`
-    INSERT INTO message (message_id, request_id, updated_at)
-    VALUES (?1, ?2, ?3)
-    ON CONFLICT(message_id) DO UPDATE SET
-      request_id = excluded.request_id,
-      updated_at = excluded.updated_at
-  `);
-  const upsertPart = db.prepare(`
-    INSERT INTO part (
-      id, message_id, request_id, part_type, source, timestamp, data_json, updated_at
-    )
-    VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)
-    ON CONFLICT(id) DO UPDATE SET
-      message_id = excluded.message_id,
-      request_id = excluded.request_id,
-      part_type = excluded.part_type,
-      source = excluded.source,
-      timestamp = excluded.timestamp,
-      data_json = excluded.data_json,
-      updated_at = excluded.updated_at
-  `);
-  const tx = db.transaction((parts) => {
-    for (const part of parts) {
-      upsertMessage.run(part.requestId, part.requestId, now);
-      upsertPart.run(
-        part.id,
-        part.requestId,
-        part.requestId,
-        part.partType,
-        part.source,
-        part.timestamp,
-        JSON.stringify(part),
-        now
-      );
-    }
-  });
-  tx(options.parts);
-  db.close();
-  return { upserted: options.parts.length };
-}
-function appendTypedParts(options) {
-  if (!Array.isArray(options.parts) || options.parts.length === 0) {
-    return { appended: 0 };
-  }
-  const validParts = options.parts.filter((item) => validateTypedPartRecord(item));
-  if (validParts.length === 0) {
-    return { appended: 0 };
-  }
-  const dbFilePath = options.dbFilePath ?? getStreamTypedDbFilePath();
-  const dbResult = upsertTypedPartsToDb({
-    dbFilePath,
-    parts: validParts
-  });
-  return { appended: validParts.length, dbUpserted: dbResult.upserted };
-}
-function readTypedPartsByRequest(options) {
-  return readTypedPartsByRequestFromDb({
-    dbFilePath: options.dbFilePath,
-    requestId: options.requestId
-  });
-}
-function isLifecycleStepPart(part) {
-  return part.partType === "step_start" || part.partType === "step_finish";
-}
-function readStepTypedPartsByRequest(options) {
-  const parts = readTypedPartsByRequest(options);
-  return parts.filter(isLifecycleStepPart);
-}
-function readTypedPartsByRequestFromDb(options) {
-  const dbFilePath = options.dbFilePath ?? getStreamTypedDbFilePath();
-  if (!existsSync17(dbFilePath)) return [];
-  const Database = getDatabaseCtorOrThrow();
-  const db = new Database(dbFilePath);
-  ensureDbSchema(db);
-  const statement = options.requestId ? db.prepare(`
-        SELECT data_json
-        FROM part
-        WHERE request_id = ?1
-        ORDER BY timestamp ASC, id ASC
-      `) : db.prepare(`
-        SELECT data_json
-        FROM part
-        ORDER BY timestamp ASC, id ASC
-      `);
-  const rows = options.requestId ? statement.all(options.requestId) : statement.all();
-  const parts = [];
-  for (const row of rows) {
-    try {
-      const parsed = JSON.parse(String(row.data_json ?? ""));
-      if (!validateTypedPartRecord(parsed)) continue;
-      parts.push(parsed);
-    } catch {
-      continue;
-    }
-  }
-  db.close();
-  return parts;
-}
-
-// src/services/ai/streamTyped/index.ts
-var streamTypedBuffer = /* @__PURE__ */ new Map();
-function emitTypedPart(event) {
-  const requestId = String(event.requestId || "").trim();
-  if (!requestId) return;
-  const current = streamTypedBuffer.get(requestId) ?? [];
-  current.push(event.part);
-  streamTypedBuffer.set(requestId, current);
-}
-function flushTypedPartBuffer(options) {
-  const requestId = String(options.requestId || "").trim();
-  if (!requestId) return { appended: 0 };
-  const parts = streamTypedBuffer.get(requestId) ?? [];
-  streamTypedBuffer.delete(requestId);
-  return appendTypedParts({
-    parts
-  });
-}
-
 // src/services/ai/streamTyped/eventAssembler.ts
 function createAssemblerState(requestId, source = "auto_compact") {
   return {
@@ -27753,310 +27631,202 @@ function flushTypedParts(state) {
   return parts;
 }
 
-// src/services/ai/streamTyped/projector.ts
-function supportsRichToolResultByProvider(provider) {
-  return String(provider ?? "").trim().toLowerCase() === "anthropic";
+// src/services/ai/streamTyped/partStore.ts
+import { existsSync as existsSync17, mkdirSync as mkdirSync7 } from "fs";
+import { dirname as dirname9 } from "path";
+import { createRequire as createRequire2 } from "node:module";
+var requireForSqlite = createRequire2(import.meta.url);
+var cachedDatabaseCtor;
+function getDatabaseCtor() {
+  if (cachedDatabaseCtor !== void 0) return cachedDatabaseCtor;
+  try {
+    const mod = requireForSqlite("bun:sqlite");
+    if (typeof mod?.Database === "function") {
+      cachedDatabaseCtor = mod.Database;
+      return cachedDatabaseCtor;
+    }
+  } catch {
+  }
+  cachedDatabaseCtor = null;
+  return null;
 }
-function extractToolResultText(content) {
-  if (typeof content === "string") return { text: content, hasNonTextBlock: false };
-  if (!Array.isArray(content)) return { text: "", hasNonTextBlock: false };
-  let hasNonTextBlock = false;
-  const text = content.filter((block) => {
-    if (!block || typeof block !== "object") return false;
-    if (block.type === "text") return true;
-    hasNonTextBlock = true;
-    return false;
-  }).map((block) => String(block.text ?? "")).join("\n");
-  return { text, hasNonTextBlock };
+function getDatabaseCtorOrThrow() {
+  const Database = getDatabaseCtor();
+  if (Database) return Database;
+  const error = new Error(
+    "PYB_TYPED_SQL_UNAVAILABLE: bun:sqlite is unavailable for stream typed storage"
+  );
+  error.code = "PYB_TYPED_SQL_UNAVAILABLE";
+  throw error;
 }
-function extractTaggedText(text, tagName) {
-  const normalized = String(text ?? "").trim();
-  if (!normalized.startsWith(`<${tagName}>`)) return null;
-  const pattern = new RegExp(`<${tagName}>([\\s\\S]*?)<\\/${tagName}>`, "i");
-  const match = normalized.match(pattern);
-  const content = String(match?.[1] ?? "").trim();
-  return content.length > 0 ? content : null;
+function getStreamTypedDbFilePath() {
+  const envPath = String(process.env.PYB_STREAM_TYPED_DB_FILE_PATH ?? "").trim();
+  if (envPath) return envPath;
+  return resolveXdgCachePath("telemetry/stream-typed-parts.db");
 }
-function projectAssistantMessage(state, message) {
-  const content = message?.message?.content;
-  if (!Array.isArray(content)) return;
-  for (let i = 0; i < content.length; i += 1) {
-    const block = content[i];
-    if (!block || typeof block !== "object") continue;
-    const type3 = String(block.type ?? "");
-    if (type3 === "text") {
-      const text = String(block.text ?? "");
-      const toolProgressText = extractTaggedText(text, "tool-progress");
-      if (toolProgressText) {
-        state.parts.push(
-          createSystemEventPart({
-            requestId: state.requestId,
-            eventType: "tool_progress",
-            text: toolProgressText,
-            source: state.source
-          })
-        );
-      }
-      const localStdoutText = extractTaggedText(text, "local-command-stdout");
-      if (localStdoutText) {
-        state.parts.push(
-          createSystemEventPart({
-            requestId: state.requestId,
-            eventType: "local_command_stdout",
-            text: localStdoutText,
-            source: state.source
-          })
-        );
-      }
-      const localStderrText = extractTaggedText(text, "local-command-stderr");
-      if (localStderrText) {
-        state.parts.push(
-          createSystemEventPart({
-            requestId: state.requestId,
-            eventType: "local_command_stderr",
-            text: localStderrText,
-            source: state.source
-          })
-        );
-      }
-      onTextStart({ textId: `text-${i}` }, state);
-      onTextDelta({ textId: `text-${i}`, text }, state);
-      onTextEnd({ textId: `text-${i}` }, state);
-      continue;
-    }
-    if (type3 === "thinking" || type3 === "reasoning") {
-      const text = String(block.thinking ?? block.reasoning ?? "");
-      onReasoningStart({ reasoningId: `reasoning-${i}` }, state);
-      onReasoningDelta({ reasoningId: `reasoning-${i}`, text }, state);
-      onReasoningEnd({ reasoningId: `reasoning-${i}` }, state);
-      continue;
-    }
-    if (type3 === "tool_use" || type3 === "server_tool_use" || type3 === "mcp_tool_use") {
-      const toolCallId = String(block.id ?? `tool-${i}`);
-      const toolName = String(block.name ?? "unknown");
-      onToolCall({ toolCallId, toolName }, state);
-    }
-  }
+function validateTypedPartRecord(record) {
+  return streamTypedPartSchema.safeParse(record).success;
 }
-function projectUserToolResult(projector, message) {
-  const state = projector.state;
-  const content = message?.message?.content;
-  if (!Array.isArray(content)) return;
-  for (let i = 0; i < content.length; i += 1) {
-    const block = content[i];
-    if (!block || typeof block !== "object") continue;
-    if (block.type !== "tool_result") continue;
-    const toolCallId = String(block.tool_use_id ?? `tool-${i}`);
-    const extracted = extractToolResultText(block.content);
-    if (extracted.hasNonTextBlock) {
-      projector.richToolResultBlockCount += 1;
-      if (!projector.supportsRichToolResult) {
-        projector.downgradedToolResultCount += 1;
-      }
-    }
-    onToolResult(
-      {
-        toolCallId,
-        status: block.is_error ? "failed" : "completed",
-        outputText: extracted.text
-      },
-      state
+function applyRuntimePragmas(db) {
+  db.exec(`PRAGMA journal_mode=WAL;`);
+  db.exec(`PRAGMA synchronous=NORMAL;`);
+  db.exec(`PRAGMA busy_timeout=5000;`);
+  db.exec(`PRAGMA foreign_keys=ON;`);
+  db.exec(`PRAGMA cache_size=-20000;`);
+}
+function ensureDbSchema(db) {
+  applyRuntimePragmas(db);
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS message (
+      message_id TEXT PRIMARY KEY,
+      request_id TEXT NOT NULL,
+      updated_at INTEGER NOT NULL
     );
+  `);
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS part (
+      id TEXT PRIMARY KEY,
+      message_id TEXT NOT NULL,
+      request_id TEXT NOT NULL,
+      part_type TEXT NOT NULL,
+      source TEXT NOT NULL,
+      timestamp INTEGER NOT NULL,
+      data_json TEXT NOT NULL,
+      updated_at INTEGER NOT NULL
+    );
+  `);
+  db.exec(`
+    CREATE INDEX IF NOT EXISTS idx_part_request_timestamp
+    ON part(request_id, timestamp, id);
+  `);
+}
+function upsertTypedPartsToDb(options) {
+  if (!Array.isArray(options.parts) || options.parts.length === 0) {
+    return { upserted: 0 };
+  }
+  if (!existsSync17(dirname9(options.dbFilePath))) {
+    mkdirSync7(dirname9(options.dbFilePath), { recursive: true });
   }
+  const Database = getDatabaseCtorOrThrow();
+  const db = new Database(options.dbFilePath, { create: true });
+  ensureDbSchema(db);
+  const now = Date.now();
+  const upsertMessage = db.prepare(`
+    INSERT INTO message (message_id, request_id, updated_at)
+    VALUES (?1, ?2, ?3)
+    ON CONFLICT(message_id) DO UPDATE SET
+      request_id = excluded.request_id,
+      updated_at = excluded.updated_at
+  `);
+  const upsertPart = db.prepare(`
+    INSERT INTO part (
+      id, message_id, request_id, part_type, source, timestamp, data_json, updated_at
+    )
+    VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)
+    ON CONFLICT(id) DO UPDATE SET
+      message_id = excluded.message_id,
+      request_id = excluded.request_id,
+      part_type = excluded.part_type,
+      source = excluded.source,
+      timestamp = excluded.timestamp,
+      data_json = excluded.data_json,
+      updated_at = excluded.updated_at
+  `);
+  const tx = db.transaction((parts) => {
+    for (const part of parts) {
+      upsertMessage.run(part.requestId, part.requestId, now);
+      upsertPart.run(
+        part.id,
+        part.requestId,
+        part.requestId,
+        part.partType,
+        part.source,
+        part.timestamp,
+        JSON.stringify(part),
+        now
+      );
+    }
+  });
+  tx(options.parts);
+  db.close();
+  return { upserted: options.parts.length };
 }
-function projectProgressMessage(state, message) {
-  const toolCallId = String(message?.toolUseID ?? "").trim();
-  if (!toolCallId) return;
-  const content = String(
-    message?.content?.message?.content?.find?.((block) => block?.type === "text")?.text ?? ""
-  );
-  const extractedProgressText = extractTaggedText(content, "tool-progress");
-  const normalizedContent = content.trim();
-  const toolProgressText = extractedProgressText ?? (normalizedContent.length > 0 ? normalizedContent : void 0);
-  if (toolProgressText) {
-    state.parts.push(
-      createSystemEventPart({
-        requestId: state.requestId,
-        eventType: "tool_progress",
-        text: toolProgressText,
-        toolCallId,
-        source: state.source
-      })
-    );
+function appendTypedParts(options) {
+  if (!Array.isArray(options.parts) || options.parts.length === 0) {
+    return { appended: 0 };
   }
-  onToolResult(
-    {
-      toolCallId,
-      status: "running",
-      outputText: content || void 0
-    },
-    state
-  );
+  const validParts = options.parts.filter((item) => validateTypedPartRecord(item));
+  if (validParts.length === 0) {
+    return { appended: 0 };
+  }
+  const dbFilePath = options.dbFilePath ?? getStreamTypedDbFilePath();
+  const dbResult = upsertTypedPartsToDb({
+    dbFilePath,
+    parts: validParts
+  });
+  return { appended: validParts.length, dbUpserted: dbResult.upserted };
 }
-function createStreamTypedProjector(options) {
-  const provider = String(options.provider ?? "").trim().toLowerCase();
-  return {
-    state: createAssemblerState(options.requestId, options.source ?? "query_main"),
-    provider,
-    supportsRichToolResult: typeof options.supportsRichToolResult === "boolean" ? options.supportsRichToolResult : supportsRichToolResultByProvider(provider),
-    richToolResultBlockCount: 0,
-    downgradedToolResultCount: 0
-  };
+function readTypedPartsByRequest(options) {
+  return readTypedPartsByRequestFromDb({
+    dbFilePath: options.dbFilePath,
+    requestId: options.requestId
+  });
 }
-function consumeProjectorCompatibilityMetrics(projector) {
-  const snapshot = {
-    provider: projector.provider || "unknown",
-    supportsRichToolResult: projector.supportsRichToolResult,
-    richToolResultBlockCount: projector.richToolResultBlockCount,
-    downgradedToolResultCount: projector.downgradedToolResultCount
-  };
-  projector.richToolResultBlockCount = 0;
-  projector.downgradedToolResultCount = 0;
-  return snapshot;
+function isLifecycleStepPart(part) {
+  return part.partType === "step_start" || part.partType === "step_finish";
 }
-function projectMessageToTypedParts(projector, message) {
-  if (!message || typeof message !== "object") return [];
-  if (message.type === "assistant") {
-    projectAssistantMessage(projector.state, message);
-  } else if (message.type === "user") {
-    projectUserToolResult(projector, message);
-  } else if (message.type === "progress") {
-    projectProgressMessage(projector.state, message);
-  }
-  return flushTypedParts(projector.state);
+function readStepTypedPartsByRequest(options) {
+  const parts = readTypedPartsByRequest(options);
+  return parts.filter(isLifecycleStepPart);
 }
-function projectLifecycleEventsToTypedParts(projector, events) {
-  if (!Array.isArray(events) || events.length === 0) return [];
+function readTypedPartsByRequestFromDb(options) {
+  const dbFilePath = options.dbFilePath ?? getStreamTypedDbFilePath();
+  if (!existsSync17(dbFilePath)) return [];
+  const Database = getDatabaseCtorOrThrow();
+  const db = new Database(dbFilePath);
+  ensureDbSchema(db);
+  const statement = options.requestId ? db.prepare(`
+        SELECT data_json
+        FROM part
+        WHERE request_id = ?1
+        ORDER BY timestamp ASC, id ASC
+      `) : db.prepare(`
+        SELECT data_json
+        FROM part
+        ORDER BY timestamp ASC, id ASC
+      `);
+  const rows = options.requestId ? statement.all(options.requestId) : statement.all();
   const parts = [];
-  for (const event of events) {
-    if (!event || typeof event !== "object") continue;
-    if (event.eventType === "start-step") {
-      parts.push(
-        createStepStartPart({
-          requestId: projector.state.requestId,
-          stepId: event.stepId,
-          timeStart: event.timestamp,
-          source: projector.state.source
-        })
-      );
+  for (const row of rows) {
+    try {
+      const parsed = JSON.parse(String(row.data_json ?? ""));
+      if (!validateTypedPartRecord(parsed)) continue;
+      parts.push(parsed);
+    } catch {
       continue;
     }
-    if (event.eventType === "finish-step") {
-      parts.push(
-        createStepFinishPart({
-          requestId: projector.state.requestId,
-          stepId: event.stepId,
-          reason: event.reason,
-          completedAt: event.completedAt,
-          costUSD: event.costUSD,
-          ...event.tokens ? { tokens: event.tokens } : {},
-          source: projector.state.source
-        })
-      );
-    }
   }
+  db.close();
   return parts;
 }
 
-// src/services/ai/streamTyped/skeletonReader.ts
-function pushText(parts, value) {
-  const text = String(value ?? "").trim();
-  if (!text) return;
-  parts.push({ type: "text", text });
-}
-function getToolState(part) {
-  if (part.partType !== "tool") return null;
-  const payload = part.payload;
-  return payload?.state ?? null;
-}
-function buildSkeletonBlocksFromTypedParts(input) {
-  const result = [];
-  for (const part of input.parts) {
-    if (!part || typeof part !== "object") continue;
-    if (part.partType === "text") {
-      pushText(result, part.payload?.text);
-      continue;
-    }
-    if (part.partType === "reasoning" && input.role === "assistant") {
-      const reasoning = String(part.payload?.text ?? "").trim();
-      if (!reasoning) continue;
-      result.push({ type: "reasoning", reasoning });
-      continue;
-    }
-    if (part.partType !== "tool") continue;
-    const payload = part.payload;
-    const state = getToolState(part);
-    const status = String(
-      state?.status ?? payload?.status ?? ""
-    ).toLowerCase();
-    const toolName = String(payload?.toolName ?? "").trim();
-    const toolCallId = String(payload?.toolCallId ?? "").trim();
-    if (!toolCallId) continue;
-    if (input.role === "assistant") {
-      if (status !== "pending") continue;
-      result.push({
-        type: "tool_use",
-        id: toolCallId,
-        name: toolName || "unknown",
-        input: state?.input && typeof state.input === "object" ? state.input : payload?.input && typeof payload.input === "object" ? payload.input : {}
-      });
-      continue;
-    }
-    if (status !== "completed" && status !== "failed" && status !== "interrupted") {
-      continue;
-    }
-    const content = String(
-      state?.output ?? state?.error ?? state?.reason ?? payload?.outputText ?? ""
-    ).trim();
-    result.push({
-      type: "tool_result",
-      tool_use_id: toolCallId,
-      content,
-      ...status === "failed" ? { is_error: true } : {}
-    });
-  }
-  return result;
+// src/services/ai/streamTyped/index.ts
+var streamTypedBuffer = /* @__PURE__ */ new Map();
+function emitTypedPart(event) {
+  const requestId = String(event.requestId || "").trim();
+  if (!requestId) return;
+  const current = streamTypedBuffer.get(requestId) ?? [];
+  current.push(event.part);
+  streamTypedBuffer.set(requestId, current);
 }
-
-// src/utils/session/fileRecoveryCore.ts
-var MAX_FILES_TO_RECOVER = 5;
-var MAX_TOKENS_PER_FILE = 1e4;
-var MAX_TOTAL_FILE_TOKENS = 5e4;
-async function selectAndReadFiles() {
-  const importantFiles = fileFreshnessService.getImportantFiles(MAX_FILES_TO_RECOVER);
-  const results = [];
-  let totalTokens = 0;
-  for (const fileInfo of importantFiles) {
-    try {
-      const { content } = readTextContent(fileInfo.path);
-      const estimatedTokens = Math.ceil(content.length * 0.25);
-      let finalContent = content;
-      let truncated = false;
-      if (estimatedTokens > MAX_TOKENS_PER_FILE) {
-        const maxChars = Math.floor(MAX_TOKENS_PER_FILE / 0.25);
-        finalContent = content.substring(0, maxChars);
-        truncated = true;
-      }
-      const finalTokens = Math.min(estimatedTokens, MAX_TOKENS_PER_FILE);
-      if (totalTokens + finalTokens > MAX_TOTAL_FILE_TOKENS) {
-        break;
-      }
-      totalTokens += finalTokens;
-      results.push({
-        path: fileInfo.path,
-        content: finalContent,
-        tokens: finalTokens,
-        truncated
-      });
-    } catch (error) {
-      logError(error);
-      debug.warn("FILE_RECOVERY_READ_FAILED", {
-        path: fileInfo.path,
-        error: error instanceof Error ? error.message : String(error)
-      });
-    }
-  }
-  return results;
+function flushTypedPartBuffer(options) {
+  const requestId = String(options.requestId || "").trim();
+  if (!requestId) return { appended: 0 };
+  const parts = streamTypedBuffer.get(requestId) ?? [];
+  streamTypedBuffer.delete(requestId);
+  return appendTypedParts({
+    parts
+  });
 }
 
 // src/services/ai/streamTyped/replay.ts
@@ -28795,7 +28565,7 @@ function getSummaryContentDiagnostics(content) {
     value: content
   };
 }
-function extractToolResultText2(content) {
+function extractToolResultText(content) {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
   return content.filter((block) => block && typeof block === "object" && block.type === "text").map((block) => String(block.text ?? "")).join("\n");
@@ -28913,7 +28683,7 @@ function emitStreamTypedPartsFromContent(content, requestId) {
       }
       if (type3 === "tool_result") {
         const toolCallId = String(block.tool_use_id ?? `tool-${i}`);
-        const outputText = extractToolResultText2(block.content);
+        const outputText = extractToolResultText(block.content);
         onToolResult(
           {
             toolCallId,
@@ -30031,42 +29801,6 @@ function applyToolOutputLifecycle(messages, options) {
   };
 }
 
-// src/utils/session/singleFactLayer.ts
-function toTextBlockContent(content) {
-  if (typeof content !== "string") return content;
-  return [
-    {
-      type: "text",
-      text: content
-    }
-  ];
-}
-function normalizeMessagesForSingleFactLayer(messages) {
-  if (!Array.isArray(messages) || messages.length === 0) return messages;
-  return messages.map((message) => {
-    if (!message || typeof message !== "object") return message;
-    if (message.type !== "user" && message.type !== "assistant") return message;
-    const currentContent = message?.message?.content;
-    const nextContent = toTextBlockContent(currentContent);
-    const shouldUpdateUserOptions = message.type === "user";
-    const hasChanges = nextContent !== currentContent || shouldUpdateUserOptions && message?.options?.contentInputPath !== "blocks";
-    if (!hasChanges) return message;
-    return {
-      ...message,
-      message: {
-        ...message.message ?? {},
-        content: nextContent
-      },
-      ...shouldUpdateUserOptions ? {
-        options: {
-          ...message.options ?? {},
-          contentInputPath: "blocks"
-        }
-      } : {}
-    };
-  });
-}
-
 // src/utils/session/toolOutputLifecycleMetricsDraft.ts
 function safeRate(numerator, denominator) {
   if (!Number.isFinite(numerator) || !Number.isFinite(denominator) || denominator <= 0) {
@@ -30353,7 +30087,686 @@ function createQueryLifecycleEvents(options) {
   };
 }
 
-// src/app/query.ts
+// src/app/sessionContext.ts
+var SessionContext = class {
+  state = "idle";
+  interrupted = false;
+  inFlightToolUseIDs = /* @__PURE__ */ new Set();
+  setRunning() {
+    if (this.state !== "closed") {
+      this.state = "running";
+    }
+  }
+  setIdle() {
+    if (this.state !== "closed") {
+      this.state = "idle";
+      this.interrupted = false;
+    }
+  }
+  setInterrupted() {
+    if (this.state !== "closed") {
+      this.state = "interrupted";
+      this.interrupted = true;
+    }
+  }
+  setErrored() {
+    if (this.state !== "closed") {
+      this.state = "errored";
+    }
+  }
+  setClosed() {
+    this.state = "closed";
+    this.inFlightToolUseIDs.clear();
+  }
+  startTool(toolUseID) {
+    if (toolUseID) this.inFlightToolUseIDs.add(toolUseID);
+  }
+  finishTool(toolUseID) {
+    if (toolUseID) this.inFlightToolUseIDs.delete(toolUseID);
+  }
+  getSnapshot() {
+    return {
+      state: this.state,
+      inFlightToolUseIDs: [...this.inFlightToolUseIDs],
+      interrupted: this.interrupted
+    };
+  }
+};
+
+// src/app/sessionEngine.ts
+var DefaultSessionEngine = class _DefaultSessionEngine {
+  constructor(runner, initialInput) {
+    this.runner = runner;
+    this.currentInput = initialInput;
+  }
+  state = "idle";
+  currentInput;
+  generator;
+  async send(input) {
+    if (this.state === "closed") {
+      throw new Error("invalid_transition: closed -> send");
+    }
+    this.currentInput = input;
+    this.generator = this.runner(input);
+    this.state = "running";
+  }
+  async *stream() {
+    if (!this.generator) {
+      return;
+    }
+    try {
+      for await (const message of this.generator) {
+        yield message;
+      }
+      if (this.state === "running") {
+        this.state = "idle";
+      }
+    } catch (error) {
+      this.state = "errored";
+      throw error;
+    }
+  }
+  async resume(input) {
+    if (this.state === "closed") {
+      throw new Error("invalid_transition: closed -> resume");
+    }
+    if (input !== void 0) {
+      this.currentInput = input;
+    }
+    if (this.currentInput === void 0) {
+      throw new Error("invalid_transition: missing_input -> resume");
+    }
+    this.generator = this.runner(this.currentInput);
+    this.state = "running";
+  }
+  fork() {
+    return new _DefaultSessionEngine(this.runner, this.currentInput);
+  }
+  async interrupt() {
+    if (this.state === "running") {
+      this.state = "interrupted";
+    }
+  }
+  async close() {
+    this.state = "closed";
+  }
+  getState() {
+    return this.state;
+  }
+};
+function createSession(args) {
+  return new DefaultSessionEngine(args.runner, args.initialInput);
+}
+async function* runSessionWithEngine(args) {
+  args.sessionContext?.setRunning();
+  const session = createSession({
+    runner: args.runner
+  });
+  await session.send(args.input);
+  try {
+    yield* session.stream();
+    args.sessionContext?.setIdle();
+  } catch (error) {
+    args.sessionContext?.setErrored();
+    throw error;
+  } finally {
+    await session.close();
+  }
+}
+function logQuerySessionRolloutApplied(args) {
+  args.logUserFriendly("THREE_LAYER_ROLLOUT_APPLIED", {
+    enabled: args.featureFlags.rolloutEnabled,
+    stage: args.featureFlags.rolloutStage,
+    decision: args.featureFlags.rolloutDecision,
+    reason: args.featureFlags.rolloutReason,
+    percent: args.featureFlags.rolloutPercent,
+    bucket: args.featureFlags.rolloutBucket,
+    typedSessionWriteEnabled: args.featureFlags.typedSessionWriteEnabled,
+    compactionBoundaryEnabled: args.featureFlags.compactionBoundaryEnabled,
+    toolOutputLifecycleEnabled: args.featureFlags.toolOutputLifecycleEnabled,
+    singleFactLayerReadEnabled: args.featureFlags.singleFactLayerReadEnabled
+  });
+}
+function createQuerySessionPrimaryPolicyCoordinator(args) {
+  let currentRequestId = args.initialRequestId ?? "";
+  return {
+    setRequestId: (requestId) => {
+      currentRequestId = requestId;
+    },
+    policy: {
+      onRolloutApplied: (featureFlags) => {
+        logQuerySessionRolloutApplied({
+          featureFlags,
+          logUserFriendly: args.logUserFriendly
+        });
+      },
+      onSkeletonRebuilt: (stats) => {
+        args.logUserFriendly("SINGLE_FACT_LAYER_SKELETON_REBUILT", {
+          role: stats.role,
+          typedPartCount: stats.typedPartCount,
+          skeletonBlockCount: stats.skeletonBlockCount,
+          mapperMode: "rollback_only"
+        });
+      },
+      onCompatibilityMetrics: (compatibilityMetrics) => {
+        args.logUserFriendly("STREAM_TYPED_PROVIDER_COMPATIBILITY", {
+          requestId: currentRequestId,
+          provider: compatibilityMetrics.provider,
+          supportsRichToolResult: compatibilityMetrics.supportsRichToolResult,
+          richToolResultBlockCount: compatibilityMetrics.richToolResultBlockCount,
+          downgradedToolResultCount: compatibilityMetrics.downgradedToolResultCount
+        });
+      }
+    }
+  };
+}
+function resolveQuerySessionFeatureFlags() {
+  return {
+    typedSessionWriteEnabled: true,
+    compactionBoundaryEnabled: false,
+    toolOutputLifecycleEnabled: false,
+    singleFactLayerReadEnabled: true,
+    rolloutEnabled: false,
+    rolloutPercent: 100,
+    rolloutBucket: 0,
+    rolloutStage: "stage_100",
+    rolloutDecision: "keep",
+    rolloutReason: "rollout_disabled"
+  };
+}
+function buildQueryTypedRequestId(args) {
+  if (args.currentRequestId) return `query_${args.currentRequestId}`;
+  if (args.fallbackQueryId) return `query_${args.fallbackQueryId}`;
+  const now = args.now ?? Date.now();
+  const randomSuffix = args.randomSuffix ?? Math.random().toString(36).slice(2, 10);
+  return `query_${now}_${randomSuffix}`;
+}
+function prepareQueryTypedProjector(args) {
+  const modelPointer = args.modelPointer || "main";
+  const modelResolution = args.resolveModelWithInfo(modelPointer);
+  const typedProvider = modelResolution.success ? String(modelResolution.profile?.provider ?? "").trim().toLowerCase() : "unknown";
+  const typedProjector = args.createStreamTypedProjector({
+    requestId: args.requestId,
+    source: "query_main",
+    provider: typedProvider
+  });
+  return { typedProvider, typedProjector };
+}
+function findLatestValue(args) {
+  for (let index = args.items.length - 1; index >= 0; index -= 1) {
+    const value = args.selectValue(args.items[index]);
+    if (value !== void 0 && value !== null) {
+      return value;
+    }
+  }
+  return void 0;
+}
+function prepareQuerySessionExecution(args) {
+  args.onRolloutApplied(args.featureFlags);
+  if (typeof args.toolUseContext.compactionBoundaryEnabled !== "boolean") {
+    args.toolUseContext.compactionBoundaryEnabled = args.featureFlags.compactionBoundaryEnabled;
+  }
+  if (typeof args.toolUseContext.toolOutputLifecycleEnabled !== "boolean") {
+    args.toolUseContext.toolOutputLifecycleEnabled = args.featureFlags.toolOutputLifecycleEnabled;
+  }
+  if (typeof args.toolUseContext.singleFactLayerReadEnabled !== "boolean") {
+    args.toolUseContext.singleFactLayerReadEnabled = args.featureFlags.singleFactLayerReadEnabled;
+  }
+  const messages = args.featureFlags.singleFactLayerReadEnabled ? args.normalizeMessagesForSingleFactLayer(args.messages) : args.messages;
+  return {
+    messages,
+    shouldPersistTypedSession: args.shouldPersistSession && args.featureFlags.typedSessionWriteEnabled,
+    shouldBuildSingleFactSkeleton: args.featureFlags.singleFactLayerReadEnabled
+  };
+}
+function prepareQuerySessionPrimaryPlan(args) {
+  const shouldPersistSession = args.toolUseContext.options?.persistSession !== false && !args.isTestEnv;
+  const fallbackQueryId = findLatestValue({
+    items: args.messages,
+    selectValue: args.extractUserQueryId
+  });
+  const typedRequestId = buildQueryTypedRequestId({
+    currentRequestId: args.currentRequestId,
+    fallbackQueryId
+  });
+  args.policyCoordinator?.setRequestId(typedRequestId);
+  const { typedProjector } = prepareQueryTypedProjector({
+    requestId: typedRequestId,
+    modelPointer: args.toolUseContext.options?.model,
+    resolveModelWithInfo: args.resolveModelWithInfo,
+    createStreamTypedProjector: args.createStreamTypedProjector
+  });
+  const rolloutFlags = resolveQuerySessionFeatureFlags();
+  const {
+    messages: preparedMessages,
+    shouldPersistTypedSession,
+    shouldBuildSingleFactSkeleton
+  } = prepareQuerySessionExecution({
+    featureFlags: rolloutFlags,
+    shouldPersistSession,
+    toolUseContext: args.toolUseContext,
+    messages: args.messages,
+    normalizeMessagesForSingleFactLayer: args.normalizeMessagesForSingleFactLayer,
+    onRolloutApplied: args.policyCoordinator?.policy.onRolloutApplied ?? args.policy?.onRolloutApplied ?? args.onRolloutApplied ?? (() => void 0)
+  });
+  return {
+    preparedMessages,
+    typedRequestId,
+    typedProjector,
+    shouldPersistTypedSession,
+    shouldBuildSingleFactSkeleton
+  };
+}
+async function* runQuerySessionPrimaryStream(args) {
+  const activePolicy = args.policyCoordinator?.policy ?? args.policy;
+  const lifecycleBinding = bindQueryLifecycleBuffer({
+    onQueryLifecycleEvent: args.onQueryLifecycleEvent,
+    setOnQueryLifecycleEvent: args.setOnQueryLifecycleEvent
+  });
+  try {
+    for await (const message of withSessionRunning({
+      sessionContext: args.sessionContext,
+      stream: args.stream
+    })) {
+      processQuerySessionTypedOutput({
+        message,
+        lifecycleEventBuffer: lifecycleBinding.lifecycleEventBuffer,
+        typedProjector: args.typedProjector,
+        shouldPersistTypedSession: args.shouldPersistTypedSession,
+        shouldBuildSingleFactSkeleton: args.shouldBuildSingleFactSkeleton,
+        requestId: args.requestId,
+        projectLifecycleEventsToTypedParts: args.projectLifecycleEventsToTypedParts,
+        projectMessageToTypedParts: args.projectMessageToTypedParts,
+        emitTypedPart: args.emitTypedPart,
+        buildSkeletonBlocksFromTypedParts: args.buildSkeletonBlocksFromTypedParts,
+        onSkeletonRebuilt: activePolicy?.onSkeletonRebuilt ?? args.onSkeletonRebuilt ?? (() => void 0)
+      });
+      yield message;
+    }
+  } finally {
+    lifecycleBinding.dispose();
+    finalizeQuerySessionTypedOutput({
+      shouldPersistTypedSession: args.shouldPersistTypedSession,
+      requestId: args.requestId,
+      typedProjector: args.typedProjector,
+      flushTypedPartBuffer: args.flushTypedPartBuffer,
+      consumeProjectorCompatibilityMetrics: args.consumeProjectorCompatibilityMetrics,
+      onCompatibilityMetrics: activePolicy?.onCompatibilityMetrics ?? args.onCompatibilityMetrics ?? (() => void 0)
+    });
+  }
+}
+async function* runQuerySessionPrimary(args) {
+  const policyCoordinator = createQuerySessionPrimaryPolicyCoordinator({
+    logUserFriendly: args.logUserFriendly
+  });
+  const {
+    preparedMessages,
+    typedRequestId,
+    typedProjector,
+    shouldPersistTypedSession,
+    shouldBuildSingleFactSkeleton
+  } = prepareQuerySessionPrimaryPlan({
+    messages: args.messages,
+    toolUseContext: args.toolUseContext,
+    currentRequestId: args.currentRequestId,
+    isTestEnv: args.isTestEnv,
+    resolveModelWithInfo: args.resolveModelWithInfo,
+    createStreamTypedProjector: args.createStreamTypedProjector,
+    normalizeMessagesForSingleFactLayer: args.normalizeMessagesForSingleFactLayer,
+    extractUserQueryId: args.extractUserQueryId,
+    policyCoordinator
+  });
+  yield* runQuerySessionPrimaryStream({
+    sessionContext: args.sessionContext,
+    onQueryLifecycleEvent: args.onQueryLifecycleEvent,
+    setOnQueryLifecycleEvent: args.setOnQueryLifecycleEvent,
+    stream: () => args.stream(preparedMessages),
+    typedProjector,
+    shouldPersistTypedSession,
+    shouldBuildSingleFactSkeleton,
+    requestId: typedRequestId,
+    projectLifecycleEventsToTypedParts: args.projectLifecycleEventsToTypedParts,
+    projectMessageToTypedParts: args.projectMessageToTypedParts,
+    emitTypedPart: args.emitTypedPart,
+    buildSkeletonBlocksFromTypedParts: args.buildSkeletonBlocksFromTypedParts,
+    flushTypedPartBuffer: args.flushTypedPartBuffer,
+    consumeProjectorCompatibilityMetrics: args.consumeProjectorCompatibilityMetrics,
+    policyCoordinator
+  });
+}
+function createQuerySessionPrimaryAdapterInput(args) {
+  return {
+    messages: args.messages,
+    toolUseContext: args.toolUseContext,
+    currentRequestId: args.currentRequestId,
+    isTestEnv: args.isTestEnv,
+    resolveModelWithInfo: args.hooks.resolveModelWithInfo,
+    createStreamTypedProjector: args.hooks.createStreamTypedProjector,
+    normalizeMessagesForSingleFactLayer: args.hooks.normalizeMessagesForSingleFactLayer,
+    extractUserQueryId: args.extractUserQueryId ?? ((message) => message?.type === "user" ? message.queryId : void 0),
+    logUserFriendly: args.logUserFriendly,
+    sessionContext: args.sessionContext ?? ensureSessionContext(args.toolUseContext),
+    onQueryLifecycleEvent: args.toolUseContext.onQueryLifecycleEvent,
+    setOnQueryLifecycleEvent: (handler) => {
+      args.toolUseContext.onQueryLifecycleEvent = handler;
+    },
+    stream: args.stream,
+    projectLifecycleEventsToTypedParts: args.hooks.projectLifecycleEventsToTypedParts,
+    projectMessageToTypedParts: args.hooks.projectMessageToTypedParts,
+    emitTypedPart: args.hooks.emitTypedPart,
+    buildSkeletonBlocksFromTypedParts: args.hooks.buildSkeletonBlocksFromTypedParts,
+    flushTypedPartBuffer: args.hooks.flushTypedPartBuffer,
+    consumeProjectorCompatibilityMetrics: args.hooks.consumeProjectorCompatibilityMetrics
+  };
+}
+async function* runQuerySessionPrimaryAdapter(args) {
+  const primaryArgs = "hooks" in args ? createQuerySessionPrimaryAdapterInput(args) : args;
+  yield* runSessionWithEngine({
+    input: primaryArgs,
+    runner: runQuerySessionPrimary
+  });
+}
+async function* runQuerySessionCompatAdapter(args) {
+  const primaryInput = createQuerySessionPrimaryAdapterInput(args);
+  yield* runSessionCompatStreams({
+    routingContext: args.routingContext,
+    primaryInput,
+    primaryRunner: runQuerySessionPrimaryAdapter,
+    fallbackInput: args.fallbackInput,
+    fallbackRunner: args.fallbackRunner,
+    toolUseContext: args.toolUseContext
+  });
+}
+async function* runQuerySessionLegacyCompatAdapter(args) {
+  const streamRunner = args.stream;
+  yield* runQuerySessionCompatAdapter({
+    ...args,
+    routingContext: {
+      sessionId: args.toolUseContext.sessionId,
+      agentId: args.toolUseContext.agentId,
+      requestId: args.requestId
+    },
+    fallbackInput: args.messages,
+    fallbackRunner: streamRunner
+  });
+}
+function processQuerySessionTypedOutput(args) {
+  if (!args.shouldPersistTypedSession && !args.shouldBuildSingleFactSkeleton) {
+    return;
+  }
+  const lifecycleParts = args.projectLifecycleEventsToTypedParts(
+    args.typedProjector,
+    args.lifecycleEventBuffer.splice(0)
+  );
+  const parts = [
+    ...lifecycleParts,
+    ...args.projectMessageToTypedParts(args.typedProjector, args.message)
+  ];
+  if (args.shouldPersistTypedSession) {
+    for (const part of parts) {
+      args.emitTypedPart({ requestId: args.requestId, part });
+    }
+  }
+  if (args.shouldBuildSingleFactSkeleton && (args.message.type === "assistant" || args.message.type === "user")) {
+    const skeletonBlocks = args.buildSkeletonBlocksFromTypedParts({
+      role: args.message.type,
+      parts
+    });
+    args.onSkeletonRebuilt({
+      role: args.message.type,
+      typedPartCount: parts.length,
+      skeletonBlockCount: skeletonBlocks.length
+    });
+  }
+}
+function finalizeQuerySessionTypedOutput(args) {
+  if (!args.shouldPersistTypedSession) {
+    return;
+  }
+  args.flushTypedPartBuffer({ requestId: args.requestId });
+  const compatibilityMetrics = args.consumeProjectorCompatibilityMetrics(args.typedProjector);
+  args.onCompatibilityMetrics(compatibilityMetrics);
+}
+function bindQueryLifecycleBuffer(args) {
+  const lifecycleEventBuffer = [];
+  const previousOnQueryLifecycleEvent = args.onQueryLifecycleEvent;
+  args.setOnQueryLifecycleEvent((event) => {
+    previousOnQueryLifecycleEvent?.(event);
+    lifecycleEventBuffer.push(event);
+  });
+  return {
+    lifecycleEventBuffer,
+    dispose: () => {
+      args.setOnQueryLifecycleEvent(previousOnQueryLifecycleEvent);
+    }
+  };
+}
+function ensureSessionContext(carrier) {
+  const sessionContext = carrier.sessionContext ?? new SessionContext();
+  carrier.sessionContext = sessionContext;
+  return sessionContext;
+}
+async function* withSessionRunning(args) {
+  args.sessionContext.setRunning();
+  try {
+    yield* args.stream();
+    args.sessionContext.setIdle();
+  } catch (error) {
+    args.sessionContext.setErrored();
+    throw error;
+  }
+}
+function resolveSessionAdapterControls(replaySeed) {
+  return {
+    enabled: resolveSessionEngineEnabledForCutover(),
+    rolloutPercent: resolveSessionEngineRolloutPercent(),
+    replaySample: resolveSessionEngineReplaySample(replaySeed),
+    forceFallback: resolveSessionEngineForceFallback()
+  };
+}
+async function* runSessionOrchestrator(args) {
+  const controls = resolveSessionAdapterControls(args.replaySeed);
+  const selectedRunner = shouldUseSessionEngineByRollout({
+    enabled: controls.enabled,
+    rolloutPercent: controls.rolloutPercent,
+    replaySample: controls.replaySample,
+    forceFallback: controls.forceFallback
+  }) ? args.sessionRunner : args.fallbackRunner;
+  yield* runSessionWithEngine({
+    input: args.input,
+    runner: selectedRunner
+  });
+}
+function createSessionReplaySeed(context) {
+  return `${context.sessionId ?? ""}:${context.agentId ?? ""}:${context.requestId ?? ""}`;
+}
+async function* runSessionOrchestratorWithContext(args) {
+  const replaySeed = createSessionReplaySeed(args.routingContext);
+  yield* runSessionOrchestrator({
+    input: args.input,
+    replaySeed,
+    sessionRunner: args.sessionRunner,
+    fallbackRunner: args.fallbackRunner
+  });
+}
+async function* runSessionOrchestratorStreams(args) {
+  yield* runSessionOrchestratorWithContext({
+    input: void 0,
+    routingContext: args.routingContext,
+    sessionRunner: async function* () {
+      yield* args.sessionStream();
+    },
+    fallbackRunner: async function* () {
+      yield* args.fallbackStream();
+    }
+  });
+}
+async function* runSessionCompatStreams(args) {
+  const sessionContext = ensureSessionContext(args.toolUseContext);
+  yield* runSessionOrchestratorStreams({
+    routingContext: args.routingContext,
+    sessionStream: async function* () {
+      yield* args.primaryRunner(args.primaryInput);
+    },
+    fallbackStream: async function* () {
+      yield* runSessionWithEngine({
+        input: args.fallbackInput,
+        sessionContext,
+        runner: args.fallbackRunner
+      });
+    }
+  });
+}
+function resolveSessionEngineEnabled() {
+  return process.env.PYB_SESSION_ENGINE_ENABLED === "true";
+}
+function resolveSessionEngineDefaultOn() {
+  return process.env.PYB_SESSION_ENGINE_DEFAULT_ON === "true";
+}
+function resolveSessionEngineEnabledForCutover() {
+  return resolveSessionEngineEnabled() || resolveSessionEngineDefaultOn();
+}
+function resolveSessionEngineForceFallback() {
+  return process.env.PYB_SESSION_ENGINE_FORCE_FALLBACK === "true";
+}
+function resolveSessionEngineRolloutPercent() {
+  const raw = process.env.PYB_SESSION_ENGINE_ROLLOUT_PERCENT;
+  if (!raw) return 0;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed)) return 0;
+  if (parsed < 0) return 0;
+  if (parsed > 100) return 100;
+  return Math.floor(parsed);
+}
+function shouldUseSessionEngineByRollout(args) {
+  if (!args.enabled) return false;
+  if (args.forceFallback) return false;
+  const percent = Math.max(0, Math.min(100, Math.floor(args.rolloutPercent)));
+  const sample2 = Math.max(0, Math.min(99, Math.floor(args.replaySample)));
+  return sample2 < percent;
+}
+function resolveSessionEngineReplaySample(replaySeed) {
+  let hash = 0;
+  for (let index = 0; index < replaySeed.length; index += 1) {
+    hash = hash * 31 + replaySeed.charCodeAt(index) >>> 0;
+  }
+  return hash % 100;
+}
+
+// src/app/queryRuntime/errorMapping.ts
+var ERROR_CLASS_BY_CODE = {
+  ENOENT: "soft",
+  EISDIR: "soft",
+  EACCES: "retryable",
+  EPERM: "retryable",
+  EMFILE: "retryable",
+  ENFILE: "retryable",
+  EIO: "fatal",
+  ENODEV: "fatal",
+  EBUSY: "fatal"
+};
+function formatError(error) {
+  if (!(error instanceof Error)) {
+    return String(error);
+  }
+  const parts = [error.message];
+  if ("stderr" in error && typeof error.stderr === "string") {
+    parts.push(error.stderr);
+  }
+  if ("stdout" in error && typeof error.stdout === "string") {
+    parts.push(error.stdout);
+  }
+  const fullMessage = parts.filter(Boolean).join("\n");
+  if (fullMessage.length <= 1e4) {
+    return fullMessage;
+  }
+  const halfLength = 5e3;
+  const start = fullMessage.slice(0, halfLength);
+  const end = fullMessage.slice(-halfLength);
+  return `${start}
+
+... [${fullMessage.length - 1e4} characters truncated] ...
+
+${end}`;
+}
+function extractErrorCode(error) {
+  if (!error || typeof error !== "object") {
+    return void 0;
+  }
+  if ("code" in error && typeof error.code === "string") {
+    return error.code;
+  }
+  return void 0;
+}
+function summarizeError(detail) {
+  const line = detail.split("\n").map((part) => part.trim()).find((part) => part.length > 0);
+  const summary = line ?? detail.trim();
+  return summary.length > 200 ? summary.slice(0, 200) : summary;
+}
+function getErrorClassFromCode(errorCode) {
+  if (!errorCode) return "soft";
+  return ERROR_CLASS_BY_CODE[errorCode] ?? "soft";
+}
+function createErrorToolResultBlock(args) {
+  const detail = typeof args.errorDetail === "string" ? args.errorDetail : typeof args.content === "string" ? args.content : JSON.stringify(args.content);
+  const errorCode = args.errorCode;
+  const errorClass = args.errorClass ?? getErrorClassFromCode(errorCode);
+  const summary = detail ? summarizeError(detail) : "";
+  return {
+    type: "tool_result",
+    content: args.content,
+    is_error: true,
+    tool_use_id: args.toolUseId,
+    error_class: errorClass,
+    ...errorCode ? { error_code: errorCode } : {},
+    ...summary ? { error_summary: summary } : {},
+    ...detail ? { error_detail: detail } : {},
+    ...args.rootToolUseId ? { root_tool_use_id: args.rootToolUseId } : {}
+  };
+}
+
+// src/app/queryRuntime/toolInput.ts
+function normalizeToolInput(tool, input) {
+  switch (tool) {
+    case BashTool: {
+      const parsed = BashTool.inputSchema.parse(input);
+      const {
+        command: command4,
+        timeout,
+        description: description3,
+        run_in_background,
+        dangerouslyDisableSandbox
+      } = parsed;
+      return {
+        command: command4.replace(`cd ${getCwd()} && `, "").replace(/\\\\;/g, "\\;"),
+        ...timeout !== void 0 ? { timeout } : {},
+        ...description3 ? { description: description3 } : {},
+        ...run_in_background ? { run_in_background } : {},
+        ...dangerouslyDisableSandbox ? { dangerouslyDisableSandbox } : {}
+      };
+    }
+    default:
+      return input;
+  }
+}
+function buildRetryEntryKey(parts) {
+  return parts.map((part) => typeof part === "string" ? part.trim() : "").filter((part) => part.length > 0).join(":");
+}
+function preprocessToolInput(tool, input) {
+  if (tool.name === "TaskOutput") {
+    const task_id = typeof input.task_id === "string" && input.task_id || typeof input.agentId === "string" && String(input.agentId) || typeof input.bash_id === "string" && String(input.bash_id) || "";
+    const block = typeof input.block === "boolean" ? input.block : true;
+    const timeout = typeof input.timeout === "number" ? input.timeout : typeof input.wait_up_to === "number" ? Number(input.wait_up_to) * 1e3 : void 0;
+    return {
+      task_id,
+      block,
+      ...timeout !== void 0 ? { timeout } : {}
+    };
+  }
+  return input;
+}
+
+// src/app/queryRuntime/lifecycle.ts
 var TOOL_PROGRESS_OPEN_TAG = ["<tool", "-progress>"].join("");
 var TOOL_PROGRESS_CLOSE_TAG = ["</tool", "-progress>"].join("");
 function inferIsNewSessionForAutoCompact(messages) {
@@ -30365,6 +30778,565 @@ function inferIsNewSessionForAutoCompact(messages) {
   );
   return !hasCompactionMarker && naturalMessages.length <= 2;
 }
+
+// src/services/ai/streamTyped/projector.ts
+function supportsRichToolResultByProvider(provider) {
+  return String(provider ?? "").trim().toLowerCase() === "anthropic";
+}
+function extractToolResultText2(content) {
+  if (typeof content === "string") return { text: content, hasNonTextBlock: false };
+  if (!Array.isArray(content)) return { text: "", hasNonTextBlock: false };
+  let hasNonTextBlock = false;
+  const text = content.filter((block) => {
+    if (!block || typeof block !== "object") return false;
+    if (block.type === "text") return true;
+    hasNonTextBlock = true;
+    return false;
+  }).map((block) => String(block.text ?? "")).join("\n");
+  return { text, hasNonTextBlock };
+}
+function extractTaggedText(text, tagName) {
+  const normalized = String(text ?? "").trim();
+  if (!normalized.startsWith(`<${tagName}>`)) return null;
+  const pattern = new RegExp(`<${tagName}>([\\s\\S]*?)<\\/${tagName}>`, "i");
+  const match = normalized.match(pattern);
+  const content = String(match?.[1] ?? "").trim();
+  return content.length > 0 ? content : null;
+}
+function projectAssistantMessage(state, message) {
+  const content = message?.message?.content;
+  if (!Array.isArray(content)) return;
+  for (let i = 0; i < content.length; i += 1) {
+    const block = content[i];
+    if (!block || typeof block !== "object") continue;
+    const type3 = String(block.type ?? "");
+    if (type3 === "text") {
+      const text = String(block.text ?? "");
+      const toolProgressText = extractTaggedText(text, "tool-progress");
+      if (toolProgressText) {
+        state.parts.push(
+          createSystemEventPart({
+            requestId: state.requestId,
+            eventType: "tool_progress",
+            text: toolProgressText,
+            source: state.source
+          })
+        );
+      }
+      const localStdoutText = extractTaggedText(text, "local-command-stdout");
+      if (localStdoutText) {
+        state.parts.push(
+          createSystemEventPart({
+            requestId: state.requestId,
+            eventType: "local_command_stdout",
+            text: localStdoutText,
+            source: state.source
+          })
+        );
+      }
+      const localStderrText = extractTaggedText(text, "local-command-stderr");
+      if (localStderrText) {
+        state.parts.push(
+          createSystemEventPart({
+            requestId: state.requestId,
+            eventType: "local_command_stderr",
+            text: localStderrText,
+            source: state.source
+          })
+        );
+      }
+      onTextStart({ textId: `text-${i}` }, state);
+      onTextDelta({ textId: `text-${i}`, text }, state);
+      onTextEnd({ textId: `text-${i}` }, state);
+      continue;
+    }
+    if (type3 === "thinking" || type3 === "reasoning") {
+      const text = String(block.thinking ?? block.reasoning ?? "");
+      onReasoningStart({ reasoningId: `reasoning-${i}` }, state);
+      onReasoningDelta({ reasoningId: `reasoning-${i}`, text }, state);
+      onReasoningEnd({ reasoningId: `reasoning-${i}` }, state);
+      continue;
+    }
+    if (type3 === "tool_use" || type3 === "server_tool_use" || type3 === "mcp_tool_use") {
+      const toolCallId = String(block.id ?? `tool-${i}`);
+      const toolName = String(block.name ?? "unknown");
+      onToolCall({ toolCallId, toolName }, state);
+    }
+  }
+}
+function projectUserToolResult(projector, message) {
+  const state = projector.state;
+  const content = message?.message?.content;
+  if (!Array.isArray(content)) return;
+  for (let i = 0; i < content.length; i += 1) {
+    const block = content[i];
+    if (!block || typeof block !== "object") continue;
+    if (block.type !== "tool_result") continue;
+    const toolCallId = String(block.tool_use_id ?? `tool-${i}`);
+    const extracted = extractToolResultText2(block.content);
+    if (extracted.hasNonTextBlock) {
+      projector.richToolResultBlockCount += 1;
+      if (!projector.supportsRichToolResult) {
+        projector.downgradedToolResultCount += 1;
+      }
+    }
+    onToolResult(
+      {
+        toolCallId,
+        status: block.is_error ? "failed" : "completed",
+        outputText: extracted.text
+      },
+      state
+    );
+  }
+}
+function projectProgressMessage(state, message) {
+  const toolCallId = String(message?.toolUseID ?? "").trim();
+  if (!toolCallId) return;
+  const content = String(
+    message?.content?.message?.content?.find?.((block) => block?.type === "text")?.text ?? ""
+  );
+  const extractedProgressText = extractTaggedText(content, "tool-progress");
+  const normalizedContent = content.trim();
+  const toolProgressText = extractedProgressText ?? (normalizedContent.length > 0 ? normalizedContent : void 0);
+  if (toolProgressText) {
+    state.parts.push(
+      createSystemEventPart({
+        requestId: state.requestId,
+        eventType: "tool_progress",
+        text: toolProgressText,
+        toolCallId,
+        source: state.source
+      })
+    );
+  }
+  onToolResult(
+    {
+      toolCallId,
+      status: "running",
+      outputText: content || void 0
+    },
+    state
+  );
+}
+function createStreamTypedProjector(options) {
+  const provider = String(options.provider ?? "").trim().toLowerCase();
+  return {
+    state: createAssemblerState(options.requestId, options.source ?? "query_main"),
+    provider,
+    supportsRichToolResult: typeof options.supportsRichToolResult === "boolean" ? options.supportsRichToolResult : supportsRichToolResultByProvider(provider),
+    richToolResultBlockCount: 0,
+    downgradedToolResultCount: 0
+  };
+}
+function consumeProjectorCompatibilityMetrics(projector) {
+  const snapshot = {
+    provider: projector.provider || "unknown",
+    supportsRichToolResult: projector.supportsRichToolResult,
+    richToolResultBlockCount: projector.richToolResultBlockCount,
+    downgradedToolResultCount: projector.downgradedToolResultCount
+  };
+  projector.richToolResultBlockCount = 0;
+  projector.downgradedToolResultCount = 0;
+  return snapshot;
+}
+function projectMessageToTypedParts(projector, message) {
+  if (!message || typeof message !== "object") return [];
+  if (message.type === "assistant") {
+    projectAssistantMessage(projector.state, message);
+  } else if (message.type === "user") {
+    projectUserToolResult(projector, message);
+  } else if (message.type === "progress") {
+    projectProgressMessage(projector.state, message);
+  }
+  return flushTypedParts(projector.state);
+}
+function projectLifecycleEventsToTypedParts(projector, events) {
+  if (!Array.isArray(events) || events.length === 0) return [];
+  const parts = [];
+  for (const event of events) {
+    if (!event || typeof event !== "object") continue;
+    if (event.eventType === "start-step") {
+      parts.push(
+        createStepStartPart({
+          requestId: projector.state.requestId,
+          stepId: event.stepId,
+          timeStart: event.timestamp,
+          source: projector.state.source
+        })
+      );
+      continue;
+    }
+    if (event.eventType === "finish-step") {
+      parts.push(
+        createStepFinishPart({
+          requestId: projector.state.requestId,
+          stepId: event.stepId,
+          reason: event.reason,
+          completedAt: event.completedAt,
+          costUSD: event.costUSD,
+          ...event.tokens ? { tokens: event.tokens } : {},
+          source: projector.state.source
+        })
+      );
+    }
+  }
+  return parts;
+}
+
+// src/services/ai/streamTyped/skeletonReader.ts
+function pushText(parts, value) {
+  const text = String(value ?? "").trim();
+  if (!text) return;
+  parts.push({ type: "text", text });
+}
+function getToolState(part) {
+  if (part.partType !== "tool") return null;
+  const payload = part.payload;
+  return payload?.state ?? null;
+}
+function buildSkeletonBlocksFromTypedParts(input) {
+  const result = [];
+  for (const part of input.parts) {
+    if (!part || typeof part !== "object") continue;
+    if (part.partType === "text") {
+      pushText(result, part.payload?.text);
+      continue;
+    }
+    if (part.partType === "reasoning" && input.role === "assistant") {
+      const reasoning = String(part.payload?.text ?? "").trim();
+      if (!reasoning) continue;
+      result.push({ type: "reasoning", reasoning });
+      continue;
+    }
+    if (part.partType !== "tool") continue;
+    const payload = part.payload;
+    const state = getToolState(part);
+    const status = String(
+      state?.status ?? payload?.status ?? ""
+    ).toLowerCase();
+    const toolName = String(payload?.toolName ?? "").trim();
+    const toolCallId = String(payload?.toolCallId ?? "").trim();
+    if (!toolCallId) continue;
+    if (input.role === "assistant") {
+      if (status !== "pending") continue;
+      result.push({
+        type: "tool_use",
+        id: toolCallId,
+        name: toolName || "unknown",
+        input: state?.input && typeof state.input === "object" ? state.input : payload?.input && typeof payload.input === "object" ? payload.input : {}
+      });
+      continue;
+    }
+    if (status !== "completed" && status !== "failed" && status !== "interrupted") {
+      continue;
+    }
+    const content = String(
+      state?.output ?? state?.error ?? state?.reason ?? payload?.outputText ?? ""
+    ).trim();
+    result.push({
+      type: "tool_result",
+      tool_use_id: toolCallId,
+      content,
+      ...status === "failed" ? { is_error: true } : {}
+    });
+  }
+  return result;
+}
+
+// src/utils/session/singleFactLayer.ts
+function toTextBlockContent(content) {
+  if (typeof content !== "string") return content;
+  return [
+    {
+      type: "text",
+      text: content
+    }
+  ];
+}
+function normalizeMessagesForSingleFactLayer(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) return messages;
+  return messages.map((message) => {
+    if (!message || typeof message !== "object") return message;
+    if (message.type !== "user" && message.type !== "assistant") return message;
+    const currentContent = message?.message?.content;
+    const nextContent = toTextBlockContent(currentContent);
+    const shouldUpdateUserOptions = message.type === "user";
+    const hasChanges = nextContent !== currentContent || shouldUpdateUserOptions && message?.options?.contentInputPath !== "blocks";
+    if (!hasChanges) return message;
+    return {
+      ...message,
+      message: {
+        ...message.message ?? {},
+        content: nextContent
+      },
+      ...shouldUpdateUserOptions ? {
+        options: {
+          ...message.options ?? {},
+          contentInputPath: "blocks"
+        }
+      } : {}
+    };
+  });
+}
+
+// src/app/queryRuntime/sessionAdapterHooks.ts
+var querySessionPrimaryAdapterHooksInline = {
+  resolveModelWithInfo: (modelPointer) => getModelManager().resolveModelWithInfo(modelPointer),
+  createStreamTypedProjector,
+  normalizeMessagesForSingleFactLayer,
+  projectLifecycleEventsToTypedParts,
+  projectMessageToTypedParts,
+  emitTypedPart,
+  buildSkeletonBlocksFromTypedParts,
+  flushTypedPartBuffer,
+  consumeProjectorCompatibilityMetrics
+};
+
+// src/app/queryRuntime/toolExecution.ts
+function buildToolHookBaseArgs(context, toolUseId) {
+  return {
+    retryEntryKey: buildRetryEntryKey([
+      context.sessionId,
+      context.parentSessionId,
+      context.childSessionId,
+      context.agentId,
+      toolUseId
+    ]),
+    retryAttempt: 0,
+    sessionId: context.sessionId,
+    parentSessionId: context.parentSessionId,
+    childSessionId: context.childSessionId,
+    agentId: context.agentId,
+    permissionMode: context.options?.toolPermissionContext?.mode,
+    cwd: getCwd(),
+    transcriptPath: getHookTranscriptPath(context),
+    safeMode: context.options?.safeMode ?? false,
+    signal: context.abortController.signal
+  };
+}
+function applyHookOutcomeSideEffects(context, hookOutcome) {
+  if (hookOutcome.systemMessages && hookOutcome.systemMessages.length > 0) {
+    queueHookSystemMessages(context, hookOutcome.systemMessages);
+  }
+  if (hookOutcome.additionalContexts && hookOutcome.additionalContexts.length > 0) {
+    queueHookAdditionalContexts(context, hookOutcome.additionalContexts);
+  }
+}
+function resolvePermissionExecutionPlan(args) {
+  const effectiveShouldSkipPermissionCheck = args.hookPermissionDecision === "allow" ? true : args.hookPermissionDecision === "ask" ? false : args.shouldSkipPermissionCheck;
+  const permissionContextForCall = args.hookPermissionDecision === "ask" && args.context.options?.toolPermissionContext && args.context.options.toolPermissionContext.mode !== "default" ? {
+    ...args.context,
+    options: {
+      ...args.context.options,
+      toolPermissionContext: {
+        ...args.context.options.toolPermissionContext,
+        mode: "default"
+      }
+    }
+  } : args.context;
+  return {
+    effectiveShouldSkipPermissionCheck,
+    permissionContextForCall
+  };
+}
+function resolveToolResultAssistantContent(args) {
+  const rawContent = args.resultForAssistant ?? args.renderResultForAssistant(args.resultData);
+  const shouldTruncate = typeof rawContent === "string" && shouldApplyToolOutputTruncation(args.resultData);
+  return typeof rawContent === "string" && shouldTruncate ? truncateToolOutput(rawContent, {
+    permissionMode: args.permissionMode
+  }).content : rawContent;
+}
+function toStructuredToolResultMessages(newMessages) {
+  if (!Array.isArray(newMessages)) {
+    return [];
+  }
+  return newMessages.filter(
+    (message) => Boolean(message) && typeof message === "object" && "type" in message
+  );
+}
+function buildToolResultEnvelope(args) {
+  return {
+    blocks: [
+      {
+        type: "tool_result",
+        content: args.content,
+        tool_use_id: args.toolUseId
+      }
+    ],
+    toolUseResult: {
+      data: args.resultData,
+      resultForAssistant: args.content,
+      ...Array.isArray(args.newMessages) ? { newMessages: args.newMessages } : {},
+      ...args.contextModifier ? { contextModifier: args.contextModifier } : {}
+    }
+  };
+}
+function createToolExecutionErrorBlock(args) {
+  const content = args.mode === "full" ? formatError(args.error) : `Tool execution failed: ${args.error instanceof Error ? args.error.message : String(args.error)}`;
+  return createErrorToolResultBlock({
+    toolUseId: args.toolUseId,
+    content,
+    errorCode: extractErrorCode(args.error)
+  });
+}
+function resolveWarningText(warnings) {
+  if (!Array.isArray(warnings) || warnings.length === 0) {
+    return void 0;
+  }
+  const normalized = warnings.filter((item) => typeof item === "string").map((item) => item.trim()).filter((item) => item.length > 0);
+  if (normalized.length === 0) {
+    return void 0;
+  }
+  return normalized.join("\n");
+}
+function normalizeProgressPayload(args) {
+  return {
+    normalizedMessages: Array.isArray(args.normalizedMessages) ? args.normalizedMessages : [],
+    tools: Array.isArray(args.tools) ? args.tools : []
+  };
+}
+function resolveInitialInputValidationMessage(args) {
+  if (args.toolName === "Read" && Object.keys(args.preprocessedInput).length === 0) {
+    return `Error: The Read tool requires a 'file_path' parameter to specify which file to read. Please provide the absolute path to the file you want to read. For example: {"file_path": "/path/to/file.txt"}`;
+  }
+  return `InputValidationError: ${args.validationMessage}`;
+}
+function createInputValidationErrorBlock(args) {
+  return createErrorToolResultBlock({
+    toolUseId: args.toolUseId,
+    content: args.content,
+    errorCode: "INPUT_VALIDATION",
+    errorClass: "soft"
+  });
+}
+function createHookBlockedErrorBlock(args) {
+  return createErrorToolResultBlock({
+    toolUseId: args.toolUseId,
+    content: args.content,
+    errorCode: "HOOK_BLOCKED",
+    errorClass: "soft"
+  });
+}
+function createPermissionDeniedErrorBlock(args) {
+  return createErrorToolResultBlock({
+    toolUseId: args.toolUseId,
+    content: args.content,
+    errorCode: "PERMISSION_DENIED",
+    errorClass: "soft"
+  });
+}
+async function resolveHookUpdatedInput(args) {
+  if (!args.updatedInput) {
+    return { kind: "unchanged", normalizedInput: args.normalizedInput };
+  }
+  const merged = { ...args.normalizedInput, ...args.updatedInput };
+  const parsed = args.tool.inputSchema.safeParse(merged);
+  if (!parsed.success) {
+    return {
+      kind: "invalid",
+      message: `Hook updatedInput failed validation: ${parsed.error.message}`
+    };
+  }
+  const normalizedInput = parsed.data;
+  const isValidUpdate = await args.tool.validateInput?.(
+    normalizedInput,
+    args.context
+  );
+  if (isValidUpdate?.result === false) {
+    return { kind: "invalid", message: isValidUpdate.message };
+  }
+  return { kind: "updated", normalizedInput };
+}
+function buildResultDispatchItems(args) {
+  const items = [];
+  const warningText = resolveWarningText(args.postWarnings);
+  if (warningText) {
+    items.push({
+      kind: "warning_progress",
+      warningText,
+      tools: args.defaultTools
+    });
+  }
+  const userMessage = buildToolResultEnvelope({
+    toolUseId: args.toolUseId,
+    content: args.content,
+    resultData: args.resultData,
+    newMessages: args.newMessages,
+    contextModifier: args.contextModifier
+  });
+  items.push({
+    kind: "user_message",
+    blocks: userMessage.blocks,
+    toolUseResult: userMessage.toolUseResult
+  });
+  const structuredMessages = toStructuredToolResultMessages(args.newMessages);
+  for (const message of structuredMessages) {
+    items.push({
+      kind: "structured_message",
+      message
+    });
+  }
+  return items;
+}
+function buildRunningProgressPayload(args) {
+  const normalizedPayload = normalizeProgressPayload({
+    normalizedMessages: args.normalizedMessages,
+    tools: args.tools
+  });
+  return {
+    content: args.content,
+    normalizedMessages: normalizedPayload.normalizedMessages,
+    tools: normalizedPayload.tools.length > 0 ? normalizedPayload.tools : args.defaultTools
+  };
+}
+function buildWarningDispatchItems(args) {
+  const warningText = resolveWarningText(args.warnings);
+  if (!warningText) {
+    return [];
+  }
+  return [
+    {
+      kind: "warning_progress",
+      warningText,
+      tools: args.defaultTools
+    }
+  ];
+}
+async function resolvePermissionResult(args) {
+  if (args.effectiveShouldSkipPermissionCheck) {
+    return { result: true };
+  }
+  return args.canUseTool(
+    args.tool,
+    args.normalizedInput,
+    { ...args.permissionContextForCall, toolUseId: args.toolUseId },
+    args.assistantMessage
+  );
+}
+async function resolvePermissionCheckOutcome(args) {
+  const { effectiveShouldSkipPermissionCheck, permissionContextForCall } = resolvePermissionExecutionPlan({
+    context: args.context,
+    hookPermissionDecision: args.hookPermissionDecision,
+    shouldSkipPermissionCheck: args.shouldSkipPermissionCheck
+  });
+  const permissionResult = await resolvePermissionResult({
+    effectiveShouldSkipPermissionCheck,
+    canUseTool: args.canUseTool,
+    tool: args.tool,
+    normalizedInput: args.normalizedInput,
+    permissionContextForCall,
+    toolUseId: args.toolUseId,
+    assistantMessage: args.assistantMessage
+  });
+  return {
+    effectiveShouldSkipPermissionCheck,
+    permissionContextForCall,
+    permissionResult
+  };
+}
+
+// src/app/query.ts
 function isToolUseLikeBlock(block) {
   return block && typeof block === "object" && (block.type === "tool_use" || block.type === "server_tool_use" || block.type === "mcp_tool_use");
 }
@@ -30638,121 +31610,28 @@ async function queryWithBinaryFeedback(toolUseContext, getAssistantResponse, get
   return await getBinaryFeedbackResponse(m1, m2);
 }
 async function* query(messages, systemPrompt, context, canUseTool, toolUseContext, getBinaryFeedbackResponse) {
-  const shouldPersistSession = toolUseContext.options?.persistSession !== false && process.env.NODE_ENV !== "test";
-  const typedRequestId = (() => {
-    const currentRequestId = getCurrentRequest()?.id;
-    if (currentRequestId) return `query_${currentRequestId}`;
-    const lastUser = [...messages].reverse().find((item) => item?.type === "user" && item?.queryId);
-    const fallbackQueryId = lastUser?.queryId;
-    if (fallbackQueryId) return `query_${fallbackQueryId}`;
-    return `query_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
-  })();
-  const modelPointer = toolUseContext.options.model || "main";
-  const modelResolution = getModelManager().resolveModelWithInfo(modelPointer);
-  const typedProvider = modelResolution.success ? String(modelResolution.profile?.provider ?? "").trim().toLowerCase() : "unknown";
-  const typedProjector = createStreamTypedProjector({
-    requestId: typedRequestId,
-    source: "query_main",
-    provider: typedProvider
-  });
-  const rolloutFlags = {
-    typedSessionWriteEnabled: true,
-    compactionBoundaryEnabled: false,
-    toolOutputLifecycleEnabled: false,
-    singleFactLayerReadEnabled: true,
-    rolloutEnabled: false,
-    rolloutPercent: 100,
-    rolloutBucket: 0,
-    rolloutStage: "stage_100",
-    rolloutDecision: "keep",
-    rolloutReason: "rollout_disabled"
-  };
-  const shouldPersistTypedSession = shouldPersistSession && rolloutFlags.typedSessionWriteEnabled;
-  const shouldBuildSingleFactSkeleton = rolloutFlags.singleFactLayerReadEnabled;
-  logUserFriendly("THREE_LAYER_ROLLOUT_APPLIED", {
-    enabled: rolloutFlags.rolloutEnabled,
-    stage: rolloutFlags.rolloutStage,
-    decision: rolloutFlags.rolloutDecision,
-    reason: rolloutFlags.rolloutReason,
-    percent: rolloutFlags.rolloutPercent,
-    bucket: rolloutFlags.rolloutBucket,
-    typedSessionWriteEnabled: rolloutFlags.typedSessionWriteEnabled,
-    compactionBoundaryEnabled: rolloutFlags.compactionBoundaryEnabled,
-    toolOutputLifecycleEnabled: rolloutFlags.toolOutputLifecycleEnabled,
-    singleFactLayerReadEnabled: rolloutFlags.singleFactLayerReadEnabled
-  });
-  if (typeof toolUseContext.compactionBoundaryEnabled !== "boolean") {
-    toolUseContext.compactionBoundaryEnabled = rolloutFlags.compactionBoundaryEnabled;
-  }
-  if (typeof toolUseContext.toolOutputLifecycleEnabled !== "boolean") {
-    toolUseContext.toolOutputLifecycleEnabled = rolloutFlags.toolOutputLifecycleEnabled;
-  }
-  if (typeof toolUseContext.singleFactLayerReadEnabled !== "boolean") {
-    toolUseContext.singleFactLayerReadEnabled = rolloutFlags.singleFactLayerReadEnabled;
-  }
-  if (rolloutFlags.singleFactLayerReadEnabled) {
-    messages = normalizeMessagesForSingleFactLayer(messages);
-  }
-  const lifecycleEventBuffer = [];
-  const previousOnQueryLifecycleEvent = toolUseContext.onQueryLifecycleEvent;
-  toolUseContext.onQueryLifecycleEvent = (event) => {
-    previousOnQueryLifecycleEvent?.(event);
-    lifecycleEventBuffer.push(event);
-  };
-  try {
-    for await (const message of queryCore(
-      messages,
-      systemPrompt,
-      context,
-      canUseTool,
-      toolUseContext,
-      getBinaryFeedbackResponse
-    )) {
-      if (shouldPersistTypedSession || shouldBuildSingleFactSkeleton) {
-        const lifecycleParts = projectLifecycleEventsToTypedParts(
-          typedProjector,
-          lifecycleEventBuffer.splice(0)
-        );
-        const parts = [
-          ...lifecycleParts,
-          ...projectMessageToTypedParts(typedProjector, message)
-        ];
-        for (const part of parts) {
-          if (shouldPersistTypedSession) {
-            emitTypedPart({ requestId: typedRequestId, part });
-          }
-        }
-        if (shouldBuildSingleFactSkeleton && (message?.type === "assistant" || message?.type === "user")) {
-          const skeletonBlocks = buildSkeletonBlocksFromTypedParts({
-            role: message.type,
-            parts
-          });
-          logUserFriendly("SINGLE_FACT_LAYER_SKELETON_REBUILT", {
-            role: message.type,
-            typedPartCount: parts.length,
-            skeletonBlockCount: skeletonBlocks.length,
-            mapperMode: "rollback_only"
-          });
-        }
-      }
-      yield message;
-    }
-  } finally {
-    toolUseContext.onQueryLifecycleEvent = previousOnQueryLifecycleEvent;
-    if (shouldPersistTypedSession) {
-      flushTypedPartBuffer({ requestId: typedRequestId });
-      const compatibilityMetrics = consumeProjectorCompatibilityMetrics(typedProjector);
-      logUserFriendly("STREAM_TYPED_PROVIDER_COMPATIBILITY", {
-        requestId: typedRequestId,
-        provider: compatibilityMetrics.provider,
-        supportsRichToolResult: compatibilityMetrics.supportsRichToolResult,
-        richToolResultBlockCount: compatibilityMetrics.richToolResultBlockCount,
-        downgradedToolResultCount: compatibilityMetrics.downgradedToolResultCount
-      });
+  yield* runQuerySessionLegacyCompatAdapter({
+    messages,
+    toolUseContext,
+    requestId: context.requestId,
+    currentRequestId: getCurrentRequest()?.id,
+    isTestEnv: process.env.NODE_ENV === "test",
+    hooks: querySessionPrimaryAdapterHooksInline,
+    logUserFriendly,
+    stream: async function* (preparedMessages) {
+      yield* queryCore(
+        preparedMessages,
+        systemPrompt,
+        context,
+        canUseTool,
+        toolUseContext,
+        getBinaryFeedbackResponse
+      );
     }
-  }
+  });
 }
 async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseContext, getBinaryFeedbackResponse, hookState) {
+  const sessionContext = toolUseContext.sessionContext;
   setRequestStatus({ kind: "thinking" });
   try {
     let getAssistantResponse = function() {
@@ -30791,9 +31670,21 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
         source: "inferred"
       };
     }
+    emitAutoCompactTelemetryEvent("COMPACTION_HOOK_TURN_END", {
+      trigger: "turn_end",
+      messageCount: messages.length,
+      sessionId: toolUseContext.sessionId,
+      agentId: toolUseContext.agentId
+    });
     const { messages: processedMessages, wasCompacted } = await checkAutoCompact(messages, toolUseContext);
     if (wasCompacted) {
       messages = processedMessages;
+      emitAutoCompactTelemetryEvent("COMPACTION_HOOK_OVERFLOW_DETECTED", {
+        trigger: "overflow_detected",
+        messageCount: messages.length,
+        sessionId: toolUseContext.sessionId,
+        agentId: toolUseContext.agentId
+      });
     }
     const boundaryConfig = resolveCompactionBoundaryConfig(toolUseContext);
     const boundaryResult = filterAfterCompactionBoundary(messages, {
@@ -30976,6 +31867,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
         );
         if (promptOutcome.decision === "block") {
           yield createAssistantMessage(promptOutcome.message);
+          sessionContext?.setIdle();
           return;
         }
       }
@@ -31092,6 +31984,12 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
         }
       }
     }
+    emitAutoCompactTelemetryEvent("COMPACTION_HOOK_PRE_NEXT_TURN", {
+      trigger: "pre_next_turn",
+      messageCount: messages.length,
+      sessionId: toolUseContext.sessionId,
+      agentId: toolUseContext.agentId
+    });
     markPhase("LLM_PREPARATION");
     const result = await queryWithBinaryFeedback(
       toolUseContext,
@@ -31105,6 +32003,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       timestamp: Date.now()
     });
     if (toolUseContext.abortController.signal.aborted) {
+      sessionContext?.setInterrupted();
       lifecycleEvents.finishStep({
         stepId,
         requestId,
@@ -31117,6 +32016,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       return;
     }
     if (result.message === null) {
+      sessionContext?.setInterrupted();
       lifecycleEvents.finishStep({
         stepId,
         requestId,
@@ -31156,6 +32056,17 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       const stopOutcome = await runStopHooks({
         hookEvent: stopHookEvent,
         reason: String(stopReason ?? ""),
+        retryEntryKey: buildRetryEntryKey([
+          toolUseContext.sessionId,
+          toolUseContext.parentSessionId,
+          toolUseContext.childSessionId,
+          toolUseContext.agentId,
+          String(stopReason ?? "")
+        ]),
+        retryAttempt: stopHookAttempts,
+        sessionId: toolUseContext.sessionId,
+        parentSessionId: toolUseContext.parentSessionId,
+        childSessionId: toolUseContext.childSessionId,
         agentId: toolUseContext.agentId,
         permissionMode: toolUseContext.options?.toolPermissionContext?.mode,
         cwd: getCwd(),
@@ -31194,6 +32105,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
         }
       }
       if (!parentUserMessage?.uuid) {
+        sessionContext?.setIdle();
         yield assistantMessage;
         return;
       }
@@ -31214,6 +32126,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
         }
       }
       yield enrichedAssistantMessage;
+      sessionContext?.setIdle();
       return;
     }
     if (!parentUserMessage?.uuid) {
@@ -31254,6 +32167,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
     }
     toolUseContext = toolQueue.getUpdatedContext();
     if (toolUseContext.abortController.signal.aborted) {
+      sessionContext?.setInterrupted();
       yield createAssistantMessage(INTERRUPT_MESSAGE_FOR_TOOL_USE);
       return;
     }
@@ -31273,6 +32187,9 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
     } catch (error) {
       throw error;
     }
+  } catch (error) {
+    sessionContext?.setErrored();
+    throw error;
   } finally {
     const currentRequest = getCurrentRequest();
     const telemetryRecord = flushAutoCompactTelemetrySnapshot({
@@ -31290,9 +32207,14 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       });
     }
     setRequestStatus({ kind: "idle" });
+    if (sessionContext?.getSnapshot().state !== "closed") {
+      sessionContext?.setIdle();
+    }
   }
 }
 async function* runToolUse(toolUse, siblingToolUseIDs, assistantMessage, canUseTool, toolUseContext, shouldSkipPermissionCheck) {
+  const sessionContext = toolUseContext.sessionContext;
+  sessionContext?.startTool(toolUse.id);
   const currentRequest = getCurrentRequest();
   const aliasResolution = resolveToolNameAlias(toolUse.name);
   setRequestStatus({ kind: "tool", detail: aliasResolution.resolvedName });
@@ -31330,6 +32252,7 @@ async function* runToolUse(toolUse, siblingToolUseIDs, assistantMessage, canUseT
         errorClass: "soft"
       })
     ]);
+    sessionContext?.finishTool(toolUse.id);
     return;
   }
   const toolInput = toolUse.input;
@@ -31355,65 +32278,30 @@ async function* runToolUse(toolUse, siblingToolUseIDs, assistantMessage, canUseT
   } catch (e) {
     logError(e);
     const errorMessage = createUserMessageFromBlocks([
-      createErrorToolResultBlock({
+      createToolExecutionErrorBlock({
         toolUseId: toolUse.id,
-        content: `Tool execution failed: ${e instanceof Error ? e.message : String(e)}`,
-        errorCode: extractErrorCode(e)
+        error: e,
+        mode: "summary"
       })
     ]);
     yield errorMessage;
+  } finally {
+    sessionContext?.finishTool(toolUse.id);
   }
 }
-function normalizeToolInput(tool, input) {
-  switch (tool) {
-    case BashTool: {
-      const parsed = BashTool.inputSchema.parse(input);
-      const {
-        command: command4,
-        timeout,
-        description: description3,
-        run_in_background,
-        dangerouslyDisableSandbox
-      } = parsed;
-      return {
-        command: command4.replace(`cd ${getCwd()} && `, "").replace(/\\\\;/g, "\\;"),
-        ...timeout !== void 0 ? { timeout } : {},
-        ...description3 ? { description: description3 } : {},
-        ...run_in_background ? { run_in_background } : {},
-        ...dangerouslyDisableSandbox ? { dangerouslyDisableSandbox } : {}
-      };
-    }
-    default:
-      return input;
-  }
-}
-function preprocessToolInput(tool, input) {
-  if (tool.name === "TaskOutput") {
-    const task_id = typeof input.task_id === "string" && input.task_id || typeof input.agentId === "string" && String(input.agentId) || typeof input.bash_id === "string" && String(input.bash_id) || "";
-    const block = typeof input.block === "boolean" ? input.block : true;
-    const timeout = typeof input.timeout === "number" ? input.timeout : typeof input.wait_up_to === "number" ? Number(input.wait_up_to) * 1e3 : void 0;
-    return {
-      task_id,
-      block,
-      ...timeout !== void 0 ? { timeout } : {}
-    };
-  }
-  return input;
-}
 async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs, input, context, canUseTool, assistantMessage, shouldSkipPermissionCheck) {
   const preprocessedInput = preprocessToolInput(tool, input);
   const isValidInput = tool.inputSchema.safeParse(preprocessedInput);
   if (!isValidInput.success) {
-    let errorMessage = `InputValidationError: ${isValidInput.error.message}`;
-    if (tool.name === "Read" && Object.keys(preprocessedInput).length === 0) {
-      errorMessage = `Error: The Read tool requires a 'file_path' parameter to specify which file to read. Please provide the absolute path to the file you want to read. For example: {"file_path": "/path/to/file.txt"}`;
-    }
+    const errorMessage = resolveInitialInputValidationMessage({
+      toolName: tool.name,
+      preprocessedInput,
+      validationMessage: isValidInput.error.message
+    });
     yield createUserMessageFromBlocks([
-      createErrorToolResultBlock({
+      createInputValidationErrorBlock({
         toolUseId: toolUseID,
-        content: errorMessage,
-        errorCode: "INPUT_VALIDATION",
-        errorClass: "soft"
+        content: errorMessage
       })
     ]);
     return;
@@ -31425,11 +32313,9 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
   );
   if (isValidCall?.result === false) {
     yield createUserMessageFromBlocks([
-      createErrorToolResultBlock({
+      createInputValidationErrorBlock({
         toolUseId: toolUseID,
-        content: isValidCall.message,
-        errorCode: "INPUT_VALIDATION",
-        errorClass: "soft"
+        content: isValidCall.message
       })
     ]);
     return;
@@ -31438,96 +32324,66 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
     toolName: tool.name,
     toolInput: normalizedInput,
     toolUseId: toolUseID,
-    permissionMode: context.options?.toolPermissionContext?.mode,
-    cwd: getCwd(),
-    transcriptPath: getHookTranscriptPath(context),
-    safeMode: context.options?.safeMode ?? false,
-    signal: context.abortController.signal
+    ...buildToolHookBaseArgs(context, toolUseID)
   });
   if (hookOutcome.kind === "block") {
     yield createUserMessageFromBlocks([
-      createErrorToolResultBlock({
+      createHookBlockedErrorBlock({
         toolUseId: toolUseID,
-        content: hookOutcome.message,
-        errorCode: "HOOK_BLOCKED",
-        errorClass: "soft"
+        content: hookOutcome.message
       })
     ]);
     return;
   }
-  if (hookOutcome.warnings.length > 0) {
-    const warningText = hookOutcome.warnings.join("\n");
+  const preWarningDispatchItems = buildWarningDispatchItems({
+    warnings: hookOutcome.warnings,
+    defaultTools: context.options?.tools ?? []
+  });
+  for (const dispatchItem of preWarningDispatchItems) {
     yield createProgressMessage(
       toolUseID,
       siblingToolUseIDs,
-      createAssistantMessage(warningText),
+      createAssistantMessage(dispatchItem.warningText),
       [],
-      context.options?.tools ?? [],
+      dispatchItem.tools,
       { progressState: "running" }
     );
   }
-  if (hookOutcome.systemMessages && hookOutcome.systemMessages.length > 0) {
-    queueHookSystemMessages(context, hookOutcome.systemMessages);
-  }
-  if (hookOutcome.additionalContexts && hookOutcome.additionalContexts.length > 0) {
-    queueHookAdditionalContexts(context, hookOutcome.additionalContexts);
+  applyHookOutcomeSideEffects(context, hookOutcome);
+  const updatedInputResult = await resolveHookUpdatedInput({
+    tool,
+    normalizedInput,
+    updatedInput: hookOutcome.updatedInput,
+    context
+  });
+  if (updatedInputResult.kind === "invalid") {
+    yield createUserMessageFromBlocks([
+      createInputValidationErrorBlock({
+        toolUseId: toolUseID,
+        content: updatedInputResult.message
+      })
+    ]);
+    return;
   }
-  if (hookOutcome.updatedInput) {
-    const merged = { ...normalizedInput, ...hookOutcome.updatedInput };
-    const parsed = tool.inputSchema.safeParse(merged);
-    if (!parsed.success) {
-      yield createUserMessageFromBlocks([
-        createErrorToolResultBlock({
-          toolUseId: toolUseID,
-          content: `Hook updatedInput failed validation: ${parsed.error.message}`,
-          errorCode: "INPUT_VALIDATION",
-          errorClass: "soft"
-        })
-      ]);
-      return;
-    }
-    normalizedInput = normalizeToolInput(tool, parsed.data);
-    const isValidUpdate = await tool.validateInput?.(
-      normalizedInput,
-      context
-    );
-    if (isValidUpdate?.result === false) {
-      yield createUserMessageFromBlocks([
-        createErrorToolResultBlock({
-          toolUseId: toolUseID,
-          content: isValidUpdate.message,
-          errorCode: "INPUT_VALIDATION",
-          errorClass: "soft"
-        })
-      ]);
-      return;
-    }
+  if (updatedInputResult.kind === "updated") {
+    normalizedInput = normalizeToolInput(tool, updatedInputResult.normalizedInput);
   }
   const hookPermissionDecision = hookOutcome.kind === "allow" ? hookOutcome.permissionDecision : void 0;
-  const effectiveShouldSkipPermissionCheck = hookPermissionDecision === "allow" ? true : hookPermissionDecision === "ask" ? false : shouldSkipPermissionCheck;
-  const permissionContextForCall = hookPermissionDecision === "ask" && context.options?.toolPermissionContext && context.options.toolPermissionContext.mode !== "default" ? {
-    ...context,
-    options: {
-      ...context.options,
-      toolPermissionContext: {
-        ...context.options.toolPermissionContext,
-        mode: "default"
-      }
-    }
-  } : context;
-  const permissionResult = effectiveShouldSkipPermissionCheck ? { result: true } : await canUseTool(
+  const { permissionResult } = await resolvePermissionCheckOutcome({
+    context,
+    hookPermissionDecision,
+    shouldSkipPermissionCheck,
+    canUseTool,
     tool,
     normalizedInput,
-    { ...permissionContextForCall, toolUseId: toolUseID },
+    toolUseId: toolUseID,
     assistantMessage
-  );
+  });
   if (permissionResult.result === false) {
     yield createUserMessageFromBlocks([
-      createErrorToolResultBlock({
+      createPermissionDeniedErrorBlock({
         toolUseId: toolUseID,
-        content: permissionResult.message,
-        errorCode: "PERMISSION_DENIED",
-        errorClass: "soft"
+        content: permissionResult.message
       })
     ]);
     return;
@@ -31541,160 +32397,81 @@ async function* checkPermissionsAndCallTool(tool, toolUseID, siblingToolUseIDs,
       switch (result.type) {
         case "result":
           {
-            const rawContent = result.resultForAssistant ?? tool.renderResultForAssistant(result.data);
-            const shouldTruncate = typeof rawContent === "string" && shouldApplyToolOutputTruncation(result.data);
-            const content = typeof rawContent === "string" && shouldTruncate ? truncateToolOutput(rawContent, {
+            const content = resolveToolResultAssistantContent({
+              resultForAssistant: result.resultForAssistant,
+              resultData: result.data,
+              renderResultForAssistant: (data) => tool.renderResultForAssistant(data),
               permissionMode: context.options?.toolPermissionContext?.mode
-            }).content : rawContent;
+            });
             const postOutcome = await runPostToolUseHooks({
               toolName: tool.name,
               toolInput: normalizedInput,
               toolResult: result.data,
               toolUseId: toolUseID,
-              permissionMode: context.options?.toolPermissionContext?.mode,
-              cwd: getCwd(),
-              transcriptPath: getHookTranscriptPath(context),
-              safeMode: context.options?.safeMode ?? false,
-              signal: context.abortController.signal
+              ...buildToolHookBaseArgs(context, toolUseID)
             });
-            if (postOutcome.systemMessages.length > 0) {
-              queueHookSystemMessages(context, postOutcome.systemMessages);
-            }
-            if (postOutcome.additionalContexts.length > 0) {
-              queueHookAdditionalContexts(
-                context,
-                postOutcome.additionalContexts
-              );
-            }
-            if (postOutcome.warnings.length > 0) {
-              const warningText = postOutcome.warnings.join("\n");
-              yield createProgressMessage(
-                toolUseID,
-                siblingToolUseIDs,
-                createAssistantMessage(warningText),
-                [],
-                context.options?.tools ?? [],
-                { progressState: "running" }
-              );
-            }
-            yield createUserMessageFromBlocks(
-              [
-                {
-                  type: "tool_result",
-                  content,
-                  tool_use_id: toolUseID
-                }
-              ],
-              {
-                data: result.data,
-                resultForAssistant: content,
-                ...Array.isArray(result.newMessages) ? { newMessages: result.newMessages } : {},
-                ...result.contextModifier ? { contextModifier: result.contextModifier } : {}
+            applyHookOutcomeSideEffects(context, postOutcome);
+            const dispatchItems = buildResultDispatchItems({
+              toolUseId: toolUseID,
+              content,
+              resultData: result.data,
+              newMessages: result.newMessages,
+              contextModifier: result.contextModifier,
+              defaultTools: context.options?.tools ?? [],
+              postWarnings: postOutcome.warnings
+            });
+            for (const dispatchItem of dispatchItems) {
+              if (dispatchItem.kind === "warning_progress") {
+                yield createProgressMessage(
+                  toolUseID,
+                  siblingToolUseIDs,
+                  createAssistantMessage(dispatchItem.warningText),
+                  [],
+                  dispatchItem.tools,
+                  { progressState: "running" }
+                );
+                continue;
               }
-            );
-            if (Array.isArray(result.newMessages)) {
-              for (const message of result.newMessages) {
-                if (message && typeof message === "object" && "type" in message) {
-                  yield message;
-                }
+              if (dispatchItem.kind === "user_message") {
+                yield createUserMessageFromBlocks(
+                  dispatchItem.blocks,
+                  dispatchItem.toolUseResult
+                );
+                continue;
               }
+              yield dispatchItem.message;
             }
           }
           return;
         case "progress":
+          const progressPayload = buildRunningProgressPayload({
+            content: result.content,
+            normalizedMessages: result.normalizedMessages,
+            tools: result.tools,
+            defaultTools: context.options?.tools ?? []
+          });
           yield createProgressMessage(
             toolUseID,
             siblingToolUseIDs,
-            result.content,
-            result.normalizedMessages || [],
-            result.tools || [],
+            progressPayload.content,
+            progressPayload.normalizedMessages,
+            progressPayload.tools,
             { progressState: "running" }
           );
           break;
       }
     }
   } catch (error) {
-    const content = formatError(error);
     logError(error);
     yield createUserMessageFromBlocks([
-      createErrorToolResultBlock({
+      createToolExecutionErrorBlock({
         toolUseId: toolUseID,
-        content,
-        errorCode: extractErrorCode(error)
+        error,
+        mode: "full"
       })
     ]);
   }
 }
-function formatError(error) {
-  if (!(error instanceof Error)) {
-    return String(error);
-  }
-  const parts = [error.message];
-  if ("stderr" in error && typeof error.stderr === "string") {
-    parts.push(error.stderr);
-  }
-  if ("stdout" in error && typeof error.stdout === "string") {
-    parts.push(error.stdout);
-  }
-  const fullMessage = parts.filter(Boolean).join("\n");
-  if (fullMessage.length <= 1e4) {
-    return fullMessage;
-  }
-  const halfLength = 5e3;
-  const start = fullMessage.slice(0, halfLength);
-  const end = fullMessage.slice(-halfLength);
-  return `${start}
-
-... [${fullMessage.length - 1e4} characters truncated] ...
-
-${end}`;
-}
-var ERROR_CLASS_BY_CODE = {
-  ENOENT: "soft",
-  EISDIR: "soft",
-  EACCES: "retryable",
-  EPERM: "retryable",
-  EMFILE: "retryable",
-  ENFILE: "retryable",
-  EIO: "fatal",
-  ENODEV: "fatal",
-  EBUSY: "fatal"
-};
-function extractErrorCode(error) {
-  if (!error || typeof error !== "object") {
-    return void 0;
-  }
-  if ("code" in error && typeof error.code === "string") {
-    return error.code;
-  }
-  return void 0;
-}
-function summarizeError(detail) {
-  const line = detail.split("\n").map((part) => part.trim()).find((part) => part.length > 0);
-  const summary = line ?? detail.trim();
-  return summary.length > 200 ? summary.slice(0, 200) : summary;
-}
-function getErrorClassFromCode(errorCode) {
-  if (!errorCode) return "soft";
-  return ERROR_CLASS_BY_CODE[errorCode] ?? "soft";
-}
-function createErrorToolResultBlock(args) {
-  const detail = typeof args.errorDetail === "string" ? args.errorDetail : typeof args.content === "string" ? args.content : JSON.stringify(args.content);
-  const errorCode = args.errorCode;
-  const errorClass = args.errorClass ?? getErrorClassFromCode(errorCode);
-  const summary = detail ? summarizeError(detail) : "";
-  return {
-    type: "tool_result",
-    content: args.content,
-    is_error: true,
-    tool_use_id: args.toolUseId,
-    error_class: errorClass,
-    ...errorCode ? { error_code: errorCode } : {},
-    ...summary ? { error_summary: summary } : {},
-    ...detail ? { error_detail: detail } : {},
-    ...args.rootToolUseId ? { root_tool_use_id: args.rootToolUseId } : {}
-  };
-}
 
 // src/ui/components/binary-feedback/BinaryFeedback.tsx
 import { default as React96, useCallback as useCallback15 } from "react";
@@ -32870,7 +33647,7 @@ import { homedir as homedir8 } from "os";
 // src/commands/agents/generation.ts
 import { randomUUID as randomUUID6 } from "crypto";
 async function generateAgentWithClaude(prompt) {
-  const { queryModel } = await import("./llm-257Z7WOJ.js");
+  const { queryModel } = await import("./llm-VL7SVIXR.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:
@@ -35876,7 +36653,7 @@ var BashTool = {
         result: false,
         message: `Security Policy: Do not use 'ls' for simple file listing. 
 - To find files: Use the 'Glob' tool.
-- To view directory structure: Use the 'LS' tool.
+- To list directory contents: Use Glob with pattern "dir/*" (e.g., Glob pattern="src/*").
 - To check permissions/metadata: Use 'ls -l' (allowed).`
       };
     }
@@ -36707,7 +37484,6 @@ export {
   __ToolUseQueueForTests,
   query,
   runToolUse,
-  normalizeToolInput,
   createConversationTrackerPersistenceTelemetryEmitter,
   REPL,
   ResumeConversation,