@workbench-ai/workbench-core 0.0.49 → 0.0.50

package/dist/candidate-patch.d.ts

@@ -0,0 +1,8 @@
+import type { SurfaceSnapshotFile, WorkbenchCandidatePatch } from "@workbench-ai/workbench-contract";
+export interface ApplyWorkbenchCandidatePatchInput {
+    baseFiles: readonly SurfaceSnapshotFile[];
+    patch: WorkbenchCandidatePatch;
+    edits: readonly string[];
+}
+export declare function applyWorkbenchCandidatePatch(input: ApplyWorkbenchCandidatePatchInput): SurfaceSnapshotFile[];
+//# sourceMappingURL=candidate-patch.d.ts.map

package/dist/candidate-patch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"candidate-patch.d.ts","sourceRoot":"","sources":["../src/candidate-patch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,iCAAiC;IAChD,SAAS,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC1C,KAAK,EAAE,uBAAuB,CAAC;IAC/B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,iCAAiC,GAAG,mBAAmB,EAAE,CAgD5G"}

package/dist/{subject-patch.js → candidate-patch.js}

@@ -1,24 +1,24 @@
-export function applyWorkbenchSubjectPatch(input) {
+export function applyWorkbenchCandidatePatch(input) {
     const issues = [];
     const edits = input.edits.map(normalizeRelativePath).filter(Boolean);
     const patchPaths = new Set();
     for (const file of input.patch.files) {
         const filePath = normalizeRelativePath(file.path);
         if (!isSafeRelativePath(filePath)) {
-            issues.push(`Subject patch contains unsafe path ${file.path}.`);
+            issues.push(`Candidate patch contains unsafe path ${file.path}.`);
         }
         if (!isAllowedEditPath(filePath, edits)) {
-            issues.push(`Subject patch contains path outside optimizer edits: ${file.path}.`);
+            issues.push(`Candidate patch contains path outside improve edits: ${file.path}.`);
         }
         patchPaths.add(filePath);
     }
     for (const fileChange of input.patch.fileChanges) {
         const filePath = normalizeRelativePath(fileChange);
         if (!isSafeRelativePath(filePath)) {
-            issues.push(`Subject patch fileChanges contains unsafe path ${fileChange}.`);
+            issues.push(`Candidate patch fileChanges contains unsafe path ${fileChange}.`);
         }
         if (!isAllowedEditPath(filePath, edits)) {
-            issues.push(`Subject patch fileChanges contains path outside optimizer edits: ${fileChange}.`);
+            issues.push(`Candidate patch fileChanges contains path outside improve edits: ${fileChange}.`);
         }
     }
     if (issues.length > 0) {

package/dist/execution-evidence.d.ts

@@ -1,10 +1,10 @@
-import type { SubjectCaseReview, HostedWorkbenchJob, HostedWorkbenchJobStatus, WorkbenchExecutionEventRole, WorkbenchExecutionSpec, WorkbenchExecutionTrace, WorkbenchExecutionEvidence, WorkbenchTraceSession } from "@workbench-ai/workbench-contract";
-export declare function buildSubjectCaseExecutionRefs(args: {
+import type { CandidateCaseReview, HostedWorkbenchJob, HostedWorkbenchJobStatus, WorkbenchExecutionEventRole, WorkbenchExecutionSpec, WorkbenchExecutionTrace, WorkbenchExecutionEvidence, WorkbenchTraceSession } from "@workbench-ai/workbench-contract";
+export declare function buildCandidateCaseExecutionRefs(args: {
     jobs: readonly HostedWorkbenchJob[];
-    subjectId: string;
+    candidateId: string;
     caseId: string;
     sampleIndex?: number;
-}): SubjectCaseReview["executions"];
+}): CandidateCaseReview["executions"];
 export declare function buildWorkbenchExecutionEvidence(args: {
     jobs: readonly HostedWorkbenchJob[];
     traceIdPrefix: string;
@@ -15,7 +15,7 @@ export declare function readWorkbenchExecutionPurpose(job: HostedWorkbenchJob):
 export declare function readWorkbenchExecutionId(job: HostedWorkbenchJob): string | null;
 export declare function readWorkbenchExecutionMetadataString(job: HostedWorkbenchJob, key: string): string | null;
 export declare function readWorkbenchExecutionMetadataNumber(job: HostedWorkbenchJob, key: string): number | null;
-export declare function isWorkbenchExecutionActive(execution: SubjectCaseReview["executions"][number]): boolean;
+export declare function isWorkbenchExecutionActive(execution: CandidateCaseReview["executions"][number]): boolean;
 export declare function resolveWorkbenchJobGroupStatus(jobs: readonly {
     status: HostedWorkbenchJobStatus;
 }[]): HostedWorkbenchJobStatus;

package/dist/execution-evidence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-evidence.d.ts","sourceRoot":"","sources":["../src/execution-evidence.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EAExB,2BAA2B,EAC3B,sBAAsB,EACtB,uBAAuB,EACvB,0BAA0B,EAC1B,qBAAqB,EACtB,MAAM,kCAAkC,CAAC;AAI1C,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,IAAI,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAgElC;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,IAAI,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,CACX,GAAG,EAAE,kBAAkB,EACvB,IAAI,EAAE,2BAA2B,KAC9B,uBAAuB,CAAC;IAC7B,mBAAmB,CAAC,EAAE,CACpB,GAAG,EAAE,kBAAkB,EACvB,IAAI,EAAE,2BAA2B,KAC9B,qBAAqB,EAAE,CAAC;CAC9B,GAAG,0BAA0B,EAAE,CAgF/B;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,kBAAkB,GACtB,sBAAsB,CAAC,SAAS,CAAC,GAAG,IAAI,CAQ1C;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,GAAG,IAAI,CAG/E;AAED,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAGf;AAED,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAGf;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,GACjD,OAAO,CAET;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,SAAS;IAAE,MAAM,EAAE,wBAAwB,CAAA;CAAE,EAAE,GACpD,wBAAwB,CAc1B"}
+{"version":3,"file":"execution-evidence.d.ts","sourceRoot":"","sources":["../src/execution-evidence.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,wBAAwB,EAExB,2BAA2B,EAC3B,sBAAsB,EACtB,uBAAuB,EACvB,0BAA0B,EAC1B,qBAAqB,EACtB,MAAM,kCAAkC,CAAC;AAI1C,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,IAAI,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAgEpC;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,IAAI,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,CACX,GAAG,EAAE,kBAAkB,EACvB,IAAI,EAAE,2BAA2B,KAC9B,uBAAuB,CAAC;IAC7B,mBAAmB,CAAC,EAAE,CACpB,GAAG,EAAE,kBAAkB,EACvB,IAAI,EAAE,2BAA2B,KAC9B,qBAAqB,EAAE,CAAC;CAC9B,GAAG,0BAA0B,EAAE,CAgF/B;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,kBAAkB,GACtB,sBAAsB,CAAC,SAAS,CAAC,GAAG,IAAI,CAQ1C;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,GAAG,IAAI,CAG/E;AAED,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAGf;AAED,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAGf;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,mBAAmB,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,GACnD,OAAO,CAET;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,SAAS;IAAE,MAAM,EAAE,wBAAwB,CAAA;CAAE,EAAE,GACpD,wBAAwB,CAc1B"}

package/dist/execution-evidence.js

@@ -1,11 +1,11 @@
 import { mergeWorkbenchExecutionTracesByJob } from "./execution-traces.js";
-export function buildSubjectCaseExecutionRefs(args) {
+export function buildCandidateCaseExecutionRefs(args) {
     const groups = new Map();
     for (const job of args.jobs) {
         const kind = readWorkbenchExecutionPurpose(job);
-        const jobSubjectId = job.subjectId ?? readWorkbenchExecutionMetadataString(job, "subjectId");
+        const jobCandidateId = job.candidateId ?? readWorkbenchExecutionMetadataString(job, "candidateId");
         const jobCaseId = readWorkbenchExecutionMetadataString(job, "caseId");
-        if (jobSubjectId === args.subjectId &&
+        if (jobCandidateId === args.candidateId &&
             kind === "attempt" &&
             caseReviewCaseIdsMatch(jobCaseId, args.caseId) &&
             caseReviewSampleIndicesMatch(readWorkbenchExecutionMetadataNumber(job, "sampleIndex"), args.sampleIndex)) {
@@ -53,7 +53,7 @@ export function buildSubjectCaseExecutionRefs(args) {
                 ...optionalNumber("attemptIndex", readWorkbenchExecutionMetadataNumber(first, "attemptIndex")),
             }];
     })
-        .sort(compareSubjectCaseExecutions);
+        .sort(compareCandidateCaseExecutions);
     return selectCurrentExecutionRun(executions);
 }
 export function buildWorkbenchExecutionEvidence(args) {
@@ -69,7 +69,7 @@ export function buildWorkbenchExecutionEvidence(args) {
         const key = [
             job.runId,
             purpose,
-            job.subjectId ?? readWorkbenchExecutionMetadataString(job, "subjectId") ?? "",
+            job.candidateId ?? readWorkbenchExecutionMetadataString(job, "candidateId") ?? "",
             readWorkbenchExecutionMetadataString(job, "caseId") ?? "",
             readWorkbenchExecutionMetadataNumber(job, "sampleIndex") ?? "",
             readWorkbenchExecutionMetadataNumber(job, "attemptIndex") ?? "",
@@ -111,7 +111,7 @@ export function buildWorkbenchExecutionEvidence(args) {
                 status: resolveWorkbenchJobGroupStatus(group),
                 jobIds,
                 executionIds,
-                ...(first.subjectId ? { subjectId: first.subjectId } : {}),
+                ...(first.candidateId ? { candidateId: first.candidateId } : {}),
                 ...optionalString("caseId", readWorkbenchExecutionMetadataString(first, "caseId")),
                 ...optionalNumber("sampleIndex", readWorkbenchExecutionMetadataNumber(first, "sampleIndex")),
                 ...optionalNumber("attemptIndex", readWorkbenchExecutionMetadataNumber(first, "attemptIndex")),
@@ -209,7 +209,7 @@ function selectCurrentExecutionRun(executions) {
         ? executions.filter((execution) => execution.runId === selectedRunId)
         : executions;
 }
-function compareSubjectCaseExecutions(left, right) {
+function compareCandidateCaseExecutions(left, right) {
     return (executionKindOrder(left.kind) - executionKindOrder(right.kind) ||
         (left.sampleIndex ?? -1) - (right.sampleIndex ?? -1) ||
         readExecutionRecencyMs(right) - readExecutionRecencyMs(left));
@@ -244,7 +244,7 @@ function compareWorkbenchExecutionEvidence(left, right) {
 }
 function traceRoleForPurpose(purpose) {
     if (purpose === "improve") {
-        return "optimizer";
+        return "improver";
     }
     return "engine";
 }

package/dist/execution-graph.d.ts

@@ -4,14 +4,14 @@ export interface CompileExecutionGraphInput {
     ownerUserId: string;
     projectId: string;
     runId: string;
-    subjectId: string;
+    candidateId: string;
     attemptIndex: number;
     sampleIndex?: number;
     caseId?: string;
     engineCase?: GenericEngineCaseSpec;
     spec: GenericRunSpec;
     workflow?: "eval" | "improve";
-    subjectRef?: string;
+    candidateRef?: string;
     caseRef?: string;
     environmentRef?: string;
 }

package/dist/execution-graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-graph.d.ts","sourceRoot":"","sources":["../src/execution-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,sBAAsB,EAEvB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAE3B,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,2BAA2B,EAAE,CAAC;IACrC,UAAU,EAAE,sBAAsB,EAAE,CAAC;CACtC;AAED,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,sBAAsB,CAAC;IAClC,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,0BAA0B,GAAG,uBAAuB,CAoEzG"}
+{"version":3,"file":"execution-graph.d.ts","sourceRoot":"","sources":["../src/execution-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,sBAAsB,EAEvB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAE3B,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,2BAA2B,EAAE,CAAC;IACrC,UAAU,EAAE,sBAAsB,EAAE,CAAC;CACtC;AAED,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,sBAAsB,CAAC;IAClC,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,0BAA0B,GAAG,uBAAuB,CAoEzG"}

package/dist/execution-graph.js

@@ -3,7 +3,7 @@ export function compileWorkbenchExecutionGraph(input) {
     const workflow = input.workflow ?? "improve";
     const sampleIndex = input.sampleIndex ?? 0;
     const caseId = input.caseId ?? "current";
-    const subjectRef = input.subjectRef ?? `workbench://benchmarks/${input.projectId}/subjects/${input.subjectId}`;
+    const candidateRef = input.candidateRef ?? `workbench://benchmarks/${input.projectId}/candidates/${input.candidateId}`;
     const caseRef = input.caseRef ?? `workbench://benchmarks/${input.projectId}/engine-cases/${caseId}`;
     if (!input.engineCase) {
         throw new Error("Execution graph compilation requires an engine case.");
@@ -15,41 +15,41 @@ export function compileWorkbenchExecutionGraph(input) {
     });
     const nodes = [];
     const executions = [];
-    const optimizerExecutionId = executionId(input, "improve", "current", 0);
-    const optimizerOutputRef = `execution://${optimizerExecutionId}/subject_patch`;
+    const improveExecutionId = executionId(input, "improve", "current", 0);
+    const improveOutputRef = `execution://${improveExecutionId}/candidate_patch`;
     const engineAdapter = input.spec.engineRun;
     if (workflow === "improve") {
-        if (!input.spec.optimizer || !input.spec.improve) {
-            throw new Error("Optimizer YAML is required for improve execution graphs.");
+        if (!input.spec.candidate.improve || !input.spec.improve) {
+            throw new Error("Candidate improve configuration is required for improve execution graphs.");
         }
         pushExecution(nodes, executions, createExecution({
             input,
             purpose: "improve",
             adapter: input.spec.improve,
             inputs: [
-                inputRef("subject", subjectRef, "/workspace/input/subject", false),
+                inputRef("candidate", candidateRef, "/workspace", true),
                 inputRef("traces", `workbench://benchmarks/${input.projectId}/runs/${input.runId}/traces`, "/workspace/input/traces", false),
             ],
-            outputs: [outputContract("subject_patch", "workbench.subject_patch.v1")],
+            outputs: [outputContract("candidate_patch", "workbench.candidate_patch.v1")],
             metadata: {
                 attemptIndex: input.attemptIndex,
                 sampleIndex: 0,
                 caseId: "current",
                 benchmark: input.spec.benchmark.name,
-                edits: input.spec.optimizer.edits,
+                edits: input.spec.candidate.improve.edits,
             },
             runtime: input.spec.environment,
-            idOverride: optimizerExecutionId,
+            idOverride: improveExecutionId,
         }), []);
     }
-    const runSubjectRef = workflow === "improve" ? optimizerOutputRef : subjectRef;
+    const runCandidateRef = workflow === "improve" ? improveOutputRef : candidateRef;
     const attemptExecutionId = executionId(input, "attempt", caseId, sampleIndex);
     pushExecution(nodes, executions, createExecution({
         input,
         purpose: "attempt",
         adapter: engineAdapter,
         inputs: [
-            inputRef("subject", runSubjectRef, "/workspace/input/subject", false),
+            inputRef("candidate", runCandidateRef, "/workspace/input/candidate", false),
             inputRef("case", caseRef, "/workspace/input/case", false),
         ],
         outputs: [outputContract("result", "workbench.result.v1")],
@@ -62,7 +62,7 @@ export function compileWorkbenchExecutionGraph(input) {
         },
         runtime: executionConfig.environment,
         idOverride: attemptExecutionId,
-    }), workflow === "improve" ? [optimizerExecutionId] : []);
+    }), workflow === "improve" ? [improveExecutionId] : []);
     return { nodes, executions };
 }
 function pushExecution(nodes, executions, execution, dependsOn) {
@@ -77,7 +77,7 @@ function createExecution(args) {
         id: args.idOverride ?? executionId(args.input, args.purpose, args.input.caseId ?? "current", args.input.sampleIndex ?? 0),
         projectId: args.input.projectId,
         runId: args.input.runId,
-        subjectId: args.input.subjectId,
+        candidateId: args.input.candidateId,
         purpose: args.purpose,
         adapter: args.adapter,
         sandbox: args.input.environmentRef

package/dist/execution-jobs.d.ts

@@ -19,10 +19,11 @@ export declare function planWorkbenchExecutionJobsForPurpose(args: {
     ownerUserId: string;
     projectId: string;
     runId: string;
-    subjectId: string;
+    candidateId: string;
     attemptIndex: number;
     samples: number;
     caseIds?: readonly string[];
+    sampleIndexesByCase?: ReadonlyMap<string, readonly number[]>;
     spec: GenericRunSpec;
     workflow: WorkbenchRunWorkflow;
     purpose: WorkbenchExecutionSpec["purpose"];
@@ -39,7 +40,7 @@ export declare function engineCaseForCase(engineCases: readonly WorkbenchEngineC
 export declare function createWorkbenchExecutionJob(args: {
     projectId: string;
     runId: string;
-    subjectId: string;
+    candidateId: string;
     execution: WorkbenchExecutionSpec;
     dependsOn: readonly string[];
     now: string;
@@ -47,18 +48,18 @@ export declare function createWorkbenchExecutionJob(args: {
     traceFiles?: readonly SurfaceSnapshotFile[];
     baseId?: string | null;
 }): HostedWorkbenchJob;
-export declare function createBaselineSubjectExecution(args: {
+export declare function createBaselineCandidateExecution(args: {
     ownerUserId: string;
     projectId: string;
     runId: string;
-    subjectId: string;
+    candidateId: string;
     attemptIndex: number;
 }): WorkbenchExecutionSpec;
-export declare function createBaselineSubjectJob(args: {
+export declare function createBaselineCandidateJob(args: {
     ownerUserId: string;
     projectId: string;
     runId: string;
-    subjectId: string;
+    candidateId: string;
     files: readonly SurfaceSnapshotFile[];
     now: string;
     baseId: string | null;

package/dist/execution-jobs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-jobs.d.ts","sourceRoot":"","sources":["../src/execution-jobs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execution-jobs.d.ts","sourceRoot":"","sources":["../src/execution-jobs.ts"],"names":[],"mappings":"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"}

package/dist/execution-jobs.js

@@ -36,12 +36,17 @@ export function planWorkbenchExecutionJobsForPurpose(args) {
     }
     for (const caseId of caseIds) {
         const engineCase = engineCaseForCase(engineCases, caseId);
-        for (let sampleIndex = 0; sampleIndex < args.samples; sampleIndex += 1) {
+        const sampleIndexes = sampleIndexesForCase({
+            caseId,
+            samples: args.samples,
+            sampleIndexesByCase: args.sampleIndexesByCase,
+        });
+        for (const sampleIndex of sampleIndexes) {
             const graph = compileWorkbenchExecutionGraph({
                 ownerUserId: args.ownerUserId,
                 projectId: args.projectId,
                 runId: args.runId,
-                subjectId: args.subjectId,
+                candidateId: args.candidateId,
                 attemptIndex: args.attemptIndex,
                 sampleIndex,
                 caseId,
@@ -57,7 +62,7 @@ export function planWorkbenchExecutionJobsForPurpose(args) {
                 jobs.push(createWorkbenchExecutionJob({
                     projectId: args.projectId,
                     runId: args.runId,
-                    subjectId: args.subjectId,
+                    candidateId: args.candidateId,
                     execution: node.execution,
                     dependsOn: node.dependsOn,
                     now: args.now,
@@ -70,6 +75,16 @@ export function planWorkbenchExecutionJobsForPurpose(args) {
     }
     return jobs.filter((job, index) => jobs.findIndex((entry) => entry.id === job.id) === index);
 }
+function sampleIndexesForCase(args) {
+    if (!args.sampleIndexesByCase) {
+        return Array.from({ length: args.samples }, (_, index) => index);
+    }
+    return [...new Set(args.sampleIndexesByCase.get(args.caseId) ?? [])]
+        .filter((sampleIndex) => Number.isSafeInteger(sampleIndex) &&
+        sampleIndex >= 0 &&
+        sampleIndex < args.samples)
+        .sort((left, right) => left - right);
+}
 export function engineCaseIds(engineCases) {
     return [...new Set(engineCases.map((bundle) => bundle.id))].sort();
 }
@@ -88,7 +103,7 @@ export function createWorkbenchExecutionJob(args) {
         id: workbenchExecutionJobId(args.execution.id),
         projectId: args.projectId,
         runId: args.runId,
-        subjectId: args.subjectId,
+        candidateId: args.candidateId,
         kind: "execute",
         status: "queued",
         attempt: 0,
@@ -97,7 +112,7 @@ export function createWorkbenchExecutionJob(args) {
         input: {
             execution: args.execution,
             dependsOn: args.dependsOn.map(workbenchExecutionJobId),
-            subjectId: args.subjectId,
+            candidateId: args.candidateId,
             attemptIndex,
             sampleIndex,
             caseId,
@@ -107,12 +122,12 @@ export function createWorkbenchExecutionJob(args) {
         },
     };
 }
-export function createBaselineSubjectExecution(args) {
+export function createBaselineCandidateExecution(args) {
     return {
         id: `exec_${args.runId.replace(/[^a-z0-9_]/giu, "_")}_attempt_${String(args.attemptIndex).padStart(3, "0")}_case_current_sample_000_improve`,
         projectId: args.projectId,
         runId: args.runId,
-        subjectId: args.subjectId,
+        candidateId: args.candidateId,
         purpose: "improve",
         adapter: {
             use: "baseline",
@@ -120,12 +135,12 @@ export function createBaselineSubjectExecution(args) {
         },
         sandbox: {
             kind: "snapshot",
-            ref: "workbench/baseline-subject",
+            ref: "workbench/baseline-candidate",
         },
         inputs: [],
         outputs: [{
-                name: "subject_patch",
-                schema: "workbench.subject_patch.v1",
+                name: "candidate_patch",
+                schema: "workbench.candidate_patch.v1",
                 required: true,
             }],
         policy: {
@@ -148,12 +163,12 @@ export function createBaselineSubjectExecution(args) {
         },
     };
 }
-export function createBaselineSubjectJob(args) {
-    const execution = createBaselineSubjectExecution({
+export function createBaselineCandidateJob(args) {
+    const execution = createBaselineCandidateExecution({
         ownerUserId: args.ownerUserId,
         projectId: args.projectId,
         runId: args.runId,
-        subjectId: args.subjectId,
+        candidateId: args.candidateId,
         attemptIndex: args.attemptIndex,
     });
     const files = args.files.map((file) => ({ ...file }));
@@ -161,7 +176,7 @@ export function createBaselineSubjectJob(args) {
         id: workbenchExecutionJobId(execution.id),
         projectId: args.projectId,
         runId: args.runId,
-        subjectId: args.subjectId,
+        candidateId: args.candidateId,
         kind: "execute",
         status: "succeeded",
         attempt: 1,
@@ -172,7 +187,7 @@ export function createBaselineSubjectJob(args) {
         input: {
             execution,
             dependsOn: [],
-            subjectId: args.subjectId,
+            candidateId: args.candidateId,
             attemptIndex: args.attemptIndex,
             baseline: true,
         },
@@ -180,10 +195,10 @@ export function createBaselineSubjectJob(args) {
             ok: true,
             executionId: execution.id,
             purpose: "improve",
-            subjectId: args.subjectId,
+            candidateId: args.candidateId,
             attemptIndex: args.attemptIndex,
             baseId: args.baseId,
-            subjectPatch: {
+            candidatePatch: {
                 files,
                 fileChanges: [],
             },

package/dist/execution-outputs.d.ts

@@ -1,6 +1,6 @@
-import type { Json, WorkbenchSubjectPatch, WorkbenchExecutionSpec, WorkbenchResult } from "@workbench-ai/workbench-contract";
+import type { Json, WorkbenchCandidatePatch, WorkbenchExecutionSpec, WorkbenchResult } from "@workbench-ai/workbench-contract";
 export interface WorkbenchExecutionOutputPayloads {
-    subjectPatch?: WorkbenchSubjectPatch;
+    candidatePatch?: WorkbenchCandidatePatch;
     result?: WorkbenchResult;
 }
 export declare function validateWorkbenchExecutionOutputPayloads(execution: WorkbenchExecutionSpec, payloads: Record<string, Json>): WorkbenchExecutionOutputPayloads;

package/dist/execution-outputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-outputs.d.ts","sourceRoot":"","sources":["../src/execution-outputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,IAAI,EAEJ,qBAAqB,EAErB,sBAAsB,EACtB,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAI1C,MAAM,WAAW,gCAAgC;IAC/C,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAED,wBAAgB,wCAAwC,CACtD,SAAS,EAAE,sBAAsB,EACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAC7B,gCAAgC,CAoClC;AAED,wBAAgB,wCAAwC,CAAC,SAAS,EAAE,sBAAsB,GAAG,MAAM,EAAE,CAkFpG;AAsBD,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,sBAAsB,GAAG,IAAI,CAKzF"}
+{"version":3,"file":"execution-outputs.d.ts","sourceRoot":"","sources":["../src/execution-outputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,IAAI,EAEJ,uBAAuB,EAEvB,sBAAsB,EACtB,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAI1C,MAAM,WAAW,gCAAgC;IAC/C,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAED,wBAAgB,wCAAwC,CACtD,SAAS,EAAE,sBAAsB,EACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAC7B,gCAAgC,CAoClC;AAED,wBAAgB,wCAAwC,CAAC,SAAS,EAAE,sBAAsB,GAAG,MAAM,EAAE,CAuFpG;AAuCD,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,sBAAsB,GAAG,IAAI,CAKzF"}

package/dist/execution-outputs.js

@@ -19,8 +19,8 @@ export function validateWorkbenchExecutionOutputPayloads(execution, payloads) {
             continue;
         }
         switch (contract.schema) {
-            case "workbench.subject_patch.v1":
-                validated.subjectPatch = normalizeSubjectPatch(payload, execution, contract, issues);
+            case "workbench.candidate_patch.v1":
+                validated.candidatePatch = normalizeCandidatePatch(payload, execution, contract, issues);
                 break;
             case "workbench.result.v1":
                 validated.result = normalizeResult(payload, execution, contract, issues);
@@ -68,7 +68,7 @@ export function collectWorkbenchExecutionIsolationIssues(execution) {
         if (!expectedInputs.has(input.name)) {
             issues.push(`Execution ${execution.id} declares unsupported input ${input.name} for purpose ${execution.purpose}.`);
         }
-        const expectedMountPath = `/workspace/input/${input.name}`;
+        const expectedMountPath = expectedInputMountPath(execution.purpose, input.name);
         if (input.mountPath !== expectedMountPath) {
             issues.push(`Execution ${execution.id} input ${input.name} must mount at ${expectedMountPath}.`);
         }
@@ -76,8 +76,11 @@ export function collectWorkbenchExecutionIsolationIssues(execution) {
             issues.push(`Execution ${execution.id} declares duplicate mount path ${input.mountPath}.`);
         }
         mountPaths.add(input.mountPath);
-        if (input.writable) {
-            issues.push(`Execution ${execution.id} inputs must be read-only.`);
+        const expectedWritable = expectedInputWritable(execution.purpose, input.name);
+        if (input.writable !== expectedWritable) {
+            issues.push(expectedWritable
+                ? `Execution ${execution.id} input ${input.name} must be writable.`
+                : `Execution ${execution.id} input ${input.name} must be read-only.`);
         }
     }
     for (const expectedInput of expectedInputs) {
@@ -116,16 +119,25 @@ export function collectWorkbenchExecutionIsolationIssues(execution) {
 }
 function expectedInputsForPurpose(purpose) {
     if (purpose === "improve") {
-        return new Set(["subject", "traces"]);
+        return new Set(["candidate", "traces"]);
     }
     if (purpose === "attempt") {
-        return new Set(["subject", "case"]);
+        return new Set(["candidate", "case"]);
     }
     return new Set();
 }
+function expectedInputMountPath(purpose, name) {
+    if (purpose === "improve" && name === "candidate") {
+        return "/workspace";
+    }
+    return `/workspace/input/${name}`;
+}
+function expectedInputWritable(purpose, name) {
+    return purpose === "improve" && name === "candidate";
+}
 function expectedOutputForPurpose(purpose) {
     if (purpose === "improve") {
-        return "subject_patch";
+        return "candidate_patch";
     }
     if (purpose === "attempt") {
         return "result";
@@ -140,24 +152,24 @@ export function assertWorkbenchExecutionIsolation(execution) {
 }
 function outputAllowedForPurpose(purpose, output) {
     if (purpose === "improve") {
-        return output.schema === "workbench.subject_patch.v1";
+        return output.schema === "workbench.candidate_patch.v1";
     }
     if (purpose === "attempt") {
         return output.schema === "workbench.result.v1";
     }
     return false;
 }
-function normalizeSubjectPatch(value, execution, contract, issues) {
+function normalizeCandidatePatch(value, execution, contract, issues) {
     const record = readRecord(value, contract.name, issues);
     const files = normalizeSnapshotFiles(record?.files, `${contract.name}.files`, issues);
     const fileChanges = normalizeStringArray(record?.fileChanges, `${contract.name}.fileChanges`, issues);
     const edits = normalizeMetadataStringArray(execution.metadata.edits);
     if (edits.length === 0) {
-        issues.push(`Execution ${execution.id} subject patch validation requires metadata.edits.`);
+        issues.push(`Execution ${execution.id} candidate patch validation requires metadata.edits.`);
     }
     for (const file of files) {
         if (!isAllowedEditPath(file.path, edits)) {
-            issues.push(`${contract.name}.files contains path outside optimizer edits: ${file.path}.`);
+            issues.push(`${contract.name}.files contains path outside improve edits: ${file.path}.`);
         }
     }
     for (const fileChange of fileChanges) {
@@ -165,7 +177,7 @@ function normalizeSubjectPatch(value, execution, contract, issues) {
             issues.push(`${contract.name}.fileChanges contains unsafe path ${fileChange}.`);
         }
         else if (!isAllowedEditPath(fileChange, edits)) {
-            issues.push(`${contract.name}.fileChanges contains path outside optimizer edits: ${fileChange}.`);
+            issues.push(`${contract.name}.fileChanges contains path outside improve edits: ${fileChange}.`);
         }
     }
     return {

package/dist/execution-runtime-types.d.ts

@@ -28,7 +28,7 @@ export interface WorkbenchExecutionRuntimeInput {
     runtimeControlOperation?: WorkbenchRuntimeControlOperationSequenceRequest;
 }
 export interface WorkbenchWorkloadStepCommand {
-    kind: "optimizer" | "subject" | "engine";
+    kind: "improver" | "candidate" | "engine";
     label: string;
     operation: WorkbenchAdapterOperation;
     executor: WorkbenchAdapterOperationExecutor;

package/dist/execution-runtime-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-runtime-types.d.ts","sourceRoot":"","sources":["../src/execution-runtime-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iCAAiC,EACjC,kBAAkB,EAClB,IAAI,EACJ,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,gCAAgC,EACjC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EACV,0BAA0B,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,yBAAyB,EACzB,iCAAiC,EACjC,wBAAwB,EACxB,+CAA+C,EAChD,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,8BAA8B;IAC7C,GAAG,EAAE,kBAAkB,CAAC;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,kBAAkB,CAAC,EAAE,IAAI,CAAC,iCAAiC,EAAE,IAAI,GAAG,UAAU,GAAG,YAAY,GAAG,MAAM,CAAC,CAAC;IACxG,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC1C,kBAAkB,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACnD,WAAW,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC5C,YAAY,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC9C,UAAU,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC5C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,SAAS,0BAA0B,EAAE,CAAC;IAC5D,gBAAgB,CAAC,EAAE,SAAS,wBAAwB,EAAE,CAAC;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,gCAAgC,CAAC;IAC5C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uBAAuB,CAAC,EAAE,+CAA+C,CAAC;CAC3E;AAED,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,WAAW,GAAG,SAAS,GAAG,QAAQ,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,yBAAyB,CAAC;IACrC,QAAQ,EAAE,iCAAiC,CAAC;IAC5C,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB"}
+{"version":3,"file":"execution-runtime-types.d.ts","sourceRoot":"","sources":["../src/execution-runtime-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iCAAiC,EACjC,kBAAkB,EAClB,IAAI,EACJ,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,gCAAgC,EACjC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EACV,0BAA0B,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,yBAAyB,EACzB,iCAAiC,EACjC,wBAAwB,EACxB,+CAA+C,EAChD,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,8BAA8B;IAC7C,GAAG,EAAE,kBAAkB,CAAC;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,kBAAkB,CAAC,EAAE,IAAI,CAAC,iCAAiC,EAAE,IAAI,GAAG,UAAU,GAAG,YAAY,GAAG,MAAM,CAAC,CAAC;IACxG,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC1C,kBAAkB,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACnD,WAAW,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC5C,YAAY,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC9C,UAAU,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC5C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,SAAS,0BAA0B,EAAE,CAAC;IAC5D,gBAAgB,CAAC,EAAE,SAAS,wBAAwB,EAAE,CAAC;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,gCAAgC,CAAC;IAC5C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uBAAuB,CAAC,EAAE,+CAA+C,CAAC;CAC3E;AAED,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,UAAU,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,yBAAyB,CAAC;IACrC,QAAQ,EAAE,iCAAiC,CAAC;IAC5C,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB"}

package/dist/execution-traces.js

@@ -140,10 +140,10 @@ export function readWorkbenchExecutionTraceFiles(files) {
 export function traceSessionLabel(filePath, role) {
     const innerPath = traceSessionInnerPath(filePath);
     if (innerPath === "runner/session") {
-        return "Subject runner";
+        return "Candidate run";
     }
-    if (innerPath === "optimizer/session") {
-        return "Optimizer";
+    if (innerPath === "improver/session") {
+        return "Improver";
     }
     const parts = innerPath
         .split("/")
@@ -215,7 +215,7 @@ function traceFilePrefix(filePath, index) {
     return safe || `trace-${index + 1}`;
 }
 function traceFileDisplayOrder(filePath) {
-    if (filePath.includes("/runner/") || filePath.includes("/optimizer/")) {
+    if (filePath.includes("/runner/") || filePath.includes("/improver/")) {
         return 0;
     }
     return 1;
@@ -224,8 +224,8 @@ function traceRoleForFilePath(filePath, purpose, fallbackRole) {
     if (filePath.includes("/runner/")) {
         return "runner";
     }
-    if (filePath.includes("/optimizer/") || purpose === "improve") {
-        return "optimizer";
+    if (filePath.includes("/improver/") || purpose === "improve") {
+        return "improver";
     }
     if (filePath.includes("/engine/")) {
         return "engine";
@@ -236,7 +236,7 @@ function traceSessionInnerPath(filePath) {
     const withoutTraceFile = filePath.replace(/\/trace\.json$/u, "");
     const markerIndexes = [
         withoutTraceFile.indexOf("/runner/"),
-        withoutTraceFile.indexOf("/optimizer/"),
+        withoutTraceFile.indexOf("/improver/"),
         withoutTraceFile.indexOf("/engine/"),
     ].filter((index) => index >= 0);
     const firstMarker = Math.min(...markerIndexes);