@google/gemini-cli-a2a-server 0.47.0-nightly.20260609.g0567b25a2 → 0.47.0

package/dist/a2a-server.mjs

@@ -130526,7 +130526,7 @@ function supportsMultimodalFunctionResponse(model, config3) {
   }
   return model.startsWith("gemini-3-");
 }
-var PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_3_1_MODEL, PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL, PREVIEW_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_3_5_FLASH_MODEL, SECONDARY_GEMINI_3_5_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_FLASH_LITE_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL_AUTO, GEMINI_MODEL_ALIAS_AUTO, GEMINI_MODEL_ALIAS_PRO, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_FLASH_LITE, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_THINKING_MODE;
+var PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_3_1_MODEL, PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL, PREVIEW_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_3_5_FLASH_MODEL, SECONDARY_GEMINI_3_5_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_FLASH_LITE_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL_AUTO, GEMINI_MODEL_ALIAS_AUTO, GEMINI_MODEL_ALIAS_PRO, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_FLASH_LITE, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_THINKING_MODE, CCPA_AI_MODEL_MAPPINGS;
 var init_models = __esm({
   "packages/core/dist/src/config/models.js"() {
     "use strict";
@@ -130550,6 +130550,9 @@ var init_models = __esm({
     GEMINI_MODEL_ALIAS_FLASH_LITE = "flash-lite";
     DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
     DEFAULT_THINKING_MODE = 8192;
+    CCPA_AI_MODEL_MAPPINGS = {
+      [DEFAULT_GEMINI_3_5_FLASH_MODEL]: SECONDARY_GEMINI_3_5_FLASH_MODEL
+    };
   }
 });
 
@@ -211657,8 +211660,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "0567b25a2";
-    CLI_VERSION = "0.47.0-nightly.20260609.g0567b25a2";
+    GIT_COMMIT_INFO = "74c6d8e02";
+    CLI_VERSION = "0.47.0";
   }
 });
 
@@ -282475,6 +282478,203 @@ var init_sessionOperations = __esm({
   }
 });
 
