ucode-agent 1.29.0 → 1.29.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucode-agent",
-  "version": "1.29.0",
+  "version": "1.29.1",
   "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/ui/screen.js

@@ -186,6 +186,7 @@ export class Screen {
     this.intro = 0;       // when the launch sweep began, 0 once it is over
     this.introTimer = null;
     this.pendingPrompt = null;
+    this.lastPrompt = '';  // the last thing the user said, for the echo check
     this.facts.branch = gitBranch(cwd);
 
     this.cols = output.columns || 80;
@@ -340,7 +341,8 @@ export class Screen {
    */
   assistant(text, { closing = false } = {}) {
     if (!text?.trim()) return;
-    const body = closing ? trimAnswer(tidyReply(text)) : tidyReply(text);
+    const tidy = tidyReply(text, 4, this.lastPrompt);
+    const body = closing ? trimAnswer(tidy) : tidy;
     if (!body.trim()) return;
     this.endRun();
     this.add('');
@@ -367,6 +369,9 @@ export class Screen {
    * loud as the input box, none of them saying anything the rail does not.
    */
   userMessage(text) {
+    // Kept so the reply can be checked against it: an answer that opens by
+    // saying the request back is repeating the line directly above it.
+    this.lastPrompt = String(text ?? '');
     const room = Math.max(8, this.width() - 2);   // the rail and the space after it
 
     const rows = [];
@@ -730,14 +735,21 @@ export class Screen {
     const room = Math.max(8, inner - BANNER_WIDTH - 6);
     const value = (v) => clip(String(v), Math.max(4, room - 10));
     const branch = this.facts.branch;
+
+    // The facts run together from the top with nothing between them, the credit
+    // sits on the last row, and whatever is left over is the gap between the
+    // two. Holding a row empty in the middle of the list — which is what a
+    // fixed six-row layout did when a fact was missing — reads as a line that
+    // failed to draw rather than as spacing.
     const facts = [
       ['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)] : ['', ''],
-      ['', ''],
+      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')],
-      ['', 'made with ❤️ by om dixit'],
-    ];
+    ].filter(Boolean).slice(0, BANNER.length - 1);
+
+    while (facts.length < BANNER.length - 1) facts.push(['', '']);
+    facts.push(['', 'made with ❤️ by om dixit']);
 
     const rows = BANNER.map((art, i) => {
       const [label, text] = facts[i] ?? ['', ''];

package/src/ui/theme.js

@@ -535,7 +535,7 @@ export function withoutCodeBlocks(text, keepLines = 4) {
  * colon pointing at nothing reads as the reply having been cut off. A short
  * block stays: three lines showing a command to run belong in an answer.
  */
-export function tidyReply(text, keepLines = 4) {
+export function tidyReply(text, keepLines = 4, prompt = '') {
   const MARK = "\u0000CUT\u0000";
   const FENCE = new RegExp("```([A-Za-z0-9+-]*)\\n([\\s\\S]*?)```", "g");
 
@@ -545,11 +545,76 @@ export function tidyReply(text, keepLines = 4) {
   });
 
   const leadIn = new RegExp("(?:^|\\n)[^\\n]{0,80}:[ \t]*\\n+" + MARK, "g");
-  return marked
+  const body = marked
     .replace(leadIn, "\n")
     .split(MARK).join("")
     .replace(new RegExp("\\n{3,}", "g"), "\n\n")
     .trim();
+  return withoutRestatement(body, prompt);
+}
+
+/**
+ * The words of a line worth comparing: lowercase, no punctuation, and nothing
+ * short enough to turn up in any sentence at all.
+ */
+const significant = (s) => String(s ?? '')
+  .toLowerCase()
+  .replace(/[^a-z0-9\s]+/g, ' ')
+  .split(/\s+/)
+  .filter((w) => w.length >= 3);
+
+/**
+ * Is this line the request handed back?
+ *
+ * A list of phrases catches the openings a model reaches for out of habit, but
+ * the commonest way of repeating a request is simply saying it again in the
+ * asker's own words — "A Next.js habit tracker with a clean dashboard, coming
+ * right up" — and no list will ever match that. So the line is compared with
+ * what was actually typed.
+ *
+ * Three guards keep it off real answers. A prompt of four significant words or
+ * fewer is never matched, because at that length an overlap means nothing. A
+ * line much longer than the prompt is saying more than the prompt did, so it
+ * is content. And the bar is four fifths of the prompt's words rather than a
+ * majority: an answer naturally shares nouns with the request that prompted
+ * it, and only something repeating nearly all of it is a repetition.
+ */
+export function echoesPrompt(line, prompt) {
+  const want = [...new Set(significant(prompt))];
+  if (want.length < 4) return false;
+
+  const text = String(line ?? '');
+  if (text.length > String(prompt ?? '').length * 2.5) return false;
+
+  const have = new Set(significant(text));
+  return want.filter((w) => have.has(w)).length / want.length >= 0.8;
+}
+
+/**
+ * The reply with any opening that reads the request back taken off the front.
+ *
+ * This ran only on the closing message before, and it belongs on every one. A
+ * model that answers "You asked me to add a dark mode toggle — done" has spent
+ * its first line telling someone something they typed themselves, and the line
+ * directly above it on screen is already their own message, in their own
+ * words, against a rail. Two copies of the request and one of the answer is
+ * the wrong ratio.
+ *
+ * It never returns nothing. A reply that is only a restatement is still the
+ * whole of the reply, and an empty answer on screen reads as a crash.
+ */
+export function withoutRestatement(text, prompt = '') {
+  const rows = String(text ?? '').replace(/\r/g, '').split('\n');
+
+  let start = 0;
+  while (start < rows.length) {
+    const line = rows[start].trim();
+    if (!line) { start++; continue; }
+    if (!RESTATED.test(line) && !echoesPrompt(line, prompt)) break;
+    start++;
+  }
+
+  return rows.slice(start).join('\n').trim() || String(text ?? '').trim();
 }
 
 /**
@@ -568,7 +633,7 @@ export function tidyReply(text, keepLines = 4) {
 export const ANSWER_LINES = 8;
 const ANSWER_ROOM = 600;   // eight wrapped lines of prose, for a reply with no line breaks in it
 
-const RESTATED = /^(?:you (?:asked|wanted|requested|said)\b|the (?:request|task|ask)\b|as (?:you )?requested\b|here(?:'s| is) what (?:you asked|i)\b|to (?:summarise|summarize|recap)\b|(?:request|task|summary|recap|overview)\s*:)/i;
+export const RESTATED = /^(?:(?:sure|ok|okay|got it|understood|alright|right)\b[\s,!.—-]*)?(?:you(?:'ve| have)? (?:asked|want|wanted|requested|said|would like|need)\b|the (?:request|task|ask)\b|as (?:you )?requested\b|here(?:'s| is) what (?:you asked|i)\b|i(?:'ll| will|'m going to| am going to) (?:build|create|make|add|write|implement)\b|let(?:'s| us) (?:build|create|make|add|write|implement)\b|to (?:summarise|summarize|recap)\b|(?:request|task|summary|recap|overview)\s*:)/i;
 const CAVEAT = /\b(?:however|failed|couldn't|could not|cannot|can't|didn't|did not|isn't|is not|doesn't|does not|not (?:yet|wired|working|done|implemented)|missing|unfinished|except)\b/i;
 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+/;