@probelabs/probe 0.6.0-rc176 → 0.6.0-rc177

package/build/agent/index.js

@@ -56110,6 +56110,12 @@ import { readFileSync, existsSync as existsSync4, mkdirSync as mkdirSync2, write
 import { join as join2, dirname as dirname3 } from "path";
 import { homedir } from "os";
 import { fileURLToPath as fileURLToPath6 } from "url";
+function validateTimeout(value) {
+  if (value === void 0 || value === null) return void 0;
+  const num = Number(value);
+  if (!Number.isFinite(num) || num < 0) return void 0;
+  return Math.min(num, MAX_TIMEOUT);
+}
 function loadMCPConfigurationFromPath(configPath) {
   if (!configPath) {
     throw new Error("Config path is required");
@@ -56195,6 +56201,14 @@ function mergeWithEnvironment(config) {
             config.mcpServers[normalizedName].env = { [property2]: value };
           }
           break;
+        case "TIMEOUT":
+          const validatedTimeout = validateTimeout(value);
+          if (validatedTimeout !== void 0) {
+            config.mcpServers[normalizedName].timeout = validatedTimeout;
+          } else {
+            console.error(`[MCP WARN] Invalid timeout value for ${normalizedName}: ${value}`);
+          }
+          break;
       }
     }
   }
@@ -56237,16 +56251,26 @@ function parseEnabledServers(config) {
         continue;
       }
     }
+    if (server.timeout !== void 0) {
+      const validatedTimeout = validateTimeout(server.timeout);
+      if (validatedTimeout === void 0) {
+        console.error(`[MCP ERROR] Server ${name} has invalid timeout value: ${server.timeout}`);
+        continue;
+      }
+      server.timeout = validatedTimeout;
+    }
     servers.push(server);
   }
   return servers;
 }
