nolo-cli 0.30.0-alpha.2 → 0.30.0-alpha.4

package/{appGetCommands-UOCWYJPV.js → appGetCommands-T6YXMZKL.js}

@@ -5,47 +5,47 @@ import {
   pickDefined,
   printCliError,
   resolveCliContext
-} from "./chunk-3RIWR23B.js";
+} from "./chunk-4VJZODXQ.js";
 import {
   hasFlag,
   hasHelpArg
-} from "./chunk-SZ5CBYMZ.js";
-import "./chunk-56IUA7RU.js";
-import "./chunk-66O5MZYH.js";
+} from "./chunk-Y4C6CIWP.js";
+import "./chunk-CYSB5B6O.js";
+import "./chunk-QMGLMEEF.js";
 import "./chunk-K6QEHQZ3.js";
-import "./chunk-UKC5HU2C.js";
+import "./chunk-GR4ULAGB.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-MEUZFIAJ.js";
+import "./chunk-XORE26Z4.js";
 import "./chunk-OIQPORYI.js";
 import "./chunk-T27IEBNQ.js";
-import "./chunk-KW47OSRJ.js";
+import "./chunk-2NKRHXDO.js";
 import "./chunk-N7J63Q6C.js";
 import "./chunk-PJY5AH5A.js";
-import "./chunk-7CD24PU4.js";
+import "./chunk-OWO7RJJP.js";
 import "./chunk-D34RI6NI.js";
-import "./chunk-XD5NQEOH.js";
+import "./chunk-WTPC3XD4.js";
 import "./chunk-4PWB7JRR.js";
 import "./chunk-2MBTWINN.js";
-import "./chunk-OYK7PA5U.js";
-import "./chunk-FS5TTXPS.js";
+import "./chunk-BNM4PN7V.js";
+import "./chunk-H5UXA6OF.js";
 import "./chunk-SWYMCHM7.js";
 import "./chunk-44HACRCK.js";
 import "./chunk-DCDL3GC4.js";
-import "./chunk-YWGSCF37.js";
-import "./chunk-THTAR67C.js";
+import "./chunk-PACNSC37.js";
+import "./chunk-NCPP67IY.js";
 import "./chunk-OB6FBSH3.js";
-import "./chunk-IZ3CBMD5.js";
-import "./chunk-GAGUBI42.js";
+import "./chunk-BPB4MFE5.js";
+import "./chunk-N3F3I7CF.js";
 import "./chunk-JZPBVBIY.js";
 import "./chunk-5RGU3J7P.js";
 import "./chunk-M76ECQRD.js";
 import "./chunk-HNMXYYJR.js";
 import "./chunk-DWLEOOGR.js";
 import "./chunk-3ASDTTEI.js";
-import "./chunk-YLADSPDU.js";
+import "./chunk-LZSOKNT7.js";
 import "./chunk-WTGCTVJG.js";
 import "./chunk-CWMSB67P.js";
-import "./chunk-VSTUQGLT.js";
+import "./chunk-EIQDGAAE.js";
 import "./chunk-ZHXJ6M7T.js";
 import "./chunk-CAENRKNJ.js";
 import "./chunk-VF4K2QE6.js";
@@ -54,14 +54,14 @@ import {
   readOption
 } from "./chunk-A7GB5UGH.js";
 import "./chunk-OLZBQWZU.js";
-import "./chunk-446VANPP.js";
+import "./chunk-B2F42PFJ.js";
 import "./chunk-KX6YBIHG.js";
-import "./chunk-A4JDTA5T.js";
-import "./chunk-BOL2D2JW.js";
+import "./chunk-AKF3R6YT.js";
+import "./chunk-H42QD4SH.js";
 import "./chunk-QSJ3HFEF.js";
-import "./chunk-DWQNDGO7.js";
+import "./chunk-MBZE75JH.js";
 import "./chunk-TOW4E763.js";
