@ls-stack/agent-eval 0.24.0 → 0.25.0

package/dist/runChild.mjs

@@ -1,4 +1,4 @@
-import { B as runSummarySchema, Et as evalChartsConfigSchema, Qt as columnDefSchema, T as createRunRequestSchema, b as loadConfig, bn as configureEvalRunLogs, dt as evalStatsConfigSchema, t as executeRun, v as parseEvalMetas, w as createFsCacheStore, z as runManifestSchema } from "./runOrchestration-D697g6Qe.mjs";
+import { B as runSummarySchema, T as createRunRequestSchema, Tn as configureEvalRunLogs, b as loadConfig, gt as evalStatsConfigSchema, jt as evalChartsConfigSchema, ot as buildEvalKey, r as getTargetEvals$1, rn as columnDefSchema, t as executeRun, v as parseEvalDiscovery, w as createFsCacheStore, z as runManifestSchema } from "./runOrchestration-B31SV_Bq.mjs";
 import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
 import { relative } from "node:path";
@@ -6,6 +6,7 @@ import { z } from "zod/v4";
 import { glob } from "glob";
 //#region ../runner/src/runChild.ts
 const evalMetaSchema = z.object({
+	key: z.string(),
 	id: z.string(),
 	title: z.string().optional(),
 	filePath: z.string(),
@@ -36,8 +37,10 @@ function getConfiguredConcurrency(configConcurrency) {
 	return Math.max(1, Math.floor(configConcurrency));
 }
 function getTargetEvals(params) {
-	if (params.request.target.evalIds && params.request.target.evalIds.length > 0) return params.request.target.evalIds.map((id) => params.evals.get(id)).filter((entry) => entry !== void 0);
-	return [...params.evals.values()].toSorted((a, b) => a.filePath.localeCompare(b.filePath));
+	return getTargetEvals$1({
+		evals: params.evals.values(),
+		request: params.request
+	});
 }
 function toWorkspaceRelativePath(params) {
 	return relative(params.workspaceRoot, params.filePath).replaceAll("\\", "/");
@@ -55,21 +58,29 @@ async function discoverRunEvals(params) {
 	for (const filePath of discovered) {
 		const source = await readFile(filePath, "utf-8");
 		const sourceFingerprint = getSourceFingerprint(source);
-		const metas = parseEvalMetas(filePath, source);
-		for (const meta of metas) evals.set(meta.id, {
-			id: meta.id,
-			title: meta.title,
-			filePath: toWorkspaceRelativePath({
+		const metas = parseEvalDiscovery(filePath, source).metas;
+		for (const meta of metas) {
+			const relativeFilePath = toWorkspaceRelativePath({
 				filePath: meta.filePath,
 				workspaceRoot: params.workspaceRoot
-			}),
-			sourceFilePath: meta.filePath,
-			sourceFingerprint,
-			columnDefs: [],
-			caseCount: null
-		});
+			});
+			const key = buildEvalKey({
+				filePath: relativeFilePath,
+				evalId: meta.id
+			});
+			evals.set(key, {
+				key,
+				id: meta.id,
+				title: meta.title,
+				filePath: relativeFilePath,
+				sourceFilePath: meta.filePath,
+				sourceFingerprint,
+				columnDefs: [],
+				caseCount: null
+			});
+		}
 	}
-	return [...evals.values()].toSorted((a, b) => a.filePath.localeCompare(b.filePath));
+	return [...evals.values()].toSorted((a, b) => a.filePath.localeCompare(b.filePath) || a.id.localeCompare(b.id));
 }
 async function readContext(contextPath) {
 	if (contextPath === void 0) throw new Error("Missing run child context path");
@@ -93,7 +104,7 @@ async function main() {
 		config,
 		workspaceRoot: context.workspaceRoot
 	});
-	const evals = new Map(evalMetas.map((evalMeta) => [evalMeta.id, evalMeta]));
+	const evals = new Map(evalMetas.map((evalMeta) => [evalMeta.key, evalMeta]));
 	const lastRunStatusMap = /* @__PURE__ */ new Map();
 	const latestRunInfoMap = /* @__PURE__ */ new Map();
 	await executeRun({
@@ -108,7 +119,6 @@ async function main() {
 		request: context.request,
 		runDir: context.runDir,
 		config,
-		evals,
 		cacheStore,
 		lastRunStatusMap,
 		latestRunInfoMap,
@@ -123,7 +133,7 @@ async function main() {
 		workspaceRoot: context.workspaceRoot,
 		getSourceFingerprint,
 		getConfiguredConcurrency: () => getConfiguredConcurrency(config.concurrency),
-		getSortedEvalMetas: () => [...evals.values()].toSorted((a, b) => a.filePath.localeCompare(b.filePath)),
+		getSortedEvalMetas: () => [...evals.values()].toSorted((a, b) => a.filePath.localeCompare(b.filePath) || a.id.localeCompare(b.id)),
 		getTargetEvals: (request) => getTargetEvals({
 			evals,
 			request