prior-cli 1.1.3 → 1.2.1

package/bin/prior.js

@@ -12,7 +12,7 @@ const { version } = require('../package.json');
 const api = require('../lib/api');
 const { renderMarkdown } = require('../lib/render');
 const { getToken, getUsername, saveAuth, clearAuth } = require('../lib/config');
-const { runAgent } = require('../lib/agent');
+const { runAgent, CONFIRM_TOOLS } = require('../lib/agent');
 
 // ── Theme ──────────────────────────────────────────────────────
 const THEME = '#9CE2D4';
@@ -250,13 +250,130 @@ function toolIcon(name) {
 
 let _toolStartTime = 0;
 
+// ── Box drawing helpers ────────────────────────────────────────
+function boxLine(text, width, color) {
+  const col = process.stdout.columns || 90;
+  const w   = Math.min(width || 56, col - 8);
+  const pad = Math.max(0, w - text.length);
+  return '  │  ' + (color ? color(text) : text) + ' '.repeat(pad) + '  │';
+}
+
+function drawBox(lines, opts = {}) {
+  const col  = process.stdout.columns || 90;
+  const w    = Math.min(opts.width || 56, col - 8);
+  const top  = '  ╭' + '─'.repeat(w + 4) + '╮';
+  const bot  = '  ╰' + '─'.repeat(w + 4) + '╯';
+  process.stdout.write(c.muted(top) + '\n');
+  for (const { text, color, dim } of lines) {
+    const str   = String(text || '').slice(0, w);
+    const pad   = ' '.repeat(Math.max(0, w - str.length));
+    const styled = color ? color(str) : dim ? c.dim(str) : c.white(str);
+    process.stdout.write(c.muted('  │  ') + styled + pad + c.muted('  │') + '\n');
+  }
+  process.stdout.write(c.muted(bot) + '\n');
+}
+
+// ── Per-tool rich preview ─────────────────────────────────────
 function renderToolStart(name, args) {
   _toolStartTime = Date.now();
-  const icon    = toolIcon(name);
-  const label   = c.bold(name.padEnd(16));
-  const preview = Object.values(args || {})[0];
-  const hint    = preview ? c.muted(String(preview).slice(0, 80)) : '';
-  process.stdout.write(`  ${icon}  ${label} ${hint}\n`);
+  const icon = toolIcon(name);
+
+  switch (name) {
+
+    case 'run_command': {
+      const cmd = args.command || '';
+      process.stdout.write(`\n  ${icon}  ${c.bold('run_command')}\n`);
+      drawBox([{ text: cmd, color: c.brand }]);
+      break;
+    }
+
+    case 'file_write': {
+      const filePath = args.path || '';
+      const content  = args.content || '';
+      const lines    = content.split('\n');
+      const preview  = lines.slice(0, 5);
+      const more     = lines.length > 5 ? lines.length - 5 : 0;
+      process.stdout.write(`\n  ${icon}  ${c.bold('file_write')}  ${c.muted('→')}  ${c.brand(filePath)}  ${c.muted(`${lines.length} line${lines.length !== 1 ? 's' : ''}`)}\n`);
+      drawBox([
+        ...preview.map(l => ({ text: l, dim: true })),
+        ...(more > 0 ? [{ text: `… ${more} more line${more !== 1 ? 's' : ''}`, dim: true }] : []),
+      ]);
+      break;
+    }
+
+    case 'file_append': {
+      const filePath = args.path || '';
+      const content  = args.content || '';
+      const lines    = content.split('\n');
+      process.stdout.write(`\n  ${icon}  ${c.bold('file_append')}  ${c.muted('→')}  ${c.brand(filePath)}  ${c.muted(`+${lines.length} line${lines.length !== 1 ? 's' : ''}`)}\n`);
+      drawBox(lines.slice(0, 4).map(l => ({ text: l, dim: true })));
+      break;
+    }
+
+    case 'file_delete': {
+      const filePath = args.path || '';
+      process.stdout.write(`\n  ${icon}  ${c.bold('file_delete')}\n`);
+      drawBox([{ text: filePath, color: chalk.red }]);
+      break;
+    }
+
+    case 'file_read': {
+      const filePath = args.path || '';
+      process.stdout.write(`\n  ${icon}  ${c.bold('file_read')}  ${c.muted(filePath)}\n`);
+      break;
+    }
+
+    case 'file_list': {
+      const dirPath = args.path || '.';
+      process.stdout.write(`\n  ${icon}  ${c.bold('file_list')}  ${c.muted(dirPath)}\n`);
+      break;
+    }
+
+    case 'web_search': {
+      const query = args.query || '';
+      process.stdout.write(`\n  ${icon}  ${c.bold('web_search')}\n`);
+      drawBox([{ text: query, color: c.brand }]);
+      break;
+    }
+
+    case 'url_fetch': {
+      const url = args.url || '';
+      process.stdout.write(`\n  ${icon}  ${c.bold('url_fetch')}  ${c.muted(url.slice(0, 70))}\n`);
+      break;
+    }
+
+    case 'generate_image': {
+      const prompt = args.prompt || '';
+      process.stdout.write(`\n  ${icon}  ${c.bold('generate_image')}\n`);
+      drawBox([{ text: prompt, color: c.brand }]);
+      process.stdout.write(c.muted('  This may take 1–3 minutes…\n'));
+      break;
+    }
+
+    case 'clipboard_read':
+      process.stdout.write(`\n  ${icon}  ${c.bold('clipboard_read')}\n`);
+      break;
+
+    case 'clipboard_write': {
+      const text = String(args.text || '').slice(0, 60);
+      process.stdout.write(`\n  ${icon}  ${c.bold('clipboard_write')}  ${c.muted(text)}\n`);
+      break;
+    }
+
+    case 'prior_feed':
+      process.stdout.write(`\n  ${icon}  ${c.bold('prior_feed')}  ${c.muted('fetching…')}\n`);
+      break;
+
+    case 'prior_profile':
+      process.stdout.write(`\n  ${icon}  ${c.bold('prior_profile')}  ${c.muted('fetching…')}\n`);
+      break;
+
+    default: {
+      const preview = Object.values(args || {})[0];
+      const hint    = preview ? c.muted(String(preview).slice(0, 80)) : '';
+      process.stdout.write(`\n  ${icon}  ${c.bold(name.padEnd(16))} ${hint}\n`);
+    }
+  }
 }
 
 function hyperlink(text, url) {
@@ -265,7 +382,6 @@ function hyperlink(text, url) {
 
 function renderToolDone(name, summary) {
   const took  = _toolStartTime ? c.dim(` · ${elapsed(Date.now() - _toolStartTime)}`) : '';
-  const label = c.muted(name.padEnd(16));
   let display = summary || '';
   if (/^[a-zA-Z]:[/\\]/.test(display) || display.startsWith('/')) {
     const fileUrl = 'file:///' + display.replace(/\\/g, '/');
@@ -273,13 +389,48 @@ function renderToolDone(name, summary) {
   } else {
     display = c.dim(display);
   }
-  process.stdout.write(`  ${c.ok('✓')}  ${label} ${display}${took}\n`);
+  process.stdout.write(`  ${c.ok('✓')}  ${c.muted(name)}  ${display}${took}\n`);
 }
 
 function renderToolError(name, error) {
-  const took  = _toolStartTime ? c.dim(` · ${elapsed(Date.now() - _toolStartTime)}`) : '';
-  const label = c.muted(name.padEnd(16));
-  process.stdout.write(`  ${c.err('✗')}  ${label} ${c.err(error || 'failed')}${took}\n`);
+  const took = _toolStartTime ? c.dim(` · ${elapsed(Date.now() - _toolStartTime)}`) : '';
+  process.stdout.write(`  ${c.err('✗')}  ${c.muted(name)}  ${c.err(error || 'failed')}${took}\n`);
+}
+
+function renderToolSkip(name) {
+  process.stdout.write(`  ${c.warn('⊘')}  ${c.muted(name)}  ${c.dim('skipped')}\n`);
+}
+
+// ── Single-keypress confirm prompt ────────────────────────────
+function askConfirmKey(promptText, rl) {
+  return new Promise(resolve => {
+    process.stdout.write(`  ${c.muted('┤')} ${promptText} ${c.muted('[Y/n]')}  `);
+
+    if (!process.stdout.isTTY || !process.stdin.isTTY) {
+      process.stdout.write(c.ok('y') + '\n');
+      return resolve(true);
+    }
+
+    // Pause readline so it doesn't swallow the keypress or react to stdin events
+    if (rl) rl.pause();
+    process.stdin.setRawMode(true);
+    process.stdin.setEncoding('utf8');
+
+    function handler(ch) {
+      process.stdin.setRawMode(false);
+      process.stdin.removeListener('data', handler);
+      // Resume readline — do NOT call process.stdin.pause() or rl.close()
+      if (rl) rl.resume();
+
+      const key = ch.toLowerCase();
+      if (key === '\u0003') { process.stdout.write('\n'); process.exit(0); }
+      if (key === 'n')      { process.stdout.write(c.err('n') + '\n\n'); return resolve(false); }
+      process.stdout.write(c.ok('y') + '\n\n');
+      resolve(true);
+    }
+
+    process.stdin.on('data', handler);
+  });
 }
 
 // ── Browser login via public URL ───────────────────────────────
@@ -773,12 +924,25 @@ Keep it under 350 words. Write prior.md now.`;
         spinStart('thinking…');
 
         try {
+          const confirm = async ({ name, args }) => {
+            spinStop();
+            const PROMPTS = {
+              run_command:  'Run this command?',
+              file_write:   'Write this file?',
+              file_delete:  'Delete this file?',
+            };
+            const approved = await askConfirmKey(PROMPTS[name] || `Execute ${name}?`, rl);
+            if (approved) spinStart('working…');
+            return approved;
+          };
+
           await runAgent({
             messages:       [...chatHistory, { role: 'user', content: input }],
             model:          currentModel,
             uncensored,
             cwd:            process.cwd(),
             projectContext,
+            confirm,
             send: ev => {
               switch (ev.type) {
 
@@ -790,7 +954,7 @@ Keep it under 350 words. Write prior.md now.`;
                   spinStop();
                   _progressStarted = false;
                   renderToolStart(ev.name, ev.args);
-                  spinStart('working…');
+                  if (!CONFIRM_TOOLS.has(ev.name)) spinStart('working…');
                   break;
 
                 case 'tool_progress': {
@@ -813,6 +977,11 @@ Keep it under 350 words. Write prior.md now.`;
                   renderToolDone(ev.name, ev.summary);
                   break;
 
+                case 'tool_skip':
+                  spinStop();
+                  renderToolSkip(ev.name);
+                  break;
+
                 case 'tool_error':
                   spinStop();
                   renderToolError(ev.name, ev.error);

package/lib/agent.js

@@ -123,7 +123,9 @@ function stripThink(text) {
 
 // ── Main agent loop ───────────────────────────────────────────
 
-async function runAgent({ messages, model, uncensored, cwd, projectContext, send }) {
+const CONFIRM_TOOLS = new Set(['run_command', 'file_delete', 'file_write']);
+
+async function runAgent({ messages, model, uncensored, cwd, projectContext, send, confirm }) {
   const token    = getToken();
   const username = getUsername() || 'user';
   const sysPrompt = buildSystemPrompt(username, cwd, uncensored, projectContext);
@@ -181,6 +183,17 @@ async function runAgent({ messages, model, uncensored, cwd, projectContext, send
     const resultParts = [];
     for (const call of calls) {
       send({ type: 'tool_start', name: call.name, args: call.args });
+
+      // Confirmation gate for destructive / side-effect tools
+      if (confirm && CONFIRM_TOOLS.has(call.name)) {
+        const approved = await confirm({ name: call.name, args: call.args });
+        if (!approved) {
+          send({ type: 'tool_skip', name: call.name });
+          resultParts.push(`<tool_result name="${call.name}">\nUser declined — action was not executed.\n</tool_result>`);
+          continue;
+        }
+      }
+
       try {
         const toolResult = await executeTool(call.name, call.args, { cwd, token, send });
         send({ type: 'tool_done', name: call.name, summary: toolResult.summary });
@@ -199,4 +212,4 @@ async function runAgent({ messages, model, uncensored, cwd, projectContext, send
   send({ type: 'done' });
 }
 
-module.exports = { runAgent };
+module.exports = { runAgent, CONFIRM_TOOLS };

package/package.json

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