sam-coder-cli 1.0.63 → 1.0.65

package/bin/agi-cli.js

@@ -429,6 +429,9 @@ const agentUtils = {
 
   async writeFile(filePath, content) {
     try {
+      // Ensure directory exists
+      const dir = path.dirname(filePath);
+      await fs.mkdir(dir, { recursive: true });
       await fs.writeFile(filePath, content, 'utf-8');
       return `Successfully wrote to ${filePath}`;
     } catch (error) {
@@ -755,7 +758,7 @@ function normalizeToolCallsFromMessage(message) {
 // Parse segmented format like <|start|>channel<|message|>...<|end|>
 function parseSegmentedTranscript(text) {
   if (!text || typeof text !== 'string') {
-    return { content: text || '', thought: '', recoveredToolCalls: null };
+    return { content: text || '', thought: '', recoveredToolCalls: null, segmented: false };
   }
 
   const blockRegex = /\<\|start\|>([^<|]+)\<\|message\|>([\s\S]*?)\<\|end\|>/gi;
@@ -763,11 +766,13 @@ function parseSegmentedTranscript(text) {
   let visibleParts = [];
   let thoughts = [];
   let commentaryParts = [];
+  let segmentedFound = false;
 
   while ((match = blockRegex.exec(text)) !== null) {
     const rawRole = (match[1] || '').trim().toLowerCase();
     const body = (match[2] || '').trim();
     if (!rawRole) continue;
+    segmentedFound = true;
 
     if (rawRole === 'analysis') {
       thoughts.push(body);
@@ -784,7 +789,72 @@ function parseSegmentedTranscript(text) {
 
   // If no blocks matched, return original
   if (visibleParts.length === 0 && thoughts.length === 0 && commentaryParts.length === 0) {
-    return { content: text, thought: '', recoveredToolCalls: null };
+    // Try channel-only segments: <|channel|>X [to=Y] [<|constrain|>Z] <|message|>... (<|end|>|<|call|>|<|return|>)
+    const chanRegex = /\<\|channel\|>\s*([a-zA-Z]+)\s*(?:to=([^\s<]+))?\s*(?:\<\|constrain\|>(\w+))?\s*\<\|message\|>([\s\S]*?)(?:\<\|end\|>|\<\|call\|>|\<\|return\|>)/gi;
+    let anyChannel = false;
+    let commsWithRecipients = [];
+    while ((match = chanRegex.exec(text)) !== null) {
+      anyChannel = true;
+      segmentedFound = true;
+      const channel = (match[1] || '').trim().toLowerCase();
+      const recipient = (match[2] || '').trim();
+      const constraint = (match[3] || '').trim().toLowerCase();
+      const body = (match[4] || '').trim();
+      if (channel === 'analysis') {
+        thoughts.push(body);
+      } else if (channel === 'commentary') {
+        if (recipient) {
+          commsWithRecipients.push({ recipient, constraint, body });
+        } else {
+          // preamble visible to user per spec
+          visibleParts.push(body);
+        }
+      } else if (channel === 'final') {
+        visibleParts.push(body);
+      } else {
+        visibleParts.push(body);
+      }
+    }
+    // Build recovered tool calls from commentary with recipients
+    let recoveredToolCalls = null;
+    if (commsWithRecipients.length) {
+      recoveredToolCalls = [];
+      for (const item of commsWithRecipients) {
+        // recipient format like functions.get_weather
+        let funcName = item.recipient;
+        if (funcName.startsWith('functions.')) {
+          funcName = funcName.slice('functions.'.length);
+        }
+        // parse args
+        let args = {};
+        if (item.constraint === 'json' || item.body.startsWith('{') || item.body.startsWith('[')) {
+          try {
+            const parsed = JSON.parse(item.body);
+            args = parsed;
+          } catch (_) {
+            // ignore parse error; leave empty
+          }
+        }
+        recoveredToolCalls.push({
+          id: `inline-${recoveredToolCalls.length + 1}`,
+          type: 'function',
+          function: {
+            name: funcName,
+            arguments: typeof args === 'string' ? args : JSON.stringify(args)
+          }
+        });
+      }
+    }
+
+    if (!anyChannel) {
+      return { content: text, thought: '', recoveredToolCalls: null, segmented: false };
+    }
+    return {
+      content: visibleParts.join('\n\n').trim(),
+      thought: thoughts.join('\n\n').trim(),
+      recoveredToolCalls: recoveredToolCalls && recoveredToolCalls.length ? recoveredToolCalls : null,
+      segmented: segmentedFound
+    };
   }
 
   // Look for a Reasoning: level outside blocks as a hint
@@ -807,7 +877,8 @@ function parseSegmentedTranscript(text) {
   return {
     content: visibleParts.join('\n\n').trim(),
     thought: thoughts.join('\n\n').trim(),
-    recoveredToolCalls: recoveredToolCalls && recoveredToolCalls.length ? recoveredToolCalls : null
+    recoveredToolCalls: recoveredToolCalls && recoveredToolCalls.length ? recoveredToolCalls : null,
+    segmented: segmentedFound
   };
 }
 
@@ -1251,6 +1322,37 @@ async function chat(rl, useToolCalling, initialModel) {
       return;
     }
     
+    // Direct Harmony tool-call execution from user input (bypass model)
+    try {
+      const seg = parseSegmentedTranscript(input);
+      if (seg && seg.segmented && seg.recoveredToolCalls && seg.recoveredToolCalls.length) {
+        const messages = [];
+        if (useToolCalling) {
+          messages.push({ role: 'system', content: TOOL_CALLING_PROMPT });
+        } else {
+          messages.push({ role: 'system', content: FUNCTION_CALLING_PROMPT });
+        }
+        messages.push({ role: 'user', content: input });
+        ui.startThinking();
+        const results = await handleToolCalls(seg.recoveredToolCalls, messages);
+        ui.stopThinking();
+        if (results.length === 1) {
+          ui.showSuccess(`Tool '${results[0].name}' executed.`);
+        } else {
+          ui.showSuccess(`Executed ${results.length} tool calls.`);
+        }
+        // Show concise outputs
+        results.forEach(r => {
+          const preview = typeof r.content === 'string' ? r.content : JSON.stringify(r.content);
+          ui.showInfo(`${r.name}: ${preview.length > 300 ? preview.slice(0, 300) + '...' : preview}`);
+        });
+        rl.prompt();
+        return;
+      }
+    } catch (e) {
+      // Fall through to normal processing if parsing/execution fails
+    }
+    
     const result = useToolCalling 
       ? await processQueryWithTools(input, conversation, currentModel)
       : await processQuery(input, conversation, currentModel);

package/package.json

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