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

package/bundle/{chunk-C6JF7KUM.js → chunk-JW7ZLS43.js}

@@ -276503,6 +276503,9 @@ function isActiveModel(model, useGemini3_1 = false, useCustomToolModel = false,
     return model !== PREVIEW_GEMINI_3_1_MODEL && model !== PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL;
   }
 }
+var CCPA_AI_MODEL_MAPPINGS = {
+  [DEFAULT_GEMINI_3_5_FLASH_MODEL]: SECONDARY_GEMINI_3_5_FLASH_MODEL
+};
 
 // packages/core/src/billing/billing.ts
 var G1_CREDIT_TYPE = "GOOGLE_ONE_AI";
@@ -279559,8 +279562,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "0567b25a2";
-var CLI_VERSION = "0.47.0-nightly.20260602.gcfcecebe8";
+var GIT_COMMIT_INFO = "74c6d8e02";
+var CLI_VERSION = "0.47.0";
 
 // packages/core/src/ide/detect-ide.ts
 var IDE_DEFINITIONS = {
@@ -281956,6 +281959,328 @@ async function deleteStoredSession(config2, sessionIdOrBasename) {
 // packages/core/src/services/chatRecordingService.ts
 import readline4 from "node:readline";
 import { randomUUID as randomUUID4 } from "node:crypto";
+
+// packages/core/src/utils/partUtils.ts
+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 clonePart(part) {
+  return { ...part };
+}
+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;
+}
+async function flatMapTextParts(parts2, transform2) {
+  const result2 = [];
+  const partArray = Array.isArray(parts2) ? parts2 : typeof parts2 === "string" ? [{ text: parts2 }] : [parts2];
+  for (const part of partArray) {
+    let textToProcess;
+    if (typeof part === "string") {
+      textToProcess = part;
+    } else if ("text" in part) {
+      textToProcess = part.text;
+    }
+    if (textToProcess !== void 0) {
+      const transformedParts = await transform2(textToProcess);
+      result2.push(...transformedParts);
+    } else {
+      result2.push(part);
+    }
+  }
+  return result2;
+}
+function appendToLastTextPart(prompt, textToAppend, separator = "\n\n") {
+  if (!textToAppend) {
+    return prompt;
+  }
+  if (prompt.length === 0) {
+    return [{ text: textToAppend }];
+  }
+  const newPrompt = [...prompt];
+  const lastPart = newPrompt.at(-1);
+  if (typeof lastPart === "string") {
+    newPrompt[newPrompt.length - 1] = `${lastPart}${separator}${textToAppend}`;
+  } else if (lastPart && "text" in lastPart) {
+    newPrompt[newPrompt.length - 1] = {
+      ...lastPart,
+      text: `${lastPart.text}${separator}${textToAppend}`
+    };
+  } else {
+    newPrompt.push({ text: `${separator}${textToAppend}` });
+  }
+  return newPrompt;
+}
+function isTextPart(part) {
+  return typeof part === "object" && part !== null && "text" in part && typeof part.text === "string";
+}
+
+// packages/core/src/core/geminiRequest.ts
+function partListUnionToString(value) {
+  return partToString(value, { verbose: true });
+}
+
+// packages/core/src/core/agentChatHistory.ts
+var 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/src/utils/cryptoUtils.ts
+import { createHash as createHash4 } from "node:crypto";
+function deriveStableId(sourceIds) {
+  const sortedIds = [...sourceIds].sort();
+  return createHash4("sha256").update(sortedIds.join("|")).digest("hex").slice(0, 32);
+}
+
+// packages/core/src/utils/sessionUtils.ts
+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(
+            (p2) => p2.functionResponse && p2.functionResponse.name === name3 && !p2.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(
+            (p2) => p2.functionCall && p2.functionCall.name === name3 && !p2.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 ensurePartArray(content) {
+  if (Array.isArray(content)) {
+    return content.map(
+      (part) => typeof part === "string" ? { text: part } : part
+    );
+  }
+  if (typeof content === "string") {
+    return [{ text: content }];
+  }
+  return [content];
+}
+function isIgnoredUserContent(trimmedContent) {
+  return trimmedContent.length === 0 || trimmedContent.startsWith("/") || trimmedContent.startsWith("?") || trimmedContent.startsWith("<session_context>") || trimmedContent.startsWith("<hook_context>");
+}
+function convertSessionToClientHistory(messages) {
+  const clientHistory = [];
+  for (const msg of messages) {
+    if (msg.type === "info" || msg.type === "error" || msg.type === "warning") {
+      continue;
+    }
+    if (msg.type === "user") {
+      const contentString = partListUnionToString(msg.content);
+      const trimmedContent = contentString.trim();
+      if (isIgnoredUserContent(trimmedContent)) {
+        continue;
+      }
+      clientHistory.push({
+        id: msg.id,
+        content: {
+          role: "user",
+          parts: ensurePartArray(msg.content)
+        }
+      });
+    } else if (msg.type === "gemini") {
+      const modelParts = [];
+      const contentParts = msg.content ? ensurePartArray(msg.content) : [];
+      const hasCallsInContent = contentParts.some((p2) => !!p2.functionCall);
+      const hasThoughtsInContent = contentParts.some((p2) => p2.thought);
+      if (hasCallsInContent || hasThoughtsInContent) {
+        modelParts.push(...contentParts);
+      } else {
+        if (msg.thoughts && msg.thoughts.length > 0) {
+          for (const thought of msg.thoughts) {
+            const thoughtText = thought.subject ? `**${thought.subject}** ${thought.description}` : thought.description;
+            modelParts.push({
+              text: thoughtText,
+              thought: true
+            });
+          }
+        }
+        modelParts.push(...contentParts);
+        if (msg.toolCalls && msg.toolCalls.length > 0) {
+          for (const toolCall of msg.toolCalls) {
+            modelParts.push({
+              functionCall: {
+                id: toolCall.id,
+                name: toolCall.name,
+                args: toolCall.args
+              }
+            });
+          }
+        }
+      }
+      if (modelParts.length > 0) {
+        clientHistory.push({
+          id: msg.id,
+          content: {
+            role: "model",
+            parts: modelParts
+          }
+        });
+        if (msg.toolCalls && msg.toolCalls.length > 0) {
+          const functionResponseParts = [];
+          for (const toolCall of msg.toolCalls) {
+            if (toolCall.result) {
+              let responseData;
+              if (typeof toolCall.result === "string") {
+                responseData = {
+                  functionResponse: {
+                    id: toolCall.id,
+                    name: toolCall.name,
+                    response: {
+                      output: toolCall.result
+                    }
+                  }
+                };
+              } else if (Array.isArray(toolCall.result)) {
+                functionResponseParts.push(...ensurePartArray(toolCall.result));
+                continue;
+              } else {
+                responseData = toolCall.result;
+              }
+              functionResponseParts.push(responseData);
+            }
+          }
+          if (functionResponseParts.length > 0) {
+            clientHistory.push({
+              id: `${msg.id}_response`,
+              content: {
+                role: "user",
+                parts: functionResponseParts
+              }
+            });
+          }
+        }
+      }
+    }
+  }
+  return clientHistory;
+}
+
+// packages/core/src/services/chatRecordingService.ts
 var 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.";
 function hasProperty(obj, prop) {
   return obj !== null && typeof obj === "object" && prop in obj;
@@ -281978,9 +282303,22 @@ function isMetadataUpdateRecord(record2) {
 function isPartialMetadataRecord(record2) {
   return isStringProperty(record2, "sessionId") && isStringProperty(record2, "projectHash");
 }
-function isTextPart(part) {
+function isTextPart2(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 (!fs30.existsSync(filePath)) {
     return null;
@@ -282039,15 +282377,15 @@ 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((p2) => isTextPart(p2) ? p2["text"] : "").join("");
+              firstUserMessageStr = rawContent.map((p2) => isTextPart2(p2) ? p2["text"] : "").join("");
             } else if (typeof rawContent === "string") {
               firstUserMessageStr = rawContent;
             }
@@ -282076,16 +282414,19 @@ 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((p2) => isTextPart(p2) ? p2.text : "").join("");
+                    firstUserMessageStr = msg.content.map((p2) => isTextPart2(p2) ? p2.text : "").join("");
                   } else {
                     firstUserMessageStr = msg.content;
                   }
@@ -282104,16 +282445,19 @@ 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((p2) => isTextPart(p2) ? p2.text : "").join("");
+                    firstUserMessageStr = msg.content.map((p2) => isTextPart2(p2) ? p2.text : "").join("");
                   } else {
                     firstUserMessageStr = msg.content;
                   }
@@ -282129,18 +282473,20 @@ 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;
       if (Array.isArray(rawContent)) {
-        fallbackFirstUserMessage = rawContent.map((part) => isTextPart(part) ? part["text"] : "").join("");
+        fallbackFirstUserMessage = rawContent.map((part) => isTextPart2(part) ? part["text"] : "").join("");
       } else if (typeof rawContent === "string") {
         fallbackFirstUserMessage = rawContent;
       }
     }
     const userMessageCount = options?.metadataOnly ? Array.from(messageKinds.values()).filter((m) => m.isUser).length : loadedMessages.filter((m) => m.type === "user").length;
-    const hasUserOrAssistant = options?.metadataOnly ? Array.from(messageKinds.values()).some((m) => m.isUserOrAssistant) : loadedMessages.some((m) => m.type === "user" || m.type === "gemini");
+    const hasResumableContent = options?.metadataOnly ? Array.from(messageKinds.values()).some((m) => m.isResumable) : hasResumableConversationContent(loadedMessages);
     return {
       sessionId: metadata2.sessionId,
       projectHash: metadata2.projectHash,
@@ -282155,7 +282501,7 @@ async function loadConversationRecord(filePath, options) {
       userMessageCount,
       memoryScratchpadIsStale: isTrackingMemoryScratchpadFreshness ? memoryScratchpadIsStale : void 0,
       firstUserMessage: fallbackFirstUserMessage,
-      hasUserOrAssistantMessage: hasUserOrAssistant
+      hasResumableContent
     };
   } catch (error40) {
     debugLogger.error("Error loading conversation record from JSONL:", error40);
@@ -282507,6 +282853,20 @@ var ChatRecordingService = class {
       throw error40;
     }
   }
+  /**
+   * 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.
@@ -282600,12 +282960,12 @@ async function parseLegacyRecordFallback(filePath, options) {
       if (options?.metadataOnly) {
         let fallbackFirstUserMessageStr;
         const firstUserMessage = legacyRecord.messages?.find(
-          (m) => m.type === "user"
+          (m) => m.type === "user" && isResumableMessageRecord(m)
         );
         if (firstUserMessage) {
           const rawContent = firstUserMessage.content;
           if (Array.isArray(rawContent)) {
-            fallbackFirstUserMessageStr = rawContent.map((p2) => isTextPart(p2) ? p2["text"] : "").join("");
+            fallbackFirstUserMessageStr = rawContent.map((p2) => isTextPart2(p2) ? p2["text"] : "").join("");
           } else if (typeof rawContent === "string") {
             fallbackFirstUserMessageStr = rawContent;
           }
@@ -282616,17 +282976,13 @@ async function parseLegacyRecordFallback(filePath, options) {
           messageCount: legacyRecord.messages?.length || 0,
           userMessageCount: legacyRecord.messages?.filter((m) => m.type === "user").length || 0,
           firstUserMessage: fallbackFirstUserMessageStr,
-          hasUserOrAssistantMessage: legacyRecord.messages?.some(
-            (m) => m.type === "user" || m.type === "gemini"
-          ) || false
+          hasResumableContent: legacyRecord.messages?.some((m) => isResumableMessageRecord(m)) || false
         };
       }
       return {
         ...legacyRecord,
         userMessageCount: legacyRecord.messages?.filter((m) => m.type === "user").length || 0,
-        hasUserOrAssistantMessage: legacyRecord.messages?.some(
-          (m) => m.type === "user" || m.type === "gemini"
-        ) || false
+        hasResumableContent: legacyRecord.messages?.some((m) => isResumableMessageRecord(m)) || false
       };
     }
   } catch {
@@ -285334,116 +285690,6 @@ function toVertexGenerationConfig(config2) {
   };
 }
 
-// packages/core/src/utils/partUtils.ts
-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 clonePart(part) {
-  return { ...part };
-}
-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;
-}
-async function flatMapTextParts(parts2, transform2) {
-  const result2 = [];
-  const partArray = Array.isArray(parts2) ? parts2 : typeof parts2 === "string" ? [{ text: parts2 }] : [parts2];
-  for (const part of partArray) {
-    let textToProcess;
-    if (typeof part === "string") {
-      textToProcess = part;
-    } else if ("text" in part) {
-      textToProcess = part.text;
-    }
-    if (textToProcess !== void 0) {
-      const transformedParts = await transform2(textToProcess);
-      result2.push(...transformedParts);
-    } else {
-      result2.push(part);
-    }
-  }
-  return result2;
-}
-function appendToLastTextPart(prompt, textToAppend, separator = "\n\n") {
-  if (!textToAppend) {
-    return prompt;
-  }
-  if (prompt.length === 0) {
-    return [{ text: textToAppend }];
-  }
-  const newPrompt = [...prompt];
-  const lastPart = newPrompt.at(-1);
-  if (typeof lastPart === "string") {
-    newPrompt[newPrompt.length - 1] = `${lastPart}${separator}${textToAppend}`;
-  } else if (lastPart && "text" in lastPart) {
-    newPrompt[newPrompt.length - 1] = {
-      ...lastPart,
-      text: `${lastPart.text}${separator}${textToAppend}`
-    };
-  } else {
-    newPrompt.push({ text: `${separator}${textToAppend}` });
-  }
-  return newPrompt;
-}
-function isTextPart2(part) {
-  return typeof part === "object" && part !== null && "text" in part && typeof part.text === "string";
-}
-
 // packages/core/src/utils/generateContentResponseUtilities.ts
 var BINARY_INJECTION_KEY = "__binary_injection__";
 function createFunctionResponsePart(callId, toolName, output) {
@@ -304029,7 +304275,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.47.0-nightly.20260602.gcfcecebe8";
+    return "0.47.0";
   })();
   return versionPromise;
 }
@@ -304541,7 +304787,7 @@ ${errorMessage}`,
 };
 
 // packages/core/src/utils/llm-edit-fixer.ts
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 
 // packages/core/src/utils/secure-browser-launcher.ts
 import { execFile as execFile6 } from "node:child_process";
@@ -306121,7 +306367,7 @@ async function generateJsonWithTimeout(client, params, timeoutMs) {
 }
 async function FixLLMEditWithInstruction(instruction, old_string, new_string, error40, current_content, baseLlmClient, abortSignal) {
   const promptId = getPromptIdWithFallback("llm-fixer");
-  const cacheKey = createHash4("sha256").update(
+  const cacheKey = createHash5("sha256").update(
     JSON.stringify([
       current_content,
       old_string,
@@ -309267,6 +309513,58 @@ var LoggingContentGenerator = class {
   }
 };
 
+// packages/core/src/core/modelMappingContentGenerator.ts
+var ModelMappingContentGenerator = class {
+  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/src/code_assist/codeAssist.ts
 async function createCodeAssistContentGenerator(httpOptions, authType, config2, sessionId) {
   if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || authType === "compute-default-credentials" /* COMPUTE_ADC */) {
@@ -309287,8 +309585,14 @@ async function createCodeAssistContentGenerator(httpOptions, authType, config2,
 }
 function getCodeAssistServer(config2) {
   let server = config2.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;
@@ -309684,11 +309988,14 @@ async function createContentGenerator(config2, gcConfig, sessionId) {
     if (config2.authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || config2.authType === "compute-default-credentials" /* COMPUTE_ADC */) {
       const httpOptions = { headers: baseHeaders };
       return new LoggingContentGenerator(
-        await createCodeAssistContentGenerator(
-          httpOptions,
-          config2.authType,
-          gcConfig,
-          sessionId
+        new ModelMappingContentGenerator(
+          await createCodeAssistContentGenerator(
+            httpOptions,
+            config2.authType,
+            gcConfig,
+            sessionId
+          ),
+          CCPA_AI_MODEL_MAPPINGS
         ),
         gcConfig
       );
@@ -329462,48 +329769,6 @@ var TopicState = class {
 // packages/core/src/agents/local-executor.ts
 import { randomUUID as randomUUID12 } from "node:crypto";
 
-// packages/core/src/core/agentChatHistory.ts
-var 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/src/core/geminiChat.ts
 import { randomUUID as randomUUID5 } from "node:crypto";
 
@@ -329515,13 +329780,6 @@ function isFunctionCall(content) {
   return content.role === "model" && !!content.parts && content.parts.every((part) => !!part.functionCall);
 }
 
-// packages/core/src/utils/cryptoUtils.ts
-import { createHash as createHash6 } from "node:crypto";
-function deriveStableId(sourceIds) {
-  const sortedIds = [...sourceIds].sort();
-  return createHash6("sha256").update(sortedIds.join("|")).digest("hex").slice(0, 32);
-}
-
 // packages/core/src/utils/historyHardening.ts
 var SYNTHETIC_THOUGHT_SIGNATURE = "skip_thought_signature_validator";
 var DEFAULT_SENTINELS = {
@@ -329796,164 +330054,6 @@ function scrubPart(part) {
   return scrubbed;
 }
 
-// packages/core/src/core/geminiRequest.ts
-function partListUnionToString(value) {
-  return partToString(value, { verbose: true });
-}
-
-// packages/core/src/utils/sessionUtils.ts
-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(
-            (p2) => p2.functionResponse && p2.functionResponse.name === name3 && !p2.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(
-            (p2) => p2.functionCall && p2.functionCall.name === name3 && !p2.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 ensurePartArray(content) {
-  if (Array.isArray(content)) {
-    return content.map(
-      (part) => typeof part === "string" ? { text: part } : part
-    );
-  }
-  if (typeof content === "string") {
-    return [{ text: content }];
-  }
-  return [content];
-}
-function convertSessionToClientHistory(messages) {
-  const clientHistory = [];
-  for (const msg of messages) {
-    if (msg.type === "info" || msg.type === "error" || msg.type === "warning") {
-      continue;
-    }
-    if (msg.type === "user") {
-      const contentString = partListUnionToString(msg.content);
-      const trimmedContent = contentString.trim();
-      if (trimmedContent.startsWith("/") || trimmedContent.startsWith("?") || trimmedContent.startsWith("<session_context>") || trimmedContent.startsWith("<hook_context>")) {
-        continue;
-      }
-      clientHistory.push({
-        id: msg.id,
-        content: {
-          role: "user",
-          parts: ensurePartArray(msg.content)
-        }
-      });
-    } else if (msg.type === "gemini") {
-      const modelParts = [];
-      const contentParts = msg.content ? ensurePartArray(msg.content) : [];
-      const hasCallsInContent = contentParts.some((p2) => !!p2.functionCall);
-      const hasThoughtsInContent = contentParts.some((p2) => p2.thought);
-      if (hasCallsInContent || hasThoughtsInContent) {
-        modelParts.push(...contentParts);
-      } else {
-        if (msg.thoughts && msg.thoughts.length > 0) {
-          for (const thought of msg.thoughts) {
-            const thoughtText = thought.subject ? `**${thought.subject}** ${thought.description}` : thought.description;
-            modelParts.push({
-              text: thoughtText,
-              thought: true
-            });
-          }
-        }
-        modelParts.push(...contentParts);
-        if (msg.toolCalls && msg.toolCalls.length > 0) {
-          for (const toolCall of msg.toolCalls) {
-            modelParts.push({
-              functionCall: {
-                id: toolCall.id,
-                name: toolCall.name,
-                args: toolCall.args
-              }
-            });
-          }
-        }
-      }
-      if (modelParts.length > 0) {
-        clientHistory.push({
-          id: msg.id,
-          content: {
-            role: "model",
-            parts: modelParts
-          }
-        });
-        if (msg.toolCalls && msg.toolCalls.length > 0) {
-          const functionResponseParts = [];
-          for (const toolCall of msg.toolCalls) {
-            if (toolCall.result) {
-              let responseData;
-              if (typeof toolCall.result === "string") {
-                responseData = {
-                  functionResponse: {
-                    id: toolCall.id,
-                    name: toolCall.name,
-                    response: {
-                      output: toolCall.result
-                    }
-                  }
-                };
-              } else if (Array.isArray(toolCall.result)) {
-                functionResponseParts.push(...ensurePartArray(toolCall.result));
-                continue;
-              } else {
-                responseData = toolCall.result;
-              }
-              functionResponseParts.push(responseData);
-            }
-          }
-          if (functionResponseParts.length > 0) {
-            clientHistory.push({
-              id: `${msg.id}_response`,
-              content: {
-                role: "user",
-                parts: functionResponseParts
-              }
-            });
-          }
-        }
-      }
-    }
-  }
-  return clientHistory;
-}
-
 // packages/core/src/core/geminiChat.ts
 var StreamEventType = /* @__PURE__ */ ((StreamEventType2) => {
   StreamEventType2["CHUNK"] = "chunk";
@@ -338373,7 +338473,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-XWGCFTD2.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-7VJY4VWP.js");
         const provider = new OAuth2AuthProvider(
           authConfig,
           options.agentName ?? "unknown",
@@ -370313,6 +370413,7 @@ async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfi
         error40,
         mcpServerName
       );
+      throw error40;
     }
     return [];
   }
@@ -381481,7 +381582,7 @@ ${sections.join("\n")}
       if (authType === "gemini-api-key" /* 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");
@@ -399946,6 +400047,7 @@ export {
   isAutoModel,
   supportsMultimodalFunctionResponse,
   isActiveModel,
+  CCPA_AI_MODEL_MAPPINGS,
   G1_CREDIT_TYPE,
   OVERAGE_ELIGIBLE_MODELS,
   isOverageEligibleModel,
@@ -400081,6 +400183,22 @@ export {
   getMatchingSessionFiles,
   deleteSessionFileAndArtifacts,
   deleteStoredSession,
+  partToString,
+  clonePart,
+  updatePart,
+  cloneFunctionResponse,
+  cloneFunctionCall,
+  getResponseText,
+  flatMapTextParts,
+  appendToLastTextPart,
+  isTextPart,
+  partListUnionToString,
+  AgentChatHistory,
+  ensureStableToolIds,
+  isIgnoredUserContent,
+  convertSessionToClientHistory,
+  isResumableMessageRecord,
+  hasResumableConversationContent,
   loadConversationRecord,
   ChatRecordingService,
   UiTelemetryService,
@@ -400156,15 +400274,6 @@ export {
   logOnboardingStart,
   logOnboardingSuccess,
   logBillingEvent,
-  partToString,
-  clonePart,
-  updatePart,
-  cloneFunctionResponse,
-  cloneFunctionCall,
-  getResponseText,
-  flatMapTextParts,
-  appendToLastTextPart,
-  isTextPart2 as isTextPart,
   BINARY_INJECTION_KEY,
   convertToFunctionResponse,
   getResponseTextFromParts,
@@ -400358,10 +400467,6 @@ export {
   AskUserTool,
   AskUserInvocation,
   isCompletedAskUserTool,
-  AgentChatHistory,
-  partListUnionToString,
-  ensureStableToolIds,
-  convertSessionToClientHistory,
   StreamEventType,
   SYNTHETIC_THOUGHT_SIGNATURE2 as SYNTHETIC_THOUGHT_SIGNATURE,
   isValidNonThoughtTextPart,