@capagents/forgeqe 1.1.7 → 1.1.9

package/src/tui/App.tsx

@@ -30,10 +30,11 @@ import { initWorkspace } from "../init.ts"
 import { ShortcutsPanel } from "./shortcuts.tsx"
 import { ago, getStarted, projectLine, setupSentence, type Fact, type GetStarted, recentWork, startActions, type RecentItem, type StartAction } from "./landing.ts"
 import { TIPS, formatDuration, formatTokens, packageVersion, shortCwd, theme } from "./theme.ts"
-import { emptyProduced, Line, Produced, producedCard, settleCall, sinceRequest, TestsSetting, TranscriptLine, trimLines } from "./transcript.tsx"
+import { emptyProduced, Line, LineRoom, Produced, producedCard, settleCall, sinceRequest, TestsSetting, TranscriptLine, trimLines } from "./transcript.tsx"
 import { Dialog, dialogSpec } from "./dialogs.ts"
 import { activityFromLog, clip, modelLabel } from "./text.ts"
 import { featuresText } from "../capabilities/render.ts"
+import { answerText, attemptCard, reviewCard } from "../code/exchange.ts"
 import { Palette, paletteItems, searchPalette, SuggestList, type PaletteItem } from "./palette.tsx"
 import { commandSuggestions, complete, lookupWorkItem, recentRuns, referenceSuggestions, repoFiles, triggerAt, type Suggestion, type WorkItem } from "./suggest.ts"
 import { initialChoice, REFINE_CHOICES, RefinePanel, type RefineChoice, type RefineState } from "./refine-panel.tsx"
@@ -988,6 +989,17 @@ export function App({ options }: { options: TuiOptions }) {
           else if (ev.kind === "say") record("thought", ev.text, shown)
           else if (ev.kind === "tool") pushTool(ev.text, ev.ok, ev.id, shown)
           else if (ev.kind === "test") record(ev.ok ? "ok" : "err", ev.text, shown)
+          // The exchange with the reviewer: its verdict and Scribe's retries as cards in the conversation, each with a
+          // line in Activity, so it is clear why a test was rejected and what is being fixed.
+          else if (ev.kind === "review") {
+            const card = reviewCard(ev)
+            pushLine({ kind: "card", text: card.title, card })
+            record(ev.approved ? "ok" : "err", `Review, attempt ${ev.attempt}/${ev.max}: ${ev.approved ? "approved" : `changes needed (${ev.issues.length})`} · ${clip(ev.summary, 140)}`, false)
+          } else if (ev.kind === "attempt") {
+            const card = attemptCard(ev)
+            pushLine({ kind: "card", text: card.title, card })
+            record("code", `Attempt ${ev.attempt}/${ev.max}: ${ev.why}${ev.fixing.length ? ` · fixing ${ev.fixing.length}` : ""}`, false)
+          } else if (ev.kind === "answer") record("code", answerText(ev), true)
         }
         if (aborted()) return
         const who = codingRef.current ? "Coding agent" : "Agent"
