niceeval 0.6.1 → 0.6.2

package/dist/report/locale.d.ts

@@ -24,7 +24,7 @@ declare const en: {
     readonly "table.attempt": "attempt";
     readonly "experimentList.experiment": "Experiment";
     readonly "experimentList.avgDuration": "Avg duration";
-    readonly "experimentList.passRate": "Pass rate";
+    readonly "experimentList.passRate": "End-to-end pass rate";
     readonly "experimentList.tokens": "Tokens";
     readonly "experimentList.estimatedCost": "Est. cost";
     readonly "experimentList.result": "Result";
@@ -35,13 +35,14 @@ declare const en: {
     readonly "experimentList.filterPlaceholder": "Filter experiments…";
     readonly "experimentList.defaultModel": "default";
     readonly "experimentList.flags": "Flags";
+    readonly "entityList.average": "{value} avg";
     /** <Table> 压到下限仍放不下时,从右侧丢列并如实报数。 */
     readonly "table.columnsHidden.one": "({n} more column not shown)";
     readonly "table.columnsHidden.other": "({n} more columns not shown)";
     readonly "overview.snapshots": "Snapshots";
     readonly "overview.evals": "Evals";
     readonly "overview.attempts": "attempts";
-    readonly "overview.passRate": "Pass rate";
+    readonly "overview.passRate": "End-to-end pass rate";
     readonly "overview.totalCost": "Total cost";
     readonly "overview.totalDuration": "Total duration";
     readonly "overview.source": "Source: {n} snapshots";
@@ -51,6 +52,13 @@ declare const en: {
     readonly "overview.attemptsCount": "{n} attempts";
     /** GroupSummary 的 KPI dt 标签(其余字段复用 verdict.* / overview.* 已有 key)。 */
     readonly "groupSummary.experiments": "Experiments";
+    readonly "experimentComparison.groups": "Experiment groups";
+    readonly "experimentComparison.group": "Experiment group";
+    readonly "experimentComparison.results": "Results";
+    readonly "experimentComparison.lastRun": "Last run";
+    readonly "experimentComparison.selectGroup": "Select experiment group {group}";
+    readonly "experimentComparison.command": "Details: {command}";
+    readonly "experimentComparison.empty": "No experiment groups";
     readonly "composedFrom.one": "composed from {n} run";
     readonly "composedFrom.other": "composed from {n} runs";
     readonly latestRun: "latest {run}";
@@ -65,6 +73,7 @@ declare const en: {
     readonly "attemptList.truncated": "and {n} more not shown";
     readonly "attemptList.truncatedText": "({n} more not shown)";
     readonly "attemptList.score": "score {score}";
+    readonly "attemptList.unavailable": "unavailable";
     readonly "attemptList.details": "details";
     readonly "scoreboard.total": "Total";
     readonly "scoreboard.totalText": "total";

package/dist/report/locale.js

@@ -2,7 +2,7 @@
 // 只覆盖组件自带的固定文案(verdict 词、缺数据、覆盖率角标、注脚、占位符等);
 // 数据本身(display、维度键、warnings 的 message)不经这里。
 // 刻意不 import src/i18n/(CLI 专用字典,locale 来源与 key 面完全不同);
-// zh-CN 译法与 src/view/app/i18n.ts 现有词保持一致(成功率/平均耗时/预估成本…)。
+// zh-CN 译法与默认 Reports 契约保持一致(端到端成功率/平均耗时/预估成本…)。
 export const DEFAULT_REPORT_LOCALE = "en";
 const en = {
     "verdict.passed": "passed",
@@ -27,7 +27,7 @@ const en = {
     "table.attempt": "attempt",
     "experimentList.experiment": "Experiment",
     "experimentList.avgDuration": "Avg duration",
-    "experimentList.passRate": "Pass rate",
+    "experimentList.passRate": "End-to-end pass rate",
     "experimentList.tokens": "Tokens",
     "experimentList.estimatedCost": "Est. cost",
     "experimentList.result": "Result",
@@ -38,13 +38,14 @@ const en = {
     "experimentList.filterPlaceholder": "Filter experiments…",
     "experimentList.defaultModel": "default",
     "experimentList.flags": "Flags",
+    "entityList.average": "{value} avg",
     /** <Table> 压到下限仍放不下时,从右侧丢列并如实报数。 */
     "table.columnsHidden.one": "({n} more column not shown)",
     "table.columnsHidden.other": "({n} more columns not shown)",
     "overview.snapshots": "Snapshots",
     "overview.evals": "Evals",
     "overview.attempts": "attempts",
-    "overview.passRate": "Pass rate",
+    "overview.passRate": "End-to-end pass rate",
     "overview.totalCost": "Total cost",
     "overview.totalDuration": "Total duration",
     "overview.source": "Source: {n} snapshots",
@@ -54,6 +55,13 @@ const en = {
     "overview.attemptsCount": "{n} attempts",
     /** GroupSummary 的 KPI dt 标签(其余字段复用 verdict.* / overview.* 已有 key)。 */
     "groupSummary.experiments": "Experiments",
+    "experimentComparison.groups": "Experiment groups",
+    "experimentComparison.group": "Experiment group",
+    "experimentComparison.results": "Results",
+    "experimentComparison.lastRun": "Last run",
+    "experimentComparison.selectGroup": "Select experiment group {group}",
+    "experimentComparison.command": "Details: {command}",
+    "experimentComparison.empty": "No experiment groups",
     "composedFrom.one": "composed from {n} run",
     "composedFrom.other": "composed from {n} runs",
     "latestRun": "latest {run}",
@@ -68,6 +76,7 @@ const en = {
     "attemptList.truncated": "and {n} more not shown",
     "attemptList.truncatedText": "({n} more not shown)",
     "attemptList.score": "score {score}",
+    "attemptList.unavailable": "unavailable",
     "attemptList.details": "details",
     "scoreboard.total": "Total",
     "scoreboard.totalText": "total",
@@ -103,7 +112,7 @@ const zhCN = {
     "table.attempt": "Attempt",
     "experimentList.experiment": "实验",
     "experimentList.avgDuration": "平均耗时",
-    "experimentList.passRate": "成功率",
+    "experimentList.passRate": "端到端成功率",
     "experimentList.tokens": "Tokens",
     "experimentList.estimatedCost": "预估成本",
     "experimentList.result": "结果",
@@ -114,12 +123,13 @@ const zhCN = {
     "experimentList.filterPlaceholder": "筛选实验…",
     "experimentList.defaultModel": "默认",
     "experimentList.flags": "Flags",
+    "entityList.average": "平均 {value}",
     "table.columnsHidden.one": "(还有 {n} 列未列出)",
     "table.columnsHidden.other": "(还有 {n} 列未列出)",
     "overview.snapshots": "快照",
     "overview.evals": "题目",
     "overview.attempts": "尝试",
-    "overview.passRate": "通过率",
+    "overview.passRate": "端到端成功率",
     "overview.totalCost": "总成本",
     "overview.totalDuration": "总耗时",
     "overview.source": "数据来源:{n} 个快照",
@@ -128,6 +138,13 @@ const zhCN = {
     "overview.evalsCount": "{n} 道题",
     "overview.attemptsCount": "{n} 次 attempt",
     "groupSummary.experiments": "实验数",
+    "experimentComparison.groups": "实验组",
+    "experimentComparison.group": "实验组",
+    "experimentComparison.results": "结果",
+    "experimentComparison.lastRun": "最后运行",
+    "experimentComparison.selectGroup": "选择实验组 {group}",
+    "experimentComparison.command": "查看：{command}",
+    "experimentComparison.empty": "没有实验组",
     "composedFrom.one": "合成自 {n} 个 run",
     "composedFrom.other": "合成自 {n} 个 run",
     "latestRun": "最新 {run}",
@@ -141,6 +158,7 @@ const zhCN = {
     "attemptList.truncated": "还有 {n} 条未列出",
     "attemptList.truncatedText": "(还有 {n} 条未列出)",
     "attemptList.score": "得分 {score}",
+    "attemptList.unavailable": "评不了",
     "attemptList.details": "详情",
     "scoreboard.total": "总分",
     "scoreboard.totalText": "总分",

package/dist/report/metrics.d.ts

@@ -8,7 +8,19 @@ import type { Metric } from "./types.ts";
 export declare function defineMetric<const Name extends string>(def: Metric<Name>): Metric<Name>;
 /** 单 attempt 成本:网关实测(usage.costUSD)优先于价格表估算(estimatedCostUSD);都缺 → null,不编 0。 */
 export declare function attemptCostUSD(result: EvalResult): number | null;
-export declare const passRate: Metric<"pass-rate">;
+/**
+ * 条件答题质量:passed = 1,failed = 0,errored 记 null 不进分母。
+ * 这是「已形成可信判定」条件下的诊断指标,不能简称默认成功率
+ * (docs/feature/reports/library.md「内置指标」)。
+ */
+export declare const taskPassRate: Metric<"task-pass-rate">;
+/** 执行可靠性:跑到可判定(passed / failed)= 1,errored = 0;skipped → null。 */
+export declare const executionReliability: Metric<"execution-reliability">;
+/**
+ * 端到端合成:passed = 1,failed / errored = 0;哪边拖累用
+ * taskPassRate / executionReliability 拆开看。
+ */
+export declare const endToEndPassRate: Metric<"end-to-end-pass-rate">;
 export declare const examScore: Metric<"exam-score">;
 export declare const durationMs: Metric<"duration">;
 export declare const tokens: Metric<"tokens">;

package/dist/report/metrics.js

@@ -1,15 +1,18 @@
 // defineMetric 与内置指标。
 //
 // null ≠ 0:null = 此 attempt 测不了这个指标(不进聚合);0 = 测了,结果是零(照常进)。
-// 哪个 verdict 落哪边必须显式表态,内置指标按 docs/feature/reports/library.md「内置指标」的表格:
+// 哪个 verdict 落哪边必须显式表态,内置指标按 docs/feature/reports/library.md「内置指标」的表格。
+// 三个通过率指标把「Agent 答错」与「基建没跑起来」拆开,不互相伪装:
 //
-//   指标(name)             skipped  errored          failed  passed        better
-//   passRate(pass-rate)     null     0                0       1             higher
-//   examScore(exam-score)   null     0                0       soft 均分      higher
-//   durationMs(duration)    null     实测             实测     实测          lower
-//   tokens(tokens)          null     实测;无 usage→null 同左   同左          lower
-//   costUSD(cost)           null     同上             同左     同左          lower
-//   turns(turns)             null     实测;o11y 缺失→null 同左  同左          lower
+//   指标(name)                                    skipped  errored          failed  passed        better
+//   taskPassRate(task-pass-rate)                   null     null             0       1             higher
+//   executionReliability(execution-reliability)    null     0                1       1             higher
+//   endToEndPassRate(end-to-end-pass-rate)         null     0                0       1             higher
+//   examScore(exam-score)                          null     0                0       soft 均分      higher
+//   durationMs(duration)                           null     实测             实测     实测          lower
+//   tokens(tokens)                                 null     实测;无 usage→null 同左   同左          lower
+//   costUSD(cost)                                  null     同上             同左     同左          lower
+//   turns(turns)                                   null     实测;o11y 缺失→null 同左  同左          lower
 //
 // 两档指标(docs/feature/reports/library.md「内置指标」):以上除 turns 外全部只读 attempt.result
 // 的瘦身字段——任何 producer、任何 copySnapshots artifacts 选择都算得出,内置报告
@@ -33,10 +36,56 @@ export function defineMetric(def) {
 export function attemptCostUSD(result) {
     return result.usage?.costUSD ?? result.estimatedCostUSD ?? null;
 }
-export const passRate = defineMetric({
-    name: "pass-rate",
-    label: { en: "Pass rate", "zh-CN": "成功率" },
-    description: "Share of evals that passed (skipped attempts excluded).",
+/**
+ * 条件答题质量:passed = 1,failed = 0,errored 记 null 不进分母。
+ * 这是「已形成可信判定」条件下的诊断指标,不能简称默认成功率
+ * (docs/feature/reports/library.md「内置指标」)。
+ */
+export const taskPassRate = defineMetric({
+    name: "task-pass-rate",
+    label: { en: "Task pass rate", "zh-CN": "可判定任务通过率" },
+    description: "Conditional task quality among attempts that formed a trustworthy verdict: passed = 1, failed = 0; errored is null.",
+    better: "higher",
+    unit: "%",
+    value(a) {
+        switch (a.result.verdict) {
+            case "passed":
+                return 1;
+            case "failed":
+                return 0;
+            default:
+                // errored = 没形成可信判定 → null 不进这个条件指标;skipped 同为 null。
+                return null;
+        }
+    },
+});
+/** 执行可靠性:跑到可判定(passed / failed)= 1,errored = 0;skipped → null。 */
+export const executionReliability = defineMetric({
+    name: "execution-reliability",
+    label: { en: "Execution reliability", "zh-CN": "执行可靠性" },
+    description: "Execution reliability: reached a trustworthy verdict (passed / failed) = 1, errored = 0.",
+    better: "higher",
+    unit: "%",
+    value(a) {
+        switch (a.result.verdict) {
+            case "passed":
+            case "failed":
+                return 1;
+            case "errored":
+                return 0;
+            default:
+                return null; // skipped
+        }
+    },
+});
+/**
+ * 端到端合成:passed = 1,failed / errored = 0;哪边拖累用
+ * taskPassRate / executionReliability 拆开看。
+ */
+export const endToEndPassRate = defineMetric({
+    name: "end-to-end-pass-rate",
+    label: { en: "End-to-end pass rate", "zh-CN": "端到端成功率" },
+    description: "End-to-end composite: passed = 1, failed / errored = 0. Split blame with taskPassRate and executionReliability.",
     better: "higher",
     unit: "%",
     value: (a) => a.result.verdict === "skipped" ? null : a.result.verdict === "passed" ? 1 : 0,
@@ -56,10 +105,12 @@ export const examScore = defineMetric({
         // failed 同理得 0:--strict 下被翻成 failed 的哪怕 soft 分不低也是 0(报告不重新判卷)。
         if (verdict !== "passed")
             return 0;
-        const soft = assertions.filter((x) => x.severity === "soft");
+        // unavailable 没有分数:不计入均分分母(评不了 ≠ 0 分;非 optional 的 unavailable
+        // 早已把 verdict 拖成 errored,走不到这个分支)。
+        const soft = assertions.filter((x) => x.severity === "soft" && x.outcome !== "unavailable");
         if (soft.length === 0)
             return 1;
-        return soft.reduce((sum, x) => sum + x.score, 0) / soft.length;
+        return soft.reduce((sum, x) => sum + (x.outcome === "unavailable" ? 0 : x.score), 0) / soft.length;
     },
 });
 export const durationMs = defineMetric({

package/dist/report/primitives.d.ts

@@ -30,6 +30,12 @@ export interface TableColumn {
     header: string;
     /** 对齐方向,默认 `"left"`;`"right"` 按显示宽度右对齐,数字列用。 */
     align?: ColumnAlign;
+    /**
+     * text 面:单元格折行后的最大物理行数,放不下的部分以 `…` 收口;省略则不限行数。
+     * 摘要类列(如比较列表的 Result)用它保证「格子是可扫读的预览」;完整值在下钻面。
+     * web 面不消费——网页的高度约束是组件自己的 CSS 决定。
+     */
+    maxLines?: number;
 }
 /** 一行的数据:身份键、已格式化的格子、可选的 attempt locator。 */
 export interface TableRow {

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

@@ -7,8 +7,8 @@ export declare function AttemptLocatorBadge({ item, attemptHref, }: {
     item: Pick<AttemptListItem, "locator" | "verdict">;
     attemptHref: (locator: AttemptLocator) => string;
 }): ReactElement;
-/** 一条 Attempt 的完整卡片:AttemptList 自己的一项,也是 EvalList 展开区里的一行。 */
-export declare function AttemptRow({ item, attemptHref, locale, }: {
+/** 一条 Attempt 的比较卡片；完整 assertions 通过 locator 下钻，不在列表内展开。 */
+export declare function AttemptRow({ item, attemptHref, }: {
     item: AttemptListItem;
     attemptHref: (locator: AttemptLocator) => string;
     locale?: ReportLocale;

package/dist/report/react/AttemptList.js

@@ -1,17 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DEFAULT_REPORT_LOCALE, localeText } from "../locale.js";
+import { attemptItemReason } from "../format.js";
 import { colorClassForKey } from "./colors.js";
 import { cx, formatDurationMs, formatUSD, verdictMark } from "./format.js";
 /** locator + 判定符的普通 <a>,AttemptList/EvalList/ExperimentList 共用。 */
 export function AttemptLocatorBadge({ item, attemptHref, }) {
     return (_jsxs("a", { className: cx("nre-locator", `nre-verdict-${item.verdict}`), href: attemptHref(item.locator), children: [item.locator, _jsx("span", { className: "nre-locator-mark", children: verdictMark(item.verdict) })] }));
 }
-function AssertionRow({ assertion, locale }) {
-    return (_jsxs("li", { className: cx("nre-assertion", `nre-assertion-${assertion.severity}`, !assertion.passed && "nre-assertion-failed"), children: [_jsx("span", { className: "nre-assertion-severity", children: assertion.severity }), _jsx("span", { className: "nre-assertion-name", children: assertion.name }), _jsx("span", { className: "nre-assertion-score", children: localeText(locale, "attemptList.score", { score: assertion.score }) }), (assertion.detail || assertion.evidence) && (_jsxs("details", { className: "nre-assertion-more", children: [_jsx("summary", { children: localeText(locale, "attemptList.details") }), assertion.detail && _jsx("p", { className: "nre-assertion-detail", children: assertion.detail }), assertion.evidence && _jsx("blockquote", { className: "nre-assertion-evidence", children: assertion.evidence })] }))] }));
-}
-/** 一条 Attempt 的完整卡片:AttemptList 自己的一项,也是 EvalList 展开区里的一行。 */
-export function AttemptRow({ item, attemptHref, locale = DEFAULT_REPORT_LOCALE, }) {
-    return (_jsxs("li", { className: cx("nre-attempt", `nre-attempt-${item.verdict}`), children: [_jsxs("div", { className: "nre-attempt-head", children: [_jsx(AttemptLocatorBadge, { item: item, attemptHref: attemptHref }), _jsx("span", { className: "nre-attempt-eval", children: item.evalId }), _jsx("span", { className: "nre-attempt-experiment", children: item.experimentId }), _jsx("span", { className: cx("nre-attempt-agent", "nre-key", colorClassForKey(item.agent)), children: item.agent }), _jsx("span", { className: "nre-attempt-duration", children: formatDurationMs(item.durationMs) }), item.costUSD !== undefined && _jsx("span", { className: "nre-attempt-cost", children: formatUSD(item.costUSD) })] }), item.error && _jsx("p", { className: "nre-attempt-error", children: item.error }), item.assertions.length > 0 && (_jsx("ul", { className: "nre-assertions", children: item.assertions.map((a, i) => (_jsx(AssertionRow, { assertion: a, locale: locale }, i))) }))] }));
+/** 一条 Attempt 的比较卡片；完整 assertions 通过 locator 下钻，不在列表内展开。 */
+export function AttemptRow({ item, attemptHref, }) {
+    const reason = attemptItemReason(item);
+    return (_jsxs("li", { className: cx("nre-attempt", `nre-attempt-${item.verdict}`), children: [_jsxs("div", { className: "nre-attempt-head", children: [_jsx(AttemptLocatorBadge, { item: item, attemptHref: attemptHref }), _jsx("span", { className: "nre-attempt-eval", children: item.evalId }), _jsx("span", { className: "nre-attempt-experiment", children: item.experimentId }), _jsx("span", { className: cx("nre-attempt-agent", "nre-key", colorClassForKey(item.agent)), children: item.agent }), _jsx("span", { className: "nre-attempt-duration", children: formatDurationMs(item.durationMs) }), item.costUSD !== undefined && _jsx("span", { className: "nre-attempt-cost", children: formatUSD(item.costUSD) })] }), reason && _jsx("p", { className: "nre-attempt-result", children: reason })] }));
 }
 export function AttemptList({ items, total, attemptHref, className, locale = DEFAULT_REPORT_LOCALE, }) {
     const remaining = (total ?? items.length) - items.length;

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

@@ -1,6 +1,6 @@
 import type { ReactElement } from "react";
-import type { EvalListItem } from "../types.ts";
 import type { AttemptLocator } from "../../results/locator.ts";
+import type { EvalListItem } from "../types.ts";
 import { type ReportLocale } from "../locale.ts";
 export declare function EvalList({ items, attemptHref, className, locale, }: {
     items: EvalListItem[];

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

@@ -0,0 +1,8 @@
+import type { ReactElement } from "react";
+import type { ExperimentComparisonData } from "../built-ins/experiment-comparison.tsx";
+import { type ReportLocale } from "../locale.ts";
+export declare function ExperimentComparisonView({ data, className, locale, }: {
+    data: ExperimentComparisonData;
+    className?: string;
+    locale?: ReportLocale;
+}): ReactElement;

package/dist/report/react/ExperimentComparison.js

@@ -0,0 +1,11 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { DEFAULT_REPORT_LOCALE, localeText } from "../locale.js";
+import { ExperimentList, MetricScatter } from "../components.js";
+import { GroupSummary } from "./GroupSummary.js";
+import { cx } from "./format.js";
+export function ExperimentComparisonView({ data, className, locale = DEFAULT_REPORT_LOCALE, }) {
+    if (data.groups.length === 0) {
+        return (_jsx("div", { className: cx("nre", "nre-experiment-comparison", className), children: _jsx("p", { className: "nre-experiment-groups-empty", children: localeText(locale, "experimentComparison.empty") }) }));
+    }
+    return (_jsxs("div", { className: cx("nre", "nre-experiment-comparison", className), "data-nre-experiment-groups": true, children: [_jsx("div", { className: "nre-experiment-group-tabs", role: "tablist", "aria-label": localeText(locale, "experimentComparison.groups"), children: data.groups.map((group, index) => (_jsxs("div", { className: "nre-experiment-group-tab", role: "tab", tabIndex: index === 0 ? 0 : -1, "aria-selected": index === 0 ? "true" : "false", "aria-label": localeText(locale, "experimentComparison.selectGroup", { group: group.key }), "data-nre-experiment-group-select": index, children: [_jsx("strong", { className: "nre-experiment-group-name", children: group.key }), _jsx(GroupSummary, { data: group.summary, locale: locale })] }, group.key))) }), _jsx("div", { className: "nre-experiment-group-panels", children: data.groups.map((group, index) => (_jsxs("details", { className: "nre-experiment-group-panel", "data-nre-experiment-group-panel": index, role: "tabpanel", open: index === 0, children: [_jsx("summary", { children: group.key }), _jsx(MetricScatter, { data: group.scatter, locale: locale }), _jsx(ExperimentList, { items: group.experiments, filter: true, locale: locale, relativeTo: group.key })] }, group.key))) })] }));
+}

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

@@ -2,10 +2,11 @@ import type { ReactElement } from "react";
 import type { AttemptLocator } from "../../results/locator.ts";
 import type { ExperimentListItem } from "../types.ts";
 import { type ReportLocale } from "../locale.ts";
-export declare function ExperimentList({ items, attemptHref, filter, className, locale, }: {
+export declare function ExperimentList({ items, attemptHref, filter, className, locale, relativeTo, }: {
     items: ExperimentListItem[];
     attemptHref: (locator: AttemptLocator) => string;
     filter?: boolean;
     className?: string;
     locale?: ReportLocale;
+    relativeTo?: string;
 }): ReactElement;

package/dist/report/react/ExperimentList.js

@@ -1,5 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { attemptItemReason } from "../format.js";
+import { attemptItemReason, experimentDisplayName } from "../format.js";
 import { DEFAULT_REPORT_LOCALE, localeText } from "../locale.js";
 import { AttemptLocatorBadge } from "./AttemptList.js";
 import { MetricCellView } from "./cell.js";
@@ -37,21 +37,19 @@ function ExperimentAttemptRow({ attempt, last, attemptHref, }) {
     return (_jsxs("li", { className: cx("nre-experiment-attempt-row", `nre-eval-${attempt.verdict}`), children: [_jsx("span", { className: "nre-attempt-branch", "aria-hidden": "true", children: last ? "└─" : "├─" }), _jsx("span", { className: "nre-eval-attempt-badges", children: _jsx(AttemptLocatorBadge, { item: attempt, attemptHref: attemptHref }) }), _jsxs("span", { className: "nre-eval-attempt-metrics", children: [formatDurationMs(attempt.durationMs), attempt.costUSD !== undefined && _jsxs(_Fragment, { children: [" \u00B7 ", formatUSD(attempt.costUSD)] })] }), _jsx("span", { className: "nre-eval-reason", children: reason ?? "—" })] }));
 }
 function EvalAttempts({ row, attemptHref, locale, }) {
-    return (_jsxs("li", { className: "nre-experiment-eval", children: [_jsxs("div", { className: cx("nre-experiment-eval-header", `nre-eval-${row.verdict}`), children: [_jsx("span", { className: cx("nre-eval-verdict", `nre-verdict-${row.verdict}`), children: verdictMark(row.verdict) }), _jsx("span", { className: "nre-eval-id", children: row.evalId }), _jsx("span", { className: "nre-eval-attempt-count", children: localeText(locale, "overview.attemptsCount", { n: row.attempts.length }) }), _jsx("span", { className: "nre-eval-summary", children: row.verdict === "passed"
-                            ? [formatDurationMs(row.duration.value ?? 0), row.cost.value === null ? undefined : formatUSD(row.cost.value)]
-                                .filter((value) => value !== undefined)
-                                .join(" · ")
-                            : row.reason })] }), _jsx("ul", { className: "nre-experiment-attempts", children: row.attempts.map((attempt, index) => (_jsx(ExperimentAttemptRow, { attempt: attempt, last: index === row.attempts.length - 1, attemptHref: attemptHref }, attempt.locator))) })] }));
+    const duration = row.duration.value === null ? localeText(locale, "cell.missing") : formatDurationMs(row.duration.value);
+    const cost = row.cost.value === null ? localeText(locale, "cell.missing") : formatUSD(row.cost.value);
+    return (_jsxs("li", { className: "nre-experiment-eval", children: [_jsxs("div", { className: cx("nre-experiment-eval-header", `nre-eval-${row.verdict}`), children: [_jsx("span", { className: cx("nre-eval-verdict", `nre-verdict-${row.verdict}`), children: verdictMark(row.verdict) }), _jsx("span", { className: "nre-eval-id", children: row.evalId }), _jsx("span", { className: "nre-eval-attempt-count", children: localeText(locale, "overview.attemptsCount", { n: row.attempts.length }) }), _jsxs("span", { className: "nre-eval-rollup", children: [localeText(locale, "entityList.average", { value: duration }), " · ", localeText(locale, "entityList.average", { value: cost })] })] }), _jsx("ul", { className: "nre-experiment-attempts", children: row.attempts.map((attempt, index) => (_jsx(ExperimentAttemptRow, { attempt: attempt, last: index === row.attempts.length - 1, attemptHref: attemptHref }, attempt.locator))) })] }));
 }
 function Flags({ flags, locale }) {
     if (!flags || Object.keys(flags).length === 0)
         return null;
     return (_jsxs("div", { className: "nre-experiment-flags", children: [_jsx("span", { children: localeText(locale, "experimentList.flags") }), Object.entries(flags).map(([key, value]) => (_jsxs("b", { children: [key, "=", String(value)] }, key)))] }));
 }
-function ExperimentRow({ item, attemptHref, locale, }) {
-    return (_jsxs("details", { className: "nre-experiment-entry", children: [_jsxs("summary", { className: "nre-experiment-summary", children: [_jsxs("span", { className: "nre-experiment-name", "data-sort-value": item.experimentId, children: [_jsx("b", { className: cx("nre-experiment-id", "nre-key", colorClassForKey(item.experimentId)), children: item.experimentId }), _jsxs("small", { children: [localeText(locale, "overview.evalsCount", { n: item.evals }), item.attempts > item.evals ? ` · ${localeText(locale, "overview.attemptsCount", { n: item.attempts })}` : "", ` · ${formatDate(item.lastRunAt, locale)}`] })] }), _jsx("span", { "data-sort-value": item.model ?? "", children: item.model ?? localeText(locale, "experimentList.defaultModel") }), _jsx("span", { "data-sort-value": item.agent, children: item.agent }), _jsx("span", { className: "nre-num", "data-sort-value": item.duration.value ?? "", children: _jsx(MetricCellView, { cell: item.duration, locale: locale }) }), _jsx("span", { className: cx("nre-num", passRateTone(item.passRate.value)), "data-sort-value": item.passRate.value ?? "", children: _jsx(MetricCellView, { cell: item.passRate, locale: locale }) }), _jsx("span", { className: "nre-num", "data-sort-value": item.tokens.value ?? "", children: _jsx(MetricCellView, { cell: item.tokens, locale: locale }) }), _jsx("span", { className: "nre-num", "data-sort-value": item.cost.value ?? "", children: _jsx(MetricCellView, { cell: item.cost, locale: locale }) }), _jsx("span", { "data-sort-value": item.verdicts.passed, children: _jsx(VerdictSummary, { item: item, locale: locale }) })] }), _jsxs("div", { className: "nre-experiment-detail", children: [_jsx(Flags, { flags: item.flags, locale: locale }), _jsx("ul", { className: "nre-experiment-evals", children: item.evalRows.map((row) => (_jsx(EvalAttempts, { row: row, attemptHref: attemptHref, locale: locale }, row.evalId))) })] })] }));
+function ExperimentRow({ item, attemptHref, locale, relativeTo, }) {
+    return (_jsxs("details", { className: "nre-experiment-entry", children: [_jsxs("summary", { className: "nre-experiment-summary", children: [_jsxs("span", { className: "nre-experiment-name", "data-sort-value": item.experimentId, children: [_jsx("b", { className: cx("nre-experiment-id", "nre-key", colorClassForKey(item.experimentId)), children: experimentDisplayName(item.experimentId, relativeTo) }), _jsxs("small", { children: [localeText(locale, "overview.evalsCount", { n: item.evals }), item.attempts > item.evals ? ` · ${localeText(locale, "overview.attemptsCount", { n: item.attempts })}` : "", ` · ${formatDate(item.lastRunAt, locale)}`] })] }), _jsx("span", { "data-sort-value": item.model ?? "", children: item.model ?? localeText(locale, "experimentList.defaultModel") }), _jsx("span", { "data-sort-value": item.agent, children: item.agent }), _jsx("span", { className: "nre-num", "data-sort-value": item.duration.value ?? "", children: _jsx(MetricCellView, { cell: item.duration, locale: locale }) }), _jsx("span", { className: cx("nre-num", passRateTone(item.passRate.value)), "data-sort-value": item.passRate.value ?? "", children: _jsx(MetricCellView, { cell: item.passRate, locale: locale }) }), _jsx("span", { className: "nre-num", "data-sort-value": item.tokens.value ?? "", children: _jsx(MetricCellView, { cell: item.tokens, locale: locale }) }), _jsx("span", { className: "nre-num", "data-sort-value": item.cost.value ?? "", children: _jsx(MetricCellView, { cell: item.cost, locale: locale }) }), _jsx("span", { "data-sort-value": item.verdicts.passed, children: _jsx(VerdictSummary, { item: item, locale: locale }) })] }), _jsxs("div", { className: "nre-experiment-detail", children: [_jsx(Flags, { flags: item.flags, locale: locale }), _jsx("ul", { className: "nre-experiment-evals", children: item.evalRows.map((row) => (_jsx(EvalAttempts, { row: row, attemptHref: attemptHref, locale: locale }, row.evalId))) })] })] }));
 }
-export function ExperimentList({ items, attemptHref, filter = false, className, locale = DEFAULT_REPORT_LOCALE, }) {
+export function ExperimentList({ items, attemptHref, filter = false, className, locale = DEFAULT_REPORT_LOCALE, relativeTo, }) {
     const labels = [
         localeText(locale, "experimentList.experiment"),
         localeText(locale, "table.model"),
@@ -62,6 +60,6 @@ export function ExperimentList({ items, attemptHref, filter = false, className,
         localeText(locale, "experimentList.estimatedCost"),
         localeText(locale, "experimentList.result"),
     ];
-    const board = (_jsxs("div", { className: "nre-experiment-table", children: [_jsx("div", { className: "nre-experiment-head", children: labels.map((label, index) => (_jsx("button", { type: "button", "data-nre-experiment-sort": index, className: index === 4 ? "nre-sort-desc" : undefined, children: label }, label))) }), items.length === 0 && _jsx("p", { className: "nre-experiment-list-empty", children: localeText(locale, "attemptList.empty") }), items.map((item) => (_jsx(ExperimentRow, { item: item, attemptHref: attemptHref, locale: locale }, item.experimentId)))] }));
+    const board = (_jsxs("div", { className: "nre-experiment-table", children: [_jsx("div", { className: "nre-experiment-head", children: labels.map((label, index) => (_jsx("button", { type: "button", "data-nre-experiment-sort": index, className: index === 4 ? "nre-sort-desc" : undefined, children: label }, label))) }), items.length === 0 && _jsx("p", { className: "nre-experiment-list-empty", children: localeText(locale, "attemptList.empty") }), items.map((item) => (_jsx(ExperimentRow, { item: item, attemptHref: attemptHref, locale: locale, relativeTo: relativeTo }, item.experimentId)))] }));
     return (_jsxs("div", { className: cx("nre", "nre-experiment-list", filter && "nre-experiment-table-wrap", className), children: [filter && (_jsx("input", { className: "nre-filter", "data-nre-experiment-filter": "", type: "search", placeholder: localeText(locale, "experimentList.filterPlaceholder") })), board] }));
 }

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 { niceTicks, placePointLabels } from "./chart-math.js";
 import { colorClassForKey, seriesClassForKey } from "./colors.js";
 import { cx } from "./format.js";
 const WIDTH = 640;
@@ -74,22 +74,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);
+    // 直接标签的候选位择优布局:锚向、避让方向都由布局按空间决定,画布边界含边距
+    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}`)))] }), _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 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/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[];