@google/gemini-cli-a2a-server 0.31.0-preview.0 → 0.31.0-preview.1

package/dist/a2a-server.mjs

@@ -141950,7 +141950,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.31.0-preview.0";
+    return "0.31.0-preview.1";
   })();
   return versionPromise;
 }
@@ -219396,8 +219396,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 = "bf278ef2b";
-    CLI_VERSION = "0.31.0-preview.0";
+    GIT_COMMIT_INFO = "b15330140";
+    CLI_VERSION = "0.31.0-preview.1";
   }
 });
 
@@ -415385,11 +415385,17 @@ async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthentic
     return false;
   }
 }
-function createTransportRequestInit(mcpServerConfig, headers) {
+function createTransportRequestInit(mcpServerConfig, headers, sanitizationConfig) {
+  const extensionEnv = getExtensionEnvironment(mcpServerConfig.extension);
+  const expansionEnv = { ...process.env, ...extensionEnv };
+  const sanitizedEnv = sanitizeEnvironment(expansionEnv, {
+    ...sanitizationConfig,
+    enableEnvironmentVariableRedaction: true
+  });
   const expandedHeaders = {};
   if (mcpServerConfig.headers) {
     for (const [key, value] of Object.entries(mcpServerConfig.headers)) {
-      expandedHeaders[key] = expandEnvVars(value, process.env);
+      expandedHeaders[key] = expandEnvVars(value, sanitizedEnv);
     }
   }
   return {
@@ -415408,13 +415414,13 @@ function createAuthProvider(mcpServerConfig) {
   }
   return void 0;
 }
-async function createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken) {
+async function createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken, sanitizationConfig) {
   try {
     const headers = {
       Authorization: `Bearer ${accessToken}`
     };
     const transportOptions = {
-      requestInit: createTransportRequestInit(mcpServerConfig, headers)
+      requestInit: createTransportRequestInit(mcpServerConfig, headers, sanitizationConfig)
     };
     return createUrlTransport(mcpServerName, mcpServerConfig, transportOptions);
   } catch (error2) {
@@ -415567,7 +415573,7 @@ async function showAuthRequiredMessage(serverName) {
   coreEvents.emitFeedback("info", message);
   throw new UnauthorizedError(message);
 }
-async function retryWithOAuth(client, serverName, config3, accessToken, httpReturned404) {
+async function retryWithOAuth(client, serverName, config3, accessToken, httpReturned404, sanitizationConfig) {
   if (httpReturned404) {
     debugLogger.log(`Retrying SSE connection to '${serverName}' with OAuth token...`);
     await connectWithSSETransport(client, config3, accessToken);
@@ -415575,7 +415581,7 @@ async function retryWithOAuth(client, serverName, config3, accessToken, httpRetu
     return;
   }
   debugLogger.log(`Retrying connection to '${serverName}' with OAuth token...`);
-  const httpTransport = await createTransportWithOAuth(serverName, config3, accessToken);
+  const httpTransport = await createTransportWithOAuth(serverName, config3, accessToken, sanitizationConfig);
   if (!httpTransport) {
     throw new Error(`Failed to create OAuth transport for server '${serverName}'`);
   }
@@ -415725,7 +415731,7 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
           if (!accessToken) {
             throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
           }
-          await retryWithOAuth(mcpClient, mcpServerName, mcpServerConfig, accessToken, httpReturned404);
+          await retryWithOAuth(mcpClient, mcpServerName, mcpServerConfig, accessToken, httpReturned404, sanitizationConfig);
           return mcpClient;
         } else {
           throw new Error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
@@ -415757,7 +415763,7 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
             if (!accessToken) {
               throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
             }
-            const oauthTransport = await createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken);
+            const oauthTransport = await createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken, sanitizationConfig);
             if (!oauthTransport) {
               throw new Error(`Failed to create OAuth transport for server '${mcpServerName}'`);
             }
@@ -415829,18 +415835,21 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode, saniti
       }
     }
     const transportOptions = {
-      requestInit: createTransportRequestInit(mcpServerConfig, headers),
+      requestInit: createTransportRequestInit(mcpServerConfig, headers, sanitizationConfig),
       authProvider
     };
     return createUrlTransport(mcpServerName, mcpServerConfig, transportOptions);
   }
   if (mcpServerConfig.command) {
-    const sanitizedEnv = sanitizeEnvironment(process.env, {
+    const extensionEnv = getExtensionEnvironment(mcpServerConfig.extension);
+    const expansionEnv = { ...process.env, ...extensionEnv };
+    const sanitizedEnv = sanitizeEnvironment(expansionEnv, {
       ...sanitizationConfig,
       enableEnvironmentVariableRedaction: true
     });
     const finalEnv = {
-      [GEMINI_CLI_IDENTIFICATION_ENV_VAR]: GEMINI_CLI_IDENTIFICATION_ENV_VAR_VALUE
+      [GEMINI_CLI_IDENTIFICATION_ENV_VAR]: GEMINI_CLI_IDENTIFICATION_ENV_VAR_VALUE,
+      ...extensionEnv
     };
     for (const [key, value] of Object.entries(sanitizedEnv)) {
       if (value !== void 0) {
@@ -415849,7 +415858,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode, saniti
     }
     if (mcpServerConfig.env) {
       for (const [key, value] of Object.entries(mcpServerConfig.env)) {
-        finalEnv[key] = expandEnvVars(value, process.env);
+        finalEnv[key] = expandEnvVars(value, expansionEnv);
       }
     }
     let transport = new StdioClientTransport({
@@ -415878,6 +415887,17 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode, saniti
   }
   throw new Error(`Invalid configuration: missing httpUrl (for Streamable HTTP), url (for SSE), and command (for stdio).`);
 }
+function getExtensionEnvironment(extension) {
+  const env2 = {};
+  if (extension?.resolvedSettings) {
+    for (const setting of extension.resolvedSettings) {
+      if (setting.value !== void 0) {
+        env2[setting.envVar] = setting.value;
+      }
+    }
+  }
+  return env2;
+}
 function isEnabled(funcDecl, mcpServerName, mcpServerConfig) {
   if (!funcDecl.name) {
     debugLogger.warn(`Discovered a function declaration without a name from MCP server '${mcpServerName}'. Skipping.`);