+// packages/core/dist/src/utils/partUtils.js
+function partToString(value, options) {
+  if (!value) {
+    return "";
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map((part2) => partToString(part2, options)).join("");
+  }
+  const part = value;
+  if (options?.verbose) {
+    if (part.videoMetadata !== void 0) {
+      return `[Video Metadata]`;
+    }
+    if (part.thought !== void 0) {
+      return `[Thought: ${part.thought}]`;
+    }
+    if (part.codeExecutionResult !== void 0) {
+      return `[Code Execution Result]`;
+    }
+    if (part.executableCode !== void 0) {
+      return `[Executable Code]`;
+    }
+    if (part.fileData !== void 0) {
+      return `[File Data]`;
+    }
+    if (part.functionCall !== void 0) {
+      return `[Function Call: ${part.functionCall.name}]`;
+    }
+    if (part.functionResponse !== void 0) {
+      return `[Function Response: ${part.functionResponse.name}]`;
+    }
+    if (part.inlineData !== void 0) {
+      const mimeType = part.inlineData.mimeType ?? "unknown";
+      const data = part.inlineData.data ?? "";
+      const bytes = Math.ceil(data.length * 3 / 4);
+      const kb = (bytes / 1024).toFixed(1);
+      const category = mimeType.startsWith("audio/") ? "Audio" : mimeType.startsWith("video/") ? "Video" : mimeType.startsWith("image/") ? "Image" : "Media";
+      return `[${category}: ${mimeType}, ${kb} KB]`;
+    }
+  }
+  return part.text ?? "";
+}
+function updatePart(part, updates) {
+  return { ...part, ...updates };
+}
+function cloneFunctionResponse(resp) {
+  return { ...resp };
+}
+function cloneFunctionCall(call) {
+  return { ...call };
+}
+function getResponseText(response) {
+  if (response.candidates && response.candidates.length > 0) {
+    const candidate = response.candidates[0];
+    if (candidate.content && candidate.content.parts && candidate.content.parts.length > 0) {
+      return candidate.content.parts.filter((part) => part.text && !part.thought).map((part) => part.text).join("");
+    }
+  }
+  return null;
+}
+var init_partUtils = __esm({
+  "packages/core/dist/src/utils/partUtils.js"() {
+    "use strict";
+  }
+});
+
+// packages/core/dist/src/core/geminiRequest.js
+function partListUnionToString(value) {
+  return partToString(value, { verbose: true });
+}
+var init_geminiRequest = __esm({
+  "packages/core/dist/src/core/geminiRequest.js"() {
+    "use strict";
+    init_node();
+    init_partUtils();
+  }
+});
+
+// packages/core/dist/src/core/agentChatHistory.js
+var AgentChatHistory;
+var init_agentChatHistory = __esm({
+  "packages/core/dist/src/core/agentChatHistory.js"() {
+    "use strict";
+    AgentChatHistory = class {
+      history = [];
+      constructor(initialTurns = []) {
+        this.history = [...initialTurns];
+      }
+      /**
+       * Adds a new turn to the history.
+       * Every turn must have a durable ID, usually provided by the ChatRecordingService.
+       */
+      push(turn) {
+        this.history.push(turn);
+      }
+      /**
+       * Overwrites the entire history with a new list of turns.
+       */
+      set(turns) {
+        this.history = [...turns];
+      }
+      clear() {
+        this.history = [];
+      }
+      get() {
+        return this.history;
+      }
+      /**
+       * Returns a copy of the raw Gemini Content[] for API consumption.
+       */
+      getContents() {
+        return this.history.map((h3) => h3.content);
+      }
+      map(callback) {
+        return this.history.map(callback);
+      }
+      flatMap(callback) {
+        return this.history.flatMap(callback);
+      }
+      get length() {
+        return this.history.length;
+      }
+    };
+  }
+});
+
+// packages/core/dist/src/utils/cryptoUtils.js
+import { createHash as createHash8 } from "node:crypto";
+function deriveStableId(sourceIds) {
+  const sortedIds = [...sourceIds].sort();
+  return createHash8("sha256").update(sortedIds.join("|")).digest("hex").slice(0, 32);
+}
+var init_cryptoUtils = __esm({
+  "packages/core/dist/src/utils/cryptoUtils.js"() {
+    "use strict";
+  }
+});
+
+// packages/core/dist/src/utils/sessionUtils.js
+function ensureStableToolIds(history) {
+  for (let i4 = 0; i4 < history.length; i4++) {
+    const turn = history[i4];
+    const parts2 = turn.content.parts || [];
+    for (let partIdx = 0; partIdx < parts2.length; partIdx++) {
+      const part = parts2[partIdx];
+      if (part.functionCall && !part.functionCall.id) {
+        const name3 = part.functionCall.name;
+        const nextTurn = history[i4 + 1];
+        let pairedId;
+        if (nextTurn?.content.role === "user") {
+          const matchingResp = nextTurn.content.parts?.find((p3) => p3.functionResponse && p3.functionResponse.name === name3 && !p3.functionResponse.id);
+          if (matchingResp) {
+            pairedId = `synth_${name3}_${deriveStableId([turn.id, i4.toString(), partIdx.toString()])}`;
+            part.functionCall.id = pairedId;
+            matchingResp.functionResponse.id = pairedId;
+          }
+        }
+        if (!part.functionCall.id) {
+          part.functionCall.id = `synth_${name3}_${deriveStableId([turn.id, i4.toString(), partIdx.toString()])}`;
+        }
+      }
+      if (part.functionResponse && !part.functionResponse.id) {
+        const name3 = part.functionResponse.name;
+        const prevTurn = history[i4 - 1];
+        if (prevTurn?.content.role === "model") {
+          const matchingCall = prevTurn.content.parts?.find((p3) => p3.functionCall && p3.functionCall.name === name3 && !p3.functionCall.id);
+          if (matchingCall) {
+            const pairedId = `synth_${name3}_${deriveStableId([prevTurn.id, (i4 - 1).toString(), partIdx.toString()])}`;
+            matchingCall.functionCall.id = pairedId;
+            part.functionResponse.id = pairedId;
+          }
+        }
+        if (!part.functionResponse.id) {
+          part.functionResponse.id = `synth_orph_${name3}_${deriveStableId([turn.id, i4.toString(), partIdx.toString()])}`;
+        }
+      }
+    }
+  }
+}
+function isIgnoredUserContent(trimmedContent) {
+  return trimmedContent.length === 0 || trimmedContent.startsWith("/") || trimmedContent.startsWith("?") || trimmedContent.startsWith("<session_context>") || trimmedContent.startsWith("<hook_context>");
+}
+var init_sessionUtils = __esm({
+  "packages/core/dist/src/utils/sessionUtils.js"() {
+    "use strict";
+    init_node();
+    init_chatRecordingService();
+    init_geminiRequest();
+    init_geminiRequest();
+    init_agentChatHistory();
+    init_cryptoUtils();
+  }
+});
+
 // packages/core/dist/src/services/chatRecordingService.js
 import path28 from "node:path";
 import * as fs34 from "node:fs";
