nolo-cli 0.174.0-alpha.1 → 0.176.0-alpha.1

package/{chunk-VJ52BYBK.js → chunk-P3KTMRQ2.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-NBTY7YJF.js";
 import {
   resolveCliLocalRuntimeKeyCapability
-} from "./chunk-24VDDKCB.js";
+} from "./chunk-TV6QW46C.js";
 import {
   HIGH_RISK_MUTATION_TOOL_NAMES
 } from "./chunk-2GRXE3YJ.js";

package/{chunk-IFRQFQ2C.js → chunk-QA5LXQFO.js}

@@ -2,7 +2,7 @@ import {
   DEVIN_CONNECT_URL,
   parseSseDataLineJson,
   parseSseDataLineObject
-} from "./chunk-DWFRZ3UI.js";
+} from "./chunk-QMFYP3O4.js";
 import {
   applyChatCompletionDelta,
   applyResponsesToolEvent,
@@ -11,7 +11,7 @@ import {
   flushChatCompletionStream,
   providerHttpFailure,
   throwIfChatCompletionStreamFailed
-} from "./chunk-LCCULKPJ.js";
+} from "./chunk-DRR5E2EM.js";
 import {
   readSseFrames
 } from "./chunk-HNUWUO75.js";
@@ -28,15 +28,16 @@ import {
 import {
   hasImageInRuntimeMessages,
   stripImagePartsFromMessages
-} from "./chunk-HHEM4TV3.js";
+} from "./chunk-CS4FUKMG.js";
 import {
   clipToolText,
   resolveHistoricalToolContentCap,
   resolveToolOutputProfile
 } from "./chunk-2WZXXAQD.js";
 import {
-  resolveAgentImageInputSupport
-} from "./chunk-7QQOOHDG.js";
+  resolveAgentImageInputSupport,
+  resolveToolImagePolicy
+} from "./chunk-XRU4QTSX.js";
 import {
   applyShapingCounts,
   attachProjectionFacts,
@@ -95,7 +96,7 @@ import {
   toOpenAiCompatibleMessages,
   toResponsesTools,
   transferDowngradedToolTurnOrigin
-} from "./chunk-ISIFZP3N.js";
+} from "./chunk-U3YGSKXD.js";
 import {
   TOOL_HAD_IMAGES,
   TOOL_IMAGES,
@@ -108,7 +109,7 @@ import {
   toolImageDelivery,
   toolImages,
   withoutToolImages
-} from "./chunk-A6B3LSDB.js";
+} from "./chunk-IJOJMOCX.js";
 import {
   BRIDGE_STREAM_MAX_CHARS,
   CLI_NOLO_WORKSPACE_TOOL_NAMES,
@@ -15900,6 +15901,153 @@ async function renderVisualPage(args2) {
   });
 }
 
