@probelabs/probe 0.6.0-rc237 → 0.6.0-rc239

package/build/agent/dsl/environment.js

@@ -117,6 +117,23 @@ function traceToolCall(toolName, fn, tracer, logFn) {
   };
 }
 
+/**
+ * Try to parse a string as JSON if it looks like a JSON object or array.
+ * Checks if the first non-whitespace character is '{' or '[' before attempting parse.
+ * Returns the original string if it's not JSON.
+ *
+ * @param {string} text - The text to try parsing
+ * @returns {any} Parsed JSON value, or the original string
+ */
+function tryParseJSONValue(text) {
+  if (typeof text !== 'string') return text;
+  const firstChar = text.trimStart()[0];
+  if (firstChar === '{' || firstChar === '[') {
+    try { return JSON.parse(text); } catch (_) { /* not valid JSON */ }
+  }
+  return text;
+}
+
 /**
  * Generate sandbox globals that bridge DSL function calls to real tool implementations.
  *
@@ -195,7 +212,15 @@ export function generateSandboxGlobals(options) {
   if (mcpBridge) {
     for (const [name, tool] of Object.entries(mcpTools)) {
       const rawMcpFn = async (params = {}) => {
-        return tool.execute(params);
+        const result = await tool.execute(params);
+        // Extract text from MCP response envelope: { content: [{ type: 'text', text: '...' }] }
+        const text = result?.content?.[0]?.text;
+        if (text === undefined) {
+          // No envelope — if raw result is a JSON-like string, try parsing it
+          if (typeof result === 'string') return tryParseJSONValue(result);
+          return result;
+        }
+        return tryParseJSONValue(text);
       };
       globals[name] = traceToolCall(name, rawMcpFn, tracer, logFn);
     }

package/build/agent/dsl/runtime.js

@@ -4,7 +4,7 @@
  * Orchestrates the full pipeline:
  * 1. Validate (AST whitelist)
  * 2. Transform (inject await, wrap in async IIFE)
- * 3. Execute in SandboxJS with tool globals + timeout
+ * 3. Execute in SandboxJS with tool globals
  *
  * Returns the result or a structured error.
  */
@@ -25,7 +25,6 @@ const Sandbox = SandboxModule.default || SandboxModule;
  * @param {Object} [options.mcpTools={}] - MCP tool metadata
  * @param {Function} options.llmCall - Function for LLM() calls: (instruction, data, options?) => Promise<any>
  * @param {number} [options.mapConcurrency=3] - Concurrency limit for map()
- * @param {number} [options.timeoutMs=120000] - Execution timeout in milliseconds (default 2 min)
  * @param {number} [options.maxLoopIterations=5000] - Max iterations for while/for loops
  * @param {Object} [options.tracer=null] - SimpleAppTracer instance for OTEL telemetry
  * @returns {Object} Runtime with execute() method
@@ -37,7 +36,6 @@ export function createDSLRuntime(options) {
     mcpTools = {},
     llmCall,
     mapConcurrency = 3,
-    timeoutMs = 120000,
     maxLoopIterations = 5000,
     tracer = null,
     sessionStore = {},
@@ -108,9 +106,8 @@ export function createDSLRuntime(options) {
       };
     }
 
-    // Step 3: Execute in SandboxJS with timeout
+    // Step 3: Execute in SandboxJS
     tracer?.addEvent?.('dsl.phase.execute_start', {
-      'dsl.timeout_ms': timeoutMs,
       'dsl.max_loop_iterations': maxLoopIterations,
     });
 
@@ -147,20 +144,10 @@ export function createDSLRuntime(options) {
       };
       process.on('unhandledRejection', rejectionHandler);
 
