@probelabs/probe 0.6.0-rc290 → 0.6.0-rc292

package/build/agent/ProbeAgent.js

@@ -1444,11 +1444,13 @@ export class ProbeAgent {
         result = await this._executeWithVercelProvider(options, controller);
       }
 
-      // Wrap textStream so limiter slot is held until stream completes
+      // Wrap textStream so limiter slot is held until stream completes.
+      // result.textStream is a read-only getter on DefaultStreamTextResult,
+      // so we wrap the result in a Proxy that intercepts the textStream property.
       if (limiter && result.textStream) {
         const originalStream = result.textStream;
         const debug = this.debug;
-        result.textStream = (async function* () {
+        const wrappedStream = (async function* () {
           try {
             for await (const chunk of originalStream) {
               yield chunk;
@@ -1461,6 +1463,13 @@ export class ProbeAgent {
             }
           }
         })();
+        return new Proxy(result, {
+          get(target, prop) {
+            if (prop === 'textStream') return wrappedStream;
+            const value = target[prop];
+            return typeof value === 'function' ? value.bind(target) : value;
+          }
+        });
       } else if (limiter) {
         // No textStream (shouldn't happen, but release just in case)
         limiter.release(null);
@@ -3499,6 +3508,7 @@ Follow these instructions carefully:
                     return true;
                   }
                 }
+
               }
 
               return false;
@@ -3529,6 +3539,24 @@ Follow these instructions carefully:
                 }
               }
 
+              // Force text-only response after 3 consecutive tool errors
+              // (e.g. workspace deleted mid-run — let the model produce its answer)
+              if (steps.length >= 3) {
+                const last3 = steps.slice(-3);
+                const allErrors = last3.every(s =>
+                  s.toolResults?.length > 0 && s.toolResults.every(tr => {
+                    const r = typeof tr.result === 'string' ? tr.result : '';
+                    return r.includes('<error ') || r.includes('does not exist');
+                  })
+                );
+                if (allErrors) {
+                  if (this.debug) {
+                    console.log(`[DEBUG] prepareStep: 3 consecutive tool errors, forcing toolChoice=none`);
+                  }
+                  return { toolChoice: 'none' };
+                }
+              }
+
               const lastStep = steps[steps.length - 1];
               const modelJustStopped = lastStep?.finishReason === 'stop'
                 && (!lastStep?.toolCalls || lastStep.toolCalls.length === 0);
@@ -3565,7 +3593,8 @@ Here is the result to review:
 ${resultToReview}
 </result>
 
-Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix).`;
+IMPORTANT: First review ALL completed work in the conversation above before taking any action.
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If your text has inaccuracies, fix the text. Only call a tool if you find a genuinely MISSING action — NEVER redo work that was already completed successfully. Respond with the COMPLETE corrected answer.`;
 
                   return {
                     userMessage: completionPromptMessage,
@@ -3774,7 +3803,8 @@ Here is the result to review:
 ${finalResult}
 </result>
 
-Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix).`;
+IMPORTANT: First review ALL completed work in the conversation above before taking any action.
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If your text has inaccuracies, fix the text. Only call a tool if you find a genuinely MISSING action — NEVER redo work that was already completed successfully. Respond with the COMPLETE corrected answer.`;
 
             currentMessages.push({ role: 'user', content: completionPromptMessage });
 

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/build/tools/vercel.js

@@ -478,7 +478,11 @@ export const searchTool = (options = {}) => {
 					return result;
 				} catch (error) {
 					console.error('Error executing search command:', error);
-					return formatErrorForAI(error);
+					const formatted = formatErrorForAI(error);
+					if (error.category === 'path_error' || error.message?.includes('does not exist')) {
+						return formatted + '\n\nThe path does not exist. Use the listFiles tool to verify the correct directory structure before retrying. If the workspace itself is gone, output your final answer with whatever information you have.';
+					}
+					return formatted;
 				}
 			}
 

package/build/utils/error-types.js