+// packages/agent-runtime/hostWindowCapture.ts
+import { spawn as spawn2 } from "node:child_process";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+var HOST_CAPTURE_TIMEOUT_MS = 9e3;
+var UNAVAILABLE = "\u5F53\u524D\u73AF\u5883\u65E0\u53EF\u7528\u622A\u5C4F\u6743\u9650/\u670D\u52A1";
+var PORTAL_SCRIPT = String.raw`
+import json, signal
+from gi.repository import Gio, GLib
+bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+loop = GLib.MainLoop()
+handle = None
+finished = False
+result = None
+responses = {}
+def response(conn, sender, path, interface, name, parameters, data):
+    global result, finished
+    responses[path] = parameters.unpack()
+    if handle == path:
+        result = responses[path]
+        finished = True
+        loop.quit()
+def stop(*args):
+    loop.quit()
+    return False
+subscription = bus.signal_subscribe('org.freedesktop.portal.Desktop', 'org.freedesktop.portal.Request', 'Response', None, None, Gio.DBusSignalFlags.NONE, response, None)
+signal.signal(signal.SIGTERM, stop)
+try:
+    options = {'interactive': GLib.Variant('b', True), 'handle_token': GLib.Variant('s', 'nolo_capture')}
+    handle = bus.call_sync('org.freedesktop.portal.Desktop', '/org/freedesktop/portal/desktop', 'org.freedesktop.portal.Screenshot', 'Screenshot', GLib.Variant('(sa{sv})', ('', options)), GLib.VariantType.new('(o)'), Gio.DBusCallFlags.NONE, 7000, None).unpack()[0]
+    if handle in responses:
+        result = responses[handle]
+        finished = True
+    else:
+        GLib.timeout_add(8000, stop)
+        loop.run()
+    if result is None:
+        print(json.dumps({'error': 'portal response timeout'}), flush=True)
+    else:
+        code, values = result
+        print(json.dumps({'code': code, 'uri': values.get('uri')}), flush=True)
+finally:
+    if handle and not finished:
+        try:
+            bus.call_sync('org.freedesktop.portal.Desktop', handle, 'org.freedesktop.portal.Request', 'Close', None, None, Gio.DBusCallFlags.NONE, 200, None)
+        except Exception:
+            pass
+    bus.signal_unsubscribe(subscription)
+`;
+var capturePortalScreenshot = (signal) => new Promise((resolve6, reject) => {
+  const child = spawn2("/usr/bin/python3", ["-c", PORTAL_SCRIPT], { stdio: ["ignore", "pipe", "pipe"] });
+  let stdout = "";
+  let stderr = "";
+  const stop = () => {
+    child.kill("SIGTERM");
+  };
+  signal.addEventListener("abort", stop, { once: true });
+  if (signal.aborted) stop();
+  child.stdout.on("data", (data) => {
+    stdout = (stdout + data).slice(-16384);
+  });
+  child.stderr.on("data", (data) => {
+    stderr = (stderr + data).slice(-4096);
+  });
+  child.once("error", reject);
+  child.once("close", (code) => {
+    signal.removeEventListener("abort", stop);
+    if (signal.aborted) return reject(new Error("portal capture timeout"));
+    if (code !== 0) return reject(new Error(stderr.trim() || `portal helper exited ${code}`));
+    try {
+      resolve6(JSON.parse(stdout));
+    } catch {
+      reject(new Error("invalid portal response"));
+    }
+  });
+});
+function createHostWindowCapture(options = {}) {
+  const concurrency = Math.max(1, Math.min(2, Math.floor(options.concurrency || 1)));
+  const timeoutMs = Math.max(1, Math.min(HOST_CAPTURE_TIMEOUT_MS, options.timeoutMs || HOST_CAPTURE_TIMEOUT_MS));
+  let active = 0;
+  const waiters = [];
+  function acquire(signal) {
+    return new Promise((resolve6, reject) => {
+      const abort = () => {
+        const index = waiters.indexOf(start);
+        if (index >= 0) waiters.splice(index, 1);
+        reject(new Error("portal capture timeout (queue)"));
+      };
+      const start = () => {
+        signal.removeEventListener("abort", abort);
+        active++;
+        resolve6();
+      };
+      if (signal.aborted) return abort();
+      if (active < concurrency) start();
+      else {
+        waiters.push(start);
+        signal.addEventListener("abort", abort, { once: true });
+      }
+    });
+  }
+  return async () => {
+    const controller = new AbortController();
+    let timer;
+    const work = async () => {
+      await acquire(controller.signal);
+      try {
+        const reply = await (options.portal ?? capturePortalScreenshot)(controller.signal);
+        if (controller.signal.aborted) throw new Error("portal capture timeout");
+        if (reply.error) throw new Error(reply.error);
+        if (reply.code !== 0) throw new Error(reply.code === 1 ? "portal denied/cancelled (Response 1)" : `portal failed (Response ${reply.code})`);
+        if (!reply.uri) throw new Error("portal returned no file URI");
+        const uri = new URL(reply.uri);
+        if (uri.protocol !== "file:" || uri.hostname && uri.hostname !== "localhost") throw new Error("portal returned a non-local file URI");
+        const path = fileURLToPath2(uri);
+        const image = await (options.readImage ?? readLocalImage)(path);
+        if (!image.images?.length) throw new Error("portal image could not be decoded");
+        const dimensions = /\[image (\d+x\d+) (\d+) bytes/.exec(image.content);
+        if (!dimensions) throw new Error("invalid image summary");
+        return {
+          ...image,
+          content: `[screenshot ${dimensions[1]} ${Math.round(Number(dimensions[2]) / 1024)}KB \u2192 ${path}]
+\u6765\u6E90\uFF1A\u5BBF\u4E3B portal \u5168\u5C4F/\u4EA4\u4E92\u9009\u62E9\u7ED3\u679C\uFF1Bportal \u672A\u63D0\u4F9B\u5E94\u7528/\u7A97\u53E3\u8EAB\u4EFD\uFF0C\u65E0\u6CD5\u786E\u8BA4\u7A97\u53E3\u540D\u3002`
+        };
+      } finally {
+        active--;
+        waiters.shift()?.();
+      }
+    };
+    try {
+      return await Promise.race([
+        work(),
+        new Promise((_, reject) => {
+          timer = setTimeout(() => {
+            controller.abort();
+            reject(new Error("portal capture timeout"));
+          }, timeoutMs);
+        })
+      ]);
+    } catch (error) {
+      return { content: `${UNAVAILABLE}\uFF1A${error instanceof Error ? error.message : String(error)}` };
+    } finally {
+      clearTimeout(timer);
+    }
+  };
+}
+var captureHostWindow = createHostWindowCapture();
+
 // packages/agent-runtime/localWorkspaceTools.ts
 import { lstat, mkdir as mkdir2, readdir as readdir2, readFile as readFile4, realpath as realpath2, stat as stat4, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -16417,6 +16565,7 @@ function runTasks(args2) {
 var WORKSPACE_TOOL_NAMES = [
   "readFile",
   "read_image",
+  "captureHostWindow",
   "writeFile",
   "editFile",
   "globFiles",
@@ -16722,6 +16871,16 @@ function buildTaskStopTool() {
   };
 }
 function buildWorkspaceToolDefinition(toolName) {
+  if (toolName === "captureHostWindow") {
+    return {
+      type: "function",
+      function: {
+        name: "captureHostWindow",
+        description: "Capture the host desktop through the Screenshot portal (interactive permission/selection may appear). Returns an image or a fail-closed reason within 9s. Portal does not identify the application/window: never infer a window name. Linux host requires /usr/bin/python3 with Gio. No arguments.",
+        parameters: { type: "object", properties: {}, additionalProperties: false }
+      }
+    };
+  }
   if (toolName === "read_image") {
     return {
       type: "function",
@@ -18127,6 +18286,16 @@ function createLocalWorkspaceToolExecutors(args2) {
       ...fileAccess,
       ...args2.resolveRipgrepBinary ? { resolveRipgrepBinary: args2.resolveRipgrepBinary } : {}
     }),
+    captureHostWindow: async (call) => {
+      let parsed;
+      try {
+        parsed = JSON.parse(call.arguments || "{}");
+      } catch {
+        return { content: "captureHostWindow accepts an empty JSON object" };
+      }
+      if (!isRecord(parsed) || Object.keys(parsed).length) return { content: "captureHostWindow accepts no arguments" };
+      return captureHostWindow();
+    },
     read_image: async (call) => {
       const parsed = parseWorkspaceToolArguments(call.arguments);
       if (Object.keys(parsed).some((key) => key !== "path")) throw new Error("read_image accepts exactly one path");
@@ -20745,13 +20914,15 @@ ${reasoningTailLog}
 }
 
 // packages/integrations/openai/responsesRequestBody.ts
-function buildResponsesRequestBody(body, model) {
+function buildResponsesRequestBody(body, model, options) {
   const tools = Array.isArray(body.tools) ? toResponsesTools(body.tools) : void 0;
   const reasoningEffort = body.reasoning && typeof body.reasoning === "object" ? void 0 : typeof body.reasoning_effort === "string" && body.reasoning_effort.trim() ? body.reasoning_effort : void 0;
   return {
     ...body,
     model,
-    input: Array.isArray(body.input) && body.input.length > 0 ? body.input : convertMessagesToResponsesInput(body.messages ?? []),
+    input: Array.isArray(body.input) && body.input.length > 0 ? body.input : convertMessagesToResponsesInput(body.messages ?? [], {
+      supportsToolImages: options?.supportsToolImages
+    }),
     ...Array.isArray(body.tools) ? { tools: tools ?? void 0 } : {},
     ...typeof body.max_tokens === "number" ? { max_output_tokens: body.max_tokens } : {},
     ...reasoningEffort ? { reasoning: { effort: reasoningEffort } } : {},
@@ -21082,8 +21253,16 @@ function buildOpenAiCompatibleChatCompletionRequest(args2) {
     args2.providerConfig.model
   );
   const sanitizedMessages = sanitizeForOutbound(args2.messages, args2.tools);
+  const toolImagePolicy = resolveToolImagePolicy({
+    routeKind: isResponses ? "responses" : "openai-compatible",
+    legacySupportsToolImages: isResponses ? false : void 0,
+    provider: args2.providerConfig.usageProvider ?? args2.providerConfig.provider,
+    model: args2.providerConfig.model,
+    customProviderUrl: args2.providerConfig.endpoint,
+    hasVision: args2.providerConfig.hasVision
+  });
   const messages = toOpenAiCompatibleMessages(sanitizedMessages, {
-    supportsToolImages: !isResponses && resolveAgentImageInputSupport({ provider: args2.providerConfig.usageProvider ?? args2.providerConfig.provider, model: args2.providerConfig.model, customProviderUrl: args2.providerConfig.endpoint, hasVision: args2.providerConfig.hasVision ?? false }),
+    supportsToolImages: !isResponses && toolImagePolicy.supportsToolImages,
     stripReasoningContent: shouldStripReasoning,
     ...args2.shapingCounts ? { shapingCounts: args2.shapingCounts } : {},
     ...resolveReasoningReplayOptions(
@@ -21120,7 +21299,9 @@ function buildOpenAiCompatibleChatCompletionRequest(args2) {
       )
     } : {}
   };
-  const body = isResponses ? buildResponsesRequestBody(rawBody, args2.providerConfig.model) : normalizeChatCompletionsBodyForProvider({
+  const body = isResponses ? buildResponsesRequestBody(rawBody, args2.providerConfig.model, {
+    supportsToolImages: toolImagePolicy.supportsToolImages
+  }) : normalizeChatCompletionsBodyForProvider({
     body: rawBody,
     provider: args2.providerConfig.provider,
     model: args2.providerConfig.model,
@@ -21997,11 +22178,11 @@ async function readNoloProcessStream(readable) {
 async function runNoloWorkspaceCliTool(call, args2) {
   const cliArgs = buildNoloWorkspaceCommandArgs(call);
   const bunSpawn = globalThis.Bun?.spawn;
-  const spawn2 = args2.spawn ?? (typeof bunSpawn === "function" ? bunSpawn : nodeSpawnFallback);
+  const spawn3 = args2.spawn ?? (typeof bunSpawn === "function" ? bunSpawn : nodeSpawnFallback);
   const execPath = args2.processExecPath ?? process.execPath;
   const entrypoint = args2.cliEntrypoint;
   const cmd = entrypoint && entrypoint !== execPath ? [execPath, entrypoint, ...cliArgs] : [execPath, ...cliArgs];
-  const proc = spawn2({
+  const proc = spawn3({
     cmd,
     stdout: "pipe",
     stderr: "pipe",

package/{chunk-DWFRZ3UI.js → chunk-QMFYP3O4.js}

@@ -2,11 +2,11 @@ import {
   streamSseDataValues
 } from "./chunk-HNUWUO75.js";
 import {
-  resolveAgentImageInputSupport
-} from "./chunk-7QQOOHDG.js";
+  resolveToolImagePolicy
+} from "./chunk-XRU4QTSX.js";
 import {
   projectOpenAiToolImages
-} from "./chunk-A6B3LSDB.js";
+} from "./chunk-IJOJMOCX.js";
 import {
   getAntigravityUserAgent,
   readAntigravityProjectId,
@@ -640,7 +640,11 @@ function shouldUseGeminiNativeToolRoute(provider, model, tools, isImageModel) {
   return provider === "google" && !isImageModel(model) && isGemini3Model(model) && Array.isArray(tools) && tools.length > 0;
 }
 function buildGeminiGenerateContentRequest(args) {
-  const supportsToolImages = args.supportsToolImages ?? false;
+  const supportsToolImages = resolveToolImagePolicy(args.toolImagePolicy ?? {
+    routeKind: "gemini-native",
+    hasVision: args.supportsToolImages,
+    legacySupportsToolImages: args.supportsToolImages ?? false
+  }).supportsToolImages;
   const { contents, systemTexts } = convertOpenAiMessagesToGemini(
     args.messages,
     {
@@ -687,11 +691,12 @@ function buildCloudCodeAssistPayload(args) {
   const rawMessages = Array.isArray(args.openAiBody.messages) ? args.openAiBody.messages : [];
   const quirks = resolveGeminiModelQuirks(model);
   const isClaude = quirks.isClaudeCrossModel;
-  const supportsToolImages = resolveAgentImageInputSupport({
+  const supportsToolImages = resolveToolImagePolicy({
     ...args.agentConfig,
+    routeKind: "antigravity",
     model,
-    hasVision: args.agentConfig.hasVision ?? false
-  });
+    hasVision: args.agentConfig.hasVision
+  }).supportsToolImages;
   const { contents, systemTexts } = convertOpenAiMessagesToGemini(rawMessages, {
     attachSkipThoughtSignature: quirks.allowsThoughtSignatureSentinel,
     supportsToolImages

package/{chunk-L7ZCLG72.js → chunk-S4SXPMPC.js}

@@ -333,7 +333,7 @@ async function saveDocState(arg, { dispatch, getState }) {
     ).unwrap();
     if (dbSpaceId) {
       try {
-        const { updateContentTitle } = await import("./contentThunks-NVX3NBHZ.js");
+        const { updateContentTitle } = await import("./contentThunks-F4Y7V4IH.js");
         await dispatch(
           updateContentTitle({
             spaceId: dbSpaceId,
@@ -372,7 +372,7 @@ async function saveDocState(arg, { dispatch, getState }) {
   }
 }
 async function createDocState(args, thunkApi) {
-  const { createPageAction } = await import("./createPageAction-N5XSWPN2.js");
+  const { createPageAction } = await import("./createPageAction-FAYZZVYI.js");
   return createPageAction(args, thunkApi);
 }
 function subscribe(listener) {

package/{chunk-KXIJYPVC.js → chunk-SYIWIP4D.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-VYNMQ6HW.js";
 import {
   fetchAndCacheTableRows
-} from "./chunk-Z4HDFBYK.js";
+} from "./chunk-GJU7F5IR.js";
 import {
   require_react
 } from "./chunk-YDH3FDFQ.js";
@@ -521,7 +521,7 @@ var executeToolRun = createAsyncThunk(
     if (!executionInput) {
       throw new Error(`ToolRun ${id} has no input to execute with.`);
     }
-    const { findToolExecutor } = await import("./tools-ZB2YBHSS.js");
+    const { findToolExecutor } = await import("./tools-KYFVARQ5.js");
     const { executor } = findToolExecutor(run.toolName);
     toolRunStarted({
       id: run.id,

package/{chunk-24VDDKCB.js → chunk-TV6QW46C.js}

@@ -20,7 +20,7 @@ import {
   toolRunUpdated,
   uiCardFallback,
   waitForAbortableDelay
-} from "./chunk-KXIJYPVC.js";
+} from "./chunk-SYIWIP4D.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
@@ -64,7 +64,7 @@ import {
 } from "./chunk-VF4K2QE6.js";
 import {
   createDocState
-} from "./chunk-L7ZCLG72.js";
+} from "./chunk-S4SXPMPC.js";
 import {
   addMemberSpace,
   fetchAuthoritativeRemoteSpace,
@@ -79,7 +79,7 @@ import {
 } from "./chunk-BAWAKW7X.js";
 import {
   createDialogAction
-} from "./chunk-RYBZM4A2.js";
+} from "./chunk-73FHDE7C.js";
 import {
   setDialogExtraReferencesAction
 } from "./chunk-IF7V3CBU.js";
@@ -102,7 +102,7 @@ import {
   updateContentCategory,
   updateContentTitle,
   writeStoredCollapsedCategories
-} from "./chunk-Z4HDFBYK.js";
+} from "./chunk-GJU7F5IR.js";
 import {
   buildDatabaseFileContentUrl,
   deleteDialog,
@@ -115,7 +115,7 @@ import {
   selectMsgById,
   uiAskChoiceFunc,
   uiAskChoiceFunctionSchema
-} from "./chunk-LTWBOZE6.js";
+} from "./chunk-LQRXBYTS.js";
 import {
   buildMediaToolConfirmation,
   normalizeMediaConfirmExecutionRevision
@@ -126,7 +126,7 @@ import {
   runLlm,
   streamAgentChatTurn,
   updateAgent
-} from "./chunk-RABMW33C.js";
+} from "./chunk-GHNRJ3TK.js";
 import {
   getCurrentSpaceId,
   getCurrentSpaceIdRaw,
@@ -3882,7 +3882,7 @@ async function deleteDialogsFunc(args, thunkApi) {
   const deletedDialogIds = [];
   const deletedDialogKeys = [];
   const failures = [];
-  const { deleteDialog: deleteDialog2 } = await import("./dialogSlice-ST2FXOF3.js");
+  const { deleteDialog: deleteDialog2 } = await import("./dialogSlice-QRWP73XJ.js");
   for (const target of targets) {
     try {
       await thunkApi.dispatch(deleteDialog2(target.dbKey)).unwrap();
@@ -18563,7 +18563,7 @@ async function updateDocFunc(args, thunkApi) {
       updated_at: (/* @__PURE__ */ new Date()).toISOString()
     };
     await dispatch(write({ data: updatedPageData, customKey: id })).unwrap();
-    const { getDocState, applyExternalDocUpdate } = await import("./docStore-PPUT7MQV.js");
+    const { getDocState, applyExternalDocUpdate } = await import("./docStore-TABPPAGD.js");
     if (getDocState().pageKey === id) {
       applyExternalDocUpdate({
         slateData: finalSlateData,

package/{chunk-ISIFZP3N.js → chunk-U3YGSKXD.js}

@@ -1,6 +1,13 @@
 import {
-  projectOpenAiToolImages
-} from "./chunk-A6B3LSDB.js";
+  EMPTY_TOOL_RESULT_TEXT,
+  TOOL_HAD_IMAGES,
+  TOOL_IMAGES,
+  createToolImageBudget,
+  formatToolImageBudgetNote,
+  hadToolImages,
+  projectOpenAiToolImages,
+  toolImages
+} from "./chunk-IJOJMOCX.js";
 import {
   getModelContextWindow
 } from "./chunk-7ZGMQZ5D.js";
@@ -92,14 +99,57 @@ var toResponsesTools = (tools) => {
 };
 var convertMessagesToResponsesInput = (messages, options) => {
   const input = [];
+  const imageBudget = createToolImageBudget();
+  let acceptedImages = 0;
   for (const message of messages) {
     if (!message?.role) continue;
     if (message.role === "tool") {
       if (!message.tool_call_id) continue;
+      if (!options?.supportsToolImages || !hadToolImages(message)) {
+        input.push({
+          type: "function_call_output",
+          call_id: message.tool_call_id,
+          output: normalizeToolOutput(message.content)
+        });
+        continue;
+      }
+      const images = toolImages(message);
+      const text = typeof message.content === "string" ? message.content : normalizeToolOutput(message.content);
+      const effectiveText = text.trim() ? text : EMPTY_TOOL_RESULT_TEXT;
+      const outputParts = [
+        { type: "input_text", text: effectiveText }
+      ];
+      let toolOmitted = 0;
+      for (const image of images) {
+        const decision = imageBudget(image);
+        if (decision === "duplicate") continue;
+        if (decision !== "delivered") {
+          toolOmitted += 1;
+          continue;
+        }
+        acceptedImages += 1;
+        outputParts.push({
+          type: "input_text",
+          text: `Image ${acceptedImages}`
+        });
+        outputParts.push({
+          type: "input_image",
+          image_url: `data:${image.mimeType};base64,${image.dataBase64}`
+        });
+      }
+      if (toolOmitted > 0) {
+        outputParts.push({
+          type: "input_text",
+          text: formatToolImageBudgetNote(toolOmitted)
+        });
+      }
+      const hadPersistedImages = message?.tool_result_metadata?.[TOOL_HAD_IMAGES] === true;
+      const hasInjectedParts = outputParts.some((p) => p.type === "input_image") || toolOmitted > 0;
+      const shouldUseArray = hadPersistedImages || hasInjectedParts;
       input.push({
         type: "function_call_output",
         call_id: message.tool_call_id,
-        output: normalizeToolOutput(message.content)
+        output: shouldUseArray ? outputParts : normalizeToolOutput(message.content)
       });
       continue;
     }
@@ -1000,6 +1050,17 @@ function preserveAgentStateFields(source, target, options) {
     }
   }
   if (source.role === "tool") {
+    if (TOOL_IMAGES in source) {
+      mutableTarget[TOOL_IMAGES] = source[TOOL_IMAGES];
+    }
+    if (source.tool_result_metadata) {
+      Object.defineProperty(mutableTarget, "tool_result_metadata", {
+        value: source.tool_result_metadata,
+        enumerable: false,
+        configurable: true,
+        writable: true
+      });
+    }
     const toolCallId = typeof source.tool_call_id === "string" ? source.tool_call_id.trim() : typeof source.toolCallId === "string" ? source.toolCallId.trim() : "";
     if (toolCallId) mutableTarget.tool_call_id = toolCallId;
   }

package/{chunk-J63HVOSX.js → chunk-UPJVQK5J.js}

@@ -2,7 +2,7 @@ import {
   clipMultilineText,
   fetchAndSerializeTable,
   waitForAbortableDelay
-} from "./chunk-KXIJYPVC.js";
+} from "./chunk-SYIWIP4D.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
@@ -21,7 +21,7 @@ import {
 } from "./chunk-AGIM7IMJ.js";
 import {
   fetchAndCacheMessages
-} from "./chunk-LTWBOZE6.js";
+} from "./chunk-LQRXBYTS.js";
 import {
   createSpaceKey
 } from "./chunk-UAD2WT54.js";

package/{chunk-EGT6ORP5.js → chunk-XIM37FAU.js}

@@ -5,7 +5,7 @@ import {
   inlineImageUrlsForCustomProvider,
   prepareTools,
   shouldInlineImageUrlsForAgent
-} from "./chunk-TMAQFKHS.js";
+} from "./chunk-CCWUO2ZE.js";
 import {
   CONFIRMATION_INPUT_KEYS,
   INVALID_TOOL_ARGS_REPLACEMENT,
@@ -14,16 +14,16 @@ import {
   performFetchRequest,
   sanitizeOutboundMessages,
   stripModelToolArgs
-} from "./chunk-ONQ2APOE.js";
+} from "./chunk-GA4NE7QH.js";
 import {
   findToolExecutor,
   toolDefinitionsByName
-} from "./chunk-24VDDKCB.js";
+} from "./chunk-TV6QW46C.js";
 import {
   classifyApiError,
   classifyGenerationError,
   extractErrorDiagnostics
-} from "./chunk-J63HVOSX.js";
+} from "./chunk-UPJVQK5J.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -32,7 +32,7 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-KXIJYPVC.js";
+} from "./chunk-SYIWIP4D.js";
 import {
   getPublicImageAgentMode
 } from "./chunk-VIDPVFP3.js";
@@ -42,10 +42,10 @@ import {
   messageStreaming,
   toolResultNeedsUserConfirmation,
   updateToolMessage
-} from "./chunk-LTWBOZE6.js";
+} from "./chunk-LQRXBYTS.js";
 import {
   streamAgentChatTurn
-} from "./chunk-RABMW33C.js";
+} from "./chunk-GHNRJ3TK.js";
 import {
   getCurrentSpaceId
 } from "./chunk-ZJ7UHBJS.js";
@@ -85,7 +85,7 @@ import {
 } from "./chunk-56GBUMO5.js";
 import {
   normalizeChatCompletionsBodyForProvider
-} from "./chunk-ISIFZP3N.js";
+} from "./chunk-U3YGSKXD.js";
 import {
   EMPTY_ASSISTANT_REPAIR_PROMPT
 } from "./chunk-T7HBI3WZ.js";