nolo-cli 0.172.0-alpha.2 → 0.173.0-alpha.1

package/chunk-FX33MFLW.js

@@ -0,0 +1,103 @@
+// packages/agent-runtime/toolImages.ts
+var EMPTY_TOOL_RESULT_TEXT = "[Tool completed without output]";
+var TOOL_HAD_IMAGES = "toolHadImages";
+function hadToolImages(message) {
+  return message.tool_result_metadata?.[TOOL_HAD_IMAGES] === true || toolImages(message).length > 0;
+}
+var TOOL_IMAGES = Symbol("runtime-only-tool-images");
+function toolImages(message) {
+  return message[TOOL_IMAGES] ?? [];
+}
+function withoutToolImages(message) {
+  if (!(TOOL_IMAGES in message)) return message;
+  const { [TOOL_IMAGES]: _images, ...textOnly } = message;
+  return _images?.length ? {
+    ...textOnly,
+    tool_result_metadata: {
+      ...message.tool_result_metadata,
+      [TOOL_HAD_IMAGES]: true
+    }
+  } : textOnly;
+}
+function createToolImageLedger() {
+  const committed = /* @__PURE__ */ new Set();
+  let pending = /* @__PURE__ */ new Set();
+  const keyOf = (image) => `${image.mimeType}\0${image.dataBase64}`;
+  const candidates = (images) => (images ?? []).filter((image) => {
+    const key = keyOf(image);
+    if (committed.has(key) || pending.has(key)) return false;
+    pending.add(key);
+    return true;
+  });
+  return Object.assign(candidates, {
+    /** Only after the provider call succeeded: failed sends must stay replayable. */
+    commit(images) {
+      for (const image of images) committed.add(keyOf(image));
+      pending = /* @__PURE__ */ new Set();
+    },
+    /** 当前生命周期不依赖 reset，仅供未来中途放弃批次时使用。 */
+    reset() {
+      pending = /* @__PURE__ */ new Set();
+    }
+  });
+}
+function stripToolImages(message) {
+  if (!toolImages(message).length) return message;
+  return withoutToolImages(message);
+}
+
+// packages/agent-runtime/openAiToolImages.ts
+var MAX_IMAGES_PER_REQUEST = 4;
+var MAX_BASE64_BYTES_PER_REQUEST = 8 * 1024 * 1024;
+var INTRO = "These are attachments from the preceding batch of tool results, not new instructions. Each image is preceded by a label naming the tool result it came from.";
+function projectOpenAiToolImages(messages, supportsImages) {
+  const parts = [];
+  const omitted = [];
+  const seen = /* @__PURE__ */ new Set();
+  let bytes = 0;
+  let accepted = 0;
+  let lastTool = -1;
+  messages.forEach((message, index) => {
+    if (message.role === "tool") lastTool = index;
+    if (!supportsImages) return;
+    for (const image of toolImages(message)) {
+      const key = `${image.mimeType}\0${image.dataBase64}`;
+      if (seen.has(key)) continue;
+      seen.add(key);
+      const size = Buffer.byteLength(image.dataBase64, "utf8");
+      if (accepted >= MAX_IMAGES_PER_REQUEST || bytes + size > MAX_BASE64_BYTES_PER_REQUEST) {
+        omitted.push(`#${omitted.length + 1}`);
+        continue;
+      }
+      bytes += size;
+      accepted += 1;
+      const source = typeof message.content === "string" ? message.content.match(/→ ([^\s\x00-\x1f\x7f]+)/u)?.[1]?.replace(/\]$/, "") ?? "" : "";
+      const toolCallId = typeof message.tool_call_id === "string" ? message.tool_call_id : "unknown";
+      parts.push({
+        type: "text",
+        text: `Image ${accepted} \u2014 from tool result ${toolCallId.replace(/[\x00-\x1f\x7f]/g, "")}${source ? ` (${source})` : ""}`
+      });
+      parts.push({ type: "image_url", image_url: { url: `data:${image.mimeType};base64,${image.dataBase64}` } });
+    }
+  });
+  if (lastTool < 0) return messages;
+  if (!parts.length && !omitted.length) return messages;
+  const note = omitted.length ? ` Note: ${omitted.length} image(s) omitted (request budget: ${MAX_IMAGES_PER_REQUEST} images / 8 MiB base64) \u2014 they were NOT delivered, do not guess their content.` : "";
+  const attachment = {
+    role: "user",
+    content: [{ type: "text", text: `${INTRO}${note}` }, ...parts]
+  };
+  return [...messages.slice(0, lastTool + 1), attachment, ...messages.slice(lastTool + 1)];
+}
+
+export {
+  EMPTY_TOOL_RESULT_TEXT,
+  TOOL_HAD_IMAGES,
+  hadToolImages,
+  TOOL_IMAGES,
+  toolImages,
+  withoutToolImages,
+  createToolImageLedger,
+  stripToolImages,
+  projectOpenAiToolImages
+};

