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

package/dist/a2a-server.mjs

@@ -38176,6 +38176,245 @@ var require_utils4 = __commonJS({
   }
 });
 
+// node_modules/punycode/punycode.js
+var require_punycode = __commonJS({
+  "node_modules/punycode/punycode.js"(exports2, module2) {
+    "use strict";
+    var maxInt = 2147483647;
+    var base = 36;
+    var tMin = 1;
+    var tMax = 26;
+    var skew = 38;
+    var damp = 700;
+    var initialBias = 72;
+    var initialN = 128;
+    var delimiter3 = "-";
+    var regexPunycode = /^xn--/;
+    var regexNonASCII = /[^\0-\x7F]/;
+    var regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g;
+    var errors = {
+      "overflow": "Overflow: input needs wider integers to process",
+      "not-basic": "Illegal input >= 0x80 (not a basic code point)",
+      "invalid-input": "Invalid input"
+    };
+    var baseMinusTMin = base - tMin;
+    var floor = Math.floor;
+    var stringFromCharCode = String.fromCharCode;
+    function error2(type2) {
+      throw new RangeError(errors[type2]);
+    }
+    function map3(array2, callback) {
+      const result2 = [];
+      let length = array2.length;
+      while (length--) {
+        result2[length] = callback(array2[length]);
+      }
+      return result2;
+    }
+    function mapDomain(domain, callback) {
+      const parts2 = domain.split("@");
+      let result2 = "";
+      if (parts2.length > 1) {
+        result2 = parts2[0] + "@";
+        domain = parts2[1];
+      }
+      domain = domain.replace(regexSeparators, ".");
+      const labels = domain.split(".");
+      const encoded = map3(labels, callback).join(".");
+      return result2 + encoded;
+    }
+    function ucs2decode(string4) {
+      const output = [];
+      let counter = 0;
+      const length = string4.length;
+      while (counter < length) {
+        const value = string4.charCodeAt(counter++);
+        if (value >= 55296 && value <= 56319 && counter < length) {
+          const extra = string4.charCodeAt(counter++);
+          if ((extra & 64512) == 56320) {
+            output.push(((value & 1023) << 10) + (extra & 1023) + 65536);
+          } else {
+            output.push(value);
+            counter--;
+          }
+        } else {
+          output.push(value);
+        }
+      }
+      return output;
+    }
+    var ucs2encode = (codePoints) => String.fromCodePoint(...codePoints);
+    var basicToDigit = function(codePoint) {
+      if (codePoint >= 48 && codePoint < 58) {
+        return 26 + (codePoint - 48);
+      }
+      if (codePoint >= 65 && codePoint < 91) {
+        return codePoint - 65;
+      }
+      if (codePoint >= 97 && codePoint < 123) {
+        return codePoint - 97;
+      }
+      return base;
+    };
+    var digitToBasic = function(digit, flag) {
+      return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
+    };
+    var adapt = function(delta, numPoints, firstTime) {
+      let k = 0;
+      delta = firstTime ? floor(delta / damp) : delta >> 1;
+      delta += floor(delta / numPoints);
+      for (; delta > baseMinusTMin * tMax >> 1; k += base) {
+        delta = floor(delta / baseMinusTMin);
+      }
+      return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+    };
+    var decode3 = function(input) {
+      const output = [];
+      const inputLength = input.length;
+      let i4 = 0;
+      let n3 = initialN;
+      let bias = initialBias;
+      let basic = input.lastIndexOf(delimiter3);
+      if (basic < 0) {
+        basic = 0;
+      }
+      for (let j = 0; j < basic; ++j) {
+        if (input.charCodeAt(j) >= 128) {
+          error2("not-basic");
+        }
+        output.push(input.charCodeAt(j));
+      }
+      for (let index = basic > 0 ? basic + 1 : 0; index < inputLength; ) {
+        const oldi = i4;
+        for (let w = 1, k = base; ; k += base) {
+          if (index >= inputLength) {
+            error2("invalid-input");
+          }
+          const digit = basicToDigit(input.charCodeAt(index++));
+          if (digit >= base) {
+            error2("invalid-input");
+          }
+          if (digit > floor((maxInt - i4) / w)) {
+            error2("overflow");
+          }
+          i4 += digit * w;
+          const t3 = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias;
+          if (digit < t3) {
+            break;
+          }
+          const baseMinusT = base - t3;
+          if (w > floor(maxInt / baseMinusT)) {
+            error2("overflow");
+          }
+          w *= baseMinusT;
+        }
+        const out2 = output.length + 1;
+        bias = adapt(i4 - oldi, out2, oldi == 0);
+        if (floor(i4 / out2) > maxInt - n3) {
+          error2("overflow");
+        }
+        n3 += floor(i4 / out2);
+        i4 %= out2;
+        output.splice(i4++, 0, n3);
+      }
+      return String.fromCodePoint(...output);
+    };
+    var encode3 = function(input) {
+      const output = [];
+      input = ucs2decode(input);
+      const inputLength = input.length;
+      let n3 = initialN;
+      let delta = 0;
+      let bias = initialBias;
+      for (const currentValue of input) {
+        if (currentValue < 128) {
+          output.push(stringFromCharCode(currentValue));
+        }
+      }
+      const basicLength = output.length;
+      let handledCPCount = basicLength;
+      if (basicLength) {
+        output.push(delimiter3);
+      }
+      while (handledCPCount < inputLength) {
+        let m2 = maxInt;
+        for (const currentValue of input) {
+          if (currentValue >= n3 && currentValue < m2) {
+            m2 = currentValue;
+          }
+        }
+        const handledCPCountPlusOne = handledCPCount + 1;
+        if (m2 - n3 > floor((maxInt - delta) / handledCPCountPlusOne)) {
+          error2("overflow");
+        }
+        delta += (m2 - n3) * handledCPCountPlusOne;
+        n3 = m2;
+        for (const currentValue of input) {
+          if (currentValue < n3 && ++delta > maxInt) {
+            error2("overflow");
+          }
+          if (currentValue === n3) {
+            let q = delta;
+            for (let k = base; ; k += base) {
+              const t3 = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias;
+              if (q < t3) {
+                break;
+              }
+              const qMinusT = q - t3;
+              const baseMinusT = base - t3;
+              output.push(
+                stringFromCharCode(digitToBasic(t3 + qMinusT % baseMinusT, 0))
+              );
+              q = floor(qMinusT / baseMinusT);
+            }
+            output.push(stringFromCharCode(digitToBasic(q, 0)));
+            bias = adapt(delta, handledCPCountPlusOne, handledCPCount === basicLength);
+            delta = 0;
+            ++handledCPCount;
+          }
+        }
+        ++delta;
+        ++n3;
+      }
+      return output.join("");
+    };
+    var toUnicode = function(input) {
+      return mapDomain(input, function(string4) {
+        return regexPunycode.test(string4) ? decode3(string4.slice(4).toLowerCase()) : string4;
+      });
+    };
+    var toASCII = function(input) {
+      return mapDomain(input, function(string4) {
+        return regexNonASCII.test(string4) ? "xn--" + encode3(string4) : string4;
+      });
+    };
+    var punycode = {
+      /**
+       * A string representing the current Punycode.js version number.
+       * @memberOf punycode
+       * @type String
+       */
+      "version": "2.3.1",
+      /**
+       * An object of methods to convert from JavaScript's internal character
+       * representation (UCS-2) to Unicode code points, and back.
+       * @see <https://mathiasbynens.be/notes/javascript-encoding>
+       * @memberOf punycode
+       * @type Object
+       */
+      "ucs2": {
+        "decode": ucs2decode,
+        "encode": ucs2encode
+      },
+      "decode": decode3,
+      "encode": encode3,
+      "toASCII": toASCII,
+      "toUnicode": toUnicode
+    };
+    module2.exports = punycode;
+  }
+});
+
 // node_modules/node-fetch/node_modules/tr46/lib/mappingTable.json
 var require_mappingTable = __commonJS({
   "node_modules/node-fetch/node_modules/tr46/lib/mappingTable.json"(exports2, module2) {
@@ -38187,7 +38426,7 @@ var require_mappingTable = __commonJS({
 var require_tr46 = __commonJS({
   "node_modules/node-fetch/node_modules/tr46/index.js"(exports2, module2) {
     "use strict";
-    var punycode = __require("punycode");
+    var punycode = require_punycode();
     var mappingTable = require_mappingTable();
     var PROCESSING_OPTIONS = {
       TRANSITIONAL: 0,
@@ -38348,7 +38587,7 @@ var require_tr46 = __commonJS({
 var require_url_state_machine = __commonJS({
   "node_modules/node-fetch/node_modules/whatwg-url/lib/url-state-machine.js"(exports2, module2) {
     "use strict";
-    var punycode = __require("punycode");
+    var punycode = require_punycode();
     var tr46 = require_tr46();
     var specialSchemes = {
       ftp: 21,
@@ -328488,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";
@@ -328500,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;
     }
@@ -328523,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;
@@ -328533,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);
@@ -328956,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.2";
+  return "0.29.4";
 }
 
 // packages/core/dist/src/code_assist/experiments/client_metadata.js
@@ -332501,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 = "7f9808ce6";
-var CLI_VERSION = "0.29.2";
+var GIT_COMMIT_INFO = "069641f65";
+var CLI_VERSION = "0.29.4";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -335982,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);
@@ -374332,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) {
@@ -386612,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({
@@ -388498,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();
@@ -388587,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();
@@ -389101,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";
@@ -389872,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);
@@ -395151,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: {
@@ -395285,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: {
@@ -395419,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,
@@ -395511,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) {
@@ -395541,7 +395790,7 @@ var OverrideStrategy = class {
       return null;
     }
     return {
-      model: resolveModel(overrideModel),
+      model: resolveModel(overrideModel, config3.getGemini31LaunchedSync?.() ?? false),
       metadata: {
         source: this.name,
         latencyMs: 0,
@@ -405117,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
@@ -409038,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;
@@ -409219,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() {
@@ -409227,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() {
@@ -409235,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() {
@@ -409844,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;