-import "./chunk-ZFTCLBEX.js";
+import "./chunk-REBLMWZW.js";
 import "./chunk-R5V5G73M.js";
 import "./chunk-LCBAMY2M.js";
 import "./chunk-4SN6J65J.js";

package/{appListCommands-EOKWTXPW.js → appListCommands-TRN2EUCV.js}

@@ -5,47 +5,47 @@ import {
   pickDefined,
   printCliError,
   resolveCliContext
-} from "./chunk-3RIWR23B.js";
+} from "./chunk-4VJZODXQ.js";
 import {
   hasFlag,
   hasHelpArg
-} from "./chunk-SZ5CBYMZ.js";
-import "./chunk-56IUA7RU.js";
-import "./chunk-66O5MZYH.js";
+} from "./chunk-Y4C6CIWP.js";
+import "./chunk-CYSB5B6O.js";
+import "./chunk-QMGLMEEF.js";
 import "./chunk-K6QEHQZ3.js";
-import "./chunk-UKC5HU2C.js";
+import "./chunk-GR4ULAGB.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-MEUZFIAJ.js";
+import "./chunk-XORE26Z4.js";
 import "./chunk-OIQPORYI.js";
 import "./chunk-T27IEBNQ.js";
-import "./chunk-KW47OSRJ.js";
+import "./chunk-2NKRHXDO.js";
 import "./chunk-N7J63Q6C.js";
 import "./chunk-PJY5AH5A.js";
-import "./chunk-7CD24PU4.js";
+import "./chunk-OWO7RJJP.js";
 import "./chunk-D34RI6NI.js";
-import "./chunk-XD5NQEOH.js";
+import "./chunk-WTPC3XD4.js";
 import "./chunk-4PWB7JRR.js";
 import "./chunk-2MBTWINN.js";
-import "./chunk-OYK7PA5U.js";
-import "./chunk-FS5TTXPS.js";
+import "./chunk-BNM4PN7V.js";
+import "./chunk-H5UXA6OF.js";
 import "./chunk-SWYMCHM7.js";
 import "./chunk-44HACRCK.js";
 import "./chunk-DCDL3GC4.js";
-import "./chunk-YWGSCF37.js";
-import "./chunk-THTAR67C.js";
+import "./chunk-PACNSC37.js";
+import "./chunk-NCPP67IY.js";
 import "./chunk-OB6FBSH3.js";
-import "./chunk-IZ3CBMD5.js";
-import "./chunk-GAGUBI42.js";
+import "./chunk-BPB4MFE5.js";
+import "./chunk-N3F3I7CF.js";
 import "./chunk-JZPBVBIY.js";
 import "./chunk-5RGU3J7P.js";
 import "./chunk-M76ECQRD.js";
 import "./chunk-HNMXYYJR.js";
 import "./chunk-DWLEOOGR.js";
 import "./chunk-3ASDTTEI.js";
-import "./chunk-YLADSPDU.js";
+import "./chunk-LZSOKNT7.js";
 import "./chunk-WTGCTVJG.js";
 import "./chunk-CWMSB67P.js";
-import "./chunk-VSTUQGLT.js";
+import "./chunk-EIQDGAAE.js";
 import "./chunk-ZHXJ6M7T.js";
 import "./chunk-CAENRKNJ.js";
 import "./chunk-VF4K2QE6.js";
@@ -54,14 +54,14 @@ import {
   readOption
 } from "./chunk-A7GB5UGH.js";
 import "./chunk-OLZBQWZU.js";
-import "./chunk-446VANPP.js";
+import "./chunk-B2F42PFJ.js";
 import "./chunk-KX6YBIHG.js";
-import "./chunk-A4JDTA5T.js";
-import "./chunk-BOL2D2JW.js";
+import "./chunk-AKF3R6YT.js";
+import "./chunk-H42QD4SH.js";
 import "./chunk-QSJ3HFEF.js";
-import "./chunk-DWQNDGO7.js";
+import "./chunk-MBZE75JH.js";
 import "./chunk-TOW4E763.js";
