niceeval 0.4.6 → 0.5.1

package/src/report/load.ts

@@ -0,0 +1,67 @@
+// --report 的装载:两个宿主(show / view)共用的中性入口。复用跑用户 .ts 配置的
+// 同一 tsx 加载机制(bin 里已 register)。show 一进程一次装载;view 的 dev server
+// 每次请求现读现渲染 —— ESM 模块缓存永不失效,所以按文件 mtime 做 cache-busting
+// (freshImport):报告文件变更 → 下次请求拿到新模块,整页重算(docs/reports.md
+// 裁决记录 6)。装载环境坑见 memory/tsx-dynamic-import-require-cycle.md。
+
+import { existsSync, statSync } from "node:fs";
+import { resolve } from "node:path";
+import { pathToFileURL } from "node:url";
+import { isReportDefinition, type ReportDefinition } from "./report.ts";
+
+/** 可预期的装载错误:宿主打一句英文直说问题与下一步,不抛堆栈。 */
+export class ReportLoadError extends Error {}
+
+export interface LoadReportOptions {
+  /**
+   * 按文件 mtime 追加 query 绕开 ESM 模块缓存:同一文件未变时命中缓存,
+   * 变更后重新装载。dev server(view)传 true;一次性进程(show / --out)不需要。
+   */
+  freshImport?: boolean;
+}
+
+export async function loadReportFile(
+  cwd: string,
+  path: string,
+  options?: LoadReportOptions,
+): Promise<ReportDefinition> {
+  const abs = resolve(cwd, path);
+  if (!existsSync(abs)) {
+    throw new ReportLoadError(
+      `Report file not found: ${abs}. Pass --report an explicit path to a module whose default export is defineReport(...).`,
+    );
+  }
+  const plain = pathToFileURL(abs);
+  const url = new URL(plain.href);
+  if (options?.freshImport) {
+    // 只 bust 报告文件本体:它 import 的模块仍走缓存,与「报告文件变更整页重算」的
+    // 装载语义一致(依赖变更不追踪)。tsx 与 Node 原生 ESM 都认 file URL 的 query。
+    url.searchParams.set("mtime", String(statSync(abs).mtimeMs));
+  }
+  let mod: { default?: unknown };
+  try {
+    mod = (await import(url.href)) as { default?: unknown };
+  } catch (e) {
+    // 个别装载环境(如 vitest 的 vite-node)按「扩展名 + query」误判文件类型;
+    // 退化为普通 import(失去变更重载,不失去功能)。仍失败才是真错误。
+    if (url.href !== plain.href) {
+      try {
+        mod = (await import(plain.href)) as { default?: unknown };
+      } catch {
+        throw new ReportLoadError(
+          `Cannot load report file ${abs}: ${e instanceof Error ? e.message : String(e)}`,
+        );
+      }
+    } else {
+      throw new ReportLoadError(
+        `Cannot load report file ${abs}: ${e instanceof Error ? e.message : String(e)}`,
+      );
+    }
+  }
+  if (!isReportDefinition(mod.default)) {
+    throw new ReportLoadError(
+      `${path} does not default-export a report. Export default defineReport(async ({ selection, results }) => ...) from "niceeval/report".`,
+    );
+  }
+  return mod.default;
+}

package/src/report/metrics.ts

@@ -16,8 +16,9 @@ import type { Metric } from "./types.ts";
 /**
  * 定义一个指标。内置指标与自定义指标是同一个类型,没有特权;
  * 校验只管「能进计算」的最低要求,聚合语义见 docs/reports.md。
+ * name 是 const 泛型:产物的 name 保持字面量,`row.cells[metric.name]` 才有编译期列键。
  */
