@google/gemini-cli 0.48.0-nightly.20260612.g4e10a34be → 0.48.0-preview.0

package/bundle/{chunk-ZT5PXPGC.js → chunk-32OC6X7M.js}

@@ -1,13 +1,13 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-RJVA7TEL.js";
+} from "./chunk-C5HEG6L3.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-GWB6WHVI.js";
+} from "./chunk-4D6ZATMR.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";

package/bundle/{chunk-GWB6WHVI.js → chunk-4D6ZATMR.js}

@@ -2223,7 +2223,7 @@ var require_parse2 = __commonJS({
         return typeof arg === "undefined" ? prev : prev.concat(arg);
       }, []);
     }
-    module2.exports = function parse8(s2, env2, opts) {
+    module2.exports = function parse9(s2, env2, opts) {
       var mapped = parseInternal(s2, env2, opts);
       if (typeof env2 !== "function") {
         return mapped;
@@ -20574,7 +20574,7 @@ var init_v1 = __esm({
 });
 
 // node_modules/uuid/dist/esm-node/parse.js
-function parse(uuid3) {
+function parse2(uuid3) {
   if (!validate_default(uuid3)) {
     throw TypeError("Invalid UUID");
   }
@@ -20602,7 +20602,7 @@ var parse_default;
 var init_parse = __esm({
   "node_modules/uuid/dist/esm-node/parse.js"() {
     init_validate();
-    parse_default = parse;
+    parse_default = parse2;
   }
 });
 
@@ -30902,21 +30902,21 @@ var require_fast_uri = __commonJS({
         normalizeString(uri, options);
       } else if (typeof uri === "object") {
         uri = /** @type {T} */
-        parse8(serialize3(uri, options), options);
+        parse9(serialize3(uri, options), options);
       }
       return uri;
     }
     function resolve29(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
-      const resolved = resolveComponent(parse8(baseURI, schemelessOptions), parse8(relativeURI, schemelessOptions), schemelessOptions, true);
+      const resolved = resolveComponent(parse9(baseURI, schemelessOptions), parse9(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
       return serialize3(resolved, schemelessOptions);
     }
     function resolveComponent(base, relative12, options, skipNormalization) {
       const target = {};
       if (!skipNormalization) {
-        base = parse8(serialize3(base, options), options);
-        relative12 = parse8(serialize3(relative12, options), options);
+        base = parse9(serialize3(base, options), options);
+        relative12 = parse9(serialize3(relative12, options), options);
       }
       options = options || {};
       if (!options.tolerant && relative12.scheme) {
@@ -31139,7 +31139,7 @@ var require_fast_uri = __commonJS({
       }
       return { parsed, malformedAuthorityOrPort };
     }
-    function parse8(uri, opts) {
+    function parse9(uri, opts) {
       return parseWithStatus(uri, opts).parsed;
     }
     function normalizeString(uri, opts) {
@@ -31168,7 +31168,7 @@ var require_fast_uri = __commonJS({
       resolveComponent,
       equal,
       serialize: serialize3,
-      parse: parse8
+      parse: parse9
     };
     module2.exports = fastUri;
     module2.exports.default = fastUri;
@@ -52391,7 +52391,7 @@ var require_root = __commonJS({
     var OneOf = require_oneof();
     var util4 = require_util7();
     var Type2;
-    var parse8;
+    var parse9;
     var common3;
     function Root2(options) {
       Namespace.call(this, "", options);
@@ -52451,8 +52451,8 @@ var require_root = __commonJS({
           if (!util4.isString(source))
             self2.setOptions(source.options).addJSON(source.nested);
           else {
-            parse8.filename = filename2;
-            var parsed = parse8(source, self2, options), resolved2, i5 = 0;
+            parse9.filename = filename2;
+            var parsed = parse9(source, self2, options), resolved2, i5 = 0;
             if (parsed.imports) {
               for (; i5 < parsed.imports.length; ++i5)
                 if (resolved2 = getBundledFileName(parsed.imports[i5]) || self2.resolvePath(filename2, parsed.imports[i5]))
@@ -52623,7 +52623,7 @@ var require_root = __commonJS({
     };
     Root2._configure = function(Type_, parse_2, common_) {
       Type2 = Type_;
-      parse8 = parse_2;
+      parse9 = parse_2;
       common3 = common_;
     };
   }
@@ -53894,9 +53894,9 @@ var require_tokenize = __commonJS({
 var require_parse4 = __commonJS({
   "node_modules/protobufjs/src/parse.js"(exports2, module2) {
     "use strict";
-    module2.exports = parse8;
-    parse8.filename = null;
-    parse8.defaults = { keepCase: false };
+    module2.exports = parse9;
+    parse9.filename = null;
+    parse9.defaults = { keepCase: false };
     var tokenize2 = require_tokenize();
     var Root2 = require_root();
     var Type2 = require_type();
@@ -53918,13 +53918,13 @@ var require_parse4 = __commonJS({
     var numberRe = util4.patterns.numberRe;
     var nameRe = /^[a-zA-Z_][a-zA-Z_0-9]*$/;
     var typeRefRe = util4.patterns.typeRefRe;
-    function parse8(source, root, options) {
+    function parse9(source, root, options) {
       if (!(root instanceof Root2)) {
         options = root;
         root = new Root2();
       }
       if (!options)
-        options = parse8.defaults;
+        options = parse9.defaults;
       var preferTrailingComment = options.preferTrailingComment || false;
       var tn = tokenize2(source, options.alternateCommentMode || false), next = tn.next, push = tn.push, peek = tn.peek, skip = tn.skip, cmnt = tn.cmnt;
       var head = true, pkg2, imports, weakImports, edition = "proto2";
@@ -53944,9 +53944,9 @@ var require_parse4 = __commonJS({
         });
       }
       function illegal(token3, name3, insideTryCatch) {
-        var filename = parse8.filename;
+        var filename = parse9.filename;
         if (!insideTryCatch)
-          parse8.filename = null;
+          parse9.filename = null;
         return Error("illegal " + (name3 || "token") + " '" + token3 + "' (" + (filename ? filename + ", " : "") + "line " + tn.line + ")");
       }
       function readString() {
@@ -54145,7 +54145,7 @@ var require_parse4 = __commonJS({
           if (typeof obj.comment !== "string") {
             obj.comment = cmnt();
           }
-          obj.filename = parse8.filename;
+          obj.filename = parse9.filename;
         }
         if (skip("{", true)) {
           var token3;
@@ -54265,7 +54265,7 @@ var require_parse4 = __commonJS({
         var type2 = new Type2(name3);
         type2.group = true;
         var field = new Field(fieldName, id, name3, rule);
-        field.filename = parse8.filename;
+        field.filename = parse9.filename;
         ifBlock(type2, function parseGroup_block(token3) {
           switch (token3) {
             case "option":
@@ -54604,7 +54604,7 @@ var require_parse4 = __commonJS({
         }
       }
       resolveFileFeatures();
-      parse8.filename = null;
+      parse9.filename = null;
       return {
         "package": pkg2,
         "imports": imports,
@@ -91593,7 +91593,7 @@ var require_public_api2 = __commonJS({
       }
       return doc;
     }
-    function parse8(src, reviver, options) {
+    function parse9(src, reviver, options) {
       let _reviver = void 0;
       if (typeof reviver === "function") {
         _reviver = reviver;
@@ -91634,7 +91634,7 @@ var require_public_api2 = __commonJS({
         return value.toString(options);
       return new Document2.Document(value, _replacer, options).toString(options);
     }
-    exports2.parse = parse8;
+    exports2.parse = parse9;
     exports2.parseAllDocuments = parseAllDocuments;
     exports2.parseDocument = parseDocument2;
     exports2.stringify = stringify3;
@@ -100751,7 +100751,7 @@ var require_forwarded_parse = __commonJS({
         position
       );
     }
-    function parse8(header) {
+    function parse9(header) {
       var mustUnescape = false;
       var isEscaping = false;
       var inQuotes = false;
@@ -100838,7 +100838,7 @@ var require_forwarded_parse = __commonJS({
       output.push(forwarded);
       return output;
     }
-    module2.exports = parse8;
+    module2.exports = parse9;
   }
 });
 
@@ -126668,11 +126668,11 @@ var require_lib5 = __commonJS({
   "node_modules/qs/lib/index.js"(exports2, module2) {
     "use strict";
     var stringify3 = require_stringify4();
-    var parse8 = require_parse5();
+    var parse9 = require_parse5();
     var formats = require_formats2();
     module2.exports = {
       formats,
-      parse: parse8,
+      parse: parse9,
       stringify: stringify3
     };
   }
@@ -166730,7 +166730,7 @@ var init_v12 = __esm({
 });
 
 // node_modules/eventid/node_modules/uuid/dist/esm-node/parse.js
-function parse2(uuid3) {
+function parse3(uuid3) {
   if (!validate_default2(uuid3)) {
     throw TypeError("Invalid UUID");
   }
@@ -166758,7 +166758,7 @@ var parse_default2;
 var init_parse2 = __esm({
   "node_modules/eventid/node_modules/uuid/dist/esm-node/parse.js"() {
     init_validate2();
-    parse_default2 = parse2;
+    parse_default2 = parse3;
   }
 });
 
@@ -202167,7 +202167,7 @@ var require_parse6 = __commonJS({
       }
       return parsed;
     }
-    function parse8(command, args2, options) {
+    function parse9(command, args2, options) {
       if (args2 && !Array.isArray(args2)) {
         options = args2;
         args2 = null;
@@ -202186,7 +202186,7 @@ var require_parse6 = __commonJS({
       };
       return options.shell ? parsed : parseNonShell(parsed);
     }
-    module2.exports = parse8;
+    module2.exports = parse9;
   }
 });
 
@@ -202245,16 +202245,16 @@ var require_cross_spawn = __commonJS({
   "node_modules/cross-spawn/index.js"(exports2, module2) {
     "use strict";
     var cp2 = __require("child_process");
-    var parse8 = require_parse6();
+    var parse9 = require_parse6();
     var enoent = require_enoent();
     function spawn13(command, args2, options) {
-      const parsed = parse8(command, args2, options);
+      const parsed = parse9(command, args2, options);
       const spawned = cp2.spawn(parsed.command, parsed.args, parsed.options);
       enoent.hookChildProcess(spawned, parsed);
       return spawned;
     }
     function spawnSync6(command, args2, options) {
-      const parsed = parse8(command, args2, options);
+      const parsed = parse9(command, args2, options);
       const result2 = cp2.spawnSync(parsed.command, parsed.args, parsed.options);
       result2.error = result2.error || enoent.verifyENOENTSync(result2.status, parsed);
       return result2;
@@ -202262,7 +202262,7 @@ var require_cross_spawn = __commonJS({
     module2.exports = spawn13;
     module2.exports.spawn = spawn13;
     module2.exports.sync = spawnSync6;
-    module2.exports._parse = parse8;
+    module2.exports._parse = parse9;
     module2.exports._enoent = enoent;
   }
 });
@@ -227951,7 +227951,7 @@ var require_parse8 = __commonJS({
   "node_modules/semver/functions/parse.js"(exports2, module2) {
     "use strict";
     var SemVer = require_semver2();
-    var parse8 = (version4, options, throwErrors = false) => {
+    var parse9 = (version4, options, throwErrors = false) => {
       if (version4 instanceof SemVer) {
         return version4;
       }
@@ -227964,7 +227964,7 @@ var require_parse8 = __commonJS({
         throw er;
       }
     };
-    module2.exports = parse8;
+    module2.exports = parse9;
   }
 });
 
@@ -227972,9 +227972,9 @@ var require_parse8 = __commonJS({
 var require_valid = __commonJS({
   "node_modules/semver/functions/valid.js"(exports2, module2) {
     "use strict";
-    var parse8 = require_parse8();
+    var parse9 = require_parse8();
     var valid = (version4, options) => {
-      const v = parse8(version4, options);
+      const v = parse9(version4, options);
       return v ? v.version : null;
     };
     module2.exports = valid;
@@ -227985,9 +227985,9 @@ var require_valid = __commonJS({
 var require_clean = __commonJS({
   "node_modules/semver/functions/clean.js"(exports2, module2) {
     "use strict";
-    var parse8 = require_parse8();
+    var parse9 = require_parse8();
     var clean = (version4, options) => {
-      const s2 = parse8(version4.trim().replace(/^[=v]+/, ""), options);
+      const s2 = parse9(version4.trim().replace(/^[=v]+/, ""), options);
       return s2 ? s2.version : null;
     };
     module2.exports = clean;
@@ -228981,9 +228981,9 @@ var require_spdx_expression_parse = __commonJS({
   "node_modules/spdx-expression-parse/index.js"(exports2, module2) {
     "use strict";
     var scan = require_scan();
-    var parse8 = require_parse9();
+    var parse9 = require_parse9();
     module2.exports = function(source) {
-      return parse8(scan(source));
+      return parse9(scan(source));
     };
   }
 });
@@ -228991,11 +228991,11 @@ var require_spdx_expression_parse = __commonJS({
 // node_modules/spdx-correct/index.js
 var require_spdx_correct = __commonJS({
   "node_modules/spdx-correct/index.js"(exports2, module2) {
-    var parse8 = require_spdx_expression_parse();
+    var parse9 = require_spdx_expression_parse();
     var spdxLicenseIds = require_spdx_license_ids();
     function valid(string4) {
       try {
-        parse8(string4);
+        parse9(string4);
         return true;
       } catch (error40) {
         return false;
@@ -229324,7 +229324,7 @@ var require_spdx_correct = __commonJS({
 // node_modules/validate-npm-package-license/index.js
 var require_validate_npm_package_license = __commonJS({
   "node_modules/validate-npm-package-license/index.js"(exports2, module2) {
-    var parse8 = require_spdx_expression_parse();
+    var parse9 = require_spdx_expression_parse();
     var correct = require_spdx_correct();
     var genericWarning = 'license should be a valid SPDX license expression (without "LicenseRef"), "UNLICENSED", or "SEE LICENSE IN <filename>"';
     var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
@@ -229342,7 +229342,7 @@ var require_validate_npm_package_license = __commonJS({
     module2.exports = function(argument) {
       var ast;
       try {
-        ast = parse8(argument);
+        ast = parse9(argument);
       } catch (e2) {
         var match2;
         if (argument === "UNLICENSED" || argument === "UNLICENCED") {
@@ -238328,7 +238328,7 @@ var require_parse11 = __commonJS({
       }
       return { risky: false };
     };
-    var parse8 = (input, options) => {
+    var parse9 = (input, options) => {
       if (typeof input !== "string") {
         throw new TypeError("Expected a string");
       }
@@ -238498,7 +238498,7 @@ var require_parse11 = __commonJS({
             output = token2.close = `)$))${extglobStar}`;
           }
           if (token2.inner.includes("*") && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {
-            const expression = parse8(rest, { ...options, fastpaths: false }).output;
+            const expression = parse9(rest, { ...options, fastpaths: false }).output;
             output = token2.close = `)${expression})${extglobStar})`;
           }
           if (token2.prev.type === "bos") {
@@ -239020,7 +239020,7 @@ var require_parse11 = __commonJS({
       }
       return state;
     };
-    parse8.fastpaths = (input, options) => {
+    parse9.fastpaths = (input, options) => {
       const opts = { ...options };
       const max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
       const len = input.length;
@@ -239085,7 +239085,7 @@ var require_parse11 = __commonJS({
       }
       return source;
     };
-    module2.exports = parse8;
+    module2.exports = parse9;
   }
 });
 
@@ -239094,7 +239094,7 @@ var require_picomatch = __commonJS({
   "packages/core/node_modules/picomatch/lib/picomatch.js"(exports2, module2) {
     "use strict";
     var scan = require_scan2();
-    var parse8 = require_parse11();
+    var parse9 = require_parse11();
     var utils = require_utils18();
     var constants6 = require_constants10();
     var isObject6 = (val) => val && typeof val === "object" && !Array.isArray(val);
@@ -239182,7 +239182,7 @@ var require_picomatch = __commonJS({
     picomatch3.isMatch = (str2, patterns, options) => picomatch3(patterns, options)(str2);
     picomatch3.parse = (pattern, options) => {
       if (Array.isArray(pattern)) return pattern.map((p2) => picomatch3.parse(p2, options));
-      return parse8(pattern, { ...options, fastpaths: false });
+      return parse9(pattern, { ...options, fastpaths: false });
     };
     picomatch3.scan = (input, options) => scan(input, options);
     picomatch3.compileRe = (state, options, returnOutput = false, returnState = false) => {
@@ -239208,10 +239208,10 @@ var require_picomatch = __commonJS({
       }
       let parsed = { negated: false, fastpaths: true };
       if (options.fastpaths !== false && (input[0] === "." || input[0] === "*")) {
-        parsed.output = parse8.fastpaths(input, options);
+        parsed.output = parse9.fastpaths(input, options);
       }
       if (!parsed.output) {
-        parsed = parse8(input, options);
+        parsed = parse9(input, options);
       }
       return picomatch3.compileRe(parsed, options, returnOutput, returnState);
     };
@@ -251357,8 +251357,23 @@ function stripShellWrapper(command) {
   const match2 = command.match(pattern);
   if (match2) {
     let newCommand = command.substring(match2[0].length).trim();
-    if (newCommand.startsWith('"') && newCommand.endsWith('"') || newCommand.startsWith("'") && newCommand.endsWith("'")) {
-      newCommand = newCommand.substring(1, newCommand.length - 1);
+    if (newCommand.length >= 2 && (newCommand.startsWith('"') && newCommand.endsWith('"') || newCommand.startsWith("'") && newCommand.endsWith("'"))) {
+      const isPosixShell = match2[0].trim().endsWith("-c");
+      if (isPosixShell && newCommand.startsWith('"')) {
+        try {
+          const parsed = (0, import_shell_quote.parse)(newCommand, (key) => "$" + key);
+          const firstEntry = parsed[0];
+          if (parsed.length === 1 && typeof firstEntry === "string") {
+            newCommand = firstEntry;
+          } else {
+            newCommand = newCommand.substring(1, newCommand.length - 1);
+          }
+        } catch {
+          newCommand = newCommand.substring(1, newCommand.length - 1);
+        }
+      } else {
+        newCommand = newCommand.substring(1, newCommand.length - 1);
+      }
     }
     return newCommand;
   }
@@ -279309,8 +279324,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "4e10a34be";
-var CLI_VERSION = "0.48.0-nightly.20260609.g3a13b8eeb";
+var GIT_COMMIT_INFO = "4d3dcdce1";
+var CLI_VERSION = "0.48.0-preview.0";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -287494,7 +287509,7 @@ __export(core_exports2, {
   isValidBase64URL: () => isValidBase64URL,
   isValidJWT: () => isValidJWT2,
   locales: () => locales_exports,
-  parse: () => parse3,
+  parse: () => parse4,
   parseAsync: () => parseAsync,
   prettifyError: () => prettifyError,
   regexes: () => regexes_exports,
@@ -288250,7 +288265,7 @@ var _parse = (_Err) => (schema2, value, _ctx, _params) => {
   }
   return result2.value;
 };
-var parse3 = /* @__PURE__ */ _parse($ZodRealError);
+var parse4 = /* @__PURE__ */ _parse($ZodRealError);
 var _parseAsync = (_Err) => async (schema2, value, _ctx, params) => {
   const ctx = _ctx ? Object.assign(_ctx, { async: true }) : { async: true };
   let result2 = schema2._zod.run({ value, issues: [] }, ctx);
@@ -296293,12 +296308,12 @@ var $ZodFunction = class {
       throw new Error("implement() must be called with a function");
     }
     const impl = (...args2) => {
-      const parsedArgs = this._def.input ? parse3(this._def.input, args2, void 0, { callee: impl }) : args2;
+      const parsedArgs = this._def.input ? parse4(this._def.input, args2, void 0, { callee: impl }) : args2;
       if (!Array.isArray(parsedArgs)) {
         throw new Error("Invalid arguments schema: not an array or tuple schema.");
       }
       const output = func2(...parsedArgs);
-      return this._def.output ? parse3(this._def.output, output, void 0, { callee: impl }) : output;
+      return this._def.output ? parse4(this._def.output, output, void 0, { callee: impl }) : output;
     };
     return impl;
   }
@@ -297344,7 +297359,7 @@ __export(external_exports2, {
   object: () => object2,
   optional: () => optional,
   overwrite: () => _overwrite,
-  parse: () => parse4,
+  parse: () => parse5,
   parseAsync: () => parseAsync2,
   partialRecord: () => partialRecord,
   pipe: () => pipe,
@@ -297473,7 +297488,7 @@ var ZodRealError = $constructor("ZodError", initializer2, {
 });
 
 // node_modules/zod/v4/classic/parse.js
-var parse4 = /* @__PURE__ */ _parse(ZodRealError);
+var parse5 = /* @__PURE__ */ _parse(ZodRealError);
 var parseAsync2 = /* @__PURE__ */ _parseAsync(ZodRealError);
 var safeParse3 = /* @__PURE__ */ _safeParse(ZodRealError);
 var safeParseAsync2 = /* @__PURE__ */ _safeParseAsync(ZodRealError);
@@ -297501,7 +297516,7 @@ var ZodType2 = /* @__PURE__ */ $constructor("ZodType", (inst, def) => {
     reg.add(inst, meta);
     return inst;
   };
-  inst.parse = (data, params) => parse4(inst, data, params, { callee: inst.parse });
+  inst.parse = (data, params) => parse5(inst, data, params, { callee: inst.parse });
   inst.safeParse = (data, params) => safeParse3(inst, data, params);
   inst.parseAsync = async (data, params) => parseAsync2(inst, data, params, { callee: inst.parseAsync });
   inst.safeParseAsync = async (data, params) => safeParseAsync2(inst, data, params);
@@ -303714,7 +303729,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.48.0-nightly.20260612.g4e10a34be";
+    return "0.48.0-preview.0";
   })();
   return versionPromise;
 }
@@ -304389,8 +304404,9 @@ function classifyValidationRequiredError(googleApiError) {
 function classifyGoogleError(error40) {
   const googleApiError = parseGoogleApiError(error40);
   const status2 = googleApiError?.code ?? getErrorStatus(error40);
+  const errorMessage = googleApiError?.message || extractErrorMessage(error40);
   if (status2 === 404) {
-    const message = googleApiError?.message || (error40 instanceof Error ? error40.message : "Model not found");
+    const message = errorMessage.trim() || "Model not found";
     return new ModelNotFoundError(message, status2);
   }
   if (status2 === 403 && googleApiError) {
@@ -304399,26 +304415,34 @@ function classifyGoogleError(error40) {
       return validationError;
     }
   }
+  const lowerMessage = errorMessage.toLowerCase();
+  if ((status2 === 429 || status2 === 499 || status2 === 503) && /limit:\s*0(?!\d|\.\d)/.test(lowerMessage)) {
+    const cause = googleApiError ?? {
+      code: status2 ?? 429,
+      message: errorMessage,
+      details: []
+    };
+    return new TerminalQuotaError(errorMessage, cause);
+  }
   if (!googleApiError || googleApiError.code !== 429 && googleApiError.code !== 499 && googleApiError.code !== 503 || googleApiError.details.length === 0) {
-    const errorMessage2 = googleApiError?.message || (error40 instanceof Error ? error40.message : String(error40));
-    const match2 = errorMessage2.match(/Please retry in ([0-9.]+(?:ms|s))/);
+    const match2 = errorMessage.match(/Please retry in ([0-9.]+(?:ms|s))/);
     if (match2?.[1]) {
       const retryDelaySeconds = parseDurationInSeconds(match2[1]);
       if (retryDelaySeconds !== null) {
         const cause = googleApiError ?? {
           code: status2 ?? 429,
-          message: errorMessage2,
+          message: errorMessage,
           details: []
         };
         if (retryDelaySeconds > MAX_RETRYABLE_DELAY_SECONDS) {
-          return new TerminalQuotaError(errorMessage2, cause, retryDelaySeconds);
+          return new TerminalQuotaError(errorMessage, cause, retryDelaySeconds);
         }
-        return new RetryableQuotaError(errorMessage2, cause, retryDelaySeconds);
+        return new RetryableQuotaError(errorMessage, cause, retryDelaySeconds);
       }
     } else if (status2 === 429 || status2 === 499 || status2 === 503) {
-      return new RetryableQuotaError(errorMessage2, googleApiError ?? {
+      return new RetryableQuotaError(errorMessage, googleApiError ?? {
         code: status2,
-        message: errorMessage2,
+        message: errorMessage,
         details: []
       });
     }
@@ -304485,9 +304509,20 @@ Suggested retry after 60s.`, googleApiError, 60);
 Suggested retry after 60s.`, googleApiError, 60);
     }
   }
-  const errorMessage = googleApiError.message || (error40 instanceof Error ? error40.message : String(error40));
   return new RetryableQuotaError(errorMessage, googleApiError);
 }
+function extractErrorMessage(error40) {
+  if (typeof error40 === "string") {
+    return error40;
+  }
+  if (typeof error40 === "object" && error40 !== null && "message" in error40) {
+    const msg = error40.message;
+    if (typeof msg === "string") {
+      return msg;
+    }
+  }
+  return "";
+}
 
 // packages/core/dist/src/availability/errorClassification.js
 function classifyFailureKind(error40) {
@@ -308623,15 +308658,22 @@ async function createContentGenerator(config2, gcConfig, sessionId) {
       }
       const proxyUrl = config2.proxy?.trim();
       const proxyAgent = proxyUrl ? baseUrl?.startsWith("http://") ? new import_dist2.HttpProxyAgent(proxyUrl) : new import_dist.HttpsProxyAgent(proxyUrl) : void 0;
+      const useVertex = config2.vertexai ?? config2.authType === AuthType2.USE_VERTEX_AI;
       const googleGenAI = new GoogleGenAI({
         apiKey: config2.authType === AuthType2.GATEWAY ? config2.apiKey : config2.apiKey === "" ? void 0 : config2.apiKey,
         vertexai: config2.vertexai ?? config2.authType === AuthType2.USE_VERTEX_AI,
         httpOptions,
         ...apiVersionEnv && { apiVersion: apiVersionEnv },
-        ...proxyAgent && {
+        // Merge proxy and GDCH endpoint into googleAuthOptions if either exists
+        ...(proxyAgent || useVertex && baseUrl) && {
           googleAuthOptions: {
             clientOptions: {
-              transporterOptions: { agent: proxyAgent }
+              ...proxyAgent && {
+                transporterOptions: { agent: proxyAgent }
+              },
+              ...useVertex && baseUrl && {
+                apiEndpoint: baseUrl
+              }
             }
           }
         }
@@ -335905,7 +335947,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-J7GSQ3D3.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-TBT32VYL.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -343471,7 +343513,7 @@ var Scheduler = class {
     return false;
   }
   _isParallelizable(request) {
-    if (request.name === UPDATE_TOPIC_TOOL_NAME) {
+    if (request.name === UPDATE_TOPIC_TOOL_NAME || EDIT_TOOL_NAMES.has(request.name)) {
       return false;
     }
     if (request.args) {
@@ -350535,7 +350577,7 @@ function parseStringResponse(result2, parsers12, texts, trim = true) {
         }
         return lines[i4 + offset];
       };
-      parsers12.some(({ parse: parse8 }) => parse8(line, result2));
+      parsers12.some(({ parse: parse9 }) => parse9(line, result2));
     }
   });
   return result2;