@google/gemini-cli-a2a-server 0.30.0-preview.2 → 0.30.0-preview.4

package/dist/a2a-server.mjs

@@ -122894,18 +122894,20 @@ var init_partUtils = __esm({
 });
 
 // packages/core/dist/src/config/models.js
-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;
     }
@@ -122917,7 +122919,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;
@@ -122927,10 +122929,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);
@@ -122954,11 +122956,13 @@ function isAutoModel(model) {
 function supportsMultimodalFunctionResponse(model) {
   return model.startsWith("gemini-3-");
 }
-var PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL_AUTO, GEMINI_MODEL_ALIAS_AUTO, GEMINI_MODEL_ALIAS_PRO, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_FLASH_LITE, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_THINKING_MODE;
+var PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_3_1_MODEL, PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL, PREVIEW_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL_AUTO, GEMINI_MODEL_ALIAS_AUTO, GEMINI_MODEL_ALIAS_PRO, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_FLASH_LITE, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_THINKING_MODE;
 var init_models = __esm({
   "packages/core/dist/src/config/models.js"() {
     "use strict";
     PREVIEW_GEMINI_MODEL = "gemini-3-pro-preview";
+    PREVIEW_GEMINI_3_1_MODEL = "gemini-3.1-pro-preview";
+    PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL = "gemini-3.1-pro-preview-customtools";
     PREVIEW_GEMINI_FLASH_MODEL = "gemini-3-flash-preview";
     DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
     DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
@@ -131341,7 +131345,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.30.0-preview.2";
+    return "0.30.0-preview.4";
   })();
   return versionPromise;
 }
@@ -208741,8 +208745,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 = "54a1200ef";
-    CLI_VERSION = "0.30.0-preview.2";
+    GIT_COMMIT_INFO = "09c6514d7";
+    CLI_VERSION = "0.30.0-preview.4";
   }
 });
 
@@ -280782,7 +280786,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);
@@ -355357,7 +355361,11 @@ var init_errorClassification = __esm({
 // packages/core/dist/src/availability/policyCatalog.js
 function getModelPolicyChain(options) {
   if (options.previewEnabled) {
-    return cloneChain(PREVIEW_CHAIN);
+    const previewModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useCustomToolModel);
+    return [
+      definePolicy({ model: previewModel }),
+      definePolicy({ model: PREVIEW_GEMINI_FLASH_MODEL, isLastResort: true })
+    ];
   }
   return cloneChain(DEFAULT_CHAIN);
 }
@@ -355391,7 +355399,7 @@ function clonePolicy(policy) {
 function cloneChain(chain2) {
   return chain2.map(clonePolicy);
 }
-var DEFAULT_ACTIONS, SILENT_ACTIONS, DEFAULT_STATE, DEFAULT_CHAIN, PREVIEW_CHAIN, FLASH_LITE_CHAIN;
+var DEFAULT_ACTIONS, SILENT_ACTIONS, DEFAULT_STATE, DEFAULT_CHAIN, FLASH_LITE_CHAIN;
 var init_policyCatalog = __esm({
   "packages/core/dist/src/availability/policyCatalog.js"() {
     "use strict";
@@ -355418,10 +355426,6 @@ var init_policyCatalog = __esm({
       definePolicy({ model: DEFAULT_GEMINI_MODEL }),
       definePolicy({ model: DEFAULT_GEMINI_FLASH_MODEL, isLastResort: true })
     ];
-    PREVIEW_CHAIN = [
-      definePolicy({ model: PREVIEW_GEMINI_MODEL }),
-      definePolicy({ model: PREVIEW_GEMINI_FLASH_MODEL, isLastResort: true })
-    ];
     FLASH_LITE_CHAIN = [
       definePolicy({
         model: DEFAULT_GEMINI_FLASH_LITE_MODEL,
@@ -355445,7 +355449,9 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
   const modelFromConfig = preferredModel ?? config3.getActiveModel?.() ?? config3.getModel();
   const configuredModel = config3.getModel();
   let chain2;
-  const resolvedModel = resolveModel(modelFromConfig);
+  const useGemini31 = config3.getGemini31LaunchedSync?.() ?? false;
+  const useCustomToolModel = useGemini31 && config3.getContentGeneratorConfig?.()?.authType === AuthType2.USE_GEMINI;
+  const resolvedModel = resolveModel(modelFromConfig, useGemini31, useCustomToolModel);
   const isAutoPreferred = preferredModel ? isAutoModel(preferredModel) : false;
   const isAutoConfigured = isAutoModel(configuredModel);
   const hasAccessToPreview = config3.getHasAccessToPreviewModel?.() ?? true;
@@ -355456,12 +355462,16 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
       const previewEnabled = isGemini3Model(resolvedModel) || preferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO;
       chain2 = getModelPolicyChain({
         previewEnabled,
-        userTier: config3.getUserTier()
+        userTier: config3.getUserTier(),
+        useGemini31,
+        useCustomToolModel
       });
     } else {
       return getModelPolicyChain({
         previewEnabled: false,
-        userTier: config3.getUserTier()
+        userTier: config3.getUserTier(),
+        useGemini31,
+        useCustomToolModel
       });
     }
   } else {
@@ -355546,6 +355556,7 @@ function applyAvailabilityTransition(getContext, failureKind) {
 var init_policyHelpers = __esm({
   "packages/core/dist/src/availability/policyHelpers.js"() {
     "use strict";
+    init_contentGenerator();
     init_policyCatalog();
     init_models();
   }
@@ -377560,9 +377571,10 @@ var init_geminiChat = __esm({
         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({
@@ -379486,7 +379498,7 @@ var init_promptProvider = __esm({
         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 isModernModel = supportsModernFeatures(desiredModel);
         const activeSnippets = isModernModel ? snippets_exports : snippets_legacy_exports;
         const contextFilenames = getAllGeminiMdFilenames();
@@ -379573,7 +379585,7 @@ ${mcpToolsList}`;
         return sanitizedPrompt;
       }
       getCompressionPrompt(config3) {
-        const desiredModel = resolveModel(config3.getActiveModel());
+        const desiredModel = resolveModel(config3.getActiveModel(), config3.getGemini31LaunchedSync?.() ?? false);
         const isModernModel = supportsModernFeatures(desiredModel);
         const activeSnippets = isModernModel ? snippets_exports : snippets_legacy_exports;
         return activeSnippets.getCompressionPrompt();
@@ -380123,6 +380135,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";
@@ -380953,7 +380966,7 @@ var init_client3 = __esm({
         if (this.currentSequenceModel) {
           return this.currentSequenceModel;
         }
-        return resolveModel(this.config.getActiveModel());
+        return resolveModel(this.config.getActiveModel(), this.config.getGemini31LaunchedSync?.() ?? false);
       }
       async *processTurn(request, signal, prompt_id, boundedTurns, isInvalidStreamRetry, displayContent) {
         let turn = new Turn(this.getChat(), prompt_id);
@@ -386151,7 +386164,7 @@ var init_defaultStrategy = __esm({
     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: {
@@ -386177,6 +386190,7 @@ var init_classifierStrategy = __esm({
     init_messageInspectors();
     init_debugLogger();
     init_types6();
+    init_contentGenerator();
     HISTORY_TURNS_FOR_CONTEXT = 4;
     HISTORY_SEARCH_WINDOW = 20;
     FLASH_MODEL = "flash";
@@ -386297,7 +386311,9 @@ Respond *only* in JSON format according to the following schema. Do not include
           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: {
@@ -386338,6 +386354,7 @@ var init_numericalClassifierStrategy = __esm({
     init_node();
     init_debugLogger();
     init_types6();
+    init_contentGenerator();
     HISTORY_TURNS_FOR_CONTEXT2 = 8;
     FLASH_MODEL2 = "flash";
     PRO_MODEL2 = "pro";
@@ -386442,7 +386459,9 @@ Model: {"complexity_reasoning": "High-level architecture and strategic planning.
           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,
@@ -386548,7 +386567,7 @@ var init_fallbackStrategy = __esm({
       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) {
@@ -386585,7 +386604,7 @@ var init_overrideStrategy = __esm({
           return null;
         }
         return {
-          model: resolveModel(overrideModel),
+          model: resolveModel(overrideModel, config3.getGemini31LaunchedSync?.() ?? false),
           metadata: {
             source: this.name,
             latencyMs: 0,
@@ -397323,7 +397342,8 @@ var init_flagNames = __esm({
       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
     };
   }
 });
@@ -401414,6 +401434,9 @@ var init_config3 = __esm({
           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;
@@ -401598,7 +401621,7 @@ var init_config3 = __esm({
         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() {
@@ -401606,7 +401629,7 @@ var init_config3 = __esm({
         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() {
@@ -401614,7 +401637,7 @@ var init_config3 = __esm({
         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() {
@@ -402227,6 +402250,28 @@ var init_config3 = __esm({
         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;