prior-cli 1.3.3 → 1.3.5

package/bin/prior.js

@@ -568,7 +568,7 @@ async function startChat(opts = {}) {
     terminal: true,
     historySize: 100,
     completer: line => {
-      const cmds = ['/help', '/clear', '/model ', '/tools', '/censored', '/uncensored', '/login', '/logout', '/exit'];
+      const cmds = ['/help', '/clear', '/censored', '/uncensored', '/login', '/logout', '/exit'];
       if (!line.startsWith('/')) return [[], line];
       const hits = cmds.filter(cmd => cmd.startsWith(line));
       return [hits, line];
@@ -599,7 +599,7 @@ async function startChat(opts = {}) {
   console.log(c.ok('  ◉') + c.muted('  Agent mode  ') + c.dim('· file  web  shell  image  prior-network'));
 
   console.log(DIVIDER);
-  console.log(c.muted('  /help  /clear  /model <name>  /tools  /exit'));
+  console.log(c.muted('  /help  /clear  /censored  /uncensored  /exit'));
   console.log(DIVIDER);
   console.log('');
 
@@ -617,9 +617,7 @@ async function startChat(opts = {}) {
     const SLASH_CMDS = [
       { cmd: '/help',        desc: 'Show help'         },
       { cmd: '/clear',       desc: 'Clear screen'      },
-      { cmd: '/model',       desc: 'Switch model'      },
-      { cmd: '/tools',       desc: 'List tools'                  },
-      { cmd: '/censored',    desc: 'Load standard model (qwen)' },
+      { cmd: '/censored',    desc: 'Load standard model (qwen)'  },
       { cmd: '/uncensored',  desc: 'Load uncensored model'      },
       { cmd: '/usage',       desc: 'Token usage today'          },
       { cmd: '/learn',       desc: 'Learn this directory → prior.md' },
@@ -759,39 +757,6 @@ async function startChat(opts = {}) {
             console.log(c.warn('  ✓  Prior Uncensored Model Loaded\n'));
             return loop();
 
-          case '/model':
-            if (args[0]) {
-              currentModel = args[0];
-              console.log(c.ok(`  ✓  Model → ${currentModel}\n`));
-            } else {
-              console.log(c.muted(`  Current model: ${currentModel || 'default'}\n`));
-            }
-            return loop();
-
-          case '/tools':
-            console.log('');
-            console.log(c.bold('  Tools available in agent mode\n'));
-            const tools = [
-              ['file_read',       'Read a file'],
-              ['file_write',      'Create or overwrite a file'],
-              ['file_append',     'Append to a file'],
-              ['file_list',       'List directory contents'],
-              ['file_delete',     'Delete a file'],
-              ['web_search',      'Search the web (Google)'],
-              ['url_fetch',       'Fetch a webpage (Puppeteer)'],
-              ['run_command',     'Execute a shell command'],
-              ['clipboard_read',  'Read from clipboard'],
-              ['clipboard_write', 'Write to clipboard'],
-              ['generate_image',  'Generate an image (Prior Diffusion)'],
-              ['prior_feed',      'Get Prior Network feed'],
-              ['prior_profile',   'Get your Prior Network profile'],
-            ];
-            tools.forEach(([name, desc]) => {
-              console.log(`  ${c.brand('▸')} ${c.bold(name.padEnd(16))} ${c.muted(desc)}`);
-            });
-            console.log('');
-            return loop();
-
           case '/learn': {
             // Sanity check — warn if not a project directory
             const cwdBase = path.basename(process.cwd()).toLowerCase();
@@ -946,8 +911,6 @@ Keep it under 350 words. Write prior.md now.`;
             console.log(c.muted('  /clear               ') + 'Clear screen');
             console.log(c.muted('  /censored            ') + 'Load standard model (qwen)');
             console.log(c.muted('  /uncensored          ') + 'Load uncensored model (dolphin)');
-            console.log(c.muted('  /model <name>        ') + 'Switch to any specific model');
-            console.log(c.muted('  /tools               ') + 'List available tools');
             console.log(c.muted('  /usage               ') + 'Token usage for today');
             console.log(c.muted('  /learn               ') + 'Scan directory and write prior.md context file');
             console.log(c.muted('  /login               ') + 'Sign in to a different account');

package/lib/agent.js

@@ -77,6 +77,22 @@ function parseToolCalls(text) {
     } catch { /* skip */ }
   }
 
+  // Primary variant: <tool name="X">{"args"}</tool>  (name as attribute — used by some models)
+  const reAttr = /<tool\s+name="([^"]+)"[^>]*>([\s\S]*?)<\/tool>/g;
+  while ((m = reAttr.exec(text)) !== null) {
+    const alreadyCaptured = calls.some(c => m.index >= c.offset && m.index < c.offset + c.raw.length);
+    if (alreadyCaptured) continue;
+    const toolName = m[1];
+    try {
+      const body   = m[2].trim();
+      const parsed = body ? JSON.parse(fixJsonLiterals(body)) : {};
+      const { args, ...rest } = parsed;
+      calls.push({ raw: m[0], offset: m.index, name: toolName, args: args || (Object.keys(rest).length > 0 ? rest : {}) });
+    } catch {
+      calls.push({ raw: m[0], offset: m.index, name: toolName, args: {} });
+    }
+  }
+
   // Fallback 1: <tool_name>{...}</tool_name>
   for (const name of TOOL_NAMES) {
     const fbRe = new RegExp(`<${name}>([\\s\\S]*?)<\\/${name}>`, 'g');
@@ -109,6 +125,21 @@ function parseToolCalls(text) {
     }
   }
 
+  // Fallback 3: <tool_name key="val" ...>...</tool_name>  (HTML attribute style — used by dolphin)
+  for (const name of TOOL_NAMES) {
+    const fbRe = new RegExp(`<${name}((?:\\s+[a-zA-Z_]\\w*="[^"]*")+)\\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;
+      const args = {};
+      const attrRe = /([a-zA-Z_]\w*)="([^"]*)"/g;
+      let am;
+      while ((am = attrRe.exec(fm[1])) !== null) args[am[1]] = am[2];
+      calls.push({ raw: fm[0], offset: fm.index, name, args });
+    }
+  }
+
   return calls;
 }
 
@@ -137,13 +168,31 @@ function stripThink(text) {
   return text.replace(/<think>[\s\S]*?<\/think>/gi, '').trim();
 }
 
+// Some models (dolphin) hallucinate fake conversation turns after their response.
+// Truncate at common boundary markers to prevent those being parsed as real tool calls.
+function truncateAtFakeTurn(text) {
+  const MARKERS = [
+    /\n[-─]{3,}\s*\n+(?:user|human)\b/i,
+    /\n+(?:user|human)\s*:\s/i,
+    /\n+(?:assistant|prior)\s*:\s/i,
+  ];
+  let cut = text.length;
+  for (const re of MARKERS) {
+    const m = re.exec(text);
+    if (m && m.index < cut) cut = m.index;
+  }
+  return text.slice(0, cut);
+}
+
 // 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('|');
+  // <tool_name ...>...</tool_name>  (with or without attributes/JSON)
   out = out.replace(new RegExp(`<(?:${namesPattern})[^>]*>[\\s\\S]*?<\\/(?:${namesPattern})>`, 'gi'), '');
+  // Self-closing or unclosed: <tool_name attr="val" />  or  <tool_name attr="val">
+  out = out.replace(new RegExp(`<(?:${namesPattern})(?:\\s[^>]*)?\\s*/?>`, 'gi'), '');
   return out.trim();
 }
 
@@ -187,8 +236,8 @@ async function runAgent({ messages, model, uncensored, cwd, projectContext, send
     totalCompletionTokens += result.completionTokens || 0;
 
     const raw     = result.content;
-    const cleaned = stripThink(raw)
-      .replace(/<tool_result[\s\S]*?<\/tool_result>/gi, '')
+    const cleaned = truncateAtFakeTurn(stripThink(raw)
+      .replace(/<tool_result[\s\S]*?<\/tool_result>/gi, ''))
       .trim();
 
     const calls = [

package/package.json

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