sam-coder-cli 1.0.61 → 1.0.63

package/bin/agi-cli.js

@@ -557,7 +557,6 @@ const agentUtils = {
 // Extract JSON from markdown code blocks
 function extractJsonFromMarkdown(text) {
   if (!text || typeof text !== 'string') {
-    console.error('Invalid input to extractJsonFromMarkdown:', typeof text);
     return null;
   }
 
@@ -569,13 +568,11 @@ function extractJsonFromMarkdown(text) {
     try {
       const jsonStr = match[1].trim();
       if (!jsonStr) {
-        console.error('Empty JSON content in markdown block');
         return null;
       }
       return JSON.parse(jsonStr);
     } catch (error) {
-      console.error('Error parsing JSON from markdown block:', error.message);
-      console.error('JSON content was:', match[1]);
+      // ignore
     }
   }
   
@@ -615,8 +612,6 @@ function extractJsonFromMarkdown(text) {
     // Last resort failed
   }
   
-  console.error('Failed to extract valid JSON from response');
-  console.error('Response text was:', text);
   return null;
 }
 
@@ -757,25 +752,63 @@ 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}`);
+// Parse segmented format like <|start|>channel<|message|>...<|end|>
+function parseSegmentedTranscript(text) {
+  if (!text || typeof text !== 'string') {
+    return { content: text || '', thought: '', recoveredToolCalls: null };
+  }
+
+  const blockRegex = /\<\|start\|>([^<|]+)\<\|message\|>([\s\S]*?)\<\|end\|>/gi;
+  let match;
+  let visibleParts = [];
+  let thoughts = [];
+  let commentaryParts = [];
+
+  while ((match = blockRegex.exec(text)) !== null) {
+    const rawRole = (match[1] || '').trim().toLowerCase();
+    const body = (match[2] || '').trim();
+    if (!rawRole) continue;
+
+    if (rawRole === 'analysis') {
+      thoughts.push(body);
+    } else if (rawRole === 'commentary') {
+      commentaryParts.push(body);
+    } else if (rawRole === 'final' || rawRole === 'assistant' || rawRole === 'user' || rawRole === 'system' || rawRole === 'developer') {
+      // Prefer 'final' or 'assistant' as visible, but include others to preserve content order
+      visibleParts.push(body);
+    } else {
+      // Unknown channel: treat as visible content
+      visibleParts.push(body);
     }
-    assistantMessage.content = content;
   }
-  normalizeToolCallsFromMessage(assistantMessage);
-  return { assistantMessage, updatedMessages: [...followupMessages, assistantMessage] };
+
+  // If no blocks matched, return original
+  if (visibleParts.length === 0 && thoughts.length === 0 && commentaryParts.length === 0) {
+    return { content: text, thought: '', recoveredToolCalls: null };
+  }
+
+  // Look for a Reasoning: level outside blocks as a hint
+  const reasoningMatch = text.match(/Reasoning:\s*(high|medium|low)/i);
+  if (reasoningMatch) {
+    thoughts.unshift(`Reasoning level: ${reasoningMatch[1]}`);
+  }
+
+  // Recover tool calls from commentary channels
+  let recoveredToolCalls = null;
+  if (commentaryParts.length) {
+    for (const part of commentaryParts) {
+      const found = parseInlineToolCalls(part);
+      if (found && found.length) {
+        recoveredToolCalls = (recoveredToolCalls || []).concat(found);
+      }
+    }
+  }
+
+  return {
+    content: visibleParts.join('\n\n').trim(),
+    thought: thoughts.join('\n\n').trim(),
+    recoveredToolCalls: recoveredToolCalls && recoveredToolCalls.length ? recoveredToolCalls : null
+  };
 }
 
 // Call OpenRouter API with tool calling
@@ -836,9 +869,20 @@ async function processQueryWithTools(query, conversation = [], currentModel) {
     const assistantMessage = response.choices[0].message;
     // Handle thinking tags and optionally display them
     if (assistantMessage && typeof assistantMessage.content === 'string') {
-      const { thought, content } = splitThinking(assistantMessage.content);
+      // First handle segmented transcripts, then fallback to <think>
+      const segmented = parseSegmentedTranscript(assistantMessage.content);
+      let thought = segmented.thought;
+      let content = segmented.content;
+      if (!segmented.thought && !segmented.recoveredToolCalls) {
+        const thinkSplit = splitThinking(assistantMessage.content);
+        thought = thought || thinkSplit.thought;
+        content = content || thinkSplit.content;
+      }
+      if (segmented.recoveredToolCalls && (!assistantMessage.tool_calls)) {
+        assistantMessage.tool_calls = segmented.recoveredToolCalls;
+      }
       if (thought && SHOW_THOUGHTS) {
-        ui.showInfo(`Thinking:\n${thought}`);
+        ui.showThought(thought);
       }
       assistantMessage.content = content;
     }
@@ -860,9 +904,16 @@ async function processQueryWithTools(query, conversation = [], currentModel) {
       const finalResponseObj = await callOpenRouter(messages, currentModel);
       const finalAssistantMessage = finalResponseObj.choices[0].message;
       if (finalAssistantMessage && typeof finalAssistantMessage.content === 'string') {
-        const { thought, content } = splitThinking(finalAssistantMessage.content);
+        const segmented = parseSegmentedTranscript(finalAssistantMessage.content);
+        let thought = segmented.thought;
+        let content = segmented.content;
+        if (!segmented.thought && !segmented.recoveredToolCalls) {
+          const thinkSplit = splitThinking(finalAssistantMessage.content);
+          thought = thought || thinkSplit.thought;
+          content = content || thinkSplit.content;
+        }
         if (thought && SHOW_THOUGHTS) {
-          ui.showInfo(`Thinking:\n${thought}`);
+          ui.showThought(thought);
         }
         finalAssistantMessage.content = content;
       }
@@ -885,9 +936,16 @@ async function processQueryWithTools(query, conversation = [], currentModel) {
           const finalResponseObj = await callOpenRouter(messages, currentModel);
           const finalAssistantMessage = finalResponseObj.choices[0].message;
           if (finalAssistantMessage && typeof finalAssistantMessage.content === 'string') {
-            const { thought, content } = splitThinking(finalAssistantMessage.content);
+            const segmented = parseSegmentedTranscript(finalAssistantMessage.content);
+            let thought = segmented.thought;
+            let content = segmented.content;
+            if (!segmented.thought && !segmented.recoveredToolCalls) {
+              const thinkSplit = splitThinking(finalAssistantMessage.content);
+              thought = thought || thinkSplit.thought;
+              content = content || thinkSplit.content;
+            }
             if (thought && SHOW_THOUGHTS) {
-              ui.showInfo(`Thinking:\n${thought}`);
+              ui.showThought(thought);
             }
             finalAssistantMessage.content = content;
           }
@@ -900,57 +958,6 @@ 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,
@@ -1078,9 +1085,16 @@ async function processQuery(query, conversation = [], currentModel) {
       const responseObj = await callOpenRouter(messages, currentModel, true);
       const assistantMessage = responseObj.choices[0].message;
       if (assistantMessage && typeof assistantMessage.content === 'string') {
-        const { thought, content } = splitThinking(assistantMessage.content);
+        const segmented = parseSegmentedTranscript(assistantMessage.content);
+        let thought = segmented.thought;
+        let content = segmented.content;
+        if (!segmented.thought && !segmented.recoveredToolCalls) {
+          const thinkSplit = splitThinking(assistantMessage.content);
+          thought = thought || thinkSplit.thought;
+          content = content || thinkSplit.content;
+        }
         if (thought && SHOW_THOUGHTS) {
-          ui.showInfo(`Thinking:\n${thought}`);
+          ui.showThought(thought);
         }
         assistantMessage.content = content;
       }
@@ -1140,7 +1154,7 @@ async function processQuery(query, conversation = [], currentModel) {
       if (finalAssistantMessage && typeof finalAssistantMessage.content === 'string') {
         const { thought, content } = splitThinking(finalAssistantMessage.content);
         if (thought && SHOW_THOUGHTS) {
-          ui.showInfo(`Thinking:\n${thought}`);
+          ui.showThought(thought);
         }
         finalResponse = content;
       } else {

package/bin/ui.js

@@ -72,6 +72,25 @@ function showAGIStatus(status) {
   console.log(chalk.cyanBright(statusBox));
 }
 
+function showThought(thought) {
+  if (!thought) return;
+  const top = chalk.gray('┌' + '─'.repeat(30) + '┐');
+  const title = chalk.magenta.bold('│   ✧ Thinking');
+  const pad = ' '.repeat(Math.max(0, 30 - '   ✧ Thinking'.length));
+  const titleLine = title + pad + chalk.gray(' │');
+  const separator = chalk.gray('├' + '─'.repeat(30) + '┤');
+  const bottom = chalk.gray('└' + '─'.repeat(30) + '┘');
+  console.log(top);
+  console.log(titleLine);
+  console.log(separator);
+  // Print each line of thought dimmed
+  String(thought).split('\n').forEach(line => {
+    const truncated = line; // keep full line; rely on terminal wrap
+    console.log(chalk.gray('│ ') + chalk.dim(truncated) + chalk.gray(' │'));
+  });
+  console.log(bottom);
+}
+
 module.exports = {
   showHeader,
   showLegacyHeader,
@@ -84,5 +103,6 @@ module.exports = {
   showWarning,
   showSuccess,
   showInfo,
-  showAGIStatus
+  showAGIStatus,
+  showThought
 };

package/package.json

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