@qwen-code/qwen-code 0.18.1 → 0.18.3-preview.0

package/cli.js

@@ -7,13 +7,13 @@ import {
   clearAccount,
   loadAccount,
   saveAccount
-} from "./chunks/chunk-Y7KMDUEP.js";
+} from "./chunks/chunk-QP4R5FTG.js";
 import {
   AcpBridge,
   PairingStore,
   SessionRouter,
   resolvePath
-} from "./chunks/chunk-HED55F43.js";
+} from "./chunks/chunk-VU6A2OBJ.js";
 import {
   ACP_PREFLIGHT_KINDS,
   CORRUPTED_SUFFIX,
@@ -23,6 +23,7 @@ import {
   ENV_CORRUPTED_PATH,
   ENV_WAS_RECOVERED,
   IDLE_HOOK_EVENTS,
+  MID_TURN_QUEUE_DRAIN_METHOD,
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   OUTPUT_LANGUAGE_AUTO,
   SERVE_CONTROL_EXT_METHODS,
@@ -91,7 +92,7 @@ import {
   updateOutputLanguageFile,
   validateCustomTheme,
   writeOutputLanguageAndRegisterPath
-} from "./chunks/chunk-BXYRCW2C.js";
+} from "./chunks/chunk-3U2ZIZDP.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -104,7 +105,7 @@ import {
   formatContextUsageText,
   isTerminalGoalStatusKind,
   require_react
-} from "./chunks/chunk-IS7UA4W3.js";
+} from "./chunks/chunk-U62OHNQR.js";
 import {
   SUPPORTED_LANGUAGES,
   clearScreen,
@@ -117,7 +118,7 @@ import {
   ta,
   writeStderrLine,
   writeStdoutLine
-} from "./chunks/chunk-XZTNBSMW.js";
+} from "./chunks/chunk-6X6PTTH3.js";
 import {
   noteInteraction
 } from "./chunks/chunk-MRO43B25.js";
@@ -137,6 +138,7 @@ import {
   DISPLAY_MODE,
   EXTENSIONS_CONFIG_FILENAME,
   ExtensionManager,
+  FORK_SUBAGENT_TYPE,
   FileDiscoveryService,
   FileSearchFactory,
   GitWorktreeService,
@@ -340,13 +342,13 @@ import {
   writeRuntimeStatus,
   writeWorktreeSession,
   writeWorktreeSessionMarker
-} from "./chunks/chunk-6T7Y7USE.js";
+} from "./chunks/chunk-VFW7VM7A.js";
 import {
   external_exports
 } from "./chunks/chunk-K5PGHDBN.js";
 import {
   runSideQuery
-} from "./chunks/chunk-HQUWWSSP.js";
+} from "./chunks/chunk-VIEIRAK3.js";
 import "./chunks/chunk-O4PICXES.js";
 import "./chunks/chunk-TW522KN6.js";
 import "./chunks/chunk-BJ5HQ23U.js";
@@ -416,7 +418,7 @@ import {
   stripRuntimeSnapshotPrefix,
   uiTelemetryService,
   withInteractionSpan
-} from "./chunks/chunk-RON7LFNH.js";
+} from "./chunks/chunk-P5CE42XM.js";
 import "./chunks/chunk-3PJXIDKI.js";
 import "./chunks/chunk-UWCTAVOD.js";
 import {
@@ -430,13 +432,13 @@ import {
   isAnyAutoMemPath
 } from "./chunks/chunk-IQHSD7K5.js";
 import "./chunks/chunk-LYRSMKLS.js";
-import "./chunks/chunk-QILTEBWS.js";
+import "./chunks/chunk-RTTAC5VW.js";
 import {
   SchemaValidator,
   ToolConfirmationOutcome,
   ToolDisplayNames,
   ToolNames
-} from "./chunks/chunk-A2ZIEEGJ.js";
+} from "./chunks/chunk-ZNUMXPNK.js";
 import {
   clearCachedCredentialFile,
   openBrowserSecurely,
@@ -11232,7 +11234,7 @@ var require_supports_color = __commonJS({
   "node_modules/chalk/node_modules/supports-color/index.js"(exports, module) {
     "use strict";
     init_esbuild_shims();
-    var os33 = __require("os");
+    var os32 = __require("os");
     var tty4 = __require("tty");
     var hasFlag3 = require_has_flag();
     var { env: env5 } = process;
@@ -11281,7 +11283,7 @@ var require_supports_color = __commonJS({
         return min;
       }
       if (process.platform === "win32") {
-        const osRelease = os33.release().split(".");
+        const osRelease = os32.release().split(".");
         if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -32580,7 +32582,7 @@ var require_supports_color2 = __commonJS({
   "node_modules/ink-link/node_modules/supports-color/index.js"(exports, module) {
     "use strict";
     init_esbuild_shims();
-    var os33 = __require("os");
+    var os32 = __require("os");
     var tty4 = __require("tty");
     var hasFlag3 = require_has_flag();
     var { env: env5 } = process;
@@ -32629,7 +32631,7 @@ var require_supports_color2 = __commonJS({
         return min;
       }
       if (process.platform === "win32") {
-        const osRelease = os33.release().split(".");
+        const osRelease = os32.release().split(".");
         if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -36808,9 +36810,9 @@ var require_defaults = __commonJS({
   "node_modules/@pnpm/npm-conf/lib/defaults.js"(exports) {
     "use strict";
     init_esbuild_shims();
-    var os33 = __require("os");
+    var os32 = __require("os");
     var path60 = __require("path");
-    var temp = os33.tmpdir();
+    var temp = os32.tmpdir();
     var uidOrPid = process.getuid ? process.getuid() : process.pid;
     var hasUnicode = /* @__PURE__ */ __name(() => true, "hasUnicode");
     var isWindows4 = process.platform === "win32";
@@ -36821,7 +36823,7 @@ var require_defaults = __commonJS({
     var umask = {
       fromString: /* @__PURE__ */ __name(() => process.umask(), "fromString")
     };
-    var home = os33.homedir();
+    var home = os32.homedir();
     if (home) {
       process.env.HOME = home;
     } else {
@@ -49241,7 +49243,7 @@ var measure_element_default = measureElement;
 // packages/cli/src/gemini.tsx
 var import_react233 = __toESM(require_react(), 1);
 import dns from "node:dns";
-import os32 from "node:os";
+import os31 from "node:os";
 import path59, { basename as basename13 } from "node:path";
 import v83 from "node:v8";
 
@@ -56776,10 +56778,10 @@ function ensureBuiltins() {
   if (!builtinsPromise) {
     builtinsPromise = (async () => {
       const [telegram, weixin, dingtalk, feishu] = await Promise.all([
-        import("./chunks/dist-YLS6NI7H.js"),
-        import("./chunks/dist-VEGFONCF.js"),
-        import("./chunks/dist-7YWFWOCJ.js"),
-        import("./chunks/dist-X4EXN7W6.js")
+        import("./chunks/dist-KF43SZZV.js"),
+        import("./chunks/dist-2UCAYOX7.js"),
+        import("./chunks/dist-UH7CYT7F.js"),
+        import("./chunks/dist-33LHH26D.js")
       ]);
       for (const mod of [telegram, weixin, dingtalk, feishu]) {
         registry.set(mod.plugin.channelType, mod.plugin);
@@ -59187,7 +59189,7 @@ var serveCommand = {
         process.exit(1);
       }
     }
-    const { runQwenServe } = await import("./chunks/serve-BWOLYT62.js");
+    const { runQwenServe } = await import("./chunks/serve-BVDNMP5D.js");
     try {
       await runQwenServe({
         port: argv.port,
@@ -59226,6 +59228,432 @@ var serveCommand = {
   }, "handler")
 };
 
+// packages/cli/src/commands/sessions.ts
+init_esbuild_shims();
+
+// packages/cli/src/commands/sessions/list.ts
+init_esbuild_shims();
+
+// packages/cli/node_modules/string-width/index.js
+init_esbuild_shims();
+var import_emoji_regex = __toESM(require_emoji_regex(), 1);
+var segmenter4 = new Intl.Segmenter();
+var defaultIgnorableCodePointRegex = new RegExp("^\\p{Default_Ignorable_Code_Point}$", "u");
+function stringWidth2(string, options = {}) {
+  if (typeof string !== "string" || string.length === 0) {
+    return 0;
+  }
+  const {
+    ambiguousIsNarrow = true,
+    countAnsiEscapeCodes = false
+  } = options;
+  if (!countAnsiEscapeCodes) {
+    string = stripAnsi(string);
+  }
+  if (string.length === 0) {
+    return 0;
+  }
+  let width = 0;
+  const eastAsianWidthOptions = { ambiguousAsWide: !ambiguousIsNarrow };
+  for (const { segment: character } of segmenter4.segment(string)) {
+    const codePoint = character.codePointAt(0);
+    if (codePoint <= 31 || codePoint >= 127 && codePoint <= 159) {
+      continue;
+    }
+    if (codePoint >= 8203 && codePoint <= 8207 || codePoint === 65279) {
+      continue;
+    }
+    if (codePoint >= 768 && codePoint <= 879 || codePoint >= 6832 && codePoint <= 6911 || codePoint >= 7616 && codePoint <= 7679 || codePoint >= 8400 && codePoint <= 8447 || codePoint >= 65056 && codePoint <= 65071) {
+      continue;
+    }
+    if (codePoint >= 55296 && codePoint <= 57343) {
+      continue;
+    }
+    if (codePoint >= 65024 && codePoint <= 65039) {
+      continue;
+    }
+    if (defaultIgnorableCodePointRegex.test(character)) {
+      continue;
+    }
+    if ((0, import_emoji_regex.default)().test(character)) {
+      width += 2;
+      continue;
+    }
+    width += eastAsianWidth(codePoint, eastAsianWidthOptions);
+  }
+  return width;
+}
+__name(stringWidth2, "stringWidth");
+
+// packages/cli/src/ui/utils/textUtils.ts
+init_esbuild_shims();
+init_ansi_regex();
+import { stripVTControlCharacters } from "node:util";
+var getAsciiArtWidth = /* @__PURE__ */ __name((asciiArt) => {
+  if (!asciiArt) {
+    return 0;
+  }
+  const lines = asciiArt.split("\n");
+  return Math.max(...lines.map((line) => getCachedStringWidth(line)));
+}, "getAsciiArtWidth");
+var codePointsCache = /* @__PURE__ */ new Map();
+var MAX_STRING_LENGTH_TO_CACHE = 1e3;
+function toCodePoints(str) {
+  let isAscii = true;
+  for (let i = 0; i < str.length; i++) {
+    if (str.charCodeAt(i) > 127) {
+      isAscii = false;
+      break;
+    }
+  }
+  if (isAscii) {
+    return str.split("");
+  }
+  if (str.length <= MAX_STRING_LENGTH_TO_CACHE) {
+    const cached = codePointsCache.get(str);
+    if (cached) {
+      return cached;
+    }
+  }
+  const result = Array.from(str);
+  if (str.length <= MAX_STRING_LENGTH_TO_CACHE) {
+    codePointsCache.set(str, result);
+  }
+  return result;
+}
+__name(toCodePoints, "toCodePoints");
+function cpLen(str) {
+  return toCodePoints(str).length;
+}
+__name(cpLen, "cpLen");
+function cpSlice(str, start, end) {
+  const arr = toCodePoints(str).slice(start, end);
+  return arr.join("");
+}
+__name(cpSlice, "cpSlice");
+function stripUnsafeCharacters(str) {
+  const strippedAnsi = stripAnsi(str);
+  const strippedVT = stripVTControlCharacters(strippedAnsi);
+  return toCodePoints(strippedVT).filter((char) => {
+    const code = char.codePointAt(0);
+    if (code === void 0) return false;
+    if (code === 9 || code === 10 || code === 13) return true;
+    if (code >= 0 && code <= 31) return false;
+    if (code >= 128 && code <= 159) return false;
+    return true;
+  }).join("");
+}
+__name(stripUnsafeCharacters, "stripUnsafeCharacters");
+var stringWidthCache = /* @__PURE__ */ new Map();
+var getCachedStringWidth = /* @__PURE__ */ __name((str) => {
+  if (/^[\x20-\x7E]*$/.test(str)) {
+    return str.length;
+  }
+  if (stringWidthCache.has(str)) {
+    return stringWidthCache.get(str);
+  }
+  const width = stringWidth2(str);
+  stringWidthCache.set(str, width);
+  return width;
+}, "getCachedStringWidth");
+var regex = ansiRegex();
+function escapeAnsiCtrlCodes(obj) {
+  if (typeof obj === "string") {
+    if (obj.search(regex) === -1) {
+      return obj;
+    }
+    regex.lastIndex = 0;
+    return obj.replace(
+      regex,
+      (match) => JSON.stringify(match).slice(1, -1)
+    );
+  }
+  if (obj === null || typeof obj !== "object") {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    let newArr = null;
+    for (let i = 0; i < obj.length; i++) {
+      const value = obj[i];
+      const escapedValue = escapeAnsiCtrlCodes(value);
+      if (escapedValue !== value) {
+        if (newArr === null) {
+          newArr = [...obj];
+        }
+        newArr[i] = escapedValue;
+      }
+    }
+    return newArr !== null ? newArr : obj;
+  }
+  let newObj = null;
+  const keys = Object.keys(obj);
+  for (const key of keys) {
+    const value = obj[key];
+    const escapedValue = escapeAnsiCtrlCodes(value);
+    if (escapedValue !== value) {
+      if (newObj === null) {
+        newObj = { ...obj };
+      }
+      newObj[key] = escapedValue;
+    }
+  }
+  return newObj !== null ? newObj : obj;
+}
+__name(escapeAnsiCtrlCodes, "escapeAnsiCtrlCodes");
+var SENSITIVE_PATTERNS = [
+  // API keys with common prefixes
+  {
+    pattern: /(sk-[a-zA-Z0-9]{20,})/g,
+    replacement: "sk-***REDACTED***"
+  },
+  {
+    pattern: /(api[_-]?key[_-]?[=:]\s*)[a-zA-Z0-9_-]{20,}/gi,
+    replacement: "$1***REDACTED***"
+  },
+  // Bearer tokens
+  {
+    pattern: /(Bearer\s+)[a-zA-Z0-9._-]+/gi,
+    replacement: "$1***REDACTED***"
+  },
+  // Generic tokens
+  {
+    pattern: /(token[_-]?[=:]\s*)[a-zA-Z0-9._-]{10,}/gi,
+    replacement: "$1***REDACTED***"
+  },
+  // Passwords in connection strings or assignments
+  {
+    pattern: /(password[_-]?[=:]\s*)[^\s]+/gi,
+    replacement: "$1***REDACTED***"
+  },
+  {
+    pattern: /(pwd[_-]?[=:]\s*)[^\s]+/gi,
+    replacement: "$1***REDACTED***"
+  },
+  // AWS keys
+  {
+    pattern: /(AKIA[A-Z0-9]{16})/g,
+    replacement: "***REDACTED***"
+  },
+  // Generic secret patterns
+  {
+    pattern: /(secret[_-]?[=:]\s*)[a-zA-Z0-9._-]{10,}/gi,
+    replacement: "$1***REDACTED***"
+  }
+];
+function sanitizeSensitiveText(text, maxLength = 200) {
+  let result = text;
+  for (const { pattern, replacement } of SENSITIVE_PATTERNS) {
+    result = result.replace(pattern, replacement);
+  }
+  if (result.length > maxLength) {
+    if (maxLength <= 3) {
+      return result.slice(0, maxLength);
+    }
+    return result.slice(0, maxLength - 3) + "...";
+  }
+  return result;
+}
+__name(sanitizeSensitiveText, "sanitizeSensitiveText");
+var FILENAME_CONTROL_CHARS_REGEX = /[\x00-\x1f\x7f-\x9f]/g;
+function escapeFilenameControlChar(ch) {
+  switch (ch) {
+    case "\b":
+      return "\\b";
+    case "	":
+      return "\\t";
+    case "\n":
+      return "\\n";
+    case "\f":
+      return "\\f";
+    case "\r":
+      return "\\r";
+    default: {
+      const code = ch.charCodeAt(0);
+      return `\\u${code.toString(16).padStart(4, "0")}`;
+    }
+  }
+}
+__name(escapeFilenameControlChar, "escapeFilenameControlChar");
+function sanitizeFilenameForDisplay(name) {
+  return escapeAnsiCtrlCodes(name).replace(
+    FILENAME_CONTROL_CHARS_REGEX,
+    escapeFilenameControlChar
+  );
+}
+__name(sanitizeFilenameForDisplay, "sanitizeFilenameForDisplay");
+
+// packages/cli/src/commands/sessions/common.ts
+init_esbuild_shims();
+function initSessionService() {
+  const settings = loadSettings();
+  Storage.setRuntimeBaseDir(
+    settings.merged.advanced?.runtimeOutputDir,
+    process.cwd()
+  );
+  return new SessionService(process.cwd());
+}
+__name(initSessionService, "initSessionService");
+
+// packages/cli/src/commands/sessions/list.ts
+var SESSION_COL = 38;
+var TIME_COL = 16;
+var TITLE_COL = 24;
+var BRANCH_COL = 12;
+function formatTime(iso) {
+  const d = new Date(iso);
+  if (isNaN(d.getTime())) return iso;
+  const pad2 = /* @__PURE__ */ __name((n) => String(n).padStart(2, "0"), "pad");
+  return `${d.getUTCFullYear()}-${pad2(d.getUTCMonth() + 1)}-${pad2(d.getUTCDate())} ${pad2(d.getUTCHours())}:${pad2(d.getUTCMinutes())}`;
+}
+__name(formatTime, "formatTime");
+function sanitize(value) {
+  const stripped = value.replace(/[\r\n\t]/g, "");
+  const escaped = escapeAnsiCtrlCodes(stripped);
+  return escaped.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\x9f]/g, "");
+}
+__name(sanitize, "sanitize");
+function padDisplay(str, width) {
+  const currentWidth = stringWidth2(str);
+  if (currentWidth >= width) return str;
+  return str + " ".repeat(width - currentWidth);
+}
+__name(padDisplay, "padDisplay");
+function truncate(str, maxLen) {
+  const width = stringWidth2(str);
+  if (width <= maxLen) return str;
+  const suffix = maxLen > 3 ? "..." : "";
+  const target = maxLen - stringWidth2(suffix);
+  let result = "";
+  let w = 0;
+  for (const char of str) {
+    w += stringWidth2(char);
+    if (w > target) break;
+    result += char;
+  }
+  return result + suffix;
+}
+__name(truncate, "truncate");
+function outputHuman(items) {
+  if (items.length === 0) {
+    writeStdoutLine("No sessions found.");
+    return;
+  }
+  const termWidth = process.stdout.columns ?? 80;
+  const PROMPT_COL = Math.max(
+    20,
+    termWidth - SESSION_COL - TIME_COL - TITLE_COL - BRANCH_COL - 4
+  );
+  const header = padDisplay("SESSION ID", SESSION_COL) + " " + padDisplay("STARTED", TIME_COL) + " " + padDisplay("TITLE", TITLE_COL) + " " + padDisplay("BRANCH", BRANCH_COL) + " PROMPT";
+  writeStdoutLine(header);
+  for (const item of items) {
+    const sessionId = truncate(
+      sanitize(String(item.sessionId ?? "")),
+      SESSION_COL
+    );
+    const time = truncate(sanitize(formatTime(item.startTime)), TIME_COL);
+    const sanitizedPrompt = sanitize(item.prompt ?? "");
+    const title = truncate(
+      item.customTitle != null ? sanitize(item.customTitle) : sanitizedPrompt,
+      TITLE_COL
+    );
+    const branch = truncate(
+      item.gitBranch != null ? sanitize(item.gitBranch) : "-",
+      BRANCH_COL
+    );
+    const prompt = truncate(sanitizedPrompt, PROMPT_COL);
+    writeStdoutLine(
+      `${padDisplay(sessionId, SESSION_COL)} ${padDisplay(time, TIME_COL)} ${padDisplay(title, TITLE_COL)} ${padDisplay(branch, BRANCH_COL)} ${prompt}`
+    );
+  }
+}
+__name(outputHuman, "outputHuman");
+function toJsonItem(item) {
+  return {
+    sessionId: item.sessionId,
+    startTime: item.startTime,
+    mtime: item.mtime,
+    prompt: item.prompt,
+    gitBranch: item.gitBranch ?? null,
+    customTitle: item.customTitle ?? null,
+    titleSource: item.titleSource ?? null,
+    filePath: item.filePath,
+    cwd: item.cwd
+  };
+}
+__name(toJsonItem, "toJsonItem");
+function formatError2(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+__name(formatError2, "formatError");
+async function handleList2(argv) {
+  let svc;
+  try {
+    svc = initSessionService();
+  } catch (err) {
+    writeStderrLine(
+      `Error: failed to initialize session service: ${formatError2(err)}`
+    );
+    process.exit(1);
+    return;
+  }
+  let result;
+  try {
+    result = await svc.listSessions({
+      size: argv.limit ?? 20
+    });
+  } catch (err) {
+    writeStderrLine(`Error: failed to list sessions: ${formatError2(err)}`);
+    process.exit(1);
+    return;
+  }
+  if (argv.json) {
+    for (const item of result.items) {
+      writeStdoutLine(JSON.stringify(toJsonItem(item)));
+    }
+    if (result.items.length > 0 && result.hasMore) {
+      writeStderrLine(
+        `Note: ${result.items.length} sessions shown, more available. Use --limit to show more.`
+      );
+    }
+  } else {
+    outputHuman(result.items);
+    if (result.items.length > 0 && result.hasMore) {
+      writeStdoutLine(
+        `Showing ${result.items.length} sessions. Use --limit to show more.`
+      );
+    }
+  }
+}
+__name(handleList2, "handleList");
+var listCommand4 = {
+  command: "list",
+  describe: "List sessions",
+  builder: /* @__PURE__ */ __name((yargs) => yargs.option("json", {
+    type: "boolean",
+    describe: "Output as JSON Lines",
+    default: false
+  }).option("limit", {
+    type: "number",
+    describe: "Maximum number of sessions to show",
+    default: 20,
+    coerce: /* @__PURE__ */ __name((v) => Number.isInteger(v) && v > 0 ? v : 20, "coerce")
+  }), "builder"),
+  handler: /* @__PURE__ */ __name(async (argv) => {
+    await handleList2(argv);
+  }, "handler")
+};
+
+// packages/cli/src/commands/sessions.ts
+var sessionsCommand = {
+  command: "sessions",
+  describe: "Manage Qwen Code sessions",
+  builder: /* @__PURE__ */ __name((yargs) => yargs.command(listCommand4).demandCommand(1, "You need at least one command before continuing.").version(false), "builder"),
+  // demandCommand(1) ensures a subcommand is always required;
+  // yargs automatically shows help when none is provided.
+  handler: /* @__PURE__ */ __name(() => {
+  }, "handler")
+};
+
 // packages/cli/src/utils/runBudget.ts
 init_esbuild_shims();
 var SECOND = 1e3;
@@ -59931,11 +60359,11 @@ async function parseArguments() {
       }
       return true;
     })
-  ).command(mcpCommand).command(extensionsCommand).command(authCommand).command(hooksCommand).command(channelCommand).command(reviewCommand).command(serveCommand);
+  ).command(mcpCommand).command(extensionsCommand).command(authCommand).command(hooksCommand).command(channelCommand).command(reviewCommand).command(serveCommand).command(sessionsCommand);
   yargsInstance.version(await getCliVersion()).alias("v", "version").help().alias("h", "help").strict().demandCommand(0, 0);
   yargsInstance.wrap(yargsInstance.terminalWidth());
   const result = await yargsInstance.parse();
-  if (result._.length > 0 && (result._[0] === "mcp" || result._[0] === "extensions" || result._[0] === "auth" || result._[0] === "hooks" || result._[0] === "channel" || result._[0] === "review")) {
+  if (result._.length > 0 && (result._[0] === "mcp" || result._[0] === "extensions" || result._[0] === "auth" || result._[0] === "hooks" || result._[0] === "channel" || result._[0] === "review" || result._[0] === "sessions")) {
     process.exit(0);
   }
   const queryArg = result.query;
@@ -64477,258 +64905,6 @@ var aboutCommand = {
 
 // packages/cli/src/ui/commands/tasksCommand.ts
 init_esbuild_shims();
-
-// packages/cli/src/ui/utils/textUtils.ts
-init_esbuild_shims();
-init_ansi_regex();
-import { stripVTControlCharacters } from "node:util";
-
-// packages/cli/node_modules/string-width/index.js
-init_esbuild_shims();
-var import_emoji_regex = __toESM(require_emoji_regex(), 1);
-var segmenter4 = new Intl.Segmenter();
-var defaultIgnorableCodePointRegex = new RegExp("^\\p{Default_Ignorable_Code_Point}$", "u");
-function stringWidth2(string, options = {}) {
-  if (typeof string !== "string" || string.length === 0) {
-    return 0;
-  }
-  const {
-    ambiguousIsNarrow = true,
-    countAnsiEscapeCodes = false
-  } = options;
-  if (!countAnsiEscapeCodes) {
-    string = stripAnsi(string);
-  }
-  if (string.length === 0) {
-    return 0;
-  }
-  let width = 0;
-  const eastAsianWidthOptions = { ambiguousAsWide: !ambiguousIsNarrow };
-  for (const { segment: character } of segmenter4.segment(string)) {
-    const codePoint = character.codePointAt(0);
-    if (codePoint <= 31 || codePoint >= 127 && codePoint <= 159) {
-      continue;
-    }
-    if (codePoint >= 8203 && codePoint <= 8207 || codePoint === 65279) {
-      continue;
-    }
-    if (codePoint >= 768 && codePoint <= 879 || codePoint >= 6832 && codePoint <= 6911 || codePoint >= 7616 && codePoint <= 7679 || codePoint >= 8400 && codePoint <= 8447 || codePoint >= 65056 && codePoint <= 65071) {
-      continue;
-    }
-    if (codePoint >= 55296 && codePoint <= 57343) {
-      continue;
-    }
-    if (codePoint >= 65024 && codePoint <= 65039) {
-      continue;
-    }
-    if (defaultIgnorableCodePointRegex.test(character)) {
-      continue;
-    }
-    if ((0, import_emoji_regex.default)().test(character)) {
-      width += 2;
-      continue;
-    }
-    width += eastAsianWidth(codePoint, eastAsianWidthOptions);
-  }
-  return width;
-}
-__name(stringWidth2, "stringWidth");
-
-// packages/cli/src/ui/utils/textUtils.ts
-var getAsciiArtWidth = /* @__PURE__ */ __name((asciiArt) => {
-  if (!asciiArt) {
-    return 0;
-  }
-  const lines = asciiArt.split("\n");
-  return Math.max(...lines.map((line) => getCachedStringWidth(line)));
-}, "getAsciiArtWidth");
-var codePointsCache = /* @__PURE__ */ new Map();
-var MAX_STRING_LENGTH_TO_CACHE = 1e3;
-function toCodePoints(str) {
-  let isAscii = true;
-  for (let i = 0; i < str.length; i++) {
-    if (str.charCodeAt(i) > 127) {
-      isAscii = false;
-      break;
-    }
-  }
-  if (isAscii) {
-    return str.split("");
-  }
-  if (str.length <= MAX_STRING_LENGTH_TO_CACHE) {
-    const cached = codePointsCache.get(str);
-    if (cached) {
-      return cached;
-    }
-  }
-  const result = Array.from(str);
-  if (str.length <= MAX_STRING_LENGTH_TO_CACHE) {
-    codePointsCache.set(str, result);
-  }
-  return result;
-}
-__name(toCodePoints, "toCodePoints");
-function cpLen(str) {
-  return toCodePoints(str).length;
-}
-__name(cpLen, "cpLen");
-function cpSlice(str, start, end) {
-  const arr = toCodePoints(str).slice(start, end);
-  return arr.join("");
-}
-__name(cpSlice, "cpSlice");
-function stripUnsafeCharacters(str) {
-  const strippedAnsi = stripAnsi(str);
-  const strippedVT = stripVTControlCharacters(strippedAnsi);
-  return toCodePoints(strippedVT).filter((char) => {
-    const code = char.codePointAt(0);
-    if (code === void 0) return false;
-    if (code === 9 || code === 10 || code === 13) return true;
-    if (code >= 0 && code <= 31) return false;
-    if (code >= 128 && code <= 159) return false;
-    return true;
-  }).join("");
-}
-__name(stripUnsafeCharacters, "stripUnsafeCharacters");
-var stringWidthCache = /* @__PURE__ */ new Map();
-var getCachedStringWidth = /* @__PURE__ */ __name((str) => {
-  if (/^[\x20-\x7E]*$/.test(str)) {
-    return str.length;
-  }
-  if (stringWidthCache.has(str)) {
-    return stringWidthCache.get(str);
-  }
-  const width = stringWidth2(str);
-  stringWidthCache.set(str, width);
-  return width;
-}, "getCachedStringWidth");
-var regex = ansiRegex();
-function escapeAnsiCtrlCodes(obj) {
-  if (typeof obj === "string") {
-    if (obj.search(regex) === -1) {
-      return obj;
-    }
-    regex.lastIndex = 0;
-    return obj.replace(
-      regex,
-      (match) => JSON.stringify(match).slice(1, -1)
-    );
-  }
-  if (obj === null || typeof obj !== "object") {
-    return obj;
-  }
-  if (Array.isArray(obj)) {
-    let newArr = null;
-    for (let i = 0; i < obj.length; i++) {
-      const value = obj[i];
-      const escapedValue = escapeAnsiCtrlCodes(value);
-      if (escapedValue !== value) {
-        if (newArr === null) {
-          newArr = [...obj];
-        }
-        newArr[i] = escapedValue;
-      }
-    }
-    return newArr !== null ? newArr : obj;
-  }
-  let newObj = null;
-  const keys = Object.keys(obj);
-  for (const key of keys) {
-    const value = obj[key];
-    const escapedValue = escapeAnsiCtrlCodes(value);
-    if (escapedValue !== value) {
-      if (newObj === null) {
-        newObj = { ...obj };
-      }
-      newObj[key] = escapedValue;
-    }
-  }
-  return newObj !== null ? newObj : obj;
-}
-__name(escapeAnsiCtrlCodes, "escapeAnsiCtrlCodes");
-var SENSITIVE_PATTERNS = [
-  // API keys with common prefixes
-  {
-    pattern: /(sk-[a-zA-Z0-9]{20,})/g,
-    replacement: "sk-***REDACTED***"
-  },
-  {
-    pattern: /(api[_-]?key[_-]?[=:]\s*)[a-zA-Z0-9_-]{20,}/gi,
-    replacement: "$1***REDACTED***"
-  },
-  // Bearer tokens
-  {
-    pattern: /(Bearer\s+)[a-zA-Z0-9._-]+/gi,
-    replacement: "$1***REDACTED***"
-  },
-  // Generic tokens
-  {
-    pattern: /(token[_-]?[=:]\s*)[a-zA-Z0-9._-]{10,}/gi,
-    replacement: "$1***REDACTED***"
-  },
-  // Passwords in connection strings or assignments
-  {
-    pattern: /(password[_-]?[=:]\s*)[^\s]+/gi,
-    replacement: "$1***REDACTED***"
-  },
-  {
-    pattern: /(pwd[_-]?[=:]\s*)[^\s]+/gi,
-    replacement: "$1***REDACTED***"
-  },
-  // AWS keys
-  {
-    pattern: /(AKIA[A-Z0-9]{16})/g,
-    replacement: "***REDACTED***"
-  },
-  // Generic secret patterns
-  {
-    pattern: /(secret[_-]?[=:]\s*)[a-zA-Z0-9._-]{10,}/gi,
-    replacement: "$1***REDACTED***"
-  }
-];
-function sanitizeSensitiveText(text, maxLength = 200) {
-  let result = text;
-  for (const { pattern, replacement } of SENSITIVE_PATTERNS) {
-    result = result.replace(pattern, replacement);
-  }
-  if (result.length > maxLength) {
-    if (maxLength <= 3) {
-      return result.slice(0, maxLength);
-    }
-    return result.slice(0, maxLength - 3) + "...";
-  }
-  return result;
-}
-__name(sanitizeSensitiveText, "sanitizeSensitiveText");
-var FILENAME_CONTROL_CHARS_REGEX = /[\x00-\x1f\x7f-\x9f]/g;
-function escapeFilenameControlChar(ch) {
-  switch (ch) {
-    case "\b":
-      return "\\b";
-    case "	":
-      return "\\t";
-    case "\n":
-      return "\\n";
-    case "\f":
-      return "\\f";
-    case "\r":
-      return "\\r";
-    default: {
-      const code = ch.charCodeAt(0);
-      return `\\u${code.toString(16).padStart(4, "0")}`;
-    }
-  }
-}
-__name(escapeFilenameControlChar, "escapeFilenameControlChar");
-function sanitizeFilenameForDisplay(name) {
-  return escapeAnsiCtrlCodes(name).replace(
-    FILENAME_CONTROL_CHARS_REGEX,
-    escapeFilenameControlChar
-  );
-}
-__name(sanitizeFilenameForDisplay, "sanitizeFilenameForDisplay");
-
-// packages/cli/src/ui/commands/tasksCommand.ts
 function statusLabel(entry) {
   switch (entry.kind) {
     case "agent": {
@@ -64928,6 +65104,147 @@ var tasksCommand = {
   }, "action")
 };
 
+// packages/cli/src/ui/commands/workflowsCommand.ts
+init_esbuild_shims();
+function rowLine(entry, now) {
+  const endTime = entry.endTime ?? now;
+  const runtime = formatDuration(endTime - entry.startTime, {
+    hideTrailingZeros: true
+  });
+  const label = entry.meta?.name ?? entry.runId;
+  const phase = entry.currentPhase ? ` \xB7 ${entry.currentPhase}` : "";
+  const counts = entry.agentsDispatched > 0 ? ` \xB7 ${entry.agentsCompleted}/${entry.agentsDispatched} agents` : "";
+  const phaseCount = entry.phases.length > 0 ? ` \xB7 ${entry.phases.length} ${entry.phases.length === 1 ? "phase" : "phases"}` : "";
+  const errorTail = entry.status === "failed" && entry.error ? ` \u2014 ${entry.error.slice(0, 80)}` : "";
+  return `  ${entry.runId.padEnd(20)} ${entry.status.padEnd(10)} ${runtime.padStart(8)}  ${label}${phase}${counts}${phaseCount}${errorTail}`;
+}
+__name(rowLine, "rowLine");
+function detailLines(entry, now) {
+  const lines = [];
+  const endTime = entry.endTime ?? now;
+  const runtime = formatDuration(endTime - entry.startTime, {
+    hideTrailingZeros: true
+  });
+  lines.push(`Workflow ${entry.runId}`);
+  if (entry.meta?.name) {
+    lines.push(`  name        : ${entry.meta.name}`);
+  }
+  if (entry.meta?.description) {
+    lines.push(`  description : ${entry.meta.description}`);
+  }
+  if (entry.meta?.whenToUse) {
+    lines.push(`  whenToUse   : ${entry.meta.whenToUse}`);
+  }
+  lines.push(`  status      : ${entry.status}`);
+  lines.push(`  runtime     : ${runtime}`);
+  if (entry.currentPhase) {
+    lines.push(`  currentPhase: ${entry.currentPhase}`);
+  }
+  lines.push(
+    `  agents      : ${entry.agentsCompleted}/${entry.agentsDispatched}`
+  );
+  if (entry.error) {
+    lines.push(`  error       : ${entry.error}`);
+  }
+  if (entry.phases.length > 0) {
+    lines.push("");
+    lines.push(`  Phases (${entry.phases.length})`);
+    for (const phase of entry.phases) {
+      lines.push(`    \xB7 ${phase}`);
+    }
+  }
+  if (entry.recentLogs.length > 0) {
+    lines.push("");
+    lines.push(`  Logs (last ${entry.recentLogs.length})`);
+    for (const line of entry.recentLogs) {
+      lines.push(`    ${line}`);
+    }
+  }
+  return lines;
+}
+__name(detailLines, "detailLines");
+var workflowsCommand = {
+  name: "workflows",
+  get description() {
+    return t(
+      "List active and completed workflow runs (text dump \u2014 interactive dialog opens via the footer pill)"
+    );
+  },
+  get argumentHint() {
+    return t("[runId]");
+  },
+  kind: "built-in" /* BUILT_IN */,
+  // Same triple-mode coverage as `/tasks`: the dialog is richer in
+  // interactive mode but headless / acp consumers need the text dump
+  // as their only inspection path.
+  supportedModes: ["interactive", "non_interactive", "acp"],
+  action: /* @__PURE__ */ __name(async (context, args) => {
+    const { config } = context.services;
+    if (!config) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Config not available."
+      };
+    }
+    const registry2 = config.getWorkflowRunRegistry();
+    const allEntries = registry2.list();
+    const trimmedArgs = (args ?? "").trim();
+    if (trimmedArgs.length > 0) {
+      const target = registry2.get(trimmedArgs);
+      if (!target) {
+        return {
+          type: "message",
+          messageType: "error",
+          content: `Unknown workflow runId: ${trimmedArgs}`
+        };
+      }
+      return {
+        type: "message",
+        messageType: "info",
+        content: detailLines(target, Date.now()).join("\n")
+      };
+    }
+    if (allEntries.length === 0) {
+      return {
+        type: "message",
+        messageType: "info",
+        content: "No workflow runs recorded yet."
+      };
+    }
+    const now = Date.now();
+    const running = allEntries.filter((e) => e.status === "running").sort((a, b) => a.startTime - b.startTime);
+    const terminal = allEntries.filter((e) => e.status !== "running").sort((a, b) => (b.endTime ?? 0) - (a.endTime ?? 0));
+    const lines = [];
+    if (context.executionMode === "interactive") {
+      lines.push(
+        t(
+          "Tip: use `/workflows <runId>` for the per-run detail view (name, description, phase tree, recent logs)."
+        ),
+        ""
+      );
+    }
+    lines.push(
+      `Workflow runs (${allEntries.length} total \xB7 ${running.length} running)`,
+      ""
+    );
+    if (running.length > 0) {
+      lines.push("Active");
+      for (const entry of running) lines.push(rowLine(entry, now));
+      lines.push("");
+    }
+    if (terminal.length > 0) {
+      lines.push("Recent");
+      for (const entry of terminal) lines.push(rowLine(entry, now));
+    }
+    return {
+      type: "message",
+      messageType: "info",
+      content: lines.join("\n")
+    };
+  }, "action")
+};
+
 // packages/cli/src/ui/commands/agentsCommand.ts
 init_esbuild_shims();
 var agentsCommand = {
@@ -67500,13 +67817,18 @@ init_esbuild_shims();
 // packages/cli/src/ui/utils/backgroundWorkUtils.ts
 init_esbuild_shims();
 function hasBlockingBackgroundWork(config) {
-  return config.getBackgroundTaskRegistry().hasUnfinalizedTasks() || config.getMonitorRegistry().getRunning().length > 0 || config.getBackgroundShellRegistry().hasRunningEntries();
+  return config.getBackgroundTaskRegistry().hasUnfinalizedTasks() || config.getMonitorRegistry().getRunning().length > 0 || config.getBackgroundShellRegistry().hasRunningEntries() || // R7 (wenshao): the WorkflowRunRegistry is a 4th sibling that the
+  // earlier P4b commit forgot to wire here. Without this OR clause,
+  // /clear and session-resume happily ran while a workflow was
+  // mid-run, orphaning the dispatch loop.
+  config.getWorkflowRunRegistry().hasRunningEntries();
 }
 __name(hasBlockingBackgroundWork, "hasBlockingBackgroundWork");
 function resetBackgroundStateForSessionSwitch(config) {
   config.getBackgroundTaskRegistry().reset();
   config.getMonitorRegistry().reset();
   config.getBackgroundShellRegistry().reset();
+  config.getWorkflowRunRegistry().reset();
 }
 __name(resetBackgroundStateForSessionSwitch, "resetBackgroundStateForSessionSwitch");
 
@@ -69783,7 +70105,6 @@ __name(rollbackStandaloneUpdate, "rollbackStandaloneUpdate");
 // packages/cli/src/utils/installationInfo.ts
 init_esbuild_shims();
 import * as fs16 from "node:fs";
-import * as os14 from "node:os";
 import * as path18 from "node:path";
 import * as childProcess from "node:child_process";
 var debugLogger14 = createDebugLogger("INSTALLATION_INFO");
@@ -69896,27 +70217,11 @@ function getInstallationInfo(projectRoot, isAutoUpdateEnabled) {
       npmPrefixWritable = true;
     } catch {
     }
-    if (!npmPrefixWritable && isAutoUpdateEnabled) {
-      const installRoot = process.env["HOME"] || os14.homedir();
-      if (!installRoot || installRoot === "/") {
-        return {
-          packageManager: "npm" /* NPM */,
-          isGlobal: true,
-          updateMessage: "Update requires sudo. Run: sudo npm install -g @qwen-code/qwen-code@latest"
-        };
-      }
-      const fallbackStandaloneDir = path18.join(
-        installRoot,
-        ".local",
-        "lib",
-        "qwen-code"
-      );
+    if (!npmPrefixWritable) {
       return {
         packageManager: "npm" /* NPM */,
         isGlobal: true,
-        isStandalone: true,
-        standaloneDir: fallbackStandaloneDir,
-        updateMessage: "npm install requires sudo. Migrating to standalone installer for automatic updates."
+        updateMessage: "Update requires sudo. Please run: sudo npm install -g @qwen-code/qwen-code@latest"
       };
     }
     const updateCommand2 = "npm install -g @qwen-code/qwen-code@latest";
@@ -71729,7 +72034,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd5) {
-    const { getGitRepoName } = await import("./chunks/src-L5P7K4MH.js");
+    const { getGitRepoName } = await import("./chunks/src-E42UOH5I.js");
     gitRepo = getGitRepoName(cwd5);
   }
   let model;
@@ -72995,6 +73300,7 @@ var forkCommand = {
     const params = {
       description: deriveForkDescription(directive),
       prompt: directive,
+      subagent_type: FORK_SUBAGENT_TYPE,
       run_in_background: true
     };
     let result;
@@ -73924,7 +74230,7 @@ function formatHookSource(source) {
   }
 }
 __name(formatHookSource, "formatHookSource");
-var listCommand4 = {
+var listCommand5 = {
   name: "list",
   get description() {
     return t("List all configured hooks");
@@ -74047,7 +74353,7 @@ var hooksCommand2 = {
         dialog: "hooks"
       };
     }
-    const result = await listCommand4.action?.(context, args);
+    const result = await listCommand5.action?.(context, args);
     return result ?? { type: "message", messageType: "info", content: "" };
   }, "action")
 };
@@ -74344,7 +74650,7 @@ init_esbuild_shims();
 init_esbuild_shims();
 var import_strip_json_comments4 = __toESM(require_strip_json_comments(), 1);
 import * as fs18 from "node:fs";
-import * as os15 from "node:os";
+import * as os14 from "node:os";
 import * as path21 from "node:path";
 function isRecord(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
@@ -74430,11 +74736,11 @@ function getClaudeProjectSettings(projects, cwd5) {
   return void 0;
 }
 __name(getClaudeProjectSettings, "getClaudeProjectSettings");
-function getClaudeCodeConfigPath(homeDir = os15.homedir()) {
+function getClaudeCodeConfigPath(homeDir = os14.homedir()) {
   return path21.join(homeDir, ".claude.json");
 }
 __name(getClaudeCodeConfigPath, "getClaudeCodeConfigPath");
-function getClaudeDesktopConfigPath(homeDir = os15.homedir(), platform5 = process.platform, env5 = process.env) {
+function getClaudeDesktopConfigPath(homeDir = os14.homedir(), platform5 = process.platform, env5 = process.env) {
   if (platform5 === "win32") {
     const appData = env5["APPDATA"] ?? path21.win32.join(homeDir, "AppData", "Roaming");
     return path21.win32.join(appData, "Claude", "claude_desktop_config.json");
@@ -74600,7 +74906,7 @@ function loadClaudeDesktopMcpServers(homeDir, platform5, env5) {
 }
 __name(loadClaudeDesktopMcpServers, "loadClaudeDesktopMcpServers");
 function loadClaudeMcpSources(options) {
-  const homeDir = options.homeDir ?? os15.homedir();
+  const homeDir = options.homeDir ?? os14.homedir();
   const cwd5 = options.cwd ?? process.cwd();
   const platform5 = options.platform ?? process.platform;
   const env5 = options.env ?? process.env;
@@ -76863,7 +77169,7 @@ init_esbuild_shims();
 // packages/cli/src/ui/utils/terminalSetup.ts
 init_esbuild_shims();
 import { promises as fs21 } from "node:fs";
-import * as os16 from "node:os";
+import * as os15 from "node:os";
 import * as path26 from "node:path";
 import { exec as exec3 } from "node:child_process";
 import { promisify } from "node:util";
@@ -76982,7 +77288,7 @@ async function detectTerminal2() {
   if (termProgram === "vscode" || process.env["VSCODE_GIT_IPC_HANDLE"]) {
     return "vscode";
   }
-  if (os16.platform() !== "win32") {
+  if (os15.platform() !== "win32") {
     try {
       const { stdout } = await execAsync("ps -o comm= -p $PPID");
       const parentName = stdout.trim();
@@ -77012,10 +77318,10 @@ async function backupFile(filePath) {
 }
 __name(backupFile, "backupFile");
 function getVSCodeStyleConfigDir(appName) {
-  const platform5 = os16.platform();
+  const platform5 = os15.platform();
   if (platform5 === "darwin") {
     return path26.join(
-      os16.homedir(),
+      os15.homedir(),
       "Library",
       "Application Support",
       appName,
@@ -77027,7 +77333,7 @@ function getVSCodeStyleConfigDir(appName) {
     }
     return path26.join(process.env["APPDATA"], appName, "User");
   } else {
-    return path26.join(os16.homedir(), ".config", appName, "User");
+    return path26.join(os15.homedir(), ".config", appName, "User");
   }
 }
 __name(getVSCodeStyleConfigDir, "getVSCodeStyleConfigDir");
@@ -79279,6 +79585,12 @@ var BuiltinCommandLoader = class {
       aboutCommand,
       agentsCommand,
       tasksCommand,
+      // Gated behind isWorkflowsEnabled — feature flag honors
+      // QWEN_CODE_ENABLE_WORKFLOWS (opt-in) and QWEN_CODE_DISABLE_WORKFLOWS
+      // (kill switch). When the flag is off the command vanishes entirely
+      // from typeahead and help, matching the established convention for
+      // experimental builtins.
+      this.config?.isWorkflowsEnabled() ? workflowsCommand : null,
       arenaCommand,
       approvalModeCommand,
       authCommand2,
@@ -82903,6 +83215,10 @@ ${text}
       if (options.captureMonitorNotifications !== false) {
         monitorRegistry.setNotificationCallback(
           (displayText, modelText, meta) => {
+            if (meta.status === "running" && typeof monitorRegistry.get === "function") {
+              const entry = monitorRegistry.get(meta.monitorId);
+              if (!entry || entry.status !== "running") return;
+            }
             const queueItem = {
               displayText,
               modelText,
@@ -83189,10 +83505,25 @@ ${text}
           if (pendingTeammateMessages.length > 0) {
             continue;
           }
-          const drainOneItem = /* @__PURE__ */ __name(async () => {
+          const drainBatch = /* @__PURE__ */ __name(async () => {
             if (localQueue.length === 0) return;
-            const item = localQueue.shift();
-            emitNotificationToSdk(item);
+            const targetType = localQueue[0].sendMessageType;
+            let splitIdx = targetType === "cron" /* Cron */ ? 1 : 0;
+            if (splitIdx === 0) {
+              while (splitIdx < localQueue.length && localQueue[splitIdx].sendMessageType === targetType) {
+                splitIdx++;
+              }
+            }
+            const batch = localQueue.splice(0, splitIdx);
+            if (batch.length === 0) return;
+            for (const queueItem of batch) {
+              emitNotificationToSdk(queueItem);
+            }
+            const item = {
+              displayText: batch.map((i) => i.displayText).join("; "),
+              modelText: batch.map((i) => i.modelText).join("\n\n"),
+              sendMessageType: targetType
+            };
             turnCount++;
             if (config.getMaxSessionTurns() >= 0 && turnCount > config.getMaxSessionTurns()) {
               await handleMaxTurnsExceededError(config);
@@ -83260,14 +83591,14 @@ ${text}
                 break;
               }
             }
-          }, "drainOneItem");
+          }, "drainBatch");
           let drainPromise = null;
           const drainLocalQueue = /* @__PURE__ */ __name(() => {
             if (drainPromise) return drainPromise;
             const p = (async () => {
               while (localQueue.length > 0) {
                 if (structuredSubmission !== void 0) return;
-                await drainOneItem();
+                await drainBatch();
               }
             })();
             drainPromise = p;
@@ -83902,7 +84233,7 @@ var SystemController = class extends BaseController {
       throw new Error("Request aborted");
     }
     try {
-      const mod = await import("./chunks/contextCommand-KS2H7MW5.js");
+      const mod = await import("./chunks/contextCommand-WP7BU7IY.js");
       if (signal.aborted) {
         throw new Error("Request aborted");
       }
@@ -85303,6 +85634,10 @@ var Session = class {
       if (this.isShuttingDown || this.abortController.signal.aborted) {
         return;
       }
+      if (meta.status === "running" && typeof registry2.get === "function") {
+        const entry = registry2.get(meta.monitorId);
+        if (!entry || entry.status !== "running") return;
+      }
       this.enqueueMonitorNotification({
         displayText,
         modelText,
@@ -85507,25 +85842,29 @@ var Session = class {
       debugLogger33.error("[Session] Query execution error:", error);
     }
   }
-  async processMonitorNotification(notification) {
+  async processMonitorNotificationBatch(batch) {
     await this.waitForInitialization();
-    this.outputAdapter.emitUserMessage([{ text: notification.displayText }]);
-    this.outputAdapter.emitSystemMessage(
-      "task_notification",
-      notification.sdkNotification
-    );
+    for (const item of batch) {
+      this.outputAdapter.emitUserMessage([{ text: item.displayText }]);
+      this.outputAdapter.emitSystemMessage(
+        "task_notification",
+        item.sdkNotification
+      );
+    }
+    const combinedModelText = batch.map((n) => n.modelText).join("\n\n");
+    const combinedDisplayText = batch.map((n) => n.displayText).join("; ");
     const promptId = this.getNextPromptId();
     await runNonInteractive(
       this.config,
       this.settings,
-      notification.modelText,
+      combinedModelText,
       promptId,
       {
         abortController: this.abortController,
         adapter: this.outputAdapter,
         controlService: this.controlService ?? void 0,
         sendMessageType: "notification" /* Notification */,
-        notificationDisplayText: notification.displayText,
+        notificationDisplayText: combinedDisplayText,
         captureMonitorNotifications: false,
         captureMonitorRegistrations: false
       }
@@ -85551,15 +85890,15 @@ var Session = class {
         this.outputAdapter.emitSystemMessage("task_started", started);
         continue;
       }
-      const notification = this.monitorQueue.shift();
-      if (!notification) {
+      if (this.monitorQueue.length === 0) {
         continue;
       }
+      const batch = this.monitorQueue.splice(0);
       try {
-        await this.processMonitorNotification(notification);
+        await this.processMonitorNotificationBatch(batch);
       } catch (error) {
         debugLogger33.error(
-          "[Session] Error processing monitor notification:",
+          "[Session] Error processing monitor notification batch:",
           error
         );
         this.emitErrorResult(error);
@@ -87745,6 +88084,22 @@ __name(loadLowlight, "loadLowlight");
 // packages/cli/src/ui/utils/CodeColorizer.tsx
 var import_jsx_runtime10 = __toESM(require_jsx_runtime(), 1);
 var debugLogger37 = createDebugLogger("CODE_COLORIZER");
+var STRUCTURAL_BOX_RE = /[│├└┌┐┘┬┴┼]/;
+var CJK_RE = /[\u4E00-\u9FFF\u3400-\u4DBF]/g;
+function looksLikeDiagramOrArt(line) {
+  const trimmed = line.trim();
+  if (trimmed.length === 0) return false;
+  if (STRUCTURAL_BOX_RE.test(trimmed)) {
+    return true;
+  }
+  const cjkMatches = trimmed.match(CJK_RE) || [];
+  const totalChars = trimmed.replace(/\s/g, "").length;
+  if (totalChars > 0 && cjkMatches.length / totalChars > 0.3) {
+    return true;
+  }
+  return false;
+}
+__name(looksLikeDiagramOrArt, "looksLikeDiagramOrArt");
 function renderHastNode(node, theme2, inheritedColor) {
   if (node.type === "text") {
     const color2 = inheritedColor || theme2.defaultColor;
@@ -87790,6 +88145,9 @@ function highlightAndRenderLine(line, language, theme2, lowlight) {
   if (!lowlight) {
     return line;
   }
+  if (!language && looksLikeDiagramOrArt(line)) {
+    return line;
+  }
   try {
     const getHighlightedLine = /* @__PURE__ */ __name(() => !language || !lowlight.registered(language) ? lowlight.highlightAuto(line) : lowlight.highlight(language, line), "getHighlightedLine");
     const renderedNode = renderHastNode(getHighlightedLine(), theme2, void 0);
@@ -90749,7 +91107,7 @@ __name(renderMermaidVisual, "renderMermaidVisual");
 init_esbuild_shims();
 import crypto2 from "node:crypto";
 import fs27 from "node:fs";
-import os17 from "node:os";
+import os16 from "node:os";
 import path35 from "node:path";
 import { spawn as spawn4, spawnSync } from "node:child_process";
 var CACHE_LIMIT = 40;
@@ -91313,7 +91671,7 @@ function isExecutable(filePath) {
 __name(isExecutable, "isExecutable");
 async function renderPngWithMmdcAsync(source, mmdc, env5, signal) {
   const tempDir = await fs27.promises.mkdtemp(
-    path35.join(os17.tmpdir(), "qwen-mermaid-")
+    path35.join(os16.tmpdir(), "qwen-mermaid-")
   );
   const inputPath = path35.join(tempDir, "diagram.mmd");
   const outputPath = path35.join(tempDir, "diagram.png");
@@ -91410,7 +91768,7 @@ function getMermaidCellAspectRatio(env5) {
 __name(getMermaidCellAspectRatio, "getMermaidCellAspectRatio");
 async function renderPngWithChafaAsync(png, widthCells, rows, chafa, env5, signal) {
   const tempDir = await fs27.promises.mkdtemp(
-    path35.join(os17.tmpdir(), "qwen-mermaid-")
+    path35.join(os16.tmpdir(), "qwen-mermaid-")
   );
   const imagePath = path35.join(tempDir, "diagram.png");
   try {
@@ -92639,39 +92997,143 @@ var AssistantMessageContent = /* @__PURE__ */ __name(({
     sourceCopyIndexOffsets
   }
 ), "AssistantMessageContent");
+var MAX_STREAMING_THINKING_VISUAL_LINES = 4;
+function wrapToVisualLines(text, width) {
+  if (width <= 0) {
+    return [""];
+  }
+  const visualLines = [];
+  for (const logicalLine of text.split("\n")) {
+    if (logicalLine === "") {
+      visualLines.push("");
+      continue;
+    }
+    let currentLine = "";
+    let currentWidth = 0;
+    for (const char of logicalLine) {
+      const charWidth = getCachedStringWidth(char);
+      if (currentWidth + charWidth > width && currentWidth > 0) {
+        visualLines.push(currentLine);
+        currentLine = "";
+        currentWidth = 0;
+      }
+      currentLine += char;
+      currentWidth += charWidth;
+    }
+    if (currentLine) {
+      visualLines.push(currentLine);
+    }
+  }
+  if (visualLines.length === 0) {
+    visualLines.push("");
+  }
+  return visualLines;
+}
+__name(wrapToVisualLines, "wrapToVisualLines");
+function tailVisualLines(text, width, maxLines) {
+  const charBudget = maxLines * width * 2;
+  let sliceStart = Math.max(0, text.length - charBudget);
+  if (sliceStart > 0) {
+    const nl = text.indexOf("\n", sliceStart);
+    if (nl !== -1 && nl < text.length - 1) {
+      sliceStart = nl + 1;
+    }
+  }
+  const lines = wrapToVisualLines(text.slice(sliceStart), width);
+  return lines.slice(-maxLines).join("\n");
+}
+__name(tailVisualLines, "tailVisualLines");
+function formatDuration2(ms) {
+  const totalSeconds = Math.round(ms / 1e3);
+  if (totalSeconds < 60) {
+    return `${totalSeconds}s`;
+  }
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return seconds > 0 ? `${minutes}m ${seconds}s` : `${minutes}m`;
+}
+__name(formatDuration2, "formatDuration");
 var ThinkMessage = /* @__PURE__ */ __name(({
   text,
   isPending,
+  expanded = false,
   availableTerminalHeight,
-  contentWidth
-}) => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
-  PrefixedMarkdownMessage,
-  {
-    text,
-    prefix: "\u2726",
-    prefixColor: theme.text.secondary,
-    isPending,
-    availableTerminalHeight,
-    contentWidth,
-    textColor: theme.text.secondary
+  contentWidth,
+  durationMs
+}) => {
+  const durationSuffix = durationMs != null ? ` ${formatDuration2(durationMs)}` : "";
+  if (!isPending && !expanded) {
+    const label = durationMs != null ? `${t("Thought for")} ${formatDuration2(durationMs)}` : t("Thinking");
+    return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Text, { dimColor: true, italic: true, children: label });
+  }
+  if (isPending) {
+    const innerWidth = Math.max(contentWidth - 2, 20);
+    const maxLines = availableTerminalHeight != null ? Math.max(
+      1,
+      Math.min(
+        MAX_STREAMING_THINKING_VISUAL_LINES,
+        Math.floor(availableTerminalHeight / 3)
+      )
+    ) : MAX_STREAMING_THINKING_VISUAL_LINES;
+    const display = tailVisualLines(text, innerWidth, maxLines);
+    return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(Box_default, { flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(Text, { dimColor: true, italic: true, children: [
+        "\u27E1 ",
+        t("Thinking"),
+        "\u2026",
+        durationSuffix
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Text, { dimColor: true, wrap: "truncate", children: display }) })
+    ] });
   }
-), "ThinkMessage");
+  const expandedLabel = durationMs != null ? `${t("Thought for")} ${formatDuration2(durationMs)}` : `${t("Thinking")}\u2026`;
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(Box_default, { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Text, { dimColor: true, italic: true, children: expandedLabel }),
+    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Box_default, { paddingLeft: 2, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+      MarkdownDisplay,
+      {
+        text,
+        isPending: false,
+        availableTerminalHeight,
+        contentWidth: contentWidth - 2,
+        textColor: theme.text.secondary
+      }
+    ) })
+  ] });
+}, "ThinkMessage");
 var ThinkMessageContent = /* @__PURE__ */ __name(({
   text,
   isPending,
+  expanded = false,
   availableTerminalHeight,
   contentWidth
-}) => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
-  ContinuationMarkdownMessage,
-  {
-    text,
-    isPending,
-    availableTerminalHeight,
-    contentWidth,
-    basePrefix: "\u2726",
-    textColor: theme.text.secondary
+}) => {
+  if (!isPending && !expanded) {
+    return null;
+  }
+  if (isPending) {
+    const innerWidth = Math.max(contentWidth - 2, 20);
+    const maxLines = availableTerminalHeight != null ? Math.max(
+      1,
+      Math.min(
+        MAX_STREAMING_THINKING_VISUAL_LINES,
+        Math.floor(availableTerminalHeight / 3)
+      )
+    ) : MAX_STREAMING_THINKING_VISUAL_LINES;
+    const display = tailVisualLines(text, innerWidth, maxLines);
+    return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Text, { dimColor: true, wrap: "truncate", children: display }) });
   }
-), "ThinkMessageContent");
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Box_default, { paddingLeft: 2, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+    MarkdownDisplay,
+    {
+      text,
+      isPending: false,
+      availableTerminalHeight,
+      contentWidth: contentWidth - 2,
+      textColor: theme.text.secondary
+    }
+  ) });
+}, "ThinkMessageContent");
 
 // packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
 init_esbuild_shims();
@@ -93093,7 +93555,7 @@ init_esbuild_shims();
 var import_react58 = __toESM(require_react(), 1);
 import { spawnSync as spawnSync2 } from "node:child_process";
 import fs28 from "node:fs";
-import os18 from "node:os";
+import os17 from "node:os";
 import pathMod from "node:path";
 
 // packages/cli/src/ui/components/shared/vim-buffer-actions.ts
@@ -95445,7 +95907,7 @@ function useTextBuffer({
       let tmpDir;
       let filePath;
       try {
-        tmpDir = fs28.mkdtempSync(pathMod.join(os18.tmpdir(), "qwen-edit-"));
+        tmpDir = fs28.mkdtempSync(pathMod.join(os17.tmpdir(), "qwen-edit-"));
         filePath = pathMod.join(tmpDir, "buffer.txt");
       } catch (err) {
         debugLogger39.error(
@@ -101189,20 +101651,23 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             sourceCopyIndexOffsets
           }
         ),
-        !compactMode && itemForDisplay.type === "gemini_thought" && /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
+        itemForDisplay.type === "gemini_thought" && /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
           ThinkMessage,
           {
             text: itemForDisplay.text.trimEnd(),
             isPending,
+            expanded: false,
             availableTerminalHeight: availableTerminalHeightGemini ?? availableTerminalHeight,
-            contentWidth
+            contentWidth,
+            durationMs: itemForDisplay.durationMs
           }
         ),
-        !compactMode && itemForDisplay.type === "gemini_thought_content" && /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
+        itemForDisplay.type === "gemini_thought_content" && /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
           ThinkMessageContent,
           {
             text: itemForDisplay.text.trimEnd(),
             isPending,
+            expanded: false,
             availableTerminalHeight: availableTerminalHeightGemini ?? availableTerminalHeight,
             contentWidth
           }
@@ -105930,12 +106395,12 @@ __name(StatusLineDialog, "StatusLineDialog");
 init_esbuild_shims();
 var import_react100 = __toESM(require_react(), 1);
 var import_jsx_runtime79 = __toESM(require_jsx_runtime(), 1);
-function formatTime(seconds) {
+function formatTime2(seconds) {
   const minutes = Math.floor(seconds / 60);
   const remainingSeconds = seconds % 60;
   return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`;
 }
-__name(formatTime, "formatTime");
+__name(formatTime2, "formatTime");
 function QwenOAuthProgress({
   onTimeout,
   onCancel,
@@ -106032,7 +106497,7 @@ function QwenOAuthProgress({
             /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(Text, { children: [
               t("Time remaining:"),
               " ",
-              formatTime(timeRemaining)
+              formatTime2(timeRemaining)
             ] })
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(Text, { color: theme.text.secondary, children: t("Esc to cancel") }) })
@@ -106060,7 +106525,7 @@ function QwenOAuthProgress({
           /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(Text, { children: [
             t("Time remaining:"),
             " ",
-            formatTime(timeRemaining)
+            formatTime2(timeRemaining)
           ] })
         ] }),
         /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(Text, { color: theme.text.secondary, children: t("Esc to cancel") }) })
@@ -107983,7 +108448,7 @@ __name(TrustDialog, "TrustDialog");
 init_esbuild_shims();
 var import_react108 = __toESM(require_react(), 1);
 import * as fs31 from "node:fs";
-import * as os19 from "node:os";
+import * as os18 from "node:os";
 import * as nodePath2 from "node:path";
 var import_jsx_runtime86 = __toESM(require_jsx_runtime(), 1);
 function getPermScopeItems() {
@@ -108098,7 +108563,7 @@ function PermissionsDialog({
   const dirCompletions = (0, import_react108.useMemo)(() => {
     const trimmed = newDirInput.trim();
     if (!trimmed) return [];
-    const expanded = trimmed.startsWith("~") ? trimmed.replace(/^~/, os19.homedir()) : trimmed;
+    const expanded = trimmed.startsWith("~") ? trimmed.replace(/^~/, os18.homedir()) : trimmed;
     const endsWithSep = expanded.endsWith("/") || expanded.endsWith(nodePath2.sep);
     const searchDir = endsWithSep ? expanded : nodePath2.dirname(expanded);
     const prefix = endsWithSep ? "" : nodePath2.basename(expanded);
@@ -108172,7 +108637,7 @@ function PermissionsDialog({
   const handleAddDirSubmit = (0, import_react108.useCallback)(() => {
     const trimmed = newDirInput.trim();
     if (!trimmed) return;
-    const expanded = trimmed.startsWith("~") ? trimmed.replace(/^~/, os19.homedir()) : trimmed;
+    const expanded = trimmed.startsWith("~") ? trimmed.replace(/^~/, os18.homedir()) : trimmed;
     const absoluteExpanded = nodePath2.isAbsolute(expanded) ? expanded : nodePath2.resolve(expanded);
     if (!fs31.existsSync(absoluteExpanded)) {
       setDirInputError(t("Directory does not exist."));
@@ -108840,7 +109305,9 @@ function ModelDialog({
   const availableModelEntries = (0, import_react109.useMemo)(() => {
     const allModels = config ? config.getAllConfiguredModels() : [];
     const runtimeModels = allModels.filter((m) => m.isRuntimeModel);
-    const registryModels = allModels.filter((m) => !m.isRuntimeModel);
+    const registryModels = allModels.filter(
+      (m) => !m.isRuntimeModel && (m.authType !== "qwen-oauth" /* QWEN_OAUTH */ || authType === "qwen-oauth" /* QWEN_OAUTH */)
+    );
     const modelsByAuthTypeMap = /* @__PURE__ */ new Map();
     for (const model of registryModels) {
       const authType2 = model.authType;
@@ -108875,7 +109342,7 @@ function ModelDialog({
       }
     }
     return result;
-  }, [config]);
+  }, [authType, config]);
   const MODEL_OPTIONS = (0, import_react109.useMemo)(
     () => availableModelEntries.map(
       ({ authType: t2, model, isRuntime, snapshotId }) => {
@@ -109747,11 +110214,11 @@ var import_react113 = __toESM(require_react(), 1);
 var import_jsx_runtime91 = __toESM(require_jsx_runtime(), 1);
 var STATUS_REFRESH_INTERVAL_MS = 2e3;
 var IN_PROCESS_REFRESH_INTERVAL_MS = 1e3;
-function truncate(str, maxLen) {
+function truncate2(str, maxLen) {
   if (str.length <= maxLen) return str;
   return str.slice(0, maxLen - 1) + "\u2026";
 }
-__name(truncate, "truncate");
+__name(truncate2, "truncate");
 function pad(str, len, align2 = "left") {
   if (str.length >= len) return str.slice(0, len);
   const padding = " ".repeat(len - str.length);
@@ -109878,7 +110345,7 @@ function ArenaStatusDialog({
           const successfulToolCalls = live?.successfulToolCalls ?? agent.stats.successfulToolCalls;
           const failedToolCalls = live?.failedToolCalls ?? agent.stats.failedToolCalls;
           return /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Box_default, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Text, { color: theme.text.primary, children: truncate(label, MAX_MODEL_NAME_LENGTH) }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Text, { color: theme.text.primary, children: truncate2(label, MAX_MODEL_NAME_LENGTH) }) }),
             /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Box_default, { width: colStatus, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Text, { color: color2, children: statusText }) }),
             /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Box_default, { width: colTime, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Text, { color: theme.text.primary, children: pad(formatDuration(elapsed), colTime - 1, "right") }) }),
             /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Box_default, { width: colTokens, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Text, { color: theme.text.primary, children: pad(totalTokens.toLocaleString(), colTokens - 1, "right") }) }),
@@ -112378,11 +112845,11 @@ function sortSkills(skills) {
   );
 }
 __name(sortSkills, "sortSkills");
-function truncate2(text, max) {
+function truncate3(text, max) {
   if (text.length <= max) return text;
   return `${text.slice(0, Math.max(0, max - 1))}\u2026`;
 }
-__name(truncate2, "truncate");
+__name(truncate3, "truncate");
 function SkillsManagerDialog({
   settings,
   config,
@@ -112473,7 +112940,7 @@ function SkillsManagerDialog({
     () => filteredUnlocked.map((s) => ({
       key: s.name,
       value: { name: s.name, description: s.description, level: s.level },
-      label: `${truncate2(s.name, NAME_COLUMN).padEnd(NAME_COLUMN)} ${truncate2(
+      label: `${truncate3(s.name, NAME_COLUMN).padEnd(NAME_COLUMN)} ${truncate3(
         s.description,
         80
       )}  (${levelLabel(s.level)})`
@@ -112718,8 +113185,8 @@ function SkillsManagerDialog({
           filteredLocked.map((s) => {
             const scopeName = higher.scopeOf(s.name) ?? t("higher scope");
             return /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(Text, { dimColor: true, wrap: "truncate", children: t("  {{name}} {{description}}  [locked: {{scope}}]", {
-              name: truncate2(s.name, NAME_COLUMN).padEnd(NAME_COLUMN),
-              description: truncate2(s.description, 60),
+              name: truncate3(s.name, NAME_COLUMN).padEnd(NAME_COLUMN),
+              description: truncate3(s.description, 60),
               scope: scopeName
             }) }, s.name);
           })
@@ -117862,7 +118329,7 @@ function convertToHistoryItems(conversation, config) {
       }
       case "assistant": {
         const parts = record.message?.parts;
-        const thoughtText = !config || !config.getContentGenerator().useSummarizedThinking() ? extractThoughtTextFromParts(parts) : "";
+        const thoughtText = !config ? extractThoughtTextFromParts(parts) : "";
         const text = extractTextFromParts(parts);
         const functionCalls = extractFunctionCalls(parts);
         if (thoughtText) {
@@ -119339,7 +119806,7 @@ __name(emptyMessage, "emptyMessage");
 init_esbuild_shims();
 var import_react146 = __toESM(require_react(), 1);
 import fs32 from "node:fs/promises";
-import os20 from "node:os";
+import os19 from "node:os";
 import path39 from "node:path";
 import { spawnSync as spawnSync4 } from "node:child_process";
 var import_jsx_runtime144 = __toESM(require_jsx_runtime(), 1);
@@ -119391,7 +119858,7 @@ async function ensureFileExists(filePath) {
 }
 __name(ensureFileExists, "ensureFileExists");
 function formatDisplayPath(filePath) {
-  const home = os20.homedir();
+  const home = os19.homedir();
   if (filePath.startsWith(home)) {
     return `~${filePath.slice(home.length)}`;
   }
@@ -119726,6 +120193,8 @@ function entryId(entry) {
       return entry.shellId;
     case "monitor":
       return entry.monitorId;
+    case "workflow":
+      return entry.runId;
     case "dream":
       return entry.dreamId;
     default: {
@@ -119744,6 +120213,7 @@ function useBackgroundTaskView(config) {
     const agentRegistry = config.getBackgroundTaskRegistry();
     const shellRegistry = config.getBackgroundShellRegistry();
     const monitorRegistry = config.getMonitorRegistry();
+    const workflowRegistry = config.getWorkflowRunRegistry();
     const memoryManager = config.getMemoryManager();
     const projectRoot = config.getProjectRoot();
     let lastDreamSig = "";
@@ -119752,6 +120222,7 @@ function useBackgroundTaskView(config) {
       const agentEntries = [...agentRegistry.getAll()];
       const shellEntries = [...shellRegistry.getAll()];
       const monitorEntries = [...monitorRegistry.getAll()];
+      const workflowEntries = [...workflowRegistry.list()];
       const allDreams = dreamSnapshot ?? memoryManager.listTasksByType("dream", projectRoot);
       const runningDreams = allDreams.filter((t2) => t2.status === "running");
       const terminalDreams = allDreams.filter(
@@ -119784,6 +120255,7 @@ function useBackgroundTaskView(config) {
         ...agentEntries,
         ...shellEntries,
         ...monitorEntries,
+        ...workflowEntries,
         ...dreamEntries
       ].sort((a, b) => {
         const aActive = isActive(a);
@@ -119800,6 +120272,7 @@ function useBackgroundTaskView(config) {
     agentRegistry.setStatusChangeCallback(refreshFromRegistry);
     shellRegistry.setStatusChangeCallback(refreshFromRegistry);
     monitorRegistry.setStatusChangeCallback(refreshFromRegistry);
+    workflowRegistry.setStatusChangeCallback(refreshFromRegistry);
     agentRegistry.setApprovalChangeCallback(refreshFromRegistry);
     const memoryListener = /* @__PURE__ */ __name(() => {
       const dreams = memoryManager.listTasksByType("dream", projectRoot);
@@ -119814,6 +120287,7 @@ function useBackgroundTaskView(config) {
       agentRegistry.setStatusChangeCallback(void 0);
       shellRegistry.setStatusChangeCallback(void 0);
       monitorRegistry.setStatusChangeCallback(void 0);
+      workflowRegistry.setStatusChangeCallback(void 0);
       agentRegistry.setApprovalChangeCallback(void 0);
       unsubscribeMemory();
     };
@@ -119948,6 +120422,9 @@ function BackgroundTaskViewProvider({
         }
         break;
       }
+      case "workflow":
+        config.getWorkflowRunRegistry().cancel(target.runId, Date.now());
+        break;
       default: {
         const _exhaustive = target;
         throw new Error(
@@ -120124,6 +120601,12 @@ function rowLabel(entry) {
       return `${SHELL_ROW_PREFIX} ${entry.command}`;
     case "monitor":
       return `[monitor] ${entry.description}`;
+    case "workflow": {
+      const label = entry.meta?.name ?? entry.runId;
+      const phase = entry.currentPhase ? ` \xB7 ${entry.currentPhase}` : "";
+      const counts = entry.agentsDispatched > 0 ? ` (${entry.agentsCompleted}/${entry.agentsDispatched})` : "";
+      return `[workflow] ${label}${phase}${counts}`;
+    }
     case "dream":
       return formatDreamRowLabel(entry);
     default: {
@@ -120238,6 +120721,15 @@ var DetailBody = /* @__PURE__ */ __name(({ entry, maxHeight, maxWidth }) => {
           maxWidth
         }
       );
+    case "workflow":
+      return /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(
+        WorkflowDetailBody,
+        {
+          entry,
+          maxHeight,
+          maxWidth
+        }
+      );
     case "dream":
       return /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(
         DreamDetailBody,
@@ -120496,6 +120988,69 @@ var MonitorDetailBody = /* @__PURE__ */ __name(({ entry, maxHeight, maxWidth })
     }
   );
 }, "MonitorDetailBody");
+var MAX_VISIBLE_PHASES = 20;
+var MAX_VISIBLE_LOG_LINES = 10;
+var WorkflowDetailBody = /* @__PURE__ */ __name(({ entry, maxHeight, maxWidth }) => {
+  const title = `${t("Workflow")} \u203A ${entry.meta?.name ?? entry.runId}`;
+  const terminal = terminalStatusPresentation(entry.status);
+  const dimSubtitleParts = [elapsedFor(entry)];
+  if (entry.agentsDispatched > 0) {
+    dimSubtitleParts.push(
+      `${entry.agentsCompleted}/${entry.agentsDispatched} ${t("agents")}`
+    );
+  }
+  dimSubtitleParts.push(
+    `${entry.phases.length} ${entry.phases.length === 1 ? t("phase") : t("phases")}`
+  );
+  const phaseOverflow = Math.max(0, entry.phases.length - MAX_VISIBLE_PHASES);
+  const visiblePhases = entry.phases.slice(-MAX_VISIBLE_PHASES);
+  const logOverflow = Math.max(
+    0,
+    entry.recentLogs.length - MAX_VISIBLE_LOG_LINES
+  );
+  const visibleLogs = entry.recentLogs.slice(-MAX_VISIBLE_LOG_LINES);
+  const hasError = Boolean(entry.error);
+  return /* @__PURE__ */ (0, import_jsx_runtime146.jsxs)(
+    MaxSizedBox,
+    {
+      maxHeight,
+      maxWidth,
+      overflowDirection: "bottom",
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { bold: true, color: theme.text.accent, children: title }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime146.jsxs)(Box_default, { children: [
+          terminal && /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { color: terminal.color, children: `${terminal.icon} ${statusVerb(entry.status)} \xB7 ` }),
+          /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { color: theme.text.secondary, children: dimSubtitleParts.join(" \xB7 ") })
+        ] }),
+        entry.meta?.description && /* @__PURE__ */ (0, import_jsx_runtime146.jsxs)(import_react149.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { wrap: "wrap", children: entry.meta.description }) })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { bold: true, dimColor: true, children: t("Phases") }) }),
+        entry.phases.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { dimColor: true, children: t("(no phase recorded yet)") }) }) : /* @__PURE__ */ (0, import_jsx_runtime146.jsxs)(import_react149.Fragment, { children: [
+          phaseOverflow > 0 && /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { dimColor: true, children: `+${phaseOverflow} ${t("more above")}` }) }),
+          visiblePhases.map((phaseTitle, i) => {
+            const isCurrent = entry.status === "running" && i === visiblePhases.length - 1 && entry.currentPhase === phaseTitle;
+            const marker = isCurrent ? "\u25B8" : "\xB7";
+            return /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { color: isCurrent ? theme.status.success : void 0, children: `  ${marker} ${phaseTitle}` }) }, `${phaseTitle}-${i}`);
+          })
+        ] }),
+        entry.recentLogs.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime146.jsxs)(import_react149.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { bold: true, dimColor: true, children: t("Logs") }) }),
+          logOverflow > 0 && /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { dimColor: true, children: `+${logOverflow} ${t("more above")}` }) }),
+          visibleLogs.map((line, i) => /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { wrap: "truncate-end", dimColor: true, children: line }) }, `log-${i}`))
+        ] }),
+        hasError && /* @__PURE__ */ (0, import_jsx_runtime146.jsxs)(import_react149.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { bold: true, color: theme.status.error, children: t("Error") }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime146.jsx)(Text, { color: theme.status.error, wrap: "wrap", children: entry.error }) })
+        ] })
+      ]
+    }
+  );
+}, "WorkflowDetailBody");
 var BackgroundTasksDialog = /* @__PURE__ */ __name(({
   availableTerminalHeight,
   terminalWidth
@@ -121318,7 +121873,6 @@ var LoadingIndicator = /* @__PURE__ */ __name(({
   currentLoadingPhrase,
   elapsedTime,
   rightContent,
-  thought,
   candidatesTokens,
   streamingCharsRef,
   isStreaming,
@@ -121335,7 +121889,7 @@ var LoadingIndicator = /* @__PURE__ */ __name(({
   if (streamingState === "idle" /* Idle */) {
     return null;
   }
-  const primaryText = thought?.subject || currentLoadingPhrase;
+  const primaryText = currentLoadingPhrase;
   const streamingTokens = streamingCharsRef ? Math.round(animatedChars / 4) : 0;
   const outputTokens = (candidatesTokens ?? 0) + streamingTokens;
   const showTokens = !isNarrow && outputTokens > 0;
@@ -121457,6 +122011,10 @@ var PrepareLabel = import_react152.default.memo(_PrepareLabel);
 // packages/cli/src/ui/components/SuggestionsDisplay.tsx
 var import_jsx_runtime150 = __toESM(require_jsx_runtime(), 1);
 var MAX_SUGGESTIONS_TO_SHOW = 8;
+function normalizeDescription(description) {
+  return description.replace(/\s+/g, " ").trim();
+}
+__name(normalizeDescription, "normalizeDescription");
 function SuggestionsDisplay({
   suggestions,
   activeIndex,
@@ -121533,7 +122091,7 @@ function SuggestionsDisplay({
             flexGrow: 1,
             flexShrink: 1,
             paddingLeft: 2,
-            children: /* @__PURE__ */ (0, import_jsx_runtime150.jsx)(Text, { color: textColor, wrap: "wrap", children: suggestion.description })
+            children: /* @__PURE__ */ (0, import_jsx_runtime150.jsx)(Text, { color: textColor, wrap: "truncate-end", children: normalizeDescription(suggestion.description) })
           }
         ),
         isActive && isLong && /* @__PURE__ */ (0, import_jsx_runtime150.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime150.jsx)(Text, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
@@ -125056,6 +125614,7 @@ var KIND_NAMES = {
   agent: { singular: "local agent", plural: "local agents" },
   shell: { singular: "shell", plural: "shells" },
   monitor: { singular: "monitor", plural: "monitors" },
+  workflow: { singular: "workflow", plural: "workflows" },
   dream: { singular: "dream", plural: "dreams" }
 };
 function hasPendingApproval(entries) {
@@ -125080,12 +125639,13 @@ function getPillLabel(entries) {
 }
 __name(getPillLabel, "getPillLabel");
 function groupAndFormat(entries) {
-  const counts = { agent: 0, shell: 0, monitor: 0, dream: 0 };
+  const counts = { agent: 0, shell: 0, monitor: 0, workflow: 0, dream: 0 };
   for (const e of entries) counts[e.kind]++;
   const parts = [];
   if (counts.shell > 0) parts.push(formatCount("shell", counts.shell));
   if (counts.agent > 0) parts.push(formatCount("agent", counts.agent));
   if (counts.monitor > 0) parts.push(formatCount("monitor", counts.monitor));
+  if (counts.workflow > 0) parts.push(formatCount("workflow", counts.workflow));
   if (counts.dream > 0) parts.push(formatCount("dream", counts.dream));
   return parts.join(", ");
 }
@@ -125994,7 +126554,6 @@ var Composer = /* @__PURE__ */ __name(() => {
     !uiState.embeddedShellFocused && !suppressBottomLoadingIndicator && /* @__PURE__ */ (0, import_jsx_runtime164.jsx)(
       LoadingIndicator,
       {
-        thought: uiState.streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ || config.getAccessibility()?.enableLoadingPhrases === false ? void 0 : uiState.thought,
         currentLoadingPhrase: config.getAccessibility()?.enableLoadingPhrases === false ? void 0 : uiState.currentLoadingPhrase,
         elapsedTime: uiState.elapsedTime,
         candidatesTokens: agentTokens,
@@ -127444,12 +128003,12 @@ import process38 from "node:process";
 init_esbuild_shims();
 var import_react184 = __toESM(require_react(), 1);
 import process25 from "node:process";
-import os21 from "node:os";
+import os20 from "node:os";
 import v82 from "v8";
 var debugLogger61 = createDebugLogger("MEMORY_MONITOR");
 var MEMORY_WARNING_THRESHOLD = Math.min(
   7 * 1024 * 1024 * 1024,
-  Math.floor(os21.totalmem() * 0.85)
+  Math.floor(os20.totalmem() * 0.85)
 );
 var MEMORY_UI_COMPACT_THRESHOLD = /* @__PURE__ */ __name(() => Math.floor(v82.getHeapStatistics().heap_size_limit * 0.65), "MEMORY_UI_COMPACT_THRESHOLD");
 var MEMORY_CHECK_INTERVAL = 60 * 1e3;
@@ -129161,7 +129720,7 @@ init_esbuild_shims();
 var import_react198 = __toESM(require_react(), 1);
 import crypto4 from "node:crypto";
 import path42 from "node:path";
-import os22 from "node:os";
+import os21 from "node:os";
 import fs36 from "node:fs";
 var OUTPUT_UPDATE_INTERVAL_MS = 1e3;
 var MAX_OUTPUT_LENGTH = 1e4;
@@ -129199,14 +129758,14 @@ var useShellCommandProcessor = /* @__PURE__ */ __name((addItemToHistory, setPend
         { type: "user_shell", text: rawQuery },
         userMessageTimestamp
       );
-      const isWindows4 = os22.platform() === "win32";
+      const isWindows4 = os21.platform() === "win32";
       const targetDir = config.getTargetDir();
       let commandToExecute = rawQuery;
       let pwdFilePath;
       if (!isWindows4) {
         let command2 = rawQuery.trim();
         const pwdFileName = `shell_pwd_${crypto4.randomBytes(6).toString("hex")}.tmp`;
-        pwdFilePath = path42.join(os22.tmpdir(), pwdFileName);
+        pwdFilePath = path42.join(os21.tmpdir(), pwdFileName);
         if (!command2.endsWith(";") && !command2.endsWith("&")) {
           command2 += ";";
         }
@@ -129882,6 +130441,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   }, [history]);
   const summaryAbortRefsRef = (0, import_react202.useRef)(/* @__PURE__ */ new Set());
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
+  const [pendingThoughtItem, pendingThoughtItemRef, setPendingThoughtItem] = useStateAndRef(null);
+  const thoughtStartTimeRef = (0, import_react202.useRef)(null);
   const [
     pendingRetryErrorItem,
     pendingRetryErrorItemRef,
@@ -130294,7 +130855,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     [setThought]
   );
   const handleThoughtEvent = (0, import_react202.useCallback)(
-    (eventValue, currentThoughtBuffer, userMessageTimestamp) => {
+    (eventValue, currentThoughtBuffer) => {
       if (turnCancelledRef.current) {
         return "";
       }
@@ -130302,56 +130863,41 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       if (!thoughtText) {
         return currentThoughtBuffer;
       }
-      let newThoughtBuffer = currentThoughtBuffer + thoughtText;
-      if (debugLogger66.isEnabled()) {
-        debugLogger66.debug(
-          `[THOUGHT_BUFFER] Buffer growing: current=${currentThoughtBuffer.length}, incoming=${thoughtText.length}, total=${newThoughtBuffer.length}`
-        );
+      const newThoughtBuffer = currentThoughtBuffer + thoughtText;
+      if (newThoughtBuffer.trim().length === 0) {
+        return newThoughtBuffer;
       }
-      const pendingType = pendingHistoryItemRef.current?.type;
-      const isPendingThought = pendingType === "gemini_thought" || pendingType === "gemini_thought_content";
-      let thoughtToMerge = eventValue;
-      if (!isPendingThought) {
-        if (newThoughtBuffer.trim().length === 0) {
-          return newThoughtBuffer;
-        }
-        if (pendingHistoryItemRef.current) {
-          addItem(pendingHistoryItemRef.current, userMessageTimestamp);
-        }
-        newThoughtBuffer = stripLeadingBlankLines(newThoughtBuffer);
-        thoughtToMerge = {
-          ...eventValue,
-          description: newThoughtBuffer
-        };
-        setPendingHistoryItem({ type: "gemini_thought", text: "" });
+      const startingNewThought = currentThoughtBuffer.trim().length === 0;
+      const description = startingNewThought ? stripLeadingBlankLines(newThoughtBuffer) : thoughtText;
+      if (startingNewThought) {
+        thoughtStartTimeRef.current = Date.now();
       }
-      const splitPoint = findLastSafeSplitPoint(newThoughtBuffer);
-      const nextPendingType = isPendingThought && pendingType === "gemini_thought_content" ? "gemini_thought_content" : "gemini_thought";
-      if (splitPoint === newThoughtBuffer.length) {
-        setPendingHistoryItem({
-          type: nextPendingType,
-          text: newThoughtBuffer
-        });
-      } else {
-        const beforeText = newThoughtBuffer.substring(0, splitPoint);
-        const afterText = newThoughtBuffer.substring(splitPoint);
-        addItem(
-          {
-            type: nextPendingType,
-            text: beforeText
-          },
-          userMessageTimestamp
-        );
-        setPendingHistoryItem({
-          type: "gemini_thought_content",
-          text: afterText
-        });
-        newThoughtBuffer = afterText;
+      mergeThought({
+        ...eventValue,
+        description
+      });
+      setPendingThoughtItem({
+        type: "gemini_thought",
+        text: stripLeadingBlankLines(newThoughtBuffer),
+        durationMs: thoughtStartTimeRef.current ? Date.now() - thoughtStartTimeRef.current : 0
+      });
+      return startingNewThought ? description : newThoughtBuffer;
+    },
+    [mergeThought, setPendingThoughtItem]
+  );
+  const commitPendingThought = (0, import_react202.useCallback)(
+    (userMessageTimestamp) => {
+      if (pendingThoughtItemRef.current) {
+        const item = { ...pendingThoughtItemRef.current };
+        if (item.type === "gemini_thought" && thoughtStartTimeRef.current) {
+          item.durationMs = Date.now() - thoughtStartTimeRef.current;
+        }
+        addItem(item, userMessageTimestamp);
       }
-      mergeThought(thoughtToMerge);
-      return newThoughtBuffer;
+      setPendingThoughtItem(null);
+      thoughtStartTimeRef.current = null;
     },
-    [addItem, pendingHistoryItemRef, setPendingHistoryItem, mergeThought]
+    [addItem, pendingThoughtItemRef, setPendingThoughtItem]
   );
   const handleUserCancelledEvent = (0, import_react202.useCallback)(
     (userMessageTimestamp) => {
@@ -130359,6 +130905,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         return;
       }
       lastPromptErroredRef.current = false;
+      commitPendingThought(userMessageTimestamp);
       if (pendingHistoryItemRef.current) {
         if (pendingHistoryItemRef.current.type === "tool_group") {
           const updatedTools = pendingHistoryItemRef.current.tools.map(
@@ -130384,6 +130931,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [
       addItem,
+      commitPendingThought,
       pendingHistoryItemRef,
       setPendingHistoryItem,
       setThought,
@@ -130393,6 +130941,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   const handleErrorEvent = (0, import_react202.useCallback)(
     (eventValue, userMessageTimestamp) => {
       lastPromptErroredRef.current = true;
+      commitPendingThought(userMessageTimestamp);
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
@@ -130423,6 +130972,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [
       addItem,
+      commitPendingThought,
       pendingHistoryItemRef,
       setPendingHistoryItem,
       setPendingRetryErrorItem,
@@ -130673,11 +131223,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               description: `${mergedThought.description ?? ""}${queuedThought.value.description ?? ""}`
             };
           }
-          thoughtBuffer = handleThoughtEvent(
-            mergedThought,
-            thoughtBuffer,
-            userMessageTimestamp
-          );
+          thoughtBuffer = handleThoughtEvent(mergedThought, thoughtBuffer);
         }
       }, "flushBufferedStreamEvents");
       const scheduleBufferedStreamFlush = /* @__PURE__ */ __name(() => {
@@ -130704,11 +131250,20 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               }
               break;
             case "content" /* Content */:
+              if (pendingThoughtItemRef.current || bufferedEvents.some((e) => e.kind === "thought")) {
+                flushBufferedStreamEvents();
+                commitPendingThought(userMessageTimestamp);
+                thoughtBuffer = "";
+              }
+              setThought((prev) => prev ? null : prev);
               bufferedEvents.push({ kind: "content", value: event.value });
               scheduleBufferedStreamFlush();
               break;
             case "tool_call_request" /* ToolCallRequest */:
               flushBufferedStreamEvents();
+              commitPendingThought(userMessageTimestamp);
+              thoughtBuffer = "";
+              setThought((prev) => prev ? null : prev);
               toolCallRequests.push(event.value);
               try {
                 const argsJson = JSON.stringify(event.value.args);
@@ -130743,6 +131298,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               break;
             case "finished" /* Finished */:
               flushBufferedStreamEvents();
+              commitPendingThought(userMessageTimestamp);
               handleFinishedEvent(
                 event,
                 userMessageTimestamp
@@ -130753,6 +131309,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               }
               geminiMessageBuffer = "";
               thoughtBuffer = "";
+              setThought(null);
               break;
             case "citation" /* Citation */:
               flushBufferedStreamEvents();
@@ -130768,8 +131325,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 if (pendingHistoryItemRef.current) {
                   setPendingHistoryItem(null);
                 }
-                geminiMessageBuffer = "";
+                commitPendingThought(userMessageTimestamp);
                 thoughtBuffer = "";
+                setThought(null);
+                geminiMessageBuffer = "";
               } else {
                 flushBufferedStreamEvents();
               }
@@ -130816,6 +131375,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         }
       } finally {
         flushBufferedStreamEvents();
+        commitPendingThought(userMessageTimestamp);
         discardBufferedStreamEvents();
         flushBufferedStreamEventsRef.current.delete(flushBufferedStreamEvents);
       }
@@ -130839,7 +131399,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       startRetryCountdown,
       clearRetryCountdown,
       setThought,
+      commitPendingThought,
       pendingHistoryItemRef,
+      pendingThoughtItemRef,
       setPendingHistoryItem,
       handleUserPromptSubmitBlockedEvent,
       handleStopHookLoopEvent,
@@ -130926,6 +131488,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             );
           }
           setThought(null);
+          setPendingThoughtItem(null);
         }
         if (submitType === "retry" /* Retry */) {
           logUserRetry(config, new UserRetryEvent(prompt_id));
@@ -131047,6 +131610,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       pendingRetryCountdownItemRef,
       pendingRetryErrorItemRef,
       setPendingRetryErrorItem,
+      setPendingThoughtItem,
       dualOutput
     ]
   );
@@ -131289,12 +131853,15 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   );
   const pendingHistoryItems = (0, import_react202.useMemo)(
     () => [
+      // Reasoning renders above the streaming answer.
+      pendingThoughtItem,
       pendingHistoryItem,
       pendingRetryErrorItem,
       pendingRetryCountdownItem,
       pendingToolCallGroupDisplay
     ].filter((i) => i !== void 0 && i !== null),
     [
+      pendingThoughtItem,
       pendingHistoryItem,
       pendingRetryErrorItem,
       pendingRetryCountdownItem,
@@ -131439,7 +132006,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   }, [config]);
   (0, import_react202.useEffect)(() => {
     const registry2 = config.getMonitorRegistry();
-    registry2.setNotificationCallback((displayText, modelText) => {
+    registry2.setNotificationCallback((displayText, modelText, meta) => {
+      if (meta.status === "running" && typeof registry2.get === "function") {
+        const entry = registry2.get(meta.monitorId);
+        if (!entry || entry.status !== "running") return;
+      }
       notificationQueueRef.current.push({
         displayText,
         modelText,
@@ -131453,13 +132024,32 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   }, [config]);
   (0, import_react202.useEffect)(() => {
     if (streamingState === "idle" /* Idle */ && !isSubmittingQueryRef.current && notificationQueueRef.current.length > 0) {
-      const item = notificationQueueRef.current.shift();
-      addItem(
-        { type: "notification", text: item.displayText },
-        Date.now()
-      );
-      submitQuery(item.modelText, item.sendMessageType, void 0, {
-        notificationDisplayText: item.displayText
+      const queue = notificationQueueRef.current;
+      const targetType = queue[0].sendMessageType;
+      if (targetType === "cron" /* Cron */) {
+        const item = queue.shift();
+        addItem(
+          { type: "notification", text: item.displayText },
+          Date.now()
+        );
+        submitQuery(item.modelText, item.sendMessageType, void 0, {
+          notificationDisplayText: item.displayText
+        });
+        return;
+      }
+      let splitIdx = 0;
+      while (splitIdx < queue.length && queue[splitIdx].sendMessageType === targetType) {
+        splitIdx++;
+      }
+      const batch = queue.splice(0, splitIdx);
+      const now = Date.now();
+      for (const item of batch) {
+        addItem({ type: "notification", text: item.displayText }, now);
+      }
+      const combinedModelText = batch.map((e) => e.modelText).join("\n\n");
+      const combinedDisplayText = batch.map((e) => e.displayText).join("; ");
+      submitQuery(combinedModelText, targetType, void 0, {
+        notificationDisplayText: combinedDisplayText
       });
     }
   }, [streamingState, submitQuery, notificationTrigger, addItem]);
@@ -133706,13 +134296,13 @@ import { format as format3 } from "node:util";
 init_esbuild_shims();
 var import_graceful_fs = __toESM(require_graceful_fs(), 1);
 import path49 from "node:path";
-import os25 from "node:os";
+import os24 from "node:os";
 
 // node_modules/xdg-basedir/index.js
 init_esbuild_shims();
-import os23 from "os";
+import os22 from "os";
 import path46 from "path";
-var homeDirectory = os23.homedir();
+var homeDirectory = os22.homedir();
 var { env: env3 } = process;
 var xdgData = env3.XDG_DATA_HOME || (homeDirectory ? path46.join(homeDirectory, ".local", "share") : void 0);
 var xdgConfig = env3.XDG_CONFIG_HOME || (homeDirectory ? path46.join(homeDirectory, ".config") : void 0);
@@ -133947,14 +134537,14 @@ var dist_default6 = FS;
 
 // node_modules/atomically/dist/constants.js
 init_esbuild_shims();
-import os24 from "node:os";
+import os23 from "node:os";
 import process30 from "node:process";
 var DEFAULT_ENCODING = "utf8";
 var DEFAULT_FILE_MODE = 438;
 var DEFAULT_FOLDER_MODE = 511;
 var DEFAULT_WRITE_OPTIONS = {};
-var DEFAULT_USER_UID = os24.userInfo().uid;
-var DEFAULT_USER_GID = os24.userInfo().gid;
+var DEFAULT_USER_UID = os23.userInfo().uid;
+var DEFAULT_USER_GID = os23.userInfo().gid;
 var DEFAULT_TIMEOUT_SYNC = 1e3;
 var IS_POSIX = !!process30.getuid;
 var IS_USER_ROOT2 = process30.getuid ? !process30.getuid() : false;
@@ -134407,7 +134997,7 @@ __name(hasProperty, "hasProperty");
 // node_modules/configstore/index.js
 function getConfigDirectory(id, globalConfigPath) {
   const pathPrefix = globalConfigPath ? path49.join(id, "config.json") : path49.join("configstore", `${id}.json`);
-  const configDirectory = xdgConfig ?? import_graceful_fs.default.mkdtempSync(import_graceful_fs.default.realpathSync(os25.tmpdir()) + path49.sep);
+  const configDirectory = xdgConfig ?? import_graceful_fs.default.mkdtempSync(import_graceful_fs.default.realpathSync(os24.tmpdir()) + path49.sep);
   return path49.join(configDirectory, pathPrefix);
 }
 __name(getConfigDirectory, "getConfigDirectory");
@@ -134686,7 +135276,7 @@ var ansi_styles_default5 = ansiStyles5;
 // node_modules/update-notifier/node_modules/chalk/source/vendor/supports-color/index.js
 init_esbuild_shims();
 import process33 from "node:process";
-import os26 from "node:os";
+import os25 from "node:os";
 import tty3 from "node:tty";
 function hasFlag2(flag, argv = globalThis.Deno ? globalThis.Deno.args : process33.argv) {
   const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
@@ -134754,7 +135344,7 @@ function _supportsColor2(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
     return min;
   }
   if (process33.platform === "win32") {
-    const osRelease = os26.release().split(".");
+    const osRelease = os25.release().split(".");
     if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
       return Number(osRelease[2]) >= 14931 ? 3 : 2;
     }
@@ -135751,7 +136341,7 @@ init_esbuild_shims();
 var import_ini = __toESM(require_ini3(), 1);
 import process35 from "node:process";
 import path50 from "node:path";
-import os27 from "node:os";
+import os26 from "node:os";
 import fs41 from "node:fs";
 var isWindows3 = process35.platform === "win32";
 var readRc = /* @__PURE__ */ __name((filePath) => {
@@ -135786,7 +136376,7 @@ var getNpmPrefix = /* @__PURE__ */ __name(() => {
   if (envPrefix) {
     return envPrefix;
   }
-  const homePrefix = readRc(path50.join(os27.homedir(), ".npmrc"));
+  const homePrefix = readRc(path50.join(os26.homedir(), ".npmrc"));
   if (homePrefix) {
     return homePrefix;
   }
@@ -135817,11 +136407,11 @@ var getYarnPrefix = /* @__PURE__ */ __name(() => {
   if (windowsPrefix) {
     return windowsPrefix;
   }
-  const configPrefix = path50.join(os27.homedir(), ".config/yarn");
+  const configPrefix = path50.join(os26.homedir(), ".config/yarn");
   if (fs41.existsSync(configPrefix)) {
     return configPrefix;
   }
-  const homePrefix = path50.join(os27.homedir(), ".yarn-config");
+  const homePrefix = path50.join(os26.homedir(), ".yarn-config");
   if (fs41.existsSync(homePrefix)) {
     return homePrefix;
   }
@@ -136954,7 +137544,7 @@ import { spawn as spawn6 } from "node:child_process";
 var spawnWrapper = spawn6;
 
 // packages/cli/src/utils/handleAutoUpdate.ts
-import os28 from "node:os";
+import os27 from "node:os";
 var UPDATE_SUCCESS_MESSAGE = "Update successful! Please restart Qwen Code to use the new version. Switching model providers before restarting may not work correctly.";
 var UPDATE_FAILED_MESSAGE = "Automatic update failed. Please try updating manually.";
 function handleAutoUpdate(info, settings, projectRoot, spawnFn = spawnWrapper) {
@@ -136993,7 +137583,7 @@ ${installationInfo.updateMessage}`;
     "@latest",
     isNightly ? "@nightly" : `@${info.update.latest}`
   );
-  const isWindows4 = os28.platform() === "win32";
+  const isWindows4 = os27.platform() === "win32";
   const shell = isWindows4 ? "cmd.exe" : "bash";
   const shellArgs = isWindows4 ? ["/c", updateCommand2] : ["-c", updateCommand2];
   const updateProcess = spawnFn(shell, shellArgs, { stdio: "pipe" });
@@ -138251,6 +138841,10 @@ function dedupeNewestFirst(messages) {
   return result;
 }
 __name(dedupeNewestFirst, "dedupeNewestFirst");
+function mergeStartupWarnings(currentWarnings, nextWarnings) {
+  return [.../* @__PURE__ */ new Set([...currentWarnings, ...nextWarnings])];
+}
+__name(mergeStartupWarnings, "mergeStartupWarnings");
 var SHELL_WIDTH_FRACTION = 0.89;
 var SHELL_HEIGHT_PADDING = 10;
 var AppContainer = /* @__PURE__ */ __name((props) => {
@@ -138383,6 +138977,9 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     computeWindowTitle(basename11(config.getTargetDir()))
   );
   const lastTitleRef = (0, import_react230.useRef)(null);
+  const [startupWarnings, setStartupWarnings] = (0, import_react230.useState)(
+    () => props.startupWarnings || []
+  );
   const staticExtraHeight = 3;
   (0, import_react230.useEffect)(() => {
     void loadLowlight().catch((err) => {
@@ -138395,6 +138992,9 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     (async () => {
       profileCheckpoint("config_initialize_start");
       await config.initialize();
+      setStartupWarnings(
+        (currentWarnings) => mergeStartupWarnings(currentWarnings, config.getWarnings())
+      );
       profileCheckpoint("config_initialize_end");
       setConfigInitialized(true);
       profileCheckpoint("input_enabled");
@@ -140693,7 +141293,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     {
       value: {
         version: props.version,
-        startupWarnings: props.startupWarnings || []
+        startupWarnings
       },
       children: /* @__PURE__ */ (0, import_jsx_runtime177.jsx)(CompactModeProvider, { value: compactModeValue, children: /* @__PURE__ */ (0, import_jsx_runtime177.jsx)(RenderModeProvider, { value: renderModeValue, children: /* @__PURE__ */ (0, import_jsx_runtime177.jsx)(TerminalOutputProvider, { value: writeRaw, children: /* @__PURE__ */ (0, import_jsx_runtime177.jsx)(ShellFocusContext.Provider, { value: isFocused, children: /* @__PURE__ */ (0, import_jsx_runtime177.jsx)(App2, {}) }) }) }) })
     }
@@ -140830,7 +141430,7 @@ __name(relaunchAppInChildProcess, "relaunchAppInChildProcess");
 init_esbuild_shims();
 var import_shell_quote = __toESM(require_shell_quote(), 1);
 import { exec as exec7, execSync as execSync5, spawn as spawn8 } from "node:child_process";
-import os29 from "node:os";
+import os28 from "node:os";
 import path56 from "node:path";
 import fs46 from "node:fs";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
@@ -140838,7 +141438,7 @@ import { promisify as promisify3 } from "node:util";
 import { randomBytes } from "node:crypto";
 var execAsync2 = promisify3(exec7);
 function getContainerPath(hostPath) {
-  if (os29.platform() !== "win32") {
+  if (os28.platform() !== "win32") {
     return hostPath;
   }
   const withForwardSlashes = hostPath.replace(/\\/g, "/");
@@ -140875,7 +141475,7 @@ async function shouldUseCurrentUserInSandbox() {
   if (envVar === "0" || envVar === "false") {
     return false;
   }
-  if (os29.platform() === "linux") {
+  if (os28.platform() === "linux") {
     const debugEnv = [process.env["DEBUG"], process.env["DEBUG_MODE"]].some(
       (v) => v === "true" || v === "1"
     );
@@ -140900,7 +141500,7 @@ function ports() {
 }
 __name(ports, "ports");
 function entrypoint(workdir, cliArgs) {
-  const isWindows4 = os29.platform() === "win32";
+  const isWindows4 = os28.platform() === "win32";
   const containerWorkdir = getContainerPath(workdir);
   const shellCmds = [];
   const pathSeparator = isWindows4 ? ";" : ":";
@@ -140983,9 +141583,9 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
       "-D",
       `TARGET_DIR=${fs46.realpathSync(process.cwd())}`,
       "-D",
-      `TMP_DIR=${fs46.realpathSync(os29.tmpdir())}`,
+      `TMP_DIR=${fs46.realpathSync(os28.tmpdir())}`,
       "-D",
-      `HOME_DIR=${fs46.realpathSync(os29.homedir())}`,
+      `HOME_DIR=${fs46.realpathSync(os28.homedir())}`,
       "-D",
       `CACHE_DIR=${fs46.realpathSync(execSync5(`getconf DARWIN_USER_CACHE_DIR`).toString().trim())}`,
       "-D",
@@ -141181,8 +141781,8 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
   if (!runtimeSameAsUserSettings) {
     args.push("--env", `QWEN_RUNTIME_DIR=${runtimeBaseDirContainerPath}`);
   }
-  args.push("--volume", `${os29.tmpdir()}:${getContainerPath(os29.tmpdir())}`);
-  const gcloudConfigDir = path56.join(os29.homedir(), ".config", "gcloud");
+  args.push("--volume", `${os28.tmpdir()}:${getContainerPath(os28.tmpdir())}`);
+  const gcloudConfigDir = path56.join(os28.homedir(), ".config", "gcloud");
   if (fs46.existsSync(gcloudConfigDir)) {
     args.push(
       "--volume",
@@ -141393,7 +141993,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
   }
   args.push("--env", `SANDBOX=${containerName}`);
   if (config.command === "podman") {
-    const emptyAuthFilePath = path56.join(os29.tmpdir(), "empty_auth.json");
+    const emptyAuthFilePath = path56.join(os28.tmpdir(), "empty_auth.json");
     fs46.writeFileSync(emptyAuthFilePath, "{}", "utf-8");
     args.push("--authfile", emptyAuthFilePath);
   }
@@ -141405,7 +142005,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     const uid = execSync5("id -u").toString().trim();
     const gid = execSync5("id -g").toString().trim();
     const username = "qwen";
-    const homeDir = getContainerPath(os29.homedir());
+    const homeDir = getContainerPath(os28.homedir());
     const setupUserCommands = [
       // Use -f with groupadd to avoid errors if the group already exists.
       `groupadd -f -g ${gid} ${username}`,
@@ -141417,7 +142017,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     const suCommand = `su -p ${username} -c '${escapedOriginalCommand}'`;
     finalEntrypoint[2] = `${setupUserCommands} && ${suCommand}`;
     userFlag = `--user ${uid}:${gid}`;
-    args.push("--env", `HOME=${os29.homedir()}`);
+    args.push("--env", `HOME=${os28.homedir()}`);
   } else if (isIntegrationTest) {
     args.push("--user", "root");
     userFlag = "--user root";
@@ -141428,7 +142028,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
   let sandboxProcess = void 0;
   if (proxyCommand) {
     const proxyContainerCommand = `${config.command} run --rm --init ${userFlag} --name ${SANDBOX_PROXY_NAME} --network ${SANDBOX_PROXY_NAME} -p 8877:8877 -v ${process.cwd()}:${workdir} --workdir ${workdir} ${image2} ${proxyCommand}`;
-    const isWindows4 = os29.platform() === "win32";
+    const isWindows4 = os28.platform() === "win32";
     const proxyShell = isWindows4 ? "cmd.exe" : "bash";
     const proxyShellArgs = isWindows4 ? ["/c", proxyContainerCommand] : ["-c", proxyContainerCommand];
     proxyProcess = spawn8(proxyShell, proxyShellArgs, {
@@ -141594,9 +142194,9 @@ __name(ensureSandboxImageIsPresent, "ensureSandboxImageIsPresent");
 // packages/cli/src/utils/startupWarnings.ts
 init_esbuild_shims();
 import fs47 from "node:fs/promises";
-import os30 from "node:os";
+import os29 from "node:os";
 import { join as pathJoin } from "node:path";
-var warningsFilePath = pathJoin(os30.tmpdir(), "qwen-code-warnings.txt");
+var warningsFilePath = pathJoin(os29.tmpdir(), "qwen-code-warnings.txt");
 async function getStartupWarnings() {
   try {
     await fs47.access(warningsFilePath);
@@ -141620,7 +142220,7 @@ __name(getStartupWarnings, "getStartupWarnings");
 // packages/cli/src/utils/userStartupWarnings.ts
 init_esbuild_shims();
 import fs48 from "node:fs/promises";
-import * as os31 from "node:os";
+import * as os30 from "node:os";
 import path57 from "node:path";
 var homeDirectoryCheck = {
   id: "home-directory",
@@ -141628,7 +142228,7 @@ var homeDirectoryCheck = {
     try {
       const [workspaceRealPath, homeRealPath] = await Promise.all([
         fs48.realpath(options.workspaceRoot),
-        fs48.realpath(os31.homedir())
+        fs48.realpath(os30.homedir())
       ]);
       if (workspaceRealPath === homeRealPath) {
         return "You are running Qwen Code in your home directory. It is recommended to run in a project-specific directory.";
@@ -143148,9 +143748,10 @@ __name(toPermissionOptions, "toPermissionOptions");
 // packages/cli/src/acp-integration/session/SubAgentTracker.ts
 var debugLogger75 = createDebugLogger("ACP_SUBAGENT_TRACKER");
 var SubAgentTracker = class {
-  constructor(ctx, client, parentToolCallId, subagentType) {
+  constructor(ctx, client, parentToolCallId, subagentType, onAskUserQuestionCancel) {
     this.ctx = ctx;
     this.client = client;
+    this.onAskUserQuestionCancel = onAskUserQuestionCancel;
     this.toolCallEmitter = new ToolCallEmitter(ctx);
     this.messageEmitter = new MessageEmitter(ctx);
     this.subagentMeta = { parentToolCallId, subagentType };
@@ -143280,12 +143881,25 @@ var SubAgentTracker = class {
         await event.respond(outcome, {
           answers: "answers" in output ? output.answers : void 0
         });
+        if (outcome === "cancel" /* Cancel */ && event.name === ToolNames.ASK_USER_QUESTION) {
+          this.onAskUserQuestionCancel?.();
+        }
       } catch (error) {
         debugLogger75.error(
           `Permission request failed for subagent tool ${event.name}:`,
           error
         );
-        await event.respond("cancel" /* Cancel */);
+        if (event.name === ToolNames.ASK_USER_QUESTION) {
+          this.onAskUserQuestionCancel?.();
+        }
+        try {
+          await event.respond("cancel" /* Cancel */);
+        } catch (respondError) {
+          debugLogger75.error(
+            `Failed to cancel subagent tool ${event.name} after permission request failure:`,
+            respondError
+          );
+        }
       }
     };
   }
@@ -143651,7 +144265,7 @@ function maskApiKeyForDisplay(apiKey) {
   return `${trimmed.slice(0, 3)}...${trimmed.slice(-4)}`;
 }
 __name(maskApiKeyForDisplay, "maskApiKeyForDisplay");
-var MID_TURN_QUEUE_DRAIN_METHOD = "craft/drainMidTurnQueue";
+var ASK_USER_QUESTION_CANCEL_SKIP_MESSAGE = "Skipped because ask_user_question was cancelled before the user answered; user input is required before continuing.";
 var MID_TURN_QUEUE_DRAIN_TIMEOUT_MS = 2e3;
 var MID_TURN_QUEUE_DRAIN_MAX_TIMEOUT_STRIKES = 3;
 var MidTurnDrainTimeoutError = class extends Error {
@@ -144450,15 +145064,21 @@ ${this.pendingWorktreeNotice}
                   );
                 }
                 if (functionCalls.length > 0) {
-                  const toolResponseParts = await this.runToolCalls(
+                  const toolRun = await this.runToolCalls(
                     pendingSend.signal,
                     promptId,
                     functionCalls
                   );
+                  if (toolRun.stopAfterUserQuestionCancel) {
+                    await this.#preserveCancelledAskUserQuestionToolRun(
+                      toolRun
+                    );
+                    return { stopReason: "end_turn" };
+                  }
                   nextMessage = {
                     role: "user",
                     parts: [
-                      ...toolResponseParts,
+                      ...toolRun.parts,
                       ...await this.#drainMidTurnUserMessages()
                     ]
                   };
@@ -144636,15 +145256,19 @@ ${this.pendingWorktreeNotice}
             );
           }
           if (functionCalls.length > 0) {
-            const toolResponseParts = await this.runToolCalls(
+            const toolRun = await this.runToolCalls(
               pendingSend.signal,
               promptId,
               functionCalls
             );
+            if (toolRun.stopAfterUserQuestionCancel) {
+              await this.#preserveCancelledAskUserQuestionToolRun(toolRun);
+              return { stopReason: "end_turn" };
+            }
             nextMessage = {
               role: "user",
               parts: [
-                ...toolResponseParts,
+                ...toolRun.parts,
                 ...await this.#drainMidTurnUserMessages()
               ]
             };
@@ -144768,6 +145392,16 @@ ${this.pendingWorktreeNotice}
       });
     }
   }
+  async #preserveCancelledAskUserQuestionToolRun(toolRun) {
+    this.#preserveUnsentMessageHistory(
+      {
+        role: "user",
+        parts: [...toolRun.parts, ...await this.#drainMidTurnUserMessages()]
+      },
+      true
+    );
+    await this.messageRewriter?.waitForPendingRewrites();
+  }
   #recordCompressionTokenCount(info) {
     this.#syncPromptTokenCountWithCurrentChat();
     const tokenCount = this.#extractCompressionTokenCount(info);
@@ -145047,15 +145681,21 @@ ${this.pendingWorktreeNotice}
                   );
                 }
                 if (functionCalls.length > 0) {
-                  const toolResponseParts = await this.runToolCalls(
+                  const toolRun = await this.runToolCalls(
                     ac.signal,
                     promptId,
                     functionCalls
                   );
+                  if (toolRun.stopAfterUserQuestionCancel) {
+                    await this.#preserveCancelledAskUserQuestionToolRun(
+                      toolRun
+                    );
+                    return;
+                  }
                   nextMessage = {
                     role: "user",
                     parts: [
-                      ...toolResponseParts,
+                      ...toolRun.parts,
                       ...await this.#drainMidTurnUserMessages()
                     ]
                   };
@@ -145171,7 +145811,10 @@ ${this.pendingWorktreeNotice}
           break;
         }
         const item = this.notificationQueue.shift();
-        await this.#executeBackgroundNotificationPrompt(item);
+        await sessionIdContext.run(
+          this.config.getSessionId(),
+          () => this.#executeBackgroundNotificationPromptInner(item)
+        );
       }
     } finally {
       this.notificationProcessing = false;
@@ -145183,12 +145826,6 @@ ${this.pendingWorktreeNotice}
       }
     }
   }
-  async #executeBackgroundNotificationPrompt(item) {
-    return sessionIdContext.run(
-      this.config.getSessionId(),
-      () => this.#executeBackgroundNotificationPromptInner(item)
-    );
-  }
   async #executeBackgroundNotificationPromptInner(item) {
     return Storage.runWithRuntimeBaseDir(
       this.runtimeBaseDir,
@@ -145279,15 +145916,20 @@ ${this.pendingWorktreeNotice}
               );
             }
             if (functionCalls.length > 0) {
-              const toolResponseParts = await this.runToolCalls(
+              const toolRun = await this.runToolCalls(
                 ac.signal,
                 promptId,
                 functionCalls
               );
+              if (toolRun.stopAfterUserQuestionCancel) {
+                await this.#preserveCancelledAskUserQuestionToolRun(toolRun);
+                await this.#emitBackgroundNotificationEndTurn("end_turn");
+                return;
+              }
               nextMessage = {
                 role: "user",
                 parts: [
-                  ...toolResponseParts,
+                  ...toolRun.parts,
                   ...await this.#drainMidTurnUserMessages()
                 ]
               };
@@ -145524,8 +146166,9 @@ ${this.pendingWorktreeNotice}
    * on. Response-part ordering matches the original `functionCalls` order.
    */
   async runToolCalls(abortSignal, promptId, functionCalls) {
+    const dedupedFunctionCalls = dedupeToolCallsById(functionCalls);
     const batches = [];
-    for (const fc of dedupeToolCallsById(functionCalls)) {
+    for (const fc of dedupedFunctionCalls) {
       const isAgent = fc.name === ToolNames.AGENT;
       const last = batches[batches.length - 1];
       if (isAgent && last?.concurrent) {
@@ -145534,7 +146177,45 @@ ${this.pendingWorktreeNotice}
         batches.push({ concurrent: isAgent, calls: [fc] });
       }
     }
-    const runBounded = /* @__PURE__ */ __name(async (calls) => {
+    let skippedToolCallCounter = 0;
+    const recordSkippedToolCall = /* @__PURE__ */ __name(async (fc) => {
+      const toolName = fc.name ?? "unknown_tool";
+      const callId = fc.id ?? `${toolName}-skip-${++skippedToolCallCounter}`;
+      const part = {
+        functionResponse: {
+          id: callId,
+          name: toolName,
+          response: { error: ASK_USER_QUESTION_CANCEL_SKIP_MESSAGE }
+        }
+      };
+      const error = new Error(ASK_USER_QUESTION_CANCEL_SKIP_MESSAGE);
+      try {
+        this.config.getChatRecordingService()?.recordToolResult([part], {
+          callId,
+          status: "error",
+          resultDisplay: void 0,
+          error,
+          errorType: void 0
+        });
+        await this.toolCallEmitter.emitStart({
+          callId,
+          toolName,
+          args: fc.args ?? {},
+          status: "pending"
+        });
+        await this.toolCallEmitter.emitError(callId, toolName, error);
+      } catch (recordError) {
+        debugLogger78.error("Failed to record skipped tool call:", recordError);
+      }
+      return part;
+    }, "recordSkippedToolCall");
+    const appendSkippedAfter = /* @__PURE__ */ __name(async (parts2, fc) => {
+      const startIndex = dedupedFunctionCalls.indexOf(fc) + 1;
+      for (const remainingCall of dedupedFunctionCalls.slice(startIndex)) {
+        parts2.push(await recordSkippedToolCall(remainingCall));
+      }
+    }, "appendSkippedAfter");
+    const runBounded = /* @__PURE__ */ __name(async (calls, runAbortSignal, onStopAfterUserQuestionCancel, shouldSkipUnstarted) => {
       const parsed = parseInt(
         process.env["QWEN_CODE_MAX_TOOL_CONCURRENCY"] || "",
         10
@@ -145544,7 +146225,19 @@ ${this.pendingWorktreeNotice}
       const executing = /* @__PURE__ */ new Set();
       for (let i = 0; i < calls.length; i++) {
         const idx = i;
-        const p = this.runTool(abortSignal, promptId, calls[idx]).then((r) => {
+        if (runAbortSignal.aborted && shouldSkipUnstarted?.()) {
+          results[idx] = {
+            parts: [await recordSkippedToolCall(calls[idx])],
+            stopAfterUserQuestionCancel: false
+          };
+          continue;
+        }
+        const p = this.runTool(
+          runAbortSignal,
+          promptId,
+          calls[idx],
+          onStopAfterUserQuestionCancel
+        ).then((r) => {
           results[idx] = r;
         }).finally(() => {
           executing.delete(p);
@@ -145560,16 +146253,54 @@ ${this.pendingWorktreeNotice}
     const parts = [];
     for (const batch of batches) {
       if (batch.concurrent && batch.calls.length > 1) {
-        const results = await runBounded(batch.calls);
-        for (const r of results) parts.push(...r);
+        const batchAbortController = new AbortController();
+        let batchStopAfterUserQuestionCancel = false;
+        const propagateAbort = /* @__PURE__ */ __name(() => {
+          batchAbortController.abort(abortSignal.reason);
+        }, "propagateAbort");
+        if (abortSignal.aborted) {
+          propagateAbort();
+        } else {
+          abortSignal.addEventListener("abort", propagateAbort, {
+            once: true
+          });
+        }
+        const stopBatchAfterUserQuestionCancel = /* @__PURE__ */ __name(() => {
+          batchStopAfterUserQuestionCancel = true;
+          batchAbortController.abort(USER_CANCEL_ABORT_REASON);
+        }, "stopBatchAfterUserQuestionCancel");
+        let results;
+        try {
+          results = await runBounded(
+            batch.calls,
+            batchAbortController.signal,
+            stopBatchAfterUserQuestionCancel,
+            () => batchStopAfterUserQuestionCancel
+          );
+        } finally {
+          abortSignal.removeEventListener("abort", propagateAbort);
+        }
+        let shouldStop = false;
+        for (const r of results) {
+          parts.push(...r.parts);
+          shouldStop ||= r.stopAfterUserQuestionCancel;
+        }
+        if (shouldStop) {
+          await appendSkippedAfter(parts, batch.calls[batch.calls.length - 1]);
+          return { parts, stopAfterUserQuestionCancel: true };
+        }
       } else {
         for (const fc of batch.calls) {
           const r = await this.runTool(abortSignal, promptId, fc);
-          parts.push(...r);
+          parts.push(...r.parts);
+          if (r.stopAfterUserQuestionCancel) {
+            await appendSkippedAfter(parts, fc);
+            return { parts, stopAfterUserQuestionCancel: true };
+          }
         }
       }
     }
-    return parts;
+    return { parts, stopAfterUserQuestionCancel: false };
   }
   /**
    * Assemble the per-turn system reminders the model needs to see at the
@@ -145601,11 +146332,15 @@ ${this.pendingWorktreeNotice}
     }
     return reminders;
   }
-  async runTool(abortSignal, promptId, fc) {
+  async runTool(abortSignal, promptId, fc, onStopAfterUserQuestionCancel) {
     const callId = fc.id ?? `${fc.name}-${Date.now()}`;
     let args = fc.args ?? {};
     const startTime = Date.now();
     let spanError;
+    let activeToolAbortSignal = abortSignal;
+    let nestedAskUserQuestionCancelled = false;
+    let agentToolAbortController;
+    let removeAgentToolAbortPropagation;
     const errorResponse = /* @__PURE__ */ __name((error) => {
       const durationMs = Date.now() - startTime;
       logToolCall(this.config, {
@@ -145616,7 +146351,7 @@ ${this.pendingWorktreeNotice}
         function_args: args,
         duration_ms: durationMs,
         // An aborted signal means the call was cancelled, not a genuine error.
-        status: abortSignal.aborted ? "cancelled" : "error",
+        status: activeToolAbortSignal.aborted ? "cancelled" : "error",
         success: false,
         error: error.message,
         tool_type: typeof tool !== "undefined" && tool instanceof DiscoveredMCPTool ? "mcp" : "native"
@@ -145631,8 +146366,9 @@ ${this.pendingWorktreeNotice}
         }
       ];
     }, "errorResponse");
-    const earlyErrorResponse = /* @__PURE__ */ __name(async (error, toolName2 = fc.name ?? "unknown_tool") => {
+    const earlyErrorResponse = /* @__PURE__ */ __name(async (error, toolName2 = fc.name ?? "unknown_tool", opts) => {
       spanError = error.message;
+      removeAgentToolAbortPropagation?.();
       if (toolName2 !== ToolNames.TODO_WRITE) {
         await this.toolCallEmitter.emitError(callId, toolName2, error);
       }
@@ -145644,7 +146380,10 @@ ${this.pendingWorktreeNotice}
         error,
         errorType: void 0
       });
-      return errorParts;
+      return {
+        parts: errorParts,
+        stopAfterUserQuestionCancel: opts?.stopAfterUserQuestionCancel ?? false
+      };
     }, "earlyErrorResponse");
     if (!fc.name) {
       return earlyErrorResponse(new Error("Missing function name"));
@@ -145679,6 +146418,23 @@ ${this.pendingWorktreeNotice}
         const isAgentTool = tool.name === ToolNames.AGENT;
         const isExitPlanModeTool = tool.name === ToolNames.EXIT_PLAN_MODE;
         const isEnterPlanModeTool = tool.name === ToolNames.ENTER_PLAN_MODE;
+        if (isAgentTool) {
+          agentToolAbortController = new AbortController();
+          activeToolAbortSignal = agentToolAbortController.signal;
+          const propagateAbort = /* @__PURE__ */ __name(() => {
+            agentToolAbortController?.abort(abortSignal.reason);
+          }, "propagateAbort");
+          if (abortSignal.aborted) {
+            propagateAbort();
+          } else {
+            abortSignal.addEventListener("abort", propagateAbort, {
+              once: true
+            });
+            removeAgentToolAbortPropagation = /* @__PURE__ */ __name(() => {
+              abortSignal.removeEventListener("abort", propagateAbort);
+            }, "removeAgentToolAbortPropagation");
+          }
+        }
         let subAgentCleanupFunctions = [];
         const toolUseId = generateToolUseId();
         const approvalMode = this.config.getApprovalMode();
@@ -145692,11 +146448,16 @@ ${this.pendingWorktreeNotice}
               this,
               this.client,
               parentToolCallId,
-              subagentType
+              subagentType,
+              () => {
+                nestedAskUserQuestionCancelled = true;
+                agentToolAbortController?.abort(USER_CANCEL_ABORT_REASON);
+                onStopAfterUserQuestionCancel?.();
+              }
             );
             subAgentCleanupFunctions = subSubAgentTracker.setup(
               taskEventEmitter,
-              abortSignal
+              activeToolAbortSignal
             );
           }
           const isAskUserQuestionTool = toolName === ToolNames.ASK_USER_QUESTION;
@@ -145914,9 +146675,15 @@ ${this.pendingWorktreeNotice}
               }
               switch (outcome) {
                 case "cancel" /* Cancel */:
+                  if (toolName === ToolNames.ASK_USER_QUESTION) {
+                    onStopAfterUserQuestionCancel?.();
+                  }
                   return earlyErrorResponse(
                     new Error(`Tool "${toolName}" was canceled by the user.`),
-                    toolName
+                    toolName,
+                    {
+                      stopAfterUserQuestionCancel: toolName === ToolNames.ASK_USER_QUESTION
+                    }
                   );
                 case "proceed_once" /* ProceedOnce */:
                 case "proceed_always" /* ProceedAlways */:
@@ -145953,7 +146720,7 @@ ${this.pendingWorktreeNotice}
               args,
               toolUseId,
               permissionMode,
-              abortSignal
+              activeToolAbortSignal
             );
             if (!preHookResult.shouldProceed) {
               const blockReason = preHookResult.blockReason || "Blocked by PreToolUse hook";
@@ -145976,11 +146743,11 @@ ${this.pendingWorktreeNotice}
               `Qwen Code is executing tool ${toolName}`
             );
             try {
-              toolResult = await invocation.execute(abortSignal);
+              toolResult = await invocation.execute(activeToolAbortSignal);
             } finally {
               sleepInhibitorHandle.release();
             }
-            const aborted2 = abortSignal.aborted;
+            const aborted2 = activeToolAbortSignal.aborted;
             endToolExecutionSpan(execSpan, {
               success: !toolResult.error && !aborted2,
               error: aborted2 ? "tool_cancelled" : toolResult.error ? "tool_error" : void 0,
@@ -145989,12 +146756,13 @@ ${this.pendingWorktreeNotice}
           } catch (execError) {
             endToolExecutionSpan(execSpan, {
               success: false,
-              error: abortSignal.aborted ? "tool_cancelled" : "tool_exception",
-              cancelled: abortSignal.aborted
+              error: activeToolAbortSignal.aborted ? "tool_cancelled" : "tool_exception",
+              cancelled: activeToolAbortSignal.aborted
             });
             throw execError;
           }
           subAgentCleanupFunctions.forEach((cleanup) => cleanup());
+          removeAgentToolAbortPropagation?.();
           if ((isEnterPlanModeTool || isExitPlanModeTool) && !didRequestPermission && !toolResult.error && this.config.getApprovalMode() !== approvalMode) {
             await this.sendUpdate({
               sessionUpdate: "current_mode_update",
@@ -146006,7 +146774,10 @@ ${this.pendingWorktreeNotice}
             callId,
             toolResult.llmContent
           );
-          if (hooksEnabledForTool && messageBusForTool && !toolResult.error) {
+          const aborted = activeToolAbortSignal.aborted;
+          const status = aborted ? "cancelled" : toolResult.error ? "error" : "success";
+          const succeeded = status === "success";
+          if (hooksEnabledForTool && messageBusForTool && !toolResult.error && !aborted && !nestedAskUserQuestionCancelled) {
             const toolResponse = {
               llmContent: toolResult.llmContent,
               returnDisplay: toolResult.returnDisplay
@@ -146018,7 +146789,7 @@ ${this.pendingWorktreeNotice}
               toolResponse,
               toolUseId,
               permissionMode,
-              abortSignal
+              activeToolAbortSignal
             );
             if (postHookResult.shouldStop) {
               const stopMessage = postHookResult.stopReason || "Execution stopped by PostToolUse hook";
@@ -146031,17 +146802,17 @@ ${this.pendingWorktreeNotice}
               const contextPart = { text: postHookResult.additionalContext };
               responseParts.push(contextPart);
             }
-          } else if (hooksEnabledForTool && messageBusForTool && toolResult.error) {
+          } else if (hooksEnabledForTool && messageBusForTool && (toolResult.error || aborted)) {
+            const isInterrupt = aborted;
             const failureHookResult = await firePostToolUseFailureHook(
               messageBusForTool,
               toolUseId,
               toolName,
               args,
-              toolResult.error.message,
-              false,
-              // not an interrupt
+              toolResult.error?.message ?? "Tool execution was cancelled",
+              isInterrupt,
               permissionMode,
-              abortSignal
+              activeToolAbortSignal
             );
             if (failureHookResult.additionalContext) {
               debugLogger78.debug(
@@ -146049,9 +146820,6 @@ ${this.pendingWorktreeNotice}
               );
             }
           }
-          const aborted = abortSignal.aborted;
-          const status = aborted ? "cancelled" : toolResult.error ? "error" : "success";
-          const succeeded = status === "success";
           if (isTodoWriteTool) {
             const todos = this.planEmitter.extractTodos(
               toolResult.returnDisplay,
@@ -146099,14 +146867,18 @@ ${this.pendingWorktreeNotice}
           } else if (aborted) {
             spanError = "Tool execution was cancelled";
           }
-          return responseParts;
+          return {
+            parts: responseParts,
+            stopAfterUserQuestionCancel: nestedAskUserQuestionCancelled
+          };
         } catch (e) {
           subAgentCleanupFunctions.forEach((cleanup) => cleanup());
+          removeAgentToolAbortPropagation?.();
           const error = e instanceof Error ? e : new Error(String(e));
           spanError = error.message;
           const hooksEnabledForError = !this.config.getDisableAllHooks?.();
           const messageBusForError = this.config.getMessageBus?.();
-          const isInterrupt = abortSignal.aborted;
+          const isInterrupt = activeToolAbortSignal.aborted;
           if (hooksEnabledForError && messageBusForError) {
             const failureHookResult = await firePostToolUseFailureHook(
               messageBusForError,
@@ -146116,7 +146888,7 @@ ${this.pendingWorktreeNotice}
               error.message,
               isInterrupt,
               String(approvalMode),
-              abortSignal
+              activeToolAbortSignal
             );
             if (failureHookResult.additionalContext) {
               debugLogger78.debug(
@@ -146138,12 +146910,15 @@ ${this.pendingWorktreeNotice}
             callId,
             // A throw caused by abort (e.g. AbortError) is a cancellation, not
             // a genuine tool error — keep it consistent with the success path.
-            status: abortSignal.aborted ? "cancelled" : "error",
+            status: activeToolAbortSignal.aborted ? "cancelled" : "error",
             resultDisplay: void 0,
             error,
             errorType: void 0
           });
-          return errorResponse(error);
+          return {
+            parts: errorResponse(error),
+            stopAfterUserQuestionCancel: nestedAskUserQuestionCancelled
+          };
         }
       });
     } finally {
@@ -148190,7 +148965,7 @@ var QwenAgent = class {
   async initialize(args) {
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.18.1";
+    const version = "0.18.3-preview.0";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -151547,7 +152322,10 @@ ${outputText}
       settings,
       argvForSession,
       cwd5,
-      [],
+      // ACP sessions do not provide an extension override. Passing [] is a
+      // truthy override and prevents default/argv extension commands from
+      // loading, so leave it unset to preserve normal CLI behavior.
+      void 0,
       // Pass separated hooks for proper source attribution
       {
         userHooks: this.settings.getUserHooks(),
@@ -151773,7 +152551,7 @@ function validateDnsResolutionOrder(order) {
 }
 __name(validateDnsResolutionOrder, "validateDnsResolutionOrder");
 function getNodeMemoryArgs(isDebugMode3) {
-  const totalMemoryMB = os32.totalmem() / (1024 * 1024);
+  const totalMemoryMB = os31.totalmem() / (1024 * 1024);
   const heapStats = v83.getHeapStatistics();
   const currentMaxOldSpaceSizeMb = Math.floor(
     heapStats.heap_size_limit / 1024 / 1024
@@ -152275,7 +153053,7 @@ ${finalArgs[promptIndex + 1]}`;
       process.exit(0);
     }
     if (config.isInteractive()) {
-      void import("./chunks/scheduler-O66SLJGU.js").then((m) => m.startBackgroundHousekeeping(config, settings)).catch((err) => {
+      void import("./chunks/scheduler-WCMRRLYM.js").then((m) => m.startBackgroundHousekeeping(config, settings)).catch((err) => {
         debugLogger80.warn("failed to start background housekeeping:", err);
       });
     }
@@ -152295,6 +153073,7 @@ ${finalArgs[promptIndex + 1]}`;
         ] : []
       ])
     ];
+    const emittedStartupWarnings = new Set(startupWarnings);
     for (const warning of startupWarnings) {
       writeStderrLine(warning);
     }
@@ -152339,6 +153118,11 @@ ${finalArgs[promptIndex + 1]}`;
     if (inputFormat !== "stream-json" /* STREAM_JSON */) {
       profileCheckpoint("config_initialize_start");
       await config.initialize();
+      for (const warning of config.getWarnings()) {
+        if (emittedStartupWarnings.has(warning)) continue;
+        emittedStartupWarnings.add(warning);
+        writeStderrLine(warning);
+      }
       profileCheckpoint("config_initialize_end");
       await config.waitForMcpReady();
       const failedMcpServers = typeof config.getFailedMcpServerNames === "function" ? config.getFailedMcpServerNames() : [];