package/{chunk-UA4VAUQL.js → chunk-GXFAZGZ6.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-VYNMQ6HW.js";
 import {
   fetchAndCacheTableRows
-} from "./chunk-MYZHJKLG.js";
+} from "./chunk-64MLOS7B.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-M7H7Z44Z.js");
+    const { findToolExecutor } = await import("./tools-K3IZ7U5G.js");
     const { executor } = findToolExecutor(run.toolName);
     toolRunStarted({
       id: run.id,

package/{chunk-5WOL7BUP.js → chunk-J33JIJK7.js}

@@ -1,10 +1,10 @@
 import {
   resolveAgentImageInputSupport
-} from "./chunk-I33CJERI.js";
+} from "./chunk-7QQOOHDG.js";
 import {
   TOOL_HAD_IMAGES,
   hadToolImages
-} from "./chunk-FZSVCJUU.js";
+} from "./chunk-FX33MFLW.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";

package/{chunk-WW5MNBTZ.js → chunk-JDWJ64VG.js}

@@ -3,10 +3,10 @@ import {
 } from "./chunk-HS7MLR74.js";
 import {
   performServerProxyFetchWithRetry
-} from "./chunk-TCWK2EQX.js";
+} from "./chunk-FJ76E5ZM.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-ORKQ3T5D.js";
+} from "./chunk-W7S5CUGI.js";
 import {
   buildSkillGuidancePromptBlock
 } from "./chunk-3LNVSFTH.js";
@@ -23,7 +23,7 @@ import {
   compileContextLayers,
   detectDispatchIntentFromMessages,
   resolveToolGuidedSections
-} from "./chunk-RATR6VCP.js";
+} from "./chunk-ZEOR6XPJ.js";
 import {
   convertMessagesToResponsesInput,
   getUsageRequestOptions,
@@ -32,11 +32,11 @@ import {
   resolveReasoningReplayOptions,
   shouldStripReasoningContentForOutbound,
   stablePromptCacheKey
-} from "./chunk-FZSVCJUU.js";
+} from "./chunk-BGQZLBMJ.js";
 import {
   resolveAgentCallPlan,
   resolveClientWire
-} from "./chunk-XBJIESNS.js";
+} from "./chunk-XAFCJN32.js";
 import {
   createFileCredentialBroker
 } from "./chunk-76YUTLOT.js";

package/{chunk-OQ3DOBYB.js → chunk-JOUFPRE4.js}