@@ -181,14 +181,14 @@ export function categorizeError(error) {
       errorCode === 'enoent') {
     return new PathError(message, {
       originalError: error,
-      suggestion: 'The specified path does not exist. Please verify the path or use a different directory.'
+      suggestion: 'The specified path does not exist. Use the listFiles tool to check the correct directory structure, then retry with a valid path.'
     });
   }
 
   if (lowerMessage.includes('not a directory') || errorCode === 'enotdir') {
     return new PathError(message, {
       originalError: error,
-      suggestion: 'The path is not a directory. Please provide a valid directory path.'
+      suggestion: 'The path is not a directory. Use the listFiles tool to find the correct directory, then retry.'
     });
   }
 

package/build/utils/path-validation.js

@@ -110,7 +110,7 @@ export async function validateCwdPath(inputPath, defaultPath = process.cwd()) {
 		}
 		if (error.code === 'ENOENT') {
 			throw new PathError(`Path does not exist: ${normalizedPath}`, {
-				suggestion: 'The specified path does not exist. Please verify the path is correct or use a different directory.',
+				suggestion: 'The specified path does not exist. Use the listFiles tool to check the correct directory structure, then retry with a valid path.',
 				details: { path: normalizedPath }
 			});
 		}

package/cjs/agent/ProbeAgent.cjs

@@ -25324,13 +25324,13 @@ function categorizeError(error40) {
   if (lowerMessage.includes("path does not exist") || lowerMessage.includes("no such file or directory") || errorCode === "enoent") {
     return new PathError(message, {
       originalError: error40,
-      suggestion: "The specified path does not exist. Please verify the path or use a different directory."
+      suggestion: "The specified path does not exist. Use the listFiles tool to check the correct directory structure, then retry with a valid path."
     });
   }
   if (lowerMessage.includes("not a directory") || errorCode === "enotdir") {
     return new PathError(message, {
       originalError: error40,
-      suggestion: "The path is not a directory. Please provide a valid directory path."
+      suggestion: "The path is not a directory. Use the listFiles tool to find the correct directory, then retry."
     });
   }
   if (lowerMessage.includes("permission denied") || errorCode === "eacces") {
@@ -25586,7 +25586,7 @@ async function validateCwdPath(inputPath, defaultPath = process.cwd()) {
     }
     if (error40.code === "ENOENT") {
       throw new PathError(`Path does not exist: ${normalizedPath}`, {
-        suggestion: "The specified path does not exist. Please verify the path is correct or use a different directory.",
+        suggestion: "The specified path does not exist. Use the listFiles tool to check the correct directory structure, then retry with a valid path.",
         details: { path: normalizedPath }
       });
     }
@@ -27643,7 +27643,11 @@ var init_vercel = __esm({
               return result;
             } catch (error40) {
               console.error("Error executing search command:", error40);
-              return formatErrorForAI(error40);
+              const formatted = formatErrorForAI(error40);
+              if (error40.category === "path_error" || error40.message?.includes("does not exist")) {
+                return formatted + "\n\nThe path does not exist. Use the listFiles tool to verify the correct directory structure before retrying. If the workspace itself is gone, output your final answer with whatever information you have.";
+              }
+              return formatted;
             }
           }
           try {
@@ -29904,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);
     }
   }
@@ -29934,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;
   }
@@ -29985,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);
     }
