@google/gemini-cli-a2a-server 0.64.0-preview.0 → 0.65.0-nightly.20261008.g44d764ee5

package/dist/a2a-server.mjs

@@ -143135,7 +143135,7 @@ var require_metadata4 = __commonJS({
         }
       }
     }
-    var Metadata2 = class _Metadata {
+    var Metadata3 = class _Metadata {
       constructor(options = {}) {
         this.internalRepr = /* @__PURE__ */ new Map();
         this.opaqueData = /* @__PURE__ */ new Map();
@@ -143327,7 +143327,7 @@ var require_metadata4 = __commonJS({
         return result2;
       }
     };
-    exports2.Metadata = Metadata2;
+    exports2.Metadata = Metadata3;
     var bufToString = (val) => {
       return Buffer.isBuffer(val) ? val.toString("base64") : val;
     };
@@ -166974,10 +166974,10 @@ var require_grpc_exporter_transport = __commonJS({
     exports2.createSslCredentials = createSslCredentials;
     function createEmptyMetadata() {
       const {
-        Metadata: Metadata2
+        Metadata: Metadata3
         // eslint-disable-next-line @typescript-eslint/no-require-imports
       } = require_src24();
-      return new Metadata2();
+      return new Metadata3();
     }
     exports2.createEmptyMetadata = createEmptyMetadata;
     var GrpcExporterTransport = class {
@@ -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 = "44d764ee5";
+    CLI_VERSION = "0.65.0-nightly.20261008.g44d764ee5";
   }
 });
 
@@ -234390,8 +234390,8 @@ var require_grpc = __commonJS({
         return grpcPackage;
       }
       metadataBuilder(headers) {
-        const Metadata2 = this.grpc.Metadata;
-        const baseMetadata = new Metadata2();
+        const Metadata3 = this.grpc.Metadata;
+        const baseMetadata = new Metadata3();
         for (const key in headers) {
           const value = headers[key];
           if (Array.isArray(value)) {
@@ -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();
       }
       /**
@@ -295087,6 +295141,8 @@ async function initializeTelemetry(config2, credentials3) {
       exportIntervalMillis: 3e4
     });
   } else if (useOtlp) {
+    const otlpHeaders = config2.getTelemetryOtlpHeaders?.() ?? {};
+    const hasHeaders = Object.keys(otlpHeaders).length > 0;
     if (otlpProtocol === "http") {
       const buildUrl = (path103) => {
         const url5 = new URL(parsedEndpoint);
@@ -295094,30 +295150,52 @@ async function initializeTelemetry(config2, credentials3) {
         return url5.href;
       };
       spanExporter = new import_exporter_trace_otlp_http.OTLPTraceExporter({
-        url: buildUrl("v1/traces")
+        url: buildUrl("v1/traces"),
+        headers: hasHeaders ? otlpHeaders : void 0
       });
       logExporter = new import_exporter_logs_otlp_http.OTLPLogExporter({
-        url: buildUrl("v1/logs")
+        url: buildUrl("v1/logs"),
+        headers: hasHeaders ? otlpHeaders : void 0
       });
       metricReader = new import_sdk_metrics2.PeriodicExportingMetricReader({
         exporter: new import_exporter_metrics_otlp_http.OTLPMetricExporter({
-          url: buildUrl("v1/metrics")
+          url: buildUrl("v1/metrics"),
+          headers: hasHeaders ? otlpHeaders : void 0
         }),
         exportIntervalMillis: 1e4
       });
     } else {
+      let metadata2;
+      if (hasHeaders) {
+        const candidateMetadata = new import_grpc_js.Metadata();
+        let validCount = 0;
+        for (const [key, value] of Object.entries(otlpHeaders)) {
+          try {
+            candidateMetadata.set(key, value);
+            validCount++;
+          } catch (error2) {
+            debugLogger.warn(`[Telemetry] Skipping invalid gRPC metadata key "${key}":`, error2);
+          }
+        }
+        if (validCount > 0) {
+          metadata2 = candidateMetadata;
+        }
+      }
       spanExporter = new import_exporter_trace_otlp_grpc.OTLPTraceExporter({
         url: parsedEndpoint,
-        compression: CompressionAlgorithm.GZIP
+        compression: CompressionAlgorithm.GZIP,
+        ...metadata2 && { metadata: metadata2 }
       });
       logExporter = new import_exporter_logs_otlp_grpc.OTLPLogExporter({
         url: parsedEndpoint,
-        compression: CompressionAlgorithm.GZIP
+        compression: CompressionAlgorithm.GZIP,
+        ...metadata2 && { metadata: metadata2 }
       });
       metricReader = new import_sdk_metrics2.PeriodicExportingMetricReader({
         exporter: new import_exporter_metrics_otlp_grpc.OTLPMetricExporter({
           url: parsedEndpoint,
-          compression: CompressionAlgorithm.GZIP
+          compression: CompressionAlgorithm.GZIP,
+          ...metadata2 && { metadata: metadata2 }
         }),
         exportIntervalMillis: 1e4
       });
@@ -295214,7 +295292,7 @@ async function shutdownTelemetry(config2, fromProcessExit = true) {
     activeTelemetryEmail = void 0;
   }
 }
-var import_exporter_trace_otlp_grpc, import_exporter_logs_otlp_grpc, import_exporter_metrics_otlp_grpc, import_exporter_trace_otlp_http, import_exporter_logs_otlp_http, import_exporter_metrics_otlp_http, import_sdk_node, import_resources, import_sdk_trace_node, import_sdk_logs, import_sdk_metrics2, import_instrumentation_http, DiagLoggerAdapter, sdk, spanProcessor, logRecordProcessor, metricReader, telemetryInitialized, callbackRegistered, authListener, keychainAvailabilityListener, tokenStorageTypeListener, telemetryBuffer, activeTelemetryEmail;
+var import_exporter_trace_otlp_grpc, import_exporter_logs_otlp_grpc, import_exporter_metrics_otlp_grpc, import_exporter_trace_otlp_http, import_exporter_logs_otlp_http, import_exporter_metrics_otlp_http, import_grpc_js, import_sdk_node, import_resources, import_sdk_trace_node, import_sdk_logs, import_sdk_metrics2, import_instrumentation_http, DiagLoggerAdapter, sdk, spanProcessor, logRecordProcessor, metricReader, telemetryInitialized, callbackRegistered, authListener, keychainAvailabilityListener, tokenStorageTypeListener, telemetryBuffer, activeTelemetryEmail;
 var init_sdk = __esm({
   "packages/core/dist/src/telemetry/sdk.js"() {
     "use strict";
@@ -295226,6 +295304,7 @@ var init_sdk = __esm({
     import_exporter_logs_otlp_http = __toESM(require_src34(), 1);
     import_exporter_metrics_otlp_http = __toESM(require_src31(), 1);
     init_esm3();
+    import_grpc_js = __toESM(require_src24(), 1);
     import_sdk_node = __toESM(require_src48(), 1);
     init_esm2();
     import_resources = __toESM(require_src26(), 1);
@@ -337592,7 +337671,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.64.0-preview.0";
+    return "0.65.0-nightly.20261008.g44d764ee5";
   })();
   return versionPromise;
 }
@@ -338253,7 +338332,10 @@ function classifyValidationRequiredError(googleApiError) {
     }
   }
   if (!validationLink) {
-    validationLink = errorInfo.metadata?.["validation_link"];
+    validationLink = errorInfo.metadata?.["validation_link"] ?? errorInfo.metadata?.["validation_url"];
+  }
+  if (!learnMoreUrl) {
+    learnMoreUrl = errorInfo.metadata?.["validation_learn_more_url"];
   }
   return new ValidationRequiredError(googleApiError.message, googleApiError, validationLink, validationDescription, learnMoreUrl);
 }
@@ -339089,7 +339171,9 @@ async function retryWithBackoff(fn2, options) {
   const getCurrentMaxAttempts = () => getAvailabilityContext?.()?.policy.maxAttempts ?? maxAttempts;
   let attempt = 0;
   let capacityAttempts = 0;
+  let validationAttempts = 0;
   const MAX_SILENT_CAPACITY_ATTEMPTS = 3;
+  const MAX_VALIDATION_ATTEMPTS = 3;
   let currentDelay = initialDelayMs;
   const throwIfAborted = () => {
     if (signal?.aborted) {
@@ -339167,7 +339251,8 @@ async function retryWithBackoff(fn2, options) {
         }
       }
       if (classifiedError instanceof ValidationRequiredError) {
-        if (onValidationRequired) {
+        if (onValidationRequired && validationAttempts < MAX_VALIDATION_ATTEMPTS) {
+          validationAttempts++;
           try {
             const intent = await onValidationRequired(classifiedError);
             if (intent === "verify") {
@@ -342310,6 +342395,8 @@ async function _doSetupUser(client, projectId, config2, httpOptions = {}) {
     pluginType: "GEMINI"
   };
   const validationHandler = config2.getValidationHandler();
+  const MAX_VALIDATION_ATTEMPTS = 3;
+  let validationAttempts = 0;
   let loadRes;
   while (true) {
     loadRes = await caServer.loadCodeAssist({
@@ -342323,7 +342410,8 @@ async function _doSetupUser(client, projectId, config2, httpOptions = {}) {
       validateLoadCodeAssistResponse(loadRes);
       break;
     } catch (e3) {
-      if (e3 instanceof ValidationRequiredError && validationHandler) {
+      if (e3 instanceof ValidationRequiredError && validationHandler && validationAttempts < MAX_VALIDATION_ATTEMPTS) {
+        validationAttempts++;
         const intent = await validationHandler(e3.validationLink, e3.validationDescription);
         if (intent === "verify") {
           continue;
@@ -368074,6 +368162,9 @@ function scrubPart(part) {
     if (part.functionResponse.id) {
       scrubbedResp["id"] = part.functionResponse.id;
     }
+    if ("parts" in part.functionResponse && Array.isArray(part.functionResponse.parts)) {
+      scrubbedResp["parts"] = part.functionResponse.parts.map(scrubPart);
+    }
     scrubbed["functionResponse"] = scrubbedResp;
   }
   if ("fileData" in part) {
@@ -368221,8 +368312,41 @@ function isSchemaDepthError(errorMessage) {
 function isInvalidArgumentError(errorMessage) {
   return errorMessage.includes("Request contains an invalid argument");
 }
+function isEmptyTextPart(part) {
+  if (part.text !== "") {
+    return false;
+  }
+  return !Object.keys(part).some((key) => key !== "text" && key !== "thought" && key !== "callIndex");
+}
+function hasNonEmptyParts(content) {
+  return (content.parts ?? []).some((part) => !isEmptyTextPart(part));
+}
+function buildInterruptedToolResponseParts(parts2) {
+  return parts2.filter((part) => !!part?.functionCall).map((part) => ({
+    functionResponse: {
+      name: part.functionCall.name?.trim() || "generic_tool",
+      id: part.functionCall.id,
+      response: { error: INTERRUPTED_TOOL_RESPONSE_ERROR }
+    }
+  }));
+}
+function ensureTerminalUserTurn(contents) {
+  const last2 = contents.at(-1);
+  if (last2?.role === "user" && hasNonEmptyParts(last2)) {
+    return contents;
+  }
+  if (last2?.role === "user") {
+    return [
+      ...contents.slice(0, -1),
+      { ...last2, parts: [{ text: CONTINUE_PROMPT_TEXT }] }
+    ];
+  }
+  const missingResponses = buildInterruptedToolResponseParts(last2?.parts ?? []);
+  const parts2 = missingResponses.length > 0 ? missingResponses : [{ text: CONTINUE_PROMPT_TEXT }];
+  return [...contents, { role: "user", parts: parts2 }];
+}
 function stripToolCallIdPrefixes(contents) {
-  return contents.map((content) => {
+  const stripped = contents.map((content) => {
     const parts2 = (content.parts || []).map((part) => {
       const newPart = { ...part };
       if (newPart.functionCall) {
@@ -368230,8 +368354,7 @@ function stripToolCallIdPrefixes(contents) {
         const name3 = fc.name?.trim() || "generic_tool";
         if (fc.id && fc.id.startsWith(`${name3}__`)) {
           newPart.functionCall = {
-            name: fc.name,
-            args: fc.args,
+            ...fc,
             id: fc.id.substring(name3.length + 2)
           };
         }
@@ -368241,8 +368364,9 @@ function stripToolCallIdPrefixes(contents) {
         const name3 = fr2.name?.trim() || "generic_tool";
         if (fr2.id && fr2.id.startsWith(`${name3}__`)) {
           newPart.functionResponse = {
-            name: fr2.name,
-            response: fr2.response,
+            // History parts are plain JSON objects, not class instances.
+            // eslint-disable-next-line @typescript-eslint/no-misused-spread
+            ...fr2,
             id: fr2.id.substring(name3.length + 2)
           };
         }
@@ -368252,18 +368376,30 @@ function stripToolCallIdPrefixes(contents) {
         delete newPart.text;
       }
       return newPart;
-    }).filter((part) => {
-      const hasOtherKeys = Object.keys(part).some((key) => key !== "text" && key !== "thought" && key !== "callIndex");
-      if (part.text !== void 0 && part.text === "" && !hasOtherKeys) {
-        return false;
-      }
-      return true;
-    });
+    }).filter((part) => !isEmptyTextPart(part));
     return {
       ...content,
       parts: parts2
     };
-  });
+  }).filter((content) => content.parts.length > 0);
+  return coalesceConsecutiveContents(stripped);
+}
+function coalesceConsecutiveContents(contents) {
+  const result2 = [];
+  for (const item of contents) {
+    const lastIdx = result2.length - 1;
+    const last2 = result2[lastIdx];
+    if (last2 && last2.role && last2.role === item.role) {
+      const hasParts = last2.parts || item.parts;
+      result2[lastIdx] = {
+        ...last2,
+        parts: hasParts ? [...last2.parts || [], ...item.parts || []] : void 0
+      };
+    } else {
+      result2.push({ ...item });
+    }
+  }
+  return result2;
 }
 function coalesceConsecutiveRoles(history) {
   const result2 = [];
@@ -368318,7 +368454,7 @@ function stripThoughts2(history) {
     };
   }).filter((turn) => !turn.content.parts || turn.content.parts.length > 0);
 }
-var StreamEventType, MID_STREAM_RETRY_OPTIONS, SYNTHETIC_THOUGHT_SIGNATURE2, INTERRUPTED_RESPONSE_PLACEHOLDER, THINKING_ONLY_NUDGE_MESSAGE, NO_RESPONSE_TEXT_NUDGE_MESSAGE, InvalidStreamError, AgentExecutionStoppedError, AgentExecutionBlockedError, GeminiChat;
+var StreamEventType, MID_STREAM_RETRY_OPTIONS, SYNTHETIC_THOUGHT_SIGNATURE2, INTERRUPTED_RESPONSE_PLACEHOLDER, INTERRUPTED_TOOL_RESPONSE_ERROR, CONTINUE_PROMPT_TEXT, THINKING_ONLY_NUDGE_MESSAGE, NO_RESPONSE_TEXT_NUDGE_MESSAGE, InvalidStreamError, AgentExecutionStoppedError, AgentExecutionBlockedError, GeminiChat;
 var init_geminiChat = __esm({
   "packages/core/dist/src/core/geminiChat.js"() {
     "use strict";
@@ -368341,6 +368477,7 @@ var init_geminiChat = __esm({
     init_tokenCalculation();
     init_policyHelpers();
     init_events();
+    init_debugLogger();
     (function(StreamEventType2) {
       StreamEventType2["CHUNK"] = "chunk";
       StreamEventType2["RETRY"] = "retry";
@@ -368355,6 +368492,8 @@ var init_geminiChat = __esm({
     };
     SYNTHETIC_THOUGHT_SIGNATURE2 = "skip_thought_signature_validator";
     INTERRUPTED_RESPONSE_PLACEHOLDER = "[The previous response was interrupted before it completed.]";
+    INTERRUPTED_TOOL_RESPONSE_ERROR = "Response was lost or interrupted.";
+    CONTINUE_PROMPT_TEXT = "Please continue.";
     THINKING_ONLY_NUDGE_MESSAGE = "[System: You previously generated thoughts but failed to provide a final user-facing response. Please ensure you provide your final answer or call a tool now.]";
     NO_RESPONSE_TEXT_NUDGE_MESSAGE = "[System: You previously returned an empty response with no text or thoughts. Please ensure you provide your final answer or call a tool now.]";
     InvalidStreamError = class extends Error {
@@ -368486,6 +368625,7 @@ var init_geminiChat = __esm({
         let userContent = createUserContent(message);
         const isOriginalFunctionResponse = isFunctionResponse(userContent);
         if (!isOriginalFunctionResponse) {
+          this.closeUnansweredToolCallsTurn();
           this.closeUnansweredToolResponseTurn();
         }
         const { model } = this.context.config.modelConfigService.getResolvedConfig(modelConfigKey);
@@ -368512,7 +368652,7 @@ var init_geminiChat = __esm({
           } else {
             const history = this.agentHistory.get();
             const lastTurn = history[history.length - 1];
-            if (!lastTurn || partListUnionToString(lastTurn.content.parts || []) !== userMessageContent) {
+            if (!lastTurn || lastTurn.content.role !== "user" || partListUnionToString(lastTurn.content.parts || []) !== userMessageContent) {
               const id = this.chatRecordingService.recordMessage({
                 model,
                 type: "user",
@@ -368560,11 +368700,12 @@ var init_geminiChat = __esm({
           } else {
             const history = this.agentHistory.get();
             const lastTurn = history[history.length - 1];
-            if (!lastTurn || partListUnionToString(lastTurn.content.parts || []) !== partListUnionToString(userContent.parts || [])) {
+            if (!lastTurn || lastTurn.content.role !== "user" || partListUnionToString(lastTurn.content.parts || []) !== partListUnionToString(userContent.parts || [])) {
               this.agentHistory.push({ id, content: userContent });
             }
           }
         }
+        this.replaceEmptyTrailingUserTurn();
         const requestHistory = this.getHistoryTurns(true);
         const streamWithRetries = async function* () {
           let isSuccess = false;
@@ -368676,23 +368817,77 @@ var init_geminiChat = __esm({
         return streamWithRetries.call(this);
       }
       /**
-       * Appends a closing model turn when history ends with an unanswered tool
-       * response, so the next user message stays a turn of its own.
+       * Appends a dedicated synthetic user turn with matching functionResponse
+       * parts when history ends with an unclosed model functionCall. The
+       * subsequent user prompt is then recorded as a clean turn of its own (after
+       * `closeUnansweredToolResponseTurn` adds the closing model turn).
        */
-      closeUnansweredToolResponseTurn() {
+      closeUnansweredToolCallsTurn() {
         const turns = this.agentHistory.get();
         const last2 = turns[turns.length - 1];
-        if (last2?.content.role !== "user" || !last2.content.parts?.some((part) => !!part.functionResponse)) {
+        if (last2?.content.role !== "model") {
+          return;
+        }
+        const missingResponses = buildInterruptedToolResponseParts(last2.content.parts ?? []);
+        if (missingResponses.length === 0) {
           return;
         }
+        const id = this.chatRecordingService.recordSyntheticMessage("user", missingResponses);
         this.agentHistory.push({
-          id: randomUUID8(),
-          content: {
-            role: "model",
-            parts: [{ text: INTERRUPTED_RESPONSE_PLACEHOLDER }]
-          }
+          id,
+          content: { role: "user", parts: missingResponses }
         });
       }
+      /**
+       * Replaces the parts of a trailing user turn that carries no content (e.g.
+       * only empty text parts) with a continuation prompt, keeping the in-memory
+       * history and the session log in sync. Runs once per send so that the
+       * persisted history never keeps an empty user turn between model turns.
+       */
+      replaceEmptyTrailingUserTurn() {
+        const turns = this.agentHistory.get();
+        const last2 = turns[turns.length - 1];
+        if (last2?.content.role !== "user" || hasNonEmptyParts(last2.content)) {
+          return;
+        }
+        this.agentHistory.set([
+          ...turns.slice(0, -1),
+          {
+            id: last2.id,
+            content: { ...last2.content, parts: [{ text: CONTINUE_PROMPT_TEXT }] }
+          }
+        ]);
+        this.chatRecordingService.updateMessagesFromHistory(this.agentHistory.get());
+      }
+      /**
+       * Appends a closing model turn when history ends with an unanswered tool
+       * response, so the next user message stays a turn of its own.
+       */
+      closeUnansweredToolResponseTurn() {
+        const turns = this.agentHistory.get();
+        let targetTurn = turns[turns.length - 1];
+        let hadEmptyTrailingModelTurn = false;
+        if (targetTurn?.content.role === "model" && (!targetTurn.content.parts || targetTurn.content.parts.length === 0)) {
+          hadEmptyTrailingModelTurn = true;
+          targetTurn = turns[turns.length - 2];
+        }
+        if (targetTurn?.content.role !== "user" || !targetTurn.content.parts?.some((part) => !!part.functionResponse)) {
+          return;
+        }
+        if (hadEmptyTrailingModelTurn) {
+          const lastTurn = turns[turns.length - 1];
+          lastTurn.content.parts = [{ text: INTERRUPTED_RESPONSE_PLACEHOLDER }];
+          this.chatRecordingService.updateMessagesFromHistory(turns);
+        } else {
+          this.agentHistory.push({
+            id: randomUUID8(),
+            content: {
+              role: "model",
+              parts: [{ text: INTERRUPTED_RESPONSE_PLACEHOLDER }]
+            }
+          });
+        }
+      }
       extractBinaryInjections(parts2) {
         const binaryParts = [];
         if (parts2) {
@@ -368809,10 +369004,14 @@ var init_geminiChat = __esm({
           if (this.onModelChanged) {
             this.tools = await this.onModelChanged(modelToUse);
           }
+          const normalizedContents = ensureTerminalUserTurn(contentsToUse);
+          if (normalizedContents !== contentsToUse) {
+            debugLogger.warn("Final contents do not end with a valid user turn. Normalizing contents to satisfy Gemini API invariant.");
+          }
           lastModelToUse = modelToUse;
           lastConfig = config2;
-          lastContentsToUse = contentsToUse;
-          const finalContents = stripToolCallIdPrefixes(contentsToUse);
+          lastContentsToUse = normalizedContents;
+          const finalContents = stripToolCallIdPrefixes(normalizedContents);
           return this.context.config.getContentGenerator().generateContentStream({
             model: modelToUse,
             contents: finalContents,
@@ -368910,6 +369109,25 @@ var init_geminiChat = __esm({
         }
         ensureStableToolIds(this.agentHistory.get());
       }
+      /**
+       * Removes the trailing model turn when it holds function calls that were
+       * never answered (e.g. every call in the batch was declined). Earlier
+       * completed tool rounds and the originating user prompt are kept, and the
+       * durable IDs of the remaining turns are preserved.
+       *
+       * @returns true when a turn was removed.
+       */
+      discardTrailingUnansweredToolCallTurn() {
+        const turns = this.agentHistory.get();
+        const last2 = turns[turns.length - 1];
+        if (last2?.content.role !== "model" || !last2.content.parts?.some((part) => !!part.functionCall)) {
+          return false;
+        }
+        this.agentHistory.rollback(turns.length - 1);
+        this.lastPromptTokenCount = estimateTokenCountSync(this.agentHistory.flatMap((c2) => c2.content.parts || []));
+        this.chatRecordingService.updateMessagesFromHistory(this.agentHistory.get());
+        return true;
+      }
       setHistory(history) {
         const wrappedHistory = history.map((item) => {
           if ("id" in item && "content" in item) {
@@ -376673,7 +376891,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 +380697,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) => {
@@ -380481,6 +380705,13 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
     portReject = reject;
   });
   let timeoutId;
+  const abortController = new AbortController();
+  const clearCallbackTimeout = () => {
+    if (timeoutId !== void 0) {
+      clearTimeout(timeoutId);
+      timeoutId = void 0;
+    }
+  };
   const responsePromise = new Promise((resolve23, reject) => {
     let serverPort;
     const server = http6.createServer(async (req, res) => {
@@ -380508,6 +380739,7 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
                 </body>
               </html>
             `);
+          clearCallbackTimeout();
           server.close();
           reject(new Error(`OAuth error: ${error2}`));
           return;
@@ -380522,13 +380754,15 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
           debugLogger.error(`OAuth callback state mismatch: received state "${state}", expected "${expectedState}". Possible CSRF attack.`);
           res.writeHead(400);
           res.end("Invalid state parameter");
+          clearCallbackTimeout();
           server.close();
           reject(new Error("State mismatch - possible CSRF attack"));
           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 +380777,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 +380793,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).');
         }
@@ -380573,14 +380809,17 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
               </body>
             </html>
           `);
+        clearCallbackTimeout();
         server.close();
         resolve23({ code, state, iss });
       } catch (error2) {
+        clearCallbackTimeout();
         server.close();
         reject(error2);
       }
     });
     server.on("error", (error2) => {
+      clearCallbackTimeout();
       portReject(error2);
       reject(error2);
     });
@@ -380604,23 +380843,31 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
       debugLogger.log(`OAuth callback server listening on port ${serverPort}`);
       portResolve(serverPort);
     });
-    const abortController = new AbortController();
     timeoutId = setTimeout(() => {
       abortController.abort(new Error("OAuth callback timeout"));
     }, 5 * 60 * 1e3);
     timeoutId.unref();
     const onAbort = () => {
-      server.close();
+      clearCallbackTimeout();
+      if (server.listening) {
+        server.close();
+      }
       reject(abortController.signal.reason);
     };
     abortController.signal.addEventListener("abort", onAbort, { once: true });
     server.on("close", () => {
+      clearCallbackTimeout();
       abortController.signal.removeEventListener("abort", onAbort);
     });
   });
   return {
     port: portPromise,
-    response: responsePromise
+    response: responsePromise,
+    cancel: (reason) => {
+      if (!abortController.signal.aborted) {
+        abortController.abort(reason ?? new Error("OAuth callback cancelled"));
+      }
+    }
   };
 }
 function getPortFromUrl(urlString) {
@@ -380829,6 +381076,7 @@ var init_oauth2_provider = __esm({
       type = "oauth2";
       tokenStorage;
       cachedToken = null;
+      pendingAuthPromise = null;
       /** Resolved OAuth URLs — may come from config or agent card. */
       authorizationUrl;
       tokenUrl;
@@ -380860,12 +381108,26 @@ var init_oauth2_provider = __esm({
       }
       /**
        * Return an Authorization header with a valid Bearer token.
-       * Refreshes or triggers interactive auth as needed.
+       * Refreshes or triggers interactive auth as needed, deduplicating concurrent requests.
        */
       async headers() {
         if (this.cachedToken && !this.tokenStorage.isTokenExpired(this.cachedToken)) {
+          this.authRetryCount = 0;
           return { Authorization: `Bearer ${this.cachedToken.accessToken}` };
         }
+        if (!this.pendingAuthPromise) {
+          this.pendingAuthPromise = this.acquireToken().finally(() => {
+            this.pendingAuthPromise = null;
+          });
+        }
+        const token2 = await this.pendingAuthPromise;
+        this.authRetryCount = 0;
+        return { Authorization: `Bearer ${token2.accessToken}` };
+      }
+      /**
+       * Refresh an expired token or run interactive browser-based authentication.
+       */
+      async acquireToken() {
         if (this.cachedToken?.refreshToken && this.tokenUrl && this.config.client_id) {
           try {
             const refreshed = await refreshAccessToken({
@@ -380875,31 +381137,50 @@ var init_oauth2_provider = __esm({
             }, this.cachedToken.refreshToken, this.tokenUrl);
             this.cachedToken = this.toOAuthToken(refreshed, this.cachedToken.refreshToken);
             await this.persistToken();
-            return { Authorization: `Bearer ${this.cachedToken.accessToken}` };
+            return this.cachedToken;
           } catch (error2) {
             debugLogger.debug(`[OAuth2AuthProvider] Refresh failed, falling back to interactive flow: ${getErrorMessage(error2)}`);
+            this.cachedToken = null;
             await this.tokenStorage.deleteCredentials(this.agentName);
           }
         }
         this.cachedToken = await this.authenticateInteractively();
-        return { Authorization: `Bearer ${this.cachedToken.accessToken}` };
+        return this.cachedToken;
+      }
+      /**
+       * Return the maximum number of consecutive authentication retries allowed.
+       */
+      getMaxAuthRetries() {
+        return BaseA2AAuthProvider.MAX_AUTH_RETRIES;
       }
       /**
        * On 401/403, clear the cached token and re-authenticate (up to MAX_AUTH_RETRIES).
        */
-      async shouldRetryWithHeaders(_req, res) {
+      async shouldRetryWithHeaders(req, res) {
         if (res.status !== 401 && res.status !== 403) {
           this.authRetryCount = 0;
           return void 0;
         }
-        if (this.authRetryCount >= BaseA2AAuthProvider.MAX_AUTH_RETRIES) {
+        const reqHeaders = new Headers(req.headers);
+        const reqToken = reqHeaders.get("Authorization")?.split(" ")[1];
+        if (reqToken && (!this.cachedToken || reqToken !== this.cachedToken.accessToken)) {
+          debugLogger.debug("[OAuth2AuthProvider] Token already cleared or updated by another request, retrying with new token");
+          const retryCount = this.authRetryCount;
+          const headers2 = await this.headers();
+          this.authRetryCount = Math.max(this.authRetryCount, retryCount);
+          return headers2;
+        }
+        if (this.authRetryCount >= this.getMaxAuthRetries()) {
           return void 0;
         }
-        this.authRetryCount++;
+        const nextRetryCount = this.authRetryCount + 1;
+        this.authRetryCount = nextRetryCount;
         debugLogger.debug("[OAuth2AuthProvider] Auth failure, clearing token and re-authenticating");
         this.cachedToken = null;
         await this.tokenStorage.deleteCredentials(this.agentName);
-        return this.headers();
+        const headers = await this.headers();
+        this.authRetryCount = nextRetryCount;
+        return headers;
       }
       // ---------------------------------------------------------------------------
       // Private helpers
@@ -380967,7 +381248,11 @@ var init_oauth2_provider = __esm({
         );
         const consent = await getConsentForOauth(`Authentication required for A2A agent: '${this.agentName}'.`);
         if (!consent) {
-          throw new FatalCancellationError("Authentication cancelled by user.");
+          const cancelError = new FatalCancellationError("Authentication cancelled by user.");
+          callbackServer.response.catch(() => {
+          });
+          callbackServer.cancel?.(cancelError);
+          throw cancelError;
         }
         coreEvents.emitFeedback("info", `\u2192 Opening your browser for OAuth sign-in...
 
@@ -387642,6 +387927,21 @@ var init_client3 = __esm({
         this.updateTelemetryTokenCount();
         this.forceFullIdeContext = true;
       }
+      /**
+       * Removes the trailing model turn when it only holds unanswered function
+       * calls. See {@link GeminiChat.discardTrailingUnansweredToolCallTurn}.
+       * Returns false without side effects when the chat is not initialized.
+       */
+      discardTrailingUnansweredToolCallTurn() {
+        if (!this.isInitialized()) {
+          return false;
+        }
+        const removed = this.getChat().discardTrailingUnansweredToolCallTurn();
+        if (removed) {
+          this.updateTelemetryTokenCount();
+        }
+        return removed;
+      }
       lastUsedModelId;
       async setTools(modelId) {
         if (!this.chat) {
@@ -410196,6 +410496,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 +410520,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 +410533,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 +410931,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 +411348,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}'...`);
@@ -413257,11 +413562,11 @@ function fromTimestamp(t3) {
   millis += (t3.nanos || 0) / 1e6;
   return new globalThis.Date(millis).toISOString();
 }
-var import_grpc_js, Empty, Struct, Struct_FieldsEntry, Value, ListValue, Timestamp, SendMessageConfiguration2, Task3, TaskStatus3, Part2, FilePart2, DataPart2, Message2, Artifact2, TaskStatusUpdateEvent2, TaskArtifactUpdateEvent2, PushNotificationConfig2, AuthenticationInfo2, AgentInterface2, AgentCard3, AgentCard_SecuritySchemesEntry, AgentProvider2, AgentCapabilities2, AgentExtension2, AgentSkill2, AgentCardSignature2, TaskPushNotificationConfig3, StringList2, Security2, Security_SchemesEntry, SecurityScheme2, APIKeySecurityScheme2, HTTPAuthSecurityScheme2, OAuth2SecurityScheme2, OpenIdConnectSecurityScheme2, MutualTlsSecurityScheme2, OAuthFlows2, AuthorizationCodeOAuthFlow2, AuthorizationCodeOAuthFlow_ScopesEntry, ClientCredentialsOAuthFlow2, ClientCredentialsOAuthFlow_ScopesEntry, ImplicitOAuthFlow2, ImplicitOAuthFlow_ScopesEntry, PasswordOAuthFlow2, PasswordOAuthFlow_ScopesEntry, SendMessageRequest3, GetTaskRequest, CancelTaskRequest, GetTaskPushNotificationConfigRequest, DeleteTaskPushNotificationConfigRequest, CreateTaskPushNotificationConfigRequest, TaskSubscriptionRequest, ListTaskPushNotificationConfigRequest, GetAgentCardRequest, SendMessageResponse3, StreamResponse3, ListTaskPushNotificationConfigResponse3, A2AServiceService, A2AServiceClient;
+var import_grpc_js2, Empty, Struct, Struct_FieldsEntry, Value, ListValue, Timestamp, SendMessageConfiguration2, Task3, TaskStatus3, Part2, FilePart2, DataPart2, Message2, Artifact2, TaskStatusUpdateEvent2, TaskArtifactUpdateEvent2, PushNotificationConfig2, AuthenticationInfo2, AgentInterface2, AgentCard3, AgentCard_SecuritySchemesEntry, AgentProvider2, AgentCapabilities2, AgentExtension2, AgentSkill2, AgentCardSignature2, TaskPushNotificationConfig3, StringList2, Security2, Security_SchemesEntry, SecurityScheme2, APIKeySecurityScheme2, HTTPAuthSecurityScheme2, OAuth2SecurityScheme2, OpenIdConnectSecurityScheme2, MutualTlsSecurityScheme2, OAuthFlows2, AuthorizationCodeOAuthFlow2, AuthorizationCodeOAuthFlow_ScopesEntry, ClientCredentialsOAuthFlow2, ClientCredentialsOAuthFlow_ScopesEntry, ImplicitOAuthFlow2, ImplicitOAuthFlow_ScopesEntry, PasswordOAuthFlow2, PasswordOAuthFlow_ScopesEntry, SendMessageRequest3, GetTaskRequest, CancelTaskRequest, GetTaskPushNotificationConfigRequest, DeleteTaskPushNotificationConfigRequest, CreateTaskPushNotificationConfigRequest, TaskSubscriptionRequest, ListTaskPushNotificationConfigRequest, GetAgentCardRequest, SendMessageResponse3, StreamResponse3, ListTaskPushNotificationConfigResponse3, A2AServiceService, A2AServiceClient;
 var init_chunk_QQCCX2KH = __esm({
   "packages/core/node_modules/@a2a-js/sdk/dist/chunk-QQCCX2KH.js"() {
     init_wire();
-    import_grpc_js = __toESM(require_src24(), 1);
+    import_grpc_js2 = __toESM(require_src24(), 1);
     init_wire();
     init_wire();
     init_wire();
@@ -416371,7 +416676,7 @@ var init_chunk_QQCCX2KH = __esm({
         responseDeserialize: (value) => Empty.decode(value)
       }
     };
-    A2AServiceClient = (0, import_grpc_js.makeGenericClientConstructor)(A2AServiceService, "a2a.v1.A2AService");
+    A2AServiceClient = (0, import_grpc_js2.makeGenericClientConstructor)(A2AServiceService, "a2a.v1.A2AService");
   }
 });
 
@@ -417357,6 +417662,7 @@ var init_config4 = __esm({
           target: params.telemetry?.target ?? DEFAULT_TELEMETRY_TARGET,
           otlpEndpoint: params.telemetry?.otlpEndpoint ?? DEFAULT_OTLP_ENDPOINT,
           otlpProtocol: params.telemetry?.otlpProtocol,
+          otlpHeaders: params.telemetry?.otlpHeaders,
           logPrompts: params.telemetry?.logPrompts ?? true,
           outfile: params.telemetry?.outfile,
           useCollector: params.telemetry?.useCollector,
@@ -418615,6 +418921,9 @@ ${sections.join("\n")}
       getTelemetryOtlpProtocol() {
         return this.telemetrySettings.otlpProtocol ?? "grpc";
       }
+      getTelemetryOtlpHeaders() {
+        return this.telemetrySettings.otlpHeaders ?? {};
+      }
       getTelemetryTarget() {
         return this.telemetrySettings.target ?? DEFAULT_TELEMETRY_TARGET;
       }