@@ -1,6 +1,9 @@
 import {
-  ANTIGRAVITY_CLOUD_CODE_BASE_URL
-} from "./chunk-TSCI6X6C.js";
+  asOptionalFiniteNumber
+} from "./chunk-WWC7I6TA.js";
+import {
+  trimTrailingSlash
+} from "./chunk-I2QHI2XM.js";
 import {
   commandCodeModels,
   kimiCodeModels,
@@ -12,6 +15,12 @@ import {
   stepfunModels,
   stepfunStepPlanModels
 } from "./chunk-GC64WGMD.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
+import {
+  asOptionalTrimmedString
+} from "./chunk-G3SUCT4W.js";
 import {
   PLATFORM_HOSTED_DEEPSEEK_FLASH_OFF_PEAK_PRICE,
   PLATFORM_HOSTED_DEEPSEEK_FLASH_PEAK_PRICE,
@@ -22,6 +31,157 @@ import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 
+// packages/agent-runtime/antigravityOAuth.ts
+var decodeBase64 = (s) => typeof Buffer !== "undefined" ? Buffer.from(s, "base64").toString("utf8") : typeof atob === "function" ? atob(s) : s;
+var ANTIGRAVITY_CLIENT_ID = decodeBase64(
+  "MTA3MTAwNjA2MDU5MS10bWhzc2luMmgyMWxjcmUyMzV2dG9sb2poNGc0MDNlcC5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbQ=="
+);
+var ANTIGRAVITY_CLIENT_SECRET = decodeBase64(
+  "R09DU1BYLUs1OEZXUjQ4NkxkTEoxbUxCOHNYQzR6NnFEQWY="
+);
+var ANTIGRAVITY_AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
+var ANTIGRAVITY_TOKEN_URL = "https://oauth2.googleapis.com/token";
+var ANTIGRAVITY_USERINFO_URL = "https://www.googleapis.com/oauth2/v1/userinfo?alt=json";
+var ANTIGRAVITY_CALLBACK_PORT = 51121;
+var ANTIGRAVITY_CALLBACK_PATH = "/oauth-callback";
+var ANTIGRAVITY_CALLBACK_URL = `http://127.0.0.1:${ANTIGRAVITY_CALLBACK_PORT}${ANTIGRAVITY_CALLBACK_PATH}`;
+var ANTIGRAVITY_SCOPES = [
+  "https://www.googleapis.com/auth/cloud-platform",
+  "https://www.googleapis.com/auth/userinfo.email",
+  "https://www.googleapis.com/auth/userinfo.profile",
+  "https://www.googleapis.com/auth/cclog",
+  "https://www.googleapis.com/auth/experimentsandconfigs"
+];
+var ANTIGRAVITY_ACCESS_TOKEN_CLIENT_SKEW_MS = 5 * 60 * 1e3;
+var ANTIGRAVITY_TOKEN_REQUEST_TIMEOUT_MS = 3e4;
+var ANTIGRAVITY_CLOUD_CODE_BASE_URL = "https://daily-cloudcode-pa.googleapis.com";
+var ANTIGRAVITY_CLOUD_CODE_HOST = "cloudcode-pa.googleapis.com";
+var ANTIGRAVITY_CLOUD_CODE_HOSTS = [
+  ANTIGRAVITY_CLOUD_CODE_HOST,
+  "daily-cloudcode-pa.googleapis.com"
+];
+function isAntigravityCloudCodeHostname(rawHost) {
+  const hostname = asTrimmedLowercaseString(rawHost ?? "").replace(/\.+$/, "");
+  if (!hostname) return false;
+  return ANTIGRAVITY_CLOUD_CODE_HOSTS.includes(hostname);
+}
+function isAntigravityCloudCodeBaseUrl(raw) {
+  const value = typeof raw === "string" ? raw.trim() : "";
+  if (!value) return false;
+  try {
+    return isAntigravityCloudCodeHostname(new URL(value).hostname);
+  } catch {
+    return false;
+  }
+}
+var ANTIGRAVITY_LEGACY_GENERIC_BASE_RE = /^https?:\/\/cloudcode-pa\.googleapis\.com$/i;
+function getAntigravityUserAgent() {
+  const version = process.env.NOLO_ANTIGRAVITY_VERSION || "2.23.1";
+  const os = process.platform === "win32" ? "windows" : process.platform;
+  const arch = process.arch === "x64" ? "amd64" : process.arch === "ia32" ? "386" : process.arch;
+  return `antigravity/hub/${version} ${os}/${arch}`;
+}
+function resolveAntigravityCloudCodeBaseUrl(customProviderUrl) {
+  const raw = (customProviderUrl ?? "").trim();
+  if (!raw) return ANTIGRAVITY_CLOUD_CODE_BASE_URL;
+  const trimmed = trimTrailingSlash(raw);
+  if (isAntigravityCloudCodeBaseUrl(trimmed)) {
+    const base = trimmed.replace(/\/v1internal:.*$/i, "").replace(/\/$/, "");
+    if (ANTIGRAVITY_LEGACY_GENERIC_BASE_RE.test(base)) {
+      return ANTIGRAVITY_CLOUD_CODE_BASE_URL;
+    }
+    return base;
+  }
+  return ANTIGRAVITY_CLOUD_CODE_BASE_URL;
+}
+function isAntigravityOAuthAgent(agentConfig) {
+  if (!agentConfig) return false;
+  const apiKeyRef = asTrimmedLowercaseString(agentConfig.apiKeyRef);
+  const provider = asTrimmedLowercaseString(agentConfig.provider);
+  const url = asTrimmedLowercaseString(agentConfig.customProviderUrl);
+  return apiKeyRef === "antigravity" || provider === "google-antigravity" || // 只看解析后的 hostname（同 resolver）：后缀 host / userinfo / path 里的官方串
+  // 都不构成 antigravity 身份。
+  isAntigravityCloudCodeBaseUrl(url);
+}
+function readAntigravityProjectId(metadata) {
+  return asOptionalTrimmedString(metadata?.projectId);
+}
+function normalizeAntigravityTokenPayload(args) {
+  const {
+    payload,
+    baseCredential,
+    now = Date.now(),
+    clientSkewMs = ANTIGRAVITY_ACCESS_TOKEN_CLIENT_SKEW_MS
+  } = args;
+  if (typeof payload.access_token !== "string" || !payload.access_token.trim()) {
+    throw new Error("Antigravity token response missing access_token");
+  }
+  const accessToken = payload.access_token.trim();
+  const expiresIn = asOptionalFiniteNumber(payload.expires_in);
+  const expiresAt = expiresIn !== void 0 ? now + expiresIn * 1e3 - clientSkewMs : baseCredential?.expiresAt;
+  const refreshToken = typeof payload.refresh_token === "string" && payload.refresh_token.trim() ? payload.refresh_token.trim() : baseCredential?.refreshToken;
+  const scope = typeof payload.scope === "string" && payload.scope.trim() ? payload.scope.trim() : baseCredential?.scope;
+  return {
+    ...baseCredential ?? {},
+    provider: baseCredential?.provider ?? "antigravity",
+    accessToken,
+    ...refreshToken ? { refreshToken } : {},
+    ...expiresAt !== void 0 ? { expiresAt } : {},
+    ...scope ? { scope } : {},
+    obtainedAt: now
+  };
+}
+async function refreshAntigravityToken(credential, deps = {}) {
+  if (!credential.refreshToken || !credential.refreshToken.trim()) {
+    throw new Error("Antigravity credential has no refresh_token");
+  }
+  const fetchImpl = deps.fetchImpl ?? fetch;
+  let response;
+  try {
+    response = await fetchImpl(ANTIGRAVITY_TOKEN_URL, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json"
+      },
+      body: new URLSearchParams({
+        client_id: ANTIGRAVITY_CLIENT_ID,
+        client_secret: ANTIGRAVITY_CLIENT_SECRET,
+        refresh_token: credential.refreshToken.trim(),
+        grant_type: "refresh_token"
+      }),
+      signal: AbortSignal.timeout(ANTIGRAVITY_TOKEN_REQUEST_TIMEOUT_MS)
+    });
+  } catch (error) {
+    throw new Error(
+      `Antigravity token refresh failed: ${toErrorMessage(error)}`
+    );
+  }
+  let rawBodyText = "";
+  let payload;
+  try {
+    rawBodyText = await response.text();
+    payload = rawBodyText ? JSON.parse(rawBodyText) : {};
+  } catch {
+    payload = {};
+  }
+  if (!response.ok) {
+    const errorCode = typeof payload.error === "string" && payload.error.trim() ? payload.error.trim() : void 0;
+    const errorDescription = typeof payload.error_description === "string" && payload.error_description.trim() ? payload.error_description.trim() : void 0;
+    const detail = (errorCode && errorDescription && errorDescription !== errorCode ? `${errorCode}: ${errorDescription}` : errorCode ?? errorDescription ?? rawBodyText.trim()) || `HTTP ${response.status}`;
+    throw new Error(`Antigravity token refresh failed: ${detail}`);
+  }
+  if (typeof payload.access_token !== "string" || !payload.access_token.trim()) {
+    throw new Error("Antigravity token refresh response missing access_token");
+  }
+  const now = deps.now?.() ?? Date.now();
+  return normalizeAntigravityTokenPayload({
+    payload,
+    baseCredential: credential,
+    now
+  });
+}
+
 // packages/integrations/deepseek/models.ts
 var deepseekModels = [
   // ── 旗舰 ──
@@ -723,6 +883,22 @@ function isSubscriptionOAuthCredential(apiKeyRef) {
 }
 
 export {
+  ANTIGRAVITY_CLIENT_ID,
+  ANTIGRAVITY_CLIENT_SECRET,
+  ANTIGRAVITY_AUTH_URL,
+  ANTIGRAVITY_TOKEN_URL,
+  ANTIGRAVITY_USERINFO_URL,
+  ANTIGRAVITY_CALLBACK_PORT,
+  ANTIGRAVITY_CALLBACK_PATH,
+  ANTIGRAVITY_SCOPES,
+  ANTIGRAVITY_CLOUD_CODE_BASE_URL,
+  isAntigravityCloudCodeBaseUrl,
+  getAntigravityUserAgent,
+  resolveAntigravityCloudCodeBaseUrl,
+  isAntigravityOAuthAgent,
+  readAntigravityProjectId,
+  normalizeAntigravityTokenPayload,
+  refreshAntigravityToken,
   SUBSCRIPTION_OAUTH_PROVIDERS,
   CUSTOM_API_KEY_TEMPLATES,
   ALL_PROVIDER_REGISTRY,

package/{chunk-6BDTSKUT.js → chunk-KBGWPSY6.js}

@@ -1,19 +1,19 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-74PQM3XI.js";
+} from "./chunk-3TAVX6CD.js";
 import {
   t
 } from "./chunk-TDX2L4W2.js";
 import {
   clipMultilineText
-} from "./chunk-UA4VAUQL.js";
+} from "./chunk-GXFAZGZ6.js";
 import {
   runLocalAgentTurn
-} from "./chunk-2EC6FNS4.js";
+} from "./chunk-BYNWE72R.js";
 import {
   applyToolSurfaceConstraints
-} from "./chunk-6J227QXV.js";
+} from "./chunk-2GRXE3YJ.js";
 import {
   resolveLocalRuntimeEnvFromPolicy
 } from "./chunk-LIQJTQRN.js";

