ucode-agent 1.21.0 → 1.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucode-agent",
-  "version": "1.21.0",
+  "version": "1.23.0",
   "description": "ucode - a terminal coding agent that reads, edits and runs your code, on NVIDIA and Cohere models.",
   "type": "module",
   "main": "ucode.js",

package/src/core/loop.js

@@ -459,6 +459,12 @@ function systemPrompt({ cwd, skills, mode, check, map, memory }) {
     'already contains it. Do not re-check work the checks have already reported on.',
     'Fast is not sloppy: it is the same work with the waiting taken out.',
     '',
+    'Never repeat the request back. Not as a summary, not as a restatement, not as',
+    'a list of what was asked for. They wrote it and it is on the screen above you.',
+    'Do not narrate your planning either - which files you will make, what order you',
+    'will do them in, what you are about to consider. Say what you are building and',
+    'then build it.',
+    '',
     'SPEAK AS "I", NEVER "WE". You are doing this, not a committee: "I will build',
     'Tide as a single HTML file", not "we have created the file".',
     '',
@@ -478,15 +484,18 @@ function systemPrompt({ cwd, skills, mode, check, map, memory }) {
     'steps already show on screen, and repeating them in words buries the few',
     'sentences worth reading.',
     '',
-    'FIRST, EVERY TIME: write one short line saying what you are about to do, then',
-    'make the tool calls. Never open a turn with a tool call and no words. Examples:',
-    '"Right, the HTML structure first." / "Now the state and the render loop." /',
-    '"That is the layout done - onto the animations." / "Let me see what is there."',
-    'One sentence, your own voice, before the actions - not after them, not instead',
-    'of them, and not a restatement of what was asked. The user is watching this',
-    'scroll past; without those lines it is a list of file operations and they cannot',
-    'tell what you are building. This matters as much as the code.',
-    '',
+    'YOUR FIRST WORDS, BEFORE ANY TOOL CALL, EVERY TIME. Nothing else appears on',
+    'screen while you work, so if you say nothing the user watches a blank page.',
+    'Open with one line:  I will build Tide for you - a tasks app in a single HTML',
+    'file.  Then one line each time you start a new piece of the work:  Now the',
+    'components.  /  Now making the filter row.  /  Onto the animations.  Then one',
+    'line at the end: what it does and how to try it.',
+    '',
+    'Those lines are the whole of what the user reads. They are not thinking out',
+    'loud: never "I need to", never "Let me", never "The user wants", never a plan',
+    'of which files you will touch. Say what you are doing, the way you would to',
+    'someone watching over your shoulder.',
+    '',
 
     '',
     'Before you guess at an API, ask: type_of gives the exact signature from the',
@@ -1411,7 +1420,7 @@ export class Agent {
     // A build or type check that just passed already verified everything
     // changed so far; the automatic check at the end would only repeat it.
     if (call.name === 'run_command' && out.exitCode === 0 &&
-        /(?:next build|npm run build|pnpm (?:run )?build|tsc)/.test(call.args?.command ?? '')) {
+        /(?:next build|npm run build|pnpm (?:run )?build|tsc)/.test(call.args?.command ?? '')) {
       this.sinceCheck?.clear();
     }
     if (!QUIET.has(call.name)) this.ui.toolResult(out.summary);

package/src/ui/plain.js

@@ -1,349 +1,351 @@
-/**
- * plain.js — the interface for when there is no terminal to draw on.
- *
- * Piped input, CI, `echo "fix the test" | ucode`, a shell wrapper that hands
- * over a pipe instead of a keyboard. There is no frame to repaint here, so
- * output is simply printed in order and the prompt is one readline line.
- *
- * It carries the same method names as screen.js on purpose: the agent loop
- * talks to one interface and never asks which one it got.
- */
-
-import readline from 'node:readline';
-import chalk from 'chalk';
-import {
-  theme, blue, sky, dim, boxTop, boxBottom, boxRow,
-  BANNER, BANNER_WIDTH, SPINNER, clip, shortenPath, asLabel, padVis, visLen, planLine,
-} from './theme.js';
-import { formatDuration, doneLine } from './activity.js';
-import { renderer, render } from './markdown.js';
-
-const COMMANDS = [
-  '/help', '/model', '/models', '/session', '/sessions', '/resume',
-  '/new', '/remember', '/skills', '/clear', '/search', '/copy', '/exit',
-];
-
-export class Plain {
-  constructor({ cwd, input = process.stdin, output = process.stdout } = {}) {
-    this.cwd = cwd;
-    this.output = output;
-    this.closed = false;
-    this.mode = 'build';   // no way to toggle without a keyboard; stays here
-    this.model = '';
-    this.timer = null;
-    this.frame = 0;
-    this.md = renderer(output.columns || 80);
-
-    this.rl = readline.createInterface({
-      input,
-      output,
-      historySize: 200,
-      completer(line) {
-        if (!line.startsWith('/')) return [[], line];
-        const hits = COMMANDS.filter((c) => c.startsWith(line));
-        return [hits.length ? hits : COMMANDS, line];
-      },
-    });
-
-    // Input is queued rather than read with rl.question(). When stdin is a
-    // pipe, readline emits every buffered line at once, so a question-per-turn
-    // loop would drop all but the first. Queueing behaves the same way
-    // interactively and makes piping work.
-    this.queue = [];
-    this.waiters = [];
-
-    this.rl.on('line', (line) => {
-      const clean = line.replace(/^/, ''); // strip a BOM on the first line
-      const waiter = this.waiters.shift();
-      if (waiter) waiter(clean);
-      else this.queue.push(clean);
-    });
-
-    this.rl.on('close', () => {
-      this.closed = true;
-      while (this.waiters.length) this.waiters.shift()(null);
-    });
-  }
-
-  width() {
-    return Math.max(30, this.output.columns || 80);
-  }
-
-  // -- output --------------------------------------------------------------
-
-  write(text = '') {
-    this.stopSpinner();
-    this.output.write(`${text}\n`);
-  }
-
-  blank() { this.write(''); }
-  note(text) { this.write(dim(`  ${text}`)); }
-
-  clearScreen() {
-    this.stopSpinner();
-    this.output.write('\x1B[2J\x1B[3J\x1B[H');
-  }
-
-  header({ cwd, model, used, limit, title }) {
-    this.stopSpinner();
-    this.model = model || this.model;
-    this.percent = limit > 0 ? Math.min(100, Math.round((used / limit) * 100)) : 0;
-
-    const width = this.width();
-    const room = Math.max(8, width - BANNER_WIDTH - 8);
-
-    const facts = [
-      ['dir', shortenPath(cwd, room - 9)],
-      ['keys', '/help'],
-      ['', ''],
-      ['', ''],
-      ['', 'made with ❤️ by om dixit'],
-    ];
-
-    // There is no input box to hang the status off here, so it goes on the
-    // last row inside the header box — still framed, still the same three
-    // facts, just attached to the only box this interface has.
-    const rows = width >= BANNER_WIDTH + 30
-      ? BANNER.map((art, i) => {
-          const [label, value] = facts[i] ?? ['', ''];
-          const right = label
-            ? `${dim(label.padEnd(9))}${chalk.white(clip(value, room - 9))}`
-            : (value ? dim(value) : '');
-          return `  ${blue(art)}   ${right}`;
-        })
-      : [
-          `  ${blue.bold('U C O D E')}  ${dim('terminal coding agent')}`,
-          ...facts
-            .filter(([label]) => label)
-            .map(([label, value]) => `  ${dim(label.padEnd(9))}${chalk.white(clip(value, width - 16))}`),
-        ];
-
-    this.write('');
-    this.write(boxTop(width));
-    for (const row of rows) this.write(boxRow(row, width));
-    this.write(boxRow(this.statusRow(), width));
-    this.write(boxBottom(width));
-    this.write('');
-  }
-
-  setFacts() { /* nothing to repaint without a frame */ }
-
-  /** The same three facts the full screen shows, on the row under the header. */
-  statusRow() {
-    const inner = this.width() - 2;
-    const chip = this.mode === 'plan' ? `${sky('◇')} ${sky('Plan')}` : `${blue('◆')} ${blue('Build')}`;
-    const left = ` ${chip} ${dim('·')} ${chalk.white(this.model || '—')}`;
-    const percent = Math.round(this.percent ?? 0);
-    const right = `${percent >= 75 ? theme.warn(`${percent}%`) : dim(`${percent}%`)} `;
-    const pad = Math.max(1, inner - visLen(left) - visLen(right));
-    return padVis(left + ' '.repeat(pad) + right, inner);
-  }
-
-  toolCall(label) {
-    this.stopSpinner();
-    this.output.write(`${blue('●')} ${asLabel(label)}\n`);
-  }
-
-  plan(items) {
-    const line = planLine(items);
-    if (line) this.write(line);
-  }
-
-  toolResult(summary) {
-    this.stopSpinner();
-    this.output.write(dim(`  └ ${summary}\n`));
-  }
-
-  toolFailed(summary) {
-    this.stopSpinner();
-    this.output.write(`${dim('  └ ')}${theme.error(summary)}\n`);
-  }
-
-  /** The change, with the same line-number gutter the full screen uses. */
-  diff(lines) {
-    this.stopSpinner();
-    for (const line of lines) {
-      if (line.startsWith('~')) {
-        this.output.write(`         ${sky(line.slice(1))}\n`);
-        continue;
-      }
-      const added = line.startsWith('+');
-      const rest = line.slice(1);
-      const parsed = /^(\d+)\|\s?([\s\S]*)$/.exec(rest);
-      if (!parsed) {
-        this.output.write(`         ${dim(rest)}\n`);
-        continue;
-      }
-      const [, number, body] = parsed;
-      const paint = added ? theme.ok : theme.error;
-      this.output.write(`  ${dim(number.padStart(6))} ${paint(`${added ? '+' : '-'} ${body}`)}\n`);
-    }
-  }
-
-  commandOutput(lines) {
-    this.stopSpinner();
-    for (const line of lines) this.output.write(`    ${dim(line)}\n`);
-  }
-
-  assistant(text) {
-    const out = render(this.md, text);
-    if (!out) return;
-    this.stopSpinner();
-    this.output.write(`\n${out}\n\n`);
-  }
-
-  narrate(text) {
-    const line = asLabel(text);
-    if (!line) return;
-    this.stopSpinner();
-    this.write(dim(`  ⋮ ${line}`));
-  }
-
-  progress(lines) {
-    const last = lines[lines.length - 1]?.trim();
-    if (last) this.updateSpinner(last);
-  }
-
-  // Streaming has nowhere to repaint here, so the reply is printed whole when
-  // it is finished. The loop only streams into a real terminal anyway.
-  streamBegin() {}
-  streamDelta() {}
-  streamEnd() { return ''; }
-  thinkingDelta() {}
-  thinkingEnd() {}
-
-  // -- spinner -------------------------------------------------------------
-
-  startSpinner(text = 'thinking') {
-    this.stopSpinner();
-    if (!this.output.isTTY) return; // a pipe does not want animation frames
-    this.spinnerText = asLabel(text);
-    this.since = Date.now();
-    this.timer = setInterval(() => {
-      this.frame = (this.frame + 1) % SPINNER.length;
-      this.paintSpinner();
-    }, 100);
-    this.timer.unref?.();
-    this.paintSpinner();
-  }
-
-  paintSpinner() {
-    const since = this.turn?.start ?? this.since;
-    const secs = Math.round((Date.now() - since) / 1000);
-    const meta = [this.turn?.steps ? `step ${this.turn.steps}` : '', secs >= 2 ? formatDuration(secs * 1000) : '']
-      .filter(Boolean).join(' · ');
-    const line = `  ${blue(SPINNER[this.frame])} ${dim(this.spinnerText)}` + (meta ? dim(` · ${meta}`) : '');
-    this.output.write(`\r\x1b[K${padVis(line, this.width() - 1)}`);
-  }
-
-  updateSpinner(text) {
-    if (!this.timer) return;
-    this.spinnerText = asLabel(text);
-    this.paintSpinner();
-  }
-
-  stopSpinner() {
-    if (!this.timer) return;
-    clearInterval(this.timer);
-    this.timer = null;
-    this.output.write('\r\x1b[K');
-  }
-
-  // -- the turn in flight ----------------------------------------------------
-
-  turnStart() {
-    this.turn = { start: Date.now(), steps: 0 };
-  }
-
-  step() {
-    if (this.turn) this.turn.steps++;
-  }
-
-  turnEnd({ ok = true } = {}) {
-    const t = this.turn;
-    this.turn = null;
-    if (t && Date.now() - t.start >= 2000) this.write(`  ${doneLine(Date.now() - t.start, t.steps, { ok })}`);
-  }
-
-  // -- input ---------------------------------------------------------------
-
-  nextLine() {
-    if (this.queue.length) return Promise.resolve(this.queue.shift());
-    if (this.closed) return Promise.resolve(null);
-    return new Promise((resolve) => this.waiters.push(resolve));
-  }
-
-  promptWith(text) {
-    this.rl.setPrompt(text);
-    this.rl.prompt();
-    return this.nextLine();
-  }
-
-  ask() {
-    this.stopSpinner();
-    return this.promptWith(`${blue('› ')}`);
-  }
-
-  async confirm({ action, detail, risk }) {
-    this.stopSpinner();
-    const badge = risk === 'command' ? ' shell ' : ' outside project ';
-    this.output.write(`\n${chalk.inverse(theme.warn(badge))} ${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] ')}`);
-    // 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'));
-    return yes;
-  }
-
-  async choose(prompt, items, { allowNone = true } = {}) {
-    this.stopSpinner();
-    items.forEach((item, i) => this.output.write(`  ${blue(String(i + 1).padStart(2))}. ${item}\n`));
-    if (allowNone) this.output.write(dim('   0. none — start fresh\n'));
-    this.output.write('\n');
-
-    const answer = await this.promptWith(`${blue('› ')}${dim(`${prompt} `)}`);
-    if (answer === null) return null;
-
-    const trimmed = String(answer).trim();
-    if (trimmed === '' || trimmed === '0') return null;
-
-    const index = Number(trimmed);
-    if (!Number.isInteger(index) || index < 1 || index > items.length) {
-      this.write(theme.warn(`  "${trimmed}" is not one of 1-${items.length}. Starting fresh.`));
-      return null;
-    }
-    return index - 1;
-  }
-
-  error(err, { debug = false } = {}) {
-    this.stopSpinner();
-    const known = err && typeof err === 'object' && err.attempted;
-
-    this.output.write('\n');
-    if (known) {
-      this.output.write(`${theme.error('✗')} ${chalk.white(`Failed while ${err.attempted}.`)}\n`);
-      this.output.write(`  ${err.failed}\n`);
-      if (err.fix) this.output.write(`  ${blue('→')} ${err.fix}\n`);
-      if (err.kind) this.output.write(dim(`  (${err.kind})\n`));
-    } else {
-      this.output.write(`${theme.error('✗')} ${chalk.white('Something broke inside ucode.')}\n`);
-      this.output.write(`  ${err?.message ?? String(err)}\n`);
-      this.output.write(`  ${blue('→')} That is a bug in ucode rather than in your project. Re-run with --debug.\n`);
-    }
-
-    if (debug) {
-      const stack = (known && err.cause?.stack) || err?.stack;
-      if (stack) this.output.write(dim(`\n${stack}\n`));
-    }
-    this.output.write('\n');
-  }
-
-  close() {
-    this.stopSpinner();
-    this.rl.close();
-  }
-}
+/**
+ * plain.js — the interface for when there is no terminal to draw on.
+ *
+ * Piped input, CI, `echo "fix the test" | ucode`, a shell wrapper that hands
+ * over a pipe instead of a keyboard. There is no frame to repaint here, so
+ * output is simply printed in order and the prompt is one readline line.
+ *
+ * It carries the same method names as screen.js on purpose: the agent loop
+ * talks to one interface and never asks which one it got.
+ */
+
+import readline from 'node:readline';
+import chalk from 'chalk';
+import {
+  theme, blue, sky, dim, boxTop, boxBottom, boxRow,
+  BANNER, BANNER_WIDTH, SPINNER, clip, shortenPath, asLabel, padVis, visLen, planLine,
+} from './theme.js';
+import { formatDuration, doneLine } from './activity.js';
+import { renderer, render } from './markdown.js';
+
+const COMMANDS = [
+  '/help', '/model', '/models', '/session', '/sessions', '/resume',
+  '/new', '/remember', '/skills', '/clear', '/search', '/copy', '/exit',
+];
+
+export class Plain {
+  constructor({ cwd, input = process.stdin, output = process.stdout } = {}) {
+    this.cwd = cwd;
+    this.output = output;
+    this.closed = false;
+    this.mode = 'build';   // no way to toggle without a keyboard; stays here
+    this.model = '';
+    this.timer = null;
+    this.frame = 0;
+    this.md = renderer(output.columns || 80);
+
+    this.rl = readline.createInterface({
+      input,
+      output,
+      historySize: 200,
+      completer(line) {
+        if (!line.startsWith('/')) return [[], line];
+        const hits = COMMANDS.filter((c) => c.startsWith(line));
+        return [hits.length ? hits : COMMANDS, line];
+      },
+    });
+
+    // Input is queued rather than read with rl.question(). When stdin is a
+    // pipe, readline emits every buffered line at once, so a question-per-turn
+    // loop would drop all but the first. Queueing behaves the same way
+    // interactively and makes piping work.
+    this.queue = [];
+    this.waiters = [];
+
+    this.rl.on('line', (line) => {
+      const clean = line.replace(/^/, ''); // strip a BOM on the first line
+      const waiter = this.waiters.shift();
+      if (waiter) waiter(clean);
+      else this.queue.push(clean);
+    });
+
+    this.rl.on('close', () => {
+      this.closed = true;
+      while (this.waiters.length) this.waiters.shift()(null);
+    });
+  }
+
+  width() {
+    return Math.max(30, this.output.columns || 80);
+  }
+
+  // -- output --------------------------------------------------------------
+
+  write(text = '') {
+    this.stopSpinner();
+    this.output.write(`${text}\n`);
+  }
+
+  blank() { this.write(''); }
+  note(text) { this.write(dim(`  ${text}`)); }
+
+  clearScreen() {
+    this.stopSpinner();
+    this.output.write('\x1B[2J\x1B[3J\x1B[H');
+  }
+
+  header({ cwd, model, used, limit, title }) {
+    this.stopSpinner();
+    this.model = model || this.model;
+    this.percent = limit > 0 ? Math.min(100, Math.round((used / limit) * 100)) : 0;
+
+    const width = this.width();
+    const room = Math.max(8, width - BANNER_WIDTH - 8);
+
+    const facts = [
+      ['dir', shortenPath(cwd, room - 9)],
+      ['keys', '/help'],
+      ['', ''],
+      ['', ''],
+      ['', 'made with ❤️ by om dixit'],
+    ];
+
+    // There is no input box to hang the status off here, so it goes on the
+    // last row inside the header box — still framed, still the same three
+    // facts, just attached to the only box this interface has.
+    const rows = width >= BANNER_WIDTH + 30
+      ? BANNER.map((art, i) => {
+          const [label, value] = facts[i] ?? ['', ''];
+          const right = label
+            ? `${dim(label.padEnd(9))}${chalk.white(clip(value, room - 9))}`
+            : (value ? dim(value) : '');
+          return `  ${blue(art)}   ${right}`;
+        })
+      : [
+          `  ${blue.bold('U C O D E')}  ${dim('terminal coding agent')}`,
+          ...facts
+            .filter(([label]) => label)
+            .map(([label, value]) => `  ${dim(label.padEnd(9))}${chalk.white(clip(value, width - 16))}`),
+        ];
+
+    this.write('');
+    this.write(boxTop(width));
+    for (const row of rows) this.write(boxRow(row, width));
+    this.write(boxRow(this.statusRow(), width));
+    this.write(boxBottom(width));
+    this.write('');
+  }
+
+  setFacts() { /* nothing to repaint without a frame */ }
+
+  /** The same three facts the full screen shows, on the row under the header. */
+  statusRow() {
+    const inner = this.width() - 2;
+    const chip = this.mode === 'plan' ? `${sky('◇')} ${sky('Plan')}` : `${blue('◆')} ${blue('Build')}`;
+    const left = ` ${chip} ${dim('·')} ${chalk.white(this.model || '—')}`;
+    const percent = Math.round(this.percent ?? 0);
+    const right = `${percent >= 75 ? theme.warn(`${percent}%`) : dim(`${percent}%`)} `;
+    const pad = Math.max(1, inner - visLen(left) - visLen(right));
+    return padVis(left + ' '.repeat(pad) + right, inner);
+  }
+
+  toolCall(label) {
+    this.stopSpinner();
+    this.output.write(`${blue('●')} ${asLabel(label)}\n`);
+  }
+
+  plan(items) {
+    const line = planLine(items);
+    if (line) this.write(line);
+  }
+
+  toolResult(summary) {
+    this.stopSpinner();
+    this.output.write(dim(`  └ ${summary}\n`));
+  }
+
+  toolFailed(summary) {
+    this.stopSpinner();
+    this.output.write(`${dim('  └ ')}${theme.error(summary)}\n`);
+  }
+
+  /** The change, with the same line-number gutter the full screen uses. */
+  diff(lines) {
+    this.stopSpinner();
+    for (const line of lines) {
+      if (line.startsWith('~')) {
+        this.output.write(`         ${sky(line.slice(1))}\n`);
+        continue;
+      }
+      const added = line.startsWith('+');
+      const rest = line.slice(1);
+      const parsed = /^(\d+)\|\s?([\s\S]*)$/.exec(rest);
+      if (!parsed) {
+        this.output.write(`         ${dim(rest)}\n`);
+        continue;
+      }
+      const [, number, body] = parsed;
+      const paint = added ? theme.ok : theme.error;
+      this.output.write(`  ${dim(number.padStart(6))} ${paint(`${added ? '+' : '-'} ${body}`)}\n`);
+    }
+  }
+
+  commandOutput(lines) {
+    this.stopSpinner();
+    for (const line of lines) this.output.write(`    ${dim(line)}\n`);
+  }
+
+  assistant(text) {
+    const out = render(this.md, text);
+    if (!out) return;
+    this.stopSpinner();
+    this.output.write(`\n${out}\n\n`);
+  }
+
+  narrate(text) {
+    const line = asLabel(text);
+    if (!line) return;
+    this.stopSpinner();
+    this.write(dim(`  ⋮ ${line}`));
+  }
+
+  progress(lines) {
+    const last = lines[lines.length - 1]?.trim();
+    if (last) this.updateSpinner(last);
+  }
+
+  // Streaming has nowhere to repaint here, so the reply is printed whole when
+  // it is finished. The loop only streams into a real terminal anyway.
+  streamBegin() {}
+  streamDelta() {}
+  streamEnd() { return ''; }
+  thinkingDelta() {}
+  thinkingEnd() {}
+
+  // -- spinner -------------------------------------------------------------
+
+  startSpinner(text = 'thinking') {
+    this.stopSpinner();
+    if (!this.output.isTTY) return; // a pipe does not want animation frames
+    this.spinnerText = asLabel(text);
+    this.since = Date.now();
+    this.timer = setInterval(() => {
+      this.frame = (this.frame + 1) % SPINNER.length;
+      this.paintSpinner();
+    }, 100);
+    this.timer.unref?.();
+    this.paintSpinner();
+  }
+
+  paintSpinner() {
+    const since = this.turn?.start ?? this.since;
+    const secs = Math.round((Date.now() - since) / 1000);
+    const meta = [this.turn?.steps ? `step ${this.turn.steps}` : '', secs >= 2 ? formatDuration(secs * 1000) : '']
+      .filter(Boolean).join(' · ');
+    const line = `  ${blue(SPINNER[this.frame])} ${dim(this.spinnerText)}` + (meta ? dim(` · ${meta}`) : '');
+    this.output.write(`\r\x1b[K${padVis(line, this.width() - 1)}`);
+  }
+
+  updateSpinner(text) {
+    if (!this.timer) return;
+    this.spinnerText = asLabel(text);
+    this.paintSpinner();
+  }
+
+  stopSpinner() {
+    if (!this.timer) return;
+    clearInterval(this.timer);
+    this.timer = null;
+    this.output.write('\r\x1b[K');
+  }
+
+  // -- the turn in flight ----------------------------------------------------
+
+  turnStart() {
+    this.turn = { start: Date.now(), steps: 0 };
+  }
+
+  step() {
+    if (this.turn) this.turn.steps++;
+  }
+
+  turnEnd({ ok = true } = {}) {
+    const t = this.turn;
+    this.turn = null;
+    if (t && !ok && Date.now() - t.start >= 2000) {
+      this.write(`  ${doneLine(Date.now() - t.start, t.steps, { ok })}`);
+    }
+  }
+
+  // -- input ---------------------------------------------------------------
+
+  nextLine() {
+    if (this.queue.length) return Promise.resolve(this.queue.shift());
+    if (this.closed) return Promise.resolve(null);
+    return new Promise((resolve) => this.waiters.push(resolve));
+  }
+
+  promptWith(text) {
+    this.rl.setPrompt(text);
+    this.rl.prompt();
+    return this.nextLine();
+  }
+
+  ask() {
+    this.stopSpinner();
+    return this.promptWith(`${blue('› ')}`);
+  }
+
+  async confirm({ action, detail, risk }) {
+    this.stopSpinner();
+    const badge = risk === 'command' ? ' shell ' : ' outside project ';
+    this.output.write(`\n${chalk.inverse(theme.warn(badge))} ${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] ')}`);
+    // 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'));
+    return yes;
+  }
+
+  async choose(prompt, items, { allowNone = true } = {}) {
+    this.stopSpinner();
+    items.forEach((item, i) => this.output.write(`  ${blue(String(i + 1).padStart(2))}. ${item}\n`));
+    if (allowNone) this.output.write(dim('   0. none — start fresh\n'));
+    this.output.write('\n');
+
+    const answer = await this.promptWith(`${blue('› ')}${dim(`${prompt} `)}`);
+    if (answer === null) return null;
+
+    const trimmed = String(answer).trim();
+    if (trimmed === '' || trimmed === '0') return null;
+
+    const index = Number(trimmed);
+    if (!Number.isInteger(index) || index < 1 || index > items.length) {
+      this.write(theme.warn(`  "${trimmed}" is not one of 1-${items.length}. Starting fresh.`));
+      return null;
+    }
+    return index - 1;
+  }
+
+  error(err, { debug = false } = {}) {
+    this.stopSpinner();
+    const known = err && typeof err === 'object' && err.attempted;
+
+    this.output.write('\n');
+    if (known) {
+      this.output.write(`${theme.error('✗')} ${chalk.white(`Failed while ${err.attempted}.`)}\n`);
+      this.output.write(`  ${err.failed}\n`);
+      if (err.fix) this.output.write(`  ${blue('→')} ${err.fix}\n`);
+      if (err.kind) this.output.write(dim(`  (${err.kind})\n`));
+    } else {
+      this.output.write(`${theme.error('✗')} ${chalk.white('Something broke inside ucode.')}\n`);
+      this.output.write(`  ${err?.message ?? String(err)}\n`);
+      this.output.write(`  ${blue('→')} That is a bug in ucode rather than in your project. Re-run with --debug.\n`);
+    }
+
+    if (debug) {
+      const stack = (known && err.cause?.stack) || err?.stack;
+      if (stack) this.output.write(dim(`\n${stack}\n`));
+    }
+    this.output.write('\n');
+  }
+
+  close() {
+    this.stopSpinner();
+    this.rl.close();
+  }
+}

package/src/ui/screen.js

@@ -106,6 +106,9 @@ const CHROME_BELOW = 6;
 /** How long one sentence of reasoning holds the line before the next takes it. */
 const THOUGHT_HOLD_MS = 1100;
 
+/** Reasoning that is about the request rather than about the work. */
+const RESTATEMENT = /^(?:the user|they|so the user|user)|^(?:i (?:need|should|will need) to (?:understand|figure|work out|check what))|^(?:let me (?:understand|re-?read|look at the (?:request|prompt)))|^(?:the (?:request|prompt|task) (?:is|asks|says))/i;
+
 /** The wordmark only earns its place with room for the facts column beside it. */
 const WORDMARK_NEEDS = BANNER_WIDTH + 30;
 
@@ -316,7 +319,7 @@ export class Screen {
       run.label = label;
       run.targets.push(groupTarget(label));
       this.run = run;
-      this.paintRun({ live: true });
+      this.paintRun();
     } else {
       this.push(`${narrationMark()} ${narration(asLabel(label))}`);
       this.run = {
@@ -324,7 +327,7 @@ export class Screen {
         targets: [groupTarget(label)], added: 0, removed: 0,
       };
       this.segment.set(kind, this.run);
-      this.paintRun({ live: true });
+      this.paintRun();
     }
     this.updateSpinner(label);
   }
@@ -352,19 +355,12 @@ export class Screen {
    * lines are gone. It settles to plain dim the moment the step finishes, so
    * the finished ones above stay quiet.
    */
-  paintRun({ live = this.run?.live } = {}) {
+  paintRun() {
     if (!this.run) return;
-    const text = asLabel(runLine(this.run));
-    this.run.live = live;
-    this.lines[this.run.at] = `${narrationMark()} ${live ? shimmer(text, this.tick * FRAME_MS) : narration(text)}`;
+    this.lines[this.run.at] = `${narrationMark()} ${narration(asLabel(runLine(this.run)))}`;
     this.render();
   }
 
-  /** Let the line in flight animate, one frame per tick. */
-  paintLiveRun() {
-    if (this.run?.live && this.lines[this.run.at] !== undefined) this.paintRun({ live: true });
-  }
-
   /**
    * A change, as its two numbers.
    *
@@ -395,10 +391,7 @@ export class Screen {
    * already names the step, and a change adds its numbers to that same line.
    * Only a failure earns a line of its own.
    */
-  toolResult() {
-    // The step is over: the line stops moving and joins the quiet ones above.
-    if (this.run) this.paintRun({ live: false });
-  }
+  toolResult() {}
 
   /**
    * Something went wrong, and the model is the one who can do anything about it.
@@ -548,39 +541,17 @@ export class Screen {
   // and the transcript gets one line afterwards saying how long it took.
 
   /**
-   * The first thing the model says, as soon as it has said it.
-   *
-   * Models reach for a tool before writing any reply, so nothing appeared for
-   * the first minute of a step. The reasoning channel streams from the first
-   * moment, so its opening sentence goes up as one line and stays there: what
-   * it is setting out to do, which is the thing worth knowing while you wait.
+   * The model's reasoning does not go on screen.
    *
-   * Written once, never rewritten. Rewriting it as more arrived was the
-   * flicker — an unfinished sentence showed as a single word, then jumped.
+   * It was surfaced here to fill the wait before the first tool call, and what
+   * it actually filled it with was the model talking to itself: "I need to
+   * build this", "The user wants a tasks app". Nobody needs their own request
+   * read back to them, and half-formed working-out is not something to publish.
+   * What the model *says* is its reply, and that is the only thing shown.
    */
-  thinkingDelta(text = '') {
-    if (this.thoughtSince === undefined) this.thoughtSince = Date.now();
-    if (!text || this.openedWith) return;
+  thinkingDelta() {}
 
-    this.thought = ((this.thought ?? '') + text).slice(0, 600);
-    const tidy = this.thought.replace(/\s+/g, ' ').trim();
-    const finished = /^(.+?[.!?])(?:\s|$)/.exec(tidy);
-    if (!finished) return;
-
-    const line = finished[1].trim();
-    if (line.length < 12) return;   // "Okay." tells nobody anything
-
-    this.openedWith = line;
-    // Full strength: this is the model talking, and it is the thing on the page
-    // worth reading. The dimmed lines around it are the machinery.
-    this.push('  ' + chalk.white(clip(line, Math.max(30, this.width() - 6))));
-  }
-
-  thinkingEnd() {
-    this.thought = '';
-    this.openedWith = undefined;
-    this.thoughtSince = undefined;
-  }
+  thinkingEnd() {}
 
   error(err, { debug = false } = {}) {
     const known = err && typeof err === 'object' && err.attempted;
@@ -912,9 +883,13 @@ export class Screen {
     const a = this.activity;
     this.activity = null;
     if (!this.status.busy) this.stopTimer();
-    // A turn that stopped without finishing says so. Dropping the line entirely
-    // left the transcript looking like the work was still going.
-    if (a && Date.now() - a.start >= 2000) this.push(`  ${doneLine(Date.now() - a.start, a.steps, { ok })}`);
+    // Nothing is written when a turn finishes. The reply is the end of the
+    // turn, and a timing line under it is bookkeeping the reader did not ask
+    // for. A turn that stopped *without* finishing still says so, because
+    // silence there is indistinguishable from a crash.
+    if (a && !ok && Date.now() - a.start >= 2000) {
+      this.push(`  ${doneLine(Date.now() - a.start, a.steps, { ok })}`);
+    }
     this.paintStatus();
   }
 
@@ -922,8 +897,10 @@ export class Screen {
   startTimer() {
     if (this.spinTimer) return;
     this.spinTimer = setInterval(() => {
+      // Only the status row repaints on a tick. Animating a transcript line
+      // meant redrawing the whole frame twelve times a second, and the input
+      // box was being rebuilt under the user's cursor as they typed.
       this.tick++;
-      this.paintLiveRun();
       this.paintStatus();
     }, FRAME_MS);
     this.spinTimer.unref?.();