@workbench-ai/workbench-core 0.0.67 → 0.0.69

package/dist/execution-scheduler.js

@@ -37,14 +37,17 @@ export async function runWorkbenchExecutionDag(args) {
             throw new Error(`Job ${job.id} has unsupported initial DAG status ${job.status}.`);
         }
         pending.set(job.id, job);
-        args.onJobQueued?.(job);
+        await runJobHook(args.onJobQueued, job);
     }
     while (pending.size > 0 || running.size > 0) {
-        const progressed = startReadyJobs();
+        const progressed = await startReadyJobs();
         if (running.size === 0) {
             if (pending.size === 0) {
                 break;
             }
+            if (await cancelTerminalBlockedPendingJobs()) {
+                continue;
+            }
             const ready = readyPendingJobs();
             if (ready.length > 0) {
                 const blocked = ready[0];
@@ -69,7 +72,7 @@ export async function runWorkbenchExecutionDag(args) {
         startedJobCount,
         cancelledJobCount,
     };
-    function startReadyJobs() {
+    async function startReadyJobs() {
         let progressed = false;
         for (const job of [...pending.values()]) {
             const dependencyStatus = dependencyTerminalStatus(job);
@@ -77,7 +80,7 @@ export async function runWorkbenchExecutionDag(args) {
                 continue;
             }
             if (dependencyStatus !== "ready") {
-                cancelPendingJob(job, dependencyStatus);
+                await cancelPendingJob(job, dependencyStatus);
                 progressed = true;
                 continue;
             }
@@ -97,7 +100,7 @@ export async function runWorkbenchExecutionDag(args) {
             };
             startedJobCount += 1;
             maxConcurrency = Math.max(maxConcurrency, running.size + 1);
-            args.onJobStarted?.(runningJob);
+            await runJobHook(args.onJobStarted, runningJob);
             const promise = finishJob(runningJob, cost);
             running.set(job.id, { cost, promise });
             progressed = true;
@@ -107,6 +110,18 @@ export async function runWorkbenchExecutionDag(args) {
     function readyPendingJobs() {
         return [...pending.values()].filter((job) => dependencyTerminalStatus(job) === "ready");
     }
+    async function cancelTerminalBlockedPendingJobs() {
+        let cancelled = false;
+        for (const job of [...pending.values()]) {
+            const dependencyStatus = dependencyTerminalStatus(job);
+            if (dependencyStatus !== "failed" && dependencyStatus !== "cancelled") {
+                continue;
+            }
+            await cancelPendingJob(job, dependencyStatus);
+            cancelled = true;
+        }
+        return cancelled;
+    }
     function dependencyTerminalStatus(job) {
         const jobDependencies = dependencies.get(job.id) ?? [];
         let blocked = false;
@@ -128,7 +143,7 @@ export async function runWorkbenchExecutionDag(args) {
         }
         return blocked ? "blocked" : "ready";
     }
-    function cancelPendingJob(job, dependencyStatus) {
+    async function cancelPendingJob(job, dependencyStatus) {
         pending.delete(job.id);
         const finishedAt = now();
         const cancelled = {
@@ -141,7 +156,7 @@ export async function runWorkbenchExecutionDag(args) {
         cancelledJobCount += 1;
         terminal.set(job.id, cancelled);
         results.set(job.id, cancelled);
-        args.onJobFinished?.(cancelled);
+        await runJobHook(args.onJobFinished, cancelled);
     }
     async function finishJob(runningJob, cost) {
         let completed;
@@ -164,9 +179,15 @@ export async function runWorkbenchExecutionDag(args) {
         }
         terminal.set(runningJob.id, completed);
         results.set(runningJob.id, completed);
-        args.onJobFinished?.(completed);
+        await runJobHook(args.onJobFinished, completed);
     }
 }
+async function runJobHook(hook, job) {
+    if (!hook) {
+        return;
+    }
+    await hook(job);
+}
 export function workbenchJobDependencies(job) {
     const input = jsonRecord(job.input);
     const dependsOn = input.dependsOn;
@@ -175,7 +196,10 @@ export function workbenchJobDependencies(job) {
         : [];
 }
 export function workbenchJobResources(job) {
-    const resources = jsonRecord(jsonRecord(jsonRecord(job.input).execution).policy).resources;
+    const input = jsonRecord(job.input);
+    const resources = input.kind === "workbench.skill.eval.job.v1"
+        ? input.resources
+        : jsonRecord(jsonRecord(input.execution).policy).resources;
     const record = jsonRecord(resources);
     return {
         cpu: readPositiveResource(record.cpu, job.id, "resources.cpu"),

package/dist/execution-traces.js

@@ -140,7 +140,7 @@ export function readWorkbenchExecutionTraceFiles(files) {
 export function traceSessionLabel(filePath, role) {
     const innerPath = traceSessionInnerPath(filePath);
     if (innerPath === "runner/session") {
-        return "Candidate run";
+        return "Skill run";
     }
     if (innerPath === "improver/session") {
         return "Improver";

package/dist/generic-spec.d.ts

@@ -1,7 +1,5 @@
-import { type EngineResolveBinding, type SurfaceSnapshotFile, type WorkbenchAdapterInvocation, type WorkbenchExecutionNetworkPolicy, type WorkbenchExecutionResources, type WorkbenchSpecValidation } from "@workbench-ai/workbench-contract";
+import type { SurfaceSnapshotFile, WorkbenchAdapterInvocation, WorkbenchExecutionNetworkPolicy, WorkbenchExecutionResources } from "@workbench-ai/workbench-contract";
 import type { WorkbenchEngineCase, WorkbenchEngineCaseSpec } from "@workbench-ai/workbench-protocol";
-export declare const BENCHMARK_SPEC_FILE = "benchmark.yaml";
-export declare const CANDIDATE_SPEC_FILE = "candidate.yaml";
 export interface WorkbenchRuntimeSpec {
     dockerfile: string;
     workdir?: string;
@@ -16,17 +14,10 @@ export interface WorkbenchRuntimeSpec {
 export interface WorkbenchPathRef {
     path: string;
 }
-export interface WorkbenchCandidatePrepareSpec {
+export interface WorkbenchSkillPrepareSpec {
     command: string;
 }
-export interface AuthoredBenchmarkSpec {
-    version: 4;
-    name: string;
-    description: string;
-    adapters: string[];
-    engine: WorkbenchAdapterInvocation;
-}
-export interface WorkbenchCandidateRunSpec extends WorkbenchAdapterInvocation {
+export interface WorkbenchSkillAgentSpec extends WorkbenchAdapterInvocation {
     name: string;
 }
 export interface WorkbenchCaseSelector {
@@ -37,48 +28,21 @@ export interface WorkbenchSelectionSpec {
     metric: string;
     cases?: WorkbenchCaseSelector;
 }
-export interface WorkbenchCandidateImproveSpec extends WorkbenchAdapterInvocation {
-    edits: string[];
-    optimizeOn?: WorkbenchCaseSelector;
-    selectBy?: WorkbenchSelectionSpec;
-}
-export interface WorkbenchCandidateManifestSpec {
-    version: 4;
-    name: string;
-    description?: string;
-    files: WorkbenchPathRef;
-    prepare?: WorkbenchCandidatePrepareSpec;
-    adapters: string[];
-    defaultRun?: string;
-    runs: Record<string, WorkbenchCandidateRunSpec>;
-    improve?: WorkbenchCandidateImproveSpec;
-}
-export interface ResolvedCandidateSpec extends WorkbenchCandidateManifestSpec {
-    selectedRunId: string;
-}
-export interface WorkbenchResolvedSource {
-    version: 4;
-    benchmark: AuthoredBenchmarkSpec;
-    candidate: ResolvedCandidateSpec;
-}
 export interface GenericRunSpec {
     version: 4;
     name: string;
     description: string;
-    benchmark: {
+    eval: {
         name: string;
         description: string;
         engine: WorkbenchAdapterInvocation;
     };
-    candidate: {
+    skill: {
         name: string;
         description?: string;
         files: WorkbenchPathRef;
-        prepare?: WorkbenchCandidatePrepareSpec;
-        defaultRun: string;
-        selectedRunId: string;
-        selectedRunName: string;
-        runs: Record<string, WorkbenchCandidateRunSpec>;
+        prepare?: WorkbenchSkillPrepareSpec;
+        agents: Record<string, WorkbenchSkillAgentSpec>;
         improve?: {
             edits: string[];
             optimizeOn?: WorkbenchCaseSelector;
@@ -101,33 +65,15 @@ export interface ResolvedEngineCaseExecutionConfig {
     run: WorkbenchAdapterInvocation;
 }
 export declare const DEFAULT_EXECUTION_RESOURCES: WorkbenchExecutionResources;
-export declare function validateWorkbenchResolvedSourceYaml(source: string): WorkbenchSpecValidation;
-export declare function resolveWorkbenchResolvedSourceYaml(source: string): GenericRunSpec;
-export declare function engineResolveBindingForSourceYaml(source: string): EngineResolveBinding;
-export declare function engineResolveBindingForSpec(spec: GenericRunSpec): EngineResolveBinding;
-export declare function resolveWorkbenchSourceFiles(args: {
-    benchmarkSource: string;
-    candidateSource: string;
-    runId?: string | null;
-}): GenericRunSpec;
-export declare function parseWorkbenchSourceFiles(args: {
-    benchmarkSource: string;
-    candidateSource?: string;
-    runId?: string | null;
-}): WorkbenchResolvedSource;
-export declare function serializeWorkbenchResolvedSourceYaml(source: WorkbenchResolvedSource): string;
-export declare function isWorkbenchCandidateManifestPath(filePath: string): boolean;
 export declare function resolveEngineCaseExecutionConfig(args: {
     spec: GenericRunSpec;
     engineCase: GenericEngineCaseSpec;
 }): ResolvedEngineCaseExecutionConfig;
-export declare function engineResolveInvocationForSpec(spec: GenericRunSpec): WorkbenchAdapterInvocation;
 export declare function engineCaseFilesForRuntimeInput(args: {
     spec: GenericRunSpec;
     engineCase: WorkbenchEngineCase;
 }): SurfaceSnapshotFile[];
 export declare function engineCasePublicFiles(engineCase: WorkbenchEngineCase): SurfaceSnapshotFile[];
-export declare function engineCasePrivateFiles(engineCase: WorkbenchEngineCase): SurfaceSnapshotFile[];
 export declare function runtimeResources(runtime: WorkbenchRuntimeSpec): WorkbenchExecutionResources;
 export declare function runtimeNetwork(runtime: WorkbenchRuntimeSpec): WorkbenchExecutionNetworkPolicy;
 export declare function runtimeSandboxRef(runtime: WorkbenchRuntimeSpec): string;

package/dist/generic-spec.d.ts.map

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