@vionwilliams/agent-os 1.0.0-alpha.21 → 1.0.0-alpha.23

package/dist/cli.js

@@ -8275,37 +8275,44 @@ import {
 function slowLoggingExternal() {
   return NOOP_LOGGER;
 }
+function withSlowOperationLogging(logger, operation) {
+  try {
+    return operation();
+  } finally {
+    logger[Symbol.dispose]();
+  }
+}
 function jsonStringify(value, replacer, space) {
-  using _ = slowLogging`JSON.stringify(${value})`;
-  return JSON.stringify(value, replacer, space);
+  return withSlowOperationLogging(slowLogging`JSON.stringify(${value})`, () => JSON.stringify(value, replacer, space));
 }
 function clone(value, options) {
-  using _ = slowLogging`structuredClone(${value})`;
-  return structuredClone(value, options);
+  return withSlowOperationLogging(slowLogging`structuredClone(${value})`, () => structuredClone(value, options));
 }
 function writeFileSync_DEPRECATED(filePath, data, options) {
-  using _ = slowLogging`fs.writeFileSync(${filePath}, ${data})`;
-  const needsFlush = options !== null && typeof options === "object" && "flush" in options && options.flush === true;
-  if (needsFlush) {
-    const encoding = typeof options === "object" && "encoding" in options ? options.encoding : undefined;
-    const mode = typeof options === "object" && "mode" in options ? options.mode : undefined;
-    let fd;
-    try {
-      fd = openSync(filePath, "w", mode);
-      fsWriteFileSync(fd, data, { encoding: encoding ?? undefined });
-      fsyncSync(fd);
-    } finally {
-      if (fd !== undefined) {
-        closeSync(fd);
+  return withSlowOperationLogging(slowLogging`fs.writeFileSync(${filePath}, ${data})`, () => {
+    const needsFlush = options !== null && typeof options === "object" && "flush" in options && options.flush === true;
+    if (needsFlush) {
+      const encoding = typeof options === "object" && "encoding" in options ? options.encoding : undefined;
+      const mode = typeof options === "object" && "mode" in options ? options.mode : undefined;
+      let fd;
+      try {
+        fd = openSync(filePath, "w", mode);
+        fsWriteFileSync(fd, data, { encoding: encoding ?? undefined });
+        fsyncSync(fd);
+      } finally {
+        if (fd !== undefined) {
+          closeSync(fd);
+        }
       }
+    } else {
+      fsWriteFileSync(filePath, data, options);
     }
-  } else {
-    fsWriteFileSync(filePath, data, options);
-  }
+  });
 }
 var SLOW_OPERATION_THRESHOLD_MS, NOOP_LOGGER, slowLogging, jsonParse = (text, reviver) => {
-  using _ = slowLogging`JSON.parse(${text})`;
-  return typeof reviver === "undefined" ? JSON.parse(text) : JSON.parse(text, reviver);
+  return withSlowOperationLogging(slowLogging`JSON.parse(${text})`, () => {
+    return typeof reviver === "undefined" ? JSON.parse(text) : JSON.parse(text, reviver);
+  });
 };
 var init_slowOperations = __esm(() => {
   init_state();
@@ -8456,49 +8463,57 @@ function getFsImplementation() {
   return activeFs;
 }
 async function readFileRange(path2, offset, maxBytes) {
-  await using fh = await open(path2, "r");
-  const size = (await fh.stat()).size;
-  if (size <= offset) {
-    return null;
-  }
-  const bytesToRead = Math.min(size - offset, maxBytes);
-  const buffer = Buffer.allocUnsafe(bytesToRead);
-  let totalRead = 0;
-  while (totalRead < bytesToRead) {
-    const { bytesRead } = await fh.read(buffer, totalRead, bytesToRead - totalRead, offset + totalRead);
-    if (bytesRead === 0) {
-      break;
+  const fh = await open(path2, "r");
+  try {
+    const size = (await fh.stat()).size;
+    if (size <= offset) {
+      return null;
+    }
+    const bytesToRead = Math.min(size - offset, maxBytes);
+    const buffer = Buffer.allocUnsafe(bytesToRead);
+    let totalRead = 0;
+    while (totalRead < bytesToRead) {
+      const { bytesRead } = await fh.read(buffer, totalRead, bytesToRead - totalRead, offset + totalRead);
+      if (bytesRead === 0) {
+        break;
+      }
+      totalRead += bytesRead;
     }
-    totalRead += bytesRead;
+    return {
+      content: buffer.toString("utf8", 0, totalRead),
+      bytesRead: totalRead,
+      bytesTotal: size
+    };
+  } finally {
+    await fh.close();
   }
-  return {
-    content: buffer.toString("utf8", 0, totalRead),
-    bytesRead: totalRead,
-    bytesTotal: size
-  };
 }
 async function tailFile(path2, maxBytes) {
-  await using fh = await open(path2, "r");
-  const size = (await fh.stat()).size;
-  if (size === 0) {
-    return { content: "", bytesRead: 0, bytesTotal: 0 };
-  }
-  const offset = Math.max(0, size - maxBytes);
-  const bytesToRead = size - offset;
-  const buffer = Buffer.allocUnsafe(bytesToRead);
-  let totalRead = 0;
-  while (totalRead < bytesToRead) {
-    const { bytesRead } = await fh.read(buffer, totalRead, bytesToRead - totalRead, offset + totalRead);
-    if (bytesRead === 0) {
-      break;
+  const fh = await open(path2, "r");
+  try {
+    const size = (await fh.stat()).size;
+    if (size === 0) {
+      return { content: "", bytesRead: 0, bytesTotal: 0 };
+    }
+    const offset = Math.max(0, size - maxBytes);
+    const bytesToRead = size - offset;
+    const buffer = Buffer.allocUnsafe(bytesToRead);
+    let totalRead = 0;
+    while (totalRead < bytesToRead) {
+      const { bytesRead } = await fh.read(buffer, totalRead, bytesToRead - totalRead, offset + totalRead);
+      if (bytesRead === 0) {
+        break;
+      }
+      totalRead += bytesRead;
     }
-    totalRead += bytesRead;
+    return {
+      content: buffer.toString("utf8", 0, totalRead),
+      bytesRead: totalRead,
+      bytesTotal: size
+    };
+  } finally {
+    await fh.close();
   }
-  return {
-    content: buffer.toString("utf8", 0, totalRead),
-    bytesRead: totalRead,
-    bytesTotal: size
-  };
 }
 async function* readLinesReverse(path2) {
   const CHUNK_SIZE = 1024 * 4;
@@ -8547,8 +8562,7 @@ var init_fsOperations = __esm(() => {
       return process.cwd();
     },
     existsSync(fsPath) {
-      using _ = slowLogging`fs.existsSync(${fsPath})`;
-      return fs.existsSync(fsPath);
+      return withSlowOperationLogging(slowLogging`fs.existsSync(${fsPath})`, () => fs.existsSync(fsPath));
     },
     async stat(fsPath) {
       return statPromise(fsPath);
@@ -8580,115 +8594,104 @@ var init_fsOperations = __esm(() => {
       return renamePromise(oldPath, newPath);
     },
     statSync(fsPath) {
-      using _ = slowLogging`fs.statSync(${fsPath})`;
-      return fs.statSync(fsPath);
+      return withSlowOperationLogging(slowLogging`fs.statSync(${fsPath})`, () => fs.statSync(fsPath));
     },
     lstatSync(fsPath) {
-      using _ = slowLogging`fs.lstatSync(${fsPath})`;
-      return fs.lstatSync(fsPath);
+      return withSlowOperationLogging(slowLogging`fs.lstatSync(${fsPath})`, () => fs.lstatSync(fsPath));
     },
     readFileSync(fsPath, options) {
-      using _ = slowLogging`fs.readFileSync(${fsPath})`;
-      return fs.readFileSync(fsPath, { encoding: options.encoding });
+      return withSlowOperationLogging(slowLogging`fs.readFileSync(${fsPath})`, () => fs.readFileSync(fsPath, { encoding: options.encoding }));
     },
     readFileBytesSync(fsPath) {
-      using _ = slowLogging`fs.readFileBytesSync(${fsPath})`;
-      return fs.readFileSync(fsPath);
+      return withSlowOperationLogging(slowLogging`fs.readFileBytesSync(${fsPath})`, () => fs.readFileSync(fsPath));
     },
     readSync(fsPath, options) {
-      using _ = slowLogging`fs.readSync(${fsPath}, ${options.length} bytes)`;
-      let fd = undefined;
-      try {
-        fd = fs.openSync(fsPath, "r");
-        const buffer = Buffer.alloc(options.length);
-        const bytesRead = fs.readSync(fd, buffer, 0, options.length, 0);
-        return { buffer, bytesRead };
-      } finally {
-        if (fd)
-          fs.closeSync(fd);
-      }
+      return withSlowOperationLogging(slowLogging`fs.readSync(${fsPath}, ${options.length} bytes)`, () => {
+        let fd = undefined;
+        try {
+          fd = fs.openSync(fsPath, "r");
+          const buffer = Buffer.alloc(options.length);
+          const bytesRead = fs.readSync(fd, buffer, 0, options.length, 0);
+          return { buffer, bytesRead };
+        } finally {
+          if (fd)
+            fs.closeSync(fd);
+        }
+      });
     },
     appendFileSync(path2, data, options) {
-      using _ = slowLogging`fs.appendFileSync(${path2}, ${data.length} chars)`;
-      if (options?.mode !== undefined) {
-        try {
-          const fd = fs.openSync(path2, "ax", options.mode);
+      return withSlowOperationLogging(slowLogging`fs.appendFileSync(${path2}, ${data.length} chars)`, () => {
+        if (options?.mode !== undefined) {
           try {
-            fs.appendFileSync(fd, data);
-          } finally {
-            fs.closeSync(fd);
+            const fd = fs.openSync(path2, "ax", options.mode);
+            try {
+              fs.appendFileSync(fd, data);
+            } finally {
+              fs.closeSync(fd);
+            }
+            return;
+          } catch (e) {
+            if (getErrnoCode(e) !== "EEXIST")
+              throw e;
           }
-          return;
-        } catch (e) {
-          if (getErrnoCode(e) !== "EEXIST")
-            throw e;
         }
-      }
-      fs.appendFileSync(path2, data);
+        fs.appendFileSync(path2, data);
+      });
     },
     copyFileSync(src, dest) {
-      using _ = slowLogging`fs.copyFileSync(${src} \u2192 ${dest})`;
-      fs.copyFileSync(src, dest);
+      return withSlowOperationLogging(slowLogging`fs.copyFileSync(${src} \u2192 ${dest})`, () => fs.copyFileSync(src, dest));
     },
     unlinkSync(path2) {
-      using _ = slowLogging`fs.unlinkSync(${path2})`;
-      fs.unlinkSync(path2);
+      return withSlowOperationLogging(slowLogging`fs.unlinkSync(${path2})`, () => fs.unlinkSync(path2));
     },
     renameSync(oldPath, newPath) {
-      using _ = slowLogging`fs.renameSync(${oldPath} \u2192 ${newPath})`;
-      fs.renameSync(oldPath, newPath);
+      return withSlowOperationLogging(slowLogging`fs.renameSync(${oldPath} \u2192 ${newPath})`, () => fs.renameSync(oldPath, newPath));
     },
     linkSync(target, path2) {
-      using _ = slowLogging`fs.linkSync(${target} \u2192 ${path2})`;
-      fs.linkSync(target, path2);
+      return withSlowOperationLogging(slowLogging`fs.linkSync(${target} \u2192 ${path2})`, () => fs.linkSync(target, path2));
     },
     symlinkSync(target, path2, type) {
-      using _ = slowLogging`fs.symlinkSync(${target} \u2192 ${path2})`;
-      fs.symlinkSync(target, path2, type);
+      return withSlowOperationLogging(slowLogging`fs.symlinkSync(${target} \u2192 ${path2})`, () => fs.symlinkSync(target, path2, type));
     },
     readlinkSync(path2) {
-      using _ = slowLogging`fs.readlinkSync(${path2})`;
-      return fs.readlinkSync(path2);
+      return withSlowOperationLogging(slowLogging`fs.readlinkSync(${path2})`, () => fs.readlinkSync(path2));
     },
     realpathSync(path2) {
-      using _ = slowLogging`fs.realpathSync(${path2})`;
-      return fs.realpathSync(path2).normalize("NFC");
+      return withSlowOperationLogging(slowLogging`fs.realpathSync(${path2})`, () => fs.realpathSync(path2).normalize("NFC"));
     },
     mkdirSync(dirPath, options) {
-      using _ = slowLogging`fs.mkdirSync(${dirPath})`;
-      const mkdirOptions = {
-        recursive: true
-      };
-      if (options?.mode !== undefined) {
-        mkdirOptions.mode = options.mode;
-      }
-      try {
-        fs.mkdirSync(dirPath, mkdirOptions);
-      } catch (e) {
-        if (getErrnoCode(e) !== "EEXIST")
-          throw e;
-      }
+      return withSlowOperationLogging(slowLogging`fs.mkdirSync(${dirPath})`, () => {
+        const mkdirOptions = {
+          recursive: true
+        };
+        if (options?.mode !== undefined) {
+          mkdirOptions.mode = options.mode;
+        }
+        try {
+          fs.mkdirSync(dirPath, mkdirOptions);
+        } catch (e) {
+          if (getErrnoCode(e) !== "EEXIST")
+            throw e;
+        }
+      });
     },
     readdirSync(dirPath) {
-      using _ = slowLogging`fs.readdirSync(${dirPath})`;
-      return fs.readdirSync(dirPath, { withFileTypes: true });
+      return withSlowOperationLogging(slowLogging`fs.readdirSync(${dirPath})`, () => fs.readdirSync(dirPath, { withFileTypes: true }));
     },
     readdirStringSync(dirPath) {
-      using _ = slowLogging`fs.readdirStringSync(${dirPath})`;
-      return fs.readdirSync(dirPath);
+      return withSlowOperationLogging(slowLogging`fs.readdirStringSync(${dirPath})`, () => fs.readdirSync(dirPath));
     },
     isDirEmptySync(dirPath) {
-      using _ = slowLogging`fs.isDirEmptySync(${dirPath})`;
-      const files = this.readdirSync(dirPath);
-      return files.length === 0;
+      return withSlowOperationLogging(slowLogging`fs.isDirEmptySync(${dirPath})`, () => {
+        const files = this.readdirSync(dirPath);
+        return files.length === 0;
+      });
     },
     rmdirSync(dirPath) {
-      using _ = slowLogging`fs.rmdirSync(${dirPath})`;
-      fs.rmdirSync(dirPath);
+      return withSlowOperationLogging(slowLogging`fs.rmdirSync(${dirPath})`, () => fs.rmdirSync(dirPath));
     },
     rmSync(path2, options) {
-      using _ = slowLogging`fs.rmSync(${path2})`;
-      fs.rmSync(path2, options);
+      return withSlowOperationLogging(slowLogging`fs.rmSync(${path2})`, () => fs.rmSync(path2, options));
     },
     createWriteStream(path2) {
       return fs.createWriteStream(path2);
@@ -30703,8 +30706,7 @@ import {
   execSync as nodeExecSync
 } from "child_process";
 function execSync_DEPRECATED(command, options) {
-  using _ = slowLogging`execSync: ${command.slice(0, 100)}`;
-  return nodeExecSync(command, options);
+  return withSlowOperationLogging(slowLogging`execSync: ${command.slice(0, 100)}`, () => nodeExecSync(command, options));
 }
 var init_execSyncWrapper = __esm(() => {
   init_slowOperations();
@@ -32282,25 +32284,26 @@ function execSyncWithDefaults_DEPRECATED(command, optionsOrAbortSignal, timeout
     stdio = ["ignore", "pipe", "pipe"]
   } = options;
   abortSignal?.throwIfAborted();
-  using _ = slowLogging`exec: ${command.slice(0, 200)}`;
-  try {
-    const result = execaSync(command, {
-      env: process.env,
-      maxBuffer: 1e6,
-      timeout: finalTimeout,
-      cwd: getCwd(),
-      stdio,
-      shell: true,
-      reject: false,
-      input
-    });
-    if (!result.stdout) {
+  return withSlowOperationLogging(slowLogging`exec: ${command.slice(0, 200)}`, () => {
+    try {
+      const result = execaSync(command, {
+        env: process.env,
+        maxBuffer: 1e6,
+        timeout: finalTimeout,
+        cwd: getCwd(),
+        stdio,
+        shell: true,
+        reject: false,
+        input
+      });
+      if (!result.stdout) {
+        return null;
+      }
+      return result.stdout.trim() || null;
+    } catch {
       return null;
     }
-    return result.stdout.trim() || null;
-  } catch {
-    return null;
-  }
+  });
 }
 var MS_IN_SECOND = 1000, SECONDS_IN_MINUTE = 60;
 var init_execFileNoThrowPortable = __esm(() => {
@@ -35293,21 +35296,25 @@ async function readJSONLFile(filePath) {
   if (size <= MAX_JSONL_READ_BYTES) {
     return parseJSONL(await readFile6(filePath));
   }
-  await using fd = await open3(filePath, "r");
-  const buf = Buffer.allocUnsafe(MAX_JSONL_READ_BYTES);
-  let totalRead = 0;
-  const fileOffset = size - MAX_JSONL_READ_BYTES;
-  while (totalRead < MAX_JSONL_READ_BYTES) {
-    const { bytesRead } = await fd.read(buf, totalRead, MAX_JSONL_READ_BYTES - totalRead, fileOffset + totalRead);
-    if (bytesRead === 0)
-      break;
-    totalRead += bytesRead;
-  }
-  const newlineIndex = buf.indexOf(10);
-  if (newlineIndex !== -1 && newlineIndex < totalRead - 1) {
-    return parseJSONL(buf.subarray(newlineIndex + 1, totalRead));
+  const fd = await open3(filePath, "r");
+  try {
+    const buf = Buffer.allocUnsafe(MAX_JSONL_READ_BYTES);
+    let totalRead = 0;
+    const fileOffset = size - MAX_JSONL_READ_BYTES;
+    while (totalRead < MAX_JSONL_READ_BYTES) {
+      const { bytesRead } = await fd.read(buf, totalRead, MAX_JSONL_READ_BYTES - totalRead, fileOffset + totalRead);
+      if (bytesRead === 0)
+        break;
+      totalRead += bytesRead;
+    }
+    const newlineIndex = buf.indexOf(10);
+    if (newlineIndex !== -1 && newlineIndex < totalRead - 1) {
+      return parseJSONL(buf.subarray(newlineIndex + 1, totalRead));
+    }
+    return parseJSONL(buf.subarray(0, totalRead));
+  } finally {
+    await fd.close();
   }
-  return parseJSONL(buf.subarray(0, totalRead));
 }
 function addItemToJSONCArray(content, newItem) {
   try {
@@ -93307,7 +93314,7 @@ var init_system = __esm(() => {
     AGENT_SDK_CLAUDE_CODE_PRESET_PREFIX,
     AGENT_SDK_PREFIX
   ];
-  AGENT_OS_VERSION = typeof MACRO !== "undefined" ? "1.0.0-alpha.21" : "dev";
+  AGENT_OS_VERSION = typeof MACRO !== "undefined" ? "1.0.0-alpha.23" : "dev";
   CLI_SYSPROMPT_PREFIXES = new Set(CLI_SYSPROMPT_PREFIX_VALUES);
 });
 
@@ -93751,7 +93758,7 @@ function getClaudeCodeUserAgent() {
 }
 var AGENT_OS_VERSION2;
 var init_userAgent = __esm(() => {
-  AGENT_OS_VERSION2 = typeof MACRO !== "undefined" ? "1.0.0-alpha.21" : "dev";
+  AGENT_OS_VERSION2 = typeof MACRO !== "undefined" ? "1.0.0-alpha.23" : "dev";
 });
 
 // src/utils/http.ts
@@ -93832,7 +93839,7 @@ var init_http2 = __esm(() => {
   init_auth();
   init_userAgent();
   init_workloadContext();
-  AGENT_OS_VERSION3 = typeof MACRO !== "undefined" ? "1.0.0-alpha.21" : "dev";
+  AGENT_OS_VERSION3 = typeof MACRO !== "undefined" ? "1.0.0-alpha.23" : "dev";
 });
 
 // src/services/api/router/userProviders.ts
@@ -207168,7 +207175,7 @@ var init_sessionStorage = __esm(() => {
   init_settings2();
   init_slowOperations();
   init_uuid();
-  VERSION4 = typeof MACRO !== "undefined" ? "1.0.0-alpha.21" : "unknown";
+  VERSION4 = typeof MACRO !== "undefined" ? "1.0.0-alpha.23" : "unknown";
   MAX_TOMBSTONE_REWRITE_BYTES = 50 * 1024 * 1024;
   SKIP_FIRST_PROMPT_PATTERN = /^(?:\s*<[a-z][\w-]*[\s>]|\[Request interrupted by user[^\]]*\])/;
   EPHEMERAL_PROGRESS_TYPES = new Set([
@@ -207298,7 +207305,7 @@ function Feedback({
       platform: env3.platform,
       gitRepo: envInfo.isGit,
       terminal: env3.terminal,
-      version: "1.0.0-alpha.21",
+      version: "1.0.0-alpha.23",
       transcript: normalizeMessagesForAPI(messages),
       errors: sanitizedErrors,
       lastApiRequest: getLastAPIRequest(),
@@ -207482,7 +207489,7 @@ function Feedback({
                       ", ",
                       env3.terminal,
                       ", v",
-                      "1.0.0-alpha.21"
+                      "1.0.0-alpha.23"
                     ]
                   })
                 ]
@@ -207588,7 +207595,7 @@ ${sanitizedDescription}
 ` + `**Environment Info**
 ` + `- Platform: ${env3.platform}
 ` + `- Terminal: ${env3.terminal}
-` + `- Version: ${"1.0.0-alpha.21"}
+` + `- Version: ${"1.0.0-alpha.23"}
 ` + `- Feedback ID: ${feedbackId}
 ` + `
 **Errors**
@@ -259973,8 +259980,8 @@ var init_toolAnalytics = __esm(() => {
   init_agentContext();
   init_slowOperations();
   init_teammate();
-  AGENT_OS_VERSION4 = typeof MACRO !== "undefined" ? "1.0.0-alpha.21" : "dev";
-  AGENT_OS_BUILD_TIME = typeof MACRO !== "undefined" ? "2026-05-21T07:31:42Z" : undefined;
+  AGENT_OS_VERSION4 = typeof MACRO !== "undefined" ? "1.0.0-alpha.23" : "dev";
+  AGENT_OS_BUILD_TIME = typeof MACRO !== "undefined" ? "2026-05-21T08:38:17Z" : undefined;
   BUILTIN_MCP_SERVER_NAMES = new Set([]);
   TOOL_INPUT_MAX_JSON_CHARS = 4 * 1024;
   FILE_COMMANDS = new Set([
@@ -274620,7 +274627,7 @@ function getInstallationEnv() {
   return;
 }
 function getClaudeCodeVersion() {
-  return "1.0.0-alpha.21";
+  return "1.0.0-alpha.23";
 }
 async function getInstalledVSCodeExtensionVersion(command) {
   const { stdout } = await execFileNoThrow(command, ["--list-extensions", "--show-versions"], {
@@ -297338,7 +297345,7 @@ async function setupSdkMcpClients(sdkMcpConfigs, sendMcpMessage) {
     const client = new Client({
       name: "claude-code",
       title: "Agent-OS",
-      version: "1.0.0-alpha.21",
+      version: "1.0.0-alpha.23",
       description: "Anthropic's agentic coding tool",
       websiteUrl: PRODUCT_URL
     }, {
@@ -297691,7 +297698,7 @@ var init_client4 = __esm(() => {
       const client = new Client({
         name: "claude-code",
         title: "Agent-OS",
-        version: "1.0.0-alpha.21",
+        version: "1.0.0-alpha.23",
         description: "Anthropic's agentic coding tool",
         websiteUrl: PRODUCT_URL
       }, {
@@ -416336,7 +416343,7 @@ function getInvokedBinary() {
 async function getDoctorDiagnostic() {
   return {
     installationType: "package-manager",
-    version: "1.0.0-alpha.21",
+    version: "1.0.0-alpha.23",
     installationPath: process.argv[1] ?? "",
     invokedBinary: getInvokedBinary(),
     configInstallMethod: "not set",
@@ -416741,7 +416748,7 @@ function buildPrimarySection() {
   });
   return [{
     label: "Version",
-    value: "1.0.0-alpha.21"
+    value: "1.0.0-alpha.23"
   }, {
     label: "Session name",
     value: nameValue
@@ -420384,7 +420391,7 @@ function Config({
         }
       })
     }) : showSubmenu === "ChannelDowngrade" ? /* @__PURE__ */ jsx_runtime169.jsx(ChannelDowngradeDialog, {
-      currentVersion: "1.0.0-alpha.21",
+      currentVersion: "1.0.0-alpha.23",
       onChoice: (choice) => {
         setShowSubmenu(null);
         setTabsHidden(false);
@@ -420396,7 +420403,7 @@ function Config({
           autoUpdatesChannel: "stable"
         };
         if (choice === "stay") {
-          newSettings.minimumVersion = "1.0.0-alpha.21";
+          newSettings.minimumVersion = "1.0.0-alpha.23";
         }
         updateSettingsForSource("userSettings", newSettings);
         setSettingsData((prev_27) => ({
@@ -428387,7 +428394,7 @@ function HelpV2(t0) {
   let t6;
   if ($3[31] !== tabs) {
     t6 = /* @__PURE__ */ jsx_runtime195.jsx(Tabs, {
-      title: `Agent-OS v${"1.0.0-alpha.21"}`,
+      title: `Agent-OS v${"1.0.0-alpha.23"}`,
       color: "professionalBlue",
       defaultTab: "general",
       children: tabs
@@ -431515,7 +431522,7 @@ var init_user = __esm(() => {
       deviceId,
       sessionId: getSessionId(),
       email: getEmail(),
-      appVersion: "1.0.0-alpha.21",
+      appVersion: "1.0.0-alpha.23",
       platform: getHostPlatformForAnalytics(),
       organizationUuid,
       accountUuid,
@@ -451766,7 +451773,7 @@ function getAllReleaseNotes(changelogContent = getStoredChangelogFromMemory()) {
     return [];
   }
 }
-async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.0.0-alpha.21") {
+async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.0.0-alpha.23") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -451793,7 +451800,7 @@ async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.0.0-alp
     releaseNotes
   };
 }
-function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.0.0-alpha.21") {
+function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.0.0-alpha.23") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -452920,7 +452927,7 @@ function getRecentActivitySync() {
   return cachedActivity;
 }
 function getLogoDisplayData() {
-  const version2 = process.env.DEMO_VERSION ?? "1.0.0-alpha.21";
+  const version2 = process.env.DEMO_VERSION ?? "1.0.0-alpha.23";
   const serverUrl = getDirectConnectServerUrl();
   const displayPath = process.env.DEMO_VERSION ? "/code/claude" : getDisplayPath(getCwd());
   const cwd2 = serverUrl ? `${displayPath} in ${serverUrl.replace(/^https?:\/\//, "")}` : displayPath;
@@ -454135,7 +454142,7 @@ function LogoV2() {
   if ($3[2] === Symbol.for("react.memo_cache_sentinel")) {
     t2 = () => {
       const currentConfig = getGlobalConfig();
-      if (currentConfig.lastReleaseNotesSeen === "1.0.0-alpha.21") {
+      if (currentConfig.lastReleaseNotesSeen === "1.0.0-alpha.23") {
         return;
       }
       saveGlobalConfig(_temp328);
@@ -454801,12 +454808,12 @@ function AgentOsPoster() {
   });
 }
 function _temp328(current) {
-  if (current.lastReleaseNotesSeen === "1.0.0-alpha.21") {
+  if (current.lastReleaseNotesSeen === "1.0.0-alpha.23") {
     return current;
   }
   return {
     ...current,
-    lastReleaseNotesSeen: "1.0.0-alpha.21"
+    lastReleaseNotesSeen: "1.0.0-alpha.23"
   };
 }
 function _temp245(s_0) {
@@ -481383,7 +481390,7 @@ async function captureMemoryDiagnostics(trigger, dumpNumber = 0) {
     smapsRollup,
     platform: process.platform,
     nodeVersion: process.version,
-    ccVersion: "1.0.0-alpha.21"
+    ccVersion: "1.0.0-alpha.23"
   };
 }
 async function performHeapDump(trigger = "manual", dumpNumber = 0) {
@@ -481956,7 +481963,7 @@ var init_bridge_kick = __esm(() => {
 var call58 = async () => {
   return {
     type: "text",
-    value: `${"1.0.0-alpha.21"} (built ${"2026-05-21T07:31:42Z"})`
+    value: `${"1.0.0-alpha.23"} (built ${"2026-05-21T08:38:17Z"})`
   };
 }, version2, version_default;
 var init_version = __esm(() => {
@@ -491448,7 +491455,7 @@ function generateHtmlReport(data, insights) {
 </html>`;
 }
 function buildExportData(data, insights, facets, remoteStats) {
-  const version3 = typeof MACRO !== "undefined" ? "1.0.0-alpha.21" : "unknown";
+  const version3 = typeof MACRO !== "undefined" ? "1.0.0-alpha.23" : "unknown";
   const remote_hosts_collected = remoteStats?.hosts.filter((h3) => h3.sessionCount > 0).map((h3) => h3.name);
   const facets_summary = {
     total: facets.size,
@@ -497817,653 +497824,657 @@ async function* queryLoop(params, consumedCommandUuids) {
   const budgetTracker = null;
   let taskBudgetRemaining = undefined;
   const config4 = buildQueryConfig();
-  using pendingMemoryPrefetch = startRelevantMemoryPrefetch(state.messages, state.toolUseContext);
-  while (true) {
-    let { toolUseContext } = state;
-    const {
-      messages,
-      autoCompactTracking,
-      maxOutputTokensRecoveryCount,
-      hasAttemptedReactiveCompact,
-      maxOutputTokensOverride,
-      pendingToolUseSummary,
-      stopHookActive,
-      turnCount
-    } = state;
-    const pendingSkillPrefetch = skillPrefetch?.startSkillDiscoveryPrefetch(null, messages, toolUseContext);
-    yield { type: "stream_request_start" };
-    queryCheckpoint("query_fn_entry");
-    if (!toolUseContext.agentId) {
-      headlessProfilerCheckpoint("query_started");
-    }
-    const queryTracking = toolUseContext.queryTracking ? {
-      chainId: toolUseContext.queryTracking.chainId,
-      depth: toolUseContext.queryTracking.depth + 1
-    } : {
-      chainId: deps.uuid(),
-      depth: 0
-    };
-    const queryChainIdForAnalytics = queryTracking.chainId;
-    toolUseContext = {
-      ...toolUseContext,
-      queryTracking
-    };
-    let messagesForQuery = [...getMessagesAfterCompactBoundary(messages)];
-    let tracking = autoCompactTracking;
-    const persistReplacements = querySource.startsWith("agent:") || querySource.startsWith("repl_main_thread");
-    messagesForQuery = await applyToolResultBudget(messagesForQuery, toolUseContext.contentReplacementState, persistReplacements ? (records) => void recordContentReplacement(records, toolUseContext.agentId).catch(logError2) : undefined, new Set(toolUseContext.options.tools.filter((t2) => !Number.isFinite(t2.maxResultSizeChars)).map((t2) => t2.name)));
-    let snipTokensFreed = 0;
-    if (false) {}
-    queryCheckpoint("query_microcompact_start");
-    const microcompactResult = await deps.microcompact(messagesForQuery, toolUseContext, querySource);
-    messagesForQuery = microcompactResult.messages;
-    const pendingCacheEdits2 = undefined;
-    queryCheckpoint("query_microcompact_end");
-    if (false) {}
-    const fullSystemPrompt = asSystemPrompt(appendSystemContext(systemPrompt, systemContext));
-    queryCheckpoint("query_autocompact_start");
-    const { compactionResult, consecutiveFailures } = await deps.autocompact(messagesForQuery, toolUseContext, {
-      systemPrompt,
-      userContext,
-      systemContext,
-      toolUseContext,
-      forkContextMessages: messagesForQuery
-    }, querySource, tracking, snipTokensFreed);
-    queryCheckpoint("query_autocompact_end");
-    if (compactionResult) {
+  const pendingMemoryPrefetch = startRelevantMemoryPrefetch(state.messages, state.toolUseContext);
+  try {
+    while (true) {
+      let { toolUseContext } = state;
       const {
-        preCompactTokenCount,
-        postCompactTokenCount,
-        truePostCompactTokenCount,
-        compactionUsage
-      } = compactionResult;
-      if (params.taskBudget) {
-        const preCompactContext = finalContextTokensFromLastResponse(messagesForQuery);
-        taskBudgetRemaining = Math.max(0, (taskBudgetRemaining ?? params.taskBudget.total) - preCompactContext);
-      }
-      tracking = {
-        compacted: true,
-        turnId: deps.uuid(),
-        turnCounter: 0,
-        consecutiveFailures: 0
-      };
-      const postCompactMessages = buildPostCompactMessages(compactionResult);
-      for (const message of postCompactMessages) {
-        yield message;
-      }
-      messagesForQuery = postCompactMessages;
-    } else if (consecutiveFailures !== undefined) {
-      tracking = {
-        ...tracking ?? { compacted: false, turnId: "", turnCounter: 0 },
-        consecutiveFailures
+        messages,
+        autoCompactTracking,
+        maxOutputTokensRecoveryCount,
+        hasAttemptedReactiveCompact,
+        maxOutputTokensOverride,
+        pendingToolUseSummary,
+        stopHookActive,
+        turnCount
+      } = state;
+      const pendingSkillPrefetch = skillPrefetch?.startSkillDiscoveryPrefetch(null, messages, toolUseContext);
+      yield { type: "stream_request_start" };
+      queryCheckpoint("query_fn_entry");
+      if (!toolUseContext.agentId) {
+        headlessProfilerCheckpoint("query_started");
+      }
+      const queryTracking = toolUseContext.queryTracking ? {
+        chainId: toolUseContext.queryTracking.chainId,
+        depth: toolUseContext.queryTracking.depth + 1
+      } : {
+        chainId: deps.uuid(),
+        depth: 0
       };
-    }
-    toolUseContext = {
-      ...toolUseContext,
-      messages: messagesForQuery
-    };
-    const assistantMessages = [];
-    const toolResults = [];
-    const toolUseBlocks = [];
-    let needsFollowUp = false;
-    queryCheckpoint("query_setup_start");
-    const useStreamingToolExecution = config4.gates.streamingToolExecution;
-    let streamingToolExecutor = useStreamingToolExecution ? new StreamingToolExecutor(toolUseContext.options.tools, canUseTool, toolUseContext) : null;
-    const appState = toolUseContext.getAppState();
-    const permissionMode = appState.toolPermissionContext.mode;
-    let currentModel = getRuntimeMainLoopModel({
-      permissionMode,
-      mainLoopModel: toolUseContext.options.mainLoopModel,
-      exceeds200kTokens: permissionMode === "plan" && doesMostRecentAssistantMessageExceed200k(messagesForQuery)
-    });
-    queryCheckpoint("query_setup_end");
-    const dumpPromptsFetch = config4.gates.isAnt ? createDumpPromptsFetch(toolUseContext.agentId ?? config4.sessionId) : undefined;
-    let collapseOwnsIt = false;
-    if (false) {}
-    const mediaRecoveryEnabled = reactiveCompact2?.isReactiveCompactEnabled() ?? false;
-    if (!compactionResult && querySource !== "compact" && querySource !== "session_memory" && !(reactiveCompact2?.isReactiveCompactEnabled() && isAutoCompactEnabled()) && !collapseOwnsIt) {
-      const { isAtBlockingLimit } = calculateTokenWarningState(tokenCountWithEstimation(messagesForQuery) - snipTokensFreed, toolUseContext.options.mainLoopModel);
-      if (isAtBlockingLimit) {
-        yield createAssistantAPIErrorMessage({
-          content: PROMPT_TOO_LONG_ERROR_MESSAGE,
-          error: "invalid_request"
-        });
-        return { reason: "blocking_limit" };
+      const queryChainIdForAnalytics = queryTracking.chainId;
+      toolUseContext = {
+        ...toolUseContext,
+        queryTracking
+      };
+      let messagesForQuery = [...getMessagesAfterCompactBoundary(messages)];
+      let tracking = autoCompactTracking;
+      const persistReplacements = querySource.startsWith("agent:") || querySource.startsWith("repl_main_thread");
+      messagesForQuery = await applyToolResultBudget(messagesForQuery, toolUseContext.contentReplacementState, persistReplacements ? (records) => void recordContentReplacement(records, toolUseContext.agentId).catch(logError2) : undefined, new Set(toolUseContext.options.tools.filter((t2) => !Number.isFinite(t2.maxResultSizeChars)).map((t2) => t2.name)));
+      let snipTokensFreed = 0;
+      if (false) {}
+      queryCheckpoint("query_microcompact_start");
+      const microcompactResult = await deps.microcompact(messagesForQuery, toolUseContext, querySource);
+      messagesForQuery = microcompactResult.messages;
+      const pendingCacheEdits2 = undefined;
+      queryCheckpoint("query_microcompact_end");
+      if (false) {}
+      const fullSystemPrompt = asSystemPrompt(appendSystemContext(systemPrompt, systemContext));
+      queryCheckpoint("query_autocompact_start");
+      const { compactionResult, consecutiveFailures } = await deps.autocompact(messagesForQuery, toolUseContext, {
+        systemPrompt,
+        userContext,
+        systemContext,
+        toolUseContext,
+        forkContextMessages: messagesForQuery
+      }, querySource, tracking, snipTokensFreed);
+      queryCheckpoint("query_autocompact_end");
+      if (compactionResult) {
+        const {
+          preCompactTokenCount,
+          postCompactTokenCount,
+          truePostCompactTokenCount,
+          compactionUsage
+        } = compactionResult;
+        if (params.taskBudget) {
+          const preCompactContext = finalContextTokensFromLastResponse(messagesForQuery);
+          taskBudgetRemaining = Math.max(0, (taskBudgetRemaining ?? params.taskBudget.total) - preCompactContext);
+        }
+        tracking = {
+          compacted: true,
+          turnId: deps.uuid(),
+          turnCounter: 0,
+          consecutiveFailures: 0
+        };
+        const postCompactMessages = buildPostCompactMessages(compactionResult);
+        for (const message of postCompactMessages) {
+          yield message;
+        }
+        messagesForQuery = postCompactMessages;
+      } else if (consecutiveFailures !== undefined) {
+        tracking = {
+          ...tracking ?? { compacted: false, turnId: "", turnCounter: 0 },
+          consecutiveFailures
+        };
       }
-    }
-    let attemptWithFallback = true;
-    queryCheckpoint("query_api_loop_start");
-    try {
-      while (attemptWithFallback) {
-        attemptWithFallback = false;
-        try {
-          let streamingFallbackOccured = false;
-          queryCheckpoint("query_api_streaming_start");
-          for await (const message of deps.callModel({
-            messages: prependUserContext(messagesForQuery, userContext),
-            systemPrompt: fullSystemPrompt,
-            thinkingConfig: toolUseContext.options.thinkingConfig,
-            tools: toolUseContext.options.tools,
-            signal: toolUseContext.abortController.signal,
-            options: {
-              async getToolPermissionContext() {
-                const appState2 = toolUseContext.getAppState();
-                return appState2.toolPermissionContext;
-              },
-              model: currentModel,
-              ...config4.gates.fastModeEnabled && {
-                fastMode: appState.fastMode
-              },
-              toolChoice: undefined,
-              isNonInteractiveSession: toolUseContext.options.isNonInteractiveSession,
-              fallbackModel,
-              onStreamingFallback: () => {
-                streamingFallbackOccured = true;
-              },
-              querySource,
-              agents: toolUseContext.options.agentDefinitions.activeAgents,
-              allowedAgentTypes: toolUseContext.options.agentDefinitions.allowedAgentTypes,
-              hasAppendSystemPrompt: !!toolUseContext.options.appendSystemPrompt,
-              maxOutputTokensOverride,
-              fetchOverride: dumpPromptsFetch,
-              mcpTools: appState.mcp.tools,
-              hasPendingMcpServers: appState.mcp.clients.some((c5) => c5.type === "pending"),
-              queryTracking,
-              effortValue: appState.effortValue,
-              advisorModel: appState.advisorModel,
-              skipCacheWrite,
-              agentId: toolUseContext.agentId,
-              addNotification: toolUseContext.addNotification,
-              routeContext: buildRouteContext(turnCount, querySource, messagesForQuery, toolUseContext.options.maxBudgetUsd),
-              ...params.taskBudget && {
-                taskBudget: {
-                  total: params.taskBudget.total,
-                  ...taskBudgetRemaining !== undefined && {
-                    remaining: taskBudgetRemaining
+      toolUseContext = {
+        ...toolUseContext,
+        messages: messagesForQuery
+      };
+      const assistantMessages = [];
+      const toolResults = [];
+      const toolUseBlocks = [];
+      let needsFollowUp = false;
+      queryCheckpoint("query_setup_start");
+      const useStreamingToolExecution = config4.gates.streamingToolExecution;
+      let streamingToolExecutor = useStreamingToolExecution ? new StreamingToolExecutor(toolUseContext.options.tools, canUseTool, toolUseContext) : null;
+      const appState = toolUseContext.getAppState();
+      const permissionMode = appState.toolPermissionContext.mode;
+      let currentModel = getRuntimeMainLoopModel({
+        permissionMode,
+        mainLoopModel: toolUseContext.options.mainLoopModel,
+        exceeds200kTokens: permissionMode === "plan" && doesMostRecentAssistantMessageExceed200k(messagesForQuery)
+      });
+      queryCheckpoint("query_setup_end");
+      const dumpPromptsFetch = config4.gates.isAnt ? createDumpPromptsFetch(toolUseContext.agentId ?? config4.sessionId) : undefined;
+      let collapseOwnsIt = false;
+      if (false) {}
+      const mediaRecoveryEnabled = reactiveCompact2?.isReactiveCompactEnabled() ?? false;
+      if (!compactionResult && querySource !== "compact" && querySource !== "session_memory" && !(reactiveCompact2?.isReactiveCompactEnabled() && isAutoCompactEnabled()) && !collapseOwnsIt) {
+        const { isAtBlockingLimit } = calculateTokenWarningState(tokenCountWithEstimation(messagesForQuery) - snipTokensFreed, toolUseContext.options.mainLoopModel);
+        if (isAtBlockingLimit) {
+          yield createAssistantAPIErrorMessage({
+            content: PROMPT_TOO_LONG_ERROR_MESSAGE,
+            error: "invalid_request"
+          });
+          return { reason: "blocking_limit" };
+        }
+      }
+      let attemptWithFallback = true;
+      queryCheckpoint("query_api_loop_start");
+      try {
+        while (attemptWithFallback) {
+          attemptWithFallback = false;
+          try {
+            let streamingFallbackOccured = false;
+            queryCheckpoint("query_api_streaming_start");
+            for await (const message of deps.callModel({
+              messages: prependUserContext(messagesForQuery, userContext),
+              systemPrompt: fullSystemPrompt,
+              thinkingConfig: toolUseContext.options.thinkingConfig,
+              tools: toolUseContext.options.tools,
+              signal: toolUseContext.abortController.signal,
+              options: {
+                async getToolPermissionContext() {
+                  const appState2 = toolUseContext.getAppState();
+                  return appState2.toolPermissionContext;
+                },
+                model: currentModel,
+                ...config4.gates.fastModeEnabled && {
+                  fastMode: appState.fastMode
+                },
+                toolChoice: undefined,
+                isNonInteractiveSession: toolUseContext.options.isNonInteractiveSession,
+                fallbackModel,
+                onStreamingFallback: () => {
+                  streamingFallbackOccured = true;
+                },
+                querySource,
+                agents: toolUseContext.options.agentDefinitions.activeAgents,
+                allowedAgentTypes: toolUseContext.options.agentDefinitions.allowedAgentTypes,
+                hasAppendSystemPrompt: !!toolUseContext.options.appendSystemPrompt,
+                maxOutputTokensOverride,
+                fetchOverride: dumpPromptsFetch,
+                mcpTools: appState.mcp.tools,
+                hasPendingMcpServers: appState.mcp.clients.some((c5) => c5.type === "pending"),
+                queryTracking,
+                effortValue: appState.effortValue,
+                advisorModel: appState.advisorModel,
+                skipCacheWrite,
+                agentId: toolUseContext.agentId,
+                addNotification: toolUseContext.addNotification,
+                routeContext: buildRouteContext(turnCount, querySource, messagesForQuery, toolUseContext.options.maxBudgetUsd),
+                ...params.taskBudget && {
+                  taskBudget: {
+                    total: params.taskBudget.total,
+                    ...taskBudgetRemaining !== undefined && {
+                      remaining: taskBudgetRemaining
+                    }
                   }
                 }
               }
-            }
-          })) {
-            if (streamingFallbackOccured) {
-              for (const msg of assistantMessages) {
-                yield { type: "tombstone", message: msg };
-              }
-              assistantMessages.length = 0;
-              toolResults.length = 0;
-              toolUseBlocks.length = 0;
-              needsFollowUp = false;
-              if (streamingToolExecutor) {
-                streamingToolExecutor.discard();
-                streamingToolExecutor = new StreamingToolExecutor(toolUseContext.options.tools, canUseTool, toolUseContext);
+            })) {
+              if (streamingFallbackOccured) {
+                for (const msg of assistantMessages) {
+                  yield { type: "tombstone", message: msg };
+                }
+                assistantMessages.length = 0;
+                toolResults.length = 0;
+                toolUseBlocks.length = 0;
+                needsFollowUp = false;
+                if (streamingToolExecutor) {
+                  streamingToolExecutor.discard();
+                  streamingToolExecutor = new StreamingToolExecutor(toolUseContext.options.tools, canUseTool, toolUseContext);
+                }
               }
-            }
-            let yieldMessage = message;
-            if (message.type === "assistant") {
-              let clonedContent;
-              for (let i4 = 0;i4 < message.message.content.length; i4++) {
-                const block2 = message.message.content[i4];
-                if (block2.type === "tool_use" && typeof block2.input === "object" && block2.input !== null) {
-                  const tool = findToolByName(toolUseContext.options.tools, block2.name);
-                  if (tool?.backfillObservableInput) {
-                    const originalInput = block2.input;
-                    const inputCopy = { ...originalInput };
-                    tool.backfillObservableInput(inputCopy);
-                    const addedFields = Object.keys(inputCopy).some((k2) => !(k2 in originalInput));
-                    if (addedFields) {
-                      clonedContent ??= [...message.message.content];
-                      clonedContent[i4] = { ...block2, input: inputCopy };
+              let yieldMessage = message;
+              if (message.type === "assistant") {
+                let clonedContent;
+                for (let i4 = 0;i4 < message.message.content.length; i4++) {
+                  const block2 = message.message.content[i4];
+                  if (block2.type === "tool_use" && typeof block2.input === "object" && block2.input !== null) {
+                    const tool = findToolByName(toolUseContext.options.tools, block2.name);
+                    if (tool?.backfillObservableInput) {
+                      const originalInput = block2.input;
+                      const inputCopy = { ...originalInput };
+                      tool.backfillObservableInput(inputCopy);
+                      const addedFields = Object.keys(inputCopy).some((k2) => !(k2 in originalInput));
+                      if (addedFields) {
+                        clonedContent ??= [...message.message.content];
+                        clonedContent[i4] = { ...block2, input: inputCopy };
+                      }
                     }
                   }
                 }
+                if (clonedContent) {
+                  yieldMessage = {
+                    ...message,
+                    message: { ...message.message, content: clonedContent }
+                  };
+                }
               }
-              if (clonedContent) {
-                yieldMessage = {
-                  ...message,
-                  message: { ...message.message, content: clonedContent }
-                };
+              let withheld = false;
+              if (false) {}
+              if (reactiveCompact2?.isWithheldPromptTooLong(message)) {
+                withheld = true;
               }
-            }
-            let withheld = false;
-            if (false) {}
-            if (reactiveCompact2?.isWithheldPromptTooLong(message)) {
-              withheld = true;
-            }
-            if (mediaRecoveryEnabled && reactiveCompact2?.isWithheldMediaSizeError(message)) {
-              withheld = true;
-            }
-            if (isWithheldMaxOutputTokens(message)) {
-              withheld = true;
-            }
-            if (!withheld) {
-              yield yieldMessage;
-            }
-            if (message.type === "assistant") {
-              assistantMessages.push(message);
-              const msgToolUseBlocks = message.message.content.filter((content) => content.type === "tool_use");
-              if (msgToolUseBlocks.length > 0) {
-                toolUseBlocks.push(...msgToolUseBlocks);
-                needsFollowUp = true;
+              if (mediaRecoveryEnabled && reactiveCompact2?.isWithheldMediaSizeError(message)) {
+                withheld = true;
               }
-              if (streamingToolExecutor && !toolUseContext.abortController.signal.aborted) {
-                for (const toolBlock of msgToolUseBlocks) {
-                  streamingToolExecutor.addTool(toolBlock, message);
+              if (isWithheldMaxOutputTokens(message)) {
+                withheld = true;
+              }
+              if (!withheld) {
+                yield yieldMessage;
+              }
+              if (message.type === "assistant") {
+                assistantMessages.push(message);
+                const msgToolUseBlocks = message.message.content.filter((content) => content.type === "tool_use");
+                if (msgToolUseBlocks.length > 0) {
+                  toolUseBlocks.push(...msgToolUseBlocks);
+                  needsFollowUp = true;
+                }
+                if (streamingToolExecutor && !toolUseContext.abortController.signal.aborted) {
+                  for (const toolBlock of msgToolUseBlocks) {
+                    streamingToolExecutor.addTool(toolBlock, message);
+                  }
                 }
               }
-            }
-            if (streamingToolExecutor && !toolUseContext.abortController.signal.aborted) {
-              for (const result of streamingToolExecutor.getCompletedResults()) {
-                if (result.message) {
-                  yield result.message;
-                  toolResults.push(...normalizeMessagesForAPI([result.message], toolUseContext.options.tools).filter((_) => _.type === "user"));
+              if (streamingToolExecutor && !toolUseContext.abortController.signal.aborted) {
+                for (const result of streamingToolExecutor.getCompletedResults()) {
+                  if (result.message) {
+                    yield result.message;
+                    toolResults.push(...normalizeMessagesForAPI([result.message], toolUseContext.options.tools).filter((_) => _.type === "user"));
+                  }
                 }
               }
             }
-          }
-          queryCheckpoint("query_api_streaming_end");
-          if (false) {}
-        } catch (innerError) {
-          if (innerError instanceof FallbackTriggeredError && fallbackModel) {
-            currentModel = fallbackModel;
-            attemptWithFallback = true;
-            yield* yieldMissingToolResultBlocks(assistantMessages, "Model fallback triggered");
-            assistantMessages.length = 0;
-            toolResults.length = 0;
-            toolUseBlocks.length = 0;
-            needsFollowUp = false;
-            if (streamingToolExecutor) {
-              streamingToolExecutor.discard();
-              streamingToolExecutor = new StreamingToolExecutor(toolUseContext.options.tools, canUseTool, toolUseContext);
-            }
-            toolUseContext.options.mainLoopModel = fallbackModel;
-            if (process.env.USER_TYPE === "ant") {
-              messagesForQuery = stripSignatureBlocks(messagesForQuery);
+            queryCheckpoint("query_api_streaming_end");
+            if (false) {}
+          } catch (innerError) {
+            if (innerError instanceof FallbackTriggeredError && fallbackModel) {
+              currentModel = fallbackModel;
+              attemptWithFallback = true;
+              yield* yieldMissingToolResultBlocks(assistantMessages, "Model fallback triggered");
+              assistantMessages.length = 0;
+              toolResults.length = 0;
+              toolUseBlocks.length = 0;
+              needsFollowUp = false;
+              if (streamingToolExecutor) {
+                streamingToolExecutor.discard();
+                streamingToolExecutor = new StreamingToolExecutor(toolUseContext.options.tools, canUseTool, toolUseContext);
+              }
+              toolUseContext.options.mainLoopModel = fallbackModel;
+              if (process.env.USER_TYPE === "ant") {
+                messagesForQuery = stripSignatureBlocks(messagesForQuery);
+              }
+              yield createSystemMessage(`Switched to ${renderModelName(innerError.fallbackModel)} due to high demand for ${renderModelName(innerError.originalModel)}`, "warning");
+              continue;
             }
-            yield createSystemMessage(`Switched to ${renderModelName(innerError.fallbackModel)} due to high demand for ${renderModelName(innerError.originalModel)}`, "warning");
-            continue;
+            throw innerError;
           }
-          throw innerError;
         }
-      }
-    } catch (error41) {
-      logError2(error41);
-      const errorMessage2 = error41 instanceof Error ? error41.message : String(error41);
-      if (error41 instanceof ImageSizeError || error41 instanceof ImageResizeError) {
+      } catch (error41) {
+        logError2(error41);
+        const errorMessage2 = error41 instanceof Error ? error41.message : String(error41);
+        if (error41 instanceof ImageSizeError || error41 instanceof ImageResizeError) {
+          yield createAssistantAPIErrorMessage({
+            content: error41.message
+          });
+          return { reason: "image_error" };
+        }
+        yield* yieldMissingToolResultBlocks(assistantMessages, errorMessage2);
         yield createAssistantAPIErrorMessage({
-          content: error41.message
+          content: errorMessage2
         });
-        return { reason: "image_error" };
+        logAntError("Query error", error41);
+        return { reason: "model_error", error: error41 };
       }
-      yield* yieldMissingToolResultBlocks(assistantMessages, errorMessage2);
-      yield createAssistantAPIErrorMessage({
-        content: errorMessage2
-      });
-      logAntError("Query error", error41);
-      return { reason: "model_error", error: error41 };
-    }
-    if (assistantMessages.length > 0) {
-      executePostSamplingHooks([...messagesForQuery, ...assistantMessages], systemPrompt, userContext, systemContext, toolUseContext, querySource);
-    }
-    if (toolUseContext.abortController.signal.aborted) {
-      if (streamingToolExecutor) {
-        for await (const update of streamingToolExecutor.getRemainingResults()) {
-          if (update.message) {
-            yield update.message;
+      if (assistantMessages.length > 0) {
+        executePostSamplingHooks([...messagesForQuery, ...assistantMessages], systemPrompt, userContext, systemContext, toolUseContext, querySource);
+      }
+      if (toolUseContext.abortController.signal.aborted) {
+        if (streamingToolExecutor) {
+          for await (const update of streamingToolExecutor.getRemainingResults()) {
+            if (update.message) {
+              yield update.message;
+            }
           }
+        } else {
+          yield* yieldMissingToolResultBlocks(assistantMessages, "Interrupted by user");
         }
-      } else {
-        yield* yieldMissingToolResultBlocks(assistantMessages, "Interrupted by user");
-      }
-      if (false) {}
-      if (toolUseContext.abortController.signal.reason !== "interrupt") {
-        yield createUserInterruptionMessage({
-          toolUse: false
-        });
-      }
-      return { reason: "aborted_streaming" };
-    }
-    if (pendingToolUseSummary) {
-      const summary = await pendingToolUseSummary;
-      if (summary) {
-        yield summary;
-      }
-    }
-    if (!needsFollowUp) {
-      const lastMessage = assistantMessages.at(-1);
-      const isWithheld413 = lastMessage?.type === "assistant" && lastMessage.isApiErrorMessage && isPromptTooLongMessage(lastMessage);
-      const isWithheldMedia = mediaRecoveryEnabled && reactiveCompact2?.isWithheldMediaSizeError(lastMessage);
-      if (isWithheld413) {
         if (false) {}
+        if (toolUseContext.abortController.signal.reason !== "interrupt") {
+          yield createUserInterruptionMessage({
+            toolUse: false
+          });
+        }
+        return { reason: "aborted_streaming" };
       }
-      if ((isWithheld413 || isWithheldMedia) && reactiveCompact2) {
-        const compacted = await reactiveCompact2.tryReactiveCompact({
-          hasAttempted: hasAttemptedReactiveCompact,
-          querySource,
-          aborted: toolUseContext.abortController.signal.aborted,
-          messages: messagesForQuery,
-          cacheSafeParams: {
-            systemPrompt,
-            userContext,
-            systemContext,
-            toolUseContext,
-            forkContextMessages: messagesForQuery
+      if (pendingToolUseSummary) {
+        const summary = await pendingToolUseSummary;
+        if (summary) {
+          yield summary;
+        }
+      }
+      if (!needsFollowUp) {
+        const lastMessage = assistantMessages.at(-1);
+        const isWithheld413 = lastMessage?.type === "assistant" && lastMessage.isApiErrorMessage && isPromptTooLongMessage(lastMessage);
+        const isWithheldMedia = mediaRecoveryEnabled && reactiveCompact2?.isWithheldMediaSizeError(lastMessage);
+        if (isWithheld413) {
+          if (false) {}
+        }
+        if ((isWithheld413 || isWithheldMedia) && reactiveCompact2) {
+          const compacted = await reactiveCompact2.tryReactiveCompact({
+            hasAttempted: hasAttemptedReactiveCompact,
+            querySource,
+            aborted: toolUseContext.abortController.signal.aborted,
+            messages: messagesForQuery,
+            cacheSafeParams: {
+              systemPrompt,
+              userContext,
+              systemContext,
+              toolUseContext,
+              forkContextMessages: messagesForQuery
+            }
+          });
+          if (compacted) {
+            if (params.taskBudget) {
+              const preCompactContext = finalContextTokensFromLastResponse(messagesForQuery);
+              taskBudgetRemaining = Math.max(0, (taskBudgetRemaining ?? params.taskBudget.total) - preCompactContext);
+            }
+            const postCompactMessages = buildPostCompactMessages(compacted);
+            for (const msg of postCompactMessages) {
+              yield msg;
+            }
+            const next3 = {
+              messages: postCompactMessages,
+              toolUseContext,
+              autoCompactTracking: undefined,
+              maxOutputTokensRecoveryCount,
+              hasAttemptedReactiveCompact: true,
+              maxOutputTokensOverride: undefined,
+              pendingToolUseSummary: undefined,
+              stopHookActive: undefined,
+              turnCount,
+              transition: { reason: "reactive_compact_retry" }
+            };
+            state = next3;
+            continue;
           }
-        });
-        if (compacted) {
-          if (params.taskBudget) {
-            const preCompactContext = finalContextTokensFromLastResponse(messagesForQuery);
-            taskBudgetRemaining = Math.max(0, (taskBudgetRemaining ?? params.taskBudget.total) - preCompactContext);
+          yield lastMessage;
+          executeStopFailureHooks(lastMessage, toolUseContext);
+          return { reason: isWithheldMedia ? "image_error" : "prompt_too_long" };
+        } else if (isWithheld413) {
+          try {
+            const forcedCompactionResult = await compactConversation(messagesForQuery, toolUseContext, {
+              systemPrompt,
+              userContext,
+              systemContext,
+              toolUseContext,
+              forkContextMessages: messagesForQuery
+            }, true, undefined, true, {
+              isRecompactionInChain: tracking?.compacted === true,
+              turnsSincePreviousCompact: tracking?.turnCounter ?? -1,
+              previousCompactTurnId: tracking?.turnId,
+              autoCompactThreshold: getAutoCompactThreshold(currentModel),
+              querySource
+            });
+            if (params.taskBudget) {
+              const preCompactContext = finalContextTokensFromLastResponse(messagesForQuery);
+              taskBudgetRemaining = Math.max(0, (taskBudgetRemaining ?? params.taskBudget.total) - preCompactContext);
+            }
+            const postCompactMessages = buildPostCompactMessages(forcedCompactionResult);
+            for (const msg of postCompactMessages) {
+              yield msg;
+            }
+            tracking = {
+              compacted: true,
+              turnId: deps.uuid(),
+              turnCounter: 0,
+              consecutiveFailures: 0
+            };
+            const next3 = {
+              messages: postCompactMessages,
+              toolUseContext,
+              autoCompactTracking: tracking,
+              maxOutputTokensRecoveryCount,
+              hasAttemptedReactiveCompact: true,
+              maxOutputTokensOverride: undefined,
+              pendingToolUseSummary: undefined,
+              stopHookActive: undefined,
+              turnCount,
+              transition: { reason: "forced_prompt_too_long_compact_retry" }
+            };
+            state = next3;
+            continue;
+          } catch {
+            yield lastMessage;
+            executeStopFailureHooks(lastMessage, toolUseContext);
+            return { reason: "prompt_too_long" };
           }
-          const postCompactMessages = buildPostCompactMessages(compacted);
-          for (const msg of postCompactMessages) {
-            yield msg;
+        } else if (false) {}
+        if (isWithheldMaxOutputTokens(lastMessage)) {
+          const capEnabled = false;
+          if (capEnabled && maxOutputTokensOverride === undefined && !process.env.CLAUDE_CODE_MAX_OUTPUT_TOKENS) {
+            const next3 = {
+              messages: messagesForQuery,
+              toolUseContext,
+              autoCompactTracking: tracking,
+              maxOutputTokensRecoveryCount,
+              hasAttemptedReactiveCompact,
+              maxOutputTokensOverride: ESCALATED_MAX_TOKENS,
+              pendingToolUseSummary: undefined,
+              stopHookActive: undefined,
+              turnCount,
+              transition: { reason: "max_output_tokens_escalate" }
+            };
+            state = next3;
+            continue;
+          }
+          if (maxOutputTokensRecoveryCount < MAX_OUTPUT_TOKENS_RECOVERY_LIMIT) {
+            const recoveryMessage = createUserMessage({
+              content: `Output token limit hit. Resume directly \u2014 no apology, no recap of what you were doing. ` + `Pick up mid-thought if that is where the cut happened. Break remaining work into smaller pieces.`,
+              isMeta: true
+            });
+            const next3 = {
+              messages: [
+                ...messagesForQuery,
+                ...assistantMessages,
+                recoveryMessage
+              ],
+              toolUseContext,
+              autoCompactTracking: tracking,
+              maxOutputTokensRecoveryCount: maxOutputTokensRecoveryCount + 1,
+              hasAttemptedReactiveCompact,
+              maxOutputTokensOverride: undefined,
+              pendingToolUseSummary: undefined,
+              stopHookActive: undefined,
+              turnCount,
+              transition: {
+                reason: "max_output_tokens_recovery",
+                attempt: maxOutputTokensRecoveryCount + 1
+              }
+            };
+            state = next3;
+            continue;
           }
-          const next3 = {
-            messages: postCompactMessages,
-            toolUseContext,
-            autoCompactTracking: undefined,
-            maxOutputTokensRecoveryCount,
-            hasAttemptedReactiveCompact: true,
-            maxOutputTokensOverride: undefined,
-            pendingToolUseSummary: undefined,
-            stopHookActive: undefined,
-            turnCount,
-            transition: { reason: "reactive_compact_retry" }
-          };
-          state = next3;
-          continue;
-        }
-        yield lastMessage;
-        executeStopFailureHooks(lastMessage, toolUseContext);
-        return { reason: isWithheldMedia ? "image_error" : "prompt_too_long" };
-      } else if (isWithheld413) {
-        try {
-          const forcedCompactionResult = await compactConversation(messagesForQuery, toolUseContext, {
-            systemPrompt,
-            userContext,
-            systemContext,
-            toolUseContext,
-            forkContextMessages: messagesForQuery
-          }, true, undefined, true, {
-            isRecompactionInChain: tracking?.compacted === true,
-            turnsSincePreviousCompact: tracking?.turnCounter ?? -1,
-            previousCompactTurnId: tracking?.turnId,
-            autoCompactThreshold: getAutoCompactThreshold(currentModel),
-            querySource
-          });
-          if (params.taskBudget) {
-            const preCompactContext = finalContextTokensFromLastResponse(messagesForQuery);
-            taskBudgetRemaining = Math.max(0, (taskBudgetRemaining ?? params.taskBudget.total) - preCompactContext);
-          }
-          const postCompactMessages = buildPostCompactMessages(forcedCompactionResult);
-          for (const msg of postCompactMessages) {
-            yield msg;
-          }
-          tracking = {
-            compacted: true,
-            turnId: deps.uuid(),
-            turnCounter: 0,
-            consecutiveFailures: 0
-          };
-          const next3 = {
-            messages: postCompactMessages,
-            toolUseContext,
-            autoCompactTracking: tracking,
-            maxOutputTokensRecoveryCount,
-            hasAttemptedReactiveCompact: true,
-            maxOutputTokensOverride: undefined,
-            pendingToolUseSummary: undefined,
-            stopHookActive: undefined,
-            turnCount,
-            transition: { reason: "forced_prompt_too_long_compact_retry" }
-          };
-          state = next3;
-          continue;
-        } catch {
           yield lastMessage;
+        }
+        if (lastMessage?.isApiErrorMessage) {
           executeStopFailureHooks(lastMessage, toolUseContext);
-          return { reason: "prompt_too_long" };
+          return { reason: "completed" };
         }
-      } else if (false) {}
-      if (isWithheldMaxOutputTokens(lastMessage)) {
-        const capEnabled = false;
-        if (capEnabled && maxOutputTokensOverride === undefined && !process.env.CLAUDE_CODE_MAX_OUTPUT_TOKENS) {
-          const next3 = {
-            messages: messagesForQuery,
-            toolUseContext,
-            autoCompactTracking: tracking,
-            maxOutputTokensRecoveryCount,
-            hasAttemptedReactiveCompact,
-            maxOutputTokensOverride: ESCALATED_MAX_TOKENS,
-            pendingToolUseSummary: undefined,
-            stopHookActive: undefined,
-            turnCount,
-            transition: { reason: "max_output_tokens_escalate" }
-          };
-          state = next3;
-          continue;
+        const stopHookResult = yield* handleStopHooks(messagesForQuery, assistantMessages, systemPrompt, userContext, systemContext, toolUseContext, querySource, stopHookActive);
+        if (stopHookResult.preventContinuation) {
+          return { reason: "stop_hook_prevented" };
         }
-        if (maxOutputTokensRecoveryCount < MAX_OUTPUT_TOKENS_RECOVERY_LIMIT) {
-          const recoveryMessage = createUserMessage({
-            content: `Output token limit hit. Resume directly \u2014 no apology, no recap of what you were doing. ` + `Pick up mid-thought if that is where the cut happened. Break remaining work into smaller pieces.`,
-            isMeta: true
-          });
+        if (stopHookResult.blockingErrors.length > 0) {
           const next3 = {
             messages: [
               ...messagesForQuery,
               ...assistantMessages,
-              recoveryMessage
+              ...stopHookResult.blockingErrors
             ],
             toolUseContext,
             autoCompactTracking: tracking,
-            maxOutputTokensRecoveryCount: maxOutputTokensRecoveryCount + 1,
+            maxOutputTokensRecoveryCount: 0,
             hasAttemptedReactiveCompact,
             maxOutputTokensOverride: undefined,
             pendingToolUseSummary: undefined,
-            stopHookActive: undefined,
+            stopHookActive: true,
             turnCount,
-            transition: {
-              reason: "max_output_tokens_recovery",
-              attempt: maxOutputTokensRecoveryCount + 1
-            }
+            transition: { reason: "stop_hook_blocking" }
           };
           state = next3;
           continue;
         }
-        yield lastMessage;
-      }
-      if (lastMessage?.isApiErrorMessage) {
-        executeStopFailureHooks(lastMessage, toolUseContext);
+        if (false) {}
         return { reason: "completed" };
       }
-      const stopHookResult = yield* handleStopHooks(messagesForQuery, assistantMessages, systemPrompt, userContext, systemContext, toolUseContext, querySource, stopHookActive);
-      if (stopHookResult.preventContinuation) {
-        return { reason: "stop_hook_prevented" };
-      }
-      if (stopHookResult.blockingErrors.length > 0) {
-        const next3 = {
-          messages: [
-            ...messagesForQuery,
-            ...assistantMessages,
-            ...stopHookResult.blockingErrors
-          ],
-          toolUseContext,
-          autoCompactTracking: tracking,
-          maxOutputTokensRecoveryCount: 0,
-          hasAttemptedReactiveCompact,
-          maxOutputTokensOverride: undefined,
-          pendingToolUseSummary: undefined,
-          stopHookActive: true,
-          turnCount,
-          transition: { reason: "stop_hook_blocking" }
-        };
-        state = next3;
-        continue;
-      }
-      if (false) {}
-      return { reason: "completed" };
-    }
-    let shouldPreventContinuation = false;
-    let updatedToolUseContext = toolUseContext;
-    queryCheckpoint("query_tool_execution_start");
-    if (streamingToolExecutor) {}
-    const toolUpdates = streamingToolExecutor ? streamingToolExecutor.getRemainingResults() : runTools(toolUseBlocks, assistantMessages, canUseTool, toolUseContext);
-    for await (const update of toolUpdates) {
-      if (update.message) {
-        yield update.message;
-        if (update.message.type === "attachment" && update.message.attachment.type === "hook_stopped_continuation") {
-          shouldPreventContinuation = true;
-        }
-        toolResults.push(...normalizeMessagesForAPI([update.message], toolUseContext.options.tools).filter((_) => _.type === "user"));
-      }
-      if (update.newContext) {
-        updatedToolUseContext = {
-          ...update.newContext,
-          queryTracking
-        };
-      }
-    }
-    queryCheckpoint("query_tool_execution_end");
-    let nextPendingToolUseSummary;
-    if (config4.gates.emitToolUseSummaries && toolUseBlocks.length > 0 && !toolUseContext.abortController.signal.aborted && !toolUseContext.agentId) {
-      const lastAssistantMessage = assistantMessages.at(-1);
-      let lastAssistantText;
-      if (lastAssistantMessage) {
-        const textBlocks = lastAssistantMessage.message.content.filter((block2) => block2.type === "text");
-        if (textBlocks.length > 0) {
-          const lastTextBlock = textBlocks.at(-1);
-          if (lastTextBlock && "text" in lastTextBlock) {
-            lastAssistantText = lastTextBlock.text;
+      let shouldPreventContinuation = false;
+      let updatedToolUseContext = toolUseContext;
+      queryCheckpoint("query_tool_execution_start");
+      if (streamingToolExecutor) {}
+      const toolUpdates = streamingToolExecutor ? streamingToolExecutor.getRemainingResults() : runTools(toolUseBlocks, assistantMessages, canUseTool, toolUseContext);
+      for await (const update of toolUpdates) {
+        if (update.message) {
+          yield update.message;
+          if (update.message.type === "attachment" && update.message.attachment.type === "hook_stopped_continuation") {
+            shouldPreventContinuation = true;
           }
+          toolResults.push(...normalizeMessagesForAPI([update.message], toolUseContext.options.tools).filter((_) => _.type === "user"));
+        }
+        if (update.newContext) {
+          updatedToolUseContext = {
+            ...update.newContext,
+            queryTracking
+          };
         }
       }
-      const toolUseIds = toolUseBlocks.map((block2) => block2.id);
-      const toolInfoForSummary = toolUseBlocks.map((block2) => {
-        const toolResult = toolResults.find((result) => result.type === "user" && Array.isArray(result.message.content) && result.message.content.some((content) => content.type === "tool_result" && content.tool_use_id === block2.id));
-        const resultContent = toolResult?.type === "user" && Array.isArray(toolResult.message.content) ? toolResult.message.content.find((c5) => c5.type === "tool_result" && c5.tool_use_id === block2.id) : undefined;
-        return {
-          name: block2.name,
-          input: block2.input,
-          output: resultContent && "content" in resultContent ? resultContent.content : null
-        };
-      });
-      nextPendingToolUseSummary = generateToolUseSummary({
-        tools: toolInfoForSummary,
-        signal: toolUseContext.abortController.signal,
-        isNonInteractiveSession: toolUseContext.options.isNonInteractiveSession,
-        lastAssistantText
-      }).then((summary) => {
-        if (summary) {
-          return createToolUseSummaryMessage(summary, toolUseIds);
+      queryCheckpoint("query_tool_execution_end");
+      let nextPendingToolUseSummary;
+      if (config4.gates.emitToolUseSummaries && toolUseBlocks.length > 0 && !toolUseContext.abortController.signal.aborted && !toolUseContext.agentId) {
+        const lastAssistantMessage = assistantMessages.at(-1);
+        let lastAssistantText;
+        if (lastAssistantMessage) {
+          const textBlocks = lastAssistantMessage.message.content.filter((block2) => block2.type === "text");
+          if (textBlocks.length > 0) {
+            const lastTextBlock = textBlocks.at(-1);
+            if (lastTextBlock && "text" in lastTextBlock) {
+              lastAssistantText = lastTextBlock.text;
+            }
+          }
         }
-        return null;
-      }).catch(() => null);
-    }
-    if (toolUseContext.abortController.signal.aborted) {
-      if (false) {}
-      if (toolUseContext.abortController.signal.reason !== "interrupt") {
-        yield createUserInterruptionMessage({
-          toolUse: true
+        const toolUseIds = toolUseBlocks.map((block2) => block2.id);
+        const toolInfoForSummary = toolUseBlocks.map((block2) => {
+          const toolResult = toolResults.find((result) => result.type === "user" && Array.isArray(result.message.content) && result.message.content.some((content) => content.type === "tool_result" && content.tool_use_id === block2.id));
+          const resultContent = toolResult?.type === "user" && Array.isArray(toolResult.message.content) ? toolResult.message.content.find((c5) => c5.type === "tool_result" && c5.tool_use_id === block2.id) : undefined;
+          return {
+            name: block2.name,
+            input: block2.input,
+            output: resultContent && "content" in resultContent ? resultContent.content : null
+          };
         });
+        nextPendingToolUseSummary = generateToolUseSummary({
+          tools: toolInfoForSummary,
+          signal: toolUseContext.abortController.signal,
+          isNonInteractiveSession: toolUseContext.options.isNonInteractiveSession,
+          lastAssistantText
+        }).then((summary) => {
+          if (summary) {
+            return createToolUseSummaryMessage(summary, toolUseIds);
+          }
+          return null;
+        }).catch(() => null);
       }
-      const nextTurnCountOnAbort = turnCount + 1;
-      if (maxTurns && nextTurnCountOnAbort > maxTurns) {
+      if (toolUseContext.abortController.signal.aborted) {
+        if (false) {}
+        if (toolUseContext.abortController.signal.reason !== "interrupt") {
+          yield createUserInterruptionMessage({
+            toolUse: true
+          });
+        }
+        const nextTurnCountOnAbort = turnCount + 1;
+        if (maxTurns && nextTurnCountOnAbort > maxTurns) {
+          yield createAttachmentMessage({
+            type: "max_turns_reached",
+            maxTurns,
+            turnCount: nextTurnCountOnAbort
+          });
+        }
+        return { reason: "aborted_tools" };
+      }
+      if (shouldPreventContinuation) {
+        return { reason: "hook_stopped" };
+      }
+      if (tracking?.compacted) {
+        tracking.turnCounter++;
+      }
+      const sleepRan = toolUseBlocks.some((b3) => b3.name === SLEEP_TOOL_NAME);
+      const isMainThread = querySource.startsWith("repl_main_thread") || querySource === "sdk";
+      const currentAgentId = toolUseContext.agentId;
+      const queuedCommandsSnapshot = getCommandsByMaxPriority(sleepRan ? "later" : "next").filter((cmd) => {
+        if (isSlashCommand(cmd))
+          return false;
+        if (isMainThread)
+          return cmd.agentId === undefined;
+        return cmd.mode === "task-notification" && cmd.agentId === currentAgentId;
+      });
+      for await (const attachment of getAttachmentMessages(null, updatedToolUseContext, null, queuedCommandsSnapshot, [...messagesForQuery, ...assistantMessages, ...toolResults], querySource)) {
+        yield attachment;
+        toolResults.push(attachment);
+      }
+      if (pendingMemoryPrefetch && pendingMemoryPrefetch.settledAt !== null && pendingMemoryPrefetch.consumedOnIteration === -1) {
+        const memoryAttachments = filterDuplicateMemoryAttachments(await pendingMemoryPrefetch.promise, toolUseContext.readFileState);
+        for (const memAttachment of memoryAttachments) {
+          const msg = createAttachmentMessage(memAttachment);
+          yield msg;
+          toolResults.push(msg);
+        }
+        pendingMemoryPrefetch.consumedOnIteration = turnCount - 1;
+      }
+      if (skillPrefetch && pendingSkillPrefetch) {
+        const skillAttachments = await skillPrefetch.collectSkillDiscoveryPrefetch(pendingSkillPrefetch);
+        for (const att of skillAttachments) {
+          const msg = createAttachmentMessage(att);
+          yield msg;
+          toolResults.push(msg);
+        }
+      }
+      const consumedCommands = queuedCommandsSnapshot.filter((cmd) => cmd.mode === "prompt" || cmd.mode === "task-notification");
+      if (consumedCommands.length > 0) {
+        for (const cmd of consumedCommands) {
+          if (cmd.uuid) {
+            consumedCommandUuids.push(cmd.uuid);
+            notifyCommandLifecycle(cmd.uuid, "started");
+          }
+        }
+        remove(consumedCommands);
+      }
+      const fileChangeAttachmentCount = count2(toolResults, (tr) => tr.type === "attachment" && tr.attachment.type === "edited_text_file");
+      if (updatedToolUseContext.options.refreshTools) {
+        const refreshedTools = updatedToolUseContext.options.refreshTools();
+        if (refreshedTools !== updatedToolUseContext.options.tools) {
+          updatedToolUseContext = {
+            ...updatedToolUseContext,
+            options: {
+              ...updatedToolUseContext.options,
+              tools: refreshedTools
+            }
+          };
+        }
+      }
+      const toolUseContextWithQueryTracking = {
+        ...updatedToolUseContext,
+        queryTracking
+      };
+      const nextTurnCount = turnCount + 1;
+      if (false) {}
+      if (maxTurns && nextTurnCount > maxTurns) {
         yield createAttachmentMessage({
           type: "max_turns_reached",
           maxTurns,
-          turnCount: nextTurnCountOnAbort
+          turnCount: nextTurnCount
         });
+        return { reason: "max_turns", turnCount: nextTurnCount };
       }
-      return { reason: "aborted_tools" };
-    }
-    if (shouldPreventContinuation) {
-      return { reason: "hook_stopped" };
-    }
-    if (tracking?.compacted) {
-      tracking.turnCounter++;
-    }
-    const sleepRan = toolUseBlocks.some((b3) => b3.name === SLEEP_TOOL_NAME);
-    const isMainThread = querySource.startsWith("repl_main_thread") || querySource === "sdk";
-    const currentAgentId = toolUseContext.agentId;
-    const queuedCommandsSnapshot = getCommandsByMaxPriority(sleepRan ? "later" : "next").filter((cmd) => {
-      if (isSlashCommand(cmd))
-        return false;
-      if (isMainThread)
-        return cmd.agentId === undefined;
-      return cmd.mode === "task-notification" && cmd.agentId === currentAgentId;
-    });
-    for await (const attachment of getAttachmentMessages(null, updatedToolUseContext, null, queuedCommandsSnapshot, [...messagesForQuery, ...assistantMessages, ...toolResults], querySource)) {
-      yield attachment;
-      toolResults.push(attachment);
-    }
-    if (pendingMemoryPrefetch && pendingMemoryPrefetch.settledAt !== null && pendingMemoryPrefetch.consumedOnIteration === -1) {
-      const memoryAttachments = filterDuplicateMemoryAttachments(await pendingMemoryPrefetch.promise, toolUseContext.readFileState);
-      for (const memAttachment of memoryAttachments) {
-        const msg = createAttachmentMessage(memAttachment);
-        yield msg;
-        toolResults.push(msg);
-      }
-      pendingMemoryPrefetch.consumedOnIteration = turnCount - 1;
-    }
-    if (skillPrefetch && pendingSkillPrefetch) {
-      const skillAttachments = await skillPrefetch.collectSkillDiscoveryPrefetch(pendingSkillPrefetch);
-      for (const att of skillAttachments) {
-        const msg = createAttachmentMessage(att);
-        yield msg;
-        toolResults.push(msg);
-      }
-    }
-    const consumedCommands = queuedCommandsSnapshot.filter((cmd) => cmd.mode === "prompt" || cmd.mode === "task-notification");
-    if (consumedCommands.length > 0) {
-      for (const cmd of consumedCommands) {
-        if (cmd.uuid) {
-          consumedCommandUuids.push(cmd.uuid);
-          notifyCommandLifecycle(cmd.uuid, "started");
-        }
-      }
-      remove(consumedCommands);
-    }
-    const fileChangeAttachmentCount = count2(toolResults, (tr) => tr.type === "attachment" && tr.attachment.type === "edited_text_file");
-    if (updatedToolUseContext.options.refreshTools) {
-      const refreshedTools = updatedToolUseContext.options.refreshTools();
-      if (refreshedTools !== updatedToolUseContext.options.tools) {
-        updatedToolUseContext = {
-          ...updatedToolUseContext,
-          options: {
-            ...updatedToolUseContext.options,
-            tools: refreshedTools
-          }
-        };
-      }
+      queryCheckpoint("query_recursive_call");
+      const next2 = {
+        messages: [...messagesForQuery, ...assistantMessages, ...toolResults],
+        toolUseContext: toolUseContextWithQueryTracking,
+        autoCompactTracking: tracking,
+        turnCount: nextTurnCount,
+        maxOutputTokensRecoveryCount: 0,
+        hasAttemptedReactiveCompact: false,
+        pendingToolUseSummary: nextPendingToolUseSummary,
+        maxOutputTokensOverride: undefined,
+        stopHookActive,
+        transition: { reason: "next_turn" }
+      };
+      state = next2;
     }
-    const toolUseContextWithQueryTracking = {
-      ...updatedToolUseContext,
-      queryTracking
-    };
-    const nextTurnCount = turnCount + 1;
-    if (false) {}
-    if (maxTurns && nextTurnCount > maxTurns) {
-      yield createAttachmentMessage({
-        type: "max_turns_reached",
-        maxTurns,
-        turnCount: nextTurnCount
-      });
-      return { reason: "max_turns", turnCount: nextTurnCount };
-    }
-    queryCheckpoint("query_recursive_call");
-    const next2 = {
-      messages: [...messagesForQuery, ...assistantMessages, ...toolResults],
-      toolUseContext: toolUseContextWithQueryTracking,
-      autoCompactTracking: tracking,
-      turnCount: nextTurnCount,
-      maxOutputTokensRecoveryCount: 0,
-      hasAttemptedReactiveCompact: false,
-      pendingToolUseSummary: nextPendingToolUseSummary,
-      maxOutputTokensOverride: undefined,
-      stopHookActive,
-      transition: { reason: "next_turn" }
-    };
-    state = next2;
+  } finally {
+    pendingMemoryPrefetch?.[Symbol.dispose]();
   }
 }
 function buildRouteContext(turnCount, querySource, messages, maxBudgetUsd) {
@@ -515666,7 +515677,7 @@ var init_filesystem = __esm(() => {
   });
   getBundledSkillsRoot = memoize_default(function getBundledSkillsRoot2() {
     const nonce = randomBytes18(16).toString("hex");
-    return join146(getClaudeTempDir(), "bundled-skills", "1.0.0-alpha.21", nonce);
+    return join146(getClaudeTempDir(), "bundled-skills", "1.0.0-alpha.23", nonce);
   });
   getResolvedWorkingDirPaths = memoize_default(getPathsForPermissionCheck);
 });
@@ -521596,7 +521607,7 @@ function computeFingerprintFromMessages(messages) {
 }
 var AGENT_OS_VERSION5, FINGERPRINT_SALT = "59cf53e54c78";
 var init_fingerprint = __esm(() => {
-  AGENT_OS_VERSION5 = typeof MACRO !== "undefined" ? "1.0.0-alpha.21" : "dev";
+  AGENT_OS_VERSION5 = typeof MACRO !== "undefined" ? "1.0.0-alpha.23" : "dev";
 });
 
 // src/services/compact/apiMicrocompact.ts
@@ -523350,7 +523361,7 @@ async function sideQuery(opts) {
     betas.push(STRUCTURED_OUTPUTS_BETA_HEADER);
   }
   const messageText = extractFirstUserMessageText(messages);
-  const fingerprint = computeFingerprint(messageText, "1.0.0-alpha.21");
+  const fingerprint = computeFingerprint(messageText, "1.0.0-alpha.23");
   const attributionHeader = getAttributionHeader(fingerprint);
   const systemBlocks = [
     attributionHeader ? { type: "text", text: attributionHeader } : null,
@@ -525269,7 +525280,7 @@ function appendToLog(path24, message) {
     cwd: getFsImplementation().cwd(),
     userType: process.env.USER_TYPE,
     sessionId: getSessionId(),
-    version: "1.0.0-alpha.21"
+    version: "1.0.0-alpha.23"
   };
   getLogWriter(path24).write(messageWithTimestamp);
 }
@@ -528247,7 +528258,7 @@ function getTelemetryAttributes() {
     attributes["session.id"] = sessionId;
   }
   if (shouldIncludeAttribute("OTEL_METRICS_INCLUDE_VERSION")) {
-    attributes["app.version"] = "1.0.0-alpha.21";
+    attributes["app.version"] = "1.0.0-alpha.23";
   }
   if (envDynamic.terminal) {
     attributes["terminal.type"] = envDynamic.terminal;
@@ -538391,7 +538402,7 @@ function buildSystemInitMessage(inputs) {
     slash_commands: inputs.commands.filter((c5) => c5.userInvocable !== false).map((c5) => c5.name),
     apiKeySource: getAnthropicApiKeyWithSource().source,
     betas: getSdkBetas(),
-    claude_code_version: "1.0.0-alpha.21",
+    claude_code_version: "1.0.0-alpha.23",
     output_style: outputStyle2,
     agents: inputs.agents.map((agent) => agent.agentType),
     skills: inputs.skills.filter((s2) => s2.userInvocable !== false).map((skill) => skill.name),
@@ -560860,7 +560871,7 @@ function buildStatusLineCommandInput(permissionMode, exceeds200kTokens, settings
       project_dir: getOriginalCwd(),
       added_dirs: addedDirs
     },
-    version: "1.0.0-alpha.21",
+    version: "1.0.0-alpha.23",
     output_style: {
       name: outputStyleName
     },
@@ -584216,7 +584227,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "1.0.0-alpha.21",
+              "1.0.0-alpha.23",
               " "
             ]
           })
@@ -584416,7 +584427,7 @@ function WelcomeV2() {
           dimColor: true,
           children: [
             "v",
-            "1.0.0-alpha.21",
+            "1.0.0-alpha.23",
             " "
           ]
         })
@@ -584642,7 +584653,7 @@ function AppleTerminalWelcomeV2(t0) {
         dimColor: true,
         children: [
           "v",
-          "1.0.0-alpha.21",
+          "1.0.0-alpha.23",
           " "
         ]
       });
@@ -584896,7 +584907,7 @@ function AppleTerminalWelcomeV2(t0) {
       dimColor: true,
       children: [
         "v",
-        "1.0.0-alpha.21",
+        "1.0.0-alpha.23",
         " "
       ]
     });
@@ -586362,7 +586373,7 @@ function completeOnboarding() {
   saveGlobalConfig((current) => ({
     ...current,
     hasCompletedOnboarding: true,
-    lastOnboardingVersion: "1.0.0-alpha.21"
+    lastOnboardingVersion: "1.0.0-alpha.23"
   }));
 }
 function showDialog(root3, renderer) {
@@ -594825,8 +594836,8 @@ async function getEnvLessBridgeConfig() {
 }
 async function checkEnvLessBridgeMinVersion() {
   const cfg = await getEnvLessBridgeConfig();
-  if (cfg.min_version && lt("1.0.0-alpha.21", cfg.min_version)) {
-    return `Your version of Agent-OS (${"1.0.0-alpha.21"}) is too old for Remote Control.
+  if (cfg.min_version && lt("1.0.0-alpha.23", cfg.min_version)) {
+    return `Your version of Agent-OS (${"1.0.0-alpha.23"}) is too old for Remote Control.
 Version ${cfg.min_version} or higher is required. Run \`agent-os update\` to update.`;
   }
   return null;
@@ -595299,7 +595310,7 @@ async function initBridgeCore(params) {
   const rawApi = createBridgeApiClient({
     baseUrl,
     getAccessToken,
-    runnerVersion: "1.0.0-alpha.21",
+    runnerVersion: "1.0.0-alpha.23",
     onDebug: logForDebugging,
     onAuth401,
     getTrustedDeviceToken
@@ -600978,7 +600989,7 @@ async function startMCPServer(cwd3, debug2, verbose) {
   setCwd(cwd3);
   const server = new Server({
     name: "claude/tengu",
-    version: "1.0.0-alpha.21"
+    version: "1.0.0-alpha.23"
   }, {
     capabilities: {
       tools: {}
@@ -606489,7 +606500,7 @@ ${customInstructions}` : customInstructions;
       }
     }
     logForDiagnosticsNoPII("info", "started", {
-      version: "1.0.0-alpha.21",
+      version: "1.0.0-alpha.23",
       is_native_binary: isInBundledMode()
     });
     registerCleanup(async () => {
@@ -607281,7 +607292,7 @@ Usage: agent-os --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version("1.0.0-alpha.21 (Agent-OS)", "-v, --version", "Output the version number");
+  }).version("1.0.0-alpha.23 (Agent-OS)", "-v, --version", "Output the version number");
   program2.option("-w, --worktree [name]", "Create a new git worktree for this session (optionally specify a name)");
   program2.option("--tmux", "Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.");
   if (canUserConfigureAdvisor()) {
@@ -609119,7 +609130,7 @@ if (false) {}
 async function main2() {
   const args = process.argv.slice(2);
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
-    console.log(`${"1.0.0-alpha.21"} (Agent-OS)`);
+    console.log(`${"1.0.0-alpha.23"} (Agent-OS)`);
     return;
   }
   const {