@atlasharness/atlascode 0.1.75 → 0.1.76

package/dist/cli.js

@@ -167950,7 +167950,7 @@ var init_hooks3 = __esm(() => {
 });
 
 // src/tui/services/mcp/types.ts
-var ConfigScopeSchema3, TransportSchema2, McpStdioServerConfigSchema3, McpXaaConfigSchema2, McpOAuthConfigSchema2, McpSSEServerConfigSchema3, McpSSEIDEServerConfigSchema, McpWebSocketIDEServerConfigSchema, McpHTTPServerConfigSchema2, McpWebSocketServerConfigSchema2, McpSdkServerConfigSchema2, McpServerConfigSchema2, McpJsonConfigSchema2;
+var ConfigScopeSchema3, TransportSchema2, McpStdioServerConfigSchema3, McpXaaConfigSchema2, McpOauthGatedMarkerSchema, McpOAuthConfigSchema2, McpSSEServerConfigSchema3, McpSSEIDEServerConfigSchema, McpWebSocketIDEServerConfigSchema, McpHTTPServerConfigSchema2, McpWebSocketServerConfigSchema2, McpSdkServerConfigSchema2, McpServerConfigSchema2, McpJsonConfigSchema2;
 var init_types9 = __esm(() => {
   init_v4();
   ConfigScopeSchema3 = lazySchema2(() => _enum([
@@ -167970,6 +167970,7 @@ var init_types9 = __esm(() => {
     env: record(string2(), string2()).optional()
   }));
   McpXaaConfigSchema2 = lazySchema2(() => boolean2());
+  McpOauthGatedMarkerSchema = lazySchema2(() => boolean2().optional());
   McpOAuthConfigSchema2 = lazySchema2(() => object({
     clientId: string2().optional(),
     callbackPort: number2().int().positive().optional(),
@@ -167986,7 +167987,8 @@ var init_types9 = __esm(() => {
     url: string2(),
     headers: record(string2(), string2()).optional(),
     headersHelper: string2().optional(),
-    oauth: McpOAuthConfigSchema2().optional()
+    oauth: McpOAuthConfigSchema2().optional(),
+    oauthGated: McpOauthGatedMarkerSchema()
   }));
   McpSSEIDEServerConfigSchema = lazySchema2(() => object({
     type: literal("sse-ide"),
@@ -168006,7 +168008,8 @@ var init_types9 = __esm(() => {
     url: string2(),
     headers: record(string2(), string2()).optional(),
     headersHelper: string2().optional(),
-    oauth: McpOAuthConfigSchema2().optional()
+    oauth: McpOAuthConfigSchema2().optional(),
+    oauthGated: McpOauthGatedMarkerSchema()
   }));
   McpWebSocketServerConfigSchema2 = lazySchema2(() => object({
     type: literal("ws"),
@@ -193121,6 +193124,63 @@ var init_oauthPort = __esm(() => {
   REDIRECT_PORT_RANGE = getPlatform3() === "windows" ? { min: 39152, max: 49151 } : { min: 49152, max: 65535 };
 });
 
+// src/tui/services/mcp/oauthScopeGate.ts
+function parseMcpOauthTrustedServersEnv(raw) {
+  if (raw === undefined || raw === null) {
+    return new Set;
+  }
+  const names = new Set;
+  for (const part of raw.split(",")) {
+    const name = part.trim().toLowerCase();
+    if (name !== "") {
+      names.add(name);
+    }
+  }
+  return names;
+}
+function getMcpOauthTrustedServers() {
+  return parseMcpOauthTrustedServersEnv(process.env[MCP_OAUTH_TRUSTED_SERVERS_ENV]);
+}
+function isMcpOauthUntrustedScope(scope, pluginSource) {
+  if (scope === "project") {
+    return true;
+  }
+  return scope === "dynamic" && pluginSource !== undefined;
+}
+function isMcpOauthBlockGated(serverName, scope, pluginSource, allowlist = getMcpOauthTrustedServers()) {
+  if (!isMcpOauthUntrustedScope(scope, pluginSource)) {
+    return false;
+  }
+  return !allowlist.has(serverName.toLowerCase());
+}
+function applyMcpOauthScopeGate(serverName, server) {
+  if (server.type !== "sse" && server.type !== "http") {
+    return server;
+  }
+  const remote = server;
+  if (remote.oauth === undefined) {
+    return server;
+  }
+  if (!isMcpOauthBlockGated(serverName, server.scope, server.pluginSource)) {
+    return server;
+  }
+  const { oauth: _gatedOAuth, ...rest } = remote;
+  return { ...rest, oauthGated: true };
+}
+function isMcpOauthDisplayGated(serverName, config) {
+  if (config.oauthGated === true) {
+    return true;
+  }
+  if (config.oauth === undefined || config.oauth === null) {
+    return false;
+  }
+  return isMcpOauthBlockGated(serverName, config.scope, config.pluginSource);
+}
+function mcpOauthGatedMessage(serverName) {
+  return `MCP server "${serverName}" 的 oauth 块为 untrusted scope（project/plugin 来源），` + `操作者 allowlist 后启用：将 server 名加入 env ${MCP_OAUTH_TRUSTED_SERVERS_ENV}（逗号分隔）后重启。` + `当前该 oauth 块整体视为缺席，不发起 OAuth 流。`;
+}
+var MCP_OAUTH_TRUSTED_SERVERS_ENV = "ATLAS_MCP_OAUTH_TRUSTED_SERVERS";
+
 // src/tui/services/mcp/envExpansion.ts
 function expandEnvVarsInString2(value) {
   const missingVars = [];
@@ -193482,7 +193542,7 @@ function addScopeToServers(servers, scope) {
   }
   const scopedServers = {};
   for (const [name, config] of Object.entries(servers)) {
-    scopedServers[name] = { ...config, scope };
+    scopedServers[name] = applyMcpOauthScopeGate(name, { ...config, scope });
   }
   return scopedServers;
 }
@@ -194169,7 +194229,7 @@ async function getMcpConfigs(dynamicServers = {}, extraDedupTargets = Promise.re
     if (!isMcpServerAllowedByPolicy(name, serverConfig)) {
       continue;
     }
-    filtered[name] = serverConfig;
+    filtered[name] = applyMcpOauthScopeGate(name, serverConfig);
   }
   return { servers: filtered, errors: mcpErrors };
 }
@@ -195538,6 +195598,9 @@ async function performMCPXaaAuth(serverName, serverConfig, onAuthorizationUrl, a
   }
 }
 async function performMCPOAuthFlow(serverName, serverConfig, onAuthorizationUrl, abortSignal, options) {
+  if (isMcpOauthDisplayGated(serverName, serverConfig)) {
+    throw new Error(mcpOauthGatedMessage(serverName));
+  }
   if (serverConfig.oauth?.xaa) {
     if (!isXaaEnabled()) {
       throw new Error(`XAA is not enabled (set ATLAS_ENABLE_XAA=1). Remove 'oauth.xaa' from server '${serverName}' to use the standard consent flow.`);
@@ -196568,6 +196631,14 @@ function createMcpAuthTool(serverName, config) {
           }
         };
       }
+      if (isMcpOauthDisplayGated(serverName, config)) {
+        return {
+          data: {
+            status: "error",
+            message: mcpOauthGatedMessage(serverName)
+          }
+        };
+      }
       const sseOrHttpConfig = config;
       let resolveAuthUrl;
       const authUrlPromise = new Promise((resolve) => {
@@ -368265,6 +368336,10 @@ function MCPListPanel(t0) {
               statusIcon = color("error", theme)(figures_default.cross);
               statusText = "failed";
             }
+            if (server_3.oauthGated === true) {
+              statusIcon = color("warning", theme)(figures_default.triangleUpOutline);
+              statusText = "oauth gated (untrusted scope) — operator allowlist to enable: " + MCP_OAUTH_TRUSTED_SERVERS_ENV;
+            }
           }
         }
       }
@@ -369738,6 +369813,7 @@ function MCPRemoteServerMenu({
     }
   }, []);
   const isEffectivelyAuthenticated = server.isAuthenticated || server.client.type === "connected" && serverToolsCount > 0;
+  const isOauthGated = server.config ? isMcpOauthDisplayGated(server.name, server.config) : false;
   const reconnectMcpServer = useMcpReconnect();
   useKeybinding("confirm:no", () => {
     authAbortControllerRef.current?.abort();
@@ -370089,7 +370165,13 @@ function MCPRemoteServerMenu({
                     bold: true,
                     children: "Auth: "
                   }, undefined, false, undefined, this),
-                  isEffectivelyAuthenticated ? /* @__PURE__ */ jsx_dev_runtime193.jsxDEV(ThemedText, {
+                  isOauthGated ? /* @__PURE__ */ jsx_dev_runtime193.jsxDEV(ThemedText, {
+                    children: [
+                      color("warning", theme)(figures_default.triangleUpOutline),
+                      " oauth gated (untrusted scope) — operator allowlist to enable: ",
+                      MCP_OAUTH_TRUSTED_SERVERS_ENV
+                    ]
+                  }, undefined, true, undefined, this) : isEffectivelyAuthenticated ? /* @__PURE__ */ jsx_dev_runtime193.jsxDEV(ThemedText, {
                     children: [
                       color("success", theme)(figures_default.tick),
                       " authenticated"
@@ -371111,6 +371193,7 @@ function MCPSettings(t0) {
               ...baseInfo,
               transport: "sse",
               isAuthenticated,
+              oauthGated: isMcpOauthDisplayGated(client_0.name, client_0.config),
               config: client_0.config
             };
           } else {
@@ -371119,6 +371202,7 @@ function MCPSettings(t0) {
                 ...baseInfo,
                 transport: "http",
                 isAuthenticated,
+                oauthGated: isMcpOauthDisplayGated(client_0.name, client_0.config),
                 config: client_0.config
               };
             } else {
@@ -434365,8 +434449,19 @@ function withoutMcpOauthCimdVars(env) {
   }
   return out;
 }
+function withoutMcpOauthTrustedServersVars(env) {
+  if (!env)
+    return {};
+  const out = {};
+  for (const [key, value] of Object.entries(env)) {
+    if (key.toUpperCase() !== MCP_OAUTH_TRUSTED_SERVERS_ENV) {
+      out[key] = value;
+    }
+  }
+  return out;
+}
 function filterSettingsEnv(env) {
-  return withoutCcdSpawnEnvKeys(withoutMcpOauthCimdVars(withoutHostManagedProviderVars(withoutSSHTunnelVars(env))));
+  return withoutCcdSpawnEnvKeys(withoutMcpOauthTrustedServersVars(withoutMcpOauthCimdVars(withoutHostManagedProviderVars(withoutSSHTunnelVars(env)))));
 }
 function applySafeConfigEnvironmentVariables2() {
   if (ccdSpawnEnvKeys === undefined) {
@@ -489999,7 +490094,9 @@ async function mcpGetHandler2(name) {
         console.log(`    ${key}: ${value}`);
       }
     }
-    if (server.oauth?.clientId || server.oauth?.callbackPort || server.oauth?.clientMetadataUrl) {
+    if (isMcpOauthDisplayGated(name, server)) {
+      console.log(`  OAuth: gated (untrusted scope) — operator allowlist to enable: ${MCP_OAUTH_TRUSTED_SERVERS_ENV}`);
+    } else if (server.oauth?.clientId || server.oauth?.callbackPort || server.oauth?.clientMetadataUrl) {
       const parts = [];
       if (server.oauth.clientId) {
         parts.push("client_id configured");
@@ -490022,7 +490119,9 @@ async function mcpGetHandler2(name) {
         console.log(`    ${key}: ${value}`);
       }
     }
-    if (server.oauth?.clientId || server.oauth?.callbackPort || server.oauth?.clientMetadataUrl) {
+    if (isMcpOauthDisplayGated(name, server)) {
+      console.log(`  OAuth: gated (untrusted scope) — operator allowlist to enable: ${MCP_OAUTH_TRUSTED_SERVERS_ENV}`);
+    } else if (server.oauth?.clientId || server.oauth?.callbackPort || server.oauth?.clientMetadataUrl) {
       const parts = [];
       if (server.oauth.clientId) {
         parts.push("client_id configured");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlasharness/atlascode",
-  "version": "0.1.75",
+  "version": "0.1.76",
   "description": "AtlasCode \u2014 Coding Agent for the domestic computing ecosystem (Ascend NPU + domestic LLM backends)",
   "bin": {
     "atlas": "dist/cli.js",