@@ -282504,6 +282704,19 @@ function isPartialMetadataRecord(record2) {
 function isTextPart(part) {
   return isStringProperty(part, "text");
 }
+function isResumableMessageRecord(message) {
+  const contentString = message.content ? partListUnionToString(message.content) : "";
+  if (message.type === "user") {
+    return !isIgnoredUserContent(contentString.trim());
+  }
+  if (message.type === "gemini") {
+    return contentString.trim().length > 0 || (message.toolCalls?.length ?? 0) > 0 || (message.thoughts?.length ?? 0) > 0;
+  }
+  return false;
+}
+function hasResumableConversationContent(messages) {
+  return messages.some((message) => isResumableMessageRecord(message));
+}
 async function loadConversationRecord(filePath, options) {
   if (!fs34.existsSync(filePath)) {
     return null;
@@ -282565,12 +282778,12 @@ async function loadConversationRecord(filePath, options) {
           }
           const id = record2.id;
           const isUser = hasProperty(record2, "type") && record2.type === "user";
-          const isUserOrAssistant = hasProperty(record2, "type") && (record2.type === "user" || record2.type === "gemini");
+          const isResumable = isResumableMessageRecord(record2);
           if (options?.metadataOnly) {
             messageIds.push(id);
-            messageKinds.set(id, { isUser, isUserOrAssistant });
+            messageKinds.set(id, { isUser, isResumable });
           }
-          if (!firstUserMessageStr && isUser && hasProperty(record2, "content") && record2["content"]) {
+          if (!firstUserMessageStr && isUser && hasProperty(record2, "content") && record2["content"] && isResumable) {
             const rawContent = record2["content"];
             if (Array.isArray(rawContent)) {
               firstUserMessageStr = rawContent.map((p3) => isTextPart(p3) ? p3["text"] : "").join("");
@@ -282601,14 +282814,17 @@ async function loadConversationRecord(filePath, options) {
               if (isMessageRecord(msg)) {
                 const id = msg.id;
                 const isUser = msg.type === "user";
-                const isUserOrAssistant = msg.type === "user" || msg.type === "gemini";
+                const isResumable = isResumableMessageRecord(msg);
                 if (options?.metadataOnly) {
                   messageIds.push(id);
-                  messageKinds.set(id, { isUser, isUserOrAssistant });
+                  messageKinds.set(id, {
+                    isUser,
+                    isResumable
+                  });
                 } else {
                   messagesMap.set(id, msg);
                 }
-                if (!firstUserMessageStr && isUser && msg.content && (Array.isArray(msg.content) || typeof msg.content === "string")) {
+                if (!firstUserMessageStr && isUser && isResumable && msg.content && (Array.isArray(msg.content) || typeof msg.content === "string")) {
                   if (Array.isArray(msg.content)) {
                     firstUserMessageStr = msg.content.map((p3) => isTextPart(p3) ? p3.text : "").join("");
                   } else {
@@ -282629,14 +282845,17 @@ async function loadConversationRecord(filePath, options) {
               if (isMessageRecord(msg)) {
                 const id = msg.id;
                 const isUser = msg.type === "user";
-                const isUserOrAssistant = msg.type === "user" || msg.type === "gemini";
+                const isResumable = isResumableMessageRecord(msg);
                 if (options?.metadataOnly) {
                   messageIds.push(id);
-                  messageKinds.set(id, { isUser, isUserOrAssistant });
+                  messageKinds.set(id, {
+                    isUser,
+                    isResumable
+                  });
                 } else {
                   messagesMap.set(id, msg);
                 }
-                if (!firstUserMessageStr && isUser && msg.content && (Array.isArray(msg.content) || typeof msg.content === "string")) {
+                if (!firstUserMessageStr && isUser && isResumable && msg.content && (Array.isArray(msg.content) || typeof msg.content === "string")) {
                   if (Array.isArray(msg.content)) {
                     firstUserMessageStr = msg.content.map((p3) => isTextPart(p3) ? p3.text : "").join("");
                   } else {
@@ -282654,7 +282873,7 @@ async function loadConversationRecord(filePath, options) {
       return await parseLegacyRecordFallback(filePath, options);
     }
     const loadedMessages = Array.from(messagesMap.values());
-    const metadataFirstUserMessage = loadedMessages.find((message) => message.type === "user") ?? null;
+    const metadataFirstUserMessage = loadedMessages.find((message) => message.type === "user" && isResumableMessageRecord(message)) ?? null;
     let fallbackFirstUserMessage = firstUserMessageStr;
     if (!fallbackFirstUserMessage && metadataFirstUserMessage) {
       const rawContent = metadataFirstUserMessage.content;
@@ -282665,7 +282884,7 @@ async function loadConversationRecord(filePath, options) {
       }
     }
     const userMessageCount = options?.metadataOnly ? Array.from(messageKinds.values()).filter((m3) => m3.isUser).length : loadedMessages.filter((m3) => m3.type === "user").length;
-    const hasUserOrAssistant = options?.metadataOnly ? Array.from(messageKinds.values()).some((m3) => m3.isUserOrAssistant) : loadedMessages.some((m3) => m3.type === "user" || m3.type === "gemini");
+    const hasResumableContent = options?.metadataOnly ? Array.from(messageKinds.values()).some((m3) => m3.isResumable) : hasResumableConversationContent(loadedMessages);
     return {
       sessionId: metadata2.sessionId,
       projectHash: metadata2.projectHash,
@@ -282680,7 +282899,7 @@ async function loadConversationRecord(filePath, options) {
       userMessageCount,
       memoryScratchpadIsStale: isTrackingMemoryScratchpadFreshness ? memoryScratchpadIsStale : void 0,
       firstUserMessage: fallbackFirstUserMessage,
-      hasUserOrAssistantMessage: hasUserOrAssistant
+      hasResumableContent
     };
   } catch (error2) {
     debugLogger.error("Error loading conversation record from JSONL:", error2);
@@ -282696,7 +282915,7 @@ async function parseLegacyRecordFallback(filePath, options) {
       const legacyRecord = parsed;
       if (options?.metadataOnly) {
         let fallbackFirstUserMessageStr;
-        const firstUserMessage = legacyRecord.messages?.find((m3) => m3.type === "user");
+        const firstUserMessage = legacyRecord.messages?.find((m3) => m3.type === "user" && isResumableMessageRecord(m3));
         if (firstUserMessage) {
           const rawContent = firstUserMessage.content;
           if (Array.isArray(rawContent)) {
@@ -282711,13 +282930,13 @@ async function parseLegacyRecordFallback(filePath, options) {
           messageCount: legacyRecord.messages?.length || 0,
           userMessageCount: legacyRecord.messages?.filter((m3) => m3.type === "user").length || 0,
           firstUserMessage: fallbackFirstUserMessageStr,
-          hasUserOrAssistantMessage: legacyRecord.messages?.some((m3) => m3.type === "user" || m3.type === "gemini") || false
+          hasResumableContent: legacyRecord.messages?.some((m3) => isResumableMessageRecord(m3)) || false
         };
       }
       return {
         ...legacyRecord,
         userMessageCount: legacyRecord.messages?.filter((m3) => m3.type === "user").length || 0,
-        hasUserOrAssistantMessage: legacyRecord.messages?.some((m3) => m3.type === "user" || m3.type === "gemini") || false
+        hasResumableContent: legacyRecord.messages?.some((m3) => isResumableMessageRecord(m3)) || false
       };
     }
   } catch {
@@ -282734,6 +282953,8 @@ var init_chatRecordingService = __esm({
     init_errors2();
     init_sessionOperations();
     init_debugLogger();
+    init_geminiRequest();
+    init_sessionUtils();
     init_chatRecordingTypes();
     init_chatRecordingTypes();
     ENOSPC_WARNING_MESSAGE = "Chat recording disabled: No space left on device. The conversation will continue but will not be saved to disk. Free up disk space and restart to enable recording.";
@@ -283062,6 +283283,20 @@ var init_chatRecordingService = __esm({
           throw error2;
         }
       }
+      /**
+       * Deletes the current session only if it has no resumable conversation
+       * content. This removes abandoned startup-only sessions while preserving any
+       * session with a real user prompt, model response, or tool activity.
+       */
+      async deleteCurrentSessionIfNotResumableAsync() {
+        if (!this.conversationFile || !this.cachedConversation) {
+          return;
+        }
+        if (hasResumableConversationContent(this.cachedConversation.messages)) {
+          return;
+        }
+        await this.deleteCurrentSessionAsync();
+      }
       /**
        * Rewinds the conversation to the state just before the specified message ID.
        * All messages from (and including) the specified ID onwards are removed.
@@ -285521,75 +285756,6 @@ var init_converter = __esm({
   }
 });
 
-// packages/core/dist/src/utils/partUtils.js
-function partToString(value, options) {
-  if (!value) {
-    return "";
-  }
-  if (typeof value === "string") {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((part2) => partToString(part2, options)).join("");
-  }
-  const part = value;
-  if (options?.verbose) {
-    if (part.videoMetadata !== void 0) {
-      return `[Video Metadata]`;
-    }
-    if (part.thought !== void 0) {
-      return `[Thought: ${part.thought}]`;
-    }
-    if (part.codeExecutionResult !== void 0) {
-      return `[Code Execution Result]`;
-    }
-    if (part.executableCode !== void 0) {
-      return `[Executable Code]`;
-    }
-    if (part.fileData !== void 0) {
-      return `[File Data]`;
-    }
-    if (part.functionCall !== void 0) {
-      return `[Function Call: ${part.functionCall.name}]`;
-    }
-    if (part.functionResponse !== void 0) {
-      return `[Function Response: ${part.functionResponse.name}]`;
-    }
-    if (part.inlineData !== void 0) {
-      const mimeType = part.inlineData.mimeType ?? "unknown";
-      const data = part.inlineData.data ?? "";
-      const bytes = Math.ceil(data.length * 3 / 4);
-      const kb = (bytes / 1024).toFixed(1);
-      const category = mimeType.startsWith("audio/") ? "Audio" : mimeType.startsWith("video/") ? "Video" : mimeType.startsWith("image/") ? "Image" : "Media";
-      return `[${category}: ${mimeType}, ${kb} KB]`;
-    }
-  }
-  return part.text ?? "";
-}
-function updatePart(part, updates) {
-  return { ...part, ...updates };
-}
-function cloneFunctionResponse(resp) {
-  return { ...resp };
-}
-function cloneFunctionCall(call) {
-  return { ...call };
-}
-function getResponseText(response) {
-  if (response.candidates && response.candidates.length > 0) {
-    const candidate = response.candidates[0];
-    if (candidate.content && candidate.content.parts && candidate.content.parts.length > 0) {
-      return candidate.content.parts.filter((part) => part.text && !part.thought).map((part) => part.text).join("");
-    }
-  }
-  return null;
-}
-var init_partUtils = __esm({
-  "packages/core/dist/src/utils/partUtils.js"() {
-    "use strict";
-  }
-});
-
 // packages/core/dist/src/utils/generateContentResponseUtilities.js
 function createFunctionResponsePart(callId, toolName, output) {
   return {
@@ -332683,7 +332849,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.47.0-nightly.20260609.g0567b25a2";
+    return "0.47.0";
   })();
   return versionPromise;
 }
@@ -334505,7 +334671,7 @@ var init_promptIdContext = __esm({
 });
 
 // packages/core/dist/src/utils/llm-edit-fixer.js
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 async function generateJsonWithTimeout(client, params, timeoutMs) {
   try {
     const timeoutSignal = AbortSignal.timeout(timeoutMs);
@@ -334526,7 +334692,7 @@ async function generateJsonWithTimeout(client, params, timeoutMs) {
 }
 async function FixLLMEditWithInstruction(instruction, old_string, new_string, error2, current_content, baseLlmClient, abortSignal) {
   const promptId = getPromptIdWithFallback("llm-fixer");
-  const cacheKey = createHash8("sha256").update(JSON.stringify([
+  const cacheKey = createHash9("sha256").update(JSON.stringify([
     current_content,
     old_string,
     new_string,
@@ -337439,6 +337605,61 @@ var init_loggingContentGenerator = __esm({
   }
 });
 
+// packages/core/dist/src/core/modelMappingContentGenerator.js
+var ModelMappingContentGenerator;
+var init_modelMappingContentGenerator = __esm({
+  "packages/core/dist/src/core/modelMappingContentGenerator.js"() {
+    "use strict";
+    init_node();
+    init_contentGenerator();
+    init_modelUtils();
+    ModelMappingContentGenerator = class {
+      wrapped;
+      mappings;
+      constructor(wrapped, mappings) {
+        this.wrapped = wrapped;
+        this.mappings = mappings;
+      }
+      getWrapped() {
+        return this.wrapped;
+      }
+      get userTier() {
+        return this.wrapped.userTier;
+      }
+      get userTierName() {
+        return this.wrapped.userTierName;
+      }
+      get paidTier() {
+        return this.wrapped.paidTier;
+      }
+      mapModel(req) {
+        if (req.model) {
+          const normalizedModel = normalizeModelId(req.model);
+          if (this.mappings[normalizedModel]) {
+            return {
+              ...req,
+              model: req.model.startsWith("models/") ? `models/${this.mappings[normalizedModel]}` : this.mappings[normalizedModel]
+            };
+          }
+        }
+        return req;
+      }
+      generateContent(request, userPromptId, role) {
+        return this.wrapped.generateContent(this.mapModel(request), userPromptId, role);
+      }
+      generateContentStream(request, userPromptId, role) {
+        return this.wrapped.generateContentStream(this.mapModel(request), userPromptId, role);
+      }
+      countTokens(request) {
+        return this.wrapped.countTokens(this.mapModel(request));
+      }
+      embedContent(request) {
+        return this.wrapped.embedContent(this.mapModel(request));
+      }
+    };
+  }
+});
+
 // packages/core/dist/src/code_assist/codeAssist.js
 async function createCodeAssistContentGenerator(httpOptions, authType, config3, sessionId) {
   if (authType === AuthType2.LOGIN_WITH_GOOGLE || authType === AuthType2.COMPUTE_ADC) {
@@ -337450,8 +337671,14 @@ async function createCodeAssistContentGenerator(httpOptions, authType, config3,
 }
 function getCodeAssistServer(config3) {
   let server = config3.getContentGenerator();
-  if (server instanceof LoggingContentGenerator) {
-    server = server.getWrapped();
+  while (true) {
+    if (server instanceof LoggingContentGenerator) {
+      server = server.getWrapped();
+    } else if (server instanceof ModelMappingContentGenerator) {
+      server = server.getWrapped();
+    } else {
+      break;
+    }
   }
   if (!(server instanceof CodeAssistServer)) {
     return void 0;
@@ -337466,6 +337693,7 @@ var init_codeAssist = __esm({
     init_setup();
     init_server();
     init_loggingContentGenerator();
+    init_modelMappingContentGenerator();
   }
 });
 
@@ -337807,7 +338035,7 @@ async function createContentGenerator(config3, gcConfig, sessionId) {
     }
     if (config3.authType === AuthType2.LOGIN_WITH_GOOGLE || config3.authType === AuthType2.COMPUTE_ADC) {
       const httpOptions = { headers: baseHeaders };
-      return new LoggingContentGenerator(await createCodeAssistContentGenerator(httpOptions, config3.authType, gcConfig, sessionId), gcConfig);
+      return new LoggingContentGenerator(new ModelMappingContentGenerator(await createCodeAssistContentGenerator(httpOptions, config3.authType, gcConfig, sessionId), CCPA_AI_MODEL_MAPPINGS), gcConfig);
     }
     if (config3.authType === AuthType2.USE_GEMINI || config3.authType === AuthType2.USE_VERTEX_AI || config3.authType === AuthType2.GATEWAY) {
       let headers = { ...baseHeaders };
@@ -337888,6 +338116,8 @@ var init_contentGenerator = __esm({
     init_surface();
     init_recordingContentGenerator();
     init_dist6();
+    init_modelMappingContentGenerator();
+    init_models();
     (function(AuthType3) {
       AuthType3["LOGIN_WITH_GOOGLE"] = "oauth-personal";
       AuthType3["USE_GEMINI"] = "gemini-api-key";
@@ -361428,54 +361658,6 @@ var init_agent_loop_context = __esm({
   }
 });
 
-// packages/core/dist/src/core/agentChatHistory.js
-var AgentChatHistory;
-var init_agentChatHistory = __esm({
-  "packages/core/dist/src/core/agentChatHistory.js"() {
-    "use strict";
-    AgentChatHistory = class {
-      history = [];
-      constructor(initialTurns = []) {
-        this.history = [...initialTurns];
-      }
-      /**
-       * Adds a new turn to the history.
-       * Every turn must have a durable ID, usually provided by the ChatRecordingService.
-       */
-      push(turn) {
-        this.history.push(turn);
-      }
-      /**
-       * Overwrites the entire history with a new list of turns.
-       */
-      set(turns) {
-        this.history = [...turns];
-      }
-      clear() {
-        this.history = [];
-      }
-      get() {
-        return this.history;
-      }
-      /**
-       * Returns a copy of the raw Gemini Content[] for API consumption.
-       */
-      getContents() {
-        return this.history.map((h3) => h3.content);
-      }
-      map(callback) {
-        return this.history.map(callback);
-      }
-      flatMap(callback) {
-        return this.history.flatMap(callback);
-      }
-      get length() {
-        return this.history.length;
-      }
-    };
-  }
-});
-
 // packages/core/dist/src/utils/messageInspectors.js
 function isFunctionResponse(content) {
   return content.role === "user" && !!content.parts && content.parts.every((part) => !!part.functionResponse);
@@ -361489,18 +361671,6 @@ var init_messageInspectors = __esm({
   }
 });
 
-// packages/core/dist/src/utils/cryptoUtils.js
-import { createHash as createHash10 } from "node:crypto";
-function deriveStableId(sourceIds) {
-  const sortedIds = [...sourceIds].sort();
-  return createHash10("sha256").update(sortedIds.join("|")).digest("hex").slice(0, 32);
-}
-var init_cryptoUtils = __esm({
-  "packages/core/dist/src/utils/cryptoUtils.js"() {
-    "use strict";
-  }
-});
-
 // packages/core/dist/src/utils/historyHardening.js
 function hardenHistory(history, options = {}) {
   if (history.length === 0)
@@ -361773,71 +361943,6 @@ var init_historyHardening = __esm({
   }
 });
 
-// packages/core/dist/src/core/geminiRequest.js
-function partListUnionToString(value) {
-  return partToString(value, { verbose: true });
-}
-var init_geminiRequest = __esm({
-  "packages/core/dist/src/core/geminiRequest.js"() {
-    "use strict";
-    init_node();
-    init_partUtils();
-  }
-});
-
-// packages/core/dist/src/utils/sessionUtils.js
-function ensureStableToolIds(history) {
-  for (let i4 = 0; i4 < history.length; i4++) {
-    const turn = history[i4];
-    const parts2 = turn.content.parts || [];
-    for (let partIdx = 0; partIdx < parts2.length; partIdx++) {
-      const part = parts2[partIdx];
-      if (part.functionCall && !part.functionCall.id) {
-        const name3 = part.functionCall.name;
-        const nextTurn = history[i4 + 1];
-        let pairedId;
-        if (nextTurn?.content.role === "user") {
-          const matchingResp = nextTurn.content.parts?.find((p3) => p3.functionResponse && p3.functionResponse.name === name3 && !p3.functionResponse.id);
-          if (matchingResp) {
-            pairedId = `synth_${name3}_${deriveStableId([turn.id, i4.toString(), partIdx.toString()])}`;
-            part.functionCall.id = pairedId;
-            matchingResp.functionResponse.id = pairedId;
-          }
-        }
-        if (!part.functionCall.id) {
-          part.functionCall.id = `synth_${name3}_${deriveStableId([turn.id, i4.toString(), partIdx.toString()])}`;
-        }
-      }
-      if (part.functionResponse && !part.functionResponse.id) {
-        const name3 = part.functionResponse.name;
-        const prevTurn = history[i4 - 1];
-        if (prevTurn?.content.role === "model") {
-          const matchingCall = prevTurn.content.parts?.find((p3) => p3.functionCall && p3.functionCall.name === name3 && !p3.functionCall.id);
-          if (matchingCall) {
-            const pairedId = `synth_${name3}_${deriveStableId([prevTurn.id, (i4 - 1).toString(), partIdx.toString()])}`;
-            matchingCall.functionCall.id = pairedId;
-            part.functionResponse.id = pairedId;
-          }
-        }
-        if (!part.functionResponse.id) {
-          part.functionResponse.id = `synth_orph_${name3}_${deriveStableId([turn.id, i4.toString(), partIdx.toString()])}`;
-        }
-      }
-    }
-  }
-}
-var init_sessionUtils = __esm({
-  "packages/core/dist/src/utils/sessionUtils.js"() {
-    "use strict";
-    init_node();
-    init_chatRecordingService();
-    init_geminiRequest();
-    init_geminiRequest();
-    init_agentChatHistory();
-    init_cryptoUtils();
-  }
-});
-
 // packages/core/dist/src/core/geminiChat.js
 import { randomUUID as randomUUID7 } from "node:crypto";
 function isIndexedPart(part) {
@@ -403246,6 +403351,7 @@ async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfi
   } catch (error2) {
     if (!isMcpMethodNotFoundError(error2)) {
       cliConfig.emitMcpDiagnostic("error", `Error discovering tools from ${mcpServerName}: ${getErrorMessage(error2)}`, error2, mcpServerName);
+      throw error2;
     }
     return [];
   }
@@ -411533,7 +411639,7 @@ ${sections.join("\n")}
           if (authType === AuthType2.USE_GEMINI) {
             setFlashModels("gemini-3-flash-preview", "gemini-3.5-flash");
           } else {
-            setFlashModels("gemini-3-flash", "gemini-3-flash");
+            setFlashModels("gemini-3.5-flash", "gemini-3.5-flash");
           }
         } else {
           setFlashModels("gemini-3-flash-preview", "gemini-2.5-flash");