@sonoma-security/mcp-gateway 0.1.4 → 0.1.5

package/dist/config.js

@@ -2,18 +2,79 @@
  * Config loader for MCP Gateway
  * Parses Claude Desktop / Cursor style MCP configs
  */
-import { readFileSync, existsSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
+import { readFileSync, existsSync, realpathSync } from "node:fs";
+import { homedir, tmpdir } from "node:os";
+import { join, normalize } from "node:path";
+/**
+ * Validate that a config path is safe to read.
+ * Prevents potential file inclusion attacks by ensuring paths:
+ * 1. End in .json (expected config format)
+ * 2. Don't contain path traversal sequences after normalization
+ * 3. Resolve to an expected location
+ */
+function validateConfigPath(configPath) {
+    // Normalize the path to resolve . and ..
+    const normalizedPath = normalize(configPath);
+    // Must end in .json
+    if (!normalizedPath.toLowerCase().endsWith(".json")) {
+        throw new Error(`Invalid config path: ${configPath}. Config files must have .json extension.`);
+    }
+    // Check for path traversal attempts that would escape after normalization
+    // This catches things like /etc/../../../passwd.json
+    if (existsSync(normalizedPath)) {
+        try {
+            const realPath = realpathSync(normalizedPath);
+            const home = homedir();
+            // Allow paths within:
+            // - User's home directory
+            // - /usr/local/etc/sonoma (MDM configs)
+            // - Current working directory
+            // - System temp directory (for tests and transient configs)
+            // Note: Use realpathSync on tmpdir to handle macOS /var -> /private/var symlink
+            const tempDir = tmpdir();
+            let resolvedTempDir = tempDir;
+            try {
+                resolvedTempDir = realpathSync(tempDir);
+            }
+            catch {
+                // Ignore if temp dir doesn't exist (unlikely)
+            }
+            const allowedPrefixes = [
+                home,
+                "/usr/local/etc/sonoma",
+                process.cwd(),
+                tempDir,
+                resolvedTempDir,
+                // Windows paths
+                process.env.APPDATA || "",
+                process.env.LOCALAPPDATA || "",
+            ].filter(Boolean);
+            const isAllowed = allowedPrefixes.some((prefix) => realPath.startsWith(prefix) || realPath === prefix);
+            if (!isAllowed) {
+                throw new Error(`Config path not in allowed location: ${configPath}. ` +
+                    `Allowed: home directory, /usr/local/etc/sonoma, or current directory.`);
+            }
+        }
+        catch (e) {
+            // realpathSync will throw if file doesn't exist - that's fine, existsSync handles that
+            if (e.code !== "ENOENT") {
+                throw e;
+            }
+        }
+    }
+}
 /**
  * Load gateway config from a JSON file
  */
 export function loadConfig(configPath) {
+    validateConfigPath(configPath);
     if (!existsSync(configPath)) {
         throw new Error(`Config file not found: ${configPath}`);
     }
     const content = readFileSync(configPath, "utf-8");
-    const raw = JSON.parse(content);
+    // Strip UTF-8 BOM if present (Windows PowerShell adds this)
+    const cleanContent = content.replace(/^\uFEFF/, "");
+    const raw = JSON.parse(cleanContent);
     // Check if this is a Claude Desktop style config
     if ("mcpServers" in raw && raw.mcpServers) {
         return convertClaudeConfig(raw);
@@ -28,11 +89,17 @@ function convertClaudeConfig(config) {
     const servers = [];
     if (config.mcpServers) {
         for (const [name, server] of Object.entries(config.mcpServers)) {
+            if (server.disabled)
+                continue;
+            if (!server.command && !server.url)
+                continue;
             servers.push({
                 name,
                 command: server.command,
                 args: server.args,
                 env: server.env,
+                url: server.url,
+                headers: server.headers,
             });
         }
     }
@@ -58,20 +125,24 @@ function convertClaudeConfig(config) {
  */
 export function loadFromParentConfig(configPath, gatewayName = "sonoma") {
     const expandedPath = configPath.replace(/^~/, homedir());
+    validateConfigPath(expandedPath);
     if (!existsSync(expandedPath)) {
         throw new Error(`Parent config file not found: ${expandedPath}`);
     }
     const content = readFileSync(expandedPath, "utf-8");
-    const raw = JSON.parse(content);
+    // Strip UTF-8 BOM if present (Windows PowerShell adds this)
+    const cleanContent = content.replace(/^\uFEFF/, "");
+    const raw = JSON.parse(cleanContent);
     if (!raw.mcpServers) {
         throw new Error(`No mcpServers found in ${expandedPath}`);
     }
-    // Find our gateway entry - try common names
+    // Find our gateway entry - try common names (only match entries with nested servers)
     const gatewayNames = [gatewayName, "sonoma", "sonoma-gateway", "sonoma-local-gateway", "mcp-gateway"];
     let gatewayEntry;
     for (const name of gatewayNames) {
-        if (raw.mcpServers[name]) {
-            gatewayEntry = raw.mcpServers[name];
+        const entry = raw.mcpServers[name];
+        if (entry?.servers && Object.keys(entry.servers).length > 0) {
+            gatewayEntry = entry;
             break;
         }
     }
@@ -79,6 +150,10 @@ export function loadFromParentConfig(configPath, gatewayName = "sonoma") {
         // Fall back to loading all servers except our own gateway
         const servers = [];
         for (const [name, server] of Object.entries(raw.mcpServers)) {
+            if (server.disabled)
+                continue;
+            if (!server.command && !server.url)
+                continue;
             // Skip gateway entries (they have --mcp-json-path in args)
             const isGateway = server.args?.some(arg => arg.includes("mcp-gateway") || arg.includes("--mcp-json-path"));
             if (!isGateway) {
@@ -87,6 +162,8 @@ export function loadFromParentConfig(configPath, gatewayName = "sonoma") {
                     command: server.command,
                     args: server.args,
                     env: server.env,
+                    url: server.url,
+                    headers: server.headers,
                 });
             }
         }
@@ -95,11 +172,17 @@ export function loadFromParentConfig(configPath, gatewayName = "sonoma") {
     // Extract nested servers from gateway entry
     const servers = [];
     for (const [name, server] of Object.entries(gatewayEntry.servers)) {
+        if (server.disabled)
+            continue;
+        if (!server.command && !server.url)
+            continue;
         servers.push({
             name,
             command: server.command,
             args: server.args,
             env: server.env,
+            url: server.url,
+            headers: server.headers,
         });
     }
     return { servers };
@@ -200,7 +283,9 @@ export function autoDetectConfig(debug = false) {
         }
         try {
             const content = readFileSync(path, "utf-8");
-            const config = JSON.parse(content);
+            // Strip UTF-8 BOM if present (Windows PowerShell adds this)
+            const cleanContent = content.replace(/^\uFEFF/, "");
+            const config = JSON.parse(cleanContent);
             if (!config.mcpServers)
                 continue;
             // Look for a gateway entry with nested servers

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/gateway.d.ts

@@ -23,11 +23,20 @@ export declare class McpGateway {
     private sonomaClient;
     private policy;
     private policyRefreshInterval;
+    private upstreamTokenStore;
     private started;
     constructor(config: GatewayConfig);
     private log;
     /**
      * Check if a tool is blocked by policy
+     *
+     * Supports both server-level and tool-level blocking:
+     * - Server-level: `toolPattern = null` blocks/allows entire server
+     * - Tool-level: `toolPattern = "read_*"` blocks/allows specific tools
+     *
+     * Priority ordering: higher priority wins, then more specific patterns
+     * Deny wins: in case of equal priority, blocked status takes precedence
+     *
      * @returns true if blocked, false if allowed
      */
     private isToolBlocked;
@@ -36,7 +45,20 @@ export declare class McpGateway {
      */
     private setupHandlers;
     /**
-     * Connect to an upstream MCP server
+     * Create a stdio transport for command-based servers.
+     */
+    private createStdioTransport;
+    /**
+     * Build HTTP request options from config headers.
+     */
+    private getHttpRequestInit;
+    /**
+     * Connect a client to a transport with a timeout.
+     */
+    private connectWithTimeout;
+    /**
+     * Connect to an upstream MCP server.
+     * For URL-based servers, tries StreamableHTTP first, then falls back to SSE.
      */
     private connectUpstream;
     /**

package/dist/gateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAeH,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,YAAY,CAAC;AAqBpB,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,qBAAqB,CAA+C;IAC5E,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,EAAE,aAAa;IA6BjC,OAAO,CAAC,GAAG;IAMX;;;OAGG;IACH,OAAO,CAAC,aAAa;IAwCrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAuJrB;;OAEG;YACW,eAAe;IA8E7B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAiCzB;;OAEG;IACH,OAAO,CAAC,WAAW;IAUnB;;OAEG;YACW,aAAa;IAW3B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC3B;;OAEG;IACH,SAAS,IAAI,aAAa,EAAE;IAI5B;;OAEG;IACH,WAAW,IAAI,IAAI;CAGpB"}
+{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAiBH,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACd,MAAM,YAAY,CAAC;AA0BpB,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,qBAAqB,CAA+C;IAC5E,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,EAAE,aAAa;IA8BjC,OAAO,CAAC,GAAG;IAOX;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,aAAa;IAoGrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAuJrB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAyB5B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;YACW,kBAAkB;IAehC;;;OAGG;YACW,eAAe;IA0H7B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA8CzB;;OAEG;IACH,OAAO,CAAC,WAAW;IAUnB;;OAEG;YACW,aAAa;IAW3B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkE5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC3B;;OAEG;IACH,SAAS,IAAI,aAAa,EAAE;IAI5B;;OAEG;IACH,WAAW,IAAI,IAAI;CAGpB"}

package/dist/gateway.js

@@ -14,10 +14,14 @@
  */
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { SonomaClient } from "./sonoma-client.js";
+import { matchesToolPattern, getPatternSpecificity } from "./pattern-matcher.js";
+import { UpstreamTokenStore, authenticateUpstream } from "./auth/index.js";
 // Timeout configuration
 const CONNECT_TIMEOUT_MS = 10_000; // 10 seconds
 const TOOL_CALL_TIMEOUT_MS = 30_000; // 30 seconds
@@ -35,10 +39,12 @@ export class McpGateway {
     sonomaClient = null;
     policy = null;
     policyRefreshInterval = null;
+    upstreamTokenStore;
     started = false;
     constructor(config) {
         this.config = config;
         this.debug = config.debug ?? false;
+        this.upstreamTokenStore = new UpstreamTokenStore();
         // Initialize Sonoma client if endpoint provided
         // Auth priority: OAuth token (user-linked) > org API key (device-level)
         if (config.sonomaEndpoint) {
@@ -53,49 +59,108 @@ export class McpGateway {
             version: "0.1.0",
         }, {
             capabilities: {
-                tools: {},
+                tools: { listChanged: true },
             },
         });
         this.setupHandlers();
     }
     log(message, ...args) {
         if (this.debug) {
-            console.error(`[gateway] ${message}`, ...args);
+            // Security: message is from developer code, not user input
+            console.error(`[gateway] ${message}`, ...args); // nosemgrep: unsafe-formatstring
         }
     }
     /**
      * Check if a tool is blocked by policy
+     *
+     * Supports both server-level and tool-level blocking:
+     * - Server-level: `toolPattern = null` blocks/allows entire server
+     * - Tool-level: `toolPattern = "read_*"` blocks/allows specific tools
+     *
+     * Priority ordering: higher priority wins, then more specific patterns
+     * Deny wins: in case of equal priority, blocked status takes precedence
+     *
      * @returns true if blocked, false if allowed
      */
     isToolBlocked(serverName, toolName) {
         if (!this.policy || this.policy.mode === "disabled") {
             return false;
         }
-        // Get identifiers to check
+        // Get server identifiers to check
         const upstream = this.upstreams.get(serverName);
         const packageName = upstream?.config.packageName;
-        // Identifiers to check: packageName (preferred) or server name
-        const identifiers = [];
+        // Build set of identifiers: packageName (preferred) or server name
+        const serverIdentifiers = new Set();
         if (packageName)
-            identifiers.push(packageName);
-        identifiers.push(serverName);
-        // Check if any identifier is in the list
-        const matchedEntry = this.policy.list.find((entry) => identifiers.includes(entry.identifier));
+            serverIdentifiers.add(packageName);
+        serverIdentifiers.add(serverName);
+        // Find all matching rules (server-level and tool-level)
+        const matchingRules = this.policy.list.filter((rule) => {
+            // Check if server identifier matches (or rule is global with "*")
+            const serverMatches = serverIdentifiers.has(rule.identifier) || rule.identifier === "*";
+            if (!serverMatches)
+                return false;
+            // Check tool pattern match
+            if (!rule.toolPattern) {
+                // Server-level rule - applies to all tools on this server
+                return true;
+            }
+            // Tool-level rule - check if pattern matches the tool name
+            return matchesToolPattern(toolName, rule.toolPattern);
+        });
+        // No matching rules found
+        if (matchingRules.length === 0) {
+            if (this.policy.mode === "blocklist") {
+                // Blocklist with no matches = not blocked
+                return false;
+            }
+            if (this.policy.mode === "allowlist") {
+                // Allowlist with no matches = blocked (not explicitly allowed)
+                this.log(`Tool not in allowlist: ${serverName}.${toolName}`);
+                return true;
+            }
+            return false;
+        }
+        // Sort rules by priority (higher first), then by pattern specificity (more specific first)
+        const sortedRules = [...matchingRules].sort((a, b) => {
+            // First sort by explicit priority (higher wins)
+            if (a.priority !== b.priority)
+                return b.priority - a.priority;
+            // Then by pattern specificity (more specific wins)
+            const specA = getPatternSpecificity(a.toolPattern);
+            const specB = getPatternSpecificity(b.toolPattern);
+            return specB - specA;
+        });
+        // Get the highest priority rule
+        const topRule = sortedRules[0];
+        // Find if there's a deny rule at the same priority level
+        const topPriority = topRule.priority;
+        const topSpecificity = getPatternSpecificity(topRule.toolPattern);
+        const denyAtTopLevel = sortedRules.find((r) => r.status === "blocked" &&
+            r.priority === topPriority &&
+            getPatternSpecificity(r.toolPattern) === topSpecificity);
         if (this.policy.mode === "blocklist") {
-            // Blocklist: block if found in list with blocked status
-            if (matchedEntry && matchedEntry.status === "blocked") {
-                this.log(`Tool blocked by policy: ${serverName}.${toolName}`);
+            // Blocklist: block if any matching rule says "blocked"
+            // Deny wins at same priority level
+            if (denyAtTopLevel) {
+                this.log(`Tool blocked by policy: ${serverName}.${toolName} (pattern: ${denyAtTopLevel.toolPattern ?? "server-level"})`);
                 return true;
             }
             return false;
         }
         if (this.policy.mode === "allowlist") {
-            // Allowlist: block if NOT found in list with allowed status
-            if (!matchedEntry || matchedEntry.status !== "allowed") {
-                this.log(`Tool not in allowlist: ${serverName}.${toolName}`);
+            // Allowlist: allow only if there's an "allowed" rule
+            // But deny wins at same priority level
+            if (denyAtTopLevel) {
+                this.log(`Tool blocked by deny rule: ${serverName}.${toolName} (pattern: ${denyAtTopLevel.toolPattern ?? "server-level"})`);
                 return true;
             }
-            return false;
+            // Check if top rule allows
+            if (topRule.status === "allowed") {
+                return false; // Allowed
+            }
+            this.log(`Tool not in allowlist: ${serverName}.${toolName}`);
+            return true; // No allow rule = blocked
         }
         return false;
     }
@@ -230,16 +295,12 @@ export class McpGateway {
         });
     }
     /**
-     * Connect to an upstream MCP server
+     * Create a stdio transport for command-based servers.
      */
-    async connectUpstream(config, existingConnection) {
-        this.log(`Connecting to upstream: ${config.name} (${config.command})`);
-        const client = new Client({
-            name: `gateway-client-${config.name}`,
-            version: "0.1.0",
-        }, {
-            capabilities: {},
-        });
+    createStdioTransport(config) {
+        if (!config.command) {
+            throw new Error(`Server ${config.name} has neither url nor command`);
+        }
         // Build env with only defined values (filter out undefined from process.env)
         let env;
         if (config.env) {
@@ -251,27 +312,121 @@ export class McpGateway {
             }
             Object.assign(env, config.env);
         }
-        const transport = new StdioClientTransport({
+        return new StdioClientTransport({
             command: config.command,
             args: config.args,
             env,
             cwd: config.cwd,
         });
+    }
+    /**
+     * Build HTTP request options from config headers.
+     */
+    getHttpRequestInit(config) {
+        if (config.headers && Object.keys(config.headers).length > 0) {
+            return { headers: config.headers };
+        }
+        return undefined;
+    }
+    /**
+     * Connect a client to a transport with a timeout.
+     */
+    async connectWithTimeout(client, transport, name) {
+        const connectPromise = client.connect(transport);
+        const timeoutPromise = new Promise((_, reject) => {
+            setTimeout(() => reject(new Error(`Connection timeout after ${CONNECT_TIMEOUT_MS}ms: ${name}`)), CONNECT_TIMEOUT_MS);
+        });
+        await Promise.race([connectPromise, timeoutPromise]);
+    }
+    /**
+     * Connect to an upstream MCP server.
+     * For URL-based servers, tries StreamableHTTP first, then falls back to SSE.
+     */
+    async connectUpstream(config, existingConnection) {
+        const label = config.url ?? config.command ?? config.name;
+        this.log(`Connecting to upstream: ${config.name} (${label})`);
+        const serverName = config.name;
+        const makeClient = () => new Client({
+            name: `gateway-client-${serverName}`,
+            version: "0.1.0",
+        }, {
+            capabilities: {},
+            listChanged: {
+                tools: {
+                    autoRefresh: true,
+                    debounceMs: 200,
+                    onChanged: (error, tools) => {
+                        if (error) {
+                            this.log(`Failed to refresh tools from ${serverName}: ${error.message}`);
+                            return;
+                        }
+                        const upstream = this.upstreams.get(serverName);
+                        if (upstream) {
+                            upstream.tools = tools || [];
+                            this.log(`Tools updated from ${serverName}: ${upstream.tools.length} tools`);
+                        }
+                        this.server.sendToolListChanged().catch((err) => {
+                            this.log(`Failed to notify client of tool list change: ${err}`);
+                        });
+                    },
+                },
+            },
+        });
+        let client;
+        let transport;
+        if (config.url) {
+            const url = new URL(config.url);
+            const requestInit = this.getHttpRequestInit(config);
+            // Try OAuth pre-auth for HTTP servers (discovers if server needs OAuth)
+            let authProvider;
+            try {
+                authProvider = await authenticateUpstream({
+                    serverUrl: config.url,
+                    serverName: config.name,
+                    store: this.upstreamTokenStore,
+                    debug: this.debug,
+                });
+                this.log(`  ${config.name}: OAuth pre-auth succeeded`);
+            }
+            catch (err) {
+                // Server may not require OAuth, or user declined; try without auth
+                this.log(`  ${config.name}: OAuth pre-auth skipped (${err instanceof Error ? err.message : err})`);
+            }
+            // Try StreamableHTTP first, fall back to SSE
+            try {
+                client = makeClient();
+                transport = new StreamableHTTPClientTransport(url, { requestInit, authProvider });
+                await this.connectWithTimeout(client, transport, config.name);
+                this.log(`  ${config.name}: connected via StreamableHTTP`);
+            }
+            catch {
+                this.log(`  ${config.name}: StreamableHTTP failed, trying SSE`);
+                client = makeClient();
+                transport = new SSEClientTransport(url, { requestInit, authProvider });
+                await this.connectWithTimeout(client, transport, config.name);
+                this.log(`  ${config.name}: connected via SSE`);
+            }
+        }
+        else {
+            client = makeClient();
+            transport = this.createStdioTransport(config);
+            await this.connectWithTimeout(client, transport, config.name);
+        }
         // Set up close handler for auto-reconnect
         transport.onclose = () => {
             const upstream = this.upstreams.get(config.name);
             if (upstream) {
                 upstream.connected = false;
                 this.log(`Upstream disconnected: ${config.name}`);
+                // Notify AI client that tools changed (disconnected server's tools are no longer available)
+                if (upstream.tools.length > 0) {
+                    this.server.sendToolListChanged().catch((err) => {
+                        this.log(`Failed to notify client of tool list change: ${err}`);
+                    });
+                }
                 this.scheduleReconnect(config.name);
             }
         };
-        // Connect with timeout
-        const connectPromise = client.connect(transport);
-        const timeoutPromise = new Promise((_, reject) => {
-            setTimeout(() => reject(new Error(`Connection timeout after ${CONNECT_TIMEOUT_MS}ms: ${config.name}`)), CONNECT_TIMEOUT_MS);
-        });
-        await Promise.race([connectPromise, timeoutPromise]);
         // Fetch tools from this upstream (also with timeout)
         const listToolsPromise = client.listTools();
         const listToolsTimeout = new Promise((_, reject) => {
@@ -308,10 +463,21 @@ export class McpGateway {
             if (!this.started)
                 return;
             try {
+                const oldToolNames = new Set(upstream.tools.map((t) => t.name));
                 const newUpstream = await this.connectUpstream(upstream.config, upstream);
                 newUpstream.reconnectAttempts = 0; // Reset on successful reconnect
                 this.upstreams.set(serverName, newUpstream);
                 this.log(`Reconnected to ${serverName}`);
+                // Notify AI client if tools changed during disconnect
+                const newToolNames = new Set(newUpstream.tools.map((t) => t.name));
+                const toolsChanged = oldToolNames.size !== newToolNames.size ||
+                    [...oldToolNames].some((name) => !newToolNames.has(name));
+                if (toolsChanged) {
+                    this.log(`Tools changed on ${serverName} after reconnect`);
+                    this.server.sendToolListChanged().catch((err) => {
+                        this.log(`Failed to notify client of tool list change: ${err}`);
+                    });
+                }
             }
             catch (error) {
                 this.log(`Reconnect failed for ${serverName}: ${error}`);
@@ -362,8 +528,11 @@ export class McpGateway {
                     this.log(`Policy refresh error: ${err}`);
                 });
             }, 5 * 60 * 1000);
-            // Start periodic telemetry flush (every 30 seconds)
-            this.sonomaClient.startTelemetryFlush(30 * 1000);
+            // Start periodic telemetry flush
+            // Default: 30 seconds, configurable via env for testing
+            const parsedFlushMs = parseInt(process.env.SONOMA_TELEMETRY_FLUSH_MS ?? "30000", 10);
+            const flushIntervalMs = Number.isNaN(parsedFlushMs) ? 30000 : parsedFlushMs;
+            this.sonomaClient.startTelemetryFlush(flushIntervalMs);
         }
         // Connect to all upstream servers
         for (const serverConfig of this.config.servers) {
@@ -372,11 +541,28 @@ export class McpGateway {
                 this.upstreams.set(serverConfig.name, upstream);
             }
             catch (error) {
-                console.error(`Failed to connect to ${serverConfig.name}:`, error);
+                // Security: serverConfig.name is from config, not user input
+                console.error(`Failed to connect to ${serverConfig.name}:`, error); // nosemgrep: unsafe-formatstring
                 // Continue with other servers
             }
         }
         this.log(`Connected to ${this.upstreams.size}/${this.config.servers.length} upstreams`);
+        // Report discovered tools to Sonoma
+        if (this.sonomaClient) {
+            const serversWithTools = Array.from(this.upstreams.entries()).map(([serverName, upstream]) => ({
+                serverIdentifier: upstream.config.packageName || serverName,
+                serverName,
+                tools: upstream.tools.map((tool) => ({
+                    name: tool.name,
+                    description: tool.description,
+                    inputSchema: tool.inputSchema,
+                })),
+            }));
+            // Fire and forget - don't block startup
+            this.sonomaClient.reportTools(serversWithTools).catch((err) => {
+                this.log(`Failed to report tools: ${err}`);
+            });
+        }
         // Start the server (stdio transport to AI client)
         const transport = new StdioServerTransport();
         await this.server.connect(transport);
@@ -408,6 +594,9 @@ export class McpGateway {
                 this.log(`Disconnected from ${name}`);
             }
             catch (error) {
+                // Security: `name` comes from this.upstreams Map keys, which are MCP server names
+                // from admin-controlled config (serverConfig.name), not user input.
+                // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring
                 console.error(`Error disconnecting from ${name}:`, error);
             }
         }