niceeval 0.6.1 → 0.7.0

package/src/report/text/faces.ts

@@ -1,193 +1,221 @@
 // 官方组件的 text 面:同一份算好的数据,渲染成终端字符(niceeval show 的形态)。
-// 输出形态照 docs-site/zh/guides/report-components.mdx 的示例块;与 web 面共守
-// 诚实契约:排序随 better、samples < total 角标、缺数据 — 不补 0、截断报剩余。
+// 与 web 面共守诚实契约:排序随 better、samples < total 角标、缺数据 — 不补 0、截断报剩余。
 // 零 react、零 IO、纯同步 —— 这是 text 宿主不需要 react-dom 的那一半。
-// chrome 文案(注脚、verdict 词、截断提示)经 ctx.locale 查 locale 字典,
-// 默认 en 与历史输出逐字一致;数据(display、键、warnings message)不本地化。
+// chrome 文案(注脚、verdict 词、截断提示)经 ctx.locale 查 locale 字典;
+// 数据 display 是 LocalizedText,按 LocalizedText 回退规则取值。
 
 import type {
   AttemptListItem,
   DeltaData,
   EvalListItem,
+  ExperimentComparisonData,
+  ExperimentComparisonGroupData,
   ExperimentListItem,
-  GroupSummaryData,
   LineData,
   MatrixData,
+  MetricCell,
   MetricColumn,
-  OverviewData,
   ScatterData,
+  ScopeSummaryData,
   ScoreboardData,
   TableData,
+  VerdictTally,
 } from "../types.ts";
 import type { TextContext } from "../tree.ts";
 import type { TableColumn, TableRow } from "../primitives.tsx";
 import {
-  attemptItemReason,
+  experimentDisplayName,
+  fitFailureSummary,
   formatDurationMs,
   formatMetricValue,
   formatPlainNumber,
   formatUSD,
   verdictMark,
 } from "../format.ts";
-import { countText, localeText, resolveMetricLabel, type ReportLocale } from "../locale.ts";
-import { indentBlock, padDisplay, textBar, wrapDisplay } from "./layout.ts";
+import {
+  countText,
+  localeText,
+  resolveLocalizedText,
+  resolveMetricLabel,
+  type ReportLocale,
+} from "../locale.ts";
+import { indentBlock, padDisplay, stringWidth, textBar, wrapDisplay } from "./layout.ts";
 import { renderTableText } from "./table.ts";
 import { renderCharPlot, renderCoordinateTable, type PlotPoint } from "./plot.ts";
 
 const MISSING_MARK = "—";
 
-/** 缺数据文案随 locale(en = "no data",与 MISSING_TEXT 一致)。 */
+/** 缺数据文案随 locale(en = "no data")。 */
 function missingText(locale: ReportLocale): string {
   return localeText(locale, "cell.missing");
 }
 