-      // Race execution against timeout
-      let timeoutHandle;
-      const executionPromise = exec().run();
-      const timeoutPromise = new Promise((_, reject) => {
-        timeoutHandle = setTimeout(() => {
-          reject(new Error(`Execution timed out after ${Math.round(timeoutMs / 1000)}s. Script took too long — reduce the amount of work (fewer items, smaller data) or increase timeout.`));
-        }, timeoutMs);
-      });
-
       let result;
       try {
-        result = await Promise.race([executionPromise, timeoutPromise]);
+        result = await exec().run();
       } finally {
-        clearTimeout(timeoutHandle);
         // Delay handler removal — SandboxJS can throw async errors after execution completes
         setTimeout(() => {
           process.removeListener('unhandledRejection', rejectionHandler);

package/build/agent/dsl/validator.js

@@ -16,18 +16,23 @@ const ALLOWED_NODE_TYPES = new Set([
   'BlockStatement',
   'VariableDeclaration',
   'VariableDeclarator',
+  'FunctionDeclaration',
   'ArrowFunctionExpression',
   'FunctionExpression',
   'CallExpression',
+  'NewExpression',
   'MemberExpression',
   'Identifier',
   'Literal',
   'TemplateLiteral',
   'TemplateElement',
+  'TaggedTemplateExpression',
   'ArrayExpression',
   'ObjectExpression',
   'SpreadElement',
   'IfStatement',
+  'SwitchStatement',
+  'SwitchCase',
   'ConditionalExpression',
   'ForOfStatement',
   'ForInStatement',
@@ -127,10 +132,6 @@ export function validateDSL(code) {
       errors.push(`Generator functions are not allowed at position ${node.start}`);
     }
 
-    // Block regex literals — SandboxJS doesn't support them
-    if (node.type === 'Literal' && node.regex) {
-      errors.push(`Regex literals are not supported at position ${node.start}. Use String methods like indexOf(), includes(), startsWith() instead.`);
-    }
 
     // Check identifiers against blocklist
     if (node.type === 'Identifier' && BLOCKED_IDENTIFIERS.has(node.name)) {

package/build/agent/index.js

@@ -21499,9 +21499,6 @@ function validateDSL(code) {
     if (node.type === "FunctionExpression" && node.generator) {
       errors.push(`Generator functions are not allowed at position ${node.start}`);
     }
-    if (node.type === "Literal" && node.regex) {
-      errors.push(`Regex literals are not supported at position ${node.start}. Use String methods like indexOf(), includes(), startsWith() instead.`);
-    }
     if (node.type === "Identifier" && BLOCKED_IDENTIFIERS.has(node.name)) {
       errors.push(`Blocked identifier: '${node.name}' at position ${node.start}`);
     }
@@ -21540,18 +21537,23 @@ var init_validator = __esm({
       "BlockStatement",
       "VariableDeclaration",
       "VariableDeclarator",
+      "FunctionDeclaration",
       "ArrowFunctionExpression",
       "FunctionExpression",
       "CallExpression",
+      "NewExpression",
       "MemberExpression",
       "Identifier",
       "Literal",
       "TemplateLiteral",
       "TemplateElement",
+      "TaggedTemplateExpression",
       "ArrayExpression",
       "ObjectExpression",
       "SpreadElement",
       "IfStatement",
+      "SwitchStatement",
+      "SwitchCase",
       "ConditionalExpression",
       "ForOfStatement",
       "ForInStatement",
@@ -21763,6 +21765,17 @@ function traceToolCall(toolName, fn, tracer, logFn) {
     }
   };
 }
+function tryParseJSONValue(text) {
+  if (typeof text !== "string") return text;
+  const firstChar = text.trimStart()[0];
+  if (firstChar === "{" || firstChar === "[") {
+    try {
+      return JSON.parse(text);
+    } catch (_) {
+    }
+  }
+  return text;
+}
 function generateSandboxGlobals(options) {
   const {
     toolImplementations = {},
@@ -21814,7 +21827,13 @@ function generateSandboxGlobals(options) {
   if (mcpBridge) {
     for (const [name, tool5] of Object.entries(mcpTools)) {
       const rawMcpFn = async (params = {}) => {
-        return tool5.execute(params);
+        const result = await tool5.execute(params);
+        const text = result?.content?.[0]?.text;
+        if (text === void 0) {
+          if (typeof result === "string") return tryParseJSONValue(result);
+          return result;
+        }
+        return tryParseJSONValue(text);
       };
       globals[name] = traceToolCall(name, rawMcpFn, tracer, logFn);
     }
@@ -21996,7 +22015,6 @@ function createDSLRuntime(options) {
     mcpTools = {},
     llmCall,
     mapConcurrency = 3,
-    timeoutMs = 12e4,
     maxLoopIterations = 5e3,
     tracer = null,
     sessionStore = {},
@@ -22051,7 +22069,6 @@ ${validation.errors.join("\n")}`,
       };
     }
     tracer?.addEvent?.("dsl.phase.execute_start", {
-      "dsl.timeout_ms": timeoutMs,
       "dsl.max_loop_iterations": maxLoopIterations
     });
     try {
@@ -22079,18 +22096,10 @@ ${validation.errors.join("\n")}`,
         escapedError = reason;
       };
       process.on("unhandledRejection", rejectionHandler);
-      let timeoutHandle;
-      const executionPromise = exec6().run();
-      const timeoutPromise = new Promise((_, reject2) => {
-        timeoutHandle = setTimeout(() => {
-          reject2(new Error(`Execution timed out after ${Math.round(timeoutMs / 1e3)}s. Script took too long \u2014 reduce the amount of work (fewer items, smaller data) or increase timeout.`));
-        }, timeoutMs);
-      });
       let result;
       try {
-        result = await Promise.race([executionPromise, timeoutPromise]);
+        result = await exec6().run();
       } finally {
-        clearTimeout(timeoutHandle);
         setTimeout(() => {
           process.removeListener("unhandledRejection", rejectionHandler);
         }, 500);

package/cjs/agent/ProbeAgent.cjs

@@ -50948,9 +50948,6 @@ function validateDSL(code) {
     if (node.type === "FunctionExpression" && node.generator) {
       errors.push(`Generator functions are not allowed at position ${node.start}`);
     }
-    if (node.type === "Literal" && node.regex) {
-      errors.push(`Regex literals are not supported at position ${node.start}. Use String methods like indexOf(), includes(), startsWith() instead.`);
-    }
     if (node.type === "Identifier" && BLOCKED_IDENTIFIERS.has(node.name)) {
       errors.push(`Blocked identifier: '${node.name}' at position ${node.start}`);
     }
@@ -50989,18 +50986,23 @@ var init_validator = __esm({
       "BlockStatement",
       "VariableDeclaration",
       "VariableDeclarator",
+      "FunctionDeclaration",
       "ArrowFunctionExpression",
       "FunctionExpression",
       "CallExpression",
+      "NewExpression",
       "MemberExpression",
       "Identifier",
       "Literal",
       "TemplateLiteral",
       "TemplateElement",
+      "TaggedTemplateExpression",
       "ArrayExpression",
       "ObjectExpression",
       "SpreadElement",
       "IfStatement",
+      "SwitchStatement",
+      "SwitchCase",
       "ConditionalExpression",
       "ForOfStatement",
       "ForInStatement",
@@ -51212,6 +51214,17 @@ function traceToolCall(toolName, fn, tracer, logFn) {
     }
   };
 }
+function tryParseJSONValue(text) {
+  if (typeof text !== "string") return text;
+  const firstChar = text.trimStart()[0];
+  if (firstChar === "{" || firstChar === "[") {
+    try {
+      return JSON.parse(text);
+    } catch (_) {
+    }
+  }
+  return text;
+}
 function generateSandboxGlobals(options) {
   const {
     toolImplementations = {},
@@ -51263,7 +51276,13 @@ function generateSandboxGlobals(options) {
   if (mcpBridge) {
     for (const [name14, tool5] of Object.entries(mcpTools)) {
       const rawMcpFn = async (params = {}) => {
-        return tool5.execute(params);
+        const result = await tool5.execute(params);
+        const text = result?.content?.[0]?.text;
+        if (text === void 0) {
+          if (typeof result === "string") return tryParseJSONValue(result);
+          return result;
+        }
+        return tryParseJSONValue(text);
       };
       globals[name14] = traceToolCall(name14, rawMcpFn, tracer, logFn);
     }
@@ -51445,7 +51464,6 @@ function createDSLRuntime(options) {
     mcpTools = {},
     llmCall,
     mapConcurrency = 3,
-    timeoutMs = 12e4,
     maxLoopIterations = 5e3,
     tracer = null,
     sessionStore = {},
@@ -51500,7 +51518,6 @@ ${validation.errors.join("\n")}`,
       };
     }
     tracer?.addEvent?.("dsl.phase.execute_start", {
-      "dsl.timeout_ms": timeoutMs,
       "dsl.max_loop_iterations": maxLoopIterations
     });
     try {
@@ -51528,18 +51545,10 @@ ${validation.errors.join("\n")}`,
         escapedError = reason;
       };
       process.on("unhandledRejection", rejectionHandler);
-      let timeoutHandle;
-      const executionPromise = exec6().run();
-      const timeoutPromise = new Promise((_, reject2) => {
-        timeoutHandle = setTimeout(() => {
-          reject2(new Error(`Execution timed out after ${Math.round(timeoutMs / 1e3)}s. Script took too long \u2014 reduce the amount of work (fewer items, smaller data) or increase timeout.`));
-        }, timeoutMs);
-      });
       let result;
       try {
-        result = await Promise.race([executionPromise, timeoutPromise]);
+        result = await exec6().run();
       } finally {
-        clearTimeout(timeoutHandle);
         setTimeout(() => {
           process.removeListener("unhandledRejection", rejectionHandler);
         }, 500);

package/cjs/index.cjs

@@ -112363,9 +112363,6 @@ function validateDSL(code) {
     if (node.type === "FunctionExpression" && node.generator) {
       errors.push(`Generator functions are not allowed at position ${node.start}`);
     }
-    if (node.type === "Literal" && node.regex) {
-      errors.push(`Regex literals are not supported at position ${node.start}. Use String methods like indexOf(), includes(), startsWith() instead.`);
-    }
     if (node.type === "Identifier" && BLOCKED_IDENTIFIERS.has(node.name)) {
       errors.push(`Blocked identifier: '${node.name}' at position ${node.start}`);
     }
@@ -112404,18 +112401,23 @@ var init_validator = __esm({
       "BlockStatement",
       "VariableDeclaration",
       "VariableDeclarator",
+      "FunctionDeclaration",
       "ArrowFunctionExpression",
       "FunctionExpression",
       "CallExpression",
+      "NewExpression",
       "MemberExpression",
       "Identifier",
       "Literal",
       "TemplateLiteral",
       "TemplateElement",
+      "TaggedTemplateExpression",
       "ArrayExpression",
       "ObjectExpression",
       "SpreadElement",
       "IfStatement",
+      "SwitchStatement",
+      "SwitchCase",
       "ConditionalExpression",
       "ForOfStatement",
       "ForInStatement",
@@ -112627,6 +112629,17 @@ function traceToolCall(toolName, fn, tracer, logFn) {
     }
   };
 }
+function tryParseJSONValue(text) {
+  if (typeof text !== "string") return text;
+  const firstChar = text.trimStart()[0];
+  if (firstChar === "{" || firstChar === "[") {
+    try {
+      return JSON.parse(text);
+    } catch (_) {
+    }
+  }
+  return text;
+}
 function generateSandboxGlobals(options) {
   const {
     toolImplementations = {},
@@ -112678,7 +112691,13 @@ function generateSandboxGlobals(options) {
   if (mcpBridge) {
     for (const [name14, tool5] of Object.entries(mcpTools)) {
       const rawMcpFn = async (params = {}) => {
-        return tool5.execute(params);
+        const result = await tool5.execute(params);
+        const text = result?.content?.[0]?.text;
+        if (text === void 0) {
+          if (typeof result === "string") return tryParseJSONValue(result);
+          return result;
+        }
+        return tryParseJSONValue(text);
       };
       globals[name14] = traceToolCall(name14, rawMcpFn, tracer, logFn);
     }
@@ -112860,7 +112879,6 @@ function createDSLRuntime(options) {
     mcpTools = {},
     llmCall,
     mapConcurrency = 3,
-    timeoutMs = 12e4,
     maxLoopIterations = 5e3,
     tracer = null,
     sessionStore = {},
@@ -112915,7 +112933,6 @@ ${validation.errors.join("\n")}`,
       };
     }
     tracer?.addEvent?.("dsl.phase.execute_start", {
-      "dsl.timeout_ms": timeoutMs,
       "dsl.max_loop_iterations": maxLoopIterations
     });
     try {
@@ -112943,18 +112960,10 @@ ${validation.errors.join("\n")}`,
         escapedError = reason;
       };
       process.on("unhandledRejection", rejectionHandler);
-      let timeoutHandle;
-      const executionPromise = exec6().run();
-      const timeoutPromise = new Promise((_, reject2) => {
-        timeoutHandle = setTimeout(() => {
-          reject2(new Error(`Execution timed out after ${Math.round(timeoutMs / 1e3)}s. Script took too long \u2014 reduce the amount of work (fewer items, smaller data) or increase timeout.`));
-        }, timeoutMs);
-      });
       let result;
       try {
-        result = await Promise.race([executionPromise, timeoutPromise]);
+        result = await exec6().run();
       } finally {
-        clearTimeout(timeoutHandle);
         setTimeout(() => {
           process.removeListener("unhandledRejection", rejectionHandler);
         }, 500);

package/package.json

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

package/src/agent/dsl/environment.js

@@ -117,6 +117,23 @@ function traceToolCall(toolName, fn, tracer, logFn) {
   };
 }
 
+/**
+ * Try to parse a string as JSON if it looks like a JSON object or array.
+ * Checks if the first non-whitespace character is '{' or '[' before attempting parse.
+ * Returns the original string if it's not JSON.
+ *
+ * @param {string} text - The text to try parsing
+ * @returns {any} Parsed JSON value, or the original string
+ */
+function tryParseJSONValue(text) {
+  if (typeof text !== 'string') return text;
+  const firstChar = text.trimStart()[0];
+  if (firstChar === '{' || firstChar === '[') {
+    try { return JSON.parse(text); } catch (_) { /* not valid JSON */ }
+  }
+  return text;
+}
+
 /**
  * Generate sandbox globals that bridge DSL function calls to real tool implementations.
  *
@@ -195,7 +212,15 @@ export function generateSandboxGlobals(options) {
   if (mcpBridge) {
     for (const [name, tool] of Object.entries(mcpTools)) {
       const rawMcpFn = async (params = {}) => {
-        return tool.execute(params);
+        const result = await tool.execute(params);
+        // Extract text from MCP response envelope: { content: [{ type: 'text', text: '...' }] }
+        const text = result?.content?.[0]?.text;
+        if (text === undefined) {
+          // No envelope — if raw result is a JSON-like string, try parsing it
+          if (typeof result === 'string') return tryParseJSONValue(result);
+          return result;
+        }
+        return tryParseJSONValue(text);
       };
       globals[name] = traceToolCall(name, rawMcpFn, tracer, logFn);
     }

package/src/agent/dsl/runtime.js

@@ -4,7 +4,7 @@
  * Orchestrates the full pipeline:
  * 1. Validate (AST whitelist)
  * 2. Transform (inject await, wrap in async IIFE)
- * 3. Execute in SandboxJS with tool globals + timeout
+ * 3. Execute in SandboxJS with tool globals
  *
  * Returns the result or a structured error.
  */
@@ -25,7 +25,6 @@ const Sandbox = SandboxModule.default || SandboxModule;
  * @param {Object} [options.mcpTools={}] - MCP tool metadata
  * @param {Function} options.llmCall - Function for LLM() calls: (instruction, data, options?) => Promise<any>
  * @param {number} [options.mapConcurrency=3] - Concurrency limit for map()
- * @param {number} [options.timeoutMs=120000] - Execution timeout in milliseconds (default 2 min)
  * @param {number} [options.maxLoopIterations=5000] - Max iterations for while/for loops
  * @param {Object} [options.tracer=null] - SimpleAppTracer instance for OTEL telemetry
  * @returns {Object} Runtime with execute() method
@@ -37,7 +36,6 @@ export function createDSLRuntime(options) {
     mcpTools = {},
     llmCall,
     mapConcurrency = 3,
-    timeoutMs = 120000,
     maxLoopIterations = 5000,
     tracer = null,
     sessionStore = {},
@@ -108,9 +106,8 @@ export function createDSLRuntime(options) {
       };
     }
 
-    // Step 3: Execute in SandboxJS with timeout
+    // Step 3: Execute in SandboxJS
     tracer?.addEvent?.('dsl.phase.execute_start', {
-      'dsl.timeout_ms': timeoutMs,
       'dsl.max_loop_iterations': maxLoopIterations,
     });
 
@@ -147,20 +144,10 @@ export function createDSLRuntime(options) {
       };
       process.on('unhandledRejection', rejectionHandler);
 
-      // Race execution against timeout
-      let timeoutHandle;
-      const executionPromise = exec().run();
-      const timeoutPromise = new Promise((_, reject) => {
-        timeoutHandle = setTimeout(() => {
-          reject(new Error(`Execution timed out after ${Math.round(timeoutMs / 1000)}s. Script took too long — reduce the amount of work (fewer items, smaller data) or increase timeout.`));
-        }, timeoutMs);
-      });
-
       let result;
       try {
-        result = await Promise.race([executionPromise, timeoutPromise]);
+        result = await exec().run();
       } finally {
-        clearTimeout(timeoutHandle);
         // Delay handler removal — SandboxJS can throw async errors after execution completes
         setTimeout(() => {
           process.removeListener('unhandledRejection', rejectionHandler);

package/src/agent/dsl/validator.js

@@ -16,18 +16,23 @@ const ALLOWED_NODE_TYPES = new Set([
   'BlockStatement',
   'VariableDeclaration',
   'VariableDeclarator',
+  'FunctionDeclaration',
   'ArrowFunctionExpression',
   'FunctionExpression',
   'CallExpression',
+  'NewExpression',
   'MemberExpression',
   'Identifier',
   'Literal',
   'TemplateLiteral',
   'TemplateElement',
+  'TaggedTemplateExpression',
   'ArrayExpression',
   'ObjectExpression',
   'SpreadElement',
   'IfStatement',
+  'SwitchStatement',
+  'SwitchCase',
   'ConditionalExpression',
   'ForOfStatement',
   'ForInStatement',
@@ -127,10 +132,6 @@ export function validateDSL(code) {
       errors.push(`Generator functions are not allowed at position ${node.start}`);
     }
 
-    // Block regex literals — SandboxJS doesn't support them
-    if (node.type === 'Literal' && node.regex) {
-      errors.push(`Regex literals are not supported at position ${node.start}. Use String methods like indexOf(), includes(), startsWith() instead.`);
-    }
 
     // Check identifiers against blocklist
     if (node.type === 'Identifier' && BLOCKED_IDENTIFIERS.has(node.name)) {