prior-cli 1.2.5 → 1.2.7

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/lib/tools.js

@@ -225,23 +225,60 @@ const TOOLS = {
     };
   },
 
-  async generate_image({ prompt, width, height, steps }, { cwd, token }) {
+  async generate_image({ prompt, width, height, steps }, { cwd, token, send }) {
     if (!prompt) throw new Error('"prompt" is required');
-    // Server handles queuing, polling, and watermarking — returns base64
-    const res = await fetch(`${CLI_BASE}/api/generate-image`, {
+    const totalSteps = steps || 20;
+    const authHdr = token ? { Authorization: `Bearer ${token}` } : {};
+
+    // Step 1: Queue
+    const queueRes = await fetch(`${CLI_BASE}/api/generate-image/queue`, {
       method:  'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        ...(token ? { Authorization: `Bearer ${token}` } : {}),
-      },
-      body:    JSON.stringify({ prompt, width: width || 896, height: height || 896, steps: steps || 20 }),
-      timeout: 360000,
+      headers: { 'Content-Type': 'application/json', ...authHdr },
+      body:    JSON.stringify({ prompt, width: width || 896, height: height || 896, steps: totalSteps }),
+      timeout: 15000,
     });
-    if (!res.ok) {
-      const err = await res.json().catch(() => ({}));
-      throw new Error(err.error || err.message || `HTTP ${res.status}`);
+    if (!queueRes.ok) {
+      const err = await queueRes.json().catch(() => ({}));
+      throw new Error(err.error || err.message || `HTTP ${queueRes.status}`);
     }
-    const data = await res.json();
+    const { promptId } = await queueRes.json();
+    if (!promptId) throw new Error('No promptId returned from image queue');
+
+    // Step 2: Poll with progress
+    let job = null;
+    for (let i = 0; i < 240; i++) {
+      await new Promise(r => setTimeout(r, 1500));
+      try {
+        const pr = await fetch(`${CLI_BASE}/api/generate-image/progress/${promptId}`, {
+          headers: authHdr, timeout: 5000,
+        });
+        if (pr.ok) {
+          job = await pr.json();
+          if (job && send && job.step !== undefined) {
+            const pct = job.percent || Math.round((job.step / (job.total || totalSteps)) * 100);
+            send({ type: 'tool_progress', step: job.step, total: job.total || totalSteps, percent: pct });
+          }
+          if (job && (job.status === 'done' || job.status === 'error')) break;
+        }
+      } catch { /* keep polling */ }
+    }
+
+    if (!job || job.status === 'error') {
+      throw new Error(job?.error || 'Image generation failed or timed out');
+    }
+
+    // Step 3: Watermark
+    const wmRes = await fetch(`${CLI_BASE}/api/generate-image/watermark`, {
+      method:  'POST',
+      headers: { 'Content-Type': 'application/json', ...authHdr },
+      body:    JSON.stringify({ filename: job.filename }),
+      timeout: 30000,
+    });
+    if (!wmRes.ok) {
+      const err = await wmRes.json().catch(() => ({}));
+      throw new Error(err.error || `Watermark failed: HTTP ${wmRes.status}`);
+    }
+    const data = await wmRes.json();
     if (!data.filename || !data.data) throw new Error('Invalid response from image generation service');
     const savePath = path.join(cwd, data.filename);
     fs.writeFileSync(savePath, Buffer.from(data.data, 'base64'));

package/package.json

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