@@ -995,6 +1007,8 @@ export function App({ options }: { options: TuiOptions }) {
         else if (ev.kind === "tool") setActivity(`${who}: ${clip(ev.text, 60)}`)
         else if (ev.kind === "info" && ev.text.startsWith("ForgeQE runs the test")) setActivity("ForgeQE is running the new test…")
         else if (ev.kind === "say") setActivity(`${who} is working…`)
+        else if (ev.kind === "review") setActivity(ev.approved ? "The reviewer approved the test" : `Scribe is fixing ${ev.issues.length} review ${ev.issues.length === 1 ? "issue" : "issues"}…`)
+        else if (ev.kind === "attempt") setActivity(`Scribe, attempt ${ev.attempt} of ${ev.max}: ${clip(ev.why, 50)}…`)
         return
       }
       case "code-start": {
@@ -1626,7 +1640,7 @@ export function App({ options }: { options: TuiOptions }) {
     const startRows = loading ? 1 + 1 + 4 : offer.length ? 1 + 1 + offer.length : 0
     const recentRows = recent.length ? 1 + 1 + recent.length : 0
     const setupRows = loading || open.length ? 2 : 0
-    const fixed = 5 + 2 + 1 + 3 + 1 + 1 + 1 // logo, project line, gap, prompt border, buttons, footer, one row to spare
+    const fixed = 4 + 2 + 1 + 3 + 1 + 1 + 1 // logo and byline, project line, gap, prompt border, buttons, footer, one row to spare
     const room = height - fixed
     const want = Math.max(5, Math.min(promptLines, room - 1))
     // Refine or a question in the prompt's place takes the room the sections would: they are for starting, not deciding.
@@ -1661,7 +1675,7 @@ export function App({ options }: { options: TuiOptions }) {
           </box>
           <box style={{ height: 1, flexShrink: 0 }} />
           <box style={{ flexDirection: "column", width: promptWidth, flexShrink: 0 }}>
-            {renderControls(promptWidth, "Describe what you want to test…", [5, maxRows], height - 5 - 2 - 1 - 1 - 1)}
+            {renderControls(promptWidth, "Describe what you want to test…", [5, maxRows], height - 4 - 2 - 1 - 1 - 1)}
             {showStart ? (
               <box style={{ flexDirection: "column", marginTop: 1, height: startRows - 1, flexShrink: 0 }}>
                 {heading(offerTitle)}
@@ -1813,10 +1827,12 @@ export function App({ options }: { options: TuiOptions }) {
     )
   }
 
-  const transcript = (every: Line[], style: Record<string, unknown>) => {
+  /** `room`: the columns a line of the conversation has (less the scrollbar), so long links are drawn to fit. */
+  const transcript = (every: Line[], style: Record<string, unknown>, room: number) => {
     // Quiet lines (reads, searches, calls in progress) are the Activity panel's; the conversation stays readable.
     const all = every.filter((l) => !l.quiet)
     return (
+    <LineRoom.Provider value={Math.max(20, room - 1)}>
     <scrollbox ref={scrollRef} stickyScroll stickyStart="bottom" style={{ flexGrow: 1, ...style }} focused={false}>
       {all.map((line, i) => (
         <TranscriptLine key={line.id} line={line} prev={all[i - 1]} />
@@ -1832,6 +1848,7 @@ export function App({ options }: { options: TuiOptions }) {
         </box>
       ) : null}
     </scrollbox>
+    </LineRoom.Provider>
     )
   }
   // A long request gets room: the box grows with the text up to nearly half the screen, then scrolls.
@@ -1847,7 +1864,7 @@ export function App({ options }: { options: TuiOptions }) {
         <box style={{ flexDirection: "row", height: height - 1, flexShrink: 0, paddingTop: 1 }}>
           <box onMouseDown={() => navRef.current.focus !== "chat" && setNav((n) => ({ ...n, focus: "chat" }))} style={{ flexDirection: "column", width: leftWidth, height: height - 2, paddingLeft: 2, paddingRight: 1 }}>
             {infoPanels(leftWidth - 3)}
-            {transcript(chatLines, {})}
+            {transcript(chatLines, {}, leftWidth - 3)}
             <box style={{ flexDirection: "column", flexShrink: 0 }}>{controls(leftWidth - 3)}</box>
           </box>
           <box style={{ flexDirection: "column", width: width - leftWidth, height: height - 2, paddingLeft: 1, paddingRight: 2 }}>
@@ -1883,7 +1900,7 @@ export function App({ options }: { options: TuiOptions }) {
   }
   return (
     <box style={{ flexDirection: "column", flexGrow: 1 }}>
-      {transcript(lines, { paddingLeft: 2, paddingRight: 2, paddingTop: 1 })}
+      {transcript(lines, { paddingLeft: 2, paddingRight: 2, paddingTop: 1 }, width - 4)}
       <box style={{ flexDirection: "column", paddingLeft: 2, paddingRight: 2, flexShrink: 0 }}>{controls(promptWidth)}</box>
       <Footer left={shortCwd()} right={footerRight} width={width} />
       {paletteOverlay}

package/src/tui/components.tsx

@@ -18,14 +18,15 @@ export const BAR = {
 }
 
 export function Logo() {
-  const name = logoRows("forge")
+  // One wordmark in capitals, FORGE in the text colour and QE in the accent: one height, weight, and baseline.
+  const name = logoRows("FORGE")
   const suffix = logoRows("QE")
   return (
     <box style={{ flexDirection: "column", alignItems: "flex-end", flexShrink: 0 }}>
       {name.map((row, i) => (
         <text key={i}>
-          <span fg={theme.faint}>{row}</span>
-          <span fg={theme.text}>{` ${suffix[i]}`}</span>
+          <span fg={theme.text}>{row}</span>
+          <span fg={theme.accent}>{` ${suffix[i]}`}</span>
         </text>
       ))}
       <text fg={theme.muted}>by Capgemini</text>

package/src/tui/text.ts

@@ -31,3 +31,19 @@ export function activityFromLog(text: string): string {
   if (text.startsWith("ForgeQE engine ·")) return "Starting the browser…"
   return clip(text, 70)
 }
+
+/**
+ * A link's text shortened to `max` columns, so it never wraps into what reads as two links. The start and the last
+ * part (the file, or the folder of a path ending in "/") are kept: ".forgeqe/reports/open-defect-rep…/report.html".
+ * The link itself keeps its whole target; only what is drawn is shorter.
+ */
+export function shortLink(text: string, max: number): string {
+  if (text.length <= max || max < 8) return text
+  const trimmed = text.replace(/\/$/, "")
+  const slash = trimmed.lastIndexOf("/")
+  const tail = slash > 0 ? text.slice(slash) : ""
+  // The last part, whole, when it leaves room for a useful start; otherwise both ends of the text.
+  if (tail && tail.length <= max - 10) return `${text.slice(0, max - tail.length - 1)}…${tail}`
+  const end = Math.floor((max - 1) / 2)
+  return `${text.slice(0, max - 1 - end)}…${text.slice(text.length - end)}`
+}

package/src/tui/theme.ts

@@ -35,35 +35,34 @@ export function formatDuration(ms: number, precise = false): string {
   return `${m}m ${String(Math.floor(s % 60)).padStart(2, "0")}s`
 }
 
-/** Four rows: ascenders, then a three-row x-height. Capitals use all four. */
-const GLYPHS: Record<string, [string, string, string, string]> = {
-  w: ["     ", "█   █", "█ █ █", "▀▀▀▀▀"],
-  e: ["    ", "█▀▀█", "█▀▀▀", "▀▀▀▀"],
-  b: ["▄   ", "█▀▀█", "█  █", "▀▀▀▀"],
-  p: ["    ", "█▀▀█", "█  █", "█▀▀▀"],
-  i: [" ", "▀", "█", "▀"],
-  l: ["▄", "█", "█", "▀"],
-  o: ["    ", "█▀▀█", "█  █", "▀▀▀▀"],
-  t: [" ▄  ", "▀█▀▀", " █  ", " ▀▀▀"],
-  r: ["   ", "█▀▀", "█  ", "▀  "],
-  c: ["    ", "█▀▀▀", "█   ", "▀▀▀▀"],
-  h: ["▄   ", "█▀▀█", "█  █", "▀  ▀"],
-  s: ["    ", "█▀▀▀", "▀▀▀█", "▀▀▀▀"],
-  a: ["    ", "▀▀▀█", "█▀▀█", "▀▀▀▀"],
-  f: [" ▄▀", "▀█▀", " █ ", " ▀ "],
-  g: ["    ", "█▀▀█", "█  █", "▀▀▀█"],
-  Q: ["█▀▀█ ", "█  █ ", "█  █ ", "▀▀▀█▄"],
-  E: ["█▀▀▀", "█▄▄ ", "█   ", "▀▀▀▀"],
-  ".": [" ", " ", " ", "▀"],
+/**
+ * The wordmark's capitals as pixel maps, five pixels tall: every letter has the same weight, height and baseline. A
+ * sixth row, left blank, is the Q's tail. Two pixel rows go in one text row as half blocks, so it is three rows high.
+ */
+const LETTERS: Record<string, string[]> = {
+  F: ["####", "#...", "###.", "#...", "#..."],
+  O: ["####", "#..#", "#..#", "#..#", "####"],
+  R: ["####", "#..#", "###.", "#..#", "#..#"],
+  G: ["####", "#...", "#.##", "#..#", "####"],
+  E: ["####", "#...", "###.", "#...", "####"],
+  Q: ["####.", "#..#.", "#..#.", "#..#.", "####.", "...##"],
 }
 
+/** The letters of `word` (capitals; others are left out) as three rows of half blocks, one space between letters. */
 export function logoRows(word: string): string[] {
-  const rows = ["", "", "", ""]
-  const letters = [...word]
-  letters.forEach((ch, index) => {
-    const glyph = GLYPHS[ch] ?? GLYPHS[ch.toLowerCase()]
-    if (!glyph) return
-    for (let r = 0; r < 4; r++) rows[r] += (index ? " " : "") + glyph[r]
+  const rows = ["", "", ""]
+  ;[...word.toUpperCase()].filter((ch) => LETTERS[ch]).forEach((ch, index) => {
+    const px = LETTERS[ch]!
+    const at = (r: number, c: number) => px[r]?.[c] === "#"
+    for (let r = 0; r < 3; r++) {
+      let cells = ""
+      for (let c = 0; c < px[0]!.length; c++) {
+        const top = at(r * 2, c)
+        const bottom = at(r * 2 + 1, c)
+        cells += top && bottom ? "█" : top ? "▀" : bottom ? "▄" : " "
+      }
+      rows[r] += (index ? " " : "") + cells
+    }
   })
   return rows
 }

package/src/tui/transcript.tsx

@@ -2,7 +2,7 @@ import { existsSync } from "node:fs"
 import os from "node:os"
 import path from "node:path"
 import { SyntaxStyle } from "@opentui/core"
-import type { ReactNode } from "react"
+import { createContext, useContext, type ReactNode } from "react"
 
 import type { CodeResult, RunStatus } from "../types.ts"
 import { CARD_MARK, type Card } from "../card.ts"
@@ -11,7 +11,7 @@ import { suiteExitCode, type SuiteResult } from "../suite/run.ts"
 import { STATUS_MARK, shortPath, type RunSummary } from "../summary.ts"
 import { BAR } from "./components.tsx"
 import { formatDuration, formatTokens, theme } from "./theme.ts"
-import { clip } from "./text.ts"
+import { clip, shortLink } from "./text.ts"
 
 /** The transcript: its lines, and the cards for a run, a suite, a tool result, and what a request produced. */
 
@@ -195,7 +195,7 @@ export function SummaryCard({ summary }: { summary: RunSummary }) {
         {summary.savedDir ? (
           <text>
             <span fg={theme.faint}>{"Saved     "}</span>
-            <Linked text={`${summary.savedDir}/  `} color={theme.muted} />
+            <Linked text={`${summary.savedDir}/  `} color={theme.muted} lead={UNDER + 10} />
             <span fg={theme.faint}>{summary.savedFiles.join(" · ")}</span>
           </text>
         ) : null}
@@ -218,14 +218,27 @@ export function linkTarget(token: string, cwd = process.cwd()): string | null {
  * Text whose web addresses and existing file paths can be opened from the terminal (OSC 8 links: cmd/ctrl+click in
  * VS Code and most terminals). A path that does not exist stays plain text, so no link leads nowhere.
  */
-export function Linked({ text, color }: { text: string; color: string }) {
-  const parts: { text: string; href?: string }[] = []
+/** The columns a line of the conversation has, for links to fit in; 0 when not known (no shortening). */
+export const LineRoom = createContext(0)
+
+/** Columns before a card's line of text: the "⎿" gutter under the card's title. */
+const UNDER = 4
+
+/**
+ * `lead`: the columns before this text on its row (a gutter, a label in another span). A link longer than what is left
+ * of the row is drawn shortened, its target whole, so it moves to the next row in one piece instead of splitting.
+ */
+export function Linked({ text, color, lead = UNDER }: { text: string; color: string; lead?: number }) {
+  const room = useContext(LineRoom)
+  const parts: { text: string; href?: string; max?: number }[] = []
   let at = 0
   for (const m of text.matchAll(LINKABLE)) {
     const href = linkTarget(m[0])
     if (!href) continue
     if (m.index! > at) parts.push({ text: text.slice(at, m.index) })
-    parts.push({ text: m[0], href })
+    // Beside its label when a useful part fits there ("Page      .forgeqe/…/report.html"), else alone on the next row.
+    const beside = room - lead - m.index! - 1
+    parts.push({ text: m[0], href, ...(room ? { max: beside >= 30 ? beside : room - lead - 1 } : {}) })
     at = m.index! + m[0].length
   }
   if (at < text.length) parts.push({ text: text.slice(at) })
@@ -234,7 +247,7 @@ export function Linked({ text, color }: { text: string; color: string }) {
       {parts.map((p, i) =>
         p.href ? (
           <a key={i} href={p.href} fg={theme.accent}>
-            {p.text}
+            {p.max ? shortLink(p.text, p.max) : p.text}
           </a>
         ) : (
           <span key={i} fg={color}>
@@ -251,7 +264,7 @@ export function Row({ label, value, color = theme.muted }: { label: string; valu
   return (
     <text>
       <span fg={theme.faint}>{label.padEnd(10)}</span>
-      <Linked text={value} color={color} />
+      <Linked text={value} color={color} lead={UNDER + 10} />
     </text>
   )
 }
@@ -307,7 +320,7 @@ export const CARD_COLOR: Record<Card["status"], string> = { ok: theme.ok, fail:
 
 export function ResultCard({ card }: { card: Card }) {
   const color = CARD_COLOR[card.status]
-  const lineColor = (l: string) => (/^\s*✓/.test(l) ? theme.ok : /^\s*[✗!]/.test(l) ? theme.err : /^\s*\?/.test(l) ? theme.warn : theme.muted)
+  const lineColor = (l: string) => (/^\s*✓/.test(l) ? theme.ok : /^\s*[✗!]/.test(l) ? theme.err : /^\s*[?~]/.test(l) ? theme.warn : /^\s*(Fix:|→)/.test(l) ? theme.text : theme.muted)
   // What a run used is in the footer and the reports; price talk stays out of the conversation.
   const body = card.body.filter((l) => !/^\s*Usage\s{2,}/.test(l)).filter((l, i, all) => l || (i > 0 && i < all.length - 1))
   return (

package/src/types.ts

@@ -136,6 +136,12 @@ export type CodeEvent =
   | { type: "code"; kind: "usage"; usage: Usage; context?: number }
   /** The agent's to-do list, each time it changes. */
   | { type: "code"; kind: "plan"; items: PlanItem[] }
+  /** The reviewer's verdict on a test that passed: approved or not, why, and each issue with its file and fix. */
+  | { type: "code"; kind: "review"; attempt: number; max: number; approved: boolean; summary: string; issues: CodeReview["issues"] }
+  /** Scribe starts another attempt: why, and what it was asked to fix (the reviewer's issues, the test's error). */
+  | { type: "code"; kind: "attempt"; attempt: number; max: number; why: string; fixing: string[] }
+  /** What Scribe said it did in an attempt: its notes, and the files it changed. */
+  | { type: "code"; kind: "answer"; attempt: number; notes?: string; changed: string[] }
 
 export type AgentEvent =
   | { type: "log"; level: "info" | "warn" | "error"; text: string }