@probelabs/probe 0.6.0-rc284 → 0.6.0-rc285

package/build/agent/schemaUtils.js

@@ -58,7 +58,7 @@ export function generateExampleFromSchema(schema, options = {}) {
 export function generateSchemaInstructions(schema, options = {}) {
   const { debug = false } = options;
 
-  let instructions = '\n\nIMPORTANT: When you provide your final answer using attempt_completion, you MUST format it as valid JSON matching this schema:\n\n';
+  let instructions = '\n\nIMPORTANT: When you provide your final answer, you MUST format it as valid JSON matching this schema:\n\n';
 
   try {
     const parsedSchema = typeof schema === 'string' ? JSON.parse(schema) : schema;
@@ -70,7 +70,7 @@ export function generateSchemaInstructions(schema, options = {}) {
     instructions += `${schema}\n\n`;
   }
 
-  instructions += 'Your response inside attempt_completion must be ONLY valid JSON - no plain text, no explanations, no markdown.\n\nIMPORTANT: First complete the requested analysis/task thoroughly, then provide your final answer in the JSON format above.';
+  instructions += 'Your final response must be ONLY valid JSON - no plain text, no explanations, no markdown.\n\nIMPORTANT: First complete the requested analysis/task thoroughly, then provide your final answer in the JSON format above.';
 
   return instructions;
 }
@@ -1167,22 +1167,22 @@ export function createJsonCorrectionPrompt(invalidResponse, schema, errorOrValid
   }
 
   // Create increasingly stronger prompts based on retry attempt
-  // These prompts explicitly instruct the AI to use attempt_completion with the JSON result
+  // These prompts instruct the AI to respond with valid JSON
   const strengthLevels = [
     {
       prefix: "CRITICAL JSON ERROR:",
-      instruction: "You MUST fix this and respond using attempt_completion with ONLY valid JSON as the result.",
-      emphasis: "Use attempt_completion with ONLY the corrected JSON in the result field. No explanatory text, no markdown, no code blocks."
+      instruction: "You MUST fix this and respond with ONLY valid JSON.",
+      emphasis: "Respond with ONLY the corrected JSON. No explanatory text, no markdown, no code blocks."
     },
     {
       prefix: "URGENT - JSON PARSING FAILED:",
-      instruction: "This is your second chance. Use attempt_completion with valid JSON that can be parsed by JSON.parse().",
-      emphasis: "ABSOLUTELY NO explanatory text or formatting. Use attempt_completion with ONLY raw JSON in the result."
+      instruction: "This is your second chance. Respond with valid JSON that can be parsed by JSON.parse().",
+      emphasis: "ABSOLUTELY NO explanatory text or formatting. Respond with ONLY raw JSON."
     },
     {
       prefix: "FINAL ATTEMPT - CRITICAL JSON ERROR:",
-      instruction: "This is the final retry. You MUST use attempt_completion with ONLY raw JSON in the result field.",
-      emphasis: "CORRECT: <attempt_completion><result>{\"key\": \"value\"}</result></attempt_completion>\nWRONG: Here is the JSON: {\"key\": \"value\"}\nWRONG: ```json{\"key\": \"value\"}```"
+      instruction: "This is the final retry. You MUST respond with ONLY raw JSON.",
+      emphasis: "CORRECT: {\"key\": \"value\"}\nWRONG: Here is the JSON: {\"key\": \"value\"}\nWRONG: ```json{\"key\": \"value\"}```"
     }
   ];
 
@@ -2081,8 +2081,7 @@ Provide only the corrected Mermaid diagram within a mermaid code block. Do not a
 
     try {
       // Don't pass schema to avoid infinite loop where AI returns raw mermaid code
-      // instead of using attempt_completion tool. The custom prompt already instructs
-      // to return only mermaid code blocks.
+      // instead of JSON. The custom prompt already instructs to return only mermaid code blocks.
       const result = await this.agent.answer(prompt, []);
 
       // Extract the mermaid code from the response

package/build/agent/shared/prompts.js

@@ -61,7 +61,7 @@ When reviewing code:
 
   'engineer': `You are a senior engineer focused on software architecture and design.
 Before jumping on the task you first analyse the user request in detail, and try to provide an elegant and concise solution.
-If the solution is clear, you can jump to implementation right away. If not, ask the user a clarification question by calling the attempt_completion tool with the required details.
+If the solution is clear, you can jump to implementation right away. If not, ask the user a clarification question with the required details.
 
 # Tone and Style
 - Be concise and direct. Explain your approach briefly before implementing, then let the code speak for itself.
@@ -84,7 +84,7 @@ If the solution is clear, you can jump to implementation right away. If not, ask
 When the request has **multiple distinct goals** (e.g. "Fix bug A AND add feature B"), use the task tool to track them:
 - Call the task tool with action="create" and a tasks array. Each task must have an "id" field.
 - Update task status to "in_progress" when starting and "completed" when done.
-- All tasks must be completed or cancelled before calling attempt_completion.
+- All tasks must be completed or cancelled before providing your final answer.
 - Stay flexible — add, remove, or reorganize tasks as your understanding changes.
 
 Do NOT create tasks for single-goal requests, even complex ones. Multiple internal steps for one goal (search, read, analyze, implement) do not need tasks.

package/build/agent/tasks/taskTool.js

@@ -69,13 +69,13 @@ Tasks = logical units of work, not files or steps.
 
 1. **Plan**: Call task tool with action="create" and a tasks array up front
 2. **Execute**: Update status to "in_progress" / "completed" as you work. Add, split, or cancel tasks as you learn more.
-3. **Finish**: All tasks must be "completed" or "cancelled" before calling attempt_completion.
+3. **Finish**: All tasks must be "completed" or "cancelled" before providing your final answer.
 
 ## Rules
 
 - Dependencies are enforced: a task cannot start until its dependencies are completed
 - Circular dependencies are rejected
-- attempt_completion is blocked while tasks remain unresolved
+- Completion is blocked while tasks remain unresolved
 `;
 
 /**
@@ -101,7 +101,7 @@ For each pending/in_progress task, either:
 - Complete it: call task tool with action="complete", id="task-X"
 - Cancel it: call task tool with action="update", id="task-X", status="cancelled"
 
-After all tasks are resolved, call attempt_completion again.`;
+After all tasks are resolved, provide your final answer.`;
 }
 
 /**

package/build/agent/tools.js

@@ -12,7 +12,6 @@ import {
   createTool,
   multiEditTool,
   DEFAULT_SYSTEM_MESSAGE,
-  attemptCompletionSchema,
   searchSchema,
   querySchema,
   extractSchema,
@@ -107,7 +106,6 @@ export {
   editSchema,
   createSchema,
   multiEditSchema,
-  attemptCompletionSchema,
   listFilesSchema,
   searchFilesSchema,
   readImageSchema,

package/build/index.js

@@ -28,7 +28,6 @@ import {
 	analyzeAllSchema,
 	executePlanSchema,
 	cleanupExecutePlanSchema,
-	attemptCompletionSchema,
 	bashSchema,
 	listFilesSchema,
 	searchFilesSchema,
@@ -105,7 +104,6 @@ export {
 	analyzeAllSchema,
 	executePlanSchema,
 	cleanupExecutePlanSchema,
-	attemptCompletionSchema,
 	bashSchema,
 	editSchema,
 	createSchema,

package/build/tools/analyzeAll.js

@@ -176,7 +176,7 @@ Instructions:
 - Format as a structured list if multiple items found
 - If nothing relevant is found in this chunk, respond with "No relevant items found in this chunk."
 - Do NOT summarize the code - extract the specific information requested
-- When done, use the attempt_completion tool with your answer as the result.`;
+- When done, provide your final answer directly.`;
 
 	try {
 		const result = await delegate({
@@ -269,7 +269,7 @@ async function aggregateResults(chunkResults, aggregation, extractionPrompt, opt
 		.map(r => `--- Chunk ${r.chunk.id} ---\n${stripResultTags(r.result)}`)
 		.join('\n\n');
 
-	const completionNote = `\n\nWhen done, use the attempt_completion tool with your answer as the result.`;
+	const completionNote = `\n\nWhen done, provide your final answer directly.`;
 
 	const aggregationPrompts = {
 		summarize: `Synthesize these analyses into a comprehensive summary. Combine related findings, remove redundancy, and present a coherent overview.
@@ -378,7 +378,7 @@ For example, if looking for customer data:
 STEP 3: CREATE THE FINAL PLAN
 Based on your experiments, output the BEST search strategy.
 
-Use attempt_completion with this EXACT format:
+Provide your answer in this EXACT format:
 
 SEARCH_QUERY: <the query that WORKED in your experiments - use OR for multiple terms>
 AGGREGATION: <summarize | list_unique | count | group_by>
@@ -458,7 +458,7 @@ Your answer should:
 
 Format your response as a well-structured document that fully answers: "${question}"
 
-When done, use the attempt_completion tool with your answer as the result.`;
+When done, provide your final answer directly.`;
 
 	try {
 		const result = await delegate({

package/build/tools/common.js

@@ -85,64 +85,14 @@ export const cleanupExecutePlanSchema = z.object({
 	clearSessionStore: z.boolean().optional().default(false).describe('Clear the session store (persisted data across execute_plan calls)')
 });
 
-// Schema for the attempt_completion tool - flexible validation for direct XML response
+// Legacy: attemptCompletionSchema kept as no-op for backward compatibility of external imports
+// The attempt_completion tool has been removed — the model now completes naturally via text.
 export const attemptCompletionSchema = {
-	// Custom validation that requires result parameter but allows direct XML response
 	safeParse: (params) => {
-		// Validate that params is an object
-		if (!params || typeof params !== 'object') {
-			return {
-				success: false,
-				error: {
-					issues: [{
-						code: 'invalid_type',
-						expected: 'object',
-						received: typeof params,
-						path: [],
-						message: 'Expected object'
-					}]
-				}
-			};
+		if (!params || typeof params !== 'object' || typeof params.result !== 'string') {
+			return { success: false, error: { issues: [{ code: 'invalid_type', path: ['result'], message: 'Deprecated' }] } };
 		}
-
-		// Validate that result parameter exists and is a string
-		if (!('result' in params)) {
-			return {
-				success: false,
-				error: {
-					issues: [{
-						code: 'invalid_type',
-						expected: 'string',
-						received: 'undefined',
-						path: ['result'],
-						message: 'Required'
-					}]
-				}
-			};
-		}
-
-		if (typeof params.result !== 'string') {
-			return {
-				success: false,
-				error: {
-					issues: [{
-						code: 'invalid_type',
-						expected: 'string',
-						received: typeof params.result,
-						path: ['result'],
-						message: 'Expected string'
-					}]
-				}
-			};
-		}
-
-		// Filter out command parameter if present (legacy compatibility)
-		const filteredData = { result: params.result };
-		
-		return {
-			success: true,
-			data: filteredData
-		};
+		return { success: true, data: { result: params.result } };
 	}
 };
 
@@ -188,6 +138,56 @@ export function createMessagePreview(message, charsPerSide = 200) {
 }
 
 
+/**
+ * Detect if a response indicates the agent is stuck in a loop or unable to proceed.
+ *
+ * @param {string} response - The agent's text response
+ * @returns {boolean} - True if the response indicates a stuck state
+ */
+export function detectStuckResponse(response) {
+	if (!response || typeof response !== 'string') {
+		return false;
+	}
+
+	const stuckPatterns = [
+		/\bi\s+cannot\s+proceed\b/i,
+		/\bi\s+can['']t\s+(?:proceed|continue|move\s+forward)\b/i,
+		/\bunable\s+to\s+(?:proceed|continue|complete)\b/i,
+		/\bblocked\b.*\b(?:proceed|continue)\b/i,
+		/\bneed\s+(?:the|an?)\s+\w+(?:\s+\w+)?\s+to\s+(?:proceed|continue)\b/i,
+		/\brequire[sd]?\s+(?:the|an?)\s+\w+\b.*\bto\s+(?:proceed|continue)\b/i,
+		/\bmissing\s+(?:required|necessary|essential)\b/i,
+		/\bdeadlock\b/i,
+		/\bwe\s+are\s+in\s+a\s+loop\b/i,
+		/\bstuck\s+in\s+a\s+loop\b/i,
+		/\bi\s+(?:have|['']ve)\s+(?:explained|stated|mentioned)\s+(?:this|the\s+situation|it)\s+(?:multiple|several)\s+times\b/i,
+		/\bi\s+(?:cannot|can['']t|could\s+not|couldn['']t)\s+(?:find|locate|get|retrieve|obtain)\s+(?:the|this|that|an?)\b/i,
+		/\bno\s+way\s+to\s+(?:find|get|obtain|retrieve)\b/i,
+		/\bi\s+(?:have|['']ve)\s+exhausted\s+(?:all|my)\s+(?:available\s+)?(?:options|methods|approaches)\b/i,
+		/\bneither\s+of\s+these\s+methods\b/i,
+	];
+
+	for (const pattern of stuckPatterns) {
+		if (pattern.test(response)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Check if two responses both indicate a stuck state.
+ *
+ * @param {string} response1 - First response
+ * @param {string} response2 - Second response
+ * @returns {boolean} - True if both responses indicate a stuck state
+ */
+export function areBothStuckResponses(response1, response2) {
+	return detectStuckResponse(response1) && detectStuckResponse(response2);
+}
+
+
 /**
  * Parse targets string into array of file specifications
  * Handles both space-separated and comma-separated targets for extract tool

package/build/tools/index.js

@@ -25,7 +25,6 @@ export {
 	cleanupExecutePlanSchema,
 	delegateDescription,
 	bashDescription,
-	attemptCompletionSchema,
 	parseAndResolvePaths,
 	resolveTargetPath,
 	listFilesSchema,

package/build/tools/vercel.js

@@ -396,7 +396,7 @@ export const searchTool = (options = {}) => {
 						if (debug) {
 							console.error(`[DEDUP] Blocked duplicate search: "${searchQuery}" (path: "${searchPath}")`);
 						}
-						return 'DUPLICATE SEARCH BLOCKED: You already searched for this exact query. Changing the path does NOT give different results — probe searches recursively. Do NOT repeat the same search. Try a genuinely different keyword, use extract to examine results you already found, or use attempt_completion if you have enough information.';
+						return 'DUPLICATE SEARCH BLOCKED: You already searched for this exact query. Changing the path does NOT give different results — probe searches recursively. Do NOT repeat the same search. Try a genuinely different keyword, use extract to examine results you already found, or provide your final answer if you have enough information.';
 					}
 					previousSearches.add(searchKey);
 					paginationCounts.set(searchKey, 0);
@@ -408,7 +408,7 @@ export const searchTool = (options = {}) => {
 						if (debug) {
 							console.error(`[DEDUP] Blocked excessive pagination (page ${pageCount}/${MAX_PAGES_PER_QUERY}): "${searchQuery}" in "${searchPath}"`);
 						}
-						return `PAGINATION LIMIT REACHED: You have already retrieved ${MAX_PAGES_PER_QUERY} pages of results for this query. You have enough results — use extract to examine specific files, or use attempt_completion to return your findings.`;
+						return `PAGINATION LIMIT REACHED: You have already retrieved ${MAX_PAGES_PER_QUERY} pages of results for this query. You have enough results — use extract to examine specific files, or provide your final answer with your findings.`;
 					}
 				}
 				try {
@@ -450,7 +450,7 @@ export const searchTool = (options = {}) => {
 					bashConfig: null,
 					architectureFileName: options.architectureFileName || null,
 					promptType: 'code-searcher',
-					allowedTools: ['search', 'extract', 'listFiles', 'attempt_completion'],
+					allowedTools: ['search', 'extract', 'listFiles'],
 					searchDelegate: false,
 					schema: CODE_SEARCH_SCHEMA,
 					parentAbortSignal: options.parentAbortSignal || null