@google/gemini-cli 0.64.0-preview.0 → 0.65.0-nightly.20261007.gef59c532f

package/bundle/{chunk-6OFXOGEG.js → chunk-JYWQ73Z5.js}

@@ -283844,8 +283844,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "fb972b2f8";
-var CLI_VERSION = "0.64.0-preview.0";
+var GIT_COMMIT_INFO = "ef59c532f";
+var CLI_VERSION = "0.65.0-nightly.20261006.gfb972b2f8";
 
 // packages/core/src/ide/detect-ide.ts
 var IDE_DEFINITIONS = {
@@ -286476,24 +286476,52 @@ function isIgnoredUserContent(trimmedContent) {
 }
 function convertSessionToClientHistory(messages) {
   const clientHistory = [];
-  for (const msg of messages) {
+  const seenFunctionResponseIds = /* @__PURE__ */ new Set();
+  const pendingPartsToAppend = /* @__PURE__ */ new Map();
+  for (let i3 = 0; i3 < messages.length; i3++) {
+    const msg = messages[i3];
     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)) {
+      const extraParts = pendingPartsToAppend.get(msg.id) || [];
+      pendingPartsToAppend.delete(msg.id);
+      if (extraParts.length === 0) {
+        if (!msg.content) {
+          continue;
+        }
+        const contentString = partListUnionToString(msg.content);
+        const trimmedContent = contentString.trim();
+        if (isIgnoredUserContent(trimmedContent)) {
+          continue;
+        }
+      }
+      const parts2 = [
+        ...msg.content ? ensurePartArray(msg.content) : [],
+        ...extraParts
+      ].filter((part) => {
+        const respId = part?.functionResponse?.id;
+        if (!respId) {
+          return true;
+        }
+        if (seenFunctionResponseIds.has(respId)) {
+          return false;
+        }
+        seenFunctionResponseIds.add(respId);
+        return true;
+      });
+      if (parts2.length === 0) {
         continue;
       }
       clientHistory.push({
         id: msg.id,
         content: {
           role: "user",
-          parts: ensurePartArray(msg.content)
+          parts: parts2
         }
       });
     } else if (msg.type === "gemini") {
+      seenFunctionResponseIds.clear();
       const modelParts = [];
       const contentParts = msg.content ? ensurePartArray(msg.content) : [];
       const hasCallsInContent = contentParts.some((p) => !!p.functionCall);
@@ -286532,9 +286560,31 @@ function convertSessionToClientHistory(messages) {
           }
         });
         if (msg.toolCalls && msg.toolCalls.length > 0) {
+          const recordedResponseIds = /* @__PURE__ */ new Set();
+          let hasUntrackedFunctionResponse = false;
+          let targetUserMsgId;
+          for (let j = i3 + 1; j < messages.length; j++) {
+            const nextMsg = messages[j];
+            if (nextMsg.type === "gemini") {
+              break;
+            }
+            if (nextMsg.type === "user" && nextMsg.content) {
+              for (const part of ensurePartArray(nextMsg.content)) {
+                if (part?.functionResponse) {
+                  targetUserMsgId ??= nextMsg.id;
+                  if (part.functionResponse.id) {
+                    recordedResponseIds.add(part.functionResponse.id);
+                  } else {
+                    hasUntrackedFunctionResponse = true;
+                  }
+                }
+              }
+            }
+          }
           const functionResponseParts = [];
           for (const toolCall of msg.toolCalls) {
-            if (toolCall.result) {
+            const isAlreadyRecorded = toolCall.id ? recordedResponseIds.has(toolCall.id) : hasUntrackedFunctionResponse;
+            if (toolCall.result && !isAlreadyRecorded) {
               let responseData;
               if (typeof toolCall.result === "string") {
                 responseData = {
@@ -286556,13 +286606,36 @@ function convertSessionToClientHistory(messages) {
             }
           }
           if (functionResponseParts.length > 0) {
-            clientHistory.push({
-              id: `${msg.id}_response`,
-              content: {
-                role: "user",
-                parts: functionResponseParts
+            if (targetUserMsgId) {
+              const existingPending = pendingPartsToAppend.get(targetUserMsgId) || [];
+              pendingPartsToAppend.set(targetUserMsgId, [
+                ...existingPending,
+                ...functionResponseParts
+              ]);
+            } else {
+              const dedupedResponseParts = functionResponseParts.filter(
+                (part) => {
+                  const respId = part?.functionResponse?.id;
+                  if (!respId) {
+                    return true;
+                  }
+                  if (seenFunctionResponseIds.has(respId)) {
+                    return false;
+                  }
+                  seenFunctionResponseIds.add(respId);
+                  return true;
+                }
+              );
+              if (dedupedResponseParts.length > 0) {
+                clientHistory.push({
+                  id: `${msg.id}_response`,
+                  content: {
+                    role: "user",
+                    parts: dedupedResponseParts
+                  }
+                });
               }
-            });
+            }
           }
         }
       }
@@ -286682,7 +286755,7 @@ function isResumableMessageRecord(message) {
   return false;
 }
 function hasResumableConversationContent(messages) {
-  return messages.some((message) => isResumableMessageRecord(message));
+  return messages?.some((message) => isResumableMessageRecord(message)) ?? false;
 }
 function createJsonlRecordAccumulator(options) {
   let metadata2 = {};
@@ -287024,6 +287097,8 @@ var ChatRecordingService = class {
   queuedThoughts = [];
   queuedTokens = null;
   context;
+  isResumedSession = false;
+  initializationPromise = null;
   messageOrder = [];
   messageMetaMap = /* @__PURE__ */ new Map();
   toolCallMetaMap = /* @__PURE__ */ new Map();
@@ -287035,7 +287110,18 @@ var ChatRecordingService = class {
     this.sessionId = context2.promptId;
     this.projectHash = getProjectHash(context2.config.getProjectRoot());
   }
+  getIsResumedSession() {
+    return this.isResumedSession;
+  }
+  setIsResumedSession(isResumed) {
+    this.isResumedSession = isResumed;
+  }
   async initialize(resumedSessionData, kind) {
+    this.isResumedSession = Boolean(resumedSessionData);
+    this.initializationPromise = this.doInitialize(resumedSessionData, kind);
+    return this.initializationPromise;
+  }
+  async doInitialize(resumedSessionData, kind) {
     try {
       this.kind = kind;
       if (resumedSessionData) {
@@ -287046,7 +287132,10 @@ var ChatRecordingService = class {
           this.conversationFile
         );
         if (loadedRecord) {
-          this.cachedConversation = loadedRecord;
+          this.cachedConversation = {
+            ...loadedRecord,
+            messages: loadedRecord.messages ?? []
+          };
           this.projectHash = this.cachedConversation.projectHash;
           if (this.conversationFile.endsWith(".json")) {
             this.conversationFile = this.conversationFile + "l";
@@ -287125,20 +287214,41 @@ var ChatRecordingService = class {
         const directories = this.kind === "subagent" ? [
           ...this.context.config.getWorkspaceContext()?.getDirectories() ?? []
         ] : void 0;
-        const initialMetadata = {
-          sessionId: this.sessionId,
-          projectHash: this.projectHash,
-          startTime: (/* @__PURE__ */ new Date()).toISOString(),
-          lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
-          kind: this.kind,
-          directories
-        };
-        this.appendRecord(initialMetadata);
-        this.cachedConversation = {
-          ...initialMetadata,
-          messages: []
-        };
-        this.rebuildIndexAndWindow([]);
+        let fileAlreadyExisted = false;
+        if (fs32.existsSync(this.conversationFile)) {
+          fileAlreadyExisted = true;
+          const loadedRecord = await loadConversationRecord(
+            this.conversationFile
+          );
+          if (loadedRecord) {
+            this.cachedConversation = {
+              ...loadedRecord,
+              messages: loadedRecord.messages ?? []
+            };
+            this.projectHash = this.cachedConversation.projectHash;
+            if (loadedRecord.hasResumableContent || hasResumableConversationContent(this.cachedConversation.messages)) {
+              this.isResumedSession = true;
+            }
+          }
+        }
+        if (!fileAlreadyExisted || !this.cachedConversation) {
+          const initialMetadata = {
+            sessionId: this.sessionId,
+            projectHash: this.projectHash,
+            startTime: (/* @__PURE__ */ new Date()).toISOString(),
+            lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
+            kind: this.kind,
+            directories
+          };
+          this.appendRecord(initialMetadata);
+          this.cachedConversation = {
+            ...initialMetadata,
+            messages: []
+          };
+          this.rebuildIndexAndWindow([]);
+        } else {
+          this.rebuildIndexAndWindow(this.cachedConversation.messages);
+        }
       }
       this.queuedThoughts = [];
       this.queuedTokens = null;
@@ -287182,14 +287292,15 @@ var ChatRecordingService = class {
     this.hasEvictedMessages = msgs.length < this.messageOrder.length;
   }
   rebuildIndexAndWindow(messages) {
+    const safeMessages = messages ?? [];
     this.messageOrder = [];
     this.messageMetaMap.clear();
     this.toolCallMetaMap.clear();
-    for (const msg of messages) {
+    for (const msg of safeMessages) {
       this.indexMessage(msg);
     }
     if (this.cachedConversation) {
-      this.cachedConversation.messages = messages.length > MAX_HISTORY_MESSAGES ? messages.slice(-MAX_HISTORY_MESSAGES) : [...messages];
+      this.cachedConversation.messages = safeMessages.length > MAX_HISTORY_MESSAGES ? safeMessages.slice(-MAX_HISTORY_MESSAGES) : [...safeMessages];
       this.hasEvictedMessages = this.cachedConversation.messages.length < this.messageOrder.length;
     } else {
       this.hasEvictedMessages = false;
@@ -287506,12 +287617,32 @@ var ChatRecordingService = class {
    * session with a real user prompt, model response, or tool activity.
    */
   async deleteCurrentSessionIfNotResumableAsync() {
-    if (!this.conversationFile || !this.cachedConversation) {
+    if (this.initializationPromise) {
+      try {
+        await this.initializationPromise;
+      } catch {
+      }
+    }
+    if (this.isResumedSession) {
       return;
     }
-    if (hasResumableConversationContent(this.cachedConversation.messages) || Array.from(this.messageMetaMap.values()).some((m) => m.isResumable)) {
+    if (!this.conversationFile) {
       return;
     }
+    if (this.cachedConversation && hasResumableConversationContent(
+      this.cachedConversation.messages ?? []
+    ) || Array.from(this.messageMetaMap.values()).some((m) => m.isResumable)) {
+      return;
+    }
+    if (fs32.existsSync(this.conversationFile)) {
+      try {
+        const fileRecord = await loadConversationRecord(this.conversationFile);
+        if (fileRecord && (fileRecord.hasResumableContent || hasResumableConversationContent(fileRecord.messages ?? []))) {
+          return;
+        }
+      } catch {
+      }
+    }
     await this.deleteCurrentSessionAsync();
   }
   /**
@@ -307961,7 +308092,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.64.0-preview.0";
+    return "0.65.0-nightly.20261006.gfb972b2f8";
   })();
   return versionPromise;
 }
@@ -344038,7 +344169,13 @@ var OAuthUtils = class {
       issuer: metadata2.issuer,
       tokenUrl: metadata2.token_endpoint,
       scopes: metadata2.scopes_supported || [],
-      registrationUrl: metadata2.registration_endpoint
+      registrationUrl: metadata2.registration_endpoint,
+      // RFC 9207 Section 3: the flag defaults to false when omitted. Discovered
+      // configurations therefore always carry an explicit boolean, which lets
+      // the callback policy distinguish them from an explicitly configured issuer.
+      // Only a literal boolean `true` enables the flag, so loosely typed values
+      // returned by some servers (e.g. "false" or "0") are not coerced to true.
+      authorizationResponseIssParameterSupported: metadata2.authorization_response_iss_parameter_supported === true
     };
   }
   /**
@@ -344439,7 +344576,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-XFP63FGJ.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-4AK74O2H.js");
         const provider = new OAuth2AuthProvider(
           authConfig,
           options.agentName ?? "unknown",
@@ -375428,7 +375565,7 @@ function areIssuersEqual(issuerA, issuerB) {
   }
   return normA === normB;
 }
-function startCallbackServer(expectedState, port, expectedIssuer) {
+function startCallbackServer(expectedState, port, expectedIssuer, requireIssInResponse) {
   let portResolve;
   let portReject;
   const portPromise = new Promise((resolve29, reject) => {
@@ -375488,9 +375625,10 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
               return;
             }
             if (expectedIssuer) {
-              if (!iss) {
+              const requireIss = requireIssInResponse ?? true;
+              if (requireIss && !iss) {
                 debugLogger.error(
-                  'OAuth callback rejected: Missing required "iss" parameter when an expected issuer is configured. Possible IdP mix-up attack (RFC 9207).'
+                  'OAuth callback rejected: Missing required "iss" parameter for the expected authorization server (RFC 9207).'
                 );
                 res.writeHead(400, { "Content-Type": "text/html" });
                 res.end(`
@@ -375510,7 +375648,7 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
                 );
                 return;
               }
-              if (!areIssuersEqual(iss, expectedIssuer)) {
+              if (iss && !areIssuersEqual(iss, expectedIssuer)) {
                 debugLogger.error(
                   "OAuth callback rejected: Issuer mismatch between authorization response and expected authorization server. Possible IdP mix-up attack (RFC 9207)."
                 );
@@ -375532,9 +375670,11 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
                 );
                 return;
               }
-              debugLogger.debug(
-                "\u2713 OAuth callback issuer validated successfully."
-              );
+              if (iss) {
+                debugLogger.debug(
+                  "\u2713 OAuth callback issuer validated successfully."
+                );
+              }
             } else if (iss) {
               debugLogger.debug(
                 'OAuth callback received "iss" parameter (no expected issuer was configured).'
@@ -375980,6 +376120,7 @@ var MCPOAuthProvider = class {
                 issuer: discoveredConfig.issuer,
                 tokenUrl: discoveredConfig.tokenUrl,
                 scopes: config2.scopes || discoveredConfig.scopes || [],
+                authorizationResponseIssParameterSupported: config2.authorizationResponseIssParameterSupported ?? discoveredConfig.authorizationResponseIssParameterSupported,
                 // Preserve existing client credentials
                 clientId: config2.clientId,
                 clientSecret: config2.clientSecret
@@ -376005,6 +376146,7 @@ var MCPOAuthProvider = class {
             issuer: discoveredConfig.issuer,
             scopes: config2.scopes || discoveredConfig.scopes || [],
             registrationUrl: discoveredConfig.registrationUrl,
+            authorizationResponseIssParameterSupported: config2.authorizationResponseIssParameterSupported ?? discoveredConfig.authorizationResponseIssParameterSupported,
             // Preserve existing client credentials
             clientId: config2.clientId,
             clientSecret: config2.clientSecret
@@ -376021,10 +376163,12 @@ var MCPOAuthProvider = class {
     debugLogger.debug(
       `Starting callback server for "${serverName}" (expected issuer: ${config2.issuer || "none"})...`
     );
+    const requireIssInResponse = config2.authorizationResponseIssParameterSupported ?? Boolean(config2.issuer);
     const callbackServer = startCallbackServer(
       pkceParams.state,
       preferredPort,
-      config2.issuer
+      config2.issuer,
+      requireIssInResponse
     );
     const redirectPort = await callbackServer.port;
     debugLogger.debug(`Callback server listening on port ${redirectPort}`);
@@ -376980,7 +377124,8 @@ async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthentic
       authorizationUrl: oauthConfig.authorizationUrl,
       issuer: oauthConfig.issuer,
       tokenUrl: oauthConfig.tokenUrl,
-      scopes: oauthConfig.scopes || []
+      scopes: oauthConfig.scopes || [],
+      authorizationResponseIssParameterSupported: mcpServerConfig.oauth?.authorizationResponseIssParameterSupported ?? oauthConfig.authorizationResponseIssParameterSupported
     };
     debugLogger.log(
       `Starting OAuth authentication for server '${mcpServerName}'...`
@@ -377714,7 +377859,8 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
               authorizationUrl: oauthConfig.authorizationUrl,
               issuer: oauthConfig.issuer,
               tokenUrl: oauthConfig.tokenUrl,
-              scopes: oauthConfig.scopes || []
+              scopes: oauthConfig.scopes || [],
+              authorizationResponseIssParameterSupported: mcpServerConfig.oauth?.authorizationResponseIssParameterSupported ?? oauthConfig.authorizationResponseIssParameterSupported
             };
             const authServerUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
             debugLogger.log(

package/bundle/{chunk-HSZIYPL6.js → chunk-KHG7NKQK.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-QUCRASYB.js";
+} from "./chunk-U6ZQ2RUE.js";
 import {
   DEFAULT_PORT,
   SERVER_START_WAIT_MS,
@@ -14,10 +14,10 @@ import {
   isServerRunning,
   resolveGemmaConfig,
   writeServerProcessInfo
-} from "./chunk-ZPLFLZQA.js";
+} from "./chunk-WXXOP3OP.js";
 import {
   debugLogger
-} from "./chunk-A4TO2DY2.js";
+} from "./chunk-KTOZF7BG.js";
 import {
   __toESM
 } from "./chunk-34MYV7JD.js";