@prismatic-io/lux 0.0.2-preview.37 → 0.0.2-preview.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/assertions/core/command-exits-zero.d.ts +2 -2
- package/lib/assertions/core/command-exits-zero.d.ts.map +1 -1
- package/lib/assertions/core/command-exits-zero.js +12 -10
- package/lib/assertions/core/command-exits-zero.js.map +1 -1
- package/lib/assertions/core/safe-regex.d.ts.map +1 -1
- package/lib/assertions/core/safe-regex.js +7 -1
- package/lib/assertions/core/safe-regex.js.map +1 -1
- package/lib/assertions/rubric/evidence.d.ts +88 -0
- package/lib/assertions/rubric/evidence.d.ts.map +1 -0
- package/lib/assertions/rubric/evidence.js +75 -0
- package/lib/assertions/rubric/evidence.js.map +1 -0
- package/lib/assertions/rubric/index.d.ts +72 -43
- package/lib/assertions/rubric/index.d.ts.map +1 -1
- package/lib/assertions/rubric/index.js +12 -51
- package/lib/assertions/rubric/index.js.map +1 -1
- package/lib/assertions/rubric/internal.d.ts +1 -1
- package/lib/assertions/rubric/internal.d.ts.map +1 -1
- package/lib/assertions/rubric/internal.js +4 -4
- package/lib/assertions/rubric/internal.js.map +1 -1
- package/lib/authoring.d.ts +1 -0
- package/lib/authoring.d.ts.map +1 -1
- package/lib/authoring.js.map +1 -1
- package/lib/cli/harness-plan.d.ts +1 -0
- package/lib/cli/harness-plan.d.ts.map +1 -1
- package/lib/cli/harness-plan.js +1 -1
- package/lib/cli/harness-plan.js.map +1 -1
- package/lib/cli/program.d.ts.map +1 -1
- package/lib/cli/program.js +8 -4
- package/lib/cli/program.js.map +1 -1
- package/lib/container/driver.d.ts.map +1 -1
- package/lib/container/driver.js +10 -8
- package/lib/container/driver.js.map +1 -1
- package/lib/container/paths.d.ts +3 -0
- package/lib/container/paths.d.ts.map +1 -0
- package/lib/container/paths.js +27 -0
- package/lib/container/paths.js.map +1 -0
- package/lib/container/resources.d.ts +2 -0
- package/lib/container/resources.d.ts.map +1 -1
- package/lib/container/resources.js +17 -9
- package/lib/container/resources.js.map +1 -1
- package/lib/core/case-defaults.d.ts +16 -0
- package/lib/core/case-defaults.d.ts.map +1 -0
- package/lib/core/case-defaults.js +42 -0
- package/lib/core/case-defaults.js.map +1 -0
- package/lib/core/case.d.ts +8 -3
- package/lib/core/case.d.ts.map +1 -1
- package/lib/core/case.js +33 -4
- package/lib/core/case.js.map +1 -1
- package/lib/core/platform-process.d.ts +2 -2
- package/lib/core/platform-process.d.ts.map +1 -1
- package/lib/core/platform-process.js +8 -8
- package/lib/core/platform-process.js.map +1 -1
- package/lib/core/reference-defaults.d.ts +5 -0
- package/lib/core/reference-defaults.d.ts.map +1 -0
- package/lib/core/reference-defaults.js +42 -0
- package/lib/core/reference-defaults.js.map +1 -0
- package/lib/index.d.ts +2 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/orchestrator/config.d.ts +1 -0
- package/lib/orchestrator/config.d.ts.map +1 -1
- package/lib/orchestrator/config.js +3 -0
- package/lib/orchestrator/config.js.map +1 -1
- package/lib/orchestrator/doctor.d.ts.map +1 -1
- package/lib/orchestrator/doctor.js +19 -42
- package/lib/orchestrator/doctor.js.map +1 -1
- package/lib/orchestrator/experiment-context.d.ts.map +1 -1
- package/lib/orchestrator/experiment-context.js +2 -1
- package/lib/orchestrator/experiment-context.js.map +1 -1
- package/lib/orchestrator/experiment-corpus.d.ts.map +1 -1
- package/lib/orchestrator/experiment-corpus.js +1 -1
- package/lib/orchestrator/experiment-corpus.js.map +1 -1
- package/lib/orchestrator/experiment-evaluation.d.ts.map +1 -1
- package/lib/orchestrator/experiment-evaluation.js +1 -0
- package/lib/orchestrator/experiment-evaluation.js.map +1 -1
- package/lib/orchestrator/experiment-identity.d.ts.map +1 -1
- package/lib/orchestrator/experiment-identity.js +3 -3
- package/lib/orchestrator/experiment-identity.js.map +1 -1
- package/lib/orchestrator/orchestrator.d.ts +3 -1
- package/lib/orchestrator/orchestrator.d.ts.map +1 -1
- package/lib/orchestrator/orchestrator.js +18 -19
- package/lib/orchestrator/orchestrator.js.map +1 -1
- package/lib/orchestrator/profile.d.ts +4 -0
- package/lib/orchestrator/profile.d.ts.map +1 -0
- package/lib/orchestrator/profile.js +10 -0
- package/lib/orchestrator/profile.js.map +1 -0
- package/package.json +1 -1
- package/skills/lux-answerer/SKILL.md +1 -1
- package/src/assertions/core/command-exits-zero.ts +33 -22
- package/src/assertions/core/safe-regex.ts +16 -6
- package/src/assertions/rubric/evidence.ts +85 -0
- package/src/assertions/rubric/index.ts +12 -59
- package/src/assertions/rubric/internal.ts +7 -6
- package/src/authoring.ts +1 -0
- package/src/cli/harness-plan.ts +7 -1
- package/src/cli/program.ts +8 -4
- package/src/container/driver.ts +10 -8
- package/src/container/paths.ts +29 -0
- package/src/container/resources.ts +21 -9
- package/src/core/case-defaults.ts +65 -0
- package/src/core/case.ts +53 -6
- package/src/core/platform-process.ts +9 -8
- package/src/core/reference-defaults.ts +47 -0
- package/src/index.ts +2 -1
- package/src/orchestrator/config.ts +3 -0
- package/src/orchestrator/doctor.ts +30 -45
- package/src/orchestrator/experiment-context.ts +2 -1
- package/src/orchestrator/experiment-corpus.ts +6 -1
- package/src/orchestrator/experiment-evaluation.ts +1 -0
- package/src/orchestrator/experiment-identity.ts +18 -3
- package/src/orchestrator/orchestrator.ts +28 -17
- package/src/orchestrator/profile.ts +24 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../src/container/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../src/container/driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/container/paths.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,eAAO,MAAM,cAAc,GAAI,CAAC,SACvB,CAAC,YACE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,KAC/C,CAwBF,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/** Translate only mounted host paths; unrelated configuration remains untouched. */
|
|
2
|
+
export const containerPaths = (value, mappings) => {
|
|
3
|
+
const ordered = [...mappings].sort(([a], [b]) => b.length - a.length);
|
|
4
|
+
const visit = (entry) => {
|
|
5
|
+
if (typeof entry === "string") {
|
|
6
|
+
let text = entry;
|
|
7
|
+
for (const [source, target] of ordered) {
|
|
8
|
+
if (source === target)
|
|
9
|
+
continue;
|
|
10
|
+
if (text === source)
|
|
11
|
+
return target;
|
|
12
|
+
if (text.startsWith(`${source}\\`) || text.startsWith(`${source}/`))
|
|
13
|
+
return target + text.slice(source.length).replaceAll("\\", "/");
|
|
14
|
+
const escaped = source.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
15
|
+
text = text.replace(new RegExp(`${escaped}([\\\\/][^\\s"']*)?(?=$|[\\s"'])`, "g"), (_match, suffix) => target + (suffix ?? "").replaceAll("\\", "/"));
|
|
16
|
+
}
|
|
17
|
+
return text;
|
|
18
|
+
}
|
|
19
|
+
if (Array.isArray(entry))
|
|
20
|
+
return entry.map(visit);
|
|
21
|
+
if (entry && typeof entry === "object")
|
|
22
|
+
return Object.fromEntries(Object.entries(entry).map(([key, item]) => [key, visit(item)]));
|
|
23
|
+
return entry;
|
|
24
|
+
};
|
|
25
|
+
return visit(value);
|
|
26
|
+
};
|
|
27
|
+
//# sourceMappingURL=paths.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/container/paths.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAAQ,EACR,QAAgD,EAC7C,EAAE;IACL,MAAM,OAAO,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,CAAC,KAAc,EAAW,EAAE;QACxC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACvC,IAAI,MAAM,KAAK,MAAM;oBAAE,SAAS;gBAChC,IAAI,IAAI,KAAK,MAAM;oBAAE,OAAO,MAAM,CAAC;gBACnC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,MAAM,GAAG,CAAC;oBACjE,OAAO,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAClE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;gBAC9D,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,IAAI,MAAM,CAAC,GAAG,OAAO,kCAAkC,EAAE,GAAG,CAAC,EAC7D,CAAC,MAAM,EAAE,MAA0B,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CACtF,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YACpC,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5F,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IACF,OAAO,KAAK,CAAC,KAAK,CAAM,CAAC;AAC3B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/container/resources.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/container/resources.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAetE,eAAO,MAAM,gBAAgB,WAAkB,kBAAkB,aAAa,MAAM;;;;;;;;;;;EAiJnF,CAAC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import { chmod, copyFile, lstat, mkdir, mkdtemp, realpath, rm, writeFile } from "node:fs/promises";
|
|
3
3
|
import { tmpdir } from "node:os";
|
|
4
|
-
import { dirname, isAbsolute, join, resolve } from "node:path";
|
|
4
|
+
import { dirname, isAbsolute, join, posix, resolve } from "node:path";
|
|
5
5
|
import { exec } from "../core/exec.js";
|
|
6
6
|
const mount = (source, target, readOnly = false) => {
|
|
7
|
-
if (
|
|
7
|
+
if (!isAbsolute(source) ||
|
|
8
|
+
!posix.isAbsolute(target) ||
|
|
9
|
+
[source, target].some((path) => /[,\r\n\0]/u.test(path)))
|
|
8
10
|
throw new Error("container mount paths must be absolute and contain no commas or control characters");
|
|
9
11
|
return `type=bind,source=${source},target=${target}${readOnly ? ",readonly" : ""}`;
|
|
10
12
|
};
|
|
@@ -53,6 +55,8 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
53
55
|
await chmod(target, 0o600);
|
|
54
56
|
}
|
|
55
57
|
const root = await realpath(workspace);
|
|
58
|
+
const containerRoot = process.platform === "win32" ? "/lux-workspace" : root;
|
|
59
|
+
const pathMappings = [[root, containerRoot]];
|
|
56
60
|
const args = [
|
|
57
61
|
"run",
|
|
58
62
|
"--init",
|
|
@@ -79,9 +83,9 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
79
83
|
"--tmpfs",
|
|
80
84
|
"/tmp:rw,nosuid,nodev,exec,size=1g,mode=1777",
|
|
81
85
|
"--workdir",
|
|
82
|
-
|
|
86
|
+
containerRoot,
|
|
83
87
|
"--mount",
|
|
84
|
-
mount(root,
|
|
88
|
+
mount(root, containerRoot),
|
|
85
89
|
"--mount",
|
|
86
90
|
mount(await realpath(home), "/home/lux"),
|
|
87
91
|
"--env",
|
|
@@ -91,7 +95,10 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
91
95
|
];
|
|
92
96
|
for (const entry of config.mounts ?? []) {
|
|
93
97
|
const source = await realpath(entry.source);
|
|
94
|
-
const
|
|
98
|
+
const requested = entry.target ?? source;
|
|
99
|
+
if (!posix.isAbsolute(requested))
|
|
100
|
+
throw new Error("container mount target must be an absolute Linux path and must not overlap host paths");
|
|
101
|
+
const target = posix.normalize(requested);
|
|
95
102
|
if ([
|
|
96
103
|
"/",
|
|
97
104
|
"/home",
|
|
@@ -106,11 +113,12 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
106
113
|
"/sys",
|
|
107
114
|
"/dev",
|
|
108
115
|
].some((reserved) => target === reserved || (reserved !== "/" && target.startsWith(`${reserved}/`))) ||
|
|
109
|
-
target ===
|
|
110
|
-
|
|
111
|
-
target.startsWith(`${
|
|
116
|
+
target === containerRoot ||
|
|
117
|
+
containerRoot.startsWith(`${target}/`) ||
|
|
118
|
+
target.startsWith(`${containerRoot}/`))
|
|
112
119
|
throw new Error("additional container mounts must not overlap the workspace or runtime paths");
|
|
113
120
|
args.push("--mount", mount(source, target, entry.readOnly ?? true));
|
|
121
|
+
pathMappings.push([resolve(entry.source), target], [source, target]);
|
|
114
122
|
}
|
|
115
123
|
const env = { ...process.env };
|
|
116
124
|
for (const key of new Set([...(config.passEnv ?? []), ...Object.keys(config.env ?? {})])) {
|
|
@@ -123,7 +131,7 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
123
131
|
args.push("--env", key);
|
|
124
132
|
}
|
|
125
133
|
args.push("--entrypoint", "node", image, config.worker ?? "/opt/lux/lib/container/worker.js");
|
|
126
|
-
return { command, args, env, image, root, cleanup };
|
|
134
|
+
return { command, args, env, image, root, containerRoot, pathMappings, cleanup };
|
|
127
135
|
}
|
|
128
136
|
catch (error) {
|
|
129
137
|
await rm(home, { recursive: true, force: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/container/resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/container/resources.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { Assertion, EvalCase } from "./case.js";
|
|
2
|
+
type DeepPartial<T> = T extends readonly unknown[] ? T : T extends (...args: never[]) => unknown ? T : T extends object ? {
|
|
3
|
+
[K in keyof T]?: DeepPartial<T[K]>;
|
|
4
|
+
} : T;
|
|
5
|
+
export type AssertionDefaults<A extends Assertion = Assertion> = {
|
|
6
|
+
[Type in A["type"]]?: DeepPartial<Omit<Extract<A, {
|
|
7
|
+
type: Type;
|
|
8
|
+
}>, "type" | "id">>;
|
|
9
|
+
};
|
|
10
|
+
export type EvalCaseDefaults<A extends Assertion = Assertion> = Omit<Partial<EvalCase>, "id" | "prompt" | "assertions"> & {
|
|
11
|
+
assertions?: A[] | undefined;
|
|
12
|
+
};
|
|
13
|
+
export declare const mergeCaseDefaults: (base: EvalCaseDefaults, local: EvalCaseDefaults) => EvalCaseDefaults;
|
|
14
|
+
export declare const applyAssertionDefaults: (assertions: Assertion[], defaults: AssertionDefaults) => Assertion[];
|
|
15
|
+
export {};
|
|
16
|
+
//# sourceMappingURL=case-defaults.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"case-defaults.d.ts","sourceRoot":"","sources":["../../src/core/case-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAIrD,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,OAAO,EAAE,GAC9C,CAAC,GACD,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,GACrC,CAAC,GACD,CAAC,SAAS,MAAM,GACd;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GACtC,CAAC,CAAC;AAEV,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAAI;KAC9D,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;CACnF,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAAI,IAAI,CAClE,OAAO,CAAC,QAAQ,CAAC,EACjB,IAAI,GAAG,QAAQ,GAAG,YAAY,CAC/B,GAAG;IAAE,UAAU,CAAC,EAAE,CAAC,EAAE,GAAG,SAAS,CAAA;CAAE,CAAC;AAmBrC,eAAO,MAAM,iBAAiB,SACtB,gBAAgB,SACf,gBAAgB,KACtB,gBAeD,CAAC;AAEH,eAAO,MAAM,sBAAsB,eACrB,SAAS,EAAE,YACb,iBAAiB,KAC1B,SAAS,EAGP,CAAC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { mergePluginConfig } from "./harness-matrix.js";
|
|
2
|
+
import { mergeAnswererReference, mergeDriverReference } from "./reference-defaults.js";
|
|
3
|
+
/** Named assertions replace inherited checks; unnamed checks append in declaration order. */
|
|
4
|
+
const mergeAssertions = (base, local) => {
|
|
5
|
+
const seen = new Set();
|
|
6
|
+
for (const assertion of local) {
|
|
7
|
+
if (!assertion.id)
|
|
8
|
+
continue;
|
|
9
|
+
if (seen.has(assertion.id))
|
|
10
|
+
throw new Error(`duplicate assertion id '${assertion.id}'`);
|
|
11
|
+
seen.add(assertion.id);
|
|
12
|
+
}
|
|
13
|
+
const result = [...base];
|
|
14
|
+
for (const assertion of local) {
|
|
15
|
+
const index = assertion.id ? result.findIndex((entry) => entry.id === assertion.id) : -1;
|
|
16
|
+
if (index < 0)
|
|
17
|
+
result.push(assertion);
|
|
18
|
+
else
|
|
19
|
+
result[index] = assertion;
|
|
20
|
+
}
|
|
21
|
+
return result;
|
|
22
|
+
};
|
|
23
|
+
export const mergeCaseDefaults = (base, local) => ({
|
|
24
|
+
...base,
|
|
25
|
+
...local,
|
|
26
|
+
...(base.driver || local.driver
|
|
27
|
+
? { driver: mergeDriverReference(base.driver, local.driver) }
|
|
28
|
+
: {}),
|
|
29
|
+
...(base.answerer || local.answerer
|
|
30
|
+
? { answerer: mergeAnswererReference(base.answerer, local.answerer) }
|
|
31
|
+
: {}),
|
|
32
|
+
...(base.meta || local.meta
|
|
33
|
+
? { meta: mergePluginConfig(base.meta, local.meta) }
|
|
34
|
+
: {}),
|
|
35
|
+
...(base.assertions || local.assertions
|
|
36
|
+
? { assertions: mergeAssertions(base.assertions ?? [], local.assertions ?? []) }
|
|
37
|
+
: {}),
|
|
38
|
+
});
|
|
39
|
+
export const applyAssertionDefaults = (assertions, defaults) => assertions.map((assertion) => ({
|
|
40
|
+
...mergePluginConfig(defaults[assertion.type], assertion),
|
|
41
|
+
}));
|
|
42
|
+
//# sourceMappingURL=case-defaults.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"case-defaults.js","sourceRoot":"","sources":["../../src/core/case-defaults.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAmBvF,6FAA6F;AAC7F,MAAM,eAAe,GAAG,CAAC,IAAiB,EAAE,KAAkB,EAAe,EAAE;IAC7E,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,SAAS,IAAI,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,EAAE;YAAE,SAAS;QAC5B,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;QACxF,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IACzB,KAAK,MAAM,SAAS,IAAI,KAAK,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzF,IAAI,KAAK,GAAG,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;;YACjC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IACjC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAsB,EACtB,KAAuB,EACL,EAAE,CAAC,CAAC;IACtB,GAAG,IAAI;IACP,GAAG,KAAK;IACR,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QAC7B,CAAC,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE;QAC7D,CAAC,CAAC,EAAE,CAAC;IACP,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ;QACjC,CAAC,CAAC,EAAE,QAAQ,EAAE,sBAAsB,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE;QACrE,CAAC,CAAC,EAAE,CAAC;IACP,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI;QACzB,CAAC,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAqB,EAAE;QACxE,CAAC,CAAC,EAAE,CAAC;IACP,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU;QACrC,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,EAAE,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE;QAChF,CAAC,CAAC,EAAE,CAAC;CACR,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,UAAuB,EACvB,QAA2B,EACd,EAAE,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAC7B,GAAI,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAe;CACzE,CAAC,CAAC,CAAC"}
|
package/lib/core/case.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
2
|
import type { AssertionPlugin } from "./assertion.js";
|
|
3
|
+
import { type AssertionDefaults, type EvalCaseDefaults } from "./case-defaults.js";
|
|
3
4
|
import type { LifecycleHooksPlugin } from "./lifecycle-hooks.js";
|
|
4
5
|
export declare const FixturesRefSchema: z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
|
|
5
6
|
kind: z.ZodLiteral<"dir">;
|
|
@@ -149,10 +150,14 @@ type AssertionPlanFields = Pick<Assertion, "id" | "name" | "threshold" | "weight
|
|
|
149
150
|
type AssertionInputOf<Plugin> = Plugin extends AssertionPlugin<Assertion, infer Input> ? Input & AssertionPlanFields : never;
|
|
150
151
|
export type EvalCaseInput<AllowedAssertion extends Assertion = Assertion> = Omit<EvalCase, "assertions"> & {
|
|
151
152
|
assertions?: AllowedAssertion[];
|
|
153
|
+
/** Remove named inherited checks without replacing the rest of the suite plan. */
|
|
154
|
+
omitAssertions?: string[];
|
|
152
155
|
};
|
|
153
|
-
export type EvalCaseAuthoringOptions<Plugins extends readonly AssertionPlugin[] = readonly AssertionPlugin[]> = {
|
|
156
|
+
export type EvalCaseAuthoringOptions<Plugins extends readonly AssertionPlugin[] = readonly AssertionPlugin[], AllowedAssertion extends Assertion = Assertion> = {
|
|
154
157
|
assertions?: Plugins;
|
|
155
158
|
fixtures?: readonly LifecycleHooksPlugin[];
|
|
159
|
+
defaults?: EvalCaseDefaults<AllowedAssertion | AssertionInputOf<Plugins[number]>>;
|
|
160
|
+
assertionDefaults?: AssertionDefaults<AllowedAssertion | AssertionInputOf<Plugins[number]>>;
|
|
156
161
|
};
|
|
157
162
|
export type EvalCaseDefinition<AllowedAssertion extends Assertion = Assertion> = {
|
|
158
163
|
(input: EvalCaseInput<AllowedAssertion>): EvalCase;
|
|
@@ -160,9 +165,9 @@ export type EvalCaseDefinition<AllowedAssertion extends Assertion = Assertion> =
|
|
|
160
165
|
* Create a case definition with selectively activated lifecycle fixtures.
|
|
161
166
|
* Further calls to `extend` append fixtures in setup order.
|
|
162
167
|
*/
|
|
163
|
-
extend<const Plugins extends readonly AssertionPlugin[] = readonly []>(options: EvalCaseAuthoringOptions<Plugins>): EvalCaseDefinition<AllowedAssertion | AssertionInputOf<Plugins[number]>>;
|
|
168
|
+
extend<const Plugins extends readonly AssertionPlugin[] = readonly []>(options: EvalCaseAuthoringOptions<Plugins, AllowedAssertion>): EvalCaseDefinition<AllowedAssertion | AssertionInputOf<Plugins[number]>>;
|
|
164
169
|
};
|
|
165
|
-
export declare const createEvalCaseDefinition: <AllowedAssertion extends Assertion = Assertion>(inheritedAssertions?: readonly AssertionPlugin[], inheritedFixtures?: readonly LifecycleHooksPlugin[]) => EvalCaseDefinition<AllowedAssertion>;
|
|
170
|
+
export declare const createEvalCaseDefinition: <AllowedAssertion extends Assertion = Assertion>(inheritedAssertions?: readonly AssertionPlugin[], inheritedFixtures?: readonly LifecycleHooksPlugin[], defaults?: EvalCaseDefaults, assertionDefaults?: AssertionDefaults) => EvalCaseDefinition<AllowedAssertion>;
|
|
166
171
|
export declare const defineEvalCase: EvalCaseDefinition<{
|
|
167
172
|
[x: string]: unknown;
|
|
168
173
|
id?: string | undefined;
|
package/lib/core/case.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"case.d.ts","sourceRoot":"","sources":["../../src/core/case.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"case.d.ts","sourceRoot":"","sources":["../../src/core/case.ts"],"names":[],"mappings":"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"}
|
package/lib/core/case.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
2
|
import { collectEvalCaseExtensions, setEvalCaseExtensions } from "./case-authoring-state.js";
|
|
3
|
+
import { applyAssertionDefaults, mergeCaseDefaults, } from "./case-defaults.js";
|
|
3
4
|
import { DriverCapabilitySchema } from "./driver.js";
|
|
4
5
|
import { DriverExecutionSchema } from "./driver-execution.js";
|
|
5
6
|
import { EvaluationMetadataSchema } from "./evaluation-clusters.js";
|
|
6
|
-
import { HarnessMatrixSchema } from "./harness-matrix.js";
|
|
7
|
+
import { HarnessMatrixSchema, mergePluginConfig } from "./harness-matrix.js";
|
|
7
8
|
import { formatZodIssues } from "./zod.js";
|
|
8
9
|
export const FixturesRefSchema = z.union([
|
|
9
10
|
z.string(),
|
|
@@ -71,9 +72,30 @@ export const EvalCaseSchema = EvalCaseObjectSchema
|
|
|
71
72
|
seen.add(assertion.id);
|
|
72
73
|
}
|
|
73
74
|
});
|
|
74
|
-
export const createEvalCaseDefinition = (inheritedAssertions = [], inheritedFixtures = []) => {
|
|
75
|
+
export const createEvalCaseDefinition = (inheritedAssertions = [], inheritedFixtures = [], defaults = {}, assertionDefaults = {}) => {
|
|
75
76
|
const define = ((input) => {
|
|
76
|
-
const
|
|
77
|
+
const { omitAssertions = [], ...local } = input;
|
|
78
|
+
for (const id of omitAssertions) {
|
|
79
|
+
if (!defaults.assertions?.some((assertion) => assertion.id === id)) {
|
|
80
|
+
throw new Error(`cannot omit unknown inherited assertion '${id}'`);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
const resolved = mergeCaseDefaults({
|
|
84
|
+
...defaults,
|
|
85
|
+
...(defaults.assertions
|
|
86
|
+
? {
|
|
87
|
+
assertions: defaults.assertions.filter((assertion) => !omitAssertions.includes(assertion.id ?? "")),
|
|
88
|
+
}
|
|
89
|
+
: {}),
|
|
90
|
+
}, local);
|
|
91
|
+
const parsed = EvalCaseSchema.safeParse({
|
|
92
|
+
...resolved,
|
|
93
|
+
...("id" in local ? { id: local.id } : {}),
|
|
94
|
+
prompt: local.prompt,
|
|
95
|
+
...(resolved.assertions
|
|
96
|
+
? { assertions: applyAssertionDefaults(resolved.assertions, assertionDefaults) }
|
|
97
|
+
: {}),
|
|
98
|
+
});
|
|
77
99
|
if (!parsed.success) {
|
|
78
100
|
throw new Error(`Invalid eval case: ${formatZodIssues(parsed.error)}`);
|
|
79
101
|
}
|
|
@@ -81,7 +103,14 @@ export const createEvalCaseDefinition = (inheritedAssertions = [], inheritedFixt
|
|
|
81
103
|
setEvalCaseExtensions(parsed.data, extensions);
|
|
82
104
|
return parsed.data;
|
|
83
105
|
});
|
|
84
|
-
define.extend = ((
|
|
106
|
+
define.extend = ((options) => {
|
|
107
|
+
const { assertions = [], fixtures = [] } = options;
|
|
108
|
+
const inherited = EvalCaseObjectSchema.omit({ id: true, prompt: true })
|
|
109
|
+
.partial()
|
|
110
|
+
.strict()
|
|
111
|
+
.parse(options.defaults ?? {});
|
|
112
|
+
return createEvalCaseDefinition([...inheritedAssertions, ...assertions], [...inheritedFixtures, ...fixtures], mergeCaseDefaults(defaults, inherited), mergePluginConfig(assertionDefaults, options.assertionDefaults ?? {}));
|
|
113
|
+
});
|
|
85
114
|
return define;
|
|
86
115
|
};
|
|
87
116
|
export const defineEvalCase = createEvalCaseDefinition();
|
package/lib/core/case.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"case.js","sourceRoot":"","sources":["../../src/core/case.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"case.js","sourceRoot":"","sources":["../../src/core/case.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAEL,sBAAsB,EAEtB,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7E,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC;IACvC,CAAC,CAAC,MAAM,EAAE;IACV,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;CAChE,CAAC,CAAC;AAGH,6EAA6E;AAC7E,6EAA6E;AAC7E,8EAA8E;AAC9E,8EAA8E;AAC9E,2DAA2D;AAC3D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC;IACrC,CAAC,CAAC,MAAM,EAAE;IACV,CAAC;SACE,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;QAC9B,SAAS,EAAE,qBAAqB,CAAC,QAAQ,EAAE;KAC5C,CAAC;SACD,MAAM,EAAE;CACZ,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC;IACvC,CAAC,CAAC,MAAM,EAAE;IACV,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;CACxE,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC;KAC7B,MAAM,CAAC;IACN,sFAAsF;IACtF,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAChC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACxC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC9C,aAAa,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACtC,CAAC;KACD,KAAK,EAAE,CAAC;AAGX,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,oBAAoB,CAAC;IAC/C,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrC,MAAM,EAAE,eAAe,CAAC,QAAQ,EAAE;IAClC,iFAAiF;IACjF,MAAM,EAAE,mBAAmB,CAAC,QAAQ,EAAE;IACtC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE;IACtC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE;IACtC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE;IACpD,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE;IAC/C,IAAI,EAAE,wBAAwB,CAAC,QAAQ,EAAE;CAC1C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB;IAChD,yEAAyE;IACzE,+DAA+D;KAC9D,MAAM,EAAE;KACR,WAAW,CAAC,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE;IAC7B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QACvE,IAAI,CAAC,SAAS,CAAC,EAAE;YAAE,SAAS;QAC5B,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,QAAQ,CAAC;gBACX,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC;gBACjC,OAAO,EAAE,2BAA2B,SAAS,CAAC,EAAE,GAAG;aACpD,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;AACH,CAAC,CAAC,CAAC;AAwCL,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,mBAAmB,GAA+B,EAAE,EACpD,iBAAiB,GAAoC,EAAE,EACvD,QAAQ,GAAqB,EAAE,EAC/B,iBAAiB,GAAsB,EAAE,EACH,EAAE;IACxC,MAAM,MAAM,GAAG,CAAC,CAAC,KAAsC,EAAY,EAAE;QACnE,MAAM,EAAE,cAAc,GAAG,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;QAChD,KAAK,MAAM,EAAE,IAAI,cAAc,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;gBACnE,MAAM,IAAI,KAAK,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QACD,MAAM,QAAQ,GAAG,iBAAiB,CAChC;YACE,GAAG,QAAQ;YACX,GAAG,CAAC,QAAQ,CAAC,UAAU;gBACrB,CAAC,CAAC;oBACE,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM,CACpC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAC5D;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,EACD,KAAK,CACN,CAAC;QACF,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC;YACtC,GAAG,QAAQ;YACX,GAAG,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1C,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,GAAG,CAAC,QAAQ,CAAC,UAAU;gBACrB,CAAC,CAAC,EAAE,UAAU,EAAE,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAAE;gBAChF,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,sBAAsB,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,UAAU,GAAG,yBAAyB,CAC1C,MAAM,CAAC,IAAI,EACX,mBAAmB,EACnB,iBAAiB,CAClB,CAAC;QACF,qBAAqB,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC,CAAyC,CAAC;IAC3C,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,OAAiC,EAAE,EAAE;QACrD,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;QACnD,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;aACpE,OAAO,EAAE;aACT,MAAM,EAAE;aACR,KAAK,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACjC,OAAO,wBAAwB,CAC7B,CAAC,GAAG,mBAAmB,EAAE,GAAG,UAAU,CAAC,EACvC,CAAC,GAAG,iBAAiB,EAAE,GAAG,QAAQ,CAAC,EACnC,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC,EACtC,iBAAiB,CAAC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAsB,CAC3F,CAAC;IACJ,CAAC,CAAmD,CAAC;IACrD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,wBAAwB,EAAE,CAAC;AAEzD,MAAM,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAAC;IACzC,CAAC,CAAC,MAAM,EAAE;IACV,CAAC,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;CAC5D,CAAC,CAAC;AACH,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC;IACvC,CAAC,CAAC,MAAM,EAAE;IACV,CAAC,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;CACpE,CAAC,CAAC;AACH,MAAM,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAAC;IACzC,CAAC,CAAC,MAAM,EAAE;IACV,CAAC,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;CACpE,CAAC,CAAC;AAEH,8EAA8E;AAC9E,uEAAuE;AACvE,2EAA2E;AAC3E,0DAA0D;AAC1D,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,OAAO,EAAE;KAC9D,MAAM,CAAC;IACN,QAAQ,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACrC,MAAM,EAAE,wBAAwB,CAAC,QAAQ,EAAE;IAC3C,QAAQ,EAAE,0BAA0B,CAAC,QAAQ,EAAE;IAC/C,QAAQ,EAAE,0BAA0B,CAAC,QAAQ,EAAE;IAC/C,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;CACnD,CAAC;KACD,KAAK,EAAE,CAAC"}
|
|
@@ -30,9 +30,9 @@ export declare const windowsDescendants: (rootPid: number, processes: readonly I
|
|
|
30
30
|
pid: number;
|
|
31
31
|
ppid: number;
|
|
32
32
|
}) => IProcessInfo[];
|
|
33
|
-
export declare const forceWindowsTree: (pid: number, discover?: (pid: number) => Promise<IProcessInfo[]>, signal?: (pid: number) => void, discoveryTimeoutMs?: number) => Promise<void>;
|
|
33
|
+
export declare const forceWindowsTree: (pid: number, discover?: (pid: number) => Promise<IProcessInfo[]>, signal?: (pid: number) => void, discoveryTimeoutMs?: number, stillOwned?: () => boolean) => Promise<void>;
|
|
34
34
|
export declare const posixProcessPlatform: (signalGroup?: (child: ChildProcess, signal: NodeJS.Signals) => void) => ProcessPlatform;
|
|
35
|
-
export declare const windowsProcessPlatform: (forceTree?: (pid: number) => Promise<void>) => ProcessPlatform;
|
|
35
|
+
export declare const windowsProcessPlatform: (forceTree?: (pid: number, stillOwned: () => boolean) => Promise<void>) => ProcessPlatform;
|
|
36
36
|
export declare const processTreeFor: (child: ChildProcess) => ProcessTree;
|
|
37
37
|
export {};
|
|
38
38
|
//# sourceMappingURL=platform-process.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform-process.d.ts","sourceRoot":"","sources":["../../src/core/platform-process.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,8BAA8B,EAGpC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGjE,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;AAEvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,6EAA6E;IAC7E,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC;IACzC,iDAAiD;IACjD,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,2DAA2D;IAC3D,cAAc,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,WAAW,CAAC;CACtD,CAAC;AAoBF,eAAO,MAAM,uBAAuB,cACvB,MAAM,CAAC,UAAU,aACjB,MAAM,CAAC,UAAU,GAAG,SAAS,aAC9B,iBAAiB,KAC1B,MAAM,CAAC,UAWT,CAAC;AAiBF,eAAO,MAAM,iBAAiB,YACnB,MAAM,gBACF,MAAM,CAAC,UAAU,aACpB,iBAAiB,QACtB,MAAM,KACV,MAAM,GAAG,SA2BX,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,YACf,MAAM,QACT,SAAS,MAAM,EAAE,WACd,oBAAoB,KAC5B,8BAgCF,CAAC;AAmCF,eAAO,MAAM,kBAAkB,YACpB,MAAM,aACJ,SAAS,YAAY,EAAE,UAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,KACnC,YAAY,EAwBd,CAAC;AASF,eAAO,MAAM,gBAAgB,QACtB,MAAM,aACD,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC,WAC1C,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"platform-process.d.ts","sourceRoot":"","sources":["../../src/core/platform-process.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,8BAA8B,EAGpC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGjE,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;AAEvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,6EAA6E;IAC7E,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC;IACzC,iDAAiD;IACjD,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,2DAA2D;IAC3D,cAAc,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,WAAW,CAAC;CACtD,CAAC;AAoBF,eAAO,MAAM,uBAAuB,cACvB,MAAM,CAAC,UAAU,aACjB,MAAM,CAAC,UAAU,GAAG,SAAS,aAC9B,iBAAiB,KAC1B,MAAM,CAAC,UAWT,CAAC;AAiBF,eAAO,MAAM,iBAAiB,YACnB,MAAM,gBACF,MAAM,CAAC,UAAU,aACpB,iBAAiB,QACtB,MAAM,KACV,MAAM,GAAG,SA2BX,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,YACf,MAAM,QACT,SAAS,MAAM,EAAE,WACd,oBAAoB,KAC5B,8BAgCF,CAAC;AAmCF,eAAO,MAAM,kBAAkB,YACpB,MAAM,aACJ,SAAS,YAAY,EAAE,UAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,KACnC,YAAY,EAwBd,CAAC;AASF,eAAO,MAAM,gBAAgB,QACtB,MAAM,aACD,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC,WAC1C,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,4CAEjB,MAAM,OAAO,KACxB,OAAO,CAAC,IAAI,CA+Bd,CAAC;AAgBF,eAAO,MAAM,oBAAoB,iBAClB,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,KACjE,eAgBD,CAAC;AAEH,eAAO,MAAM,sBAAsB,eACtB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,KAEnE,eAoBD,CAAC;AAKH,eAAO,MAAM,cAAc,UAAW,YAAY,KAAG,WACT,CAAC"}
|
|
@@ -162,8 +162,8 @@ const windowsProcessList = async () => {
|
|
|
162
162
|
getAllProcesses(resolve);
|
|
163
163
|
});
|
|
164
164
|
};
|
|
165
|
-
export const forceWindowsTree = async (pid, discover = windowsProcessList, signal = signalWindowsProcess, discoveryTimeoutMs = 2_000) => {
|
|
166
|
-
if (!safeWindowsSignalTarget(pid))
|
|
165
|
+
export const forceWindowsTree = async (pid, discover = windowsProcessList, signal = signalWindowsProcess, discoveryTimeoutMs = 2_000, stillOwned = () => true) => {
|
|
166
|
+
if (!stillOwned() || !safeWindowsSignalTarget(pid))
|
|
167
167
|
return;
|
|
168
168
|
let processes = [];
|
|
169
169
|
let timer;
|
|
@@ -182,7 +182,8 @@ export const forceWindowsTree = async (pid, discover = windowsProcessList, signa
|
|
|
182
182
|
if (timer)
|
|
183
183
|
clearTimeout(timer);
|
|
184
184
|
}
|
|
185
|
-
|
|
185
|
+
// Discovery is asynchronous; an exited leader can already have a recycled PID.
|
|
186
|
+
if (!stillOwned() || windowsAncestorPids(processes, process).has(pid))
|
|
186
187
|
return;
|
|
187
188
|
const descendants = windowsDescendants(pid, processes);
|
|
188
189
|
for (const process of descendants.toReversed()) {
|
|
@@ -222,20 +223,19 @@ export const posixProcessPlatform = (signalGroup = signalPosixGroup) => ({
|
|
|
222
223
|
};
|
|
223
224
|
},
|
|
224
225
|
});
|
|
225
|
-
export const windowsProcessPlatform = (forceTree = forceWindowsTree) => ({
|
|
226
|
+
export const windowsProcessPlatform = (forceTree = (pid, stillOwned) => forceWindowsTree(pid, undefined, undefined, undefined, stillOwned)) => ({
|
|
226
227
|
detached: false,
|
|
227
228
|
processTreeFor: (child) => {
|
|
228
229
|
const pid = child.pid;
|
|
229
230
|
let forced;
|
|
231
|
+
const stillOwned = () => child.exitCode == null && child.signalCode == null;
|
|
230
232
|
const forceOnce = () => {
|
|
231
233
|
if (forced)
|
|
232
234
|
return forced;
|
|
233
|
-
|
|
234
|
-
(child.signalCode !== null && child.signalCode !== undefined);
|
|
235
|
-
if (pid === undefined || leaderHasExited)
|
|
235
|
+
if (pid === undefined || !stillOwned())
|
|
236
236
|
forced = Promise.resolve();
|
|
237
237
|
else
|
|
238
|
-
forced = forceTree(pid);
|
|
238
|
+
forced = forceTree(pid, stillOwned);
|
|
239
239
|
return forced;
|
|
240
240
|
};
|
|
241
241
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform-process.js","sourceRoot":"","sources":["../../src/core/platform-process.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"platform-process.js","sourceRoot":"","sources":["../../src/core/platform-process.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { AnswererRef, DriverRef } from "./case.js";
|
|
2
|
+
export declare const withDriverDefaults: (reference: DriverRef | undefined, defaults: Record<string, unknown> | undefined) => DriverRef | undefined;
|
|
3
|
+
export declare const mergeDriverReference: (base: DriverRef | undefined, local: DriverRef | undefined) => DriverRef | undefined;
|
|
4
|
+
export declare const mergeAnswererReference: (base: AnswererRef | undefined, local: AnswererRef | undefined) => AnswererRef | undefined;
|
|
5
|
+
//# sourceMappingURL=reference-defaults.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reference-defaults.d.ts","sourceRoot":"","sources":["../../src/core/reference-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGxD,eAAO,MAAM,kBAAkB,cAClB,SAAS,GAAG,SAAS,YACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,KAC5C,SAAS,GAAG,SAId,CAAC;AAEF,eAAO,MAAM,oBAAoB,SACzB,SAAS,GAAG,SAAS,SACpB,SAAS,GAAG,SAAS,KAC3B,SAAS,GAAG,SAad,CAAC;AAEF,eAAO,MAAM,sBAAsB,SAC3B,WAAW,GAAG,SAAS,SACtB,WAAW,GAAG,SAAS,KAC7B,WAAW,GAAG,SAahB,CAAC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { mergePluginConfig } from "./harness-matrix.js";
|
|
2
|
+
export const withDriverDefaults = (reference, defaults) => {
|
|
3
|
+
if (!reference || !defaults)
|
|
4
|
+
return reference;
|
|
5
|
+
const selected = typeof reference === "string" ? { name: reference } : reference;
|
|
6
|
+
return { ...selected, config: mergePluginConfig(defaults, selected.config) };
|
|
7
|
+
};
|
|
8
|
+
export const mergeDriverReference = (base, local) => {
|
|
9
|
+
if (local === undefined)
|
|
10
|
+
return base;
|
|
11
|
+
if (base === undefined)
|
|
12
|
+
return local;
|
|
13
|
+
const first = typeof base === "string" ? { name: base } : base;
|
|
14
|
+
const second = typeof local === "string" ? { name: local } : local;
|
|
15
|
+
if (first.name !== second.name)
|
|
16
|
+
return local;
|
|
17
|
+
return {
|
|
18
|
+
name: second.name,
|
|
19
|
+
config: mergePluginConfig(first.config, second.config),
|
|
20
|
+
...((second.execution ?? first.execution)
|
|
21
|
+
? { execution: second.execution ?? first.execution }
|
|
22
|
+
: {}),
|
|
23
|
+
};
|
|
24
|
+
};
|
|
25
|
+
export const mergeAnswererReference = (base, local) => {
|
|
26
|
+
const merged = mergeDriverReference(base, local);
|
|
27
|
+
if (typeof merged !== "object" || merged.name !== "persona")
|
|
28
|
+
return merged;
|
|
29
|
+
const first = typeof base === "object" ? base.config : undefined;
|
|
30
|
+
const second = typeof local === "object" ? local.config : undefined;
|
|
31
|
+
if (!first || !second || typeof first !== "object" || typeof second !== "object")
|
|
32
|
+
return merged;
|
|
33
|
+
if (!("provider" in second) || ("provider" in first && second.provider === first.provider))
|
|
34
|
+
return merged;
|
|
35
|
+
const config = { ...merged.config };
|
|
36
|
+
for (const key of ["model", "command", "reasoningEffort"]) {
|
|
37
|
+
if (!(key in second))
|
|
38
|
+
delete config[key];
|
|
39
|
+
}
|
|
40
|
+
return { name: merged.name, config };
|
|
41
|
+
};
|
|
42
|
+
//# sourceMappingURL=reference-defaults.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reference-defaults.js","sourceRoot":"","sources":["../../src/core/reference-defaults.ts"],"names":[],"mappings":"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"}
|