prior-cli 1.2.4 → 1.2.6

package/bin/prior.js

@@ -670,14 +670,12 @@ async function startChat(opts = {}) {
       clearSuggestions();
       if (!matches.length) return;
       _suggCount = matches.length;
-      process.stdout.write('\x1b[s');                   // save cursor first (at end of typed input)
-      // Print newlines to scroll terminal and guarantee room below the prompt
-      process.stdout.write('\n'.repeat(matches.length));
-      process.stdout.write(`\x1b[${matches.length}A`); // move cursor back up to prompt line
+      process.stdout.write('\x1b[s'); // save cursor at end of typed input
       for (const { cmd, desc } of matches) {
+        // \x1b[B = cursor down 1 (no scroll), \r = col 0, \x1b[2K = clear line
         process.stdout.write(`\x1b[B\r\x1b[2K${c.brand('  ' + cmd.padEnd(14))}${c.dim(desc)}`);
       }
-      process.stdout.write('\x1b[u');                   // restore cursor to end of typed input
+      process.stdout.write('\x1b[u'); // restore cursor to end of typed input
     }
 
     process.stdin.on('keypress', (ch, key) => {

package/lib/agent.js

@@ -77,7 +77,7 @@ function parseToolCalls(text) {
     } catch { /* skip */ }
   }
 
-  // Fallback: <tool_name>{...}</tool_name>
+  // Fallback 1: <tool_name>{...}</tool_name>
   for (const name of TOOL_NAMES) {
     const fbRe = new RegExp(`<${name}>([\\s\\S]*?)<\\/${name}>`, 'g');
     let fm;
@@ -93,6 +93,22 @@ function parseToolCalls(text) {
     }
   }
 
+  // Fallback 2: <tool_name {"key":"val"}>...</tool_name>  (JSON in opening tag)
+  for (const name of TOOL_NAMES) {
+    const fbRe = new RegExp(`<${name}\\s*({[\\s\\S]*?})\\s*>[\\s\\S]*?<\\/${name}>`, 'g');
+    let fm;
+    while ((fm = fbRe.exec(text)) !== null) {
+      const alreadyCaptured = calls.some(c => fm.index >= c.offset && fm.index < c.offset + c.raw.length);
+      if (alreadyCaptured) continue;
+      try {
+        const fixed  = fixJsonLiterals(fm[1].trim());
+        const parsed = JSON.parse(fixed);
+        const { args, ...rest } = parsed || {};
+        calls.push({ raw: fm[0], offset: fm.index, name, args: args || (parsed && Object.keys(rest).length > 0 ? rest : {}) });
+      } catch { /* skip */ }
+    }
+  }
+
   return calls;
 }
 
@@ -121,6 +137,16 @@ function stripThink(text) {
   return text.replace(/<think>[\s\S]*?<\/think>/gi, '').trim();
 }
 
+// Strip any residual tool-call tags the model echoes in its text output
+function stripToolTags(text) {
+  // <tool>...</tool>
+  let out = text.replace(/<tool>[\s\S]*?<\/tool>/gi, '');
+  // <tool_name {...}>...</tool_name>  AND  <tool_name>...</tool_name>
+  const namesPattern = TOOL_NAMES.join('|');
+  out = out.replace(new RegExp(`<(?:${namesPattern})[^>]*>[\\s\\S]*?<\\/(?:${namesPattern})>`, 'gi'), '');
+  return out.trim();
+}
+
 // ── Main agent loop ───────────────────────────────────────────
 
 const CONFIRM_TOOLS = new Set(['run_command', 'file_delete', 'file_write']);
@@ -168,13 +194,13 @@ async function runAgent({ messages, model, uncensored, cwd, projectContext, send
     // ── No tool calls → final answer ──────────────────────────
     if (calls.length === 0) {
       await trackTokenUsage(token, totalPromptTokens, totalCompletionTokens);
-      send({ type: 'text', content: cleaned });
+      send({ type: 'text', content: stripToolTags(cleaned) });
       send({ type: 'done' });
       return;
     }
 
     // ── Text before first tool call ───────────────────────────
-    const textBefore = cleaned.slice(0, calls[0].offset).trim();
+    const textBefore = stripToolTags(cleaned.slice(0, calls[0].offset)).trim();
     if (textBefore) send({ type: 'text', content: textBefore });
 
     history.push({ role: 'assistant', content: raw });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prior-cli",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Prior Network AI — command-line interface",
   "bin": {
     "prior": "bin/prior.js"