prior-cli 1.2.6 → 1.2.8

package/bin/prior.js

@@ -457,44 +457,18 @@ async function loginViaBrowser() {
 
 // ── Inline login flow ──────────────────────────────────────────
 async function doLoginFlow() {
-  console.log(c.bold('  Sign in\n'));
-  console.log(`  ${c.brand('[1]')}  Login manually`);
-  console.log(`  ${c.brand('[2]')}  Login in browser`);
-  console.log('');
-
-  const choiceRl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const choice   = await ask(choiceRl, c.muted('  Choice [1/2] : '));
-  choiceRl.close();
-  console.log('');
-
-  if (choice === '2') {
-    process.stdout.write(c.dim('  Opening browser…'));
-    try {
-      const { token, username } = await loginViaBrowser();
-      saveAuth(token, username);
-      clearLine();
-      console.log(c.ok('  ✓ Logged in as ') + c.bold(username));
-      console.log('');
-      return username;
-    } catch (err) {
-      clearLine();
-      throw err;
-    }
+  process.stdout.write(c.dim('  Opening browser…'));
+  try {
+    const { token, username } = await loginViaBrowser();
+    saveAuth(token, username);
+    clearLine();
+    console.log(c.ok('  ✓ Logged in as ') + c.bold(username));
+    console.log('');
+    return username;
+  } catch (err) {
+    clearLine();
+    throw err;
   }
-
-  // Default: manual
-  const manualRl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const username = await ask(manualRl, c.muted('  Username : '));
-  manualRl.close();
-  const password = await promptPassword(c.muted('  Password : '));
-  console.log('');
-  process.stdout.write(c.dim('  Authenticating…'));
-  const data = await api.login(username, password);
-  saveAuth(data.token, username);
-  clearLine();
-  console.log(c.ok('  ✓ Logged in as ') + c.bold(username));
-  console.log('');
-  return username;
 }
 
 // ── Organization ToS flow ──────────────────────────────────────

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.6",
+  "version": "1.2.8",
   "description": "Prior Network AI — command-line interface",
   "bin": {
     "prior": "bin/prior.js"