niceeval 0.6.1 → 0.7.0

package/dist/report/react/MetricScatter.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { formatMetricValue } from "../format.js";
-import { DEFAULT_REPORT_LOCALE, countText, localeText, resolveMetricLabel } from "../locale.js";
-import { layoutLabelOffsets, niceTicks } from "./chart-math.js";
+import { DEFAULT_REPORT_LOCALE, countText, localeText, resolveLocalizedText, resolveMetricLabel } from "../locale.js";
+import { niceTicks, placePointLabels } from "./chart-math.js";
 import { colorClassForKey, seriesClassForKey } from "./colors.js";
 import { cx } from "./format.js";
 const WIDTH = 640;
@@ -9,22 +9,55 @@ const HEIGHT = 360;
 const MARGIN = { top: 26, right: 24, bottom: 46, left: 62 };
 const PLOT_W = WIDTH - MARGIN.left - MARGIN.right;
 const PLOT_H = HEIGHT - MARGIN.top - MARGIN.bottom;
-/** 点的直接标签:experiment id 的末段(完整 id 在 <title> 里)。 */
-function pointLabel(key) {
-    return key.split("/").filter(Boolean).at(-1) ?? key;
+/**
+ * 点的直接标签:末段在当前 data 中唯一才缩成末段;重名时逐步加长为能区分它们的最短
+ * 路径后缀(完整 id 与两轴值仍进 <title>)。
+ */
+function pointLabels(keys) {
+    const segsOf = (key) => key.split("/").filter(Boolean);
+    const depth = new Map(keys.map((key) => [key, 1]));
+    for (;;) {
+        const byLabel = new Map();
+        for (const key of keys) {
+            const segs = segsOf(key);
+            const label = segs.slice(-Math.min(depth.get(key), segs.length)).join("/") || key;
+            byLabel.set(label, [...(byLabel.get(label) ?? []), key]);
+        }
+        let grew = false;
+        for (const group of byLabel.values()) {
+            if (group.length < 2)
+                continue;
+            for (const key of group) {
+                const segs = segsOf(key);
+                if (depth.get(key) < segs.length) {
+                    depth.set(key, depth.get(key) + 1);
+                    grew = true;
+                }
+            }
+        }
+        if (!grew) {
+            const out = new Map();
+            for (const key of keys) {
+                const segs = segsOf(key);
+                out.set(key, segs.slice(-Math.min(depth.get(key), segs.length)).join("/") || key);
+            }
+            return out;
+        }
+    }
 }
 /**
- * 一根轴:niceTicks 撑出整齐的值域,值 → 像素做线性映射;
- * better: "lower" 时反向,好的一端固定在右 / 上。
+ * 一根轴:niceTicks 撑出整齐的值域,值 → 像素做线性映射。轴方向跟随指标的 `better`:
+ * `better: "lower"` 的轴反向渲染(值大的一端在左 / 下),「更好」因此恒指向右与上;
+ * 刻度标签始终显示真实值,反向只改方向不改数字(docs/feature/reports/library/metric-views.md)。
  */
-function axisScale(values, better, pixelLo, pixelHi) {
+function axisScale(values, pixelLo, pixelHi, invert) {
     const ticks = niceTicks(Math.min(...values), Math.max(...values), 5);
     const lo = ticks[0];
     const hi = ticks[ticks.length - 1];
     const scale = (v) => {
         let t = (v - lo) / (hi - lo || 1);
-        if (better === "lower")
-            t = 1 - t; // 反向:值越低越靠「好」的一端
+        if (invert)
+            t = 1 - t;
         return pixelLo + t * (pixelHi - pixelLo);
     };
     return { ticks, scale };
@@ -41,21 +74,25 @@ export function MetricScatter({ data, pointHref, className, locale = DEFAULT_REP
         return (_jsxs("figure", { className: cx("nre", "nre-metric-scatter", className), children: [_jsx("p", { className: "nre-scatter-empty nre-missing", children: localeText(locale, "scatter.noData", { x: xLabel, y: yLabel }) }), missingNote] }));
     }
     const axisLabel = (label, col) => `${label}${col.unit ? `(${col.unit})` : ""}`;
-    const xScale = axisScale(drawableRows.map((r) => r.x.value), data.x.better, MARGIN.left, MARGIN.left + PLOT_W);
-    // y 像素轴向下增长:better:"higher" 高值在上 → 映射到 [bottom, top];"lower" 由 axisScale 反向后同样落到上方
-    const yScale = axisScale(drawableRows.map((r) => r.y.value), data.y.better, MARGIN.top + PLOT_H, MARGIN.top);
+    // 轴方向跟随 better:lower 反向(值大在左 / 下),higher 与未声明正向。
+    const xScale = axisScale(drawableRows.map((r) => r.x.value), MARGIN.left, MARGIN.left + PLOT_W, data.x.better === "lower");
+    // y 像素轴向下增长:正向 = 高值在上 → 映射到 [bottom, top];lower 反向 = 高值在下。
+    const yScale = axisScale(drawableRows.map((r) => r.y.value), MARGIN.top + PLOT_H, MARGIN.top, data.y.better === "lower");
+    const labelByKey = pointLabels(drawableRows.map((r) => r.key));
+    // 方向提示恒为「越靠右上越好」,仅当两轴都声明 better 时显示——任一轴未声明,
+    // 组件不猜「更好」朝哪边,整图无提示。
+    const showBetterHint = data.x.better !== undefined && data.y.better !== undefined;
     const points = drawableRows.map((r) => {
         const xValue = r.x.value;
         const yValue = r.y.value;
         return {
             key: r.key,
             series: r.series,
-            label: pointLabel(r.key),
+            label: labelByKey.get(r.key) ?? r.key,
             xValue,
             yValue,
-            // hover 内容:experiment(点键)+ 系列(series,ExperimentComparison 传的是 agent 维度,
-            // 有则加一行;无系列的散点没有这行)+ 两轴 display 与 samples/total(docs/feature/reports/library.md「MetricScatter」行为清单)
-            title: `${r.key}${r.series !== undefined ? `\n${r.series}` : ""}\n${xLabel}: ${r.x.display}(${r.x.samples}/${r.x.total})\n${yLabel}: ${r.y.display}(${r.y.samples}/${r.y.total})`,
+            // hover 内容:experiment(点键)+ 系列(有则加一行)+ 两轴 display 与 samples/total
+            title: `${r.key}${r.series !== undefined ? `\n${r.series}` : ""}\n${xLabel}: ${resolveLocalizedText(r.x.display, locale)}(${r.x.samples}/${r.x.total})\n${yLabel}: ${resolveLocalizedText(r.y.display, locale)}(${r.y.samples}/${r.y.total})`,
             px: xScale.scale(xValue),
             py: yScale.scale(yValue),
         };
@@ -74,22 +111,16 @@ export function MetricScatter({ data, pointHref, className, locale = DEFAULT_REP
     }
     for (const list of bySeries.values())
         list.sort((a, b) => a.xValue - b.xValue);
-    // 直接标签的防撞布局:靠右的点把标签锚到左侧,重叠的往下推、补 leader line
-    const positions = points.map((p) => {
-        const anchorLeft = p.px >= MARGIN.left + PLOT_W * 0.72;
-        return { cx: p.px, cy: p.py, anchorLeft, width: p.label.length * 6.4 + 10 };
-    });
-    const labelOffsets = layoutLabelOffsets(positions);
-    return (_jsxs("figure", { className: cx("nre", "nre-metric-scatter", className), children: [_jsxs("svg", { className: "nre-scatter-svg", viewBox: `0 0 ${WIDTH} ${HEIGHT}`, role: "img", "aria-label": `${axisLabel(xLabel, data.x)} × ${axisLabel(yLabel, data.y)}`, children: [_jsxs("g", { className: "nre-scatter-grid", children: [yScale.ticks.map((tick) => (_jsx("line", { x1: MARGIN.left, x2: MARGIN.left + PLOT_W, y1: yScale.scale(tick), y2: yScale.scale(tick) }, `gy${tick}`))), xScale.ticks.map((tick) => (_jsx("line", { y1: MARGIN.top, y2: MARGIN.top + PLOT_H, x1: xScale.scale(tick), x2: xScale.scale(tick) }, `gx${tick}`)))] }), _jsx("text", { className: "nre-scatter-better-hint", x: MARGIN.left + PLOT_W - 6, y: MARGIN.top + 14, textAnchor: "end", children: localeText(locale, "scatter.betterHint") }), _jsx("g", { className: "nre-scatter-axis nre-scatter-axis-y", children: yScale.ticks.map((tick) => (_jsx("text", { className: "nre-scatter-tick", x: MARGIN.left - 8, y: yScale.scale(tick) + 3, textAnchor: "end", children: formatMetricValue(tick, data.y.unit) }, `ay${tick}`))) }), _jsx("g", { className: "nre-scatter-axis nre-scatter-axis-x", children: xScale.ticks.map((tick) => (_jsx("text", { className: "nre-scatter-tick", x: xScale.scale(tick), y: MARGIN.top + PLOT_H + 16, textAnchor: "middle", children: formatMetricValue(tick, data.x.unit) }, `ax${tick}`))) }), _jsx("text", { className: "nre-scatter-xlabel", x: MARGIN.left + PLOT_W / 2, y: HEIGHT - 8, textAnchor: "middle", children: axisLabel(xLabel, data.x) }), _jsx("text", { className: "nre-scatter-ylabel", x: 14, y: MARGIN.top + PLOT_H / 2, textAnchor: "middle", transform: `rotate(-90 14 ${MARGIN.top + PLOT_H / 2})`, children: axisLabel(yLabel, data.y) }), seriesOrder.map((series) => {
+    // 直接标签的候选位择优布局:锚向、避让方向都由布局按空间决定,画布边界含边距
+    const labels = placePointLabels(points.map((p) => ({ cx: p.px, cy: p.py, width: p.label.length * 6.4 + 10 })), { x0: 2, y0: 2, x1: WIDTH - 2, y1: HEIGHT - 2 });
+    return (_jsxs("figure", { className: cx("nre", "nre-metric-scatter", className), children: [_jsxs("svg", { className: "nre-scatter-svg", viewBox: `0 0 ${WIDTH} ${HEIGHT}`, role: "img", "aria-label": `${axisLabel(xLabel, data.x)} × ${axisLabel(yLabel, data.y)}`, children: [_jsxs("g", { className: "nre-scatter-grid", children: [yScale.ticks.map((tick) => (_jsx("line", { x1: MARGIN.left, x2: MARGIN.left + PLOT_W, y1: yScale.scale(tick), y2: yScale.scale(tick) }, `gy${tick}`))), xScale.ticks.map((tick) => (_jsx("line", { y1: MARGIN.top, y2: MARGIN.top + PLOT_H, x1: xScale.scale(tick), x2: xScale.scale(tick) }, `gx${tick}`)))] }), showBetterHint && (_jsx("text", { className: "nre-scatter-better-hint", x: MARGIN.left + PLOT_W - 6, y: MARGIN.top + 14, textAnchor: "end", children: localeText(locale, "scatter.betterUpperRight") })), _jsx("g", { className: "nre-scatter-axis nre-scatter-axis-y", children: yScale.ticks.map((tick) => (_jsx("text", { className: "nre-scatter-tick", x: MARGIN.left - 8, y: yScale.scale(tick) + 3, textAnchor: "end", children: formatMetricValue(tick, data.y.unit) }, `ay${tick}`))) }), _jsx("g", { className: "nre-scatter-axis nre-scatter-axis-x", children: xScale.ticks.map((tick) => (_jsx("text", { className: "nre-scatter-tick", x: xScale.scale(tick), y: MARGIN.top + PLOT_H + 16, textAnchor: "middle", children: formatMetricValue(tick, data.x.unit) }, `ax${tick}`))) }), _jsx("text", { className: "nre-scatter-xlabel", x: MARGIN.left + PLOT_W / 2, y: HEIGHT - 8, textAnchor: "middle", children: axisLabel(xLabel, data.x) }), _jsx("text", { className: "nre-scatter-ylabel", x: 14, y: MARGIN.top + PLOT_H / 2, textAnchor: "middle", transform: `rotate(-90 14 ${MARGIN.top + PLOT_H / 2})`, children: axisLabel(yLabel, data.y) }), seriesOrder.map((series) => {
                         const list = bySeries.get(series);
                         if (list.length < 2)
                             return null;
                         return (_jsx("polyline", { className: cx("nre-scatter-line", seriesClassForKey(series)), "data-series": series, points: list.map((p) => `${p.px},${p.py}`).join(" "), fill: "none" }, series));
                     }), points.map((p, i) => {
-                        const { anchorLeft } = positions[i];
-                        const labelX = p.px + (anchorLeft ? -10 : 10);
-                        const labelY = p.py + 4 + labelOffsets[i];
-                        const group = (_jsxs("g", { className: cx("nre-scatter-point", p.series !== undefined ? seriesClassForKey(p.series) : "nre-series-none"), "data-key": p.key, children: [_jsx("title", { children: p.title }), labelOffsets[i] !== 0 && _jsx("line", { className: "nre-leader", x1: p.px, y1: p.py, x2: labelX, y2: labelY - 4 }), _jsx("circle", { className: "nre-scatter-hit", cx: p.px, cy: p.py, r: 12 }), _jsx("circle", { className: "nre-scatter-dot", cx: p.px, cy: p.py, r: 4.5 }), _jsx("text", { className: "nre-scatter-point-label", x: labelX, y: labelY, textAnchor: anchorLeft ? "end" : "start", children: p.label })] }));
+                        const label = labels[i];
+                        const group = (_jsxs("g", { className: cx("nre-scatter-point", p.series !== undefined ? seriesClassForKey(p.series) : "nre-series-none"), "data-key": p.key, children: [_jsx("title", { children: p.title }), label.leader && _jsx("line", { className: "nre-leader", x1: p.px, y1: p.py, x2: label.x, y2: label.y - 4 }), _jsx("circle", { className: "nre-scatter-hit", cx: p.px, cy: p.py, r: 12 }), _jsx("circle", { className: "nre-scatter-dot", cx: p.px, cy: p.py, r: 4.5 }), _jsx("text", { className: "nre-scatter-point-label", x: label.x, y: label.y, textAnchor: label.anchor, children: p.label })] }));
                         const row = drawableRows[i];
                         return pointHref ? (_jsx("a", { className: "nre-scatter-point-link", href: pointHref(row), children: group }, p.key)) : (_jsx("g", { children: group }, p.key));
                     })] }), seriesOrder.length > 0 && (_jsx("figcaption", { className: "nre-scatter-legend", children: seriesOrder.map((series) => (_jsx("span", { className: cx("nre-legend-key", "nre-key", colorClassForKey(series)), children: series }, series))) })), missingNote] }));

package/dist/report/react/MetricTable.js

@@ -3,21 +3,11 @@ import { DEFAULT_REPORT_LOCALE, localeText, resolveMetricLabel } from "../locale
 import { MetricCellView } from "./cell.js";
 import { colorClassForKey } from "./colors.js";
 import { cx } from "./format.js";
-/** verdict 计票 pill(「3 passed / 1 failed」):非零判定各一枚,全零如实空。 */
-function VerdictTally({ verdicts, locale, }) {
-    const kinds = ["passed", "failed", "errored", "skipped"].filter((k) => verdicts[k] > 0);
-    return (_jsxs("span", { className: "nre-verdict-tally", children: [kinds.map((kind) => (_jsxs("span", { className: cx("nre-verdict-pill", `nre-verdict-${kind}`), children: [verdicts[kind], " ", localeText(locale, `verdict.${kind}`)] }, kind))), kinds.length === 0 && _jsx("span", { className: "nre-missing", children: "\u2014" })] }));
-}
 export function MetricTable({ data, attemptHref, filter, className, locale = DEFAULT_REPORT_LOCALE, }) {
-    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 table = (_jsxs("table", { className: cx("nre", "nre-metric-table", !filter && className), children: [_jsx("thead", { children: _jsxs("tr", { children: [_jsx("th", { scope: "col", className: "nre-dimension", "data-nre-sort": "", children: data.dimension }), hasMeta && hasModel && (_jsx("th", { scope: "col", className: "nre-meta-col", "data-nre-sort": "", children: localeText(locale, "table.model") })), hasMeta && (_jsx("th", { scope: "col", className: "nre-meta-col", "data-nre-sort": "", children: localeText(locale, "table.agent") })), data.columns.map((col) => (_jsxs("th", { scope: "col", className: "nre-metric-col", "data-nre-sort": "", children: [resolveMetricLabel(col.label, locale, col.key), col.unit && _jsxs("span", { className: "nre-unit", children: ["(", col.unit, ")"] }), col.better && (_jsx("span", { className: "nre-better", title: localeText(locale, col.better === "higher" ? "table.higherBetter" : "table.lowerBetter"), children: col.better === "higher" ? "↑" : "↓" }))] }, col.key))), hasVerdicts && (_jsx("th", { scope: "col", className: "nre-verdicts-col", "data-nre-sort": "", children: localeText(locale, "table.verdicts") }))] }) }), _jsx("tbody", { children: data.rows.map((row) => (_jsxs("tr", { children: [_jsxs("th", { scope: "row", className: cx("nre-row-key", "nre-key", colorClassForKey(row.key)), "data-sort-value": row.key, children: [row.key, row.meta?.evals !== undefined && (_jsxs("div", { className: "nre-row-meta-sub", children: [localeText(locale, "overview.evalsCount", { n: row.meta.evals }), row.meta.attempts !== undefined && row.meta.attempts > row.meta.evals
-                                            ? ` · ${localeText(locale, "overview.attemptsCount", { n: row.meta.attempts })}`
-                                            : "", row.meta.lastRunAt ? ` · ${localeText(locale, "latestRun", { run: row.meta.lastRunAt })}` : ""] }))] }), hasMeta && hasModel && (_jsx("td", { className: "nre-td nre-meta-cell", "data-sort-value": row.meta?.model ?? "", children: row.meta?.model ?? _jsx("span", { className: "nre-missing", children: "\u2014" }) })), hasMeta && (_jsx("td", { className: "nre-td nre-meta-cell", "data-sort-value": row.meta?.agent ?? "", children: row.meta?.agent ?? _jsx("span", { className: "nre-missing", children: "\u2014" }) })), data.columns.map((col) => {
+    const table = (_jsxs("table", { className: cx("nre", "nre-metric-table", !filter && className), children: [_jsx("thead", { children: _jsxs("tr", { children: [_jsx("th", { scope: "col", className: "nre-dimension", "data-nre-sort": "", children: data.rowDimension }), data.columns.map((col) => (_jsxs("th", { scope: "col", className: "nre-metric-col", "data-nre-sort": "", children: [resolveMetricLabel(col.label, locale, col.key), col.unit && _jsxs("span", { className: "nre-unit", children: ["(", col.unit, ")"] }), col.better && (_jsx("span", { className: "nre-better", title: localeText(locale, col.better === "higher" ? "table.higherBetter" : "table.lowerBetter"), children: col.better === "higher" ? "↑" : "↓" }))] }, col.key)))] }) }), _jsx("tbody", { children: data.rows.map((row) => (_jsxs("tr", { children: [_jsx("th", { scope: "row", className: cx("nre-row-key", "nre-key", colorClassForKey(row.key)), "data-sort-value": row.key, children: row.key }), data.columns.map((col) => {
                             const cell = row.cells[col.key];
                             return (_jsx("td", { className: "nre-td", "data-sort-value": cell?.value ?? "", children: cell ? (_jsx(MetricCellView, { cell: cell, attemptHref: attemptHref, locale: locale })) : (_jsx("span", { className: "nre-empty" })) }, col.key));
-                        }), hasVerdicts && (_jsx("td", { className: "nre-td nre-verdicts-cell", "data-sort-value": row.meta?.verdicts?.passed ?? "", children: row.meta?.verdicts ? (_jsx(VerdictTally, { verdicts: row.meta.verdicts, locale: locale })) : (_jsx("span", { className: "nre-missing", children: "\u2014" })) }))] }, row.key))) })] }));
+                        })] }, row.key))) })] }));
     if (!filter)
         return table;
     // 过滤输入框渲染在表格前(同一个 wrap 里),enhance.js 经 data-nre-filter 接管;

package/dist/report/react/ScopeSummary.d.ts

@@ -0,0 +1,10 @@
+import type { ReactElement } from "react";
+import type { ScopeSummaryData } from "../types.ts";
+import { type ReportLocale } from "../locale.ts";
+export declare function ScopeSummary({ data, votes, className, locale, }: {
+    data: ScopeSummaryData;
+    /** 显示哪一级计票;默认 "eval"。data 恒携带两级,votes 只选择呈现。 */
+    votes?: "eval" | "attempt";
+    className?: string;
+    locale?: ReportLocale;
+}): ReactElement;

package/dist/report/react/ScopeSummary.js

@@ -0,0 +1,17 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { DEFAULT_REPORT_LOCALE, localeText } from "../locale.js";
+import { MetricCellView } from "./cell.js";
+import { cx } from "./format.js";
+function VerdictTallyView({ tally, locale }) {
+    const kinds = ["passed", "failed", "errored", "skipped"].filter((k) => tally[k] > 0);
+    return (_jsxs("span", { className: "nre-verdict-tally", children: [kinds.map((kind) => (_jsxs("span", { className: cx("nre-verdict-pill", `nre-verdict-${kind}`), children: [tally[kind], " ", localeText(locale, `verdict.${kind}`)] }, kind))), kinds.length === 0 && _jsx("span", { className: "nre-missing", children: "\u2014" })] }));
+}
+export function ScopeSummary({ data, votes = "eval", className, locale = DEFAULT_REPORT_LOCALE, }) {
+    const tally = votes === "attempt" ? data.attemptVerdicts : data.evalVerdicts;
+    return (_jsxs("div", { className: cx("nre", "nre-scope-summary", className), "data-votes": votes, children: [_jsxs("dl", { className: "nre-scope-kpis", children: [_jsxs("div", { className: "nre-scope-kpi nre-scope-kpi-rate", children: [_jsx("dt", { children: localeText(locale, "scopeSummary.passRate") }), _jsx("dd", { children: _jsx(MetricCellView, { cell: data.endToEndPassRate, locale: locale }) })] }), _jsxs("div", { className: "nre-scope-kpi", children: [_jsx("dt", { children: localeText(locale, "scopeSummary.experiments") }), _jsx("dd", { children: data.experiments })] }), _jsxs("div", { className: "nre-scope-kpi", children: [_jsx("dt", { children: localeText(locale, "scopeSummary.evals") }), _jsx("dd", { children: data.evals })] }), _jsxs("div", { className: "nre-scope-kpi", children: [_jsx("dt", { children: localeText(locale, "scopeSummary.attempts") }), _jsx("dd", { children: data.attempts })] }), _jsxs("div", { className: "nre-scope-kpi nre-scope-kpi-verdicts", children: [_jsx("dt", { children: localeText(locale, votes === "attempt" ? "scopeSummary.votesAttempt" : "scopeSummary.votesEval") }), _jsx("dd", { children: _jsx(VerdictTallyView, { tally: tally, locale: locale }) })] }), _jsxs("div", { className: "nre-scope-kpi", children: [_jsx("dt", { children: localeText(locale, "scopeSummary.totalCost") }), _jsx("dd", { children: _jsx(MetricCellView, { cell: data.totalCostUSD, locale: locale }) })] })] }), data.range.latestStartedAt !== null && (_jsx("p", { className: "nre-scope-summary-range", children: data.range.earliestStartedAt !== null && data.range.earliestStartedAt !== data.range.latestStartedAt
+                    ? localeText(locale, "scopeSummary.range", {
+                        from: data.range.earliestStartedAt,
+                        to: data.range.latestStartedAt,
+                    })
+                    : data.range.latestStartedAt }))] }));
+}

package/dist/report/react/Scoreboard.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { DEFAULT_REPORT_LOCALE, countText, localeText } from "../locale.js";
+import { DEFAULT_REPORT_LOCALE, countText, localeText, resolveLocalizedText } from "../locale.js";
 import { colorClassForKey } from "./colors.js";
 import { cx } from "./format.js";
 export function Scoreboard({ data, className, locale = DEFAULT_REPORT_LOCALE, }) {
@@ -11,16 +11,16 @@ export function Scoreboard({ data, className, locale = DEFAULT_REPORT_LOCALE, })
                 subjectKeys.push(subject.key);
         }
     }
-    return (_jsxs("section", { className: cx("nre", "nre-scoreboard", className), children: [_jsxs("table", { className: "nre-scoreboard-table", children: [_jsx("thead", { children: _jsxs("tr", { children: [_jsx("th", { scope: "col", className: "nre-dimension", children: data.dimension }), _jsxs("th", { scope: "col", className: "nre-total-col", children: [localeText(locale, "scoreboard.total"), _jsxs("span", { className: "nre-full-marks", children: ["/ ", data.fullMarks] })] }), subjectKeys.map((key) => (_jsx("th", { scope: "col", className: "nre-subject-col", children: key }, key)))] }) }), _jsx("tbody", { children: data.rows.map((row) => (_jsxs("tr", { children: [_jsx("th", { scope: "row", className: cx("nre-row-key", "nre-key", colorClassForKey(row.key)), children: row.key }), _jsx("td", { className: "nre-total", children: row.total.display }), subjectKeys.map((key) => {
+    return (_jsxs("section", { className: cx("nre", "nre-scoreboard", className), children: [_jsxs("table", { className: "nre-scoreboard-table", children: [_jsx("thead", { children: _jsxs("tr", { children: [_jsx("th", { scope: "col", className: "nre-dimension", children: data.rowDimension }), _jsxs("th", { scope: "col", className: "nre-total-col", children: [localeText(locale, "scoreboard.total"), _jsxs("span", { className: "nre-full-marks", children: ["/ ", data.fullMarks] })] }), subjectKeys.map((key) => (_jsx("th", { scope: "col", className: "nre-subject-col", children: key }, key)))] }) }), _jsx("tbody", { children: data.rows.map((row) => (_jsxs("tr", { children: [_jsx("th", { scope: "row", className: cx("nre-row-key", "nre-key", colorClassForKey(row.key)), children: row.key }), _jsxs("td", { className: "nre-total", children: [resolveLocalizedText(row.total.display, locale), row.total.notRun > 0 && (_jsx("span", { className: "nre-total-not-run", children: countText(locale, "scoreboard.notRun", row.total.notRun) })), row.total.unscorable > 0 && (_jsx("span", { className: "nre-total-unscorable", children: countText(locale, "scoreboard.unscorable", row.total.unscorable) }))] }), subjectKeys.map((key) => {
                                     const subject = row.subjects.find((s) => s.key === key);
                                     if (!subject)
                                         return _jsx("td", { className: "nre-td-empty" }, key);
-                                    return (_jsxs("td", { className: "nre-subject", children: [_jsxs("span", { className: "nre-subject-score", title: localeText(locale, "scoreboard.subjectTitle", {
-                                                    evals: subject.evals,
+                                    return (_jsxs("td", { className: "nre-subject", children: [_jsx("span", { className: "nre-subject-score", title: localeText(locale, "scoreboard.subjectTitle", {
+                                                    questions: subject.questions,
                                                     earned: subject.earned,
                                                     possible: subject.possible,
-                                                }), children: [subject.earned, "/", subject.possible] }), subject.missing > 0 && (_jsx("span", { className: "nre-subject-missing", children: countText(locale, "scoreboard.missing", subject.missing) }))] }, key));
+                                                }), children: resolveLocalizedText(subject.display, locale) }), subject.notRun > 0 && (_jsx("span", { className: "nre-subject-not-run", children: localeText(locale, "scoreboard.notRunText", { n: subject.notRun }) })), subject.unscorable > 0 && (_jsx("span", { className: "nre-subject-unscorable", children: localeText(locale, "scoreboard.unscorableText", { n: subject.unscorable }) }))] }, key));
                                 })] }, row.key))) })] }), _jsxs("p", { className: "nre-weights", children: [localeText(locale, "scoreboard.weights"), " ", data.weights.length === 0
                         ? localeText(locale, "scoreboard.allWeights")
-                        : data.weights.map((w) => (_jsxs("span", { className: "nre-weight", children: [w.prefix, " \u00D7", w.weight] }, w.prefix))), data.weights.length > 0 && _jsx("span", { className: "nre-weight-rest", children: localeText(locale, "scoreboard.othersWeight") })] })] }));
+                        : data.weights.map((w) => (_jsxs("span", { className: "nre-weight", children: [w.prefix, " \u00D7", w.weight] }, w.prefix))), data.weights.length > 0 && _jsx("span", { className: "nre-weight-rest", children: localeText(locale, "scoreboard.othersWeight") })] }), data.ignoredEvals > 0 && (_jsx("p", { className: "nre-scoreboard-ignored", children: countText(locale, "scoreboard.ignored", data.ignoredEvals) }))] }));
 }

package/dist/report/react/cell.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { DEFAULT_REPORT_LOCALE, localeText } from "../locale.js";
+import { DEFAULT_REPORT_LOCALE, localeText, resolveLocalizedText } from "../locale.js";
 export function MetricCellView({ cell, attemptHref, locale = DEFAULT_REPORT_LOCALE, }) {
     // 全 null(没有任何有效样本)→ 缺数据文案,绝不画 0;total 仍如实入 title
     if (cell.value === null) {
         return (_jsx("span", { className: "nre-cell nre-cell-missing", children: _jsx("span", { className: "nre-missing", title: localeText(locale, "cell.noneMeasurableTitle", { total: cell.total }), children: localeText(locale, "cell.missing") }) }));
     }
-    return (_jsxs("span", { className: "nre-cell", children: [_jsx("span", { className: "nre-value", title: localeText(locale, "cell.measuredTitle", { samples: cell.samples, total: cell.total }), children: cell.display }), cell.samples < cell.total && (_jsxs("sup", { className: "nre-coverage", title: localeText(locale, "cell.coverageTitle", { samples: cell.samples, total: cell.total }), children: [cell.samples, "/", cell.total] })), attemptHref && cell.refs && cell.refs.length > 0 && (_jsx("span", { className: "nre-refs", children: cell.refs.map((locator, i) => (_jsxs("a", { className: "nre-ref", href: attemptHref(locator), children: ["#", i + 1] }, locator))) }))] }));
+    return (_jsxs("span", { className: "nre-cell", children: [_jsx("span", { className: "nre-value", title: localeText(locale, "cell.measuredTitle", { samples: cell.samples, total: cell.total }), children: resolveLocalizedText(cell.display, locale) }), cell.samples < cell.total && (_jsxs("sup", { className: "nre-coverage", title: localeText(locale, "cell.coverageTitle", { samples: cell.samples, total: cell.total }), children: [cell.samples, "/", cell.total] })), attemptHref && cell.refs && cell.refs.length > 0 && (_jsx("span", { className: "nre-refs", children: cell.refs.map((locator, i) => (_jsxs("a", { className: "nre-ref", href: attemptHref(locator), children: ["#", i + 1] }, locator))) }))] }));
 }

package/dist/report/react/chart-math.d.ts

@@ -1,14 +1,31 @@
 /** [min, max] 区间上生成 count 个左右的“整齐”刻度(Heckbert nice-numbers)。 */
 export declare function niceTicks(min: number, max: number, count?: number): number[];
-export interface LabelInput {
+export interface PointLabelInput {
     cx: number;
     cy: number;
+    /** 标签文本的估算宽度(px)。 */
     width: number;
-    /** true = 文字锚在点左侧(text-anchor: end),false = 锚在右侧(text-anchor: start)。 */
-    anchorLeft: boolean;
+}
+/** 标签允许占用的画布范围(含坐标轴边距,标签可以借用空白边距)。 */
+export interface LabelBounds {
+    x0: number;
+    y0: number;
+    x1: number;
+    y1: number;
+}
+export interface PlacedPointLabel {
+    /** <text> 的锚点坐标(y 为文字基线)。 */
+    x: number;
+    y: number;
+    anchor: "start" | "end" | "middle";
+    /** 标签不在点左右紧邻位:渲染层补 leader line 连回原点。 */
+    leader: boolean;
 }
 /**
- * 贪心地把互相重叠的直接标签往下推开(按 y 排序、逐个查重叠再下移),点本身位置不变。
- * 散点常见同分不同价的聚簇,这一步避免标签叠成一团糊字。
+ * 散点直接标签的候选位择优布局(docs/feature/reports/library.md「MetricScatter」):
+ * 每个标签在点四周由近及远的候选环上打分——与已放置标签的重叠、与任何数据点的重叠、
+ * 越出画布的面积、离点距离逐项累加,取代价最小的候选。存在无冲突候选时标签必不遮点、
+ * 不叠标签、不越界;全候选冲突时取重叠最小者,绝不丢标签。重合点簇因此向不同方向散开,
+ * 而不是单向堆叠压到下方的数据点上。
  */
-export declare function layoutLabelOffsets(items: LabelInput[], lineHeight?: number, padX?: number): number[];
+export declare function placePointLabels(points: PointLabelInput[], bounds: LabelBounds): PlacedPointLabel[];

package/dist/report/react/chart-math.js

@@ -1,5 +1,4 @@
-// 通用图表数值工具:round-number 刻度生成与标签防撞布局,零依赖纯函数。
-// 从 src/view/app/lib/chart.ts 迁来(view 侧从这里 re-export),报告组件与 view 共用同一份。
+// 通用图表数值工具:round-number 刻度生成与点标签布局,零依赖纯函数。
 function niceNumber(range, round) {
     if (range <= 0)
         return 1;
@@ -43,26 +42,79 @@ export function niceTicks(min, max, count = 5) {
         ticks.push(Number(v.toFixed(10)));
     return ticks;
 }
+/** 标签框高度(基线上方 10px、下方 2px,对应 11px 字号)。 */
+const LABEL_ASCENT = 10;
+const LABEL_DESCENT = 2;
+/** 数据点视为边长 2×DOT_R 的方形障碍(点半径 4.5 + 命中余量)。 */
+const DOT_R = 6;
+/** 紧邻位与点的水平间距;候选环按它逐环外扩。 */
+const NEAR = 10;
+const RINGS = [NEAR, NEAR + 12, NEAR + 26];
+function labelBoxAt(x, y, anchor, width) {
+    const x0 = anchor === "start" ? x : anchor === "end" ? x - width : x - width / 2;
+    return { x0, y0: y - LABEL_ASCENT, x1: x0 + width, y1: y + LABEL_DESCENT };
+}
+function overlapArea(a, b) {
+    const w = Math.min(a.x1, b.x1) - Math.max(a.x0, b.x0);
+    const h = Math.min(a.y1, b.y1) - Math.max(a.y0, b.y0);
+    return w > 0 && h > 0 ? w * h : 0;
+}
+function outOfBoundsArea(box, bounds) {
+    const total = (box.x1 - box.x0) * (box.y1 - box.y0);
+    const w = Math.min(box.x1, bounds.x1) - Math.max(box.x0, bounds.x0);
+    const h = Math.min(box.y1, bounds.y1) - Math.max(box.y0, bounds.y0);
+    const inside = w > 0 && h > 0 ? w * h : 0;
+    return total - inside;
+}
+/** 一个点在距离 d 的候选环:左右紧邻、四个斜角、正上正下。顺序即同代价时的偏好序。 */
+function ringCandidates(p, d) {
+    const diag = d * 0.75;
+    return [
+        { x: p.cx + d, y: p.cy + 4, anchor: "start" },
+        { x: p.cx - d, y: p.cy + 4, anchor: "end" },
+        { x: p.cx + diag, y: p.cy - diag - 2, anchor: "start" },
+        { x: p.cx - diag, y: p.cy - diag - 2, anchor: "end" },
+        { x: p.cx, y: p.cy - d - LABEL_DESCENT - 2, anchor: "middle" },
+        { x: p.cx + diag, y: p.cy + diag + LABEL_ASCENT, anchor: "start" },
+        { x: p.cx - diag, y: p.cy + diag + LABEL_ASCENT, anchor: "end" },
+        { x: p.cx, y: p.cy + d + LABEL_ASCENT + 2, anchor: "middle" },
+    ];
+}
 /**
- * 贪心地把互相重叠的直接标签往下推开(按 y 排序、逐个查重叠再下移),点本身位置不变。
- * 散点常见同分不同价的聚簇,这一步避免标签叠成一团糊字。
+ * 散点直接标签的候选位择优布局(docs/feature/reports/library.md「MetricScatter」):
+ * 每个标签在点四周由近及远的候选环上打分——与已放置标签的重叠、与任何数据点的重叠、
+ * 越出画布的面积、离点距离逐项累加,取代价最小的候选。存在无冲突候选时标签必不遮点、
+ * 不叠标签、不越界;全候选冲突时取重叠最小者,绝不丢标签。重合点簇因此向不同方向散开,
+ * 而不是单向堆叠压到下方的数据点上。
  */
-export function layoutLabelOffsets(items, lineHeight = 14, padX = 4) {
-    const offsets = new Array(items.length).fill(0);
-    const order = [...items.keys()].sort((a, b) => items[a].cy - items[b].cy || items[a].cx - items[b].cx);
-    const placed = [];
+export function placePointLabels(points, bounds) {
+    const dots = points.map((p) => ({ x0: p.cx - DOT_R, y0: p.cy - DOT_R, x1: p.cx + DOT_R, y1: p.cy + DOT_R }));
+    const placedBoxes = [];
+    const result = new Array(points.length);
+    // 由上到下、由左到右逐个放置,布局确定可复现
+    const order = [...points.keys()].sort((a, b) => points[a].cy - points[b].cy || points[a].cx - points[b].cx);
     for (const i of order) {
-        const it = items[i];
-        const x0 = it.anchorLeft ? it.cx - it.width : it.cx;
-        const x1 = it.anchorLeft ? it.cx : it.cx + it.width;
-        let y = it.cy;
-        let guard = 0;
-        while (guard < 40 && placed.some((p) => x0 < p.x1 + padX && x1 > p.x0 - padX && Math.abs(y - p.y) < lineHeight)) {
-            y += lineHeight;
-            guard++;
+        const p = points[i];
+        let best = null;
+        for (let ring = 0; ring < RINGS.length; ring++) {
+            const candidates = ringCandidates(p, RINGS[ring]);
+            for (let c = 0; c < candidates.length; c++) {
+                const candidate = candidates[c];
+                const box = labelBoxAt(candidate.x, candidate.y, candidate.anchor, p.width);
+                let cost = 0;
+                for (const placed of placedBoxes)
+                    cost += overlapArea(box, placed) * 4;
+                for (const dot of dots)
+                    cost += overlapArea(box, dot) * 3;
+                cost += outOfBoundsArea(box, bounds) * 6;
+                cost += ring * 8 + c * 0.5; // 近环、偏好序靠前者优先,只作同冲突程度下的排序
+                if (best === null || cost < best.cost) {
+                    best = { candidate, box, cost, leader: !(ring === 0 && c <= 1) };
+                }
+            }
         }
-        placed.push({ x0, x1, y });
-        offsets[i] = y - it.cy;
+        placedBoxes.push(best.box);
+        result[i] = { ...best.candidate, leader: best.leader };
     }
-    return offsets;
+    return result;
 }

package/dist/report/react/fixtures.d.ts

@@ -1,19 +1,15 @@
-import type { AttemptListItem, DeltaData, EvalListItem, ExperimentListItem, GroupSummaryData, LineData, MatrixData, MetricColumn, OverviewData, ScatterData, ScoreboardData, TableData } from "../types.ts";
+import type { AttemptListItem, DeltaData, EvalListItem, ExperimentListItem, LineData, MatrixData, MetricColumn, ScatterData, ScopeSummaryData, ScoreboardData, TableData } from "../types.ts";
 export declare const passRateColumn: MetricColumn;
 export declare const codeLinesColumn: MetricColumn;
 export declare const costColumn: MetricColumn;
-export declare const overviewData: OverviewData;
-export declare const overviewWithCost: OverviewData;
-/** GroupSummary.data 的产物形态:eval 级折叠计票 + 旧 GroupSelector 口径的通过率(包成 MetricCell)。 */
-export declare const groupSummaryData: GroupSummaryData;
-export declare const tableData: TableData<"pass-rate" | "code-lines">;
-/** rows: "experiment" 的榜单形态:行携带 agent/model 元信息与 eval 级折叠计票。 */
-export declare const tableDataWithMeta: TableData<"pass-rate">;
+/** scopeSummaryData 的产物形态:两级计票恒随行,成功率与总成本是官方 MetricCell。 */
+export declare const scopeSummaryData: ScopeSummaryData;
+export declare const tableData: TableData;
 export declare const matrixData: MatrixData;
 export declare const scoreboardData: ScoreboardData;
 export declare const scatterData: ScatterData;
 export declare const lineData: LineData;
-export declare const deltaData: DeltaData<"pass-rate" | "cost">;
+export declare const deltaData: DeltaData;
 export declare const attemptListItems: AttemptListItem[];
 export declare const evalListItems: EvalListItem[];
 export declare const experimentListItems: ExperimentListItem[];