-var __filename4, __dirname4, DEFAULT_CONFIG;
+var __filename4, __dirname4, DEFAULT_TIMEOUT, MAX_TIMEOUT, DEFAULT_CONFIG;
 var init_config = __esm({
   "src/agent/mcp/config.js"() {
     "use strict";
     __filename4 = fileURLToPath6(import.meta.url);
     __dirname4 = dirname3(__filename4);
+    DEFAULT_TIMEOUT = 3e4;
+    MAX_TIMEOUT = 6e5;
     DEFAULT_CONFIG = {
       mcpServers: {
         // Example probe server configuration
@@ -56475,7 +56499,9 @@ var init_client = __esm({
           if (this.debug) {
             console.error(`[MCP DEBUG] Calling ${toolName} with args:`, JSON.stringify(args, null, 2));
           }
-          const timeout = this.config?.settings?.timeout || 3e4;
+          const serverTimeout = clientInfo.config?.timeout;
+          const globalTimeout = this.config?.settings?.timeout ?? DEFAULT_TIMEOUT;
+          const timeout = serverTimeout ?? globalTimeout;
           const timeoutPromise = new Promise((_, reject2) => {
             setTimeout(() => {
               reject2(new Error(`MCP tool call timeout after ${timeout}ms`));

package/build/agent/mcp/client.js

@@ -7,7 +7,7 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { WebSocketClientTransport } from '@modelcontextprotocol/sdk/client/websocket.js';
-import { loadMCPConfiguration, parseEnabledServers } from './config.js';
+import { loadMCPConfiguration, parseEnabledServers, DEFAULT_TIMEOUT } from './config.js';
 
 /**
  * Create transport based on configuration
@@ -274,8 +274,11 @@ export class MCPClientManager {
         console.error(`[MCP DEBUG] Calling ${toolName} with args:`, JSON.stringify(args, null, 2));
       }
 
-      // Get timeout from config (default 30 seconds)
-      const timeout = this.config?.settings?.timeout || 30000;
+      // Get timeout: per-server timeout takes priority over global timeout (default 30 seconds)
+      // Note: Timeout values are already validated at config load time by parseEnabledServers
+      const serverTimeout = clientInfo.config?.timeout;
+      const globalTimeout = this.config?.settings?.timeout ?? DEFAULT_TIMEOUT;
+      const timeout = serverTimeout ?? globalTimeout;
 
       // Create a timeout promise
       const timeoutPromise = new Promise((_, reject) => {

package/build/agent/mcp/config.js

@@ -11,6 +11,24 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
+/**
+ * Timeout configuration constants
+ */
+export const DEFAULT_TIMEOUT = 30000; // 30 seconds
+export const MAX_TIMEOUT = 600000; // 10 minutes max to prevent resource exhaustion
+
+/**
+ * Validate and normalize a timeout value
+ * @param {*} value - The timeout value to validate
+ * @returns {number|undefined} Validated timeout in ms, or undefined if invalid
+ */
+export function validateTimeout(value) {
+  if (value === undefined || value === null) return undefined;
+  const num = Number(value);
+  if (!Number.isFinite(num) || num < 0) return undefined; // Invalid, use fallback
+  return Math.min(num, MAX_TIMEOUT); // Cap at max timeout
+}
+
 /**
  * Default MCP configuration structure
  */
@@ -160,6 +178,15 @@ function mergeWithEnvironment(config) {
             config.mcpServers[normalizedName].env = { [property]: value };
           }
           break;
+        case 'TIMEOUT':
+          // Per-server timeout in milliseconds with validation
+          const validatedTimeout = validateTimeout(value);
+          if (validatedTimeout !== undefined) {
+            config.mcpServers[normalizedName].timeout = validatedTimeout;
+          } else {
+            console.error(`[MCP WARN] Invalid timeout value for ${normalizedName}: ${value}`);
+          }
+          break;
       }
     }
   }
@@ -219,6 +246,16 @@ export function parseEnabledServers(config) {
       }
     }
 
+    // Validate and normalize timeout if present (fail-fast validation)
+    if (server.timeout !== undefined) {
+      const validatedTimeout = validateTimeout(server.timeout);
+      if (validatedTimeout === undefined) {
+        console.error(`[MCP ERROR] Server ${name} has invalid timeout value: ${server.timeout}`);
+        continue;
+      }
+      server.timeout = validatedTimeout;
+    }
+
     servers.push(server);
   }
 
@@ -276,9 +313,17 @@ export function createSampleConfig() {
         transport: 'websocket',
         enabled: false,
         description: 'Custom WebSocket MCP server'
+      },
+      'slow-server-example': {
+        command: 'node',
+        args: ['path/to/slow-server.js'],
+        transport: 'stdio',
+        enabled: false,
+        timeout: 120000,
+        description: 'Example server with custom 2-minute timeout (overrides global setting)'
       }
     },
-    // Global settings
+    // Global settings (apply to all servers unless overridden per-server)
     settings: {
       timeout: 30000,
       retryCount: 3,
@@ -309,5 +354,8 @@ export default {
   loadMCPConfigurationFromPath,
   parseEnabledServers,
   createSampleConfig,
-  saveConfig
+  saveConfig,
+  validateTimeout,
+  DEFAULT_TIMEOUT,
+  MAX_TIMEOUT
 };

package/cjs/agent/ProbeAgent.cjs

@@ -5842,7 +5842,6 @@ var init_EventStreamSerde = __esm({
               const { eventHeader, eventPayload } = memberSchema.getMergedTraits();
               if (eventPayload) {
                 explicitPayloadMember = memberName;
-                break;
               } else if (eventHeader) {
                 const value = event[unionMember][memberName];
                 let type = "binary";
@@ -17253,9 +17252,9 @@ var require_dist_cjs49 = __commonJS({
       expiration: new Date(creds.Expiration),
       ...creds.AccountId && { accountId: creds.AccountId }
     });
-    var DEFAULT_TIMEOUT = 1e3;
+    var DEFAULT_TIMEOUT2 = 1e3;
     var DEFAULT_MAX_RETRIES = 0;
-    var providerConfigFromInit = ({ maxRetries = DEFAULT_MAX_RETRIES, timeout = DEFAULT_TIMEOUT }) => ({ maxRetries, timeout });
+    var providerConfigFromInit = ({ maxRetries = DEFAULT_MAX_RETRIES, timeout = DEFAULT_TIMEOUT2 }) => ({ maxRetries, timeout });
     var retry = (toRetry, maxRetries) => {
       let promise = toRetry();
       for (let i4 = 0; i4 < maxRetries; i4++) {
@@ -17536,7 +17535,7 @@ For more information, please visit: ` + STATIC_STABILITY_DOC_URL);
       return fromImdsCredentials(credentialsResponse);
     };
     exports2.DEFAULT_MAX_RETRIES = DEFAULT_MAX_RETRIES;
-    exports2.DEFAULT_TIMEOUT = DEFAULT_TIMEOUT;
+    exports2.DEFAULT_TIMEOUT = DEFAULT_TIMEOUT2;
     exports2.ENV_CMDS_AUTH_TOKEN = ENV_CMDS_AUTH_TOKEN;
     exports2.ENV_CMDS_FULL_URI = ENV_CMDS_FULL_URI;
     exports2.ENV_CMDS_RELATIVE_URI = ENV_CMDS_RELATIVE_URI;
@@ -81986,6 +81985,12 @@ You should be:
 });
 
 // src/agent/mcp/config.js
+function validateTimeout(value) {
+  if (value === void 0 || value === null) return void 0;
+  const num = Number(value);
+  if (!Number.isFinite(num) || num < 0) return void 0;
+  return Math.min(num, MAX_TIMEOUT);
+}
 function loadMCPConfigurationFromPath(configPath) {
   if (!configPath) {
     throw new Error("Config path is required");
@@ -82071,6 +82076,14 @@ function mergeWithEnvironment(config) {
             config.mcpServers[normalizedName].env = { [property2]: value };
           }
           break;
+        case "TIMEOUT":
+          const validatedTimeout = validateTimeout(value);
+          if (validatedTimeout !== void 0) {
+            config.mcpServers[normalizedName].timeout = validatedTimeout;
+          } else {
+            console.error(`[MCP WARN] Invalid timeout value for ${normalizedName}: ${value}`);
+          }
+          break;
       }
     }
   }
@@ -82113,11 +82126,19 @@ function parseEnabledServers(config) {
         continue;
       }
     }
+    if (server.timeout !== void 0) {
+      const validatedTimeout = validateTimeout(server.timeout);
+      if (validatedTimeout === void 0) {
+        console.error(`[MCP ERROR] Server ${name14} has invalid timeout value: ${server.timeout}`);
+        continue;
+      }
+      server.timeout = validatedTimeout;
+    }
     servers.push(server);
   }
   return servers;
 }
-var import_fs12, import_path11, import_os3, import_url4, __filename4, __dirname4, DEFAULT_CONFIG;
+var import_fs12, import_path11, import_os3, import_url4, __filename4, __dirname4, DEFAULT_TIMEOUT, MAX_TIMEOUT, DEFAULT_CONFIG;
 var init_config = __esm({
   "src/agent/mcp/config.js"() {
     "use strict";
@@ -82127,6 +82148,8 @@ var init_config = __esm({
     import_url4 = require("url");
     __filename4 = (0, import_url4.fileURLToPath)("file:///");
     __dirname4 = (0, import_path11.dirname)(__filename4);
+    DEFAULT_TIMEOUT = 3e4;
+    MAX_TIMEOUT = 6e5;
     DEFAULT_CONFIG = {
       mcpServers: {
         // Example probe server configuration
@@ -82355,7 +82378,9 @@ var init_client2 = __esm({
           if (this.debug) {
             console.error(`[MCP DEBUG] Calling ${toolName} with args:`, JSON.stringify(args, null, 2));
           }
-          const timeout = this.config?.settings?.timeout || 3e4;
+          const serverTimeout = clientInfo.config?.timeout;
+          const globalTimeout = this.config?.settings?.timeout ?? DEFAULT_TIMEOUT;
+          const timeout = serverTimeout ?? globalTimeout;
           const timeoutPromise = new Promise((_, reject2) => {
             setTimeout(() => {
               reject2(new Error(`MCP tool call timeout after ${timeout}ms`));

package/cjs/index.cjs

@@ -7369,7 +7369,6 @@ var init_EventStreamSerde = __esm({
               const { eventHeader, eventPayload } = memberSchema.getMergedTraits();
               if (eventPayload) {
                 explicitPayloadMember = memberName;
-                break;
               } else if (eventHeader) {
                 const value = event[unionMember][memberName];
                 let type = "binary";
@@ -18780,9 +18779,9 @@ var require_dist_cjs49 = __commonJS({
       expiration: new Date(creds.Expiration),
       ...creds.AccountId && { accountId: creds.AccountId }
     });
-    var DEFAULT_TIMEOUT = 1e3;
+    var DEFAULT_TIMEOUT2 = 1e3;
     var DEFAULT_MAX_RETRIES = 0;
-    var providerConfigFromInit = ({ maxRetries = DEFAULT_MAX_RETRIES, timeout = DEFAULT_TIMEOUT }) => ({ maxRetries, timeout });
+    var providerConfigFromInit = ({ maxRetries = DEFAULT_MAX_RETRIES, timeout = DEFAULT_TIMEOUT2 }) => ({ maxRetries, timeout });
     var retry = (toRetry, maxRetries) => {
       let promise = toRetry();
       for (let i4 = 0; i4 < maxRetries; i4++) {
@@ -19063,7 +19062,7 @@ For more information, please visit: ` + STATIC_STABILITY_DOC_URL);
       return fromImdsCredentials(credentialsResponse);
     };
     exports2.DEFAULT_MAX_RETRIES = DEFAULT_MAX_RETRIES;
-    exports2.DEFAULT_TIMEOUT = DEFAULT_TIMEOUT;
+    exports2.DEFAULT_TIMEOUT = DEFAULT_TIMEOUT2;
     exports2.ENV_CMDS_AUTH_TOKEN = ENV_CMDS_AUTH_TOKEN;
     exports2.ENV_CMDS_FULL_URI = ENV_CMDS_FULL_URI;
     exports2.ENV_CMDS_RELATIVE_URI = ENV_CMDS_RELATIVE_URI;
@@ -79717,6 +79716,12 @@ You should be:
 });
 
 // src/agent/mcp/config.js
+function validateTimeout(value) {
+  if (value === void 0 || value === null) return void 0;
+  const num = Number(value);
+  if (!Number.isFinite(num) || num < 0) return void 0;
+  return Math.min(num, MAX_TIMEOUT);
+}
 function loadMCPConfigurationFromPath(configPath) {
   if (!configPath) {
     throw new Error("Config path is required");
@@ -79802,6 +79807,14 @@ function mergeWithEnvironment(config) {
             config.mcpServers[normalizedName].env = { [property2]: value };
           }
           break;
+        case "TIMEOUT":
+          const validatedTimeout = validateTimeout(value);
+          if (validatedTimeout !== void 0) {
+            config.mcpServers[normalizedName].timeout = validatedTimeout;
+          } else {
+            console.error(`[MCP WARN] Invalid timeout value for ${normalizedName}: ${value}`);
+          }
+          break;
       }
     }
   }
@@ -79844,11 +79857,19 @@ function parseEnabledServers(config) {
         continue;
       }
     }
+    if (server.timeout !== void 0) {
+      const validatedTimeout = validateTimeout(server.timeout);
+      if (validatedTimeout === void 0) {
+        console.error(`[MCP ERROR] Server ${name14} has invalid timeout value: ${server.timeout}`);
+        continue;
+      }
+      server.timeout = validatedTimeout;
+    }
     servers.push(server);
   }
   return servers;
 }
-var import_fs7, import_path6, import_os3, import_url4, __filename4, __dirname4, DEFAULT_CONFIG;
+var import_fs7, import_path6, import_os3, import_url4, __filename4, __dirname4, DEFAULT_TIMEOUT, MAX_TIMEOUT, DEFAULT_CONFIG;
 var init_config = __esm({
   "src/agent/mcp/config.js"() {
     "use strict";
@@ -79858,6 +79879,8 @@ var init_config = __esm({
     import_url4 = require("url");
     __filename4 = (0, import_url4.fileURLToPath)("file:///");
     __dirname4 = (0, import_path6.dirname)(__filename4);
+    DEFAULT_TIMEOUT = 3e4;
+    MAX_TIMEOUT = 6e5;
     DEFAULT_CONFIG = {
       mcpServers: {
         // Example probe server configuration
@@ -80086,7 +80109,9 @@ var init_client2 = __esm({
           if (this.debug) {
             console.error(`[MCP DEBUG] Calling ${toolName} with args:`, JSON.stringify(args, null, 2));
           }
-          const timeout = this.config?.settings?.timeout || 3e4;
+          const serverTimeout = clientInfo.config?.timeout;
+          const globalTimeout = this.config?.settings?.timeout ?? DEFAULT_TIMEOUT;
+          const timeout = serverTimeout ?? globalTimeout;
           const timeoutPromise = new Promise((_, reject2) => {
             setTimeout(() => {
               reject2(new Error(`MCP tool call timeout after ${timeout}ms`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc176",
+  "version": "0.6.0-rc177",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/agent/mcp/client.js

@@ -7,7 +7,7 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { WebSocketClientTransport } from '@modelcontextprotocol/sdk/client/websocket.js';
-import { loadMCPConfiguration, parseEnabledServers } from './config.js';
+import { loadMCPConfiguration, parseEnabledServers, DEFAULT_TIMEOUT } from './config.js';
 
 /**
  * Create transport based on configuration
@@ -274,8 +274,11 @@ export class MCPClientManager {
         console.error(`[MCP DEBUG] Calling ${toolName} with args:`, JSON.stringify(args, null, 2));
       }
 
-      // Get timeout from config (default 30 seconds)
-      const timeout = this.config?.settings?.timeout || 30000;
+      // Get timeout: per-server timeout takes priority over global timeout (default 30 seconds)
+      // Note: Timeout values are already validated at config load time by parseEnabledServers
+      const serverTimeout = clientInfo.config?.timeout;
+      const globalTimeout = this.config?.settings?.timeout ?? DEFAULT_TIMEOUT;
+      const timeout = serverTimeout ?? globalTimeout;
 
       // Create a timeout promise
       const timeoutPromise = new Promise((_, reject) => {

package/src/agent/mcp/config.js

@@ -11,6 +11,24 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
+/**
+ * Timeout configuration constants
+ */
+export const DEFAULT_TIMEOUT = 30000; // 30 seconds
+export const MAX_TIMEOUT = 600000; // 10 minutes max to prevent resource exhaustion
+
+/**
+ * Validate and normalize a timeout value
+ * @param {*} value - The timeout value to validate
+ * @returns {number|undefined} Validated timeout in ms, or undefined if invalid
+ */
+export function validateTimeout(value) {
+  if (value === undefined || value === null) return undefined;
+  const num = Number(value);
+  if (!Number.isFinite(num) || num < 0) return undefined; // Invalid, use fallback
+  return Math.min(num, MAX_TIMEOUT); // Cap at max timeout
+}
+
 /**
  * Default MCP configuration structure
  */
@@ -160,6 +178,15 @@ function mergeWithEnvironment(config) {
             config.mcpServers[normalizedName].env = { [property]: value };
           }
           break;
+        case 'TIMEOUT':
+          // Per-server timeout in milliseconds with validation
+          const validatedTimeout = validateTimeout(value);
+          if (validatedTimeout !== undefined) {
+            config.mcpServers[normalizedName].timeout = validatedTimeout;
+          } else {
+            console.error(`[MCP WARN] Invalid timeout value for ${normalizedName}: ${value}`);
+          }
+          break;
       }
     }
   }
@@ -219,6 +246,16 @@ export function parseEnabledServers(config) {
       }
     }
 
+    // Validate and normalize timeout if present (fail-fast validation)
+    if (server.timeout !== undefined) {
+      const validatedTimeout = validateTimeout(server.timeout);
+      if (validatedTimeout === undefined) {
+        console.error(`[MCP ERROR] Server ${name} has invalid timeout value: ${server.timeout}`);
+        continue;
+      }
+      server.timeout = validatedTimeout;
+    }
+
     servers.push(server);
   }
 
@@ -276,9 +313,17 @@ export function createSampleConfig() {
         transport: 'websocket',
         enabled: false,
         description: 'Custom WebSocket MCP server'
+      },
+      'slow-server-example': {
+        command: 'node',
+        args: ['path/to/slow-server.js'],
+        transport: 'stdio',
+        enabled: false,
+        timeout: 120000,
+        description: 'Example server with custom 2-minute timeout (overrides global setting)'
       }
     },
-    // Global settings
+    // Global settings (apply to all servers unless overridden per-server)
     settings: {
       timeout: 30000,
       retryCount: 3,
@@ -309,5 +354,8 @@ export default {
   loadMCPConfigurationFromPath,
   parseEnabledServers,
   createSampleConfig,
-  saveConfig
+  saveConfig,
+  validateTimeout,
+  DEFAULT_TIMEOUT,
+  MAX_TIMEOUT
 };