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

package/dist/a2a-server.mjs

@@ -105516,6 +105516,150 @@ var init_open = __esm({
   }
 });
 
+// packages/core/dist/src/utils/googleErrors.js
+function parseGoogleApiError(error2) {
+  if (!error2) {
+    return null;
+  }
+  let errorObj = error2;
+  if (typeof errorObj === "string") {
+    try {
+      errorObj = JSON.parse(errorObj);
+    } catch (_) {
+      return null;
+    }
+  }
+  if (Array.isArray(errorObj) && errorObj.length > 0) {
+    errorObj = errorObj[0];
+  }
+  if (typeof errorObj !== "object" || errorObj === null) {
+    return null;
+  }
+  let currentError = fromGaxiosError(errorObj) ?? fromApiError(errorObj);
+  let depth = 0;
+  const maxDepth = 10;
+  while (currentError && typeof currentError.message === "string" && depth < maxDepth) {
+    try {
+      const parsedMessage = JSON.parse(currentError.message.replace(/\u00A0/g, "").replace(/\n/g, " "));
+      if (parsedMessage.error) {
+        currentError = parsedMessage.error;
+        depth++;
+      } else {
+        break;
+      }
+    } catch (_error) {
+      break;
+    }
+  }
+  if (!currentError) {
+    return null;
+  }
+  const code2 = currentError.code;
+  const message = currentError.message;
+  const errorDetails = currentError.details;
+  if (code2 && message) {
+    const details = [];
+    if (Array.isArray(errorDetails)) {
+      for (const detail of errorDetails) {
+        if (detail && typeof detail === "object") {
+          const detailObj = detail;
+          const typeKey = Object.keys(detailObj).find((key) => key.trim() === "@type");
+          if (typeKey) {
+            if (typeKey !== "@type") {
+              detailObj["@type"] = detailObj[typeKey];
+              delete detailObj[typeKey];
+            }
+            if (typeof detailObj["@type"] === "string") {
+              details.push(detailObj);
+            }
+          }
+        }
+      }
+    }
+    return {
+      code: code2,
+      message,
+      details
+    };
+  }
+  return null;
+}
+function isErrorShape(obj) {
+  return typeof obj === "object" && obj !== null && ("message" in obj && typeof obj.message === "string" || "code" in obj && typeof obj.code === "number");
+}
+function fromGaxiosError(errorObj) {
+  const gaxiosError = errorObj;
+  let outerError;
+  if (gaxiosError.response?.data) {
+    let data = gaxiosError.response.data;
+    if (typeof data === "string") {
+      try {
+        data = JSON.parse(data);
+      } catch (_) {
+      }
+    }
+    if (Array.isArray(data) && data.length > 0) {
+      data = data[0];
+    }
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
+        const potentialError = data.error;
+        if (isErrorShape(potentialError)) {
+          outerError = potentialError;
+        }
+      }
+    }
+  }
+  if (!outerError) {
+    if (gaxiosError.error) {
+      outerError = gaxiosError.error;
+    } else {
+      return void 0;
+    }
+  }
+  return outerError;
+}
+function fromApiError(errorObj) {
+  const apiError = errorObj;
+  let outerError;
+  if (apiError.message) {
+    let data = apiError.message;
+    if (typeof data === "string") {
+      try {
+        data = JSON.parse(data);
+      } catch (_) {
+        if (typeof data === "string") {
+          const firstBrace = data.indexOf("{");
+          const lastBrace = data.lastIndexOf("}");
+          if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
+            try {
+              data = JSON.parse(data.substring(firstBrace, lastBrace + 1));
+            } catch (__) {
+            }
+          }
+        }
+      }
+    }
+    if (Array.isArray(data) && data.length > 0) {
+      data = data[0];
+    }
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
+        const potentialError = data.error;
+        if (isErrorShape(potentialError)) {
+          outerError = potentialError;
+        }
+      }
+    }
+  }
+  return outerError;
+}
+var init_googleErrors = __esm({
+  "packages/core/dist/src/utils/googleErrors.js"() {
+    "use strict";
+  }
+});
+
 // packages/core/dist/src/utils/errors.js
 function isGaxiosError(error2) {
   return typeof error2 === "object" && error2 !== null && "response" in error2 && typeof error2.response === "object" && error2.response !== null;
@@ -105560,6 +105704,13 @@ function isResponseData(data) {
   return true;
 }
 function toFriendlyError(error2) {
+  const googleApiError = parseGoogleApiError(error2);
+  if (googleApiError && googleApiError.code === 403) {
+    const tosDetail = googleApiError.details.find((d) => d["@type"] === "type.googleapis.com/google.rpc.ErrorInfo" && "reason" in d && d.reason === "TOS_VIOLATION");
+    if (tosDetail) {
+      return new AccountSuspendedError(googleApiError.message, tosDetail.metadata);
+    }
+  }
   if (isGaxiosError(error2)) {
     const data = parseResponseData(error2);
     if (data && data.error && data.error.message && data.error.code) {
@@ -105609,10 +105760,11 @@ function isAuthenticationError(error2) {
   }
   return false;
 }
-var FatalError, FatalAuthenticationError, FatalCancellationError, ForbiddenError, UnauthorizedError, BadRequestError2, ChangeAuthRequestedError;
+var FatalError, FatalAuthenticationError, FatalCancellationError, ForbiddenError, AccountSuspendedError, UnauthorizedError, BadRequestError2, ChangeAuthRequestedError;
 var init_errors = __esm({
   "packages/core/dist/src/utils/errors.js"() {
     "use strict";
+    init_googleErrors();
     FatalError = class extends Error {
       exitCode;
       constructor(message, exitCode) {
@@ -105632,6 +105784,16 @@ var init_errors = __esm({
     };
     ForbiddenError = class extends Error {
     };
+    AccountSuspendedError = class extends ForbiddenError {
+      appealUrl;
+      appealLinkText;
+      constructor(message, metadata2) {
+        super(message);
+        this.name = "AccountSuspendedError";
+        this.appealUrl = metadata2?.["appeal_url"];
+        this.appealLinkText = metadata2?.["appeal_url_link_text"];
+      }
+    };
     UnauthorizedError = class extends Error {
     };
     BadRequestError2 = class extends Error {
@@ -141950,7 +142112,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.31.0-preview.0";
+    return "0.31.0-preview.2";
   })();
   return versionPromise;
 }
@@ -142237,150 +142399,6 @@ var init_server = __esm({
   }
 });
 
-// packages/core/dist/src/utils/googleErrors.js
-function parseGoogleApiError(error2) {
-  if (!error2) {
-    return null;
-  }
-  let errorObj = error2;
-  if (typeof errorObj === "string") {
-    try {
-      errorObj = JSON.parse(errorObj);
-    } catch (_) {
-      return null;
-    }
-  }
-  if (Array.isArray(errorObj) && errorObj.length > 0) {
-    errorObj = errorObj[0];
-  }
-  if (typeof errorObj !== "object" || errorObj === null) {
-    return null;
-  }
-  let currentError = fromGaxiosError(errorObj) ?? fromApiError(errorObj);
-  let depth = 0;
-  const maxDepth = 10;
-  while (currentError && typeof currentError.message === "string" && depth < maxDepth) {
-    try {
-      const parsedMessage = JSON.parse(currentError.message.replace(/\u00A0/g, "").replace(/\n/g, " "));
-      if (parsedMessage.error) {
-        currentError = parsedMessage.error;
-        depth++;
-      } else {
-        break;
-      }
-    } catch (_error) {
-      break;
-    }
-  }
-  if (!currentError) {
-    return null;
-  }
-  const code2 = currentError.code;
-  const message = currentError.message;
-  const errorDetails = currentError.details;
-  if (code2 && message) {
-    const details = [];
-    if (Array.isArray(errorDetails)) {
-      for (const detail of errorDetails) {
-        if (detail && typeof detail === "object") {
-          const detailObj = detail;
-          const typeKey = Object.keys(detailObj).find((key) => key.trim() === "@type");
-          if (typeKey) {
-            if (typeKey !== "@type") {
-              detailObj["@type"] = detailObj[typeKey];
-              delete detailObj[typeKey];
-            }
-            if (typeof detailObj["@type"] === "string") {
-              details.push(detailObj);
-            }
-          }
-        }
-      }
-    }
-    return {
-      code: code2,
-      message,
-      details
-    };
-  }
-  return null;
-}
-function isErrorShape(obj) {
-  return typeof obj === "object" && obj !== null && ("message" in obj && typeof obj.message === "string" || "code" in obj && typeof obj.code === "number");
-}
-function fromGaxiosError(errorObj) {
-  const gaxiosError = errorObj;
-  let outerError;
-  if (gaxiosError.response?.data) {
-    let data = gaxiosError.response.data;
-    if (typeof data === "string") {
-      try {
-        data = JSON.parse(data);
-      } catch (_) {
-      }
-    }
-    if (Array.isArray(data) && data.length > 0) {
-      data = data[0];
-    }
-    if (typeof data === "object" && data !== null) {
-      if ("error" in data) {
-        const potentialError = data.error;
-        if (isErrorShape(potentialError)) {
-          outerError = potentialError;
-        }
-      }
-    }
-  }
-  if (!outerError) {
-    if (gaxiosError.error) {
-      outerError = gaxiosError.error;
-    } else {
-      return void 0;
-    }
-  }
-  return outerError;
-}
-function fromApiError(errorObj) {
-  const apiError = errorObj;
-  let outerError;
-  if (apiError.message) {
-    let data = apiError.message;
-    if (typeof data === "string") {
-      try {
-        data = JSON.parse(data);
-      } catch (_) {
-        if (typeof data === "string") {
-          const firstBrace = data.indexOf("{");
-          const lastBrace = data.lastIndexOf("}");
-          if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
-            try {
-              data = JSON.parse(data.substring(firstBrace, lastBrace + 1));
-            } catch (__) {
-            }
-          }
-        }
-      }
-    }
-    if (Array.isArray(data) && data.length > 0) {
-      data = data[0];
-    }
-    if (typeof data === "object" && data !== null) {
-      if ("error" in data) {
-        const potentialError = data.error;
-        if (isErrorShape(potentialError)) {
-          outerError = potentialError;
-        }
-      }
-    }
-  }
-  return outerError;
-}
-var init_googleErrors = __esm({
-  "packages/core/dist/src/utils/googleErrors.js"() {
-    "use strict";
-  }
-});
-
 // packages/core/dist/src/utils/httpErrors.js
 function getErrorStatus(error2) {
   if (typeof error2 === "object" && error2 !== null) {
@@ -219396,8 +219414,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 = "3e3da76cc";
+    CLI_VERSION = "0.31.0-preview.2";
   }
 });
 
@@ -415385,11 +415403,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 +415432,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 +415591,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 +415599,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 +415749,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 +415781,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 +415853,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 +415876,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 +415905,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.`);