@probelabs/probe 0.6.0-rc291 → 0.6.0-rc292

package/build/agent/dsl/environment.js

@@ -234,7 +234,14 @@ export function generateSandboxGlobals(options) {
         }
         return tryParseJSONValue(text);
       };
-      globals[name] = traceToolCall(name, rawMcpFn, tracer, logFn);
+      const tracedFn = traceToolCall(name, rawMcpFn, tracer, logFn);
+      globals[name] = tracedFn;
+      // Register sanitized alias for names with hyphens/dots/etc that aren't valid JS identifiers
+      // e.g. "workable-api" → also available as "workable_api"
+      const sanitized = name.replace(/[^a-zA-Z0-9_$]/g, '_');
+      if (sanitized !== name) {
+        globals[sanitized] = tracedFn;
+      }
     }
   }
 

package/build/agent/dsl/runtime.js

@@ -181,9 +181,17 @@ export function createDSLRuntime(options) {
         'dsl.error': e.message?.substring(0, 500),
       });
 
+      // Enrich "X is not defined" errors with available tool names
+      let errorMsg = `Execution failed: ${e.message}`;
+      if (e.message && e.message.includes('is not defined')) {
+        const globalNames = Object.keys(toolGlobals).sort();
+        errorMsg += `\nAvailable functions: ${globalNames.join(', ')}`;
+        errorMsg += `\nNote: Tools with hyphens (e.g. "my-tool") are available with underscores: my_tool()`;
+      }
+
       return {
         status: 'error',
-        error: `Execution failed: ${e.message}`,
+        error: errorMsg,
         logs,
       };
     }

package/build/tools/executePlan.js

@@ -778,6 +778,7 @@ return table;
 - Do NOT define helper functions that call tools. Write all logic inline or use for..of loops.
 - Do NOT use regex literals (/pattern/) — use String methods like indexOf, includes, startsWith instead.
 - ONLY use functions listed below. Do NOT call functions that are not listed.