package/{chunk-BE42X662.js → chunk-KPSNHLFI.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-UEILX4EV.js";
 import {
   compareAgentSelection
-} from "./chunk-6J227QXV.js";
+} from "./chunk-2GRXE3YJ.js";
 import {
   DEFAULT_PROVIDER_RETRY_MS,
   isAgentUnavailableNow,
@@ -11,7 +11,7 @@ import {
 } from "./chunk-JLR5NWP2.js";
 import {
   isOAuthApiKeyRef
-} from "./chunk-BKCR2JHG.js";
+} from "./chunk-UKZX3NHN.js";
 import {
   isOwnedAgentKey,
   ownedAgentKey,
@@ -21,12 +21,10 @@ import {
   getModelAbility
 } from "./chunk-HLAL63BZ.js";
 import {
+  isAntigravityOAuthAgent,
   isSubscriptionEndpoint,
   isSubscriptionOAuthCredential
-} from "./chunk-OQ3DOBYB.js";
-import {
-  isAntigravityOAuthAgent
-} from "./chunk-TSCI6X6C.js";
+} from "./chunk-JOUFPRE4.js";
 
 // packages/ai/agent/agentBilling.ts
 function resolveBillingSource(candidate) {

package/{chunk-O4H4HD4X.js → chunk-N2N63HTQ.js}

@@ -333,7 +333,7 @@ async function saveDocState(arg, { dispatch, getState }) {
     ).unwrap();
     if (dbSpaceId) {
       try {
-        const { updateContentTitle } = await import("./contentThunks-SM5FP7FM.js");
+        const { updateContentTitle } = await import("./contentThunks-I4HNLTQY.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-KUQVLZMZ.js");
+  const { createPageAction } = await import("./createPageAction-S7MGYSMU.js");
   return createPageAction(args, thunkApi);
 }
 function subscribe(listener) {

package/{chunk-R2RDXNEE.js → chunk-O2LB346J.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-HNUWUO75.js";
 import {
   resolveAgentImageInputSupport
-} from "./chunk-I33CJERI.js";
+} from "./chunk-7QQOOHDG.js";
 import {
   accumulateToolCallDelta,
   createThinkParserState,
@@ -30,11 +30,11 @@ import {
   stablePromptCacheKey,
   toOpenAiCompatibleMessages,
   toResponsesTools
-} from "./chunk-FZSVCJUU.js";
+} from "./chunk-BGQZLBMJ.js";
 import {
   isMeaningfulChatCompletionOutput,
   isMeaningfulResponsesOutput
-} from "./chunk-BKCR2JHG.js";
+} from "./chunk-7ZGMQZ5D.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";

package/{chunk-XWX5ZGWR.js → chunk-O3OJRN5Z.js}

@@ -1,11 +1,17 @@
 import {
   streamSseDataValues
 } from "./chunk-HNUWUO75.js";
+import {
+  resolveAgentImageInputSupport
+} from "./chunk-7QQOOHDG.js";
+import {
+  projectOpenAiToolImages
+} from "./chunk-FX33MFLW.js";
 import {
   getAntigravityUserAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-TSCI6X6C.js";
+} from "./chunk-JOUFPRE4.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -145,20 +151,60 @@ function parseDataUrlToInlineData(url) {
   if (!match) return null;
   return { mimeType: match[1], data: match[2] };
 }
-function extractInlineDataParts(content) {
-  if (!Array.isArray(content)) return [];
-  const parts = [];
-  for (const part of content) {
-    if (!part || typeof part !== "object") continue;
-    if (part.type !== "image_url") continue;
-    const url = part.image_url?.url;
-    if (typeof url !== "string" || !url.trim()) continue;
-    const inline = parseDataUrlToInlineData(url);
-    if (inline) parts.push({ inlineData: inline });
+function filterOrphanedToolMessages(messages) {
+  if (!Array.isArray(messages)) return [];
+  const result = [];
+  let pendingFunctionCalls = [];
+  let toolCallIndex = 0;
+  for (const raw of messages) {
+    if (!raw || typeof raw !== "object" || !("role" in raw)) continue;
+    const role = String(raw.role);
+    if (role === "system") {
+      result.push(raw);
+      continue;
+    }
+    if (role === "user") {
+      pendingFunctionCalls = [];
+      result.push(raw);
+      continue;
+    }
+    if (role === "assistant" || role === "model") {
+      pendingFunctionCalls = [];
+      const calls = "tool_calls" in raw && Array.isArray(raw.tool_calls) ? raw.tool_calls : [];
+      for (const call of calls) {
+        if (!call || typeof call !== "object") continue;
+        const name = call.function?.name || `tool_${++toolCallIndex}`;
+        const id = typeof call.id === "string" ? call.id : "";
+        pendingFunctionCalls.push({ name, id });
+      }
+      result.push(raw);
+      continue;
+    }
+    if (role === "tool") {
+      const toolCallId = "tool_call_id" in raw && typeof raw.tool_call_id === "string" ? raw.tool_call_id : "";
+      const rawName = "name" in raw && typeof raw.name === "string" ? raw.name.trim() : "";
+      const pendingIndex = pendingFunctionCalls.findIndex(
+        (p) => toolCallId ? p.id === toolCallId : rawName ? p.name === rawName : true
+      );
+      if (pendingIndex === -1) {
+        continue;
+      }
+      pendingFunctionCalls.splice(pendingIndex, 1);
+      result.push(raw);
+      continue;
+    }
+    result.push(raw);
   }
-  return parts;
+  return result;
 }
 function convertOpenAiMessagesToGemini(messages, options) {
+  const sanitizedMessages = filterOrphanedToolMessages(
+    messages ?? []
+  );
+  const effectiveMessages = projectOpenAiToolImages(
+    sanitizedMessages,
+    options.supportsToolImages === true
+  );
   const contents = [];
   const systemTexts = [];
   let toolCallIndex = 0;
@@ -186,7 +232,7 @@ function convertOpenAiMessagesToGemini(messages, options) {
     pendingFunctionCalls = [];
     pushOrMergeContent("user", dummyResponses);
   };
-  for (const raw of messages) {
+  for (const raw of effectiveMessages) {
     if (!raw || typeof raw !== "object" || !("role" in raw)) continue;
     const role = String(raw.role);
     const content = "content" in raw ? raw.content : null;
@@ -199,16 +245,25 @@ function convertOpenAiMessagesToGemini(messages, options) {
     }
     if (role === "user") {
       flushPendingFunctionCalls();
-      const text = messageText(
-        content
-      );
-      const imageParts = extractInlineDataParts(
-        content
-      );
-      if (!text && imageParts.length === 0) continue;
       const parts = [];
-      if (text) parts.push({ text });
-      for (const img of imageParts) parts.push(img);
+      if (typeof content === "string") {
+        const text = content.trim();
+        if (text) parts.push({ text });
+      } else if (Array.isArray(content)) {
+        for (const part of content) {
+          if (!part || typeof part !== "object") continue;
+          if (part.type === "text" && typeof part.text === "string" && part.text.trim()) {
+            parts.push({ text: part.text });
+          } else if (part.type === "image_url") {
+            const url = part.image_url?.url;
+            if (typeof url === "string" && url.trim()) {
+              const inline = parseDataUrlToInlineData(url);
+              if (inline) parts.push({ inlineData: inline });
+            }
+          }
+        }
+      }
+      if (parts.length === 0) continue;
       pushOrMergeContent("user", parts);
       continue;
     }
@@ -585,9 +640,13 @@ 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 { contents, systemTexts } = convertOpenAiMessagesToGemini(
     args.messages,
-    { attachSkipThoughtSignature: args.attachSkipThoughtSignature }
+    {
+      attachSkipThoughtSignature: args.attachSkipThoughtSignature,
+      supportsToolImages
+    }
   );
   const request = { contents };
   if (systemTexts.length > 0) {
@@ -628,8 +687,14 @@ function buildCloudCodeAssistPayload(args) {
   const rawMessages = Array.isArray(args.openAiBody.messages) ? args.openAiBody.messages : [];
   const quirks = resolveGeminiModelQuirks(model);
   const isClaude = quirks.isClaudeCrossModel;
+  const supportsToolImages = resolveAgentImageInputSupport({
+    ...args.agentConfig,
+    model,
+    hasVision: args.agentConfig.hasVision ?? false
+  });
   const { contents, systemTexts } = convertOpenAiMessagesToGemini(rawMessages, {
-    attachSkipThoughtSignature: quirks.allowsThoughtSignatureSentinel
+    attachSkipThoughtSignature: quirks.allowsThoughtSignatureSentinel,
+    supportsToolImages
   });
   if (contents.length === 0) {
     throw new Error("Antigravity Cloud Code Assist request has no user/model contents.");

package/{chunk-OPNHKULV.js → chunk-P34IX26T.js}

@@ -3,7 +3,7 @@ import {
   classifyAgentApiKeyRef,
   formatUnsupportedAgentApiKeyRefMessage,
   shouldReadAgentKeyRemotely
-} from "./chunk-PJVGNB4L.js";
+} from "./chunk-RPZNVBA5.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-NBTY7YJF.js";
@@ -556,7 +556,7 @@ async function buildCreatedAgentRecord(args) {
   const resolvedAgentInput = resolveCliAgentKeyInput(args.parsed.agentInput);
   const agentKey = resolvedAgentInput.startsWith("agent-") ? resolvedAgentInput : createAgentKey.private(userId || "local", resolvedAgentInput);
   if (args.parsed.presetId) {
-    const { resolveProviderPresetFields } = await import("./providerPresetApply-5K4PBX4J.js");
+    const { resolveProviderPresetFields } = await import("./providerPresetApply-MBMGCNKZ.js");
     const fields = resolveProviderPresetFields(args.parsed.presetId);
     if (fields.kind === "manual") {
       throw new Error(

package/{chunk-ISMHFI2Y.js → chunk-QWNMFO5E.js}

@@ -1,13 +1,13 @@
 import {
   listUserRecordsFromServers,
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-SUBKVXFM.js";
+} from "./chunk-RUKAOMXD.js";
 import {
   agentRecordHasConfiguredCredential
-} from "./chunk-OPNHKULV.js";
+} from "./chunk-P34IX26T.js";
 import {
   deriveCredentialGroup
-} from "./chunk-BE42X662.js";
+} from "./chunk-KPSNHLFI.js";
 import {
   isTombstoneRecord
 } from "./chunk-D2MDMY2M.js";