ucode-agent 1.62.8 → 1.64.0

package/src/ui/plain.js

@@ -24,6 +24,9 @@ const COMMANDS = [
   '/new', '/remember', '/skills', '/clear', '/search', '/copy', '/exit',
 ];
 
+/** The tag on an approval prompt. */
+export const badge = (risk) => ({ command: ' shell ', mcp: ' tool ', trust: ' project ' })[risk] ?? ' outside project ';
+
 export class Plain {
   constructor({ cwd, input = process.stdin, output = process.stdout } = {}) {
     this.cwd = cwd;
@@ -293,18 +296,18 @@ export class Plain {
     return this.promptWith(`${blue('› ')}`);
   }
 
-  async confirm({ action, detail, risk }) {
+  async confirm({ action, detail, risk, always }) {
     this.stopSpinner();
-    const badge = risk === 'command' ? ' shell ' : ' outside project ';
-    this.output.write(`\n${chalk.inverse(theme.warn(badge))} ${chalk.white(action)}\n`);
+    this.output.write(`\n${chalk.inverse(theme.warn(badge(risk)))} ${chalk.white(action)}\n`);
     for (const line of String(detail ?? '').split('\n')) {
       if (line) this.output.write(dim(`  ${line}\n`));
     }
 
-    const answer = await this.promptWith(`${blue('  go ahead? ')}${dim('[y/N] ')}`);
+    const answer = await this.promptWith(`${blue('  go ahead? ')}${dim(always ? `[y/N, a = always allow ${always}] ` : '[y/N] ')}`);
     // End of input is a no: never run something nobody approved.
-    const yes = /^(y|yes)$/i.test(String(answer ?? '').trim());
-    this.output.write(dim(yes ? '  approved\n\n' : '  declined\n\n'));
+    const said = String(answer ?? '').trim();
+    const yes = always && /^(a|always)$/i.test(said) ? 'always' : /^(y|yes)$/i.test(said);
+    this.output.write(dim(yes === 'always' ? `  approved — ${always} is always allowed here now\n\n` : yes ? '  approved\n\n' : '  declined\n\n'));
     return yes;
   }
 

package/src/ui/screen.js

@@ -40,10 +40,11 @@ import {
   theme, blue, sky, deep, dim, edge, ADDED, REMOVED, BANNER, BANNER_WIDTH, SPINNER,
   boxTop, boxBottom, boxRow, visLen, padVis, clip, wrapAnsi,
   shortenPath, asLabel, ensureColour, planLine, bare, narration, narrationMark, groupKind, groupLabel, groupTarget, runLine, planRows, tidyReply, trimAnswer,
-  bannerPaint, RAIL, modeChip, ADD_CHIP, asNarrationLine } from './theme.js';
+  bannerPaint, RAIL, modeChip, ADD_CHIP, micChip, asNarrationLine } from './theme.js';
 import { FRAME_MS, spinnerGlyph, formatDuration, doneLine, workingLine, bannerSweep, SWEEP_MS } from './activity.js';
 import { gitBranch } from '../core/git.js';
 import { renderer, render } from './markdown.js';
+import { badge } from './plain.js';
 import { VERSION } from '../core/version.js';
 
 /**
@@ -60,7 +61,7 @@ export function isLabel(text) {
 export const COMMANDS = [
   '/help', '/model', '/models', '/session', '/sessions', '/resume',
   '/new', '/remember', '/skills', '/clear', '/search', '/copy', '/exit',
-  '/stats', '/doctor', '/deploy', '/look', '/undo',
+  '/stats', '/doctor', '/deploy', '/look', '/undo', '/mic',
 ];
 
 // ANSI ----------------------------------------------------------------------
@@ -215,6 +216,12 @@ export class Screen {
     this.plusTo = 0;
     this.attachments = [];
     this.onAttach = null;
+    // The mic button: null when idle, else 'starting' | 'listening' | 'writing'.
+    // Ctrl+T starts and stops it; while it listens, enter stops and sends.
+    this.micFrom = 0;
+    this.micTo = 0;
+    this.listening = null;
+    this.onMic = null;
     this.onInterrupt = null;
     this.onModeChange = null;
     this.spinTimer = null;
@@ -808,7 +815,7 @@ export class Screen {
       ['dir', value(shortenPath(this.facts.cwd ?? this.cwd, room - 10))],
       branch && ['branch', value(branch)],
       VERSION && ['version', value(this.facts.update ? `${VERSION} → ${this.facts.update} next start` : VERSION)],
-      ['keys', value('/help · esc interrupts · ctrl+b plan · ctrl+o file')],
+      ['keys', value('/help · ctrl+t mic · ctrl+o file · ctrl+b plan · esc stops')],
     ].filter(Boolean).slice(0, BANNER.length - 1);
 
     while (facts.length < BANNER.length - 1) facts.push(['', '']);
@@ -986,7 +993,8 @@ export class Screen {
   statusRow(width = this.width()) {
     const inner = width - 2;             // the space between the two borders
     const chip = this.modeChip();
-    const left = ` ${chip}  ${ADD_CHIP}  ${chalk.white(this.model || '—')}`;
+    const mic = micChip(this.listening);
+    const buttons = ` ${chip}  ${ADD_CHIP}  ${mic}`;
 
     // How long the turn has taken, back in the box beside the other two facts
     // about the session. It is not on the live line: that line says what is
@@ -996,16 +1004,24 @@ export class Screen {
     const since = this.activity?.start ?? this.status.since ?? 0;
     const running = this.busy() && since && now - since >= 1000;
     const right = `${running ? `${dim(formatDuration(now - since))}   ` : ''}${this.percentChip()} `;
+    // On a narrow terminal the model name goes before any button does.
+    const withModel = `${buttons}  ${chalk.white(this.model || '—')}`;
+    const left = visLen(withModel) + visLen(right) < inner ? withModel : buttons;
 
     // Where a click on the bottom row still counts as hitting the mode chip.
     this.chipTo = 2 + visLen(chip);
     this.plusFrom = this.chipTo + 3;                     // after the two spaces
     this.plusTo = this.plusFrom + visLen(ADD_CHIP) - 1;
+    this.micFrom = this.plusTo + 3;
+    this.micTo = this.micFrom + visLen(mic) - 1;
 
     const between = Math.max(1, inner - visLen(left) - visLen(right));
     const files = this.attachments.map((f) => path.basename(f)).join(', ');
-    const middle = this.flashText ? dim(clip(this.flashText, between - 2))
-      : files ? sky(clip(`+ ${files}`, between - 2)) : '';
+    // Room for the three spaces after it and at least one before.
+    const room = between - 4;
+    const middle = this.listening === 'listening' ? sky(clip('speak now · enter sends · ctrl+t stops · esc cancels', room))
+      : this.flashText ? dim(clip(this.flashText, room))
+        : files ? sky(clip(`+ ${files}`, room)) : '';
 
     const tail = middle ? `${middle}   ` : '';
     const pad = Math.max(1, inner - visLen(left) - visLen(tail) - visLen(right));
@@ -1188,22 +1204,23 @@ export class Screen {
   }
 
   /** y/n, answered on the input line. */
-  confirm({ action, detail, risk }) {
+  confirm({ action, detail, risk, always }) {
     this.push('');
-    this.push(`${chalk.inverse(theme.warn(risk === 'command' ? ' shell ' : ' outside project '))} ${chalk.white(action)}`);
+    this.push(`${chalk.inverse(theme.warn(badge(risk)))} ${chalk.white(action)}`);
     for (const line of String(detail ?? '').split('\n')) {
       if (line) this.push(dim(`  ${line}`));
     }
 
-    this.pendingPrompt = 'go ahead? [y/N]';
+    this.pendingPrompt = always ? `go ahead? [y/N, a = always allow ${always}]` : 'go ahead? [y/N]';
     this.scroll = 0; // the question has to be on screen to be answered
     this.render();
 
     return this.nextLine().then((answer) => {
       this.pendingPrompt = null;
       // End of input counts as no. Never run something nobody approved.
-      const yes = /^(y|yes)$/i.test(String(answer ?? '').trim());
-      this.push(dim(yes ? '  approved' : '  declined'));
+      const said = String(answer ?? '').trim();
+      const yes = always && /^(a|always)$/i.test(said) ? 'always' : /^(y|yes)$/i.test(said);
+      this.push(dim(yes === 'always' ? `  approved — ${always} is always allowed here now` : yes ? '  approved' : '  declined'));
       this.push('');
       return yes;
     });
@@ -1430,12 +1447,30 @@ export class Screen {
       if (row !== statusRow) return;
       if (col > g.left + 1 && col <= g.left + this.chipTo) this.toggleMode();
       else if (col >= g.left + this.plusFrom && col <= g.left + this.plusTo) this.onAttach?.();
+      else if (col >= g.left + this.micFrom && col <= g.left + this.micTo) this.onMic?.('toggle');
       return;
     }
-    // The mode chip and the "+ file" button, at the left of the bottom row.
+    // The mode chip, "+ file" and mic buttons, at the left of the bottom row.
     if (row !== this.rows - 1) return;
     if (col >= 2 && col <= this.chipTo) this.toggleMode();
     else if (col >= this.plusFrom && col <= this.plusTo) this.onAttach?.();
+    else if (col >= this.micFrom && col <= this.micTo) this.onMic?.('toggle');
+  }
+
+  /** The mic's state, for the chip: null, 'starting', 'listening' or 'writing'. */
+  setListening(state) {
+    this.listening = state;
+    this.render();
+  }
+
+  /** Words from the mic, into the box at the cursor; `send` presses enter for them. */
+  insertText(text, { send = false } = {}) {
+    const before = this.buffer.slice(0, this.cursor);
+    const joined = before && !before.endsWith(' ') ? `${before} ${text}` : before + text;
+    this.buffer = joined + this.buffer.slice(this.cursor);
+    this.cursor = joined.length;
+    if (send) this.onKey('\r');
+    else this.render();
   }
 
   /** A file chosen with "+ file", to go with the next message. */
@@ -1470,6 +1505,12 @@ export class Screen {
       return;
     }
 
+    // While the mic listens, enter means "done, send it" and esc means "never mind".
+    if (this.listening === 'listening') {
+      if (key === '\r' || key === '\n') { this.onMic?.('send'); return; }
+      if (key === ESC || key === '\x03') { this.onMic?.('cancel'); return; }
+    }
+
     switch (key) {
       case '\r':
       case '\n': {
@@ -1516,6 +1557,10 @@ export class Screen {
         this.onAttach?.();
         return;
 
+      case '\x14':  // ctrl+t — the mic button: start listening, or stop and put the words in the box
+        this.onMic?.('toggle');
+        return;
+
       case '\x15':  // ctrl+u — clear the line; on an empty line, the attached files
         if (!this.buffer) this.attachments = [];
         this.buffer = this.buffer.slice(this.cursor);

package/src/ui/theme.js

@@ -130,6 +130,13 @@ export const modeChip = (mode) =>
 /** The "+ file" button beside the mode chip, in the quieter of the two chip styles. */
 export const ADD_CHIP = PLAN_CHIP(' + file ');
 
+/** The mic button beside it: quiet when idle, red while it is listening. */
+const LISTEN_CHIP = chalk.bgHex('#e5484d').hex('#ffffff').bold;
+export const micChip = (state) =>
+  state === 'listening' ? LISTEN_CHIP(' ● listening ')
+    : state ? PLAN_CHIP(` ${state === 'starting' ? 'starting' : 'writing'}… `)
+      : PLAN_CHIP(' mic ');
+
 /** The spinner. Braille dots, because they animate in place without jitter. */
 export const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 
@@ -787,8 +794,30 @@ const CAVEAT = /\b(?:however|failed|couldn't|could not|cannot|can't|didn't|did n
 const ACTIONABLE = /\b(?:open|run|serve|visit|try|start|npm|npx|node|pnpm|yarn)\b|https?:\/\/|\.(?:html?|css|jsx?|tsx?|md|json|py|rs|go)\b/i;
 const BULLET = /^\s*(?:[-*•>]|\d+[.)]|[✓✔✅☑])\s+/;
 
+/**
+ * Words that say nothing about this app, because they are said about every
+ * app: "a sleek, modern and intuitive interface for a seamless experience".
+ */
+export const STOCK = /\b(?:seamless(?:ly)?|sleek|modern and clean|clean and modern|robust|intuitive|user-friendly|cutting-edge|state-of-the-art|elevate[sd]?|effortless(?:ly)?|stunning|delightful|vibrant|happy coding|feel free to|i hope (?:this|you)|let me know if)\b/i;
+
+/**
+ * The closing message without its stock sentences. A sentence goes only when
+ * it is pure filler: one that says how to try the app, or admits something is
+ * unfinished, stays whatever words it uses. Never returns nothing.
+ */
+export function withoutStock(text) {
+  const lines = String(text ?? '').replace(/\r/g, '').split('\n');
+  const out = [];
+  for (const line of lines) {
+    if (!STOCK.test(line)) { out.push(line); continue; }
+    const kept = line.split(/(?<=[.!?])\s+/).filter((s) => !STOCK.test(s) || ACTIONABLE.test(s) || CAVEAT.test(s));
+    if (kept.length) out.push(kept.join(' '));
+  }
+  return out.join('\n').trim() || lines.join('\n').trim();
+}
+
 export function trimAnswer(text, max = ANSWER_LINES) {
-  const all = String(text ?? '').replace(/\r/g, '').split('\n');
+  const all = withoutStock(text).split('\n');
 
   let start = 0;
   while (start < all.length && (!all[start].trim() || RESTATED.test(all[start].trim()))) start++;

package/ucode.js

@@ -39,6 +39,9 @@ function parseArgs(argv) {
     else if (a === '--cwd' || a === '-C') args.cwd = path.resolve(argv[++i]);
     else if (a === '--help' || a === '-h') args.help = true;
     else if (a === '--version' || a === '-v') args.version = true;
+    else if (a === '--print' || a === '-p') args.print = argv[i + 1] && !argv[i + 1].startsWith('-') ? argv[++i] : '-';
+    else if (a === '--json') args.json = true;
+    else if (a === '--yes' || a === '-y') args.yes = true;
   }
 
   return args;
@@ -59,10 +62,16 @@ async function usage() {
     '    -C, --cwd <dir>    work in another directory\n' +
     '        --plan         start in plan mode: read and research, change nothing\n' +
     '        --debug        print stack traces when something breaks\n' +
+    '    -p, --print <task> do one task with no keyboard, print the answer, exit\n' +
+    '        --json         with -p: print one JSON object about the run instead\n' +
+    '    -y, --yes          with -p: say yes to anything that would be asked\n' +
     '    -v, --version      print the version\n' +
     '    -h, --help         this message\n' +
     '    doctor             check that everything ucode needs is working\n' +
-    '    login <key>        save your key for every folder on this machine\n\n' +
+    '    login <key>        save your key for every folder on this machine\n' +
+    '    mcp add <name> <command> [args...]   connect an MCP server (--url <url> for a remote one)\n' +
+    '    mcp list | mcp remove <name>\n\n' +
+    `  ${sky('Other models')}  UCODE_BASE_URL=http://localhost:11434/v1 UCODE_MODEL=<model> ucode  (Ollama, offline)\n\n` +
     `  ${sky('Models')}\n${models}\n\n` +
     `  Needs GEMINI_API_KEY in the environment or in ${ENV_FILE}\n` +
     '  Free keys: https://aistudio.google.com/apikey\n\n'
@@ -92,6 +101,33 @@ async function main() {
     return;
   }
 
+  if (process.argv[2] === 'mcp') {
+    const { mcpCommand } = await import('./src/core/mcpcli.js');
+    process.stdout.write(`${await mcpCommand(process.argv.slice(3))}\n`);
+    return;
+  }
+
+  if (args.print !== undefined) {
+    let prompt = args.print;
+    if (prompt === '-') {
+      const chunks = [];
+      for await (const chunk of process.stdin) chunks.push(chunk);
+      prompt = Buffer.concat(chunks).toString('utf8').trim();
+    }
+    if (!prompt) {
+      process.stderr.write('ucode -p needs a task: ucode -p "fix the failing test"\n');
+      process.exitCode = 2;
+      return;
+    }
+    const [, { setModel }] = await heavy();
+    if (args.model) setModel(args.model);
+    const { runHeadless } = await import('./src/core/headless.js');
+    const code = await runHeadless({ cwd: args.cwd, prompt, json: args.json, yes: args.yes, plan: args.plan });
+    // A one-shot run ends here, whatever handle something left open.
+    process.stdout.write('', () => process.exit(code));
+    return;
+  }
+
   // Update before the session starts, not after it ends.
   //
   // Installing in the background and taking effect "next time" means the run