@google/gemini-cli 0.55.0-preview.3 → 0.55.1

package/bundle/{chunk-D7NKQXI3.js → chunk-32XQ54AJ.js}

@@ -282559,8 +282559,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "da3710eb9";
-var CLI_VERSION = "0.55.0-preview.2";
+var GIT_COMMIT_INFO = "58ba19945";
+var CLI_VERSION = "0.55.1";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -305823,7 +305823,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.55.0-preview.2";
+    return "0.55.1";
   })();
   return versionPromise;
 }
@@ -338558,7 +338558,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-BPEC44QP.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-RA73ERNX.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -365882,6 +365882,29 @@ import * as http2 from "node:http";
 import * as crypto19 from "node:crypto";
 import { URL as URL6 } from "node:url";
 var REDIRECT_PATH = "/oauth/callback";
+function getRedirectUri(config2, redirectPort) {
+  if (process.env["GOOGLE_CLOUD_WORKSTATIONS"] === "true" && process.env["WEB_HOST"]) {
+    if (config2.redirectUri) {
+      try {
+        const parsed = new URL6(config2.redirectUri);
+        if (parsed.hostname === "localhost" || parsed.hostname === "127.0.0.1" || parsed.hostname === "[::1]") {
+          const port = String(redirectPort);
+          parsed.protocol = "https:";
+          parsed.hostname = `${port}-${process.env["WEB_HOST"]}`;
+          parsed.port = "";
+          return parsed.toString();
+        }
+      } catch {
+      }
+      return config2.redirectUri;
+    }
+    return `https://${redirectPort}-${process.env["WEB_HOST"]}${REDIRECT_PATH}`;
+  }
+  if (config2.redirectUri) {
+    return config2.redirectUri;
+  }
+  return `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+}
 var HTTP_OK = 200;
 function generatePKCEParams() {
   const codeVerifier = crypto19.randomBytes(64).toString("base64url");
@@ -366015,7 +366038,7 @@ function getPortFromUrl(urlString) {
   return void 0;
 }
 function buildAuthorizationUrl(config2, pkceParams, redirectPort, resource) {
-  const redirectUri = config2.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+  const redirectUri = getRedirectUri(config2, redirectPort);
   const params = new URLSearchParams({
     client_id: config2.clientId,
     response_type: "code",
@@ -366104,7 +366127,7 @@ async function parseTokenEndpointResponse(response, operationName, defaultErrorC
   };
 }
 async function exchangeCodeForToken(config2, code, codeVerifier, redirectPort, resource) {
-  const redirectUri = config2.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+  const redirectUri = getRedirectUri(config2, redirectPort);
   const params = new URLSearchParams({
     grant_type: "authorization_code",
     code,
@@ -366175,7 +366198,7 @@ var MCPOAuthProvider = class {
    * @returns The registered client information
    */
   async registerClient(registrationUrl, config2, redirectPort) {
-    const redirectUri = config2.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+    const redirectUri = getRedirectUri(config2, redirectPort);
     const registrationRequest = {
       client_name: "Gemini CLI MCP Client",
       redirect_uris: [redirectUri],
@@ -366464,10 +366487,11 @@ ${authUrl}
       debugLogger.debug(`Returning valid token for server: ${serverName}`);
       return token2.accessToken;
     }
-    if (token2.refreshToken && config2.clientId && credentials3.tokenUrl) {
+    const clientId = config2.clientId ?? credentials3.clientId;
+    if (token2.refreshToken && clientId && credentials3.tokenUrl) {
       try {
         debugLogger.log(`Refreshing expired token for MCP server: ${serverName}`);
-        const newTokenResponse = await this.refreshAccessToken(config2, token2.refreshToken, credentials3.tokenUrl, credentials3.mcpServerUrl);
+        const newTokenResponse = await this.refreshAccessToken({ ...config2, clientId }, token2.refreshToken, credentials3.tokenUrl, credentials3.mcpServerUrl);
         const newToken = {
           accessToken: newTokenResponse.access_token,
           tokenType: newTokenResponse.token_type,
@@ -366477,7 +366501,7 @@ ${authUrl}
         if (newTokenResponse.expires_in) {
           newToken.expiresAt = Date.now() + newTokenResponse.expires_in * 1e3;
         }
-        await this.tokenStorage.saveToken(serverName, newToken, config2.clientId, credentials3.tokenUrl, credentials3.mcpServerUrl);
+        await this.tokenStorage.saveToken(serverName, newToken, clientId, credentials3.tokenUrl, credentials3.mcpServerUrl);
         return newToken.accessToken;
       } catch (error40) {
         coreEvents.emitFeedback("error", "Failed to refresh auth token.", error40);
@@ -366495,7 +366519,7 @@ ${authUrl}
       const clientId = config2.clientId ?? credentials3.clientId;
       if (current.refreshToken && clientId && credentials3.tokenUrl) {
         try {
-          const newTokenResponse = await this.refreshAccessToken(config2, current.refreshToken, credentials3.tokenUrl, credentials3.mcpServerUrl);
+          const newTokenResponse = await this.refreshAccessToken({ ...config2, clientId }, current.refreshToken, credentials3.tokenUrl, credentials3.mcpServerUrl);
           const refreshed = {
             accessToken: newTokenResponse.access_token,
             tokenType: newTokenResponse.token_type,

package/bundle/{chunk-BXJWVB6T.js → chunk-3PF5QBBI.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-2K3N3YWJ.js";
+} from "./chunk-4VCYHMUV.js";
 import {
   AppEvent,
   appEvents
@@ -59,14 +59,14 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-XLLOEYE5.js";
+} from "./chunk-4PTN4HDB.js";
 import {
   isDevelopment
-} from "./chunk-S35HA76T.js";
+} from "./chunk-XCA4ZL2J.js";
 import {
   emptyIcon,
   require_react
-} from "./chunk-OKM3M2PX.js";
+} from "./chunk-2M2ZIALC.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
@@ -230,7 +230,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-VPMDE76T.js";
+} from "./chunk-QCOIICKD.js";
 import {
   require_src
 } from "./chunk-TUDYL3X4.js";
@@ -77163,7 +77163,7 @@ var authCommand = {
 import process29 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "da3710eb9";
+var GIT_COMMIT_INFO = "58ba19945";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -82944,7 +82944,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./core-PJ4GTWLE.js");
+      const { MCPOAuthProvider } = await import("./core-IV4CNC54.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };

package/bundle/{chunk-XLLOEYE5.js → chunk-4PTN4HDB.js}

@@ -28,7 +28,7 @@ import {
   partListUnionToString,
   require_strip_json_comments,
   sanitizeFilenamePart
-} from "./chunk-VPMDE76T.js";
+} from "./chunk-QCOIICKD.js";
 import {
   __commonJS,
   __require,

package/bundle/{chunk-2K3N3YWJ.js → chunk-4VCYHMUV.js}

@@ -1,7 +1,7 @@
 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-4PVLKN7E.js";
+} from "./chunk-PG6A7S3N.js";
 import {
   __commonJS,
   __require

package/bundle/{chunk-IKOQM4YN.js → chunk-54ARFWUQ.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-CF6HJK4T.js";
+} from "./chunk-F6UH32RP.js";
 import {
   DEFAULT_PORT,
   SERVER_START_WAIT_MS,
@@ -14,10 +14,10 @@ import {
   isServerRunning,
   resolveGemmaConfig,
   writeServerProcessInfo
-} from "./chunk-DW2J2NTU.js";
+} from "./chunk-ODKPTNXF.js";
 import {
   debugLogger
-} from "./chunk-WWUS7UCO.js";
+} from "./chunk-32XQ54AJ.js";
 import {
   __toESM
 } from "./chunk-34MYV7JD.js";

package/bundle/{chunk-GJBRSFPM.js → chunk-5LKFYSMV.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-CF6HJK4T.js";
+} from "./chunk-F6UH32RP.js";
 import {
   AppEvent,
   appEvents
@@ -59,14 +59,14 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-DW2J2NTU.js";
+} from "./chunk-ODKPTNXF.js";
 import {
   isDevelopment
-} from "./chunk-ETEDB3N6.js";
+} from "./chunk-AICCA4O7.js";
 import {
   emptyIcon,
   require_react
-} from "./chunk-DIJFIQU5.js";
+} from "./chunk-MVFWCC7A.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
@@ -243,7 +243,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-WWUS7UCO.js";
+} from "./chunk-32XQ54AJ.js";
 import {
   require_src
 } from "./chunk-TUDYL3X4.js";
@@ -77176,7 +77176,7 @@ var authCommand = {
 import process29 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "a41ce0f59";
+var GIT_COMMIT_INFO = "41327e407";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -82957,7 +82957,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./dist-VQ3F4FS5.js");
+      const { MCPOAuthProvider } = await import("./dist-DZLHUESI.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };

package/bundle/{chunk-2YAEBNH4.js → chunk-7PUNXJV6.js}

@@ -1,7 +1,7 @@
 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-MOTK2J3L.js";
+} from "./chunk-QZIGFB5E.js";
 import {
   __commonJS,
   __require

package/bundle/{chunk-4MK4F3LQ.js → chunk-AHQT54A5.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-MOTK2J3L.js";
+} from "./chunk-QZIGFB5E.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-D7NKQXI3.js";
+} from "./chunk-TBDX7VEE.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";

package/bundle/{chunk-ETEDB3N6.js → chunk-AICCA4O7.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-FQNLDGXL.js";
+} from "./chunk-MMGNXRKB.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-WWUS7UCO.js";
+} from "./chunk-32XQ54AJ.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";

package/bundle/{chunk-DW2J2NTU.js → chunk-CBP73R2W.js}

@@ -31,7 +31,7 @@ import {
   partListUnionToString,
   require_strip_json_comments,
   sanitizeFilenamePart
-} from "./chunk-WWUS7UCO.js";
+} from "./chunk-TBDX7VEE.js";
 import {
   __commonJS,
   __require,

package/bundle/{chunk-XNQ2USVV.js → chunk-DPETPWEN.js}

@@ -31,7 +31,7 @@ import {
   partListUnionToString,
   require_strip_json_comments,
   sanitizeFilenamePart
-} from "./chunk-D7NKQXI3.js";
+} from "./chunk-ZYL2LM3Y.js";
 import {
   __commonJS,
   __require,

package/bundle/{chunk-3JEIIDY3.js → chunk-F6UH32RP.js}

@@ -1,7 +1,7 @@
 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-5C4IPSFG.js";
+} from "./chunk-MMGNXRKB.js";
 import {
   __commonJS,
   __require

package/bundle/{chunk-V6HSKTFR.js → chunk-FFNJNOPW.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-2YAEBNH4.js";
+} from "./chunk-UE3CHSFT.js";
 import {
   DEFAULT_PORT,
   SERVER_START_WAIT_MS,
@@ -14,10 +14,10 @@ import {
   isServerRunning,
   resolveGemmaConfig,
   writeServerProcessInfo
-} from "./chunk-XNQ2USVV.js";
+} from "./chunk-DPETPWEN.js";
 import {
   debugLogger
-} from "./chunk-D7NKQXI3.js";
+} from "./chunk-ZYL2LM3Y.js";
 import {
   __toESM
 } from "./chunk-34MYV7JD.js";

package/bundle/{chunk-QJZS4YYR.js → chunk-IHBI4YWX.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-2YAEBNH4.js";
+} from "./chunk-UE3CHSFT.js";
 import {
   AppEvent,
   appEvents
@@ -59,14 +59,14 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-XNQ2USVV.js";
+} from "./chunk-DPETPWEN.js";
 import {
   isDevelopment
-} from "./chunk-4MK4F3LQ.js";
+} from "./chunk-UNIFGKZA.js";
 import {
   emptyIcon,
   require_react
-} from "./chunk-ENEDM4X3.js";
+} from "./chunk-RV6ZZ7XX.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
@@ -243,7 +243,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-D7NKQXI3.js";
+} from "./chunk-ZYL2LM3Y.js";
 import {
   require_src
 } from "./chunk-TUDYL3X4.js";
@@ -77176,7 +77176,7 @@ var authCommand = {
 import process29 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "da3710eb9";
+var GIT_COMMIT_INFO = "58ba19945";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -82957,7 +82957,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./dist-6SIQ6JNU.js");
+      const { MCPOAuthProvider } = await import("./dist-6SH22WAQ.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };

package/bundle/{chunk-YOSR3LGH.js → chunk-L72KYPGX.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-3JEIIDY3.js";
+} from "./chunk-7PUNXJV6.js";
 import {
   AppEvent,
   appEvents
@@ -59,14 +59,14 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-3KVUW3GS.js";
+} from "./chunk-CBP73R2W.js";
 import {
   isDevelopment
-} from "./chunk-NQ7ACVH7.js";
+} from "./chunk-AHQT54A5.js";
 import {
   emptyIcon,
   require_react
-} from "./chunk-6VBVRJ2T.js";
+} from "./chunk-WD5EVW3M.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
@@ -243,7 +243,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-QY6VB26P.js";
+} from "./chunk-TBDX7VEE.js";
 import {
   require_src
 } from "./chunk-TUDYL3X4.js";
@@ -77176,7 +77176,7 @@ var authCommand = {
 import process29 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "da3710eb9";
+var GIT_COMMIT_INFO = "58ba19945";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -82957,7 +82957,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./dist-UVDHLJPD.js");
+      const { MCPOAuthProvider } = await import("./dist-GGMH7TPR.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };

package/bundle/{chunk-4PVLKN7E.js → chunk-MMGNXRKB.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-VPMDE76T.js";
+} from "./chunk-32XQ54AJ.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-6VBVRJ2T.js → chunk-MVFWCC7A.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   CoreToolCallStatus,
   checkExhaustive
-} from "./chunk-QY6VB26P.js";
+} from "./chunk-32XQ54AJ.js";
 import {
   __commonJS,
   __toESM

package/bundle/{chunk-5C4IPSFG.js → chunk-MXXWTJ5T.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-QY6VB26P.js";
+} from "./chunk-ZYL2LM3Y.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-3KVUW3GS.js → chunk-ODKPTNXF.js}

@@ -31,7 +31,7 @@ import {
   partListUnionToString,
   require_strip_json_comments,
   sanitizeFilenamePart
-} from "./chunk-QY6VB26P.js";
+} from "./chunk-32XQ54AJ.js";
 import {
   __commonJS,
   __require,

package/bundle/{chunk-FQNLDGXL.js → chunk-PG6A7S3N.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-WWUS7UCO.js";
+} from "./chunk-QCOIICKD.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-VPMDE76T.js → chunk-QCOIICKD.js}

@@ -282830,8 +282830,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "da3710eb9";
-var CLI_VERSION = "0.55.0-preview.2";
+var GIT_COMMIT_INFO = "58ba19945";
+var CLI_VERSION = "0.56.0-nightly.20260806.g761f604c1";
 
 // packages/core/src/ide/detect-ide.ts
 var IDE_DEFINITIONS = {
@@ -306413,7 +306413,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.55.0-preview.2";
+    return "0.56.0-nightly.20260806.g761f604c1";
   })();
   return versionPromise;
 }
@@ -341236,7 +341236,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-IVUO6NTZ.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-QKZF52YW.js");
         const provider = new OAuth2AuthProvider(
           authConfig,
           options.agentName ?? "unknown",
@@ -371103,6 +371103,29 @@ import * as http2 from "node:http";
 import * as crypto19 from "node:crypto";
 import { URL as URL6 } from "node:url";
 var REDIRECT_PATH = "/oauth/callback";
+function getRedirectUri(config2, redirectPort) {
+  if (process.env["GOOGLE_CLOUD_WORKSTATIONS"] === "true" && process.env["WEB_HOST"]) {
+    if (config2.redirectUri) {
+      try {
+        const parsed = new URL6(config2.redirectUri);
+        if (parsed.hostname === "localhost" || parsed.hostname === "127.0.0.1" || parsed.hostname === "[::1]") {
+          const port = String(redirectPort);
+          parsed.protocol = "https:";
+          parsed.hostname = `${port}-${process.env["WEB_HOST"]}`;
+          parsed.port = "";
+          return parsed.toString();
+        }
+      } catch {
+      }
+      return config2.redirectUri;
+    }
+    return `https://${redirectPort}-${process.env["WEB_HOST"]}${REDIRECT_PATH}`;
+  }
+  if (config2.redirectUri) {
+    return config2.redirectUri;
+  }
+  return `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+}
 var HTTP_OK = 200;
 function generatePKCEParams() {
   const codeVerifier = crypto19.randomBytes(64).toString("base64url");
@@ -371247,7 +371270,7 @@ function getPortFromUrl(urlString) {
   return void 0;
 }
 function buildAuthorizationUrl(config2, pkceParams, redirectPort, resource) {
-  const redirectUri = config2.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+  const redirectUri = getRedirectUri(config2, redirectPort);
   const params = new URLSearchParams({
     client_id: config2.clientId,
     response_type: "code",
@@ -371342,7 +371365,7 @@ async function parseTokenEndpointResponse(response, operationName, defaultErrorC
   };
 }
 async function exchangeCodeForToken(config2, code, codeVerifier, redirectPort, resource) {
-  const redirectUri = config2.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+  const redirectUri = getRedirectUri(config2, redirectPort);
   const params = new URLSearchParams({
     grant_type: "authorization_code",
     code,
@@ -371417,7 +371440,7 @@ var MCPOAuthProvider = class {
    * @returns The registered client information
    */
   async registerClient(registrationUrl, config2, redirectPort) {
-    const redirectUri = config2.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+    const redirectUri = getRedirectUri(config2, redirectPort);
     const registrationRequest = {
       client_name: "Gemini CLI MCP Client",
       redirect_uris: [redirectUri],
@@ -371763,13 +371786,14 @@ ${authUrl}
       debugLogger.debug(`Returning valid token for server: ${serverName}`);
       return token2.accessToken;
     }
-    if (token2.refreshToken && config2.clientId && credentials3.tokenUrl) {
+    const clientId = config2.clientId ?? credentials3.clientId;
+    if (token2.refreshToken && clientId && credentials3.tokenUrl) {
       try {
         debugLogger.log(
           `Refreshing expired token for MCP server: ${serverName}`
         );
         const newTokenResponse = await this.refreshAccessToken(
-          config2,
+          { ...config2, clientId },
           token2.refreshToken,
           credentials3.tokenUrl,
           credentials3.mcpServerUrl
@@ -371786,7 +371810,7 @@ ${authUrl}
         await this.tokenStorage.saveToken(
           serverName,
           newToken,
-          config2.clientId,
+          clientId,
           credentials3.tokenUrl,
           credentials3.mcpServerUrl
         );
@@ -371811,7 +371835,7 @@ ${authUrl}
       if (current.refreshToken && clientId && credentials3.tokenUrl) {
         try {
           const newTokenResponse = await this.refreshAccessToken(
-            config2,
+            { ...config2, clientId },
             current.refreshToken,
             credentials3.tokenUrl,
             credentials3.mcpServerUrl

package/bundle/{chunk-MOTK2J3L.js → chunk-QZIGFB5E.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-D7NKQXI3.js";
+} from "./chunk-TBDX7VEE.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-DIJFIQU5.js → chunk-RV6ZZ7XX.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   CoreToolCallStatus,
   checkExhaustive
-} from "./chunk-WWUS7UCO.js";
+} from "./chunk-ZYL2LM3Y.js";
 import {
   __commonJS,
   __toESM