@probelabs/probe 0.6.0-rc79 → 0.6.0-rc81

package/build/agent/ProbeAgent.js

@@ -254,21 +254,38 @@ ${attemptCompletionToolDefinition}
     let xmlToolGuidelines = `
 # Tool Use Formatting
 
-Tool use MUST be formatted using XML-style tags. The tool name is enclosed in opening and closing tags, and each parameter is similarly enclosed within its own set of tags. You MUST use exactly ONE tool call per message until you are ready to complete the task.
+Tool use MUST be formatted using XML-style tags. Each tool call requires BOTH opening and closing tags with the exact tool name. Each parameter is similarly enclosed within its own set of opening and closing tags. You MUST use exactly ONE tool call per message until you are ready to complete the task.
 
-Structure:
+**CRITICAL: Every XML tag MUST have both opening <tag> and closing </tag> parts.**
+
+Structure (note the closing tags):
 <tool_name>
 <parameter1_name>value1</parameter1_name>
 <parameter2_name>value2</parameter2_name>
 ...
 </tool_name>
 
-Example:
+Examples:
 <search>
 <query>error handling</query>
 <path>src/search</path>
 </search>
 
+<extract>
+<path>src/config.js</path>
+<start_line>15</start_line>
+<end_line>25</end_line>
+</extract>
+
+<attempt_completion>
+<result>The configuration is loaded from src/config.js lines 15-25 which contains the database settings.</result>
+</attempt_completion>
+
+# Special Case: Quick Completion
+If your previous response was already correct and complete, you may respond with just:
+<attempt_complete>
+This signals to use your previous response as the final answer without repeating content.
+
 # Thinking Process
 
 Before using a tool, analyze the situation within <thinking></thinking> tags. This helps you organize your thoughts and make better decisions.
@@ -283,12 +300,13 @@ I need to find code related to error handling in the search module. The most app
 1. Think step-by-step about how to achieve the user's goal.
 2. Use <thinking></thinking> tags to analyze the situation and determine the appropriate tool.
 3. Choose **one** tool that helps achieve the current step.
-4. Format the tool call using the specified XML format. Ensure all required parameters are included.
+4. Format the tool call using the specified XML format with BOTH opening and closing tags. Ensure all required parameters are included.
 5. **You MUST respond with exactly one tool call in the specified XML format in each turn.**
 6. Wait for the tool execution result, which will be provided in the next message (within a <tool_result> block).
 7. Analyze the tool result and decide the next step. If more tool calls are needed, repeat steps 2-6.
 8. If the task is fully complete and all previous steps were successful, use the \`<attempt_completion>\` tool to provide the final answer. This is the ONLY way to finish the task.
 9. If you cannot proceed (e.g., missing information, invalid request), explain the issue clearly before using \`<attempt_completion>\` with an appropriate message in the \`<result>\` tag.
+10. If your previous response was already correct and complete, you may use \`<attempt_complete>\` as a shorthand.
 
 Available Tools:
 - search: Search code using keyword queries.
@@ -298,6 +316,7 @@ Available Tools:
 - searchFiles: Find files matching a glob pattern with recursive search capability.
 ${this.allowEdit ? '- implement: Implement a feature or fix a bug using aider.\n' : ''}
 - attempt_completion: Finalize the task and provide the result to the user.
+- attempt_complete: Quick completion using previous response (shorthand).
 `;
 
     // Common instructions
@@ -618,13 +637,33 @@ When troubleshooting:
 
           if (toolName === 'attempt_completion') {
             completionAttempted = true;
-            const validation = attemptCompletionSchema.safeParse(params);
-            if (validation.success) {
-              finalResult = validation.data.result;
-              if (this.debug) console.log(`[DEBUG] Task completed successfully with result: ${finalResult.substring(0, 100)}...`);
+
+            // Handle attempt_complete shorthand - use previous response
+            if (params.result === '__PREVIOUS_RESPONSE__') {
+              // Find the last assistant message with actual content (not tool calls)
+              const lastAssistantMessage = [...currentMessages].reverse().find(msg =>
+                msg.role === 'assistant' &&
+                msg.content &&
+                !parseXmlToolCallWithThinking(msg.content, validTools)
+              );
+
+              if (lastAssistantMessage) {
+                finalResult = lastAssistantMessage.content;
+                if (this.debug) console.log(`[DEBUG] Using previous response as completion: ${finalResult.substring(0, 100)}...`);
+              } else {
+                finalResult = 'Error: No previous response found to use as completion.';
+                if (this.debug) console.log(`[DEBUG] No suitable previous response found for attempt_complete shorthand`);
+              }
             } else {
-              console.error(`[ERROR] Invalid attempt_completion parameters:`, validation.error);
-              finalResult = 'Error: Invalid completion attempt. The task could not be completed properly.';
+              // Standard attempt_completion handling
+              const validation = attemptCompletionSchema.safeParse(params);
+              if (validation.success) {
+                finalResult = validation.data.result;
+                if (this.debug) console.log(`[DEBUG] Task completed successfully with result: ${finalResult.substring(0, 100)}...`);
+              } else {
+                console.error(`[ERROR] Invalid attempt_completion parameters:`, validation.error);
+                finalResult = 'Error: Invalid completion attempt. The task could not be completed properly.';
+              }
             }
             break;
           } else {
@@ -738,9 +777,45 @@ When troubleshooting:
         } else {
           // No tool call found, add assistant response and ask for tool usage
           currentMessages.push({ role: 'assistant', content: assistantResponseContent });
+
+          // Build appropriate reminder message based on whether schema is provided
+          let reminderContent;
+          if (options.schema) {  // Apply for ANY schema, not just JSON schemas
+            // When schema is provided, give specific instructions
+            reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
+
+Remember: Use proper XML format with BOTH opening and closing tags:
+
+<tool_name>
+<parameter>value</parameter>
+</tool_name>
+
+IMPORTANT: A schema was provided. You MUST respond with data that matches this schema.
+Use attempt_completion with your response directly inside the tags:
+
+<attempt_completion>
+{"key": "value", "field": "your actual data here matching the schema"}
+</attempt_completion>
+
+Your response must conform to this schema:
+${options.schema}`;
+          } else {
+            // Standard reminder without schema
+            reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
+
+Remember: Use proper XML format with BOTH opening and closing tags:
+
+<tool_name>
+<parameter>value</parameter>
+</tool_name>
+
+Or for quick completion if your previous response was already correct:
+<attempt_complete>`;
+          }
+
           currentMessages.push({
             role: 'user',
-            content: 'Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.'
+            content: reminderContent
           });
           if (this.debug) {
             console.log(`[DEBUG] No tool call detected in assistant response. Prompting for tool use.`);

package/build/agent/index.js

@@ -1440,11 +1440,24 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       "recursive",
       "includeHidden",
       "max_results",
+      "maxResults",
       "result",
       "command",
       "description",
       "task",
-      "param"
+      "param",
+      "pattern",
+      "allow_tests",
+      "exact",
+      "maxTokens",
+      "language",
+      "input_content",
+      "context_lines",
+      "format",
+      "directory",
+      "autoCommits",
+      "files",
+      "targets"
     ];
     for (const paramName of commonParams) {
       const paramOpenTag = `<${paramName}>`;
@@ -1474,23 +1487,7 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       params[paramName] = paramValue;
     }
     if (toolName === "attempt_completion") {
-      const resultOpenTag = "<result>";
-      const resultCloseTag = "</result>";
-      const resultOpenIndex = innerContent.indexOf(resultOpenTag);
-      if (resultOpenIndex !== -1) {
-        const resultCloseIndex = innerContent.indexOf(resultCloseTag, resultOpenIndex + resultOpenTag.length);
-        if (resultCloseIndex !== -1) {
-          params["result"] = innerContent.substring(
-            resultOpenIndex + resultOpenTag.length,
-            resultCloseIndex
-          ).trim();
-        }
-      } else {
-        const paramsCount = Object.keys(params).filter((key) => key !== "command").length;
-        if (paramsCount === 0) {
-          params["result"] = innerContent.trim();
-        }
-      }
+      params["result"] = innerContent.trim();
       if (params.command) {
         delete params.command;
       }
@@ -1534,7 +1531,7 @@ var init_common = __esm({
       allow_tests: z.boolean().optional().default(false).describe("Allow test files in search results")
     });
     extractSchema = z.object({
-      file_path: z.string().optional().describe("Path to the file to extract from. Can include line numbers or symbol names"),
+      targets: z.string().optional().describe("File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets"),
       input_content: z.string().optional().describe("Text content to extract file paths from"),
       line: z.number().optional().describe("Start line number to extract a specific code block"),
       end_line: z.number().optional().describe("End line number for extracting a range of lines"),
@@ -1602,6 +1599,12 @@ var init_common = __esm({
 Description: Search code in the repository using Elasticsearch query syntax (except field based queries, e.g. "filename:..." NOT supported).
 
 You need to focus on main keywords when constructing the query, and always use elastic search syntax like OR AND and brackets to group keywords.
+
+**Session Management & Caching:**
+- Ensure not to re-read the same symbols twice - reuse context from previous tool calls
+- Probe returns a session ID on first run - reuse it for subsequent calls to avoid redundant searches
+- Once data is returned, it's cached and won't return on next runs (this is expected behavior)
+
 Parameters:
 - query: (required) Search query with Elasticsearch syntax. You can use + for important terms, and - for negation.
 - path: (required) Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc. YOU SHOULD ALWAYS provide FULL PATH when searching dependencies, including depency name.
@@ -1611,11 +1614,22 @@ Parameters:
 - maxTokens: (optional, default: 10000) Maximum number of tokens to return (number).
 - language: (optional) Limit search to files of a specific programming language (e.g., 'rust', 'js', 'python', 'go' etc.).
 
+**Workflow:** Always start with search, then use extract for detailed context when needed.
 
 Usage Example:
 
 <examples>
 
+User: Where is the login logic?
+Assistant workflow:
+1. <search>
+<query>login AND auth AND token</query>
+<path>.</path>
+</search>
+2. Now lets look closer: <extract>
+<targets>session.rs#AuthService.login auth.rs:2-100</targets>
+</extract>
+
 User: How to calculate the total amount in the payments module?
 <search>
 <query>calculate AND payment</query>
@@ -1639,7 +1653,6 @@ User: Find all react imports in the project.
 <language>js</language>
 </search>
 
-
 User: Find how decompoud library works?
 <search>
 <query>import { react }</query>
@@ -1671,11 +1684,16 @@ Usage Example:
 `;
     extractToolDefinition = `
 ## extract
-Description: Extract code blocks from files based on file paths and optional line numbers. Use this tool to see complete context after finding relevant files. It can be used to read full files as well. 
+Description: Extract code blocks from files based on file paths and optional line numbers. Use this tool to see complete context after finding relevant files. It can be used to read full files as well.
 Full file extraction should be the LAST RESORT! Always prefer search.
 
+**Multiple Extraction:** You can extract multiple symbols/files in one call by providing multiple file paths separated by spaces.
+
+**Session Awareness:** Reuse context from previous tool calls. Don't re-extract the same symbols you already have.
+
 Parameters:
-- file_path: (required) Path to the file to extract from. Can include line numbers or symbol names (e.g., 'src/main.rs:10-20', 'src/utils.js#myFunction').
+- targets: (required) File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets (e.g., 'src/main.rs:10-20', 'src/utils.js#myFunction').
+  For multiple extractions: 'session.rs#AuthService.login auth.rs:2-100 config.rs#DatabaseConfig'
 - line: (optional) Start line number to extract a specific code block. Use with end_line for ranges.
 - end_line: (optional) End line number for extracting a range of lines.
 - allow_tests: (optional, default: false) Allow test files and test code blocks (true/false).
@@ -1683,42 +1701,46 @@ Usage Example:
 
 <examples>
 
+User: Where is the login logic? (After search found relevant files)
+<extract>
+<targets>session.rs#AuthService.login auth.rs:2-100 config.rs#DatabaseConfig</targets>
+</extract>
+
+User: How does error handling work? (After search identified files)
+<extract>
+<targets>error.rs#ErrorType utils.rs#handle_error src/main.rs:50-80</targets>
+</extract>
+
 User: How RankManager works
 <extract>
-<file_path>src/search/ranking.rs#RankManager</file_path>
+<targets>src/search/ranking.rs#RankManager</targets>
 </extract>
 
 User: Lets read the whole file
 <extract>
-<file_path>src/search/ranking.rs</file_path>
+<targets>src/search/ranking.rs</targets>
 </extract>
 
 User: Read the first 10 lines of the file
 <extract>
-<file_path>src/search/ranking.rs</file_path>
+<targets>src/search/ranking.rs</targets>
 <line>1</line>
 <end_line>10</end_line>
 </extract>
 
 User: Read file inside the dependency
 <extract>
-<file_path>/dep/go/github.com/gorilla/mux/router.go</file_path>
+<targets>/dep/go/github.com/gorilla/mux/router.go</targets>
 </extract>
 
-
 </examples>
 `;
     attemptCompletionToolDefinition = `
 ## attempt_completion
 Description: Use this tool ONLY when the task is fully complete and you have received confirmation of success for all previous tool uses. Presents the final result to the user. You can provide your response directly inside the XML tags without any parameter wrapper.
 Parameters:
-- No validation required - provide your complete answer directly inside the XML tags or use the <result> parameter (both formats supported).
-Usage Examples:
-<attempt_completion>
-<result>I have refactored the search module according to the requirements and verified the tests pass. The module now uses the new BM25 ranking algorithm and has improved error handling.</result>
-</attempt_completion>
-
-Or direct response:
+- No validation required - provide your complete answer directly inside the XML tags.
+Usage Example:
 <attempt_completion>
 I have refactored the search module according to the requirements and verified the tests pass. The module now uses the new BM25 ranking algorithm and has improved error handling.
 </attempt_completion>
@@ -2020,7 +2042,7 @@ var init_vercel = __esm({
         name: "extract",
         description: extractDescription,
         parameters: extractSchema,
-        execute: async ({ file_path, input_content, line, end_line, allow_tests, context_lines, format }) => {
+        execute: async ({ targets, input_content, line, end_line, allow_tests, context_lines, format }) => {
           try {
             let extractPath = options.defaultPath || ".";
             if ((extractPath === "." || extractPath === "./") && options.defaultPath) {
@@ -2030,8 +2052,8 @@ var init_vercel = __esm({
               extractPath = options.defaultPath;
             }
             if (debug) {
-              if (file_path) {
-                console.error(`Executing extract with file: "${file_path}", path: "${extractPath}", context lines: ${context_lines || 10}`);
+              if (targets) {
+                console.error(`Executing extract with targets: "${targets}", path: "${extractPath}", context lines: ${context_lines || 10}`);
               } else if (input_content) {
                 console.error(`Executing extract with input content, path: "${extractPath}", context lines: ${context_lines || 10}`);
               }
@@ -2058,8 +2080,8 @@ var init_vercel = __esm({
                 contextLines: context_lines,
                 format: effectiveFormat
               };
-            } else if (file_path) {
-              const files = [file_path];
+            } else if (targets) {
+              const files = [targets];
               let effectiveFormat = format;
               if (outline && format === "outline-xml") {
                 effectiveFormat = "xml";
@@ -2071,7 +2093,7 @@ var init_vercel = __esm({
                 format: effectiveFormat
               };
             } else {
-              throw new Error("Either file_path or input_content must be provided");
+              throw new Error("Either targets or input_content must be provided");
             }
             const results = await extract(extractOptions);
             if (tempFilePath) {
@@ -2595,7 +2617,14 @@ function createTools(configOptions) {
 function parseXmlToolCallWithThinking(xmlString, validTools) {
   const thinkingMatch = xmlString.match(/<thinking>([\s\S]*?)<\/thinking>/);
   const thinkingContent = thinkingMatch ? thinkingMatch[1].trim() : null;
-  const cleanedXmlString = xmlString.replace(/<thinking>[\s\S]*?<\/thinking>/g, "").trim();
+  let cleanedXmlString = xmlString.replace(/<thinking>[\s\S]*?<\/thinking>/g, "").trim();
+  const attemptCompleteMatch = cleanedXmlString.match(/^<attempt_complete>\s*$/);
+  if (attemptCompleteMatch) {
+    return {
+      toolName: "attempt_completion",
+      params: { result: "__PREVIOUS_RESPONSE__" }
+    };
+  }
   const parsedTool = parseXmlToolCall(cleanedXmlString, validTools);
   if (process.env.DEBUG === "1" && thinkingContent) {
     console.log(`[DEBUG] AI Thinking Process:
@@ -3939,21 +3968,38 @@ ${attemptCompletionToolDefinition}
         let xmlToolGuidelines = `
 # Tool Use Formatting
 
-Tool use MUST be formatted using XML-style tags. The tool name is enclosed in opening and closing tags, and each parameter is similarly enclosed within its own set of tags. You MUST use exactly ONE tool call per message until you are ready to complete the task.
+Tool use MUST be formatted using XML-style tags. Each tool call requires BOTH opening and closing tags with the exact tool name. Each parameter is similarly enclosed within its own set of opening and closing tags. You MUST use exactly ONE tool call per message until you are ready to complete the task.
+
+**CRITICAL: Every XML tag MUST have both opening <tag> and closing </tag> parts.**
 
-Structure:
+Structure (note the closing tags):
 <tool_name>
 <parameter1_name>value1</parameter1_name>
 <parameter2_name>value2</parameter2_name>
 ...
 </tool_name>
 
-Example:
+Examples:
 <search>
 <query>error handling</query>
 <path>src/search</path>
 </search>
 
+<extract>
+<path>src/config.js</path>
+<start_line>15</start_line>
+<end_line>25</end_line>
+</extract>
+
+<attempt_completion>
+<result>The configuration is loaded from src/config.js lines 15-25 which contains the database settings.</result>
+</attempt_completion>
+
+# Special Case: Quick Completion
+If your previous response was already correct and complete, you may respond with just:
+<attempt_complete>
+This signals to use your previous response as the final answer without repeating content.
+
 # Thinking Process
 
 Before using a tool, analyze the situation within <thinking></thinking> tags. This helps you organize your thoughts and make better decisions.
@@ -3968,12 +4014,13 @@ I need to find code related to error handling in the search module. The most app
 1. Think step-by-step about how to achieve the user's goal.
 2. Use <thinking></thinking> tags to analyze the situation and determine the appropriate tool.
 3. Choose **one** tool that helps achieve the current step.
-4. Format the tool call using the specified XML format. Ensure all required parameters are included.
+4. Format the tool call using the specified XML format with BOTH opening and closing tags. Ensure all required parameters are included.
 5. **You MUST respond with exactly one tool call in the specified XML format in each turn.**
 6. Wait for the tool execution result, which will be provided in the next message (within a <tool_result> block).
 7. Analyze the tool result and decide the next step. If more tool calls are needed, repeat steps 2-6.
 8. If the task is fully complete and all previous steps were successful, use the \`<attempt_completion>\` tool to provide the final answer. This is the ONLY way to finish the task.
 9. If you cannot proceed (e.g., missing information, invalid request), explain the issue clearly before using \`<attempt_completion>\` with an appropriate message in the \`<result>\` tag.
+10. If your previous response was already correct and complete, you may use \`<attempt_complete>\` as a shorthand.
 
 Available Tools:
 - search: Search code using keyword queries.
@@ -3983,6 +4030,7 @@ Available Tools:
 - searchFiles: Find files matching a glob pattern with recursive search capability.
 ${this.allowEdit ? "- implement: Implement a feature or fix a bug using aider.\n" : ""}
 - attempt_completion: Finalize the task and provide the result to the user.
+- attempt_complete: Quick completion using previous response (shorthand).
 `;
         const commonInstructions = `<instructions>
 Follow these instructions carefully:
@@ -4259,13 +4307,26 @@ You are working with a repository located at: ${searchDirectory}
               if (this.debug) console.log(`[DEBUG] Parsed tool call: ${toolName} with params:`, params);
               if (toolName === "attempt_completion") {
                 completionAttempted = true;
-                const validation = attemptCompletionSchema.safeParse(params);
-                if (validation.success) {
-                  finalResult = validation.data.result;
-                  if (this.debug) console.log(`[DEBUG] Task completed successfully with result: ${finalResult.substring(0, 100)}...`);
+                if (params.result === "__PREVIOUS_RESPONSE__") {
+                  const lastAssistantMessage = [...currentMessages].reverse().find(
+                    (msg) => msg.role === "assistant" && msg.content && !parseXmlToolCallWithThinking(msg.content, validTools)
+                  );
+                  if (lastAssistantMessage) {
+                    finalResult = lastAssistantMessage.content;
+                    if (this.debug) console.log(`[DEBUG] Using previous response as completion: ${finalResult.substring(0, 100)}...`);
+                  } else {
+                    finalResult = "Error: No previous response found to use as completion.";
+                    if (this.debug) console.log(`[DEBUG] No suitable previous response found for attempt_complete shorthand`);
+                  }
                 } else {
-                  console.error(`[ERROR] Invalid attempt_completion parameters:`, validation.error);
-                  finalResult = "Error: Invalid completion attempt. The task could not be completed properly.";
+                  const validation = attemptCompletionSchema.safeParse(params);
+                  if (validation.success) {
+                    finalResult = validation.data.result;
+                    if (this.debug) console.log(`[DEBUG] Task completed successfully with result: ${finalResult.substring(0, 100)}...`);
+                  } else {
+                    console.error(`[ERROR] Invalid attempt_completion parameters:`, validation.error);
+                    finalResult = "Error: Invalid completion attempt. The task could not be completed properly.";
+                  }
                 }
                 break;
               } else {
@@ -4363,9 +4424,40 @@ Error: Unknown tool '${toolName}'. Available tools: ${Object.keys(this.toolImple
               }
             } else {
               currentMessages.push({ role: "assistant", content: assistantResponseContent });
+              let reminderContent;
+              if (options.schema) {
+                reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
+
+Remember: Use proper XML format with BOTH opening and closing tags:
+
+<tool_name>
+<parameter>value</parameter>
+</tool_name>
+
+IMPORTANT: A schema was provided. You MUST respond with data that matches this schema.
+Use attempt_completion with your response directly inside the tags:
+
+<attempt_completion>
+{"key": "value", "field": "your actual data here matching the schema"}
+</attempt_completion>
+
+Your response must conform to this schema:
+${options.schema}`;
+              } else {
+                reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
+
+Remember: Use proper XML format with BOTH opening and closing tags:
+
+<tool_name>
+<parameter>value</parameter>
+</tool_name>
+
+Or for quick completion if your previous response was already correct:
+<attempt_complete>`;
+              }
               currentMessages.push({
                 role: "user",
-                content: "Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer."
+                content: reminderContent
               });
               if (this.debug) {
                 console.log(`[DEBUG] No tool call detected in assistant response. Prompting for tool use.`);

package/build/agent/tools.js

@@ -126,7 +126,7 @@ User: Find all markdown files in the docs directory, but only at the top level.
 `;
 
 /**
- * Enhanced XML parser that handles thinking tags
+ * Enhanced XML parser that handles thinking tags and attempt_complete shorthand
  * This function removes any <thinking></thinking> tags from the input string
  * before passing it to the original parseXmlToolCall function
  * @param {string} xmlString - The XML string to parse
@@ -139,7 +139,17 @@ export function parseXmlToolCallWithThinking(xmlString, validTools) {
   const thinkingContent = thinkingMatch ? thinkingMatch[1].trim() : null;
 
   // Remove thinking tags and their content from the XML string
-  const cleanedXmlString = xmlString.replace(/<thinking>[\s\S]*?<\/thinking>/g, '').trim();
+  let cleanedXmlString = xmlString.replace(/<thinking>[\s\S]*?<\/thinking>/g, '').trim();
+
+  // Check for attempt_complete shorthand (single tag with no closing tag and no parameters)
+  const attemptCompleteMatch = cleanedXmlString.match(/^<attempt_complete>\s*$/);
+  if (attemptCompleteMatch) {
+    // Convert shorthand to full attempt_completion format with special marker
+    return {
+      toolName: 'attempt_completion',
+      params: { result: '__PREVIOUS_RESPONSE__' }
+    };
+  }
 
   // Use the original parseXmlToolCall function to parse the cleaned XML string
   const parsedTool = parseXmlToolCall(cleanedXmlString, validTools);