+- MCP tools with hyphens in their names (e.g. \`workable-api\`) are available using underscores: \`workable_api()\`. Hyphens are not valid in JS identifiers.
 
 ### Available functions
 

package/build/tools/fuzzyMatch.js

@@ -73,7 +73,17 @@ export function lineTrimmedMatch(contentLines, searchLines) {
       }
     }
     if (allMatch) {
-      const matchedText = contentLines.slice(i, i + windowSize).join('\n');
+      // Limit indent tolerance: even though trimmed content matches, reject when
+      // the indentation level difference is too large — it likely means the match
+      // is in a completely different scope (issue #507).
+      const windowLines = contentLines.slice(i, i + windowSize);
+      const windowMinIndent = getMinIndent(windowLines);
+      const searchMinIndent = getMinIndent(searchLines);
+      const indentDiff = Math.abs(windowMinIndent - searchMinIndent);
+      if (isIndentDiffTooLarge(windowLines, searchLines, indentDiff)) {
+        continue; // Skip — too far off in nesting
+      }
+      const matchedText = windowLines.join('\n');
       matches.push(matchedText);
     }
   }
@@ -134,6 +144,19 @@ export function whitespaceNormalizedMatch(content, search) {
     }
 
     const matchedText = content.substring(originalStart, actualEnd);
+
+    // Limit indent tolerance: reject matches where the indentation level
+    // difference is too large — likely a wrong-scope match (issue #507).
+    const matchedLines = matchedText.split('\n');
+    const searchLines = search.split('\n');
+    const matchMinIndent = getMinIndent(matchedLines);
+    const searchMinIndent = getMinIndent(searchLines);
+    const indentDiff = Math.abs(matchMinIndent - searchMinIndent);
+    if (isIndentDiffTooLarge(matchedLines, searchLines, indentDiff)) {
+      searchStart = idx + 1;
+      continue; // Skip — too far off in nesting
+    }
+
     matches.push(matchedText);
 
     searchStart = idx + 1;
@@ -219,6 +242,15 @@ export function indentFlexibleMatch(contentLines, searchLines) {
     }
 
     if (allMatch) {
+      // Limit indent tolerance: reject matches where indentation differs by more than
+      // 1 level. Larger differences likely mean the match is in a completely different
+      // scope/nesting level — silent file corruption risk (issue #507).
+      // For tabs: 1 tab = 1 level, so max diff = 1.
+      // For spaces: detect indent unit (2 or 4), allow 1 unit of difference.
+      const indentDiff = Math.abs(windowMinIndent - searchMinIndent);
+      if (isIndentDiffTooLarge(windowLines, searchLines, indentDiff)) {
+        continue; // Skip — too far off in nesting
+      }
       const matchedText = windowLines.join('\n');
       matches.push(matchedText);
     }
@@ -232,6 +264,25 @@ export function indentFlexibleMatch(contentLines, searchLines) {
   };
 }
 
+/**
+ * Check if an indentation difference exceeds the allowed limit.
+ * Uses tab-aware threshold: 1 for tabs, 4 for spaces.
+ * Checks BOTH sides for tab usage to avoid asymmetric detection.
+ *
+ * @param {string[]} linesA - First set of lines
+ * @param {string[]} linesB - Second set of lines
+ * @param {number} indentDiff - Absolute difference in min indent
+ * @returns {boolean} true if the diff exceeds the limit
+ */
+function isIndentDiffTooLarge(linesA, linesB, indentDiff) {
+  if (indentDiff <= 0) return false;
+  const sampleA = linesA.find(l => l.trim().length > 0) || '';
+  const sampleB = linesB.find(l => l.trim().length > 0) || '';
+  const useTabs = sampleA.startsWith('\t') || sampleB.startsWith('\t');
+  const maxAllowedDiff = useTabs ? 1 : 4;
+  return indentDiff > maxAllowedDiff;
+}
+
 /**
  * Get the minimum indentation level (number of leading whitespace characters)
  * across all non-empty lines.

package/build/tools/lineEditHeuristics.js

@@ -92,6 +92,17 @@ export function restoreIndentation(newStr, originalLines) {
   const newIndent = detectBaseIndent(newStr);
 
   if (targetIndent !== newIndent) {
+    // Limit auto-reindent tolerance: reject when indentation differs by more than
+    // 1 level. Larger differences likely mean the match landed in a completely
+    // different scope — allowing it risks silent file corruption (issue #507).
+    // For tabs: 1 tab = 1 level, so max diff = 1 char.
+    // For spaces: 1 level = up to 4 spaces, so max diff = 4 chars.
+    const indentDiff = Math.abs(targetIndent.length - newIndent.length);
+    const useTabs = targetIndent.includes('\t') || newIndent.includes('\t');
+    const maxAllowedDiff = useTabs ? 1 : 4;
+    if (indentDiff > maxAllowedDiff) {
+      return { result: newStr, modifications };
+    }
     const reindented = reindent(newStr, targetIndent);
     if (reindented !== newStr) {
       modifications.push(`reindented from "${newIndent}" to "${targetIndent}"`);

package/cjs/agent/ProbeAgent.cjs

@@ -29908,7 +29908,14 @@ function lineTrimmedMatch(contentLines, searchLines) {
       }
     }
     if (allMatch) {
-      const matchedText = contentLines.slice(i, i + windowSize).join("\n");
+      const windowLines = contentLines.slice(i, i + windowSize);
+      const windowMinIndent = getMinIndent(windowLines);
+      const searchMinIndent = getMinIndent(searchLines);
+      const indentDiff = Math.abs(windowMinIndent - searchMinIndent);
+      if (isIndentDiffTooLarge(windowLines, searchLines, indentDiff)) {
+        continue;
+      }
+      const matchedText = windowLines.join("\n");
       matches.push(matchedText);
     }
   }
@@ -29938,6 +29945,15 @@ function whitespaceNormalizedMatch(content, search2) {
       actualEnd++;
     }
     const matchedText = content.substring(originalStart, actualEnd);
+    const matchedLines = matchedText.split("\n");
+    const searchLines = search2.split("\n");
+    const matchMinIndent = getMinIndent(matchedLines);
+    const searchMinIndent = getMinIndent(searchLines);
+    const indentDiff = Math.abs(matchMinIndent - searchMinIndent);
+    if (isIndentDiffTooLarge(matchedLines, searchLines, indentDiff)) {
+      searchStart = idx + 1;
+      continue;
+    }
     matches.push(matchedText);
     searchStart = idx + 1;
   }
@@ -29989,6 +30005,10 @@ function indentFlexibleMatch(contentLines, searchLines) {
       }
     }
     if (allMatch) {
+      const indentDiff = Math.abs(windowMinIndent - searchMinIndent);
+      if (isIndentDiffTooLarge(windowLines, searchLines, indentDiff)) {
+        continue;
+      }
       const matchedText = windowLines.join("\n");
       matches.push(matchedText);
     }
@@ -29999,6 +30019,14 @@ function indentFlexibleMatch(contentLines, searchLines) {
     count: matches.length
   };
 }
+function isIndentDiffTooLarge(linesA, linesB, indentDiff) {
+  if (indentDiff <= 0) return false;
+  const sampleA = linesA.find((l) => l.trim().length > 0) || "";
+  const sampleB = linesB.find((l) => l.trim().length > 0) || "";
+  const useTabs = sampleA.startsWith("	") || sampleB.startsWith("	");
+  const maxAllowedDiff = useTabs ? 1 : 4;
+  return indentDiff > maxAllowedDiff;
+}
 function getMinIndent(lines) {
   let min = Infinity;
   for (const line of lines) {
@@ -30158,6 +30186,12 @@ function restoreIndentation(newStr, originalLines) {
   const targetIndent = detectBaseIndent(originalCode);
   const newIndent = detectBaseIndent(newStr);
   if (targetIndent !== newIndent) {
+    const indentDiff = Math.abs(targetIndent.length - newIndent.length);
+    const useTabs = targetIndent.includes("	") || newIndent.includes("	");
+    const maxAllowedDiff = useTabs ? 1 : 4;
+    if (indentDiff > maxAllowedDiff) {
+      return { result: newStr, modifications };
+    }
     const reindented = reindent(newStr, targetIndent);
     if (reindented !== newStr) {
       modifications.push(`reindented from "${newIndent}" to "${targetIndent}"`);
@@ -40531,7 +40565,12 @@ function generateSandboxGlobals(options) {
         }
         return tryParseJSONValue(text);
       };
-      globals[name15] = traceToolCall(name15, rawMcpFn, tracer, logFn);
+      const tracedFn = traceToolCall(name15, rawMcpFn, tracer, logFn);
+      globals[name15] = tracedFn;
+      const sanitized = name15.replace(/[^a-zA-Z0-9_$]/g, "_");
+      if (sanitized !== name15) {
+        globals[sanitized] = tracedFn;
+      }
     }
   }
   if (llmCall) {
@@ -40886,9 +40925,17 @@ ${validation.errors.join("\n")}`,
         "dsl.duration_ms": elapsed,
         "dsl.error": e.message?.substring(0, 500)
       });