@@ -29995,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) {
@@ -30154,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}"`);
@@ -31008,6 +31046,9 @@ var require_utils = __commonJS({
         sandboxGlobal
       };
       context.prototypeWhitelist.set(Object.getPrototypeOf([][Symbol.iterator]()), /* @__PURE__ */ new Set());
+      context.prototypeWhitelist.set(Object.getPrototypeOf(""[Symbol.iterator]()), /* @__PURE__ */ new Set());
+      context.prototypeWhitelist.set(Object.getPrototypeOf((/* @__PURE__ */ new Set())[Symbol.iterator]()), /* @__PURE__ */ new Set());
+      context.prototypeWhitelist.set(Object.getPrototypeOf((/* @__PURE__ */ new Map())[Symbol.iterator]()), /* @__PURE__ */ new Set());
       return context;
     }
     function createExecContext(sandbox, executionTree, evalContext) {
@@ -32146,6 +32187,18 @@ var require_executor = __commonJS({
             a = void 0;
           }
         }
+        if (op === 29 && !a) {
+          done(void 0, a);
+          return;
+        }
+        if (op === 30 && a) {
+          done(void 0, a);
+          return;
+        }
+        if (op === 85 && a !== null && a !== void 0) {
+          done(void 0, a);
+          return;
+        }
         let bobj;
         try {
           let ad;
@@ -32208,6 +32261,18 @@ var require_executor = __commonJS({
             a = void 0;
           }
         }
+        if (op === 29 && !a) {
+          done(void 0, a);
+          return;
+        }
+        if (op === 30 && a) {
+          done(void 0, a);
+          return;
+        }
+        if (op === 85 && a !== null && a !== void 0) {
+          done(void 0, a);
+          return;
+        }
         let bobj;
         try {
           bobj = syncDone((d) => execSync(ticks, tree[2], scope, context, d, inLoopOrSwitch)).result;
@@ -40500,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) {
@@ -40855,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
       };
     }
@@ -100588,7 +100666,7 @@ var init_ProbeAgent = __esm({
           if (limiter && result.textStream) {
             const originalStream = result.textStream;
             const debug = this.debug;
-            result.textStream = (async function* () {
+            const wrappedStream = (async function* () {
               try {
                 for await (const chunk of originalStream) {
                   yield chunk;
@@ -100601,6 +100679,13 @@ var init_ProbeAgent = __esm({
                 }
               }
             })();
+            return new Proxy(result, {
+              get(target, prop) {
+                if (prop === "textStream") return wrappedStream;
+                const value = target[prop];
+                return typeof value === "function" ? value.bind(target) : value;
+              }
+            });
           } else if (limiter) {
             limiter.release(null);
           }
@@ -102254,6 +102339,21 @@ You are working with a workspace. Available paths: ${workspaceDesc}
                       }
                     }
                   }
+                  if (steps.length >= 3) {
+                    const last3 = steps.slice(-3);
+                    const allErrors = last3.every(
+                      (s) => s.toolResults?.length > 0 && s.toolResults.every((tr) => {
+                        const r = typeof tr.result === "string" ? tr.result : "";
+                        return r.includes("<error ") || r.includes("does not exist");
+                      })
+                    );
+                    if (allErrors) {
+                      if (this.debug) {
+                        console.log(`[DEBUG] prepareStep: 3 consecutive tool errors, forcing toolChoice=none`);
+                      }
+                      return { toolChoice: "none" };
+                    }
+                  }
                   const lastStep = steps[steps.length - 1];
                   const modelJustStopped = lastStep?.finishReason === "stop" && (!lastStep?.toolCalls || lastStep.toolCalls.length === 0);
                   if (modelJustStopped) {
@@ -102282,7 +102382,8 @@ Here is the result to review:
 ${resultToReview}
 </result>
 
-Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix).`;
+IMPORTANT: First review ALL completed work in the conversation above before taking any action.
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If your text has inaccuracies, fix the text. Only call a tool if you find a genuinely MISSING action \u2014 NEVER redo work that was already completed successfully. Respond with the COMPLETE corrected answer.`;
                       return {
                         userMessage: completionPromptMessage,
                         toolChoice: "none"
@@ -102441,7 +102542,8 @@ Here is the result to review:
 ${finalResult}
 </result>
 
-Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix).`;
+IMPORTANT: First review ALL completed work in the conversation above before taking any action.
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If your text has inaccuracies, fix the text. Only call a tool if you find a genuinely MISSING action \u2014 NEVER redo work that was already completed successfully. Respond with the COMPLETE corrected answer.`;
                 currentMessages.push({ role: "user", content: completionPromptMessage });
                 const completionStreamOptions = {
                   model: this.provider ? this.provider(this.model) : this.model,

package/cjs/index.cjs

@@ -1447,13 +1447,13 @@ function categorizeError(error40) {
   if (lowerMessage.includes("path does not exist") || lowerMessage.includes("no such file or directory") || errorCode === "enoent") {
     return new PathError(message, {
       originalError: error40,
-      suggestion: "The specified path does not exist. Please verify the path or use a different directory."
+      suggestion: "The specified path does not exist. Use the listFiles tool to check the correct directory structure, then retry with a valid path."
     });
   }
   if (lowerMessage.includes("not a directory") || errorCode === "enotdir") {
     return new PathError(message, {
       originalError: error40,
-      suggestion: "The path is not a directory. Please provide a valid directory path."
+      suggestion: "The path is not a directory. Use the listFiles tool to find the correct directory, then retry."
     });
   }
   if (lowerMessage.includes("permission denied") || errorCode === "eacces") {
@@ -1709,7 +1709,7 @@ async function validateCwdPath(inputPath, defaultPath = process.cwd()) {
     }
     if (error40.code === "ENOENT") {
       throw new PathError(`Path does not exist: ${normalizedPath}`, {
-        suggestion: "The specified path does not exist. Please verify the path is correct or use a different directory.",
+        suggestion: "The specified path does not exist. Use the listFiles tool to check the correct directory structure, then retry with a valid path.",
         details: { path: normalizedPath }
       });
     }
@@ -82700,6 +82700,9 @@ var require_utils2 = __commonJS({
         sandboxGlobal
       };
       context.prototypeWhitelist.set(Object.getPrototypeOf([][Symbol.iterator]()), /* @__PURE__ */ new Set());
+      context.prototypeWhitelist.set(Object.getPrototypeOf(""[Symbol.iterator]()), /* @__PURE__ */ new Set());
+      context.prototypeWhitelist.set(Object.getPrototypeOf((/* @__PURE__ */ new Set())[Symbol.iterator]()), /* @__PURE__ */ new Set());
+      context.prototypeWhitelist.set(Object.getPrototypeOf((/* @__PURE__ */ new Map())[Symbol.iterator]()), /* @__PURE__ */ new Set());
       return context;
     }
     function createExecContext(sandbox, executionTree, evalContext) {
@@ -83838,6 +83841,18 @@ var require_executor = __commonJS({
             a = void 0;
           }
         }
+        if (op === 29 && !a) {
+          done(void 0, a);
+          return;
+        }
+        if (op === 30 && a) {
+          done(void 0, a);
+          return;
+        }
+        if (op === 85 && a !== null && a !== void 0) {
+          done(void 0, a);
+          return;
+        }
         let bobj;
         try {
           let ad;
@@ -83900,6 +83915,18 @@ var require_executor = __commonJS({
             a = void 0;
           }
         }
+        if (op === 29 && !a) {
+          done(void 0, a);
+          return;
+        }
+        if (op === 30 && a) {
+          done(void 0, a);
+          return;
+        }
+        if (op === 85 && a !== null && a !== void 0) {
+          done(void 0, a);
+          return;
+        }
         let bobj;
         try {
           bobj = syncDone((d) => execSync(ticks, tree[2], scope, context, d, inLoopOrSwitch)).result;
@@ -92192,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) {
@@ -92547,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
       };
     }
@@ -97538,7 +97578,7 @@ var init_ProbeAgent = __esm({
           if (limiter && result.textStream) {
             const originalStream = result.textStream;
             const debug = this.debug;
-            result.textStream = (async function* () {
+            const wrappedStream = (async function* () {
               try {
                 for await (const chunk of originalStream) {
                   yield chunk;
@@ -97551,6 +97591,13 @@ var init_ProbeAgent = __esm({
                 }
               }
             })();
+            return new Proxy(result, {
+              get(target, prop) {
+                if (prop === "textStream") return wrappedStream;
+                const value = target[prop];
+                return typeof value === "function" ? value.bind(target) : value;
+              }
+            });
           } else if (limiter) {
             limiter.release(null);
           }
@@ -99204,6 +99251,21 @@ You are working with a workspace. Available paths: ${workspaceDesc}
                       }
                     }
                   }
+                  if (steps.length >= 3) {
+                    const last3 = steps.slice(-3);
+                    const allErrors = last3.every(
+                      (s) => s.toolResults?.length > 0 && s.toolResults.every((tr) => {
+                        const r = typeof tr.result === "string" ? tr.result : "";
+                        return r.includes("<error ") || r.includes("does not exist");
+                      })
+                    );
+                    if (allErrors) {
+                      if (this.debug) {
+                        console.log(`[DEBUG] prepareStep: 3 consecutive tool errors, forcing toolChoice=none`);
+                      }
+                      return { toolChoice: "none" };
+                    }
+                  }
                   const lastStep = steps[steps.length - 1];
                   const modelJustStopped = lastStep?.finishReason === "stop" && (!lastStep?.toolCalls || lastStep.toolCalls.length === 0);
                   if (modelJustStopped) {
@@ -99232,7 +99294,8 @@ Here is the result to review:
 ${resultToReview}
 </result>
 
-Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix).`;
+IMPORTANT: First review ALL completed work in the conversation above before taking any action.
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If your text has inaccuracies, fix the text. Only call a tool if you find a genuinely MISSING action \u2014 NEVER redo work that was already completed successfully. Respond with the COMPLETE corrected answer.`;
                       return {
                         userMessage: completionPromptMessage,
                         toolChoice: "none"
@@ -99391,7 +99454,8 @@ Here is the result to review:
 ${finalResult}
 </result>
 
-Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix).`;
+IMPORTANT: First review ALL completed work in the conversation above before taking any action.
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If your text has inaccuracies, fix the text. Only call a tool if you find a genuinely MISSING action \u2014 NEVER redo work that was already completed successfully. Respond with the COMPLETE corrected answer.`;
                 currentMessages.push({ role: "user", content: completionPromptMessage });
                 const completionStreamOptions = {
                   model: this.provider ? this.provider(this.model) : this.model,
@@ -101417,7 +101481,11 @@ var init_vercel = __esm({
               return result;
             } catch (error40) {
               console.error("Error executing search command:", error40);
-              return formatErrorForAI(error40);
+              const formatted = formatErrorForAI(error40);
+              if (error40.category === "path_error" || error40.message?.includes("does not exist")) {
+                return formatted + "\n\nThe path does not exist. Use the listFiles tool to verify the correct directory structure before retrying. If the workspace itself is gone, output your final answer with whatever information you have.";
+              }
+              return formatted;
             }
           }
           try {
@@ -101838,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);
     }
   }
@@ -101868,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;
   }
@@ -101919,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);
     }
@@ -101929,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) {
@@ -102003,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-rc290",
+  "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/ProbeAgent.js

@@ -1444,11 +1444,13 @@ export class ProbeAgent {
         result = await this._executeWithVercelProvider(options, controller);
       }
 
-      // Wrap textStream so limiter slot is held until stream completes
+      // Wrap textStream so limiter slot is held until stream completes.
+      // result.textStream is a read-only getter on DefaultStreamTextResult,
+      // so we wrap the result in a Proxy that intercepts the textStream property.
       if (limiter && result.textStream) {
         const originalStream = result.textStream;
         const debug = this.debug;
-        result.textStream = (async function* () {
+        const wrappedStream = (async function* () {
           try {
             for await (const chunk of originalStream) {
               yield chunk;
@@ -1461,6 +1463,13 @@ export class ProbeAgent {
             }
           }
         })();
+        return new Proxy(result, {
+          get(target, prop) {
+            if (prop === 'textStream') return wrappedStream;
+            const value = target[prop];
+            return typeof value === 'function' ? value.bind(target) : value;
+          }
+        });
       } else if (limiter) {
         // No textStream (shouldn't happen, but release just in case)
         limiter.release(null);
@@ -3499,6 +3508,7 @@ Follow these instructions carefully:
                     return true;
                   }
                 }
+
               }
 
               return false;
@@ -3529,6 +3539,24 @@ Follow these instructions carefully:
                 }
               }
 
+              // Force text-only response after 3 consecutive tool errors
+              // (e.g. workspace deleted mid-run — let the model produce its answer)
+              if (steps.length >= 3) {
+                const last3 = steps.slice(-3);
+                const allErrors = last3.every(s =>
+                  s.toolResults?.length > 0 && s.toolResults.every(tr => {
+                    const r = typeof tr.result === 'string' ? tr.result : '';
+                    return r.includes('<error ') || r.includes('does not exist');
+                  })
+                );
+                if (allErrors) {
+                  if (this.debug) {
+                    console.log(`[DEBUG] prepareStep: 3 consecutive tool errors, forcing toolChoice=none`);
+                  }
+                  return { toolChoice: 'none' };
+                }
+              }
+
               const lastStep = steps[steps.length - 1];
               const modelJustStopped = lastStep?.finishReason === 'stop'
                 && (!lastStep?.toolCalls || lastStep.toolCalls.length === 0);
@@ -3565,7 +3593,8 @@ Here is the result to review:
 ${resultToReview}
 </result>
 
-Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix).`;
+IMPORTANT: First review ALL completed work in the conversation above before taking any action.
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If your text has inaccuracies, fix the text. Only call a tool if you find a genuinely MISSING action — NEVER redo work that was already completed successfully. Respond with the COMPLETE corrected answer.`;
 
                   return {
                     userMessage: completionPromptMessage,
@@ -3774,7 +3803,8 @@ Here is the result to review:
 ${finalResult}
 </result>
 
-Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix).`;
+IMPORTANT: First review ALL completed work in the conversation above before taking any action.
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is. If your text has inaccuracies, fix the text. Only call a tool if you find a genuinely MISSING action — NEVER redo work that was already completed successfully. Respond with the COMPLETE corrected answer.`;
 
             currentMessages.push({ role: 'user', content: completionPromptMessage });
 

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}"`);

package/src/tools/vercel.js

@@ -478,7 +478,11 @@ export const searchTool = (options = {}) => {
 					return result;
 				} catch (error) {
 					console.error('Error executing search command:', error);
-					return formatErrorForAI(error);
+					const formatted = formatErrorForAI(error);
+					if (error.category === 'path_error' || error.message?.includes('does not exist')) {
+						return formatted + '\n\nThe path does not exist. Use the listFiles tool to verify the correct directory structure before retrying. If the workspace itself is gone, output your final answer with whatever information you have.';
+					}
+					return formatted;
 				}
 			}
 

package/src/utils/error-types.js

@@ -181,14 +181,14 @@ export function categorizeError(error) {
       errorCode === 'enoent') {
     return new PathError(message, {
       originalError: error,
-      suggestion: 'The specified path does not exist. Please verify the path or use a different directory.'
+      suggestion: 'The specified path does not exist. Use the listFiles tool to check the correct directory structure, then retry with a valid path.'
     });
   }
 
   if (lowerMessage.includes('not a directory') || errorCode === 'enotdir') {
     return new PathError(message, {
       originalError: error,
-      suggestion: 'The path is not a directory. Please provide a valid directory path.'
+      suggestion: 'The path is not a directory. Use the listFiles tool to find the correct directory, then retry.'
     });
   }
 

package/src/utils/path-validation.js

@@ -110,7 +110,7 @@ export async function validateCwdPath(inputPath, defaultPath = process.cwd()) {
 		}
 		if (error.code === 'ENOENT') {
 			throw new PathError(`Path does not exist: ${normalizedPath}`, {
-				suggestion: 'The specified path does not exist. Please verify the path is correct or use a different directory.',
+				suggestion: 'The specified path does not exist. Use the listFiles tool to check the correct directory structure, then retry with a valid path.',
 				details: { path: normalizedPath }
 			});
 		}