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

package/dist/a2a-server.mjs

@@ -221367,8 +221367,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 = "fb972b2f8";
-    CLI_VERSION = "0.64.0-preview.0";
+    GIT_COMMIT_INFO = "ef59c532f";
+    CLI_VERSION = "0.65.0-nightly.20261007.gef59c532f";
   }
 });
 
@@ -292506,7 +292506,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 = {};
@@ -292907,6 +292907,8 @@ var init_chatRecordingService = __esm({
       queuedThoughts = [];
       queuedTokens = null;
       context;
+      isResumedSession = false;
+      initializationPromise = null;
       messageOrder = [];
       messageMetaMap = /* @__PURE__ */ new Map();
       toolCallMetaMap = /* @__PURE__ */ new Map();
@@ -292918,7 +292920,18 @@ var init_chatRecordingService = __esm({
         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) {
@@ -292927,7 +292940,10 @@ var init_chatRecordingService = __esm({
             this.kind = resumedSessionData.conversation.kind;
             const loadedRecord = await loadConversationRecord(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";
@@ -292995,20 +293011,39 @@ var init_chatRecordingService = __esm({
             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 (fs36.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;
@@ -293053,14 +293088,15 @@ var init_chatRecordingService = __esm({
         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;
@@ -293367,12 +293403,30 @@ var init_chatRecordingService = __esm({
        * 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 (!this.conversationFile) {
           return;
         }
-        if (hasResumableConversationContent(this.cachedConversation.messages) || Array.from(this.messageMetaMap.values()).some((m3) => m3.isResumable)) {
+        if (this.cachedConversation && hasResumableConversationContent(this.cachedConversation.messages ?? []) || Array.from(this.messageMetaMap.values()).some((m3) => m3.isResumable)) {
           return;
         }
+        if (fs36.existsSync(this.conversationFile)) {
+          try {
+            const fileRecord = await loadConversationRecord(this.conversationFile);
+            if (fileRecord && (fileRecord.hasResumableContent || hasResumableConversationContent(fileRecord.messages ?? []))) {
+              return;
+            }
+          } catch {
+          }
+        }
         await this.deleteCurrentSessionAsync();
       }
       /**
@@ -337592,7 +337646,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.64.0-preview.0";
+    return "0.65.0-nightly.20261007.gef59c532f";
   })();
   return versionPromise;
 }
@@ -376673,7 +376727,13 @@ var init_oauth_utils = __esm({
           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
         };
       }
       /**
@@ -380473,7 +380533,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((resolve23, reject) => {
@@ -380527,8 +380587,9 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
           return;
         }
         if (expectedIssuer) {
-          if (!iss) {
-            debugLogger.error('OAuth callback rejected: Missing required "iss" parameter when an expected issuer is configured. Possible IdP mix-up attack (RFC 9207).');
+          const requireIss = requireIssInResponse ?? true;
+          if (requireIss && !iss) {
+            debugLogger.error('OAuth callback rejected: Missing required "iss" parameter for the expected authorization server (RFC 9207).');
             res.writeHead(400, { "Content-Type": "text/html" });
             res.end(`
                 <html>
@@ -380543,7 +380604,7 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
             reject(new Error('Missing "iss" parameter in authorization response per RFC 9207'));
             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).");
             res.writeHead(400, { "Content-Type": "text/html" });
             res.end(`
@@ -380559,7 +380620,9 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
             reject(new Error("Issuer mismatch in authorization response - possible OAuth mix-up attack"));
             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).');
         }
@@ -410196,6 +410259,7 @@ var init_oauth_provider = __esm({
                     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
@@ -410219,6 +410283,7 @@ var init_oauth_provider = __esm({
                 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
@@ -410231,7 +410296,8 @@ var init_oauth_provider = __esm({
         const pkceParams = generatePKCEParams();
         const preferredPort = getPortFromUrl(config2.redirectUri);
         debugLogger.debug(`Starting callback server for "${serverName}" (expected issuer: ${config2.issuer || "none"})...`);
-        const callbackServer = startCallbackServer(pkceParams.state, preferredPort, config2.issuer);
+        const requireIssInResponse = config2.authorizationResponseIssParameterSupported ?? Boolean(config2.issuer);
+        const callbackServer = startCallbackServer(pkceParams.state, preferredPort, config2.issuer, requireIssInResponse);
         const redirectPort = await callbackServer.port;
         debugLogger.debug(`Callback server listening on port ${redirectPort}`);
         if (!config2.clientId) {
@@ -410628,7 +410694,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}'...`);
     const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
@@ -411044,7 +411111,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(`Starting OAuth authentication for server '${mcpServerName}'...`);