+      let errorMsg = `Execution failed: ${e.message}`;
+      if (e.message && e.message.includes("is not defined")) {
+        const globalNames = Object.keys(toolGlobals).sort();
+        errorMsg += `
+Available functions: ${globalNames.join(", ")}`;
+        errorMsg += `
+Note: Tools with hyphens (e.g. "my-tool") are available with underscores: my_tool()`;
+      }
       return {
         status: "error",
-        error: `Execution failed: ${e.message}`,
+        error: errorMsg,
         logs
       };
     }

package/cjs/index.cjs

@@ -92219,7 +92219,12 @@ function generateSandboxGlobals(options) {
         }
         return tryParseJSONValue(text);
       };
-      globals[name15] = traceToolCall(name15, rawMcpFn, tracer, logFn);
+      const tracedFn = traceToolCall(name15, rawMcpFn, tracer, logFn);
+      globals[name15] = tracedFn;
+      const sanitized = name15.replace(/[^a-zA-Z0-9_$]/g, "_");
+      if (sanitized !== name15) {
+        globals[sanitized] = tracedFn;
+      }
     }
   }
   if (llmCall) {
@@ -92574,9 +92579,17 @@ ${validation.errors.join("\n")}`,
         "dsl.duration_ms": elapsed,
         "dsl.error": e.message?.substring(0, 500)
       });
+      let errorMsg = `Execution failed: ${e.message}`;
+      if (e.message && e.message.includes("is not defined")) {
+        const globalNames = Object.keys(toolGlobals).sort();
+        errorMsg += `
+Available functions: ${globalNames.join(", ")}`;
+        errorMsg += `
+Note: Tools with hyphens (e.g. "my-tool") are available with underscores: my_tool()`;
+      }
       return {
         status: "error",
-        error: `Execution failed: ${e.message}`,
+        error: errorMsg,
         logs
       };
     }
@@ -101893,7 +101906,14 @@ function lineTrimmedMatch(contentLines, searchLines) {
       }
     }
     if (allMatch) {
-      const matchedText = contentLines.slice(i, i + windowSize).join("\n");
+      const windowLines = contentLines.slice(i, i + windowSize);
+      const windowMinIndent = getMinIndent(windowLines);
+      const searchMinIndent = getMinIndent(searchLines);
+      const indentDiff = Math.abs(windowMinIndent - searchMinIndent);
+      if (isIndentDiffTooLarge(windowLines, searchLines, indentDiff)) {
+        continue;
+      }
+      const matchedText = windowLines.join("\n");
       matches.push(matchedText);
     }
   }
@@ -101923,6 +101943,15 @@ function whitespaceNormalizedMatch(content, search2) {
       actualEnd++;
     }
     const matchedText = content.substring(originalStart, actualEnd);
+    const matchedLines = matchedText.split("\n");
+    const searchLines = search2.split("\n");
+    const matchMinIndent = getMinIndent(matchedLines);
+    const searchMinIndent = getMinIndent(searchLines);
+    const indentDiff = Math.abs(matchMinIndent - searchMinIndent);
+    if (isIndentDiffTooLarge(matchedLines, searchLines, indentDiff)) {
+      searchStart = idx + 1;
+      continue;
+    }
     matches.push(matchedText);
     searchStart = idx + 1;
   }
@@ -101974,6 +102003,10 @@ function indentFlexibleMatch(contentLines, searchLines) {
       }
     }
     if (allMatch) {
+      const indentDiff = Math.abs(windowMinIndent - searchMinIndent);
+      if (isIndentDiffTooLarge(windowLines, searchLines, indentDiff)) {
+        continue;
+      }
       const matchedText = windowLines.join("\n");
       matches.push(matchedText);
     }
@@ -101984,6 +102017,14 @@ function indentFlexibleMatch(contentLines, searchLines) {
     count: matches.length
   };
 }
+function isIndentDiffTooLarge(linesA, linesB, indentDiff) {
+  if (indentDiff <= 0) return false;
+  const sampleA = linesA.find((l) => l.trim().length > 0) || "";
+  const sampleB = linesB.find((l) => l.trim().length > 0) || "";
+  const useTabs = sampleA.startsWith("	") || sampleB.startsWith("	");
+  const maxAllowedDiff = useTabs ? 1 : 4;
+  return indentDiff > maxAllowedDiff;
+}
 function getMinIndent(lines) {
   let min = Infinity;
   for (const line of lines) {
@@ -102058,6 +102099,12 @@ function restoreIndentation(newStr, originalLines) {
   const targetIndent = detectBaseIndent(originalCode);
   const newIndent = detectBaseIndent(newStr);
   if (targetIndent !== newIndent) {
+    const indentDiff = Math.abs(targetIndent.length - newIndent.length);
+    const useTabs = targetIndent.includes("	") || newIndent.includes("	");
+    const maxAllowedDiff = useTabs ? 1 : 4;
+    if (indentDiff > maxAllowedDiff) {
+      return { result: newStr, modifications };
+    }
     const reindented = reindent(newStr, targetIndent);
     if (reindented !== newStr) {
       modifications.push(`reindented from "${newIndent}" to "${targetIndent}"`);

package/package.json

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

package/src/agent/dsl/environment.js

@@ -234,7 +234,14 @@ export function generateSandboxGlobals(options) {
         }
         return tryParseJSONValue(text);
       };
-      globals[name] = traceToolCall(name, rawMcpFn, tracer, logFn);
+      const tracedFn = traceToolCall(name, rawMcpFn, tracer, logFn);
+      globals[name] = tracedFn;
+      // Register sanitized alias for names with hyphens/dots/etc that aren't valid JS identifiers
+      // e.g. "workable-api" → also available as "workable_api"
+      const sanitized = name.replace(/[^a-zA-Z0-9_$]/g, '_');
+      if (sanitized !== name) {
+        globals[sanitized] = tracedFn;
+      }
     }
   }
 

package/src/agent/dsl/runtime.js

@@ -181,9 +181,17 @@ export function createDSLRuntime(options) {
         'dsl.error': e.message?.substring(0, 500),
       });
 
+      // Enrich "X is not defined" errors with available tool names
+      let errorMsg = `Execution failed: ${e.message}`;
+      if (e.message && e.message.includes('is not defined')) {
+        const globalNames = Object.keys(toolGlobals).sort();
+        errorMsg += `\nAvailable functions: ${globalNames.join(', ')}`;
+        errorMsg += `\nNote: Tools with hyphens (e.g. "my-tool") are available with underscores: my_tool()`;
+      }
+
       return {
         status: 'error',
-        error: `Execution failed: ${e.message}`,
+        error: errorMsg,
         logs,
       };
     }

package/src/tools/executePlan.js

@@ -778,6 +778,7 @@ return table;
 - Do NOT define helper functions that call tools. Write all logic inline or use for..of loops.
 - Do NOT use regex literals (/pattern/) — use String methods like indexOf, includes, startsWith instead.
 - ONLY use functions listed below. Do NOT call functions that are not listed.
+- MCP tools with hyphens in their names (e.g. \`workable-api\`) are available using underscores: \`workable_api()\`. Hyphens are not valid in JS identifiers.
 
 ### Available functions
 

package/src/tools/fuzzyMatch.js

@@ -73,7 +73,17 @@ export function lineTrimmedMatch(contentLines, searchLines) {
       }
     }
     if (allMatch) {
-      const matchedText = contentLines.slice(i, i + windowSize).join('\n');
+      // Limit indent tolerance: even though trimmed content matches, reject when
+      // the indentation level difference is too large — it likely means the match
+      // is in a completely different scope (issue #507).
+      const windowLines = contentLines.slice(i, i + windowSize);
+      const windowMinIndent = getMinIndent(windowLines);
+      const searchMinIndent = getMinIndent(searchLines);
+      const indentDiff = Math.abs(windowMinIndent - searchMinIndent);
+      if (isIndentDiffTooLarge(windowLines, searchLines, indentDiff)) {
+        continue; // Skip — too far off in nesting
+      }
+      const matchedText = windowLines.join('\n');
       matches.push(matchedText);
     }
   }
@@ -134,6 +144,19 @@ export function whitespaceNormalizedMatch(content, search) {
     }
 
     const matchedText = content.substring(originalStart, actualEnd);
+
+    // Limit indent tolerance: reject matches where the indentation level
+    // difference is too large — likely a wrong-scope match (issue #507).
+    const matchedLines = matchedText.split('\n');
+    const searchLines = search.split('\n');
+    const matchMinIndent = getMinIndent(matchedLines);
+    const searchMinIndent = getMinIndent(searchLines);
+    const indentDiff = Math.abs(matchMinIndent - searchMinIndent);
+    if (isIndentDiffTooLarge(matchedLines, searchLines, indentDiff)) {
+      searchStart = idx + 1;
+      continue; // Skip — too far off in nesting
+    }
+
     matches.push(matchedText);
 
     searchStart = idx + 1;
@@ -219,6 +242,15 @@ export function indentFlexibleMatch(contentLines, searchLines) {
     }
 
     if (allMatch) {
+      // Limit indent tolerance: reject matches where indentation differs by more than
+      // 1 level. Larger differences likely mean the match is in a completely different
+      // scope/nesting level — silent file corruption risk (issue #507).
+      // For tabs: 1 tab = 1 level, so max diff = 1.
+      // For spaces: detect indent unit (2 or 4), allow 1 unit of difference.
+      const indentDiff = Math.abs(windowMinIndent - searchMinIndent);
+      if (isIndentDiffTooLarge(windowLines, searchLines, indentDiff)) {
+        continue; // Skip — too far off in nesting
+      }
       const matchedText = windowLines.join('\n');
       matches.push(matchedText);
     }
@@ -232,6 +264,25 @@ export function indentFlexibleMatch(contentLines, searchLines) {
   };
 }
 
+/**
+ * Check if an indentation difference exceeds the allowed limit.
+ * Uses tab-aware threshold: 1 for tabs, 4 for spaces.
+ * Checks BOTH sides for tab usage to avoid asymmetric detection.
+ *
+ * @param {string[]} linesA - First set of lines
+ * @param {string[]} linesB - Second set of lines
+ * @param {number} indentDiff - Absolute difference in min indent
+ * @returns {boolean} true if the diff exceeds the limit
+ */
+function isIndentDiffTooLarge(linesA, linesB, indentDiff) {
+  if (indentDiff <= 0) return false;
+  const sampleA = linesA.find(l => l.trim().length > 0) || '';
+  const sampleB = linesB.find(l => l.trim().length > 0) || '';
+  const useTabs = sampleA.startsWith('\t') || sampleB.startsWith('\t');
+  const maxAllowedDiff = useTabs ? 1 : 4;
+  return indentDiff > maxAllowedDiff;
+}
+
 /**
  * Get the minimum indentation level (number of leading whitespace characters)
  * across all non-empty lines.

package/src/tools/lineEditHeuristics.js

@@ -92,6 +92,17 @@ export function restoreIndentation(newStr, originalLines) {
   const newIndent = detectBaseIndent(newStr);
 
   if (targetIndent !== newIndent) {
+    // Limit auto-reindent tolerance: reject when indentation differs by more than
+    // 1 level. Larger differences likely mean the match landed in a completely
+    // different scope — allowing it risks silent file corruption (issue #507).
+    // For tabs: 1 tab = 1 level, so max diff = 1 char.
+    // For spaces: 1 level = up to 4 spaces, so max diff = 4 chars.
+    const indentDiff = Math.abs(targetIndent.length - newIndent.length);
+    const useTabs = targetIndent.includes('\t') || newIndent.includes('\t');
+    const maxAllowedDiff = useTabs ? 1 : 4;
+    if (indentDiff > maxAllowedDiff) {
+      return { result: newStr, modifications };
+    }
     const reindented = reindent(newStr, targetIndent);
     if (reindented !== newStr) {
       modifications.push(`reindented from "${newIndent}" to "${targetIndent}"`);