-/** 格子的文本形态:缺数据 —,覆盖不全带 samples/total 角标。 */
-export function cellText(cell: { value: number | null; display: string; samples: number; total: number }): string {
+/** 格子的文本形态:缺数据 —,覆盖不全带 samples/total 角标;display 按 locale 解析。 */
+export function cellText(cell: MetricCell, locale: ReportLocale): string {
   if (cell.value === null) return MISSING_MARK;
-  return cell.samples < cell.total ? `${cell.display} ${cell.samples}/${cell.total}` : cell.display;
+  const display = resolveLocalizedText(cell.display, locale);
+  return cell.samples < cell.total ? `${display} ${cell.samples}/${cell.total}` : display;
 }
 
-// ───────────────────────── RunOverview ─────────────────────────
+/** verdict 计票的紧凑文案("3 passed / 1 failed"):非零判定逐个列,全部为零如实 —。 */
+export function verdictTallyText(tally: VerdictTally, locale: ReportLocale): string {
+  const parts: string[] = [];
+  for (const kind of ["passed", "failed", "errored", "skipped"] as const) {
+    if (tally[kind] > 0) parts.push(`${tally[kind]} ${localeText(locale, `verdict.${kind}`)}`);
+  }
+  return parts.length > 0 ? parts.join(" / ") : MISSING_MARK;
+}
 
-export function overviewText(data: OverviewData, ctx: TextContext): string {
-  const { totals, snapshots } = data;
-  const locale = ctx.locale;
-  const runs = new Set(snapshots.map((s) => s.startedAt)).size;
-  const latest = snapshots.map((s) => s.startedAt).sort().at(-1);
-  const head = [
-    countText(locale, "overview.experiments", snapshots.length),
-    localeText(locale, "overview.evalsCount", { n: totals.evals }),
-    localeText(locale, "overview.attemptsCount", { n: totals.attempts }),
-    // 通过率只渲染 computeCell 算好的同一个 MetricCell(cellText 复用缺数据/coverage 角标语义),
-    // 不从 passed/failed/errored 现场重算——与 web 面 RunOverview 同一份数据同一种读法。
-    `${localeText(locale, "overview.passRate")} ${cellText(totals.passRate)}`,
-    countText(locale, "composedFrom", runs),
-    ...(latest ? [localeText(locale, "latestRun", { run: latest })] : []),
-  ].join(" · ");
-  const tallies = [
-    `${localeText(locale, "verdict.passed")} ${totals.passed}`,
-    `${localeText(locale, "verdict.failed")} ${totals.failed}`,
-    `${localeText(locale, "verdict.errored")} ${totals.errored}`,
-    `${localeText(locale, "verdict.skipped")} ${totals.skipped}`,
-    totals.costUSD === null ? missingText(locale) : formatUSD(totals.costUSD),
-    formatDurationMs(totals.durationMs),
-  ].join(" · ");
-  const lines = [head, tallies];
-  for (const warning of data.warnings) lines.push(`! ${warning.message}`);
-  return lines.join("\n");
+/** ISO 时间 → "YYYY-MM-DD HH:mm"(本地时区);不可解析原样返回。 */
+function formatDateTimeMinute(iso: string): string {
+  const date = new Date(iso);
+  if (Number.isNaN(date.valueOf())) return iso;
+  const pad = (n: number) => String(n).padStart(2, "0");
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
 }
 
-// ───────────────────────── GroupSummary ─────────────────────────
+// ───────────────────────── ScopeSummary ─────────────────────────
 
 /**
- * 一至两行:头行是通过率(GroupSummaryData.passRate.display,不重算比例)+ experiment/eval 数 +
- * failed(+ errored,非零才列,与旧 GroupSelector 卡片一致)+ 总成本;第二行(有则加)是最后运行时间。
- * 不依赖固定网格宽度,窄终端自然换行。
+ * 一至两行:头行是端到端成功率(官方 MetricCell,不重算)+ experiment/eval/attempt 数 +
+ * `votes` 选中的那级计票 + 总成本;第二行(有则加)是快照时间窗。
  */
-export function groupSummaryText(data: GroupSummaryData, ctx: TextContext): string {
+export function scopeSummaryText(data: ScopeSummaryData, votes: "eval" | "attempt", ctx: TextContext): string {
   const locale = ctx.locale;
+  const tally = votes === "attempt" ? data.attemptVerdicts : data.evalVerdicts;
   const head = [
-    `${localeText(locale, "overview.passRate")} ${cellText(data.passRate)}`,
+    `${localeText(locale, "scopeSummary.passRate")} ${cellText(data.endToEndPassRate, locale)}`,
     countText(locale, "overview.experiments", data.experiments),
     localeText(locale, "overview.evalsCount", { n: data.evals }),
-    `${localeText(locale, "verdict.failed")} ${data.verdicts.failed}`,
-    ...(data.verdicts.errored > 0 ? [`${localeText(locale, "verdict.errored")} ${data.verdicts.errored}`] : []),
-    data.totalCostUSD === null ? missingText(locale) : formatUSD(data.totalCostUSD),
+    localeText(locale, "overview.attemptsCount", { n: data.attempts }),
+    verdictTallyText(tally, locale),
+    `${localeText(locale, "scopeSummary.totalCost")} ${cellText(data.totalCostUSD, locale)}`,
   ].join(" · ");
   const lines = [head];
-  if (data.lastRunAt) lines.push(localeText(locale, "latestRun", { run: data.lastRunAt }));
+  if (data.range.latestStartedAt !== null) {
+    const from = data.range.earliestStartedAt;
+    const to = data.range.latestStartedAt;
+    lines.push(
+      from !== null && from !== to
+        ? localeText(locale, "scopeSummary.range", { from: formatDateTimeMinute(from), to: formatDateTimeMinute(to) })
+        : formatDateTimeMinute(to),
+    );
+  }
   return lines.join("\n");
 }
 
-// ───────────────────────── MetricTable ─────────────────────────
+// ───────────────────────── ExperimentComparison ─────────────────────────
+
+/** 单组详情:标题行 + 缩进的散点与实验列表(与 web 面同一份预分区数据)。 */
+function comparisonGroupText(group: ExperimentComparisonGroupData, ctx: TextContext): string {
+  const inner = Math.max(20, ctx.width - 2);
+  const innerCtx: TextContext = {
+    width: inner,
+    locale: ctx.locale,
+    attemptCommand: ctx.attemptCommand,
+    experimentCommand: ctx.experimentCommand,
+    render: (node, w) => ctx.render(node, w ?? inner),
+  };
+  const body = [scatterText(group.scatter, innerCtx), experimentListText(group.experiments, innerCtx, group.key)]
+    .filter((block) => block.length > 0)
+    .join("\n\n");
+  return `${localeText(ctx.locale, "experimentComparison.group")} ${group.key}\n\n${indentBlock(body, "  ")}`;
+}
 
-/** verdict 计票的紧凑文案("3 passed / 1 failed"):非零判定逐个列,全部为零如实 —。 */
-export function verdictTallyText(
-  verdicts: NonNullable<NonNullable<TableData["rows"][number]["meta"]>["verdicts"]>,
-  locale: ReportLocale,
+/**
+ * text 面:命中多个可比组时只输出组索引与可复制的单组查看命令,不倾倒全部组详情;
+ * 命中单组时省略索引,直接输出该组的散点与实验列表。
+ */
+export function experimentComparisonText(
+  data: ExperimentComparisonData,
+  _className: string | undefined,
+  ctx: TextContext,
 ): string {
-  const parts: string[] = [];
-  for (const kind of ["passed", "failed", "errored", "skipped"] as const) {
-    if (verdicts[kind] > 0) parts.push(`${verdicts[kind]} ${localeText(locale, `verdict.${kind}`)}`);
-  }
-  return parts.length > 0 ? parts.join(" / ") : MISSING_MARK;
+  const locale = ctx.locale;
+  if (data.groups.length === 0) return localeText(locale, "experimentComparison.empty");
+  if (data.groups.length === 1) return comparisonGroupText(data.groups[0]!, ctx);
+
+  const columns: TableColumn[] = [
+    { key: "group", header: localeText(locale, "experimentComparison.group") },
+    { key: "experiments", header: localeText(locale, "scopeSummary.experiments"), align: "right" },
+    { key: "evals", header: localeText(locale, "scopeSummary.evals"), align: "right" },
+    { key: "passRate", header: localeText(locale, "scopeSummary.passRate"), align: "right" },
+    { key: "results", header: localeText(locale, "experimentComparison.results") },
+    { key: "cost", header: localeText(locale, "scopeSummary.totalCost"), align: "right" },
+    { key: "lastRun", header: localeText(locale, "experimentComparison.lastRun") },
+  ] as unknown as TableColumn[];
+  const rows: TableRow[] = data.groups.map((group) => ({
+    key: group.key,
+    cells: {
+      group: group.key,
+      experiments: String(group.summary.experiments),
+      evals: String(group.summary.evals),
+      passRate: cellText(group.summary.endToEndPassRate, locale),
+      results: verdictTallyText(group.summary.evalVerdicts, locale),
+      cost: group.summary.totalCostUSD.value === null ? null : cellText(group.summary.totalCostUSD, locale),
+      lastRun: group.summary.range.latestStartedAt === null ? null : formatDateTimeMinute(group.summary.range.latestStartedAt),
+    },
+  }));
+  const table = renderTableText(
+    { columns: columns as unknown as [TableColumn, ...TableColumn[]], rows, locale },
+    ctx,
+  );
+  const commands = [
+    localeText(locale, "experimentComparison.commandsHead"),
+    ...data.groups.map((group) => `  ${ctx.experimentCommand(group.key)}`),
+  ].join("\n");
+  return `${table}\n\n${commands}`;
 }
 
+// ───────────────────────── MetricTable ─────────────────────────
+
 export function tableText(data: TableData, ctx: TextContext): string {
   const locale = ctx.locale;
-  // meta 在场时补 Model / Agent / Verdicts 列(rows: "experiment" 的榜单 parity);
-  // 列序对齐 view 原生榜单:experiment、model、agent、指标列…、verdicts
-  const hasMeta = data.rows.some((row) => row.meta !== undefined);
-  const hasModel = data.rows.some((row) => row.meta?.model !== undefined);
-  const hasVerdicts = data.rows.some((row) => row.meta?.verdicts !== undefined);
   const columns: TableColumn[] = [
-    { key: "dimension", header: data.dimension },
-    ...(hasMeta && hasModel ? [{ key: "model", header: localeText(locale, "table.model") }] : []),
-    ...(hasMeta ? [{ key: "agent", header: localeText(locale, "table.agent") }] : []),
-    // 指标列的键用序号,不用 metric name —— 维度名、"model" 这些键都在同一个命名空间里,
-    // 指标恰好叫 "agent" 时不能把 meta 列顶掉。
+    { key: "dimension", header: data.rowDimension },
+    // 指标列的键用序号,不用 metric name —— 维度名和指标名在同一个命名空间里,可能撞键。
     ...data.columns.map((c, i) => ({ key: `metric${i}`, header: resolveMetricLabel(c.label, locale, c.key) })),
-    ...(hasVerdicts ? [{ key: "verdicts", header: localeText(locale, "table.verdicts") }] : []),
   ];
   const rows: TableRow[] = data.rows.map((row) => {
     const cells: Record<string, string | null> = { dimension: row.key };
-    if (hasMeta && hasModel) cells.model = row.meta?.model ?? null;
-    if (hasMeta) cells.agent = row.meta?.agent ?? null;
     data.columns.forEach((col, i) => {
-      const cell = (row.cells as Record<string, TableData["rows"][number]["cells"][string]>)[col.key];
-      cells[`metric${i}`] = cell ? cellText(cell) : null;
+      const cell = row.cells[col.key];
+      cells[`metric${i}`] = cell ? cellText(cell, locale) : null;
     });
-    if (hasVerdicts) cells.verdicts = row.meta?.verdicts ? verdictTallyText(row.meta.verdicts, locale) : null;
     return { key: row.key, cells };
   });
-  const table = renderTableText({ columns, rows, locale }, ctx);
-
-  // rows: "experiment" 专属的行摘要(eval/attempt 数 + 最后运行时间):表格列已经挤满
-  // dimension/model/agent/指标/verdicts,这几个数字挤进行键下面单独一行,与 web 面
-  // 「行键下的小 sub-line」同一份信息、同一种「不进列」的取舍。
-  const metaLines: string[] = [];
-  for (const row of data.rows) {
-    if (row.meta?.evals === undefined) continue;
-    const parts = [localeText(locale, "overview.evalsCount", { n: row.meta.evals })];
-    if (row.meta.attempts !== undefined && row.meta.attempts > row.meta.evals) {
-      parts.push(localeText(locale, "overview.attemptsCount", { n: row.meta.attempts }));
-    }
-    if (row.meta.lastRunAt) parts.push(localeText(locale, "latestRun", { run: row.meta.lastRunAt }));
-    metaLines.push(`  ${row.key}: ${parts.join(" · ")}`);
-  }
-
-  const blocks = [table, ...(metaLines.length > 0 ? [metaLines.join("\n")] : [])];
-  return blocks.join("\n\n");
+  return renderTableText({ columns: columns as unknown as [TableColumn, ...TableColumn[]], rows, locale }, ctx);
 }
 
 // ───────────────────────── MetricMatrix ─────────────────────────
 
 export function matrixText(data: MatrixData, ctx: TextContext): string {
   // 表体全是维度键与 display,没有 chrome 文案;"next:" 是命令提示,不本地化。
+  const locale = ctx.locale;
   const rowKeys: string[] = [];
   const columnKeys: string[] = [];
-  const byPosition = new Map<string, MatrixData["cells"][number]["cell"]>();
+  const byPosition = new Map<string, MetricCell>();
   for (const entry of data.cells) {
     if (!rowKeys.includes(entry.row)) rowKeys.push(entry.row);
     if (!columnKeys.includes(entry.column)) columnKeys.push(entry.column);
     byPosition.set(JSON.stringify([entry.row, entry.column]), entry.cell);
   }
   const columns: TableColumn[] = [
-    { key: "dimension", header: data.rows },
+    { key: "dimension", header: data.rowDimension },
     ...columnKeys.map((column, i) => ({ key: `column${i}`, header: column })),
   ];
   const rows: TableRow[] = rowKeys.map((row) => {
     const cells: Record<string, string | null> = { dimension: row };
     columnKeys.forEach((column, i) => {
       const cell = byPosition.get(JSON.stringify([row, column]));
-      cells[`column${i}`] = cell ? cellText(cell) : null; // 稀疏格子在文本里以 — 呈现,不编数
+      cells[`column${i}`] = cell ? cellText(cell, locale) : null; // 稀疏格子在文本里以 — 呈现,不编数
     });
     return { key: row, cells };
   });
-  const table = renderTableText({ columns, rows, locale: ctx.locale }, ctx);
+  const table = renderTableText({ columns: columns as unknown as [TableColumn, ...TableColumn[]], rows, locale }, ctx);
 
   // 下钻命令:行维度是 eval 时,指向最值得看的一行(先挑有缺格的,再挑按 better 最差的)
-  if (data.rows !== "eval" || rowKeys.length === 0) return table;
+  if (data.rowDimension !== "eval" || rowKeys.length === 0) return table;
   const better = data.metric.better ?? "higher";
   let next: string | undefined;
   let worst: { key: string; value: number } | undefined;
@@ -217,10 +245,11 @@ export function matrixText(data: MatrixData, ctx: TextContext): string {
 
 const BAR_WIDTH = 20;
 
-export function barsText(data: MatrixData): string {
+export function barsText(data: MatrixData, ctx: TextContext): string {
+  const locale = ctx.locale;
   const groupKeys: string[] = [];
   const seriesKeys: string[] = [];
-  const byPosition = new Map<string, MatrixData["cells"][number]["cell"]>();
+  const byPosition = new Map<string, MetricCell>();
   for (const entry of data.cells) {
     if (!groupKeys.includes(entry.row)) groupKeys.push(entry.row);
     if (!seriesKeys.includes(entry.column)) seriesKeys.push(entry.column);
@@ -230,10 +259,9 @@ export function barsText(data: MatrixData): string {
   // 条长刻度:% 的天然域是 [0,1],其余以全图最大值为满条
   const values = data.cells.map((c) => c.cell.value).filter((v): v is number => v !== null);
   const maxValue = values.length > 0 ? Math.max(...values) : 0;
-  const ratioOf = (value: number) =>
-    data.metric.unit === "%" ? value : maxValue === 0 ? 0 : value / maxValue;
+  const ratioOf = (value: number) => (data.metric.unit === "%" ? value : maxValue === 0 ? 0 : value / maxValue);
 
-  const seriesWidth = Math.max(...seriesKeys.map((k) => k.length), 0);
+  const seriesWidth = Math.max(...seriesKeys.map((k) => stringWidth(k)), 0);
   const lines: string[] = [];
   for (const group of groupKeys) {
     lines.push(group);
@@ -256,7 +284,7 @@ export function barsText(data: MatrixData): string {
         lines.push(`  ${label}   ${MISSING_MARK}`);
         continue;
       }
-      lines.push(`  ${label}   ${textBar(ratioOf(cell.value), BAR_WIDTH)}  ${cellText(cell)}`);
+      lines.push(`  ${label}   ${textBar(ratioOf(cell.value), BAR_WIDTH)}  ${cellText(cell, locale)}`);
     }
   }
   return lines.join("\n");
@@ -273,14 +301,18 @@ export function scoreboardText(data: ScoreboardData, ctx: TextContext): string {
     }
   }
   const columns: TableColumn[] = [
-    { key: "dimension", header: data.dimension },
+    { key: "dimension", header: data.rowDimension },
     { key: "total", header: localeText(locale, "scoreboard.totalText") },
     ...subjectKeys.map((key, i) => ({ key: `subject${i}`, header: key })),
   ];
   const rows: TableRow[] = data.rows.map((row) => {
+    const totalNotes = [
+      ...(row.total.notRun > 0 ? [localeText(locale, "scoreboard.notRunText", { n: row.total.notRun })] : []),
+      ...(row.total.unscorable > 0 ? [localeText(locale, "scoreboard.unscorableText", { n: row.total.unscorable })] : []),
+    ];
     const cells: Record<string, string | null> = {
       dimension: row.key,
-      total: `${row.total.display}/${data.fullMarks}`,
+      total: `${resolveLocalizedText(row.total.display, locale)}/${data.fullMarks}${totalNotes.length > 0 ? ` ${totalNotes.join(" ")}` : ""}`,
     };
     subjectKeys.forEach((key, i) => {
       const subject = row.subjects.find((s) => s.key === key);
@@ -289,18 +321,22 @@ export function scoreboardText(data: ScoreboardData, ctx: TextContext): string {
         return;
       }
       const score = `${formatPlainNumber(subject.earned)}/${formatPlainNumber(subject.possible)}`;
-      cells[`subject${i}`] =
-        subject.missing > 0
-          ? `${score} ${localeText(locale, "scoreboard.missingText", { n: subject.missing })}`
-          : score;
+      const notes = [
+        ...(subject.notRun > 0 ? [localeText(locale, "scoreboard.notRunText", { n: subject.notRun })] : []),
+        ...(subject.unscorable > 0 ? [localeText(locale, "scoreboard.unscorableText", { n: subject.unscorable })] : []),
+      ];
+      cells[`subject${i}`] = notes.length > 0 ? `${score} ${notes.join(" ")}` : score;
     });
     return { key: row.key, cells };
   });
-  const table = renderTableText({ columns, rows, locale }, ctx);
-  if (data.weights.length === 0) return table;
-  // 实际生效的权重表 —— 成绩单可审计
-  const weights = data.weights.map((w) => `${w.prefix} ×${w.weight}`).join(" · ");
-  return `${table}\n${localeText(locale, "scoreboard.weights")} ${weights} · ${localeText(locale, "scoreboard.othersWeight")}`;
+  const table = renderTableText({ columns: columns as unknown as [TableColumn, ...TableColumn[]], rows, locale }, ctx);
+  const footnotes: string[] = [];
+  if (data.weights.length > 0) {
+    const weights = data.weights.map((w) => `${w.prefix} ×${w.weight}`).join(" · ");
+    footnotes.push(`${localeText(locale, "scoreboard.weights")} ${weights} · ${localeText(locale, "scoreboard.othersWeight")}`);
+  }
+  if (data.ignoredEvals > 0) footnotes.push(countText(locale, "scoreboard.ignored", data.ignoredEvals));
+  return footnotes.length > 0 ? `${table}\n${footnotes.join("\n")}` : table;
 }
 
 // ───────────────────────── MetricScatter ─────────────────────────
@@ -311,6 +347,26 @@ function axisLabel(col: MetricColumn, locale: ReportLocale): string {
   return resolveMetricLabel(col.label, locale, col.key);
 }
 
+/**
+ * 方向提示:轴向已随 better 反正(lower 反向),「更好」恒指向右上,文案恒为
+ * 「越靠右上越好」;仅当 x、y 都声明 better 时显示——任一轴未声明,组件不猜
+ * 「更好」朝哪边,整图无提示(返回 undefined)。
+ */
+function betterCornerText(x: MetricColumn, y: MetricColumn, locale: ReportLocale): string | undefined {
+  if (x.better === undefined || y.better === undefined) return undefined;
+  return localeText(locale, "scatter.betterUpperRight");
+}
+
+/** 轴标题行:"<x label>(越低越好) × <y label>"——better 方向如实标注,不虚构轴向。 */
+function scatterHeading(data: ScatterData, locale: ReportLocale): string {
+  const withBetter = (col: MetricColumn) => {
+    const label = axisLabel(col, locale);
+    if (col.better === undefined) return label;
+    return `${label}(${localeText(locale, col.better === "lower" ? "table.lowerBetter" : "table.higherBetter")})`;
+  };
+  return `${withBetter(data.x)} × ${withBetter(data.y)}`;
+}
+
 export function scatterText(data: ScatterData, ctx: TextContext): string {
   const locale = ctx.locale;
   const drawable = data.rows.filter((r) => r.x.value !== null && r.y.value !== null);
@@ -326,10 +382,14 @@ export function scatterText(data: ScatterData, ctx: TextContext): string {
   // 点太密排不下时降级为坐标表,不硬挤
   if (drawable.length > POINT_MARKS.length || ctx.width < 44) {
     const table = renderCoordinateTable(
-      drawable.map((r) => ({ key: r.key, x: r.x.display, y: r.y.display })),
-      { key: data.points, x: axisLabel(data.x, locale), y: axisLabel(data.y, locale) },
+      drawable.map((r) => ({
+        key: r.key,
+        x: resolveLocalizedText(r.x.display, locale),
+        y: resolveLocalizedText(r.y.display, locale),
+      })),
+      { key: data.pointDimension, x: axes.x, y: axes.y },
     );
-    return [table, ...footnotes].join("\n");
+    return [scatterHeading(data, locale), "", table, ...footnotes].join("\n");
   }
 
   const points: PlotPoint[] = drawable.map((r, i) => ({
@@ -347,20 +407,21 @@ export function scatterText(data: ScatterData, ctx: TextContext): string {
   }
   for (const list of bySeries.values()) list.sort((a, b) => a.x - b.x);
 
-  const invertX = data.x.better === "lower";
   const plot = renderCharPlot({
     width: ctx.width,
     points,
     lines: [...bySeries.values()].filter((l) => l.length > 1),
-    xLabel: `${axisLabel(data.x, locale)}${invertX ? ` ${localeText(locale, "scatter.axisReversed")}` : ""}`,
-    yLabel: axisLabel(data.y, locale),
+    xLabel: axes.x,
+    yLabel: axes.y,
     formatX: (v) => formatMetricValue(v, data.x.unit),
     formatY: (v) => formatMetricValue(v, data.y.unit),
-    invertX,
+    // 轴方向跟随 better(与 web 面同规则):lower 反向,higher 与未声明正向。
+    invertX: data.x.better === "lower",
     invertY: data.y.better === "lower",
   });
   const legend = drawable.map((r, i) => `${POINT_MARKS[i]} ${r.key}`).join("   ");
-  return [plot, "", localeText(locale, "scatter.betterUpperRight"), legend, ...footnotes].join("\n");
+  const hint = betterCornerText(data.x, data.y, locale);
+  return [scatterHeading(data, locale), plot, "", ...(hint !== undefined ? [hint] : []), legend, ...footnotes].join("\n");
 }
 
 // ───────────────────────── MetricLine ─────────────────────────
@@ -374,6 +435,8 @@ export function lineText(data: LineData, ctx: TextContext): string {
 
   if (drawable.length === 0) return [missingText(locale), ...footnotes].join("\n");
 
+  const xLabel = resolveMetricLabel(data.x.label, locale, data.x.key);
+
   // 系列 → 字母;无系列 = 单系列
   const seriesKeys: string[] = [];
   for (const r of drawable) {
@@ -383,8 +446,12 @@ export function lineText(data: LineData, ctx: TextContext): string {
 
   if (seriesKeys.length > POINT_MARKS.length || ctx.width < 44) {
     const table = renderCoordinateTable(
-      drawable.map((r) => ({ key: r.series ? `${r.key} (${r.series})` : r.key, x: r.xDisplay, y: r.y.display })),
-      { key: "experiment", x: data.x.label, y: axisLabel(data.y, locale) },
+      drawable.map((r) => ({
+        key: r.series !== undefined ? `${r.series} (${r.key})` : r.key,
+        x: resolveLocalizedText(r.xDisplay, locale),
+        y: resolveLocalizedText(r.y.display, locale),
+      })),
+      { key: data.seriesDimension ?? xLabel, x: xLabel, y: axisLabel(data.y, locale) },
     );
     return [table, ...footnotes].join("\n");
   }
@@ -406,11 +473,10 @@ export function lineText(data: LineData, ctx: TextContext): string {
     width: ctx.width,
     points,
     lines: lines.filter((l) => l.length > 1),
-    xLabel: data.x.label,
+    xLabel,
     yLabel: axisLabel(data.y, locale),
     formatX: (v) => formatMetricValue(v, data.x.unit),
     formatY: (v) => formatMetricValue(v, data.y.unit),
-    invertY: data.y.better === "lower",
   });
   const legend = seriesKeys
     .map((key, i) => `${POINT_MARKS[i]} ${key === "" ? axisLabel(data.y, locale) : key}`)
@@ -421,41 +487,62 @@ export function lineText(data: LineData, ctx: TextContext): string {
 // ───────────────────────── DeltaTable ─────────────────────────
 
 export function deltaText(data: DeltaData, ctx: TextContext): string {
+  const locale = ctx.locale;
+  // 0 对不是错误:明确空态并报告配对域实验数(派生形态携带;字面形态缺省按 0)。
+  if (data.rows.length === 0) {
+    return localeText(locale, "delta.empty", { experiments: data.experiments ?? 0 });
+  }
   const columns: TableColumn[] = [
-    { key: "pair", header: "pair" },
-    ...data.columns.map((c, i) => ({ key: `metric${i}`, header: resolveMetricLabel(c.label, ctx.locale, c.key) })),
+    { key: "pair", header: localeText(locale, "delta.pairHeader") },
+    ...data.columns.map((c, i) => ({ key: `metric${i}`, header: resolveMetricLabel(c.label, locale, c.key) })),
   ];
   const rows: TableRow[] = data.rows.map((row) => {
-    const cells: Record<string, string | null> = { pair: row.key };
+    const cells: Record<string, string | null> = { pair: resolveLocalizedText(row.label, locale) };
     data.columns.forEach((col, i) => {
-      const cell = (row.cells as Record<string, DeltaData["rows"][number]["cells"][string]>)[col.key];
+      const cell = row.cells[col.key];
       if (!cell) {
         cells[`metric${i}`] = null;
         return;
       }
-      const a = cell.a.value === null ? MISSING_MARK : cell.a.display;
-      const b = cell.b.value === null ? MISSING_MARK : cell.b.display;
-      cells[`metric${i}`] = `${a} → ${b}   ${cell.display}`;
+      const a = cell.a.value === null ? MISSING_MARK : resolveLocalizedText(cell.a.display, locale);
+      const b = cell.b.value === null ? MISSING_MARK : resolveLocalizedText(cell.b.display, locale);
+      cells[`metric${i}`] = `${a} → ${b}   ${resolveLocalizedText(cell.display, locale)}`;
     });
     return { key: row.key, cells };
   });
-  return renderTableText({ columns, rows, locale: ctx.locale }, ctx);
+  return renderTableText({ columns: columns as unknown as [TableColumn, ...TableColumn[]], rows, locale }, ctx);
 }
 
 // ───────────────────────── 实体列表(ExperimentList / EvalList / AttemptList)─────────────────────────
 //
 // 三面共用的紧凑标记:`locator✓`(判定符紧跟 locator,中间不留空格)。
-// ExperimentList / EvalList 逐 attempt 只列这一个标记 + 各自的原因/耗时摘要,不重复整段
-// niceeval show 命令;要看某个 attempt 的完整证据,agent 自己拼 `niceeval show <locator>`——
-// 命令模板只在 AttemptList(叶子层)展示完整断言明细时才值得,不在中间层重复。
+// ExperimentList / EvalList 逐 attempt 只列这一个标记 + 各自的摘要,不重复整段
+// niceeval show 命令;要看某个 attempt 的完整证据,agent 自己拼 `niceeval show <locator>`。
 
 function locatorBadge(item: { locator: string; verdict: AttemptListItem["verdict"] }): string {
   return `${item.locator}${verdictMark(item.verdict)}`;
 }
 
+/**
+ * failureSummary + moreFailures 的展示形态:摘要在计算侧已按 Scoring display 契约折好,
+ * 这里只加 "+N more failures" 计数与宽度收口,不重算摘要。
+ */
+function attemptReasonText(item: AttemptListItem, locale: ReportLocale, maxChars: number): string | undefined {
+  if (item.failureSummary === null) return undefined;
+  const withMore =
+    item.moreFailures > 0
+      ? `${item.failureSummary} · ${countText(locale, "entityList.moreFailures", item.moreFailures)}`
+      : item.failureSummary;
+  return fitFailureSummary(withMore, Math.max(24, maxChars));
+}
+
 // ── ExperimentList ──
 
-function experimentSummaryTable(items: ExperimentListItem[], ctx: TextContext): string {
+function experimentSummaryTable(
+  items: readonly ExperimentListItem[],
+  ctx: TextContext,
+  relativeTo?: string,
+): string {
   const locale = ctx.locale;
   const compact = ctx.width < 100;
   const columns: TableColumn[] = [
@@ -466,48 +553,62 @@ function experimentSummaryTable(items: ExperimentListItem[], ctx: TextContext):
     { key: "passRate", header: compact && locale === "en" ? "Pass" : localeText(locale, "experimentList.passRate"), align: "right" },
     { key: "result", header: localeText(locale, "experimentList.result") },
     { key: "tokens", header: localeText(locale, "experimentList.tokens"), align: "right" },
-    { key: "cost", header: compact && locale === "en" ? "Cost" : localeText(locale, "experimentList.estimatedCost"), align: "right" },
+    { key: "cost", header: localeText(locale, "experimentList.cost"), align: "right" },
   ];
   const rows: TableRow[] = items.map((item) => ({
     key: item.experimentId,
     cells: {
-      experiment: item.experimentId,
+      experiment: experimentDisplayName(item.experimentId, relativeTo),
       model: item.model ?? localeText(locale, "experimentList.defaultModel"),
       agent: item.agent,
-      duration: cellText(item.duration),
-      passRate: cellText(item.passRate),
-      result: verdictTallyText(item.verdicts, locale),
-      tokens: cellText(item.tokens),
-      cost: cellText(item.cost),
+      duration: cellText(item.durationMs, locale),
+      passRate: cellText(item.endToEndPassRate, locale),
+      result: verdictTallyText(item.evalVerdicts, locale),
+      tokens: cellText(item.tokens, locale),
+      cost: cellText(item.costUSD, locale),
     },
   }));
   const metadata = items.flatMap((item) =>
     wrapDisplay(
-      `${item.experimentId}: ${localeText(locale, "overview.evalsCount", { n: item.evals })} · ${localeText(locale, "overview.attemptsCount", { n: item.attempts })} · ${item.lastRunAt}`,
+      `${experimentDisplayName(item.experimentId, relativeTo)}: ${localeText(locale, "overview.evalsCount", { n: item.evals })} · ${localeText(locale, "overview.attemptsCount", { n: item.attempts })} · ${item.lastRunAt}`,
       Math.max(8, ctx.width - 2),
     ).map((line) => `  ${line}`),
   );
-  return [renderTableText({ columns, rows, locale }, ctx), metadata.join("\n")].join("\n");
+  return [renderTableText({ columns: columns as unknown as [TableColumn, ...TableColumn[]], rows, locale }, ctx), metadata.join("\n")].join("\n");
 }
 
-function experimentDetailTable(item: ExperimentListItem, ctx: TextContext): string {
+function experimentDetailTable(item: ExperimentListItem, ctx: TextContext, relativeTo?: string): string {
   const locale = ctx.locale;
   const columns: TableColumn[] = [
     { key: "status", header: localeText(locale, "experimentList.status") },
     { key: "entity", header: localeText(locale, "experimentList.evalAttempt") },
-    { key: "result", header: localeText(locale, "experimentList.result") },
+    // Result 是可扫读的失败预览,不是证据面:两行放不下的以 … 收口,完整值走 locator 下钻。
+    { key: "result", header: localeText(locale, "experimentList.result"), maxLines: 2 },
     { key: "duration", header: localeText(locale, "experimentList.duration"), align: "right" },
     { key: "cost", header: localeText(locale, "experimentList.cost"), align: "right" },
   ];
+  // Result 的字符预算 ≈ 两行 × 它能分到的列宽(总宽减其它列的自然宽与列距)。这里只做
+  // 粗预算;精确的按宽度收口由列的 maxLines 兜底。
+  const statusWidth = Math.max(
+    stringWidth(localeText(locale, "experimentList.status")),
+    ...item.evalRows.map((row) => stringWidth(`${verdictMark(row.verdict)} ${localeText(locale, `verdict.${row.verdict}`)}`)),
+  );
+  const entityWidth = Math.max(
+    stringWidth(localeText(locale, "experimentList.evalAttempt")),
+    ...item.evalRows.flatMap((row) => [stringWidth(row.evalId), ...row.attempts.map((a) => stringWidth(a.locator) + 3)]),
+  );
+  const fixedWidth = statusWidth + entityWidth + 8 /* duration */ + 6 /* cost */ + 3 * 4; /* 4 段列距 */
+  const resultBudget = Math.max(24, (ctx.width - fixedWidth) * 2);
   const rows: TableRow[] = item.evalRows.flatMap((row) => {
+    // Eval 父行只承载折叠判定与题级聚合;失败摘要只在 Attempt 子行出现。
     const parent: TableRow = {
       key: row.evalId,
       cells: {
         status: `${verdictMark(row.verdict)} ${localeText(locale, `verdict.${row.verdict}`)}`,
         entity: row.evalId,
         result: "",
-        duration: "",
-        cost: "",
+        duration: localeText(locale, "entityList.average", { value: cellText(row.durationMs, locale) }),
+        cost: localeText(locale, "entityList.average", { value: cellText(row.costUSD, locale) }),
       },
     };
     const attempts: TableRow[] = row.attempts.map((attempt, index) => ({
@@ -515,43 +616,59 @@ function experimentDetailTable(item: ExperimentListItem, ctx: TextContext): stri
       cells: {
         status: `  ${verdictMark(attempt.verdict)}`,
         entity: `${index === row.attempts.length - 1 ? "└─" : "├─"} ${attempt.locator}`,
-        result: attemptItemReason(attempt) ?? MISSING_MARK,
+        result: attemptReasonText(attempt, locale, resultBudget) ?? MISSING_MARK,
         duration: attempt.verdict === "skipped" && attempt.durationMs === 0 ? null : formatDurationMs(attempt.durationMs),
-        cost: attempt.costUSD === undefined ? null : formatUSD(attempt.costUSD),
+        cost: attempt.costUSD === null ? null : formatUSD(attempt.costUSD),
       },
     }));
     return [parent, ...attempts];
   });
   const flags = item.flags && Object.keys(item.flags).length > 0
-    ? `${localeText(locale, "experimentList.flags")} ${Object.entries(item.flags).map(([key, value]) => `${key}=${String(value)}`).join(" · ")}`
+    ? `${localeText(locale, "experimentList.flags")} ${Object.entries(item.flags)
+        .map(([key, value]) => `${key}=${typeof value === "string" ? value : JSON.stringify(value)}`)
+        .join(" · ")}`
     : undefined;
-  return [item.experimentId, flags, renderTableText({ columns, rows, locale }, ctx)].filter(Boolean).join("\n");
+  return [
+    experimentDisplayName(item.experimentId, relativeTo),
+    flags,
+    renderTableText({ columns: columns as unknown as [TableColumn, ...TableColumn[]], rows, locale }, ctx),
+  ]
+    .filter(Boolean)
+    .join("\n");
 }
 
-export function experimentListText(items: ExperimentListItem[], ctx: TextContext): string {
+export function experimentListText(items: readonly ExperimentListItem[], ctx: TextContext, relativeTo?: string): string {
   if (items.length === 0) return localeText(ctx.locale, "attemptList.empty");
-  return [experimentSummaryTable(items, ctx), ...items.map((item) => experimentDetailTable(item, ctx))].join("\n\n");
+  return [
+    experimentSummaryTable(items, ctx, relativeTo),
+    ...items.map((item) => experimentDetailTable(item, ctx, relativeTo)),
+  ].join("\n\n");
 }
 
 // ── EvalList ──
 
-function evalListAttemptLine(item: AttemptListItem): string {
-  const reason = attemptItemReason(item);
+function evalListAttemptLine(item: AttemptListItem, ctx: TextContext): string {
+  // 行式列表同守「Result 最多两行」:预算 = 两行终端宽,超出按尾截收口。
+  const reason = attemptReasonText(item, ctx.locale, ctx.width * 2 - stringWidth(locatorBadge(item)) - 6);
   return `  ${locatorBadge(item)}${reason ? ` · ${reason}` : ""}`;
 }
 
-export function evalListText(items: EvalListItem[], ctx: TextContext): string {
+export function evalListText(items: readonly EvalListItem[], ctx: TextContext): string {
   const locale = ctx.locale;
   if (items.length === 0) return localeText(locale, "attemptList.empty");
   const blocks = items.map((item) => {
     const identity = `${item.evalId} · ${item.experimentId} · ${localeText(locale, `verdict.${item.verdict}`)}`;
     const summary = [
-      localeText(locale, "attemptList.score", { score: cellText(item.score) }),
+      localeText(locale, "attemptList.score", { score: cellText(item.examScore, locale) }),
       localeText(locale, "overview.attemptsCount", { n: item.attempts.length }),
-      `${formatDurationMs(item.duration.value ?? 0)} avg`,
-      item.cost.value === null ? `${missingText(locale)} avg` : `${formatUSD(item.cost.value)} avg`,
+      localeText(locale, "entityList.average", {
+        value: item.durationMs.value === null ? missingText(locale) : formatDurationMs(item.durationMs.value),
+      }),
+      localeText(locale, "entityList.average", {
+        value: item.costUSD.value === null ? missingText(locale) : formatUSD(item.costUSD.value),
+      }),
     ].join(" · ");
-    const attemptLines = item.attempts.map(evalListAttemptLine);
+    const attemptLines = item.attempts.map((attempt) => evalListAttemptLine(attempt, ctx));
     return [identity, `  ${summary}`, ...attemptLines].join("\n");
   });
   return blocks.join("\n\n");
@@ -559,45 +676,25 @@ export function evalListText(items: EvalListItem[], ctx: TextContext): string {
 
 // ── AttemptList ──
 
-/** 一个 AttemptListItem 的完整 text 卡片:判定符 + locator + 身份 + 耗时/成本,
- * 然后逐条断言(gate 与 soft 都列,与 web 面的 AttemptRow 同一份材料)。 */
-function attemptListItemText(item: AttemptListItem, ctx: TextContext, locale: ReportLocale): string {
+/** Attempt 比较卡片:只显示一条主失败摘要(至多两行终端宽);完整 assertions 走 locator 下钻。 */
+function attemptListItemText(item: AttemptListItem, ctx: TextContext): string {
   const head = [
     `${verdictMark(item.verdict)} ${item.locator}`,
     item.evalId,
     item.experimentId,
     formatDurationMs(item.durationMs),
-    ...(item.costUSD !== undefined ? [formatUSD(item.costUSD)] : []),
+    ...(item.costUSD !== null ? [formatUSD(item.costUSD)] : []),
   ].join(" · ");
   const lines = [head];
-  if (item.error) {
-    lines.push(indentBlock(wrapDisplay(item.error, ctx.width - 4).join("\n"), "    "));
-  }
-  for (const assertion of item.assertions) {
-    const scoreText =
-      assertion.threshold !== undefined
-        ? `${formatPlainNumber(assertion.score)}/${formatPlainNumber(assertion.threshold)}`
-        : formatPlainNumber(assertion.score);
-    lines.push(
-      `  ${assertion.severity} ${assertion.name} · ${localeText(locale, `verdict.${assertion.passed ? "passed" : "failed"}`)}${assertion.severity === "soft" ? ` ${scoreText}` : ""}`,
-    );
-    if (assertion.detail) lines.push(indentBlock(wrapDisplay(assertion.detail, ctx.width - 4).join("\n"), "    "));
-    if (assertion.evidence) {
-      const limit = Math.max(240, ctx.width * 5);
-      const evidence =
-        assertion.evidence.length <= limit
-          ? assertion.evidence
-          : `${assertion.evidence.slice(0, limit)}… (${assertion.evidence.length - limit} more chars; open ${item.locator} for full evidence)`;
-      lines.push(indentBlock(wrapDisplay(evidence, ctx.width - 6).join("\n"), "      "));
-    }
-  }
+  const reason = attemptReasonText(item, ctx.locale, ctx.width * 2 - 4);
+  if (reason) lines.push(`  ${reason}`);
   return lines.join("\n");
 }
 
-export function attemptListText(items: AttemptListItem[], total: number | undefined, ctx: TextContext): string {
+export function attemptListText(items: readonly AttemptListItem[], total: number | undefined, ctx: TextContext): string {
   const locale = ctx.locale;
   if (items.length === 0) return localeText(locale, "attemptList.empty");
-  const blocks = items.map((item) => attemptListItemText(item, ctx, locale));
+  const blocks = items.map((item) => attemptListItemText(item, ctx));
   const remaining = (total ?? items.length) - items.length;
   if (remaining > 0) blocks.push(localeText(locale, "attemptList.truncatedText", { n: remaining }));
   return blocks.join("\n\n");