sam-coder-cli 1.0.4 → 1.0.5

package/bin/agi-cli.js

@@ -508,12 +508,10 @@ async function handleToolCalls(toolCalls, messages) {
 }
 
 // Process a query with tool calling
-async function processQueryWithTools(query, conversation = [], maxIterations = 5) {
+async function processQueryWithTools(query, conversation = []) {
   // Add user message to conversation
   const userMessage = { role: 'user', content: query };
-  let messages = [...conversation, userMessage];
-  let iteration = 0;
-  let finalResponse = null;
+  const messages = [...conversation, userMessage];
 
   // Add system message if this is the first message
   if (conversation.length === 0) {
@@ -526,54 +524,50 @@ If a tool fails, you can try again with different parameters or a different appr
     });
   }
 
-  // Process in a loop to handle multiple tool calls
-  while (iteration < maxIterations) {
-    ui.startThinking();
-    
-    try {
-      const response = await callOpenRouterWithTools(messages);
-      const assistantMessage = response.choices[0].message;
-      messages.push(assistantMessage);
-      
-      // If there are no tool calls, we're done
-      if (!assistantMessage.tool_calls || assistantMessage.tool_calls.length === 0) {
-        ui.stopThinking();
-        finalResponse = assistantMessage.content || 'No content in response';
-        break;
-      }
-      
-      // Process tool calls
-      console.log(`🛠️  Executing ${assistantMessage.tool_calls.length} tools...`);
-      const toolResults = await handleToolCalls(assistantMessage.tool_calls, messages);
-      
-      // Add tool results to messages
-      messages = [...messages, ...toolResults];
-      
-      // If we've reached max iterations, get a final response
-      if (iteration === maxIterations - 1) {
-        console.log('ℹ️  Reached maximum number of iterations. Getting final response...');
-        const finalResponseObj = await callOpenRouterWithTools(messages);
-        finalResponse = finalResponseObj.choices[0].message.content || 'No content in final response';
-      }
-      
-      iteration++;
-    } catch (error) {
+  ui.startThinking();
+
+  try {
+    const response = await callOpenRouterWithTools(messages);
+    const assistantMessage = response.choices[0].message;
+    messages.push(assistantMessage);
+
+    // If there are no tool calls, we're done
+    if (!assistantMessage.tool_calls || assistantMessage.tool_calls.length === 0) {
       ui.stopThinking();
-      console.error('❌ Error during processing:', error);
-      finalResponse = `An error occurred: ${error.message}`;
-      break;
+      return {
+        response: assistantMessage.content || 'No content in response',
+        conversation: messages
+      };
     }
+
+    // Process tool calls
+    ui.stopThinking(); // Stop thinking while tools execute
+    console.log(`🛠️  Executing ${assistantMessage.tool_calls.length} tools...`);
+    const toolResults = await handleToolCalls(assistantMessage.tool_calls, messages);
+
+    // Add tool results to messages
+    messages.push(...toolResults);
+
+    // Now, get the AI's response to the tool results
+    ui.startThinking();
+    const finalResponseObj = await callOpenRouterWithTools(messages);
+    const finalAssistantMessage = finalResponseObj.choices[0].message;
+    messages.push(finalAssistantMessage);
+    ui.stopThinking();
+
+    return {
+      response: finalAssistantMessage.content || 'Actions executed. What is the next step?',
+      conversation: messages
+    };
+
+  } catch (error) {
+    ui.stopThinking();
+    console.error('❌ Error during processing:', error);
+    return {
+      response: `An error occurred: ${error.message}`,
+      conversation: messages
+    };
   }
-  
-  // If we don't have a final response yet (shouldn't happen, but just in case)
-  if (!finalResponse) {
-    finalResponse = 'No response generated. The operation may have timed out or encountered an error.';
-  }
-  
-  return {
-    response: finalResponse,
-    conversation: messages
-  };
 }
 
 // Execute a single action from the action system

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "sam-coder-cli",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "SAM-CODER: An animated command-line AI assistant with agency capabilities.",
   "main": "bin/agi-cli.js",
   "bin": {
-    "sam-coder": "./bin/agi-cli.js"
+    "sam-coder": "bin/agi-cli.js"
   },
   "scripts": {
     "start": "node ./bin/agi-cli.js"