@google/gemini-cli-a2a-server 0.41.0-preview.1 → 0.42.0-nightly.20260501.gcaa046641

package/dist/a2a-server.mjs

@@ -126051,8 +126051,10 @@ var init_events = __esm({
       /**
        * Flushes buffered messages. Call this immediately after primary UI listener
        * subscribes.
+       *
+       * @param transform - Optional function to transform events before they are emitted.
        */
-      drainBacklogs() {
+      drainBacklogs(transform2) {
         const backlog = this._eventBacklog;
         const head = this._backlogHead;
         this._eventBacklog = [];
@@ -126061,7 +126063,16 @@ var init_events = __esm({
           const item = backlog[i3];
           if (item === void 0)
             continue;
-          this.emit(item.event, ...item.args);
+          let eventToEmit = item.event;
+          let argsToEmit = item.args;
+          if (transform2) {
+            const transformed = transform2(item.event, item.args);
+            if (!transformed)
+              continue;
+            eventToEmit = transformed.event;
+            argsToEmit = transformed.args;
+          }
+          this.emit(eventToEmit, ...argsToEmit);
         }
       }
       emitTelemetryKeychainAvailability(event) {
@@ -209422,8 +209433,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 = "7d233ddd5";
-    CLI_VERSION = "0.41.0-preview.1";
+    GIT_COMMIT_INFO = "caa046641";
+    CLI_VERSION = "0.42.0-nightly.20260501.gcaa046641";
   }
 });
 
@@ -280351,6 +280362,7 @@ var init_chatRecordingService = __esm({
        */
       async deleteSessionAndArtifacts(chatsDir, file, tempDir) {
         const filePath = path27.join(chatsDir, file);
+        let fullSessionId;
         try {
           const CHUNK_SIZE = 4096;
           const buffer = Buffer.alloc(CHUNK_SIZE);
@@ -280359,31 +280371,66 @@ var init_chatRecordingService = __esm({
           try {
             fd = await fs35.promises.open(filePath, "r");
             const { bytesRead } = await fd.read(buffer, 0, CHUNK_SIZE, 0);
-            if (bytesRead === 0) {
-              await fd.close();
-              await fs35.promises.unlink(filePath);
-              return;
+            if (bytesRead > 0) {
+              const contentChunk = buffer.toString("utf8", 0, bytesRead);
+              const newlineIndex = contentChunk.indexOf("\n");
+              firstLine = newlineIndex !== -1 ? contentChunk.substring(0, newlineIndex) : contentChunk;
+              try {
+                const content = JSON.parse(firstLine);
+                if (isSessionIdRecord(content)) {
+                  fullSessionId = content.sessionId;
+                }
+              } catch {
+              }
             }
-            const contentChunk = buffer.toString("utf8", 0, bytesRead);
-            const newlineIndex = contentChunk.indexOf("\n");
-            firstLine = newlineIndex !== -1 ? contentChunk.substring(0, newlineIndex) : contentChunk;
           } finally {
             if (fd !== void 0) {
               await fd.close();
             }
           }
-          const content = JSON.parse(firstLine);
-          let fullSessionId;
-          if (isSessionIdRecord(content)) {
-            fullSessionId = content["sessionId"];
+          if (!fullSessionId) {
+            try {
+              const fileContent = await fs35.promises.readFile(filePath, "utf8");
+              const parsed = JSON.parse(fileContent);
+              if (isSessionIdRecord(parsed)) {
+                fullSessionId = parsed.sessionId;
+              }
+            } catch {
+            }
           }
-          await fs35.promises.unlink(filePath);
           if (fullSessionId) {
             await deleteSessionArtifactsAsync(fullSessionId, tempDir);
             await deleteSubagentSessionDirAndArtifactsAsync(fullSessionId, chatsDir, tempDir);
           }
         } catch (error2) {
-          debugLogger.error(`Error deleting associated file ${file}:`, error2);
+          debugLogger.error(`Error deleting artifacts for session file ${file}:`, error2);
+        } finally {
+          try {
+            await fs35.promises.unlink(filePath);
+          } catch (error2) {
+            if (isNodeError(error2) && error2.code !== "ENOENT") {
+              debugLogger.error(`Error unlinking session file ${file}:`, error2);
+            }
+          }
+        }
+      }
+      /**
+       * Asynchronously deletes the current session's chat file and tool outputs.
+       * This encapsulates the session ID logic and uses non-blocking I/O to avoid
+       * blocking the event loop on exit.
+       */
+      async deleteCurrentSessionAsync() {
+        if (!this.conversationFile) {
+          return;
+        }
+        try {
+          const tempDir = this.context.config.storage.getProjectTempDir();
+          await fs35.promises.unlink(this.conversationFile).catch(() => {
+          });
+          await deleteSessionArtifactsAsync(this.sessionId, tempDir);
+        } catch (error2) {
+          debugLogger.error("Error deleting current session.", error2);
+          throw error2;
         }
       }
       /**
@@ -329384,7 +329431,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.41.0-preview.1";
+    return "0.42.0-nightly.20260501.gcaa046641";
   })();
   return versionPromise;
 }
@@ -330218,14 +330265,36 @@ var init_errorClassification = __esm({
 
 // packages/core/dist/src/availability/policyCatalog.js
 function getModelPolicyChain(options) {
+  const isAuto = options.isAutoSelection ?? false;
   if (options.previewEnabled) {
-    const previewModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useGemini31FlashLite, options.useCustomToolModel);
+    const proModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useGemini31FlashLite, options.useCustomToolModel);
     return [
-      definePolicy({ model: previewModel }),
-      definePolicy({ model: PREVIEW_GEMINI_FLASH_MODEL, isLastResort: true })
+      definePolicy({
+        model: proModel,
+        ...isAuto ? {
+          maxAttempts: 3,
+          actions: { ...DEFAULT_ACTIONS, transient: "silent" },
+          stateTransitions: { ...DEFAULT_STATE, transient: "sticky_retry" }
+        } : {}
+      }),
+      definePolicy({
+        model: PREVIEW_GEMINI_FLASH_MODEL,
+        isLastResort: true,
+        maxAttempts: 10
+      })
     ];
   }
-  return cloneChain(DEFAULT_CHAIN);
+  return [
+    definePolicy({
+      model: DEFAULT_GEMINI_MODEL,
+      ...isAuto ? AUTO_ROUTING_OVERRIDES : {}
+    }),
+    definePolicy({
+      model: DEFAULT_GEMINI_FLASH_MODEL,
+      isLastResort: true,
+      maxAttempts: 10
+    })
+  ];
 }
 function createSingleModelChain(model) {
   return [definePolicy({ model, isLastResort: true })];
@@ -330240,6 +330309,7 @@ function definePolicy(config3) {
   return {
     model: config3.model,
     isLastResort: config3.isLastResort,
+    maxAttempts: config3.maxAttempts,
     actions: { ...DEFAULT_ACTIONS, ...config3.actions ?? {} },
     stateTransitions: {
       ...DEFAULT_STATE,
@@ -330257,7 +330327,7 @@ function clonePolicy(policy) {
 function cloneChain(chain2) {
   return chain2.map(clonePolicy);
 }
-var DEFAULT_ACTIONS, SILENT_ACTIONS, DEFAULT_STATE, DEFAULT_CHAIN, FLASH_LITE_CHAIN;
+var DEFAULT_ACTIONS, SILENT_ACTIONS, DEFAULT_STATE, AUTO_ROUTING_OVERRIDES, FLASH_LITE_CHAIN;
 var init_policyCatalog = __esm({
   "packages/core/dist/src/availability/policyCatalog.js"() {
     "use strict";
@@ -330276,14 +330346,18 @@ var init_policyCatalog = __esm({
     };
     DEFAULT_STATE = {
       terminal: "terminal",
-      transient: "sticky_retry",
+      transient: "terminal",
       not_found: "terminal",
       unknown: "terminal"
     };
-    DEFAULT_CHAIN = [
-      definePolicy({ model: DEFAULT_GEMINI_MODEL }),
-      definePolicy({ model: DEFAULT_GEMINI_FLASH_MODEL, isLastResort: true })
-    ];
+    AUTO_ROUTING_OVERRIDES = {
+      maxAttempts: 3,
+      actions: { ...DEFAULT_ACTIONS, transient: "silent" },
+      stateTransitions: {
+        ...DEFAULT_STATE,
+        transient: "sticky_retry"
+      }
+    };
     FLASH_LITE_CHAIN = [
       definePolicy({
         model: DEFAULT_GEMINI_FLASH_LITE_MODEL,
@@ -330322,14 +330396,16 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
     };
     if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
       chain2 = config3.modelConfigService.resolveChain("lite", context2);
-    } else if (isGemini3Model(resolvedModel, config3) || isAutoModel(preferredModel ?? "", config3) || isAutoModel(configuredModel, config3)) {
-      if (isAutoModel(configuredModel, config3) && config3.modelConfigService.getModelChain(configuredModel)) {
+    } else if (isGemini3Model(resolvedModel, config3) || isAutoPreferred || isAutoConfigured) {
+      if (isAutoConfigured && config3.modelConfigService.getModelChain(configuredModel)) {
         chain2 = config3.modelConfigService.resolveChain(configuredModel, context2);
       }
       if (!chain2) {
+        const isAutoSelection = isAutoPreferred || isAutoConfigured;
         const previewEnabled = hasAccessToPreview && (isGemini3Model(resolvedModel, config3) || preferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO);
+        const autoPrefix = isAutoSelection ? "auto-" : "";
         const chainKey = previewEnabled ? "preview" : "default";
-        chain2 = config3.modelConfigService.resolveChain(chainKey, context2);
+        chain2 = config3.modelConfigService.resolveChain(`${autoPrefix}${chainKey}`, context2);
       }
     }
     if (!chain2) {
@@ -330340,10 +330416,12 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
     if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
       chain2 = getFlashLitePolicyChain();
     } else if (isGemini3Model(resolvedModel, config3) || isAutoPreferred || isAutoConfigured) {
+      const isAutoSelection = isAutoPreferred || isAutoConfigured;
       if (hasAccessToPreview) {
         const previewEnabled = isGemini3Model(resolvedModel, config3) || preferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO;
         chain2 = getModelPolicyChain({
           previewEnabled,
+          isAutoSelection,
           userTier: config3.getUserTier(),
           useGemini31,
           useGemini31FlashLite,
@@ -330352,6 +330430,7 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
       } else {
         chain2 = getModelPolicyChain({
           previewEnabled: false,
+          isAutoSelection,
           userTier: config3.getUserTier(),
           useGemini31,
           useGemini31FlashLite,
@@ -330431,10 +330510,12 @@ function applyModelSelection(config3, modelConfigKey, options = {}) {
   if (selection.attempts && options.consumeAttempt !== false) {
     config3.getModelAvailabilityService().consumeStickyAttempt(finalModel);
   }
+  const chain2 = resolvePolicyChain(config3, finalModel);
+  const policy = chain2.find((p2) => p2.model === finalModel);
   return {
     model: finalModel,
     config: generateContentConfig,
-    maxAttempts: selection.attempts
+    maxAttempts: selection.attempts ?? policy?.maxAttempts
   };
 }
 function applyAvailabilityTransition(getContext, failureKind) {
@@ -330447,7 +330528,8 @@ function applyAvailabilityTransition(getContext, failureKind) {
   if (transition === "terminal") {
     context2.service.markTerminal(context2.policy.model, failureKind === "terminal" ? "quota" : "capacity");
   } else if (transition === "sticky_retry") {
-    context2.service.markRetryOncePerTurn(context2.policy.model);
+    context2.service.markRetryOncePerTurn(context2.policy.model, context2.policy.maxAttempts);
+    context2.service.consumeStickyAttempt(context2.policy.model);
   }
 }
 var init_policyHelpers = __esm({
@@ -330752,6 +330834,7 @@ async function retryWithBackoff(fn2, options) {
     shouldRetryOnError: isRetryableError,
     ...cleanOptions
   };
+  const getCurrentMaxAttempts = () => getAvailabilityContext?.()?.policy.maxAttempts ?? maxAttempts;
   let attempt = 0;
   let currentDelay = initialDelayMs;
   const throwIfAborted = () => {
@@ -330759,7 +330842,7 @@ async function retryWithBackoff(fn2, options) {
       throw createAbortError();
     }
   };
-  while (attempt < maxAttempts) {
+  while (attempt < getCurrentMaxAttempts()) {
     if (signal?.aborted) {
       throw createAbortError();
     }
@@ -330823,7 +330906,7 @@ async function retryWithBackoff(fn2, options) {
       }
       const is500 = errorCode !== void 0 && errorCode >= 500 && errorCode < 600;
       if (classifiedError instanceof RetryableQuotaError || is500) {
-        if (attempt >= maxAttempts) {
+        if (attempt >= getCurrentMaxAttempts()) {
           const errorMessage = classifiedError instanceof Error ? classifiedError.message : "";
           debugLogger.warn(`Attempt ${attempt} failed${errorMessage ? `: ${errorMessage}` : ""}. Max attempts reached`);
           if (onPersistent429) {
@@ -330864,7 +330947,7 @@ async function retryWithBackoff(fn2, options) {
           continue;
         }
       }
-      if (attempt >= maxAttempts || // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      if (attempt >= getCurrentMaxAttempts() || // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       !shouldRetryOnError(error2, retryFetchErrors)) {
         throw error2;
       }
@@ -330927,8 +331010,11 @@ var init_retry = __esm({
       "EAI_AGAIN",
       "ECONNREFUSED",
       "ERR_SSL_WRONG_VERSION_NUMBER",
-      "EPROTO"
+      "EPROTO",
       // Generic protocol error (often SSL-related)
+      "UND_ERR_HEADERS_TIMEOUT",
+      "UND_ERR_BODY_TIMEOUT",
+      "UND_ERR_CONNECT_TIMEOUT"
     ];
     RETRYABLE_SSL_ERROR_PATTERN = /^ERR_SSL_.*BAD_RECORD_MAC/i;
     FETCH_FAILED_MESSAGE = "fetch failed";
@@ -331077,7 +331163,7 @@ var init_baseLlmClient = __esm({
             authType: this.authType ?? this.config.getContentGeneratorConfig()?.authType,
             retryFetchErrors: this.config.getRetryFetchErrors(),
             onRetry: (attempt, error2, delayMs) => {
-              const actualMaxAttempts = availabilityMaxAttempts ?? maxAttempts ?? DEFAULT_MAX_ATTEMPTS2;
+              const actualMaxAttempts = getAvailabilityContext()?.policy.maxAttempts ?? maxAttempts ?? DEFAULT_MAX_ATTEMPTS2;
               const modelName = getDisplayString(currentModel);
               const errorType = getRetryErrorType(error2);
               coreEvents.emitRetryAttempt({
@@ -332896,24 +332982,26 @@ var init_telemetry2 = __esm({
 });
 
 // packages/core/dist/src/utils/channel.js
+function getChannelFromVersion(version4) {
+  if (!version4 || version4.includes("nightly")) {
+    return ReleaseChannel.NIGHTLY;
+  }
+  if (version4.includes("preview")) {
+    return ReleaseChannel.PREVIEW;
+  }
+  return ReleaseChannel.STABLE;
+}
 async function getReleaseChannel(cwd) {
   if (cache.has(cwd)) {
     return cache.get(cwd);
   }
   const packageJson4 = await getPackageJson(cwd);
   const version4 = packageJson4?.version ?? "";
-  let channel;
-  if (version4.includes("nightly") || version4 === "") {
-    channel = ReleaseChannel.NIGHTLY;
-  } else if (version4.includes("preview")) {
-    channel = ReleaseChannel.PREVIEW;
-  } else {
-    channel = ReleaseChannel.STABLE;
-  }
+  const channel = getChannelFromVersion(version4);
   cache.set(cwd, channel);
   return channel;
 }
-var ReleaseChannel, cache;
+var ReleaseChannel, RELEASE_CHANNEL_STABILITY, cache;
 var init_channel = __esm({
   "packages/core/dist/src/utils/channel.js"() {
     "use strict";
@@ -332923,6 +333011,11 @@ var init_channel = __esm({
       ReleaseChannel2["PREVIEW"] = "preview";
       ReleaseChannel2["STABLE"] = "stable";
     })(ReleaseChannel || (ReleaseChannel = {}));
+    RELEASE_CHANNEL_STABILITY = {
+      [ReleaseChannel.NIGHTLY]: 0,
+      [ReleaseChannel.PREVIEW]: 1,
+      [ReleaseChannel.STABLE]: 2
+    };
     cache = /* @__PURE__ */ new Map();
   }
 });
@@ -334245,15 +334338,11 @@ var init_recordingContentGenerator = __esm({
 // packages/core/dist/src/core/contentGenerator.js
 import * as os25 from "node:os";
 function validateBaseUrl(baseUrl) {
-  let url5;
   try {
-    url5 = new URL(baseUrl);
+    new URL(baseUrl);
   } catch {
     throw new Error(`Invalid custom base URL: ${baseUrl}`);
   }
-  if (url5.protocol !== "https:" && !LOCAL_HOSTNAMES.includes(url5.hostname)) {
-    throw new Error("Custom base URL must use HTTPS unless it is localhost.");
-  }
 }
 async function createContentGeneratorConfig(config3, authType, apiKey, baseUrl, customHeaders, vertexAiRouting) {
   const geminiApiKey = apiKey || process.env["GEMINI_API_KEY"] || await loadApiKey() || void 0;
@@ -334383,7 +334472,7 @@ async function createContentGenerator(config3, gcConfig, sessionId) {
   }
   return generator;
 }
-var AuthType2, LOCAL_HOSTNAMES, VERTEX_AI_REQUEST_TYPE_HEADER, VERTEX_AI_SHARED_REQUEST_TYPE_HEADER;
+var AuthType2, VERTEX_AI_REQUEST_TYPE_HEADER, VERTEX_AI_SHARED_REQUEST_TYPE_HEADER;
 var init_contentGenerator = __esm({
   "packages/core/dist/src/core/contentGenerator.js"() {
     "use strict";
@@ -334406,7 +334495,6 @@ var init_contentGenerator = __esm({
       AuthType3["COMPUTE_ADC"] = "compute-default-credentials";
       AuthType3["GATEWAY"] = "gateway";
     })(AuthType2 || (AuthType2 = {}));
-    LOCAL_HOSTNAMES = ["localhost", "127.0.0.1", "[::1]"];
     VERTEX_AI_REQUEST_TYPE_HEADER = "X-Vertex-AI-LLM-Request-Type";
     VERTEX_AI_SHARED_REQUEST_TYPE_HEADER = "X-Vertex-AI-LLM-Shared-Request-Type";
   }
@@ -344028,7 +344116,7 @@ var init_grep = __esm({
           const grepAvailable = await this.isCommandAvailable("grep");
           if (grepAvailable) {
             strategyUsed = "system grep";
-            const grepArgs = ["-r", "-n", "-H", "-E", "-I"];
+            const grepArgs = ["-r", "-n", "-H", "-E", "-I", "-i"];
             const globExcludes = this.fileExclusions.getGlobExcludes();
             const commonExcludes = globExcludes.map((pattern2) => {
               let dir = pattern2;
@@ -357124,13 +357212,13 @@ function updateGlobalFetchTimeouts(timeoutMs) {
   if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
     throw new RangeError(`Invalid timeout value: ${timeoutMs}. Must be a positive finite number.`);
   }
-  defaultTimeout = timeoutMs;
+  defaultHeadersTimeout = timeoutMs;
   if (currentProxy) {
     setGlobalProxy(currentProxy);
   } else {
     (0, import_undici2.setGlobalDispatcher)(new import_undici2.Agent({
-      headersTimeout: defaultTimeout,
-      bodyTimeout: defaultTimeout
+      headersTimeout: defaultHeadersTimeout,
+      bodyTimeout: defaultBodyTimeout
     }));
   }
 }
@@ -357201,11 +357289,11 @@ function setGlobalProxy(proxy2) {
   currentProxy = proxy2;
   (0, import_undici2.setGlobalDispatcher)(new import_undici2.ProxyAgent({
     uri: proxy2,
-    headersTimeout: defaultTimeout,
-    bodyTimeout: defaultTimeout
+    headersTimeout: defaultHeadersTimeout,
+    bodyTimeout: defaultBodyTimeout
   }));
 }
-var import_undici2, import_ipaddr, FetchError2, defaultTimeout, currentProxy, IANA_BENCHMARK_RANGE;
+var import_undici2, import_ipaddr, FetchError2, defaultHeadersTimeout, defaultBodyTimeout, currentProxy, IANA_BENCHMARK_RANGE;
 var init_fetch = __esm({
   "packages/core/dist/src/utils/fetch.js"() {
     "use strict";
@@ -357220,11 +357308,12 @@ var init_fetch = __esm({
         this.name = "FetchError";
       }
     };
-    defaultTimeout = 3e5;
+    defaultHeadersTimeout = 6e4;
+    defaultBodyTimeout = 3e5;
     currentProxy = void 0;
     (0, import_undici2.setGlobalDispatcher)(new import_undici2.Agent({
-      headersTimeout: defaultTimeout,
-      bodyTimeout: defaultTimeout
+      headersTimeout: defaultHeadersTimeout,
+      bodyTimeout: defaultBodyTimeout
     }));
     IANA_BENCHMARK_RANGE = import_ipaddr.default.parseCIDR("198.18.0.0/15");
   }
@@ -364933,7 +365022,7 @@ ${options.planModeToolsList}
    - **Inquiries:** If the request is an **Inquiry** (e.g., "How does X work?"), answer directly. DO NOT create a plan.
    - **Directives:** If the request is a **Directive** (e.g., "Fix bug Y"), follow the workflow below.
 5. **Plan Storage:** Save plans as Markdown (.md) using descriptive filenames.
-6. **Direct Modification:** If asked to modify code, explain you are in Plan Mode and use ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} to request approval.
+6. **Direct Modification:** If asked to modify code, explain you are in Plan Mode and use the built-in ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} tool to request approval. **CRITICAL: NEVER attempt to call this tool via ${formatToolName(SHELL_TOOL_NAME)}.**
 7. **Presenting Plan:** When seeking informal agreement on a plan, or any time the user asks to see the plan, you MUST output the full content of the plan in the chat response. This overrides the "Minimal Output" guideline.
 
 ## Planning Workflow
@@ -364957,7 +365046,7 @@ Write the implementation plan to \`${options.plansDir}/\`. The plan's structure
 - **Complex Tasks:** Include **Background & Motivation**, **Scope & Impact**, **Proposed Solution**, **Alternatives Considered**, a phased **Implementation Plan**, **Verification**, and **Migration & Rollback** strategies.${options.interactive ? "\n- **Alignment Check:** After drafting the plan, you MUST present it to the user in the chat (adhering to Rule 7 for presenting plans) to ensure alignment on the specific details. Ask for feedback or confirmation, and proceed to Step 4 (Review & Approval) once the user agrees with the detailed plan." : ""}
 
 ### 4. Review & Approval
-ONLY use the ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} tool to present the plan for formal approval AFTER you have reached an informal agreement with the user in the chat regarding the proposed strategy. When called, this tool will present the plan and ${options.interactive ? "formally request approval." : "begin implementation."}
+ONLY use the built-in ${formatToolName(EXIT_PLAN_MODE_TOOL_NAME)} tool to present the plan for formal approval AFTER you have reached an informal agreement with the user in the chat regarding the proposed strategy. **CRITICAL: NEVER attempt to call this tool via ${formatToolName(SHELL_TOOL_NAME)}.** When called, this tool will present the plan and ${options.interactive ? "formally request approval." : "begin implementation."}
 
 ${renderApprovedPlanSection(options.approvedPlanPath)}`.trim();
 }
@@ -365582,7 +365671,7 @@ ${options.planModeToolsList}
 - Save the implementation plan to the designated plans directory
 
 ### Phase 4: Review & Approval
-- Present the plan and request approval for the finalized plan using the \`${EXIT_PLAN_MODE_TOOL_NAME}\` tool
+- Present the plan and request approval for the finalized plan using the built-in \`${EXIT_PLAN_MODE_TOOL_NAME}\` tool. **CRITICAL: NEVER attempt to call this tool via \`${SHELL_TOOL_NAME}\`.**
 - If plan is approved, you can begin implementation
 - If plan is rejected, address the feedback and iterate on the plan
 
@@ -369982,7 +370071,12 @@ function convertFrontmatterAuthToConfig(frontmatter) {
         client_secret: frontmatter.client_secret,
         scopes: frontmatter.scopes,
         authorization_url: frontmatter.authorization_url,
-        token_url: frontmatter.token_url
+        token_url: frontmatter.token_url,
+        issuer: frontmatter.issuer,
+        audiences: frontmatter.audiences,
+        redirect_uri: frontmatter.redirect_uri,
+        token_param_name: frontmatter.token_param_name,
+        registration_url: frontmatter.registration_url
       };
     default: {
       const exhaustive = frontmatter;
@@ -370048,7 +370142,12 @@ function markdownToAgentDefinition(markdown, metadata2) {
             clientSecret: config3.auth.client_secret,
             scopes: config3.auth.scopes,
             authorizationUrl: config3.auth.authorization_url,
-            tokenUrl: config3.auth.token_url
+            tokenUrl: config3.auth.token_url,
+            issuer: config3.auth.issuer,
+            audiences: config3.auth.audiences,
+            redirectUri: config3.auth.redirect_uri,
+            tokenParamName: config3.auth.token_param_name,
+            registrationUrl: config3.auth.registration_url
           };
         }
       }
@@ -370184,7 +370283,12 @@ var init_agentLoader = __esm({
           client_secret: external_exports.string().optional(),
           scopes: external_exports.array(external_exports.string()).optional(),
           authorization_url: external_exports.string().url().optional(),
-          token_url: external_exports.string().url().optional()
+          token_url: external_exports.string().url().optional(),
+          issuer: external_exports.string().url().optional(),
+          audiences: external_exports.array(external_exports.string()).optional(),
+          redirect_uri: external_exports.string().url().optional(),
+          token_param_name: external_exports.string().optional(),
+          registration_url: external_exports.string().url().optional()
         })
       ]).optional()
     });
@@ -370230,7 +370334,12 @@ var init_agentLoader = __esm({
       client_secret: external_exports.string().optional(),
       scopes: external_exports.array(external_exports.string()).optional(),
       authorization_url: external_exports.string().url().optional(),
-      token_url: external_exports.string().url().optional()
+      token_url: external_exports.string().url().optional(),
+      issuer: external_exports.string().url().optional(),
+      audiences: external_exports.array(external_exports.string()).optional(),
+      redirect_uri: external_exports.string().url().optional(),
+      token_param_name: external_exports.string().optional(),
+      registration_url: external_exports.string().url().optional()
     });
     authConfigSchema = external_exports.discriminatedUnion("type", [
       apiKeyAuthSchema,
@@ -384887,7 +384996,7 @@ var init_a2aUtils = __esm({
         if (message.role === "user")
           return;
         const text = extractPartsText(message.parts, "");
-        if (text && this.messageLog[this.messageLog.length - 1] !== text) {
+        if (text && this.messageLog.at(-1) !== text) {
           this.messageLog.push(text);
         }
       }
@@ -393213,7 +393322,7 @@ var init_modelAvailabilityService = __esm({
       markHealthy(model) {
         this.clearState(model);
       }
-      markRetryOncePerTurn(model) {
+      markRetryOncePerTurn(model, attempts = 1) {
         const currentState = this.health.get(model);
         if (currentState?.status === "terminal") {
           return;
@@ -393225,7 +393334,8 @@ var init_modelAvailabilityService = __esm({
         this.setState(model, {
           status: "sticky_retry",
           reason: "retry_once_per_turn",
-          consumed
+          consumed,
+          attempts
         });
       }
       consumeStickyAttempt(model) {
@@ -393253,7 +393363,7 @@ var init_modelAvailabilityService = __esm({
           const snapshot = this.snapshot(model);
           if (snapshot.available) {
             const state = this.health.get(model);
-            const attempts = state?.status === "sticky_retry" ? 1 : void 0;
+            const attempts = state?.status === "sticky_retry" ? state.attempts : void 0;
             return { selectedModel: model, skipped, attempts };
           } else {
             skipped.push({ model, reason: snapshot.reason ?? "unknown" });
@@ -394596,7 +394706,7 @@ var init_defaultModelConfigs = __esm({
             },
             stateTransitions: {
               terminal: "terminal",
-              transient: "sticky_retry",
+              transient: "terminal",
               not_found: "terminal",
               unknown: "terminal"
             }
@@ -394604,18 +394714,54 @@ var init_defaultModelConfigs = __esm({
           {
             model: "gemini-3-flash-preview",
             isLastResort: true,
+            maxAttempts: 10,
             actions: {
               terminal: "prompt",
               transient: "prompt",
               not_found: "prompt",
               unknown: "prompt"
             },
+            stateTransitions: {
+              terminal: "terminal",
+              transient: "terminal",
+              not_found: "terminal",
+              unknown: "terminal"
+            }
+          }
+        ],
+        "auto-preview": [
+          {
+            model: "gemini-3-pro-preview",
+            maxAttempts: 3,
+            actions: {
+              terminal: "prompt",
+              transient: "silent",
+              not_found: "prompt",
+              unknown: "prompt"
+            },
             stateTransitions: {
               terminal: "terminal",
               transient: "sticky_retry",
               not_found: "terminal",
               unknown: "terminal"
             }
+          },
+          {
+            model: "gemini-3-flash-preview",
+            isLastResort: true,
+            maxAttempts: 10,
+            actions: {
+              terminal: "prompt",
+              transient: "prompt",
+              not_found: "prompt",
+              unknown: "prompt"
+            },
+            stateTransitions: {
+              terminal: "terminal",
+              transient: "terminal",
+              not_found: "terminal",
+              unknown: "terminal"
+            }
           }
         ],
         default: [
@@ -394637,18 +394783,54 @@ var init_defaultModelConfigs = __esm({
           {
             model: "gemini-2.5-flash",
             isLastResort: true,
+            maxAttempts: 10,
             actions: {
               terminal: "prompt",
               transient: "prompt",
               not_found: "prompt",
               unknown: "prompt"
             },
+            stateTransitions: {
+              terminal: "terminal",
+              transient: "terminal",
+              not_found: "terminal",
+              unknown: "terminal"
+            }
+          }
+        ],
+        "auto-default": [
+          {
+            model: "gemini-2.5-pro",
+            maxAttempts: 3,
+            actions: {
+              terminal: "prompt",
+              transient: "silent",
+              not_found: "prompt",
+              unknown: "prompt"
+            },
             stateTransitions: {
               terminal: "terminal",
               transient: "sticky_retry",
               not_found: "terminal",
               unknown: "terminal"
             }
+          },
+          {
+            model: "gemini-2.5-flash",
+            isLastResort: true,
+            maxAttempts: 10,
+            actions: {
+              terminal: "prompt",
+              transient: "prompt",
+              not_found: "prompt",
+              unknown: "prompt"
+            },
+            stateTransitions: {
+              terminal: "terminal",
+              transient: "terminal",
+              not_found: "terminal",
+              unknown: "terminal"
+            }
           }
         ],
         lite: [
@@ -394662,7 +394844,7 @@ var init_defaultModelConfigs = __esm({
             },
             stateTransitions: {
               terminal: "terminal",
-              transient: "sticky_retry",
+              transient: "terminal",
               not_found: "terminal",
               unknown: "terminal"
             }
@@ -394677,7 +394859,7 @@ var init_defaultModelConfigs = __esm({
             },
             stateTransitions: {
               terminal: "terminal",
-              transient: "sticky_retry",
+              transient: "terminal",
               not_found: "terminal",
               unknown: "terminal"
             }
@@ -394693,7 +394875,7 @@ var init_defaultModelConfigs = __esm({
             },
             stateTransitions: {
               terminal: "terminal",
-              transient: "sticky_retry",
+              transient: "terminal",
               not_found: "terminal",
               unknown: "terminal"
             }
@@ -395141,12 +395323,17 @@ async function readGeminiMdFiles(filePaths, importFormat = "tree", boundaryMarke
         debugLogger.debug("[DEBUG] [MemoryDiscovery] Successfully read and processed imports:", filePath, `(Length: ${processedResult.content.length})`);
         return { filePath, content: processedResult.content };
       } catch (error2) {
-        const isTestEnv = process.env["VITEST"];
-        if (!isTestEnv) {
-          const message = error2 instanceof Error ? error2.message : String(error2);
-          logger6.warn(`Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`);
+        const isEISDIR = error2 instanceof Error && error2.code === "EISDIR";
+        if (isEISDIR) {
+          debugLogger.debug("[DEBUG] [MemoryDiscovery] Skipping directory at GEMINI.md path:", filePath);
+        } else {
+          const isTestEnv = process.env["VITEST"];
+          if (!isTestEnv) {
+            const message = error2 instanceof Error ? error2.message : String(error2);
+            logger6.warn(`Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`);
+          }
+          debugLogger.debug("[DEBUG] [MemoryDiscovery] Failed to read:", filePath);
         }
-        debugLogger.debug("[DEBUG] [MemoryDiscovery] Failed to read:", filePath);
         return { filePath, content: null };
       }
     });
@@ -402489,12 +402676,13 @@ var init_mcp_client_manager = __esm({
         await Promise.all(Object.keys(extension.mcpServers ?? {}).map((name3) => {
           const config3 = this.allServerConfigs.get(name3);
           if (config3?.extension?.id === extension.id) {
+            const clientKey = this.getClientKey(name3, config3);
             this.allServerConfigs.delete(name3);
             const index = this.blockedMcpServers.findIndex((s5) => s5.name === name3 && s5.extensionName === extension.name);
             if (index !== -1) {
               this.blockedMcpServers.splice(index, 1);
             }
-            return this.disconnectClient(name3, true);
+            return this.disconnectClient(clientKey, true);
           }
           return Promise.resolve();
         }));