@capagents/forgeqe 1.1.8 → 1.2.0

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

@@ -116,6 +116,8 @@ export type CodeResult = {
   knownDefect?: boolean
   /** The job did not finish: what it wrote was moved to the needs-attention folder (see src/code/attention.ts). */
   attention?: { dir: string; files: string[]; patch?: string; readme: string }
+  /** The job worked from an existing test: ran it as it was, extended it, or updated it. */
+  existing?: "reused" | "extended" | "updated"
 }
 
 /** What an agent did to a file, for the shell's file list. */
@@ -136,6 +138,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 }