-export function defineMetric(def: Metric): Metric {
+export function defineMetric<const Name extends string>(def: Metric<Name>): Metric<Name> {
   if (typeof def.name !== "string" || def.name.length === 0) {
     throw new Error("defineMetric: metric name must be a non-empty string.");
   }

package/src/report/param.ts

@@ -0,0 +1,18 @@
+// param():把 experiment 声明的 params 当维度或轴(docs/reports.md「params 与新摆法」)。
+// 变量来自配置,不来自命名 —— 报告不解析 experiment id 字符串抠变量。
+
+import type { ParamRef } from "./types.ts";
+
+export function param(
+  name: string,
+  opts?: {
+    /** 组标签 / 轴标签;函数形态把声明值折成组名(如 `(v) => \`${v} agents\``)。 */
+    label?: string | ((value: string | number | boolean) => string);
+    unit?: string;
+  },
+): ParamRef {
+  if (typeof name !== "string" || name.length === 0) {
+    throw new Error("param: name must be a non-empty string (the key declared in the experiment's params).");
+  }
+  return { kind: "param", name, label: opts?.label, unit: opts?.unit };
+}

package/src/report/primitives.tsx

@@ -0,0 +1,117 @@
+// 排版原语 Row / Col / Section / Text / Style:五个内置双面组件,没有特殊机制。
+// web 面是普通 React 渲染;text 面用 ctx.render(child, 子宽) 显式传宽,
+// Row 分栏、宽度不足降级纵向。Style 给自定义组件带样式:web 面吐 <style> 标签,
+// text 面渲染为空 —— 静态导出不打包用户代码,className 引用的 CSS 靠它随树走。
+
+import type { ReactNode } from "react";
+import { defineComponent, type ReportNode } from "./tree.ts";
+import { indentBlock, joinColumns, wrapDisplay } from "./text/layout.ts";
+
+function childArray(children: ReportNode): ReportNode[] {
+  if (children === null || children === undefined || typeof children === "boolean") return [];
+  return Array.isArray(children) ? children : [children];
+}
+
+function cx(...parts: (string | undefined)[]): string {
+  return parts.filter(Boolean).join(" ");
+}
+
+export interface LayoutProps {
+  children?: ReportNode;
+  className?: string;
+}
+
+/** 纵向依次排列:网页是块级堆叠,终端是逐块输出(块间空一行)。 */
+export const Col = defineComponent<LayoutProps>({
+  web({ children, className }) {
+    return <div className={cx("nre", "nre-col", className)}>{children as ReactNode}</div>;
+  },
+  text({ children }, ctx) {
+    return childArray(children)
+      .map((child) => ctx.render(child))
+      .filter((block) => block.length > 0)
+      .join("\n\n");
+  },
+});
+Col.displayName = "Col";
+
+// Row 的每栏至少留这个宽度,不硬挤;不够就降级纵向
+const MIN_COLUMN_WIDTH = 24;
+const COLUMN_SEPARATOR = " │ ";
+
+/** 并排:网页横向排布,终端字符分栏;终端宽度不够时自动降级为纵向。 */
+export const Row = defineComponent<LayoutProps>({
+  web({ children, className }) {
+    return <div className={cx("nre", "nre-row", className)}>{children as ReactNode}</div>;
+  },
+  text({ children }, ctx) {
+    const blocks = childArray(children).filter(
+      (child) => child !== null && child !== undefined && typeof child !== "boolean",
+    );
+    if (blocks.length === 0) return "";
+    if (blocks.length === 1) return ctx.render(blocks[0]);
+    const columnWidth = Math.floor(
+      (ctx.width - COLUMN_SEPARATOR.length * (blocks.length - 1)) / blocks.length,
+    );
+    if (columnWidth < MIN_COLUMN_WIDTH) {
+      // 宽度不足:降级纵向,与 Col 同一形态
+      return blocks
+        .map((child) => ctx.render(child))
+        .filter((block) => block.length > 0)
+        .join("\n\n");
+    }
+    const rendered = blocks.map((child) => ctx.render(child, columnWidth));
+    return joinColumns(rendered, rendered.map(() => columnWidth), COLUMN_SEPARATOR);
+  },
+});
+Row.displayName = "Row";
+
+export interface SectionProps extends LayoutProps {
+  title: string;
+}
+
+/** 带标题的块:网页是标题层级,终端是标题行加缩进。 */
+export const Section = defineComponent<SectionProps>({
+  web({ title, children, className }) {
+    return (
+      <section className={cx("nre", "nre-section", className)}>
+        <h2 className="nre-section-title">{title}</h2>
+        {children as ReactNode}
+      </section>
+    );
+  },
+  text({ title, children }, ctx) {
+    const body = childArray(children)
+      .map((child) => ctx.render(child, ctx.width - 2))
+      .filter((block) => block.length > 0)
+      .join("\n\n");
+    return body.length > 0 ? `${title}\n${indentBlock(body, "  ")}` : title;
+  },
+});
+Section.displayName = "Section";
+
+/** 说明文字:网页是段落,终端是折行文本。 */
+export const Text = defineComponent<LayoutProps>({
+  web({ children, className }) {
+    return <p className={cx("nre", "nre-text", className)}>{children as ReactNode}</p>;
+  },
+  text({ children }, ctx) {
+    return wrapDisplay(ctx.render(children), ctx.width).join("\n");
+  },
+});
+Text.displayName = "Text";
+
+export interface StyleProps {
+  children?: string;
+}
+
+/** 自定义组件的样式随树带走:web 面吐 <style> 标签,text 面渲染为空。 */
+export const Style = defineComponent<StyleProps>({
+  web({ children }) {
+    return <style>{children}</style>;
+  },
+  text() {
+    return "";
+  },
+});
+Style.displayName = "Style";

package/src/report/react/CaseList.tsx

@@ -3,7 +3,7 @@
 // truncated 如实报「还有 n 条没列」。长文本收进 <details>,零 JS 也能展开。
 
 import type { ReactElement } from "react";
-import type { AttemptRef, CaseListData } from "./data.ts";
+import type { AttemptRef, CaseListData } from "../types.ts";
 import { colorClassForKey } from "./colors.ts";
 import { cx, formatDurationMs, formatUSD } from "./format.ts";
 
@@ -32,7 +32,7 @@ export function CaseList({
               {row.costUSD !== undefined && <span className="nre-case-cost">{formatUSD(row.costUSD)}</span>}
               {attemptHref && (
                 <a className="nre-case-link" href={attemptHref(row.ref)}>
-                  查看 attempt
+                  view attempt
                 </a>
               )}
             </div>

package/src/report/react/DeltaTable.tsx

@@ -3,7 +3,7 @@
 // 任一侧缺数据时 Δ 显示为缺,不硬算(数据侧已给 delta: null,这里只如实渲染)。
 
 import type { ReactElement } from "react";
-import type { DeltaData, MetricColumn } from "./data.ts";
+import type { DeltaData, MetricColumn } from "../types.ts";
 import { MetricCellView } from "./cell.tsx";
 import { colorClassForKey } from "./colors.ts";
 import { MISSING_TEXT, cx } from "./format.ts";
@@ -29,7 +29,7 @@ export function DeltaTable({
       <thead>
         <tr>
           <th scope="col" className="nre-dimension">
-            对比(A → B)
+            pair (A → B)
           </th>
           {data.columns.map((col) => (
             <th scope="col" key={col.key} className="nre-metric-col">

package/src/report/react/MetricBars.tsx

@@ -0,0 +1,109 @@
+// MetricBars:分组条形——同一份矩阵数据的另一种摆法(MetricBars.data = MetricMatrix.data)。
+// 组维度一组条、系列维度一根条、条长是指标值;竖向分组柱,柱顶标数值,系列颜色与
+// 其它组件的稳定配色一致,图例自动生成。组内按值排序,方向随 better;
+// 缺数据的系列不画柱、不编 0(与 text 面的 — 同口径)。
+
+import type { ReactElement } from "react";
+import type { AttemptRef, MatrixData, MetricCell } from "../types.ts";
+import { colorHexForKey, colorClassForKey } from "./colors.ts";
+import { cx } from "./format.ts";
+
+const WIDTH = 640;
+const HEIGHT = 320;
+const PLOT = { left: 16, right: WIDTH - 16, top: 28, bottom: HEIGHT - 40 };
+
+export function MetricBars({
+  data,
+  attemptHref,
+  className,
+}: {
+  data: MatrixData;
+  attemptHref?: (ref: AttemptRef) => string;
+  className?: string;
+}): ReactElement {
+  // 稀疏 cells → 首次出现顺序的组/系列键 + 查找表
+  const groupKeys: string[] = [];
+  const seriesKeys: string[] = [];
+  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);
+    byPosition.set(JSON.stringify([entry.row, entry.column]), entry.cell);
+  }
+
+  const better = data.metric.better ?? "higher";
+  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;
+  // 条高刻度:% 的天然域是 [0,1],其余以全图最大值为满条
+  const ratioOf = (value: number) => (data.metric.unit === "%" ? Math.min(1, Math.max(0, value)) : maxValue === 0 ? 0 : value / maxValue);
+
+  const groupWidth = (PLOT.right - PLOT.left) / Math.max(1, groupKeys.length);
+  const barWidth = Math.min(36, (groupWidth - 16) / Math.max(1, seriesKeys.length));
+  const plotHeight = PLOT.bottom - PLOT.top;
+
+  return (
+    <figure className={cx("nre", "nre-metric-bars", className)}>
+      <svg
+        className="nre-bars-svg"
+        viewBox={`0 0 ${WIDTH} ${HEIGHT}`}
+        role="img"
+        aria-label={`${data.metric.label} by ${data.rows} × ${data.columns}`}
+      >
+        {groupKeys.map((group, gi) => {
+          const x0 = PLOT.left + gi * groupWidth;
+          // 组内按值排序,方向随 better(缺数据的系列不画柱)
+          const entries = seriesKeys
+            .map((series) => ({ series, cell: byPosition.get(JSON.stringify([group, series])) }))
+            .filter((e): e is { series: string; cell: MetricCell } => e.cell !== undefined && e.cell.value !== null)
+            .sort((a, b) =>
+              better === "lower" ? (a.cell.value as number) - (b.cell.value as number) : (b.cell.value as number) - (a.cell.value as number),
+            );
+          const innerWidth = entries.length * barWidth;
+          const startX = x0 + (groupWidth - innerWidth) / 2;
+          return (
+            <g key={group} className="nre-bars-group" data-group={group}>
+              {entries.map(({ series, cell }, si) => {
+                const h = Math.max(1, ratioOf(cell.value as number) * plotHeight);
+                const x = startX + si * barWidth;
+                const y = PLOT.bottom - h;
+                const title = `${group} · ${series}: ${cell.display}(${cell.samples}/${cell.total})`;
+                const rect = (
+                  <rect className="nre-bar" x={x + 2} y={y} width={barWidth - 4} height={h} fill={colorHexForKey(series)}>
+                    <title>{title}</title>
+                  </rect>
+                );
+                const ref = cell.refs[0];
+                return (
+                  <g key={series}>
+                    {attemptHref && ref ? <a href={attemptHref(ref)}>{rect}</a> : rect}
+                    {/* 柱顶标数值;覆盖不全时把 samples/total 一并标出,不藏 */}
+                    <text className="nre-bar-value" x={x + barWidth / 2} y={y - 4} textAnchor="middle" fontSize={10} fill="#525252">
+                      {cell.samples < cell.total ? `${cell.display} ${cell.samples}/${cell.total}` : cell.display}
+                    </text>
+                  </g>
+                );
+              })}
+              <text className="nre-bars-group-label" x={x0 + groupWidth / 2} y={HEIGHT - 20} textAnchor="middle" fontSize={12} fill="#525252">
+                {group}
+              </text>
+            </g>
+          );
+        })}
+        {/* 基线 */}
+        <line x1={PLOT.left} y1={PLOT.bottom} x2={PLOT.right} y2={PLOT.bottom} stroke="#d4d4d4" />
+      </svg>
+      {/* 图例:系列 → 稳定配色,跨块同键同色 */}
+      <figcaption className="nre-bars-legend">
+        <span className="nre-bars-metric">
+          {data.metric.label}
+          {data.metric.unit && <span className="nre-unit">({data.metric.unit})</span>}
+        </span>
+        {seriesKeys.map((series) => (
+          <span key={series} className={cx("nre-legend-key", "nre-key", colorClassForKey(series))}>
+            {series}
+          </span>
+        ))}
+      </figcaption>
+    </figure>
+  );
+}

package/src/report/react/MetricLine.tsx

@@ -0,0 +1,200 @@
+// MetricLine:趋势线——x 是 experiment 声明的 param(有序变量),每个系列一条线。
+// 与 MetricScatter 的分工:scatter 的两轴都是测出来的指标(找 frontier),
+// line 的 x 是你配置的变量(看趋势)。x 轴正常升序;y 轴向随 better;
+// x 或 y 缺数据的点不画,注脚如实报数;每个点带 <title> hover,可经 pointHref 下钻。
+
+import type { ReactElement } from "react";
+import type { LineData } from "../types.ts";
+import { colorHexForKey } from "./colors.ts";
+import { MISSING_TEXT, cx } from "./format.ts";
+
+const WIDTH = 640;
+const HEIGHT = 360;
+const PLOT = { left: 64, right: WIDTH - 140, top: 24, bottom: HEIGHT - 56 };
+
+interface DrawablePoint {
+  key: string;
+  series?: string;
+  xValue: number;
+  yValue: number;
+  title: string;
+  px: number;
+  py: number;
+}
+
+function linearScale(values: number[], pixelLo: number, pixelHi: number, invert: boolean) {
+  const lo = Math.min(...values);
+  const hi = Math.max(...values);
+  const span = hi - lo || 2;
+  const padded = { lo: lo - (hi - lo ? span * 0.08 : 1), hi: hi + (hi - lo ? span * 0.08 : 1) };
+  const scale = (v: number) => {
+    let t = (v - padded.lo) / (padded.hi - padded.lo);
+    if (invert) t = 1 - t;
+    return pixelLo + t * (pixelHi - pixelLo);
+  };
+  return { lo, hi, scale };
+}
+
+export function MetricLine({
+  data,
+  pointHref,
+  className,
+}: {
+  data: LineData;
+  pointHref?: (row: LineData["rows"][number]) => string;
+  className?: string;
+}): ReactElement {
+  const missing = data.rows.filter((r) => r.x === null || r.y.value === null);
+  const drawableRows = data.rows.filter((r) => r.x !== null && r.y.value !== null);
+
+  const missingNote =
+    missing.length > 0 ? (
+      <p className="nre-line-missing" title={missing.map((r) => r.key).join(", ")}>
+        {missing.length} {missing.length === 1 ? "point" : "points"} missing data
+      </p>
+    ) : null;
+
+  if (drawableRows.length === 0) {
+    return (
+      <figure className={cx("nre", "nre-metric-line", className)}>
+        <p className="nre-missing">{MISSING_TEXT}</p>
+        {missingNote}
+      </figure>
+    );
+  }
+
+  const xScale = linearScale(drawableRows.map((r) => r.x as number), PLOT.left, PLOT.right, false);
+  // y 像素轴向下增长:higher 高值在上;lower 反向后「好」的一端同样在上
+  const yScale = linearScale(
+    drawableRows.map((r) => r.y.value as number),
+    PLOT.bottom,
+    PLOT.top,
+    data.y.better === "lower",
+  );
+
+  const points: DrawablePoint[] = drawableRows.map((r) => ({
+    key: r.key,
+    series: r.series,
+    xValue: r.x as number,
+    yValue: r.y.value as number,
+    title: `${r.key}\n${data.x.label}: ${r.xDisplay}\n${data.y.label}: ${r.y.display}(${r.y.samples}/${r.y.total})`,
+    px: xScale.scale(r.x as number),
+    py: yScale.scale(r.y.value as number),
+  }));
+
+  // 同系列的点按 x 排序连线;系列名标在最右点旁
+  const seriesOrder: string[] = [];
+  const bySeries = new Map<string, DrawablePoint[]>();
+  for (const p of points) {
+    const key = p.series ?? "";
+    if (!bySeries.has(key)) {
+      bySeries.set(key, []);
+      seriesOrder.push(key);
+    }
+    bySeries.get(key)!.push(p);
+  }
+  for (const list of bySeries.values()) list.sort((a, b) => a.xValue - b.xValue);
+
+  const xTicks = xScale.lo === xScale.hi ? [xScale.lo] : [xScale.lo, xScale.hi];
+  const yTicks = yScale.lo === yScale.hi ? [yScale.lo] : [yScale.lo, yScale.hi];
+  const xDisplayFor = (value: number) =>
+    drawableRows.find((r) => r.x === value)?.xDisplay ?? String(value);
+  const yDisplayFor = (value: number) =>
+    drawableRows.find((r) => r.y.value === value)?.y.display ?? String(value);
+
+  return (
+    <figure className={cx("nre", "nre-metric-line", className)}>
+      <svg
+        className="nre-line-svg"
+        viewBox={`0 0 ${WIDTH} ${HEIGHT}`}
+        role="img"
+        aria-label={`${data.y.label} by ${data.x.label}`}
+      >
+        <rect
+          className="nre-line-plot"
+          x={PLOT.left}
+          y={PLOT.top}
+          width={PLOT.right - PLOT.left}
+          height={PLOT.bottom - PLOT.top}
+          fill="none"
+          stroke="#d4d4d4"
+        />
+        <text className="nre-line-xlabel" x={(PLOT.left + PLOT.right) / 2} y={HEIGHT - 8} textAnchor="middle" fontSize={12} fill="#525252">
+          {data.x.label}
+          {data.x.unit ? `(${data.x.unit})` : ""}
+        </text>
+        <text
+          className="nre-line-ylabel"
+          x={16}
+          y={(PLOT.top + PLOT.bottom) / 2}
+          textAnchor="middle"
+          fontSize={12}
+          fill="#525252"
+          transform={`rotate(-90 16 ${(PLOT.top + PLOT.bottom) / 2})`}
+        >
+          {data.y.label}
+          {data.y.unit ? `(${data.y.unit})` : ""}
+        </text>
+
+        {xTicks.map((v) => (
+          <text key={`x${v}`} className="nre-line-tick" x={xScale.scale(v)} y={PLOT.bottom + 16} textAnchor="middle" fontSize={11} fill="#737373">
+            {xDisplayFor(v)}
+          </text>
+        ))}
+        {yTicks.map((v) => (
+          <text key={`y${v}`} className="nre-line-tick" x={PLOT.left - 6} y={yScale.scale(v) + 4} textAnchor="end" fontSize={11} fill="#737373">
+            {yDisplayFor(v)}
+          </text>
+        ))}
+
+        {seriesOrder.map((series) => {
+          const list = bySeries.get(series)!;
+          const color = series === "" ? "#525252" : colorHexForKey(series);
+          const labelAt = list.reduce((a, b) => (b.px > a.px ? b : a));
+          return (
+            <g key={series || "(single)"} className="nre-line-series" data-series={series || undefined}>
+              {list.length > 1 && (
+                <polyline
+                  className="nre-line-path"
+                  points={list.map((p) => `${p.px},${p.py}`).join(" ")}
+                  fill="none"
+                  stroke={color}
+                  strokeWidth={1.5}
+                />
+              )}
+              {series !== "" && (
+                <text className="nre-line-series-label" x={labelAt.px + 8} y={labelAt.py + 4} fontSize={12} fill={color}>
+                  {series}
+                </text>
+              )}
+            </g>
+          );
+        })}
+
+        {points.map((p, i) => {
+          const circle = (
+            <circle
+              className="nre-line-point"
+              data-key={p.key}
+              cx={p.px}
+              cy={p.py}
+              r={4}
+              fill={p.series !== undefined ? colorHexForKey(p.series) : "#525252"}
+            >
+              <title>{p.title}</title>
+            </circle>
+          );
+          const row = drawableRows[i];
+          return pointHref ? (
+            <a key={`${p.key}:${i}`} className="nre-line-point-link" href={pointHref(row)}>
+              {circle}
+            </a>
+          ) : (
+            <g key={`${p.key}:${i}`}>{circle}</g>
+          );
+        })}
+      </svg>
+      {missingNote}
+    </figure>
+  );
+}

package/src/report/react/MetricMatrix.tsx

@@ -5,7 +5,7 @@
 // 是格子里的普通 <a>,不 hydrate 也能点。
 
 import type { ReactElement } from "react";
-import type { AttemptRef, MatrixData } from "./data.ts";
+import type { AttemptRef, MatrixData } from "../types.ts";
 import { MetricCellView } from "./cell.tsx";
 import { colorClassForKey } from "./colors.ts";
 import { cx } from "./format.ts";

package/src/report/react/MetricScatter.tsx

@@ -4,7 +4,7 @@
 // 底部注脚如实报「n 个点缺数据」;hover 信息退化为 SVG <title>,不 hydrate 也在。
 
 import type { ReactElement } from "react";
-import type { MetricColumn, ScatterData } from "./data.ts";
+import type { MetricColumn, ScatterData } from "../types.ts";
 import { colorHexForKey } from "./colors.ts";
 import { MISSING_TEXT, cx } from "./format.ts";
 

package/src/report/react/MetricTable.tsx

@@ -5,7 +5,7 @@
 // 一组全 null 渲染成「缺数据」,绝不画 0(逻辑在 MetricCellView)。
 
 import type { ReactElement } from "react";
-import type { AttemptRef, TableData } from "./data.ts";
+import type { AttemptRef, TableData } from "../types.ts";
 import { MetricCellView } from "./cell.tsx";
 import { colorClassForKey } from "./colors.ts";
 import { cx } from "./format.ts";

package/src/report/react/RunOverview.tsx

@@ -3,7 +3,7 @@
 // 诚实不靠使用者记得渲染(docs/reports.md「第一档」行为清单)。
 
 import type { ReactElement } from "react";
-import type { OverviewData } from "./data.ts";
+import type { OverviewData } from "../types.ts";
 import { MISSING_TEXT, cx, formatDurationMs, formatPercent, formatUSD } from "./format.ts";
 
 export function RunOverview({
@@ -72,12 +72,12 @@ export function RunOverview({
         ))}
       </p>
 
-      {/* 选择器的警告(残缺快照等)直接渲染在条内,不静默 */}
+      {/* 选集的警告(残缺快照等)直接渲染在条内,不静默;结构化字段供程序判断,这里打 message */}
       {data.warnings.length > 0 && (
         <ul className="nre-warnings">
           {data.warnings.map((w, i) => (
-            <li key={i} className="nre-warning">
-              {w}
+            <li key={i} className="nre-warning" data-kind={w.kind}>
+              {w.message}
             </li>
           ))}
         </ul>

package/src/report/react/Scoreboard.tsx

@@ -3,7 +3,7 @@
 // weights 是「实际生效的权重表」,渲染出来让成绩单可审计(docs/reports.md scoreboard 公式一节)。
 
 import type { ReactElement } from "react";
-import type { ScoreboardData } from "./data.ts";
+import type { ScoreboardData } from "../types.ts";
 import { colorClassForKey } from "./colors.ts";
 import { cx } from "./format.ts";
 
@@ -28,7 +28,7 @@ export function Scoreboard({
         <thead>
           <tr>
             <th scope="col" className="nre-dimension">
-              {data.of}
+              {data.dimension}
             </th>
             <th scope="col" className="nre-total-col">
               Total<span className="nre-full-marks">/ {data.fullMarks}</span>
@@ -72,7 +72,7 @@ export function Scoreboard({
       </table>
       {/* 实际生效的权重表:成绩单可审计 */}
       <p className="nre-weights">
-        权重:
+        weights:{" "}
         {data.weights.length === 0
           ? "all evals ×1"
           : data.weights.map((w) => (

package/src/report/react/cell.tsx

@@ -3,7 +3,7 @@
 // 纯渲染、零 hooks;交互只有普通 <a>(下钻由使用者的 attemptHref 决定去处)。
 
 import type { ReactElement } from "react";
-import type { AttemptRef, MetricCell } from "./data.ts";
+import type { AttemptRef, MetricCell } from "../types.ts";
 import { MISSING_TEXT } from "./format.ts";
 
 export function MetricCellView({