niceeval 0.1.1 → 0.1.2

package/src/runner/reporters/console.ts

@@ -3,13 +3,7 @@
 import type { EvalResult, Reporter, RunSummary } from "../../types.ts";
 import { t } from "../../i18n/index.ts";
 import { formatDuration, formatTokens, renderRunReport } from "./table.ts";
-
-const SYMBOL: Record<string, string> = {
-  passed: "✓",
-  failed: "✗",
-  errored: "!",
-  skipped: "○",
-};
+import { outcomeSymbol } from "./shared.ts";
 
 export function Console(): Reporter {
   return {
@@ -24,7 +18,7 @@ export function Console(): Reporter {
       process.stdout.write(t("report.runStart", { count: n, extra }));
     },
     onEvalComplete(result: EvalResult) {
-      const sym = SYMBOL[result.outcome] ?? "?";
+      const sym = outcomeSymbol(result.outcome);
       const tok = (result.usage?.inputTokens ?? 0) + (result.usage?.outputTokens ?? 0);
       // requests > 0 但 tokens = 0 → agent 跑了但不上报用量(如 bub);显示 — 而非误导性的 0
       const tokStr = tok > 0 ? `${formatTokens(tok)} tok` : (result.usage?.requests ?? 0) > 0 ? `— tok` : `0 tok`;

package/src/runner/reporters/live.ts

@@ -5,16 +5,10 @@
 import type { Reporter, RunShape, RunSummary } from "../../types.ts";
 import { t } from "../../i18n/index.ts";
 import { renderRunReport } from "./table.ts";
+import { outcomeSymbol } from "./shared.ts";
 
 const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 
-const OUTCOME_SYM: Record<string, string> = {
-  passed: "✓",
-  failed: "✗",
-  errored: "!",
-  skipped: "○",
-};
-
 // 进度日志里的基础设施噪声:OTLP 端口、remote-agent 启动提示、trace span 计数。
 // 这些在行尾显示毫无意义,直接丢弃。
 const NOISE_PATTERNS = [
@@ -76,7 +70,7 @@ export function Live(rows: LiveRow[], totalAttempts: number): LiveReporter {
   function renderRow(state: RowState, frame: number): string {
     const done = state.completed >= state.total;
     const sym = done
-      ? (OUTCOME_SYM[state.dominantOutcome ?? ""] ?? "?")
+      ? outcomeSymbol(state.dominantOutcome ?? "")
       : SPINNER[frame % SPINNER.length];
 
     const evalCol = state.evalId.slice(0, 24).padEnd(24);

package/src/runner/reporters/shared.ts

@@ -0,0 +1,15 @@
+// reporter 共用的展示常量。符号表只此一份 —— console/live/table 各抄一份时,
+// 改一个符号要同步三处且不报错。
+
+import type { ResultOutcome } from "../../types.ts";
+
+export const OUTCOME_SYM: Record<ResultOutcome, string> = {
+  passed: "✓",
+  failed: "✗",
+  errored: "!",
+  skipped: "○",
+};
+
+export function outcomeSymbol(outcome: string): string {
+  return OUTCOME_SYM[outcome as ResultOutcome] ?? "?";
+}

package/src/runner/reporters/table.ts

@@ -1,19 +1,13 @@
 import type { EvalResult, RunSummary, Usage } from "../../types.ts";
 import { t } from "../../i18n/index.ts";
+import { outcomeSymbol } from "./shared.ts";
+import { foldEvalOutcome, evalLevelStats as sharedEvalLevelStats } from "../../shared/outcome.ts";
+// 展示口径(耗时/成本/百分比)与聚合小工具(标签/求和/排序)与 view 共用一份实现;
+// console.ts 经这里 re-export formatDuration。
+import { formatCost, formatDuration, formatPercent } from "../../shared/format.ts";
+import { OUTCOME_ORDER, avg, displayExperimentName, fallbackExperimentLabel, sumMaybe, totalTokens } from "../../shared/aggregate.ts";
 
-const OUTCOME_ORDER: Record<string, number> = {
-  failed: 0,
-  errored: 1,
-  skipped: 2,
-  passed: 3,
-};
-
-const OUTCOME_SYM: Record<string, string> = {
-  passed: "✓",
-  failed: "✗",
-  errored: "!",
-  skipped: "○",
-};
+export { formatCost, formatDuration } from "../../shared/format.ts";
 
 interface ExperimentRow {
   key: string;
@@ -119,20 +113,8 @@ export function formatTokens(n: number): string {
   return String(n);
 }
 
-export function formatDuration(ms: number): string {
-  if (!Number.isFinite(ms) || ms <= 0) return "0ms";
-  if (ms >= 60_000) return `${(ms / 60_000).toFixed(1)}m`;
-  if (ms >= 1000) return `${(ms / 1000).toFixed(2)}s`;
-  return `${Math.round(ms)}ms`;
-}
-
-export function formatCost(n: number | undefined): string {
-  if (n === undefined || n <= 0) return "$0";
-  return `$${n.toFixed(n < 1 ? 3 : 2)}`;
-}
-
 export function formatOutcome(outcome: string): string {
-  const sym = OUTCOME_SYM[outcome] ?? "?";
+  const sym = outcomeSymbol(outcome);
   switch (outcome) {
     case "passed": return `${sym} ${t("report.passed")}`;
     case "failed": return `${sym} ${t("report.failed")}`;
@@ -198,21 +180,9 @@ function aggregateEvalRows(results: EvalResult[]): EvalRow[] {
     .sort((a, b) => OUTCOME_ORDER[a.outcome] - OUTCOME_ORDER[b.outcome] || a.id.localeCompare(b.id));
 }
 
+// 折叠 / 计票口径与 view 同一份实现(src/shared/outcome.ts),CLI 表格和网页榜单永不打架。
 function evalLevelStats(results: EvalResult[]) {
-  const byEval = new Map<string, EvalResult[]>();
-  for (const r of results) byEval.set(r.id, [...(byEval.get(r.id) ?? []), r]);
-  const counts = { passed: 0, failed: 0, errored: 0, skipped: 0 };
-  for (const group of byEval.values()) counts[foldEvalOutcome(group)] += 1;
-  const ran = counts.passed + counts.failed + counts.errored;
-  return { evals: byEval.size, ...counts, passRate: ran ? counts.passed / ran : 0 };
-}
-
-function foldEvalOutcome(results: EvalResult[]): EvalResult["outcome"] {
-  const outcomes = results.map((r) => r.outcome);
-  if (outcomes.some((o) => o === "passed")) return "passed";
-  if (outcomes.some((o) => o === "failed")) return "failed";
-  if (outcomes.some((o) => o === "errored")) return "errored";
-  return "skipped";
+  return sharedEvalLevelStats(results, (r) => r.id);
 }
 
 function reasonFor(result: EvalResult): string {
@@ -238,33 +208,11 @@ function formatResult(row: ExperimentRow): string {
   return `${row.passed}/${row.evals} ${t("report.passed")} · ${failures} ${t("report.failed")}${suffix}`;
 }
 
-function displayExperimentName(id: string | undefined): string | undefined {
-  if (!id) return undefined;
-  return id.split("/").filter(Boolean).at(-1) ?? id;
-}
 
-function fallbackExperimentLabel(result: EvalResult): string {
-  if (result.experiment?.id) return displayExperimentName(result.experiment.id) ?? result.experiment.id;
-  if (result.model) return `${result.agent}/${result.model}`;
-  return result.agent || "ad hoc run";
-}
 
-function totalTokens(items: Array<Usage | undefined>): number {
-  return items.reduce((n, u) => n + (u?.inputTokens ?? 0) + (u?.outputTokens ?? 0), 0);
-}
 
-function sumMaybe(items: Array<number | undefined>): number | undefined {
-  const known = items.filter((n): n is number => n !== undefined);
-  return known.length ? known.reduce((sum, n) => sum + n, 0) : undefined;
-}
 
-function avg(items: number[]): number {
-  return items.length ? items.reduce((sum, n) => sum + n, 0) / items.length : 0;
-}
 
-function formatPercent(v: number): string {
-  return `${Math.round(v * 100)}%`;
-}
 
 function renderTable(headers: string[], rows: string[][], opts: { maxWidth?: number; flexibleColumn?: number } = {}): string {
   const rawRows = [headers, ...rows];