-import "./chunk-ZFTCLBEX.js";
+import "./chunk-REBLMWZW.js";
 import "./chunk-R5V5G73M.js";
 import "./chunk-LCBAMY2M.js";
 import "./chunk-4SN6J65J.js";

package/{authCommand-H5KE7K7K.js → authCommand-RR5LAYSW.js}

@@ -6,7 +6,7 @@ import {
   parseFlagWithOptionalValue,
   runCloudflareOAuthLogin,
   upsertEnvVariable
-} from "./chunk-CV6I4HBA.js";
+} from "./chunk-LWP3HB56.js";
 import "./chunk-6HYVJV7B.js";
 import {
   ANTHROPIC_OAUTH_AUTHORIZE_URL,
@@ -46,19 +46,19 @@ import {
   startCallbackServer,
   validateXAIEndpoint,
   xaiOAuthDiscovery
-} from "./chunk-T3Y5EMJS.js";
+} from "./chunk-WJD5RNVB.js";
 import "./chunk-WJRJDX2W.js";
 import "./chunk-LM6IYQ3F.js";
 import "./chunk-JBTJAPUF.js";
-import "./chunk-TJYWZ3LO.js";
-import "./chunk-XD5NQEOH.js";
+import "./chunk-2NYIVLAY.js";
+import "./chunk-WTPC3XD4.js";
 import {
   createOAuthTokenStore
 } from "./chunk-JZPBVBIY.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import "./chunk-VSTUQGLT.js";
+import "./chunk-EIQDGAAE.js";
 import "./chunk-ZHXJ6M7T.js";
 import "./chunk-CAENRKNJ.js";
 import {

package/{chunk-Q24P6TUS.js → chunk-2FNQS3NE.js}

@@ -7,7 +7,7 @@ import {
 import {
   patch,
   selectById
-} from "./chunk-A4JDTA5T.js";
+} from "./chunk-AKF3R6YT.js";
 import {
   __toESM
 } from "./chunk-4VNS5WPM.js";

package/{chunk-KW47OSRJ.js → chunk-2NKRHXDO.js}

@@ -9,15 +9,15 @@ import {
   buildRuntimeGuidanceBlocks,
   fetchReferenceContents,
   resolveToolGuidedSections
-} from "./chunk-7CD24PU4.js";
+} from "./chunk-OWO7RJJP.js";
 import {
   getAllToolRuns,
   resolveAgentRecommendedSkillNames,
   resolveAgentRequiredPackIds
-} from "./chunk-OYK7PA5U.js";
+} from "./chunk-BNM4PN7V.js";
 import {
   getDocState
-} from "./chunk-FS5TTXPS.js";
+} from "./chunk-H5UXA6OF.js";
 import {
   resolveToolBaseUrl
 } from "./chunk-44HACRCK.js";
@@ -26,7 +26,7 @@ import {
   getModelPricing,
   getPrices,
   hasExplicitAgentPricing
-} from "./chunk-YWGSCF37.js";
+} from "./chunk-PACNSC37.js";
 import {
   PERSONALIZATION_DIALOG_CATEGORY,
   buildPersonalizationDialogPolicyContext,
@@ -38,11 +38,10 @@ import {
   resolveBuiltinPlatformAgentConfig,
   selectAllMsgs,
   selectCurrentTable,
-  selectCurrentUserBalance,
   selectTableRows,
   selectViewMode,
   serializeMessageContent
-} from "./chunk-THTAR67C.js";
+} from "./chunk-NCPP67IY.js";
 import {
   clipCompactText
 } from "./chunk-OB6FBSH3.js";
@@ -56,7 +55,7 @@ import {
   findModelConfig,
   getModelConfig,
   getProviderByModelName
-} from "./chunk-VSTUQGLT.js";
+} from "./chunk-EIQDGAAE.js";
 import {
   PLATFORM_HOSTED_QWEN_37_FLASH_MODEL
 } from "./chunk-CAENRKNJ.js";
@@ -68,26 +67,27 @@ import {
   selectKnowledgeCaptureLevel,
   selectSpaceContextLevel,
   selectUserTonePreset
-} from "./chunk-446VANPP.js";
+} from "./chunk-B2F42PFJ.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
 import {
   read,
   selectById
-} from "./chunk-A4JDTA5T.js";
+} from "./chunk-AKF3R6YT.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
   PUBLIC_QWEN_37_FLASH_AGENT_KEY
-} from "./chunk-DWQNDGO7.js";
+} from "./chunk-MBZE75JH.js";
 import {
   extractCustomId
 } from "./chunk-TOW4E763.js";
 import {
+  selectIdentityUserBalance,
   selectIdentityUserId
-} from "./chunk-ZFTCLBEX.js";
+} from "./chunk-REBLMWZW.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
@@ -858,11 +858,6 @@ var buildEditingContextSummary = (state, runtimeOptions) => {
 };
 
 // packages/ai/llm/agentCapabilities.ts
-var isCustomAgent = (agent) => {
-  const apiSource = agent.apiSource?.toLowerCase();
-  const provider = agent.provider?.toLowerCase();
-  return apiSource === "custom" || provider === "custom";
-};
 var ANTIGRAVITY_EFFORT_SUFFIXES = [
   "-tiered",
   "-extra-low",
@@ -893,21 +888,21 @@ var lookupKnownModelVision = (provider, model) => {
   const strippedPreview = stripPreviewSuffix(model);
   if (strippedPreview !== model) candidates.push(strippedPreview);
   for (const candidate of candidates) {
-    if (provider) {
+    if (provider && provider !== "custom") {
       const direct = findModelConfig(provider, candidate);
-      if (direct) return direct.hasVision;
+      if (direct && typeof direct.hasVision === "boolean") return direct.hasVision;
     }
     const detected = getProviderByModelName(candidate);
     if (detected) {
       const found = findModelConfig(detected, candidate)?.hasVision;
       if (found !== void 0) return found;
     }
-    if (!provider && candidate.includes("/")) {
+    if (candidate.includes("/")) {
       const slash = candidate.indexOf("/");
       const modelProvider = candidate.slice(0, slash).toLowerCase();
       const modelName = candidate.slice(slash + 1);
       const nested = findModelConfig(modelProvider, modelName);
-      if (nested) return nested.hasVision;
+      if (nested && typeof nested.hasVision === "boolean") return nested.hasVision;
     }
   }
   return void 0;
@@ -916,18 +911,13 @@ var resolveAgentImageInputSupport = (agent) => {
   if (!agent) return true;
   const provider = asTrimmedLowercaseString(agent.provider) || null;
   const model = asOptionalTrimmedString(agent.model) ?? "";
-  const custom = isCustomAgent(agent);
   const catalogHasVision = lookupKnownModelVision(
-    custom ? null : provider,
+    provider,
     model
   );
-  if (!custom && catalogHasVision !== void 0) {
+  if (catalogHasVision !== void 0) {
     return catalogHasVision;
   }
-  if (custom) {
-    if (catalogHasVision === true) return true;
-    return true;
-  }
   if (typeof agent.hasVision === "boolean") {
     return agent.hasVision;
   }
@@ -1219,7 +1209,7 @@ ${content}
   return output;
 };
 var validateAccessAndBalance = (agentConfig, state) => {
-  const userBalance = selectCurrentUserBalance(state);
+  const userBalance = selectIdentityUserBalance(state);
   const currentUserId = selectIdentityUserId(state);
   const isCustomApi = agentConfig.apiSource === "custom";
   const isCliApi = agentConfig.apiSource === "cli";
@@ -2887,13 +2877,35 @@ async function runLocalAgentTurn(input) {
     input: input.input,
     contextReferenceResolver: input.adapter.host === "cli" ? input.contextReferenceResolver : void 0
   });
-  const messages = builtMessages.messages;
+  let messages = builtMessages.messages;
   const supportsImages = resolveAgentImageInputSupport({
     apiSource: agentConfig.apiSource,
     provider: agentConfig.provider,
     model: agentConfig.model,
     hasVision: agentConfig.hasVision
   });
+  if (!supportsImages && hasImageInRuntimeMessages(messages)) {
+    const imageUrls = extractImageUrlsFromMessages(messages);
+    const preprocessed = await preprocessImagesForTextOnlyAgent(
+      messages,
+      (urls) => describeImageWithLocalProvider(input.adapter, urls)
+    );
+    if (preprocessed !== messages) {
+      messages = preprocessed;
+      emitLoopEvent(input, {
+        kind: "image-preprocessed",
+        atMs: Date.now(),
+        imageCount: imageUrls.length
+      });
+    } else {
+      messages = filterImagePartsFromMessages(messages, false);
+      emitLoopEvent(input, {
+        kind: "image-downgraded",
+        reason: "no-vision",
+        atMs: Date.now()
+      });
+    }
+  }
   const userInputText = extractUserInputText(input.input);
   let toolCallCount = 0;
   let result;
@@ -2904,7 +2916,6 @@ async function runLocalAgentTurn(input) {
   let round = 0;
   let emptyAssistantRepairPending = false;
   let emptyAssistantRepairUsed = false;
-  let imageDowngradeNotified = false;
   let skipFinalAppend = false;
   let partialContent = "";
   try {
@@ -2913,43 +2924,10 @@ async function runLocalAgentTurn(input) {
       partialContent = "";
       throwIfAborted(input);
       const preparedMessages = prepareMessagesForProviderCall(messages);
-      let baseRequestMessages;
-      if (!supportsImages && hasImageInRuntimeMessages(preparedMessages.messages)) {
-        const imageUrls = extractImageUrlsFromMessages(preparedMessages.messages);
-        const preprocessed = await preprocessImagesForTextOnlyAgent(
-          preparedMessages.messages,
-          (urls) => describeImageWithLocalProvider(input.adapter, urls)
-        );
-        if (preprocessed !== preparedMessages.messages) {
-          baseRequestMessages = preprocessed;
-          if (!imageDowngradeNotified) {
-            imageDowngradeNotified = true;
-            emitLoopEvent(input, {
-              kind: "image-preprocessed",
-              atMs: Date.now(),
-              imageCount: imageUrls.length
-            });
-          }
-        } else {
-          baseRequestMessages = filterImagePartsFromMessages(
-            preparedMessages.messages,
-            supportsImages
-          );
-          if (!imageDowngradeNotified) {
-            imageDowngradeNotified = true;
-            emitLoopEvent(input, {
-              kind: "image-downgraded",
-              reason: "no-vision",
-              atMs: Date.now()
-            });
-          }
-        }
-      } else {
-        baseRequestMessages = filterImagePartsFromMessages(
-          preparedMessages.messages,
-          supportsImages
-        );
-      }
+      const baseRequestMessages = filterImagePartsFromMessages(
+        preparedMessages.messages,
+        supportsImages
+      );
       const requestMessages = emptyAssistantRepairPending ? [...baseRequestMessages, { role: "user", content: EMPTY_ASSISTANT_REPAIR_PROMPT }] : baseRequestMessages;
       const contextMetrics = {
         ...preparedMessages.metrics,

package/{chunk-TJYWZ3LO.js → chunk-2NYIVLAY.js}

@@ -1,6 +1,6 @@
 import {
   trimTrailingSlash
-} from "./chunk-XD5NQEOH.js";
+} from "./chunk-WTPC3XD4.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";

package/{chunk-2XM5KUNE.js → chunk-3MUUQJXW.js}

@@ -1,9 +1,9 @@
 import {
   resolveReferenceAssets
-} from "./chunk-DCWBP2O7.js";
+} from "./chunk-W53SDRNA.js";
 import {
   fetchReferenceContents
-} from "./chunk-7CD24PU4.js";
+} from "./chunk-OWO7RJJP.js";
 
 // packages/ai/agent/fetchAgentContexts.ts
 async function fetchAgentContexts(references, dispatch) {

package/{chunk-MMCVBEAD.js → chunk-3NHLRJTZ.js}

@@ -4,7 +4,7 @@ import {
   refreshAntigravityOAuthToken,
   refreshOpenAiCodexToken,
   xaiRefresh
-} from "./chunk-T3Y5EMJS.js";
+} from "./chunk-WJD5RNVB.js";
 import {
   ackRunRecord,
   checkStaleRun,
@@ -26,7 +26,7 @@ import {
 } from "./chunk-WJRJDX2W.js";
 import {
   buildLocalAgentLookupKeys
-} from "./chunk-66O5MZYH.js";
+} from "./chunk-QMGLMEEF.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -53,7 +53,7 @@ import {
   readOpenAiCompatibleSseCompletion,
   resolveAgentNextAvailableAt,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-UKC5HU2C.js";
+} from "./chunk-GR4ULAGB.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
@@ -63,7 +63,7 @@ import {
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-MEUZFIAJ.js";
+} from "./chunk-XORE26Z4.js";
 import {
   buildCliPrompt
 } from "./chunk-ATNTHIZI.js";
@@ -73,25 +73,25 @@ import {
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-W2YKDXT7.js";
+} from "./chunk-FVKMFU3A.js";
 import {
   inferCaptureIntent,
   resolveHistoricalToolContentCap,
   summarizeToolArguments
-} from "./chunk-KW47OSRJ.js";
+} from "./chunk-2NKRHXDO.js";
 import {
   getAntigravityUserAgent,
   isAntigravityOAuthAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-TJYWZ3LO.js";
+} from "./chunk-2NYIVLAY.js";
 import {
   convertMessagesToResponsesInput,
   toResponsesTools
 } from "./chunk-D34RI6NI.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-XD5NQEOH.js";
+} from "./chunk-WTPC3XD4.js";
 import {
   buildDialogFallbackTitleFromUserInput,
   normalizeDialogTitle
@@ -103,7 +103,7 @@ import {
   readXhsProfileFunctionSchema,
   rememberMemoryFunctionSchema,
   setTodoListFunc
-} from "./chunk-SWOTB2TX.js";
+} from "./chunk-INRBVD6S.js";
 import {
   createDrainExhaustedResponse,
   isCoreDrainingBody,
@@ -127,13 +127,13 @@ import {
   parseNoloWorkspaceToolArguments,
   resolveAgentRequiredPackIds,
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-OYK7PA5U.js";
+} from "./chunk-BNM4PN7V.js";
 import {
   applyTokenUsageToDayStats,
   prepareTokenUsageData,
   resolveBuiltinPlatformAgentConfig,
   runKeyed
-} from "./chunk-THTAR67C.js";
+} from "./chunk-NCPP67IY.js";
 import {
   BUILTIN_TITLE_LLM_CONFIG,
   clipCompactText
@@ -144,7 +144,7 @@ import {
   resolveCurrentRunRuntimeToolPolicy,
   resolveLocalWorkspaceExecutorOptionsFromPolicy,
   resolveRequestedRuntimeToolNames
-} from "./chunk-GAGUBI42.js";
+} from "./chunk-N3F3I7CF.js";
 import {
   createOAuthTokenStore,
   isTokenExpired,
@@ -162,7 +162,7 @@ import {
 } from "./chunk-DWLEOOGR.js";
 import {
   isAdaptiveThinkingModelId
-} from "./chunk-VSTUQGLT.js";
+} from "./chunk-EIQDGAAE.js";
 import {
   isCompiledBinary,
   parseUserIdFromAuthToken
@@ -175,7 +175,7 @@ import {
 } from "./chunk-QSJ3HFEF.js";
 import {
   isSystemBuiltinTrustedAgentKey
-} from "./chunk-DWQNDGO7.js";
+} from "./chunk-MBZE75JH.js";
 import {
   NOLO_CLUSTER_SERVERS
 } from "./chunk-LCBAMY2M.js";
@@ -3091,7 +3091,7 @@ function extractInlineDataParts(content) {
 function convertOpenAiMessagesToGemini(messages, options) {
   const contents = [];
   const systemTexts = [];
-  const toolNamesById = /* @__PURE__ */ new Map();
+  let toolCallIndex = 0;
   let pendingFunctionCalls = [];
   const pushOrMergeContent = (role, parts) => {
     if (parts.length === 0) return;
@@ -3105,8 +3105,12 @@ function convertOpenAiMessagesToGemini(messages, options) {
   const flushPendingFunctionCalls = () => {
     if (pendingFunctionCalls.length === 0) return;
     const dummyResponses = pendingFunctionCalls.map(
-      ({ name }) => ({
-        functionResponse: { name, response: { output: "{}" } }
+      ({ name, id }) => ({
+        functionResponse: {
+          name,
+          response: { output: "{}" },
+          ...id ? { id } : {}
+        }
       })
     );
     pendingFunctionCalls = [];
@@ -3144,16 +3148,14 @@ function convertOpenAiMessagesToGemini(messages, options) {
         content
       );
       const toolCalls = "tool_calls" in raw && Array.isArray(raw.tool_calls) ? raw.tool_calls ?? [] : [];
-      if (text) pushOrMergeContent("model", [{ text }]);
-      if (toolCalls.length > 0 && contents.length > 0 && contents[contents.length - 1]?.role !== "user") {
-        contents.push({ role: "user", parts: [{ text: "" }] });
-      }
       const parts = [];
+      if (text) {
+        parts.push({ text });
+      }
       for (const call of toolCalls) {
         const name = call?.function?.name?.trim();
         if (!name) continue;
-        const id = call.id?.trim() || `${name}_${toolNamesById.size}`;
-        toolNamesById.set(id, name);
+        const id = call.id?.trim() || `${name}_${toolCallIndex++}`;
         pendingFunctionCalls.push({ name, id });
         const realSignature = typeof call.thought_signature === "string" && call.thought_signature ? call.thought_signature : void 0;
         const isFirstFunctionCallPart = !parts.some(

package/{chunk-3RIWR23B.js → chunk-4VJZODXQ.js}

@@ -1,6 +1,6 @@
 import {
   requireTokenUser
-} from "./chunk-SZ5CBYMZ.js";
+} from "./chunk-Y4C6CIWP.js";
 import {
   resolveServerUrl
 } from "./chunk-A7GB5UGH.js";

package/{chunk-GVKTKT3O.js → chunk-5GDLMDLY.js}

@@ -1,13 +1,13 @@
 import {
   listUserRecordsFromServers,
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-HLG6GAUD.js";
+} from "./chunk-FXCLTQEO.js";
 import {
   agentRecordHasConfiguredCredential
-} from "./chunk-56IUA7RU.js";
+} from "./chunk-CYSB5B6O.js";
 import {
   toSafeAgentSummary
-} from "./chunk-UTQZ73QQ.js";
+} from "./chunk-VNQ4HVEE.js";
 import {
   PUBLIC_AGENT_KEY_PREFIX,
   isOwnedAgentKey,

package/{chunk-DKRT67FG.js → chunk-7NE6SSNO.js}

@@ -1,13 +1,13 @@
 import {
   selectCurrentServer,
   selectRemoteServers
-} from "./chunk-446VANPP.js";
+} from "./chunk-B2F42PFJ.js";
 import {
   noloDeleteRequest,
   noloWriteRequest,
   selectIdentityUser,
   selectIdentityUserId
-} from "./chunk-ZFTCLBEX.js";
+} from "./chunk-REBLMWZW.js";
 import {
   normalizeTimeFields
 } from "./chunk-R5V5G73M.js";