@qwen-code/qwen-code 0.21.6 → 0.21.7-nightly.20260808.4ec0371e6

package/chunks/{channel-worker-group-JWQK224X.js → channel-worker-group-MTW2AGT3.js}

@@ -3,20 +3,20 @@
 import {
   ChannelWorkerReconcileError,
   createChannelWorkerGroup
-} from "./chunk-S7CV4KO6.js";
+} from "./chunk-AB4A73VL.js";
 import "./chunk-R574ATRM.js";
 import "./chunk-J26HHFI5.js";
 import "./chunk-6PLDPT2C.js";
-import "./chunk-MKVZE4ZJ.js";
+import "./chunk-KTJFU7RT.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-24ER7UV4.js";
+import "./chunk-UFALT4LK.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-BKHCW2BI.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-5HBA2Z7V.js";
-import "./chunk-DIEFUBV6.js";
+import "./chunk-DIWZNWZT.js";
 import "./chunk-UDXSXLER.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";

package/chunks/{channel-worker-manager-77E3OXRQ.js → channel-worker-manager-UU6PTQSI.js}

@@ -2,26 +2,26 @@
 "use strict";
 import {
   ChannelWorkerReconcileError
-} from "./chunk-S7CV4KO6.js";
+} from "./chunk-AB4A73VL.js";
 import "./chunk-R574ATRM.js";
 import "./chunk-J26HHFI5.js";
 import "./chunk-6PLDPT2C.js";
 import {
   ChannelWorkerStartupError,
   ChannelWorkerStopError
-} from "./chunk-MKVZE4ZJ.js";
+} from "./chunk-KTJFU7RT.js";
 import "./chunk-FYJ7W2PI.js";
 import {
   ChannelDeliveryError,
   ChannelWebhookEnqueueError
 } from "./chunk-YP5KH5Y7.js";
-import "./chunk-24ER7UV4.js";
+import "./chunk-UFALT4LK.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-BKHCW2BI.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-5HBA2Z7V.js";
-import "./chunk-DIEFUBV6.js";
+import "./chunk-DIWZNWZT.js";
 import "./chunk-UDXSXLER.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";

package/chunks/{channel-worker-supervisor-62YWUGP2.js → channel-worker-supervisor-5SRD24FG.js}

@@ -4,16 +4,16 @@ import {
   ChannelWorkerStartupError,
   ChannelWorkerStopError,
   createChannelWorkerSupervisor
-} from "./chunk-MKVZE4ZJ.js";
+} from "./chunk-KTJFU7RT.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-24ER7UV4.js";
+import "./chunk-UFALT4LK.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-BKHCW2BI.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-5HBA2Z7V.js";
-import "./chunk-DIEFUBV6.js";
+import "./chunk-DIWZNWZT.js";
 import "./chunk-UDXSXLER.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";

package/chunks/{chunk-XC656O42.js → chunk-22NBYCPD.js}

@@ -5,17 +5,17 @@ import {
 } from "./chunk-NAVJD2PQ.js";
 import {
   formatFetchErrorForUser
-} from "./chunk-QYPT3QUD.js";
+} from "./chunk-3ULCB3NE.js";
 import {
   combineAbortSignals
 } from "./chunk-DJ2GSRLV.js";
 import {
   atomicWriteFile
-} from "./chunk-UH7Z7Y45.js";
+} from "./chunk-FOGU3LJX.js";
 import {
   Storage,
   createDebugLogger
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-K2B3X3E7.js → chunk-26ISE5EG.js}

@@ -2,14 +2,14 @@
 "use strict";
 import {
   getCliVersion
-} from "./chunk-YMBOEAF4.js";
+} from "./chunk-Z6W3XDLN.js";
 import {
   IdeClient,
   formatMemoryUsage
-} from "./chunk-A4VTILZT.js";
+} from "./chunk-BFSQBXHV.js";
 import {
   createDebugLogger
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -25,7 +25,7 @@ import { execFile } from "node:child_process";
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "ed1ae7d12";
+var GIT_COMMIT_INFO = "b127bd632";
 
 // packages/cli/src/utils/systemInfo.ts
 var debugLogger = createDebugLogger("STATUS");

package/chunks/{chunk-Z7JILXGX.js → chunk-2UUMVNYT.js}

@@ -19,15 +19,15 @@ import {
   taskHasLegacyCondition,
   taskHasLegacyRunMode,
   updateCronTasks
-} from "./chunk-MOHAWIAW.js";
+} from "./chunk-GNPNYXJB.js";
 import {
   ToolNames
-} from "./chunk-D7D7RXIJ.js";
+} from "./chunk-PYQADEFD.js";
 import {
   Storage,
   createDebugLogger,
   getProjectHash
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-ACZRB7AD.js → chunk-3ARO4N5G.js}

@@ -10,19 +10,19 @@ import {
 } from "./chunk-MR3PXB6E.js";
 import {
   ideContextStore
-} from "./chunk-A4VTILZT.js";
+} from "./chunk-BFSQBXHV.js";
 import {
   require_proper_lockfile
 } from "./chunk-KRXPRVGL.js";
 import {
   atomicWriteFileSync
-} from "./chunk-UH7Z7Y45.js";
+} from "./chunk-FOGU3LJX.js";
 import {
   FatalConfigError,
   Storage,
   createDebugLogger,
   getErrorMessage
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import {
   writeStderrLine
 } from "./chunk-KGJGEEVR.js";

package/chunks/{chunk-CJ5WLD5Y.js → chunk-3HS6Y4UA.js}

@@ -1,12 +1,13 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
+  UNSAFE_OBJECT_KEYS,
   getPlugin
-} from "./chunk-EMYZIABH.js";
+} from "./chunk-VDS2WYM5.js";
 import {
   loadSettings,
   saveSettings
-} from "./chunk-PPUOYL77.js";
+} from "./chunk-77WOUGCA.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -50,7 +51,6 @@ function invalidConfig(message) {
   return new ChannelSettingsError("channel_settings_invalid_config", message);
 }
 __name(invalidConfig, "invalidConfig");
-var UNSAFE_OBJECT_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
 function assertSafeChannelName(name) {
   if (UNSAFE_OBJECT_KEYS.has(name)) {
     throw new ChannelSettingsError(
@@ -108,7 +108,7 @@ function assertSharedField(key, value) {
   const enumValues = {
     senderPolicy: /* @__PURE__ */ new Set(["allowlist", "pairing", "open"]),
     dmPolicy: /* @__PURE__ */ new Set(["open", "disabled"]),
-    groupPolicy: /* @__PURE__ */ new Set(["disabled", "allowlist", "open"]),
+    groupPolicy: /* @__PURE__ */ new Set(["disabled", "allowlist", "pairing", "open"]),
     sessionScope: /* @__PURE__ */ new Set(["user", "thread", "single"]),
     dispatchMode: /* @__PURE__ */ new Set(["steer", "followup", "collect"]),
     blockStreaming: /* @__PURE__ */ new Set(["on", "off"])
@@ -168,40 +168,101 @@ function assertSharedField(key, value) {
   return false;
 }
 __name(assertSharedField, "assertSharedField");
-function assertDescriptorValue(field, value) {
-  const invalidEnvironment = typeof value === "string" && isEnvironmentReference(value) && field.envResolvable !== true;
+function containsUnsafeObjectKey(value) {
+  if (Array.isArray(value)) {
+    return value.some((item) => containsUnsafeObjectKey(item));
+  }
+  if (!isRecord(value)) return false;
+  return Object.entries(value).some(
+    ([key, nested]) => UNSAFE_OBJECT_KEYS.has(key) || containsUnsafeObjectKey(nested)
+  );
+}
+__name(containsUnsafeObjectKey, "containsUnsafeObjectKey");
+function assertDescriptorValue(field, value, path = field.key, previous) {
+  if (field.kind === "object") {
+    if (isDeepStrictEqual(previous, value) && !containsUnsafeObjectKey(value)) {
+      return;
+    }
+    if (!isRecord(value)) {
+      throw invalidConfig(`Channel field "${path}" has an invalid value.`);
+    }
+    const previousRecord = isRecord(previous) ? previous : {};
+    const properties = new Map(
+      field.properties.map((property) => [property.key, property])
+    );
+    for (const [key, nestedValue] of Object.entries(value)) {
+      const property = properties.get(key);
+      if (!property) {
+        assertPreservedUnknownField(path, key, nestedValue, previousRecord);
+        continue;
+      }
+      assertDescriptorValue(
+        property,
+        nestedValue,
+        `${path}.${key}`,
+        Object.hasOwn(previousRecord, key) ? previousRecord[key] : void 0
+      );
+    }
+    assertRequiredFields(field.properties, value, path);
+    return;
+  }
+  const invalidEnvironment = typeof value === "string" && isEnvironmentReference(value) && !field.envResolvable;
   if (invalidEnvironment) {
     throw invalidConfig(
-      `Channel field "${field.key}" does not support environment references.`
+      `Channel field "${path}" does not support environment references.`
     );
   }
-  const valid = (field.kind === "string" || field.kind === "secret") && typeof value === "string" && value.length > 0 || field.kind === "boolean" && typeof value === "boolean" || field.kind === "number" && typeof value === "number" && Number.isFinite(value) || field.kind === "enum" && typeof value === "string" && field.options?.some((option) => option.value === value) === true || field.kind === "string-list" && Array.isArray(value) && value.every((item) => typeof item === "string") || field.kind === "record" && isRecord(value) && Object.values(value).every((v) => typeof v === "string");
+  const valid = (field.kind === "string" || field.kind === "secret") && typeof value === "string" && value.length > 0 || field.kind === "boolean" && typeof value === "boolean" || field.kind === "number" && typeof value === "number" && Number.isFinite(value) && (field.exclusiveMinimum === void 0 || value > field.exclusiveMinimum) || field.kind === "enum" && typeof value === "string" && field.options?.some((option) => option.value === value) === true || field.kind === "string-list" && Array.isArray(value) && value.every((item) => typeof item === "string") || field.kind === "record" && isRecord(value) && Object.values(value).every((v) => typeof v === "string") && !containsUnsafeObjectKey(value);
   if (!valid) {
-    throw invalidConfig(`Channel field "${field.key}" has an invalid value.`);
+    throw invalidConfig(`Channel field "${path}" has an invalid value.`);
   }
 }
 __name(assertDescriptorValue, "assertDescriptorValue");
+function assertRequiredFields(fields, values, path) {
+  for (const field of fields) {
+    if (!field.required) continue;
+    const value = Object.hasOwn(values, field.key) ? values[field.key] : void 0;
+    if (value === void 0 || value === null || value === "") {
+      const fieldPath = path ? `${path}.${field.key}` : field.key;
+      throw invalidConfig(`Channel field "${fieldPath}" is required.`);
+    }
+  }
+}
+__name(assertRequiredFields, "assertRequiredFields");
+function assertPreservedUnknownField(path, key, value, previous) {
+  const fieldPath = path ? `${path}.${key}` : key;
+  if (UNSAFE_OBJECT_KEYS.has(key)) {
+    throw invalidConfig(`Channel field "${fieldPath}" is not manageable.`);
+  }
+  if (containsUnsafeObjectKey(value)) {
+    throw invalidConfig(
+      `Channel field "${fieldPath}" cannot use a reserved key.`
+    );
+  }
+  if (Object.hasOwn(previous, key) && isDeepStrictEqual(previous[key], value)) {
+    return;
+  }
+  throw invalidConfig(`Channel field "${fieldPath}" is not manageable.`);
+}
+__name(assertPreservedUnknownField, "assertPreservedUnknownField");
 function assertManagedConfig(config, previous, fields) {
   const descriptorFields = new Map(fields.map((field) => [field.key, field]));
   for (const [key, value] of Object.entries(config)) {
     if (key === "type") continue;
     const field = descriptorFields.get(key);
     if (field) {
-      assertDescriptorValue(field, value);
+      assertDescriptorValue(
+        field,
+        value,
+        field.key,
+        Object.hasOwn(previous, key) ? previous[key] : void 0
+      );
       continue;
     }
     if (assertSharedField(key, value)) continue;
-    if (!Object.hasOwn(previous, key) || !isDeepStrictEqual(previous[key], value)) {
-      throw invalidConfig(`Channel field "${key}" is not manageable.`);
-    }
-  }
-  for (const field of fields) {
-    if (!field.required) continue;
-    const value = config[field.key];
-    if (value === void 0 || value === null || value === "") {
-      throw invalidConfig(`Channel field "${field.key}" is required.`);
-    }
+    assertPreservedUnknownField(void 0, key, value, previous);
   }
+  assertRequiredFields(fields, config);
 }
 __name(assertManagedConfig, "assertManagedConfig");
 function validateSecretUpdate(update) {
@@ -294,9 +355,22 @@ var WorkspaceChannelSettingsStore = class {
       if (value !== void 0) nextConfig[key] = value;
     }
     assertManagedConfig(nextConfig, previous, plugin.management.fields);
-    const crossFieldError = plugin.management.validateConfig?.(nextConfig);
+    let crossFieldError;
+    try {
+      crossFieldError = plugin.management.validateConfig?.(nextConfig);
+      if (crossFieldError instanceof Promise) {
+        void crossFieldError.catch(() => {
+        });
+      }
+    } catch (error) {
+      throw invalidConfig(
+        `Channel validateConfig failed: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
     if (crossFieldError !== void 0) {
-      throw invalidConfig(crossFieldError);
+      throw invalidConfig(
+        typeof crossFieldError === "string" ? crossFieldError : "Channel validateConfig must return a string error message."
+      );
     }
     const channels = { ...current.channels, [name]: nextConfig };
     const workspaceFile = loadSettings(this.workspaceCwd, {

package/chunks/{chunk-MBEMTXQT.js → chunk-3K7FH2KQ.js}

@@ -593,8 +593,7 @@ function reduceGoalControl(current, transition) {
     return assertNever(request, snapshotOf(current));
   }
   return transitionGoal(current, transition.now, {
-    status: "active",
-    turnCount: 0
+    status: "active"
   });
 }
 __name(reduceGoalControl, "reduceGoalControl");
@@ -864,7 +863,6 @@ __name(createMigratedGoalState, "createMigratedGoalState");
 // packages/core/src/goals/goal-runtime.ts
 var GOAL_RUNTIME_DISPOSED_MESSAGE = "Goal runtime has been disposed";
 var STALE_GOAL_TURN_MESSAGE = "Goal turn permit is no longer valid";
-var MAX_GOAL_CONTINUATION_TURNS = 50;
 var GoalPersistenceUnavailableError = class extends Error {
   static {
     __name(this, "GoalPersistenceUnavailableError");
@@ -1002,35 +1000,6 @@ function createGoalRuntime(options) {
     if (snapshot.goal?.status !== "active" || currentPermit || pendingProposal || verificationAttempt) {
       return;
     }
-    if (snapshot.goal.turnCount >= MAX_GOAL_CONTINUATION_TURNS) {
-      const budgetGoalId = snapshot.goal.goalId;
-      const budgetRevision = snapshot.goal.revision;
-      void enqueue(async () => {
-        if (snapshot.goal?.status !== "active" || snapshot.goal.goalId !== budgetGoalId || snapshot.goal.revision !== budgetRevision)
-          return;
-        const now = Date.now();
-        const reason = `Goal exceeded the ${MAX_GOAL_CONTINUATION_TURNS}-turn continuation budget`;
-        const limitedSnapshot = {
-          v: GOAL_STATE_VERSION,
-          goal: {
-            ...snapshot.goal,
-            status: "usage_limited",
-            activeTimeMs: elapsedActiveTime(snapshot.goal, now),
-            updatedAt: now,
-            lastReason: reason
-          },
-          activity: "idle"
-        };
-        await options.journal.recordGoalState(randomUUID(), {
-          v: GOAL_STATE_VERSION,
-          cause: "usage_limited",
-          snapshot: limitedSnapshot
-        });
-        snapshot = structuredClone(limitedSnapshot);
-        broadcast("usage_limited");
-      });
-      return;
-    }
     continuationQueued = true;
     flushContinuation(cause);
   }, "queueContinuation");

package/chunks/{chunk-QYPT3QUD.js → chunk-3ULCB3NE.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   delay
-} from "./chunk-QMBEW7EW.js";
+} from "./chunk-BGG4MBYD.js";
 import {
   isTlsVerificationDisabled
-} from "./chunk-BFHXDAR7.js";
+} from "./chunk-KKBPOU75.js";
 import {
   getErrorMessage
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-IMOQO6YL.js → chunk-4Q6N3SNL.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   getEffectiveSupportedModes
-} from "./chunk-TOGZTG4X.js";
+} from "./chunk-MIA37QO3.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-3UOLYNTF.js → chunk-4QJJHIZ5.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   loadSettings
-} from "./chunk-PPUOYL77.js";
+} from "./chunk-77WOUGCA.js";
 import {
   getCurrentLanguage
-} from "./chunk-KHUA3NQV.js";
+} from "./chunk-TAOSTUHI.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-ACZRB7AD.js";
+} from "./chunk-3ARO4N5G.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -21,15 +21,16 @@ import {
   createTransport,
   hashMcpServerConfig,
   isGatedMcpScope,
-  normalizeClaudeMcpServer
-} from "./chunk-A4VTILZT.js";
+  normalizeClaudeMcpServer,
+  runWithTimeout
+} from "./chunk-BFSQBXHV.js";
 import {
   atomicWriteFile
-} from "./chunk-UH7Z7Y45.js";
+} from "./chunk-FOGU3LJX.js";
 import {
   Storage,
   getErrorMessage
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import {
   writeStderrLine,
   writeStdoutLine
@@ -556,6 +557,7 @@ var COLOR_GREEN = "\x1B[32m";
 var COLOR_YELLOW = "\x1B[33m";
 var COLOR_RED = "\x1B[31m";
 var RESET_COLOR = "\x1B[0m";
+var MCP_CONNECT_TIMEOUT_MS = 5e3;
 async function getMcpServersFromConfig() {
   const settings = loadSettings();
   const extensionManager = new ExtensionManager({
@@ -597,16 +599,23 @@ async function testMCPConnection(serverName, config) {
     transport = await createTransport(serverName, config, false);
   } catch (_error) {
     await client.close();
-    return "disconnected" /* DISCONNECTED */;
+    return { status: "disconnected" /* DISCONNECTED */, timedOut: false };
   }
   try {
-    await client.connect(transport, { timeout: 5e3 });
+    await runWithTimeout(
+      client.connect(transport, { timeout: MCP_CONNECT_TIMEOUT_MS }),
+      MCP_CONNECT_TIMEOUT_MS,
+      `MCP connection for ${serverName}`
+    );
     await client.ping();
     await client.close();
-    return "connected" /* CONNECTED */;
-  } catch (_error) {
+    return { status: "connected" /* CONNECTED */, timedOut: false };
+  } catch (error) {
     await transport.close();
-    return "disconnected" /* DISCONNECTED */;
+    return {
+      status: "disconnected" /* DISCONNECTED */,
+      timedOut: error instanceof Error && error.message.startsWith("Timed out after ")
+    };
   }
 }
 __name(testMCPConnection, "testMCPConnection");
@@ -645,7 +654,7 @@ async function listMcpServers() {
         continue;
       }
     }
-    const status = await getServerStatus(serverName, server);
+    const { status, timedOut } = await getServerStatus(serverName, server);
     let statusIndicator = "";
     let statusText = "";
     switch (status) {
@@ -660,7 +669,7 @@ async function listMcpServers() {
       case "disconnected" /* DISCONNECTED */:
       default:
         statusIndicator = COLOR_RED + "\u2717" + RESET_COLOR;
-        statusText = "Disconnected";
+        statusText = timedOut ? `Disconnected (timed out after ${MCP_CONNECT_TIMEOUT_MS}ms)` : "Disconnected";
         break;
     }
     writeStdoutLine(`${statusIndicator} ${serverInfo} - ${statusText}`);

package/chunks/{chunk-VGFPFM4U.js → chunk-5PGKKSO6.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   theme
-} from "./chunk-U25CMJYY.js";
+} from "./chunk-EKPKKXY2.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -14,10 +14,14 @@ import {
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
+import {
+  collectInlineImages,
+  extractInlineContentRuns
+} from "./chunk-PJRW65JO.js";
 import {
   formatHistoryGapNotice,
   indexGapsByChild
-} from "./chunk-RFUHDCNF.js";
+} from "./chunk-O7VQ3F22.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -29,21 +33,21 @@ import {
 } from "./chunk-3SH53ANB.js";
 import {
   t
-} from "./chunk-KHUA3NQV.js";
+} from "./chunk-TAOSTUHI.js";
 import {
   getToolResponseDisplayText,
   stripTrailingUserPromptSubmitContextPart
-} from "./chunk-A4VTILZT.js";
+} from "./chunk-BFSQBXHV.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";
 import {
   GoalPersistenceUnavailableError,
   parseGoalStateRecordPayloadV2
-} from "./chunk-MBEMTXQT.js";
+} from "./chunk-3K7FH2KQ.js";
 import {
   ToolDisplayNames
-} from "./chunk-D7D7RXIJ.js";
+} from "./chunk-PYQADEFD.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -3183,7 +3187,7 @@ function convertToHistoryItems(conversation, config, historyGaps) {
       case "assistant": {
         const parts = record.message?.parts;
         const thoughtText = !config ? extractThoughtTextFromParts(parts) : "";
-        const text = extractTextFromParts(parts);
+        const displayRuns = extractInlineContentRuns(parts, "\n");
         const functionCalls = extractFunctionCalls(parts);
         if (thoughtText) {
           if (currentToolGroup.length > 0) {
@@ -3195,7 +3199,7 @@ function convertToHistoryItems(conversation, config, historyGaps) {
           }
           items.push({ type: "gemini_thought", text: thoughtText });
         }
-        if (text) {
+        if (displayRuns.length > 0) {
           if (currentToolGroup.length > 0) {
             items.push({
               type: "tool_group",
@@ -3203,11 +3207,27 @@ function convertToHistoryItems(conversation, config, historyGaps) {
             });
             currentToolGroup = [];
           }
-          items.push({
-            type: "gemini",
-            text,
-            timestamp: new Date(record.timestamp).getTime()
-          });
+          for (const [index, run] of displayRuns.entries()) {
+            const type = index === 0 ? "gemini" : "gemini_content";
+            const timestamp = index === 0 ? { timestamp: new Date(record.timestamp).getTime() } : {};
+            if (run.kind === "text") {
+              items.push({ type, text: run.text, ...timestamp });
+            } else if (run.kind === "image") {
+              items.push({
+                type,
+                text: "",
+                images: [run.image],
+                ...timestamp
+              });
+            } else {
+              items.push({
+                type,
+                text: "",
+                omittedImageCount: run.count,
+                ...timestamp
+              });
+            }
+          }
         }
         for (const fc of functionCalls) {
           const tool = getTool(config, fc.name);
@@ -3229,6 +3249,7 @@ function convertToHistoryItems(conversation, config, historyGaps) {
           const callId = record.toolCallResult.callId;
           const toolCall = currentToolGroup.find((t2) => t2.callId === callId);
           if (toolCall) {
+            const responseParts = record.toolCallResult.responseParts ?? record.message?.parts;
             const rawDisplay = record.toolCallResult.resultDisplay;
             toolCall.resultDisplay = rawDisplay;
             if (record.toolCallResult.visionBridgeNotice !== void 0) {
@@ -3236,10 +3257,15 @@ function convertToHistoryItems(conversation, config, historyGaps) {
             }
             const rawStatus = record.toolCallResult["status"];
             toolCall.status = rawStatus === "error" ? "Error" /* Error */ : "Success" /* Success */;
+            const { images, omittedImageCount } = collectInlineImages(responseParts);
+            if (images.length > 0) {
+              toolCall.images = images;
+            }
+            if (omittedImageCount > 0) {
+              toolCall.omittedImageCount = omittedImageCount;
+            }
             if (toolCall.status === "Success" /* Success */ && isCollapsibleTool(toolCall.name)) {
-              toolCall.detailedDisplay = getToolResponseDisplayText(
-                record.toolCallResult.responseParts ?? record.message?.parts
-              );
+              toolCall.detailedDisplay = getToolResponseDisplayText(responseParts);
             }
           }
           pendingToolCalls.delete(callId || "");

package/chunks/{chunk-NGJOAKJY.js → chunk-5YT3Y33M.js}

@@ -2,14 +2,14 @@
 "use strict";
 import {
   functionResponsePartsToString
-} from "./chunk-GESMMPAK.js";
+} from "./chunk-UKAYEQDU.js";
 import {
   parseAndFormatApiError
-} from "./chunk-A4VTILZT.js";
+} from "./chunk-BFSQBXHV.js";
 import {
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-PX5DNLSA.js";
+} from "./chunk-XCG76UE6.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";