sam-coder-cli 1.0.60 → 1.0.61

package/bin/agi-cli.js

@@ -757,6 +757,27 @@ function normalizeToolCallsFromMessage(message) {
   return message;
 }
 
+// Ask the model to produce a structured follow-up with thinking and either tool_calls or JSON action
+async function requestStructuredFollowup(messages, currentModel, preferTools = true) {
+  const instruction = preferTools
+    ? 'Think step-by-step inside <think></think>. Then, if any tools are needed, call them via tool_calls. If no tools are required, output a single markdown ```json code block with an action object (type, data, reasoning) per the schema. Do not include any other text.'
+    : 'Think step-by-step inside <think></think>, then output a single markdown ```json code block with an action object (type, data, reasoning) per the schema. Do not include any other text.';
+
+  const followupUser = { role: 'user', content: instruction };
+  const followupMessages = [...messages, followupUser];
+  const responseObj = await callOpenRouter(followupMessages, currentModel, !preferTools);
+  const assistantMessage = responseObj.choices[0].message;
+  if (assistantMessage && typeof assistantMessage.content === 'string') {
+    const { thought, content } = splitThinking(assistantMessage.content);
+    if (thought && SHOW_THOUGHTS) {
+      ui.showInfo(`Thinking:\n${thought}`);
+    }
+    assistantMessage.content = content;
+  }
+  normalizeToolCallsFromMessage(assistantMessage);
+  return { assistantMessage, updatedMessages: [...followupMessages, assistantMessage] };
+}
+
 // Call OpenRouter API with tool calling
 async function callOpenRouter(messages, currentModel, useJson = false) {
   const apiKey = OPENROUTER_API_KEY;
@@ -879,6 +900,57 @@ async function processQueryWithTools(query, conversation = [], currentModel) {
           // If fallback execution fails, just return original assistant content
         }
       }
+      // Final attempt: request a structured follow-up that includes thinking and tool calls
+      try {
+        ui.startThinking();
+        const { assistantMessage: structuredMsg, updatedMessages } = await requestStructuredFollowup(messages, currentModel, true);
+        messages.length = 0; updatedMessages.forEach(m => messages.push(m));
+
+        // If tool calls present now, execute them
+        if (structuredMsg.tool_calls && structuredMsg.tool_calls.length) {
+          const toolResults2 = await handleToolCalls(structuredMsg.tool_calls, messages);
+          messages.push(...toolResults2);
+          const finalResponseObj2 = await callOpenRouter(messages, currentModel);
+          const finalAssistantMessage2 = finalResponseObj2.choices[0].message;
+          if (finalAssistantMessage2 && typeof finalAssistantMessage2.content === 'string') {
+            const { thought, content } = splitThinking(finalAssistantMessage2.content);
+            if (thought && SHOW_THOUGHTS) ui.showInfo(`Thinking:\n${thought}`);
+            finalAssistantMessage2.content = content;
+          }
+          messages.push(finalAssistantMessage2);
+          ui.stopThinking();
+          return { response: finalAssistantMessage2.content, conversation: messages };
+        }
+
+        // Else try JSON action again from the structured response
+        const structuredAction = extractJsonFromMarkdown(structuredMsg.content);
+        if (structuredAction && structuredAction.type) {
+          try {
+            const result2 = await executeAction(structuredAction);
+            messages.push({ role: 'user', content: `Action result (${structuredAction.type}): ${result2}` });
+            const finalResponseObj3 = await callOpenRouter(messages, currentModel);
+            const finalAssistantMessage3 = finalResponseObj3.choices[0].message;
+            if (finalAssistantMessage3 && typeof finalAssistantMessage3.content === 'string') {
+              const { thought, content } = splitThinking(finalAssistantMessage3.content);
+              if (thought && SHOW_THOUGHTS) ui.showInfo(`Thinking:\n${thought}`);
+              finalAssistantMessage3.content = content;
+            }
+            messages.push(finalAssistantMessage3);
+            ui.stopThinking();
+            return { response: finalAssistantMessage3.content, conversation: messages };
+          } catch (_) {
+            ui.stopThinking();
+          }
+        }
+
+        ui.stopThinking();
+        return {
+          response: structuredMsg.content,
+          conversation: messages
+        };
+      } catch (_) {
+        // ignore and fall back to original assistant message
+      }
       ui.stopThinking();
       return {
         response: assistantMessage.content,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sam-coder-cli",
-  "version": "1.0.60",
+  "version": "1.0.61",
   "description": "SAM-CODER: An animated command-line AI assistant with agency capabilities.",
   "main": "bin/agi-cli.js",
   "bin": {