@qwen-code/qwen-code 0.21.1-simplify-system-prompt.0 → 0.21.2

package/chunks/{chunk-3IXOIAKE.js → chunk-V4XNUDPE.js}

@@ -7,27 +7,29 @@ import {
   DEFAULT_RING_SIZE
 } from "./chunk-GLWP3FDB.js";
 import {
-  DEFAULT_COMPACTED_REPLAY_MAX_BYTES
-} from "./chunk-COH43MRJ.js";
+  DEFAULT_COMPACTED_REPLAY_MAX_BYTES,
+  DEFAULT_MAX_JOURNAL_BYTES,
+  DEFAULT_MAX_JOURNAL_EVENTS
+} from "./chunk-XCGIMOLN.js";
 import {
   normalizeServeChannelSelection
 } from "./chunk-ALMR3E6Q.js";
 import {
   loadSettings
-} from "./chunk-JALU3ZDU.js";
+} from "./chunk-W3UKBMSI.js";
 import {
   writeStderrLine
 } from "./chunk-OWAK7LMW.js";
 import {
   MCP_BUDGET_WARN_FRACTION
-} from "./chunk-DM4Q4JJH.js";
+} from "./chunk-54YCNSK5.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
 import {
   openBrowserSecurely,
   shouldLaunchBrowser
-} from "./chunk-JESCGQM3.js";
+} from "./chunk-NAVJD2PQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -151,6 +153,14 @@ var serveCommand = {
     type: "number",
     default: DEFAULT_COMPACTED_REPLAY_MAX_BYTES,
     description: "Per-session in-memory compacted replay snapshot byte cap for `POST /session/:id/load` late attaches. Larger = more recent history in load snapshots at higher heap cost. Must be a positive safe integer no larger than 256 MiB."
+  }).option("max-journal-events", {
+    type: "number",
+    default: DEFAULT_MAX_JOURNAL_EVENTS,
+    description: "Per-session cap on raw events retained in the in-flight live journal (current unfinished turn). When exceeded, the oldest entries are dropped. Must be a positive safe integer."
+  }).option("max-journal-bytes", {
+    type: "number",
+    default: DEFAULT_MAX_JOURNAL_BYTES,
+    description: "Per-session byte cap on the in-flight live journal. When exceeded, the oldest entries are dropped (at least one is always kept). Must be a positive safe integer."
   }).option("http-bridge", {
     type: "boolean",
     default: true,
@@ -302,7 +312,7 @@ var serveCommand = {
         process.exit(1);
       }
     }
-    const { runQwenServe } = await import("./run-qwen-serve-3VCV4I7E.js");
+    const { runQwenServe } = await import("./run-qwen-serve-RN2R6QQW.js");
     try {
       const handle = await runQwenServe({
         port: argv.port,
@@ -315,6 +325,8 @@ var serveCommand = {
         maxConnections: argv["max-connections"],
         eventRingSize: argv["event-ring-size"],
         compactedReplayMaxBytes: argv["compacted-replay-max-bytes"],
+        maxJournalEvents: argv["max-journal-events"],
+        maxJournalBytes: argv["max-journal-bytes"],
         workspace: argv.workspace,
         requireAuth: argv["require-auth"],
         enableSessionShell: argv["enable-session-shell"],

package/chunks/{chunk-WDSWXQU3.js → chunk-VEMNQMHA.js}

@@ -2,11 +2,11 @@
 "use strict";
 import {
   STATUS_SCHEMA_VERSION
-} from "./chunk-KU5XMLDK.js";
+} from "./chunk-GURGAJTX.js";
 import {
   detectRuntime,
   redactProxyCredentials
-} from "./chunk-2JZBVYTU.js";
+} from "./chunk-Q3T5KA2V.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-LNURQEMZ.js → chunk-VMX5RZQH.js}

@@ -14,28 +14,29 @@ import {
   MODIFIER_ALT_BIT,
   MODIFIER_CTRL_BIT,
   MODIFIER_SHIFT_BIT,
+  MODIFIER_SUPER_BIT,
   clipboardHasImage
-} from "./chunk-J56UI34H.js";
+} from "./chunk-NBD76HUW.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
 import {
   use_stdin_default,
   use_stdout_default
-} from "./chunk-6GMVPFB2.js";
-import {
-  require_react
-} from "./chunk-5QWWOFGG.js";
+} from "./chunk-2IIJTXYF.js";
 import {
   noteInteraction
 } from "./chunk-KW7NOTN6.js";
+import {
+  require_react
+} from "./chunk-5QWWOFGG.js";
 import {
   KittySequenceOverflowEvent,
   logKittySequenceOverflow
-} from "./chunk-RWS5VYWC.js";
+} from "./chunk-DUNI4EBW.js";
 import {
   createDebugLogger
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-E2BHWIDT.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -420,7 +421,7 @@ function KeypressProvider({
           mods -= KITTY_MODIFIER_EVENT_TYPES_OFFSET;
         }
         const bits = mods - KITTY_MODIFIER_BASE;
-        const alt = (bits & MODIFIER_ALT_BIT) === MODIFIER_ALT_BIT;
+        const alt = (bits & MODIFIER_ALT_BIT) === MODIFIER_ALT_BIT || (bits & MODIFIER_SUPER_BIT) === MODIFIER_SUPER_BIT;
         const ctrl = (bits & MODIFIER_CTRL_BIT) === MODIFIER_CTRL_BIT;
         return {
           key: {
@@ -445,7 +446,7 @@ function KeypressProvider({
         }
         const bits = mods - KITTY_MODIFIER_BASE;
         const shift = (bits & MODIFIER_SHIFT_BIT) === MODIFIER_SHIFT_BIT;
-        const alt = (bits & MODIFIER_ALT_BIT) === MODIFIER_ALT_BIT;
+        const alt = (bits & MODIFIER_ALT_BIT) === MODIFIER_ALT_BIT || (bits & MODIFIER_SUPER_BIT) === MODIFIER_SUPER_BIT;
         const ctrl = (bits & MODIFIER_CTRL_BIT) === MODIFIER_CTRL_BIT;
         const sym = m[2];
         const symbolToName = {
@@ -487,7 +488,7 @@ function KeypressProvider({
         }
         const modifierBits = modifiers - KITTY_MODIFIER_BASE;
         const shift = (modifierBits & MODIFIER_SHIFT_BIT) === MODIFIER_SHIFT_BIT;
-        const alt = (modifierBits & MODIFIER_ALT_BIT) === MODIFIER_ALT_BIT;
+        const alt = (modifierBits & MODIFIER_ALT_BIT) === MODIFIER_ALT_BIT || (modifierBits & MODIFIER_SUPER_BIT) === MODIFIER_SUPER_BIT;
         const ctrl = (modifierBits & MODIFIER_CTRL_BIT) === MODIFIER_CTRL_BIT;
         const terminator = m[4];
         if (keyCode === CHAR_CODE_ESC && terminator === "~" && m[3]) {
@@ -1003,6 +1004,7 @@ function KeypressProvider({
       sequence
     }), "createPasteKeyEvent");
     const shouldFlushRawDataAsPaste = /* @__PURE__ */ __name((data) => {
+      if (data.includes(27)) return false;
       const hasReturn = data.includes(13);
       const hasEmbeddedTab = data.length > 1 && data.includes(9);
       const isSingleReturn = data.length <= 2 && hasReturn;

package/chunks/{chunk-JALU3ZDU.js → chunk-W3UKBMSI.js}

@@ -21,12 +21,12 @@ import {
   getLanguageNameFromLocale,
   getLanguageSettingsOptions,
   t
-} from "./chunk-VV6XU5L7.js";
+} from "./chunk-3F2WDAV6.js";
 import {
   getHomeEnvFallbackVars,
   loadEnvironment,
   preResolveHomeEnvOverrides
-} from "./chunk-PANH4R3B.js";
+} from "./chunk-EU5TBFJI.js";
 import {
   ENV_CORRUPTED_PATH,
   ENV_WAS_RECOVERED
@@ -34,7 +34,7 @@ import {
 import {
   isWorkspaceTrusted,
   updateSettingsFilePreservingFormat
-} from "./chunk-VCBZUOSI.js";
+} from "./chunk-P755N4CS.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -46,23 +46,23 @@ import {
   DEFAULT_TOOL_RESULTS_TOTAL_CHARS_THRESHOLD,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD
-} from "./chunk-DM4Q4JJH.js";
+} from "./chunk-54YCNSK5.js";
 import {
   stripRuntimeSnapshotPrefix
-} from "./chunk-PSWQZHEA.js";
+} from "./chunk-ZMOJ7ISP.js";
 import {
   DEFAULT_QWEN_CUSTOM_IGNORE_FILE_NAMES
-} from "./chunk-M5JM7OSF.js";
+} from "./chunk-N4ACHWNH.js";
 import {
   DEFAULT_SENSITIVE_SPAN_ATTRIBUTE_MAX_LENGTH,
   SENSITIVE_SPAN_ATTRIBUTE_MAX_LENGTH_LIMIT
-} from "./chunk-INADJJGW.js";
+} from "./chunk-G7XXKQYS.js";
 import {
   FatalConfigError,
   Storage,
   createDebugLogger,
   getErrorMessage
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-E2BHWIDT.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -891,9 +891,9 @@ var SETTINGS_SCHEMA = {
         type: "boolean",
         label: "Virtualized History (reduces flicker on long sessions)",
         category: "UI",
-        requiresRestart: false,
-        default: false,
-        description: "Render conversation history in an in-app scrollable viewport instead of the terminal scrollback buffer. Recommended if you see flicker, scroll-storm, or interface freeze on long sessions, after Ctrl+O, after Ctrl+E / Ctrl+F (expand), after window resize, or when alt-tabbing back. Scroll with Shift+\u2191/\u2193 (line), PgUp/PgDn (page), Ctrl+Home/End (top/bottom), or the mouse wheel. Also enables mouse interactions: click an option in a menu/dialog to select it, hover to highlight it, and click in the prompt to position the cursor. Does NOT use the host terminal scrollback while enabled. Drag to select text in the viewport (double/triple click selects a word/line), copied on release. To use the terminal\u2019s own selection instead, hold Shift (or Option on macOS) while dragging.",
+        requiresRestart: true,
+        default: true,
+        description: "Render conversation history in an in-app scrollable viewport instead of the terminal scrollback buffer. Enabled by default in compatible interactive terminals to avoid flicker, scroll-storm, and interface freeze on long sessions, after Ctrl+O, after Ctrl+E / Ctrl+F (expand), after window resize, or when alt-tabbing back. Screen reader mode and non-interactive output such as piped stdout or CI use append-only terminal output instead. Scroll with Shift+\u2191/\u2193 (line), PgUp/PgDn (page), Ctrl+Home/End (top/bottom), or the mouse wheel. Also enables mouse interactions: click an option in a menu/dialog to select it, hover to highlight it, and click in the prompt to position the cursor. Does NOT use the host terminal scrollback while enabled. Drag to select text in the viewport (double/triple click selects a word/line), copied on release. To use the terminal\u2019s own selection instead, hold Shift (or Option on macOS) while dragging.",
         showInDialog: true
       },
       showScrollbar: {
@@ -1064,6 +1064,10 @@ var SETTINGS_SCHEMA = {
     jsonSchemaOverride: {
       type: "object",
       properties: {
+        userId: {
+          description: "Stable end-user identifier written to GenAI spans as gen_ai.user.id for ARMS session analysis. This value is linkable personal data: prefer a pseudonymous ID, and configure it only when one process represents one user.",
+          type: "string"
+        },
         includeSensitiveSpanAttributes: {
           description: "When enabled, user prompts, system prompts, tool inputs/outputs, and model responses are written to native OTel span attributes in addition to the log-to-span bridge. Warning: this may expose sensitive data (file contents, shell commands, conversation history) to your OTLP backend.",
           type: "boolean",
@@ -1365,6 +1369,28 @@ var SETTINGS_SCHEMA = {
             parentKey: "generationConfig",
             showInDialog: false
           },
+          retryInitialDelayMs: {
+            type: "number",
+            label: "Retry Initial Delay",
+            category: "Generation Configuration",
+            requiresRestart: false,
+            default: void 0,
+            description: "Initial delay in milliseconds for stream rate-limit retries.",
+            minimum: 1,
+            parentKey: "generationConfig",
+            showInDialog: false
+          },
+          retryMaxDelayMs: {
+            type: "number",
+            label: "Retry Max Delay",
+            category: "Generation Configuration",
+            requiresRestart: false,
+            default: void 0,
+            description: "Maximum delay in milliseconds for stream rate-limit retries.",
+            minimum: 1,
+            parentKey: "generationConfig",
+            showInDialog: false
+          },
           enableCacheControl: {
             type: "boolean",
             label: "Enable Cache Control",
@@ -1733,6 +1759,26 @@ var SETTINGS_SCHEMA = {
         showInDialog: false,
         mergeStrategy: "union" /* UNION */
       },
+      defaultDisabled: {
+        type: "array",
+        label: "Default Disabled Skills",
+        category: "Advanced",
+        requiresRestart: false,
+        default: void 0,
+        description: "Skill names disabled by default unless explicitly enabled through skills.enabled. Matched case-insensitively and UNION-merged across settings scopes. skills.disabled always wins.",
+        showInDialog: false,
+        mergeStrategy: "union" /* UNION */
+      },
+      enabled: {
+        type: "array",
+        label: "Enabled Skills",
+        category: "Advanced",
+        requiresRestart: false,
+        default: void 0,
+        description: "Explicit opt-ins that override matching skills.defaultDisabled entries. Matched case-insensitively and UNION-merged across settings scopes. Cannot override skills.disabled.",
+        showInDialog: false,
+        mergeStrategy: "union" /* UNION */
+      },
       directories: {
         type: "array",
         label: "Skill Directories",
@@ -2012,6 +2058,25 @@ var SETTINGS_SCHEMA = {
             default: true,
             description: "When enabled, MCP tools are loaded on-demand via ToolSearch to reduce prompt size. Disable this for models that rely on prefix-based KV caching (e.g. DeepSeek) to keep the prompt prefix stable and maximize cache hit rates.",
             showInDialog: true
+          },
+          threshold: {
+            type: "number",
+            label: "Deferred Tool Preload Threshold (%)",
+            category: "Tools",
+            requiresRestart: true,
+            default: 10,
+            description: "Context-window percentage used as the session-start budget for preloading deferred tools (bundled built-ins and MCP alike). When every deferred tool schema fits within the budget, all are declared upfront instead of loaded on demand, keeping the prompt prefix stable for KV caching. Set 0 to always load deferred tools on demand.",
+            showInDialog: true,
+            // A percentage of the context window: values above 100 would set a
+            // budget larger than the window and unconditionally preload every
+            // deferred tool, defeating the point of the threshold. Bound it the
+            // way autoCompactThreshold bounds its fraction.
+            jsonSchemaOverride: {
+              type: "number",
+              minimum: 0,
+              maximum: 100,
+              default: 10
+            }
           }
         }
       },
@@ -2454,6 +2519,15 @@ var SETTINGS_SCHEMA = {
           type: "string",
           description: "URL pattern (supports * wildcard)"
         }
+      },
+      allowPrivateNetworkHooks: {
+        type: "boolean",
+        label: "Allow Private Network Hooks",
+        category: "Security",
+        requiresRestart: false,
+        default: false,
+        description: "When true, HTTP hooks may target private/link-local IP ranges (the SSRF IP-range checks are skipped). Cloud metadata hostnames (e.g. 169.254.169.254, metadata.google.internal) remain blocked. Only honored from User, System, and SystemDefaults settings scopes; values set in Workspace settings are ignored so a cloned repository cannot self-grant this bypass. Enable only in trusted, managed environments, and pair with security.allowedHttpHookUrls.",
+        showInDialog: false
       }
     }
   },
@@ -2547,6 +2621,30 @@ var SETTINGS_SCHEMA = {
           }
         }
       },
+      modelGrades: {
+        type: "object",
+        label: "Model Grades",
+        category: "Model",
+        requiresRestart: true,
+        default: void 0,
+        description: "Maps semantic model grade names exposed to the Agent tool to concrete model selectors.",
+        showInDialog: false,
+        mergeStrategy: "shallow_merge" /* SHALLOW_MERGE */,
+        jsonSchemaOverride: {
+          type: "object",
+          additionalProperties: { type: "string" }
+        }
+      },
+      allowedGrades: {
+        type: "array",
+        label: "Allowed Model Grades",
+        category: "Model",
+        requiresRestart: true,
+        default: void 0,
+        description: "Optional whitelist of model grade names the Agent tool may use.",
+        showInDialog: false,
+        items: { type: "string" }
+      },
       maxParallelAgents: {
         type: "number",
         label: "Max Parallel Agents",
@@ -2727,6 +2825,17 @@ var SETTINGS_SCHEMA = {
         mergeStrategy: "concat" /* CONCAT */,
         items: HOOK_DEFINITION_ITEMS
       },
+      StopFailure: {
+        type: "array",
+        label: "After Agent Failure Hooks",
+        category: "Advanced",
+        requiresRestart: false,
+        default: [],
+        description: "Hooks that execute when a turn ends due to an API error or loop detection, instead of the normal Stop hooks. Receives error type and details.",
+        showInDialog: false,
+        mergeStrategy: "concat" /* CONCAT */,
+        items: HOOK_DEFINITION_ITEMS
+      },
       MessageDisplay: {
         type: "array",
         label: "Message Display Hooks",
@@ -2888,6 +2997,15 @@ var SETTINGS_SCHEMA = {
         description: "Allow daemon and ACP sessions to continue an unfinished top-level Todo list for at most two consecutive primary-model calls without new user input. Mid-turn user input starts a fresh two-attempt stage. Disabled in safe, bare, and Approval plan modes.",
         showInDialog: false
       },
+      sessionWriterLease: {
+        type: "boolean",
+        label: "Enable ACP Session Writer Lease",
+        category: "Experimental",
+        requiresRestart: true,
+        default: false,
+        description: "Enable cross-process write fencing for persisted ACP and daemon sessions. The effective value is frozen when the ACP or daemon process starts. Every concurrent ACP or daemon writer must enable the setting; interactive and headless writers remain outside the protocol.",
+        showInDialog: true
+      },
       cronRecurringMaxAgeDays: {
         type: "number",
         label: "Recurring Cron Max Age (Days)",
@@ -4378,6 +4496,12 @@ function getSettingsWarnings(loadedSettings) {
   for (const warning of getModelProvidersOverrideWarnings(loadedSettings)) {
     warningSet.add(warning);
   }
+  const workspaceFile = loadedSettings.forScope("Workspace" /* Workspace */);
+  if (workspaceFile.rawJson !== void 0 && workspaceFile.originalSettings.security?.allowPrivateNetworkHooks !== void 0) {
+    warningSet.add(
+      `Warning: security.allowPrivateNetworkHooks in workspace settings (${workspaceFile.path}) is ignored. This setting is only honored from User, System, or SystemDefaults scope settings.`
+    );
+  }
   return [...warningSet];
 }
 __name(getSettingsWarnings, "getSettingsWarnings");
@@ -4393,8 +4517,19 @@ function tagMcpServerScope(settings, scope) {
   return { ...settings, mcpServers: tagged };
 }
 __name(tagMcpServerScope, "tagMcpServerScope");
+function stripWorkspacePrivateNetworkHooks(settings) {
+  if (settings.security?.allowPrivateNetworkHooks === void 0) {
+    return settings;
+  }
+  const { allowPrivateNetworkHooks: _stripped, ...restSecurity } = settings.security;
+  return { ...settings, security: restSecurity };
+}
+__name(stripWorkspacePrivateNetworkHooks, "stripWorkspacePrivateNetworkHooks");
 function mergeSettings(system, systemDefaults, user, workspace, isTrusted) {
-  const safeWorkspace = isTrusted ? tagMcpServerScope(workspace, "workspace") : {};
+  const safeWorkspace = isTrusted ? tagMcpServerScope(
+    stripWorkspacePrivateNetworkHooks(workspace),
+    "workspace"
+  ) : {};
   return customDeepMerge(
     getMergeStrategyForPath,
     {},
@@ -4461,10 +4596,11 @@ var LoadedSettings = class {
         throw new Error(`Invalid scope: ${scope}`);
     }
   }
-  setValue(scope, key, value) {
+  setValue(scope, key, value, assertCanCommit) {
     if (key === "model.name" && typeof value === "string") {
       value = stripRuntimeSnapshotPrefix(value);
     }
+    assertCanCommit?.();
     const settingsFile = this.forScope(scope);
     setNestedPropertySafe(settingsFile.settings, key, value);
     setNestedPropertySafe(settingsFile.originalSettings, key, value);
@@ -4472,7 +4608,7 @@ var LoadedSettings = class {
     const replacePath = key === "mcpServers" ? key.split(".") : [];
     saveSettings(settingsFile, createSettingsUpdate(key, value), replacePath);
   }
-  setValues(writes, onScopeCommitted) {
+  setValues(writes, onScopeCommitted, assertCanCommit) {
     const scopes = /* @__PURE__ */ new Set();
     for (const write of writes) {
       const value = write.key === "model.name" && typeof write.value === "string" ? stripRuntimeSnapshotPrefix(write.value) : write.value;
@@ -4486,6 +4622,7 @@ var LoadedSettings = class {
     for (let i = 0; i < scopeList.length; i++) {
       const scope = scopeList[i];
       try {
+        assertCanCommit?.();
         saveSettings(this.forScope(scope), void 0, void 0, {
           throwOnWriteFailure: true
         });
@@ -4739,7 +4876,7 @@ function loadSettings(workspaceDir = process.cwd(), consumeCorruptionEnvVars = t
     settings: {},
     rawJson: void 0
   };
-  const workspaceSettingsActive = realWorkspaceDir !== realHomeDir;
+  const workspaceSettingsActive = !opts.skipWorkspaceSettings && realWorkspaceDir !== realHomeDir;
   if (workspaceSettingsActive) {
     workspaceResult = loadAndMigrate(
       workspaceSettingsPath,
@@ -4784,7 +4921,7 @@ function loadSettings(workspaceDir = process.cwd(), consumeCorruptionEnvVars = t
     systemSettings,
     userSettings
   );
-  const isTrusted = isWorkspaceTrusted(
+  const isTrusted = opts.workspaceTrusted ?? isWorkspaceTrusted(
     initialTrustCheckSettings,
     void 0,
     realWorkspaceDir
@@ -4915,6 +5052,7 @@ export {
   backupSettingsFile,
   restoreSettingsFromBackup,
   cleanupSettingsBackup,
+  v1ToV2Migration,
   getUserSettingsPath,
   getUserSettingsDir,
   SETTINGS_VERSION,

package/chunks/{chunk-DN6ZX5AY.js → chunk-WWCMSZII.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   theme
-} from "./chunk-VAK25FTU.js";
+} from "./chunk-45IOTAUS.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -10,14 +10,14 @@ import {
   Box_default,
   Text,
   use_is_screen_reader_enabled_default
-} from "./chunk-6GMVPFB2.js";
+} from "./chunk-2IIJTXYF.js";
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
 import {
   formatHistoryGapNotice,
   indexGapsByChild
-} from "./chunk-BRRAJXPA.js";
+} from "./chunk-PCK4B6LR.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -29,16 +29,17 @@ import {
 } from "./chunk-E5Z2AVNV.js";
 import {
   t
-} from "./chunk-VV6XU5L7.js";
+} from "./chunk-3F2WDAV6.js";
 import {
-  getToolResponseDisplayText
-} from "./chunk-DM4Q4JJH.js";
+  getToolResponseDisplayText,
+  stripTrailingUserPromptSubmitContextPart
+} from "./chunk-54YCNSK5.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";
 import {
   ToolDisplayNames
-} from "./chunk-PR75REBZ.js";
+} from "./chunk-MM7TH7ZM.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -2741,6 +2742,16 @@ function safeDescription(raw) {
   return cleaned || void 0;
 }
 __name(safeDescription, "safeDescription");
+function categoryShowsDescriptionsInline(toolCalls, category) {
+  const sameCategory = toolCalls.filter(
+    (tc) => getToolCategory(tc.name) === category
+  );
+  if (sameCategory.length > DESCRIPTION_INLINE_LIMIT) return false;
+  return sameCategory.every(
+    (tc) => safeDescription(tc.description) !== void 0
+  );
+}
+__name(categoryShowsDescriptionsInline, "categoryShowsDescriptionsInline");
 function getActiveToolHint(toolCalls) {
   if (toolCalls.length < 2) return void 0;
   const statuses = [
@@ -2753,16 +2764,21 @@ function getActiveToolHint(toolCalls) {
       const tool = toolCalls[index];
       if (tool.status === status) {
         const category = getToolCategory(tool.name);
-        const usesCountSummary = toolCalls.some(
+        const hasCategoryPeers = toolCalls.some(
           (candidate, candidateIndex) => candidateIndex !== index && getToolCategory(candidate.name) === category
         );
-        return usesCountSummary ? safeDescription(tool.description) : void 0;
+        if (!hasCategoryPeers) return void 0;
+        if (categoryShowsDescriptionsInline(toolCalls, category))
+          return void 0;
+        return safeDescription(tool.description);
       }
     }
   }
   return void 0;
 }
 __name(getActiveToolHint, "getActiveToolHint");
+var DESCRIPTION_INLINE_LIMIT = 3;
+var DESCRIPTION_PREVIEW_COUNT = 2;
 function buildToolSummary(toolCalls, isActive) {
   if (toolCalls.length === 0) return "";
   const toolsByCategory = /* @__PURE__ */ new Map();
@@ -2777,20 +2793,37 @@ function buildToolSummary(toolCalls, isActive) {
     const tools = toolsByCategory.get(cat);
     if (!tools || tools.length === 0) continue;
     const template = CATEGORY_TEMPLATES[cat];
+    const verb = isActive ? template.activeVerb : template.pastVerb;
     let part;
     if (tools.length === 1) {
       const safeDesc = safeDescription(tools[0].description);
       if (safeDesc !== void 0) {
-        const verb = isActive ? template.activeVerb : template.pastVerb;
         part = `${verb} ${safeDesc}`;
       } else {
         part = t(isActive ? template.active.one : template.past.one, {
           count: "1"
         });
       }
+    } else if (tools.length <= DESCRIPTION_INLINE_LIMIT) {
+      const descriptions = tools.map((tc) => safeDescription(tc.description)).filter((d) => d !== void 0);
+      if (descriptions.length === tools.length) {
+        part = `${verb} ${descriptions.join(", ")}`;
+      } else {
+        const forms = isActive ? template.active : template.past;
+        part = t(forms.many, { count: String(tools.length) });
+      }
     } else {
-      const forms = isActive ? template.active : template.past;
-      part = t(forms.many, { count: String(tools.length) });
+      const previewDescs = tools.slice(0, DESCRIPTION_PREVIEW_COUNT).map((tc) => safeDescription(tc.description)).filter((d) => d !== void 0);
+      if (previewDescs.length === DESCRIPTION_PREVIEW_COUNT) {
+        const remaining = tools.length - DESCRIPTION_PREVIEW_COUNT;
+        const morePhrase = t("... and {{count}} more", {
+          count: String(remaining)
+        });
+        part = `${verb} ${previewDescs.join(", ")}, ${morePhrase}`;
+      } else {
+        const forms = isActive ? template.active : template.past;
+        part = t(forms.many, { count: String(tools.length) });
+      }
     }
     if (parts.length > 0) {
       part = part.charAt(0).toLowerCase() + part.slice(1);
@@ -2848,6 +2881,17 @@ var CompactToolGroupDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth
 }, "CompactToolGroupDisplay");
 
 // packages/cli/src/ui/utils/resumeHistoryUtils.ts
+function extractUserRecordDisplayText(record) {
+  const payload = record.systemPayload;
+  if (payload?.displayText) {
+    return payload.displayText;
+  }
+  const parts = record.message?.parts ?? [];
+  return extractTextFromParts([
+    ...stripTrailingUserPromptSubmitContextPart(parts)
+  ]);
+}
+__name(extractUserRecordDisplayText, "extractUserRecordDisplayText");
 function extractTextFromParts(parts) {
   if (!parts) return "";
   const textParts = [];
@@ -3053,7 +3097,7 @@ function convertToHistoryItems(conversation, config, historyGaps) {
             currentToolGroup = [];
           }
           const payload = pendingAtCommands.shift();
-          const text2 = payload.userText || extractTextFromParts(record.message?.parts);
+          const text2 = payload.userText || extractUserRecordDisplayText(record);
           if (text2) {
             items.push({ type: "user", text: text2 });
           }
@@ -3073,7 +3117,7 @@ function convertToHistoryItems(conversation, config, historyGaps) {
           });
           currentToolGroup = [];
         }
-        const text = extractTextFromParts(record.message?.parts);
+        const text = extractUserRecordDisplayText(record);
         if (text) {
           items.push({ type: "user", text });
         }
@@ -3130,6 +3174,9 @@ function convertToHistoryItems(conversation, config, historyGaps) {
           if (toolCall) {
             const rawDisplay = record.toolCallResult.resultDisplay;
             toolCall.resultDisplay = rawDisplay;
+            if (record.toolCallResult.visionBridgeNotice !== void 0) {
+              toolCall.visionBridgeNotice = record.toolCallResult.visionBridgeNotice;
+            }
             const rawStatus = record.toolCallResult["status"];
             toolCall.status = rawStatus === "error" ? "Error" /* Error */ : "Success" /* Success */;
             if (toolCall.status === "Success" /* Success */ && isCollapsibleTool(toolCall.name)) {