@google/gemini-cli-a2a-server 0.30.0-preview.6 → 0.30.1

package/dist/a2a-server.mjs

@@ -131345,7 +131345,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.30.0-preview.6";
+    return "0.30.1";
   })();
   return versionPromise;
 }
@@ -208745,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 = "a24009f9c";
-    CLI_VERSION = "0.30.0-preview.6";
+    GIT_COMMIT_INFO = "0fc15382a";
+    CLI_VERSION = "0.30.1";
   }
 });
 
@@ -399642,6 +399642,105 @@ ${authUrl}
   }
 });
 
+// node_modules/dotenv-expand/lib/main.js
+var require_main = __commonJS({
+  "node_modules/dotenv-expand/lib/main.js"(exports2, module2) {
+    "use strict";
+    function _resolveEscapeSequences(value) {
+      return value.replace(/\\\$/g, "$");
+    }
+    function expandValue(value, processEnv, runningParsed) {
+      const env2 = { ...runningParsed, ...processEnv };
+      const regex2 = /(?<!\\)\${([^{}]+)}|(?<!\\)\$([A-Za-z_][A-Za-z0-9_]*)/g;
+      let result2 = value;
+      let match2;
+      const seen = /* @__PURE__ */ new Set();
+      while ((match2 = regex2.exec(result2)) !== null) {
+        seen.add(result2);
+        const [template, bracedExpression, unbracedExpression] = match2;
+        const expression = bracedExpression || unbracedExpression;
+        const opRegex = /(:\+|\+|:-|-)/;
+        const opMatch = expression.match(opRegex);
+        const splitter = opMatch ? opMatch[0] : null;
+        const r3 = expression.split(splitter);
+        let defaultValue;
+        let value2;
+        const key = r3.shift();
+        if ([":+", "+"].includes(splitter)) {
+          defaultValue = env2[key] ? r3.join(splitter) : "";
+          value2 = null;
+        } else {
+          defaultValue = r3.join(splitter);
+          value2 = env2[key];
+        }
+        if (value2) {
+          if (seen.has(value2)) {
+            result2 = result2.replace(template, defaultValue);
+          } else {
+            result2 = result2.replace(template, value2);
+          }
+        } else {
+          result2 = result2.replace(template, defaultValue);
+        }
+        if (result2 === runningParsed[key]) {
+          break;
+        }
+        regex2.lastIndex = 0;
+      }
+      return result2;
+    }
+    function expand3(options) {
+      const runningParsed = {};
+      let processEnv = process.env;
+      if (options && options.processEnv != null) {
+        processEnv = options.processEnv;
+      }
+      for (const key in options.parsed) {
+        let value = options.parsed[key];
+        if (processEnv[key] && processEnv[key] !== value) {
+          value = processEnv[key];
+        } else {
+          value = expandValue(value, processEnv, runningParsed);
+        }
+        options.parsed[key] = _resolveEscapeSequences(value);
+        runningParsed[key] = _resolveEscapeSequences(value);
+      }
+      for (const processKey in options.parsed) {
+        processEnv[processKey] = options.parsed[processKey];
+      }
+      return options;
+    }
+    module2.exports.expand = expand3;
+  }
+});
+
+// packages/core/dist/src/utils/envExpansion.js
+function expandEnvVars(str2, env2) {
+  if (!str2)
+    return str2;
+  const isWindows5 = process.platform === "win32";
+  const processedStr = isWindows5 ? str2.replace(/%(\w+)%/g, (_, name4) => env2[name4] ?? "") : str2;
+  const dummyKey = "__GCLI_EXPAND_TARGET__";
+  const processEnv = {};
+  for (const [key, value] of Object.entries(env2)) {
+    if (value !== void 0) {
+      processEnv[key] = value;
+    }
+  }
+  const result2 = (0, import_dotenv_expand.expand)({
+    parsed: { [dummyKey]: processedStr },
+    processEnv
+  });
+  return result2.parsed?.[dummyKey] ?? "";
+}
+var import_dotenv_expand;
+var init_envExpansion = __esm({
+  "packages/core/dist/src/utils/envExpansion.js"() {
+    "use strict";
+    import_dotenv_expand = __toESM(require_main(), 1);
+  }
+});
+
 // packages/core/dist/src/tools/mcp-client.js
 import { basename as basename11 } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -399702,10 +399801,22 @@ 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, sanitizedEnv);
+    }
+  }
   return {
     headers: {
-      ...mcpServerConfig.headers,
+      ...expandedHeaders,
       ...headers
     }
   };
@@ -399719,13 +399830,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) {
@@ -399887,7 +399998,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);
@@ -399895,7 +400006,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}'`);
   }
@@ -400045,7 +400156,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}'`);
@@ -400076,7 +400187,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}'`);
             }
@@ -400148,20 +400259,36 @@ 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 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,
+      ...extensionEnv
+    };
+    for (const [key, value] of Object.entries(sanitizedEnv)) {
+      if (value !== void 0) {
+        finalEnv[key] = value;
+      }
+    }
+    if (mcpServerConfig.env) {
+      for (const [key, value] of Object.entries(mcpServerConfig.env)) {
+        finalEnv[key] = expandEnvVars(value, expansionEnv);
+      }
+    }
     let transport = new StdioClientTransport({
       command: mcpServerConfig.command,
       args: mcpServerConfig.args || [],
-      env: {
-        ...sanitizeEnvironment(process.env, sanitizationConfig),
-        ...mcpServerConfig.env || {},
-        [GEMINI_CLI_IDENTIFICATION_ENV_VAR]: GEMINI_CLI_IDENTIFICATION_ENV_VAR_VALUE
-      },
+      env: finalEnv,
       cwd: mcpServerConfig.cwd,
       stderr: "pipe"
     });
@@ -400184,6 +400311,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.`);
@@ -400220,6 +400358,7 @@ var init_mcp_client = __esm({
     init_message_bus();
     init_events();
     init_environmentSanitization();
+    init_envExpansion();
     init_shellExecutionService();
     MCP_DEFAULT_TIMEOUT_MSEC = 10 * 60 * 1e3;
     (function(MCPServerStatus2) {
@@ -407842,7 +407981,7 @@ var require_package13 = __commonJS({
 });
 
 // packages/a2a-server/node_modules/dotenv/lib/main.js
-var require_main = __commonJS({
+var require_main2 = __commonJS({
   "packages/a2a-server/node_modules/dotenv/lib/main.js"(exports2, module2) {
     var fs73 = __require("fs");
     var path86 = __require("path");
@@ -426060,7 +426199,7 @@ import { promises as fsPromises11, createReadStream as createReadStream5 } from
 import { join as join25 } from "node:path";
 
 // packages/a2a-server/src/config/config.ts
-var dotenv = __toESM(require_main(), 1);
+var dotenv = __toESM(require_main2(), 1);
 init_dist7();
 import * as fs67 from "node:fs";
 import * as path79 from "node:path";