@google/gemini-cli-a2a-server 0.29.3 → 0.29.4

package/dist/a2a-server.mjs

@@ -328727,6 +328727,8 @@ function getResponseText(response) {
 
 // packages/core/dist/src/config/models.js
 var PREVIEW_GEMINI_MODEL = "gemini-3-pro-preview";
+var PREVIEW_GEMINI_3_1_MODEL = "gemini-3.1-pro-preview";
+var PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL = "gemini-3.1-pro-preview-customtools";
 var PREVIEW_GEMINI_FLASH_MODEL = "gemini-3-flash-preview";
 var DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
 var DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
@@ -328739,18 +328741,20 @@ var GEMINI_MODEL_ALIAS_FLASH = "flash";
 var GEMINI_MODEL_ALIAS_FLASH_LITE = "flash-lite";
 var DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
 var DEFAULT_THINKING_MODE = 8192;
-function resolveModel(requestedModel) {
+function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel = false) {
   switch (requestedModel) {
-    case PREVIEW_GEMINI_MODEL_AUTO: {
+    case PREVIEW_GEMINI_MODEL:
+    case PREVIEW_GEMINI_MODEL_AUTO:
+    case GEMINI_MODEL_ALIAS_AUTO:
+    case GEMINI_MODEL_ALIAS_PRO: {
+      if (useGemini3_1) {
+        return useCustomToolModel ? PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL : PREVIEW_GEMINI_3_1_MODEL;
+      }
       return PREVIEW_GEMINI_MODEL;
     }
     case DEFAULT_GEMINI_MODEL_AUTO: {
       return DEFAULT_GEMINI_MODEL;
     }
-    case GEMINI_MODEL_ALIAS_AUTO:
-    case GEMINI_MODEL_ALIAS_PRO: {
-      return PREVIEW_GEMINI_MODEL;
-    }
     case GEMINI_MODEL_ALIAS_FLASH: {
       return PREVIEW_GEMINI_FLASH_MODEL;
     }
@@ -328762,7 +328766,7 @@ function resolveModel(requestedModel) {
     }
   }
 }
-function resolveClassifierModel(requestedModel, modelAlias) {
+function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false) {
   if (modelAlias === GEMINI_MODEL_ALIAS_FLASH) {
     if (requestedModel === DEFAULT_GEMINI_MODEL_AUTO || requestedModel === DEFAULT_GEMINI_MODEL) {
       return DEFAULT_GEMINI_FLASH_MODEL;
@@ -328772,10 +328776,10 @@ function resolveClassifierModel(requestedModel, modelAlias) {
     }
     return resolveModel(GEMINI_MODEL_ALIAS_FLASH);
   }
-  return resolveModel(requestedModel);
+  return resolveModel(requestedModel, useGemini3_1, useCustomToolModel);
 }
 function isPreviewModel(model) {
-  return model === PREVIEW_GEMINI_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_MODEL_AUTO;
+  return model === PREVIEW_GEMINI_MODEL || model === PREVIEW_GEMINI_3_1_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_MODEL_AUTO;
 }
 function isGemini3Model(model) {
   const resolved = resolveModel(model);
@@ -329195,7 +329199,7 @@ var __filename = fileURLToPath5(import.meta.url);
 var __dirname3 = path22.dirname(__filename);
 async function getVersion() {
   const pkgJson = await getPackageJson(__dirname3);
-  return "0.29.3";
+  return "0.29.4";
 }
 
 // packages/core/dist/src/code_assist/experiments/client_metadata.js
@@ -332740,8 +332744,8 @@ var Float64Vector = import_vector.default.Float64Vector;
 var PointerVector = import_vector.default.PointerVector;
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "f581ebdd1";
-var CLI_VERSION = "0.29.3";
+var GIT_COMMIT_INFO = "069641f65";
+var CLI_VERSION = "0.29.4";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -336221,7 +336225,7 @@ async function createContentGenerator(config3, gcConfig, sessionId2) {
       return new LoggingContentGenerator(fakeGenerator, gcConfig);
     }
     const version4 = await getVersion();
-    const model = resolveModel(gcConfig.getModel());
+    const model = resolveModel(gcConfig.getModel(), config3.authType === AuthType2.USE_GEMINI || config3.authType === AuthType2.USE_VERTEX_AI || (await gcConfig.getGemini31Launched?.() ?? false));
     const customHeadersEnv = process.env["GEMINI_CLI_CUSTOM_HEADERS"] || void 0;
     const userAgent = `GeminiCLI/${version4}/${model} (${process.platform}; ${process.arch})`;
     const customHeadersMap = parseCustomHeaders(customHeadersEnv);
@@ -374571,7 +374575,7 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
   const modelFromConfig = preferredModel ?? config3.getActiveModel?.() ?? config3.getModel();
   const configuredModel = config3.getModel();
   let chain2;
-  const resolvedModel = resolveModel(modelFromConfig);
+  const resolvedModel = resolveModel(modelFromConfig, config3.getGemini31LaunchedSync?.() ?? false);
   const isAutoPreferred = preferredModel ? isAutoModel(preferredModel) : false;
   const isAutoConfigured = isAutoModel(configuredModel);
   if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
@@ -386851,9 +386855,10 @@ var GeminiChat = class {
     const getAvailabilityContext = createAvailabilityContextProvider(this.config, () => lastModelToUse);
     const initialActiveModel = this.config.getActiveModel();
     const apiCall = async () => {
-      let modelToUse = resolveModel(lastModelToUse);
+      const useGemini3_1 = await this.config.getGemini31Launched?.() ?? false;
+      let modelToUse = resolveModel(lastModelToUse, useGemini3_1);
       if (this.config.getActiveModel() !== initialActiveModel) {
-        modelToUse = resolveModel(this.config.getActiveModel());
+        modelToUse = resolveModel(this.config.getActiveModel(), useGemini3_1);
       }
       if (modelToUse !== lastModelToUse) {
         const { generateContentConfig: newConfig } = this.config.modelConfigService.getResolvedConfig({
@@ -388737,7 +388742,7 @@ var PromptProvider = class {
     const toolNames = config3.getToolRegistry().getAllToolNames();
     const enabledToolNames = new Set(toolNames);
     const approvedPlanPath = config3.getApprovedPlanPath();
-    const desiredModel = resolveModel(config3.getActiveModel());
+    const desiredModel = resolveModel(config3.getActiveModel(), config3.getGemini31LaunchedSync?.() ?? false);
     const isGemini3 = isPreviewModel(desiredModel);
     const activeSnippets = isGemini3 ? snippets_exports : snippets_legacy_exports;
     const contextFilenames = getAllGeminiMdFilenames();
@@ -388826,7 +388831,7 @@ ${mcpToolsList}`;
     return sanitizedPrompt;
   }
   getCompressionPrompt(config3) {
-    const desiredModel = resolveModel(config3.getActiveModel());
+    const desiredModel = resolveModel(config3.getActiveModel(), config3.getGemini31LaunchedSync?.() ?? false);
     const isGemini3 = isPreviewModel(desiredModel);
     const activeSnippets = isGemini3 ? snippets_exports : snippets_legacy_exports;
     return activeSnippets.getCompressionPrompt();
@@ -389340,6 +389345,7 @@ function findCompressSplitPoint(contents, fraction) {
 function modelStringToModelConfigAlias(model) {
   switch (model) {
     case PREVIEW_GEMINI_MODEL:
+    case PREVIEW_GEMINI_3_1_MODEL:
       return "chat-compression-3-pro";
     case PREVIEW_GEMINI_FLASH_MODEL:
       return "chat-compression-3-flash";
@@ -390111,7 +390117,7 @@ var GeminiClient = class {
     if (this.currentSequenceModel) {
       return this.currentSequenceModel;
     }
-    return resolveModel(this.config.getActiveModel());
+    return resolveModel(this.config.getActiveModel(), this.config.getGemini31LaunchedSync?.() ?? false);
   }
   async *processTurn(request3, signal, prompt_id, boundedTurns, isInvalidStreamRetry, displayContent) {
     let turn = new Turn(this.getChat(), prompt_id);
@@ -395390,7 +395396,7 @@ var ModelAvailabilityService = class {
 var DefaultStrategy = class {
   name = "default";
   async route(_context, config3, _baseLlmClient) {
-    const defaultModel = resolveModel(config3.getModel());
+    const defaultModel = resolveModel(config3.getModel(), config3.getGemini31LaunchedSync?.() ?? false);
     return {
       model: defaultModel,
       metadata: {
@@ -395524,7 +395530,9 @@ var ClassifierStrategy = class {
       const routerResponse = ClassifierResponseSchema.parse(jsonResponse);
       const reasoning = routerResponse.reasoning;
       const latencyMs = Date.now() - startTime;
-      const selectedModel = resolveClassifierModel(model, routerResponse.model_choice);
+      const useGemini3_1 = await config3.getGemini31Launched?.() ?? false;
+      const useCustomToolModel = useGemini3_1 && config3.getContentGeneratorConfig().authType === AuthType2.USE_GEMINI;
+      const selectedModel = resolveClassifierModel(model, routerResponse.model_choice, useGemini3_1, useCustomToolModel);
       return {
         model: selectedModel,
         metadata: {
@@ -395658,7 +395666,9 @@ var NumericalClassifierStrategy = class {
       const routerResponse = ClassifierResponseSchema2.parse(jsonResponse);
       const score = routerResponse.complexity_score;
       const { threshold, groupLabel, modelAlias } = await this.getRoutingDecision(score, config3, config3.getSessionId() || "unknown-session");
-      const selectedModel = resolveClassifierModel(model, modelAlias);
+      const useGemini3_1 = await config3.getGemini31Launched?.() ?? false;
+      const useCustomToolModel = useGemini3_1 && config3.getContentGeneratorConfig().authType === AuthType2.USE_GEMINI;
+      const selectedModel = resolveClassifierModel(model, modelAlias, useGemini3_1, useCustomToolModel);
       const latencyMs = Date.now() - startTime;
       return {
         model: selectedModel,
@@ -395750,7 +395760,7 @@ var FallbackStrategy = class {
   name = "fallback";
   async route(context2, config3, _baseLlmClient) {
     const requestedModel = context2.requestedModel ?? config3.getModel();
-    const resolvedModel = resolveModel(requestedModel);
+    const resolvedModel = resolveModel(requestedModel, config3.getGemini31LaunchedSync?.() ?? false);
     const service = config3.getModelAvailabilityService();
     const snapshot = service.snapshot(resolvedModel);
     if (snapshot.available) {
@@ -395780,7 +395790,7 @@ var OverrideStrategy = class {
       return null;
     }
     return {
-      model: resolveModel(overrideModel),
+      model: resolveModel(overrideModel, config3.getGemini31LaunchedSync?.() ?? false),
       metadata: {
         source: this.name,
         latencyMs: 0,
@@ -405356,7 +405366,8 @@ var ExperimentFlags = {
   ENABLE_ADMIN_CONTROLS: 45752213,
   MASKING_PROTECTION_THRESHOLD: 45758817,
   MASKING_PRUNABLE_THRESHOLD: 45758818,
-  MASKING_PROTECT_LATEST_TURN: 45758819
+  MASKING_PROTECT_LATEST_TURN: 45758819,
+  GEMINI_3_1_PRO_LAUNCHED: 45760185
 };
 
 // packages/core/dist/src/config/config.js
@@ -409277,6 +409288,9 @@ var Config = class {
       this.geminiClient.stripThoughtsFromHistory();
     }
     this.modelAvailabilityService.reset();
+    if (this.contentGeneratorConfig) {
+      this.contentGeneratorConfig.authType = void 0;
+    }
     const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod);
     this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
     this.contentGeneratorConfig = newContentGeneratorConfig;
@@ -409458,7 +409472,7 @@ var Config = class {
     if (pooled.remaining !== void 0) {
       return pooled.remaining;
     }
-    const primaryModel = resolveModel(this.getModel());
+    const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync());
     return this.modelQuotas.get(primaryModel)?.remaining;
   }
   getQuotaLimit() {
@@ -409466,7 +409480,7 @@ var Config = class {
     if (pooled.limit !== void 0) {
       return pooled.limit;
     }
-    const primaryModel = resolveModel(this.getModel());
+    const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync());
     return this.modelQuotas.get(primaryModel)?.limit;
   }
   getQuotaResetTime() {
@@ -409474,7 +409488,7 @@ var Config = class {
     if (pooled.resetTime !== void 0) {
       return pooled.resetTime;
     }
-    const primaryModel = resolveModel(this.getModel());
+    const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync());
     return this.modelQuotas.get(primaryModel)?.resetTime;
   }
   getEmbeddingModel() {
@@ -410083,6 +410097,28 @@ var Config = class {
     await this.ensureExperimentsLoaded();
     return this.experiments?.flags[ExperimentFlags.BANNER_TEXT_CAPACITY_ISSUES]?.stringValue ?? "";
   }
+  /**
+   * Returns whether Gemini 3.1 has been launched.
+   * This method is async and ensures that experiments are loaded before returning the result.
+   */
+  async getGemini31Launched() {
+    await this.ensureExperimentsLoaded();
+    return this.getGemini31LaunchedSync();
+  }
+  /**
+   * Returns whether Gemini 3.1 has been launched.
+   *
+   * Note: This method should only be called after startup, once experiments have been loaded.
+   * If you need to call this during startup or from an async context, use
+   * getGemini31Launched instead.
+   */
+  getGemini31LaunchedSync() {
+    const authType = this.contentGeneratorConfig?.authType;
+    if (authType === AuthType2.USE_GEMINI || authType === AuthType2.USE_VERTEX_AI) {
+      return true;
+    }
+    return this.experiments?.flags[ExperimentFlags.GEMINI_3_1_PRO_LAUNCHED]?.boolValue ?? false;
+  }
   async ensureExperimentsLoaded() {
     if (!this.experimentsPromise) {
       return;