@workbench-ai/workbench-core 0.0.68 → 0.0.70

package/dist/coded-errors.d.ts

@@ -0,0 +1,27 @@
+import type { Json } from "@workbench-ai/workbench-contract";
+export interface WorkbenchCodedErrorOptions {
+    retryable?: boolean;
+    remediation?: string;
+    subject?: Record<string, Json>;
+    exitCode?: number;
+}
+export declare class WorkbenchUserError extends Error {
+    constructor(message: string);
+}
+export declare class WorkbenchCodedError extends WorkbenchUserError {
+    readonly code: string;
+    readonly retryable: boolean;
+    readonly remediation?: string;
+    readonly subject?: Record<string, Json>;
+    readonly exitCode: number;
+    constructor(code: string, message: string, options?: WorkbenchCodedErrorOptions);
+}
+export declare function codedErrorFromUnknown(error: unknown, fallbackCode?: string): {
+    code: string;
+    message: string;
+    retryable: boolean;
+    remediation?: string;
+    subject?: Record<string, Json>;
+    exitCode: number;
+};
+//# sourceMappingURL=coded-errors.d.ts.map

package/dist/coded-errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"coded-errors.d.ts","sourceRoot":"","sources":["../src/coded-errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAE7D,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,kBAAmB,SAAQ,KAAK;gBAC/B,OAAO,EAAE,MAAM;CAI5B;AAED,qBAAa,mBAAoB,SAAQ,kBAAkB;IACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEd,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,0BAA+B;CAapF;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,SAAa,GAAG;IAChF,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAyBA"}

package/dist/coded-errors.js

@@ -0,0 +1,52 @@
+export class WorkbenchUserError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "WorkbenchUserError";
+    }
+}
+export class WorkbenchCodedError extends WorkbenchUserError {
+    code;
+    retryable;
+    remediation;
+    subject;
+    exitCode;
+    constructor(code, message, options = {}) {
+        super(message);
+        this.name = "WorkbenchCodedError";
+        this.code = code;
+        this.retryable = options.retryable ?? false;
+        if (options.remediation) {
+            this.remediation = options.remediation;
+        }
+        if (options.subject) {
+            this.subject = options.subject;
+        }
+        this.exitCode = options.exitCode ?? 1;
+    }
+}
+export function codedErrorFromUnknown(error, fallbackCode = "internal") {
+    if (error instanceof WorkbenchCodedError) {
+        return {
+            code: error.code,
+            message: error.message,
+            retryable: error.retryable,
+            ...(error.remediation ? { remediation: error.remediation } : {}),
+            ...(error.subject ? { subject: error.subject } : {}),
+            exitCode: error.exitCode,
+        };
+    }
+    if (error instanceof WorkbenchUserError) {
+        return {
+            code: "usage",
+            message: error.message,
+            retryable: false,
+            exitCode: 2,
+        };
+    }
+    return {
+        code: fallbackCode,
+        message: error instanceof Error ? error.message : String(error),
+        retryable: false,
+        exitCode: 1,
+    };
+}

package/dist/execution-events.d.ts

@@ -5,6 +5,7 @@ export interface WorkbenchExecutionProgressTarget {
     ownerUserId?: string;
     flushWindowMs?: number;
     transport?: "http" | "stdout" | "both";
+    appendBatch?: (batch: WorkbenchExecutionEventBatch) => Promise<void>;
 }
 export interface WorkbenchExecutionEventPublisherContext {
     projectId: string;
@@ -45,9 +46,12 @@ export interface WorkbenchProgressStdoutEnvelope {
         batch: WorkbenchExecutionEventBatch;
     };
 }
+export interface PublishWorkbenchProgressStdoutEnvelopeOptions {
+    forwardStdout?: boolean;
+}
 export declare function createWorkbenchProgressStdoutParser(onEnvelope: (envelope: WorkbenchProgressStdoutEnvelope) => void): {
     write(chunk: Buffer | string): void;
     flush(): void;
 };
-export declare function publishWorkbenchProgressStdoutEnvelope(envelope: WorkbenchProgressStdoutEnvelope, expectedTarget?: WorkbenchExecutionProgressTarget): Promise<void>;
+export declare function publishWorkbenchProgressStdoutEnvelope(envelope: WorkbenchProgressStdoutEnvelope, expectedTarget?: WorkbenchExecutionProgressTarget, options?: PublishWorkbenchProgressStdoutEnvelopeOptions): Promise<void>;
 //# sourceMappingURL=execution-events.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"execution-events.d.ts","sourceRoot":"","sources":["../src/execution-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,uBAAuB,EACvB,4BAA4B,EAC5B,6BAA6B,EAC9B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,gCAAgC;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,uCAAuC;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,gCAAgC,CAAC;CAC3C;AAED,MAAM,WAAW,4BAA4B;IAC3C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,6BAA6B,CAAC;IACtC,IAAI,CAAC,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC1C,OAAO,EAAE,IAAI,CAAC;CACf;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,MAAM,EAAE,SAAS,4BAA4B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,eAAO,MAAM,gCAAgC,2BAA2B,CAAC;AAEzE,wBAAgB,sCAAsC,CACpD,OAAO,EAAE,uCAAuC,GAC/C,gCAAgC,CAsClC;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,gCAAgC,GAAG,SAAS,EACvD,IAAI,EAAE;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC3C,IAAI,CAAC,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACA,OAAO,CAAC,IAAI,CAAC,CAef;AAyCD,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,MAAM,EAAE,kCAAkC,CAAC;QAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,4BAA4B,CAAC;KACrC,CAAC;CACH;AAED,wBAAgB,mCAAmC,CACjD,UAAU,EAAE,CAAC,QAAQ,EAAE,+BAA+B,KAAK,IAAI,GAC9D;IACD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACpC,KAAK,IAAI,IAAI,CAAC;CACf,CA0DA;AAED,wBAAsB,sCAAsC,CAC1D,QAAQ,EAAE,+BAA+B,EACzC,cAAc,CAAC,EAAE,gCAAgC,GAChD,OAAO,CAAC,IAAI,CAAC,CAiBf"}
+{"version":3,"file":"execution-events.d.ts","sourceRoot":"","sources":["../src/execution-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,uBAAuB,EACvB,4BAA4B,EAC5B,6BAA6B,EAC9B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,gCAAgC;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IACvC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,4BAA4B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,uCAAuC;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,gCAAgC,CAAC;CAC3C;AAED,MAAM,WAAW,4BAA4B;IAC3C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,6BAA6B,CAAC;IACtC,IAAI,CAAC,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC1C,OAAO,EAAE,IAAI,CAAC;CACf;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,MAAM,EAAE,SAAS,4BAA4B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,eAAO,MAAM,gCAAgC,2BAA2B,CAAC;AAEzE,wBAAgB,sCAAsC,CACpD,OAAO,EAAE,uCAAuC,GAC/C,gCAAgC,CAsClC;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,gCAAgC,GAAG,SAAS,EACvD,IAAI,EAAE;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC3C,IAAI,CAAC,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACA,OAAO,CAAC,IAAI,CAAC,CAef;AA0CD,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,MAAM,EAAE,kCAAkC,CAAC;QAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,4BAA4B,CAAC;KACrC,CAAC;CACH;AAED,MAAM,WAAW,6CAA6C;IAC5D,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,mCAAmC,CACjD,UAAU,EAAE,CAAC,QAAQ,EAAE,+BAA+B,KAAK,IAAI,GAC9D;IACD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACpC,KAAK,IAAI,IAAI,CAAC;CACf,CA0DA;AAED,wBAAsB,sCAAsC,CAC1D,QAAQ,EAAE,+BAA+B,EACzC,cAAc,CAAC,EAAE,gCAAgC,EACjD,OAAO,GAAE,6CAAkD,GAC1D,OAAO,CAAC,IAAI,CAAC,CA0Bf"}

package/dist/execution-events.js

@@ -75,6 +75,7 @@ function validProgressTarget(target) {
             ? { flushWindowMs: target.flushWindowMs }
             : {}),
         ...(target.transport === "stdout" || target.transport === "both" ? { transport: target.transport } : { transport: "http" }),
+        ...(target.appendBatch ? { appendBatch: target.appendBatch } : {}),
     };
 }
 async function publishProgressBatch(target, batch) {
@@ -147,7 +148,7 @@ export function createWorkbenchProgressStdoutParser(onEnvelope) {
         },
     };
 }
-export async function publishWorkbenchProgressStdoutEnvelope(envelope, expectedTarget) {
+export async function publishWorkbenchProgressStdoutEnvelope(envelope, expectedTarget, options = {}) {
     const target = validProgressTarget(expectedTarget);
     if (!target) {
         await postProgressBody(envelope);
@@ -156,14 +157,23 @@ export async function publishWorkbenchProgressStdoutEnvelope(envelope, expectedT
     if (!progressEnvelopeMatchesTarget(envelope, target)) {
         return;
     }
-    await postProgressBody({
+    if (target.appendBatch) {
+        await target.appendBatch(envelope.body.batch);
+        return;
+    }
+    const deliveredEnvelope = {
         url: target.url,
         body: {
             ...envelope.body,
             ...(target.ownerUserId ? { ownerUserId: target.ownerUserId } : {}),
             leaseToken: target.token,
         },
-    });
+    };
+    if (target.transport === "stdout" && options.forwardStdout === true) {
+        process.stdout.write(`${WORKBENCH_PROGRESS_STDOUT_PREFIX}${JSON.stringify(deliveredEnvelope)}\n`);
+        return;
+    }
+    await postProgressBody(deliveredEnvelope);
 }
 function progressEnvelopeMatchesTarget(envelope, target) {
     return envelope.url === target.url &&

package/dist/execution-scheduler.d.ts

@@ -11,15 +11,16 @@ export interface WorkbenchExecutionDagResult {
     startedJobCount: number;
     cancelledJobCount: number;
 }
+type WorkbenchExecutionDagJobHook = (job: RemoteWorkbenchJob) => void | Promise<void>;
 export interface WorkbenchExecutionDagRunInput {
     jobs: readonly RemoteWorkbenchJob[];
     capacity: WorkbenchExecutionDagCapacity;
     sandboxBackend: WorkbenchSandboxBackendName;
     executeJob: (job: RemoteWorkbenchJob) => Promise<RemoteWorkbenchJob>;
     now?: () => string;
-    onJobQueued?: (job: RemoteWorkbenchJob) => void;
-    onJobStarted?: (job: RemoteWorkbenchJob) => void;
-    onJobFinished?: (job: RemoteWorkbenchJob) => void;
+    onJobQueued?: WorkbenchExecutionDagJobHook;
+    onJobStarted?: WorkbenchExecutionDagJobHook;
+    onJobFinished?: WorkbenchExecutionDagJobHook;
 }
 export declare function runWorkbenchExecutionDag(args: WorkbenchExecutionDagRunInput): Promise<WorkbenchExecutionDagResult>;
 export declare function workbenchJobDependencies(job: RemoteWorkbenchJob): string[];
@@ -28,4 +29,5 @@ export declare function workbenchJobHostCost(job: RemoteWorkbenchJob, backend: W
 export declare function addCapacity(left: WorkbenchExecutionDagCapacity, right: WorkbenchExecutionDagCapacity): WorkbenchExecutionDagCapacity;
 export declare function subtractCapacity(left: WorkbenchExecutionDagCapacity, right: WorkbenchExecutionDagCapacity): WorkbenchExecutionDagCapacity;
 export declare function capacityFits(available: WorkbenchExecutionDagCapacity, cost: WorkbenchExecutionDagCapacity): boolean;
+export {};
 //# sourceMappingURL=execution-scheduler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"execution-scheduler.d.ts","sourceRoot":"","sources":["../src/execution-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,gCAAgC,EACrC,KAAK,2BAA2B,EACjC,MAAM,6BAA6B,CAAC;AAErC,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,kBAAkB,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpC,QAAQ,EAAE,6BAA6B,CAAC;IACxC,cAAc,EAAE,2BAA2B,CAAC;IAC5C,UAAU,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACrE,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAChD,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACnD;AASD,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,6BAA6B,GAClC,OAAO,CAAC,2BAA2B,CAAC,CAuLtC;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAM1E;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,kBAAkB,GACtB,gCAAgC,CAYlC;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,2BAA2B,GACnC,sBAAsB,CAExB;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,6BAA6B,EACnC,KAAK,EAAE,6BAA6B,GACnC,6BAA6B,CAM/B;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,6BAA6B,EACnC,KAAK,EAAE,6BAA6B,GACnC,6BAA6B,CAM/B;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,6BAA6B,EACxC,IAAI,EAAE,6BAA6B,GAClC,OAAO,CAIT"}
+{"version":3,"file":"execution-scheduler.d.ts","sourceRoot":"","sources":["../src/execution-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,gCAAgC,EACrC,KAAK,2BAA2B,EACjC,MAAM,6BAA6B,CAAC;AAErC,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,kBAAkB,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,KAAK,4BAA4B,GAAG,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEtF,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpC,QAAQ,EAAE,6BAA6B,CAAC;IACxC,cAAc,EAAE,2BAA2B,CAAC;IAC5C,UAAU,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACrE,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,4BAA4B,CAAC;IAC3C,YAAY,CAAC,EAAE,4BAA4B,CAAC;IAC5C,aAAa,CAAC,EAAE,4BAA4B,CAAC;CAC9C;AASD,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,6BAA6B,GAClC,OAAO,CAAC,2BAA2B,CAAC,CAuMtC;AAYD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAM1E;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,kBAAkB,GACtB,gCAAgC,CAYlC;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,2BAA2B,GACnC,sBAAsB,CAExB;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,6BAA6B,EACnC,KAAK,EAAE,6BAA6B,GACnC,6BAA6B,CAM/B;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,6BAA6B,EACnC,KAAK,EAAE,6BAA6B,GACnC,6BAA6B,CAM/B;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,6BAA6B,EACxC,IAAI,EAAE,6BAA6B,GAClC,OAAO,CAIT"}

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,8 +179,14 @@ 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);

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 EVAL_SPEC_FILE = "eval.yaml";
-export declare const SKILL_SPEC_FILE = "skill.yaml";
 export interface WorkbenchRuntimeSpec {
     dockerfile: string;
     workdir?: string;
@@ -19,13 +17,6 @@ export interface WorkbenchPathRef {
 export interface WorkbenchSkillPrepareSpec {
     command: string;
 }
-export interface AuthoredEvalSpec {
-    version: 4;
-    name: string;
-    description: string;
-    adapters: string[];
-    engine: WorkbenchAdapterInvocation;
-}
 export interface WorkbenchSkillAgentSpec extends WorkbenchAdapterInvocation {
     name: string;
 }
@@ -37,30 +28,6 @@ export interface WorkbenchSelectionSpec {
     metric: string;
     cases?: WorkbenchCaseSelector;
 }
-export interface WorkbenchSkillImproveSpec extends WorkbenchAdapterInvocation {
-    edits: string[];
-    optimizeOn?: WorkbenchCaseSelector;
-    selectBy?: WorkbenchSelectionSpec;
-}
-export interface WorkbenchSkillManifestSpec {
-    version: 4;
-    name: string;
-    description?: string;
-    files: WorkbenchPathRef;
-    prepare?: WorkbenchSkillPrepareSpec;
-    adapters: string[];
-    defaultAgent?: string;
-    agents: Record<string, WorkbenchSkillAgentSpec>;
-    improve?: WorkbenchSkillImproveSpec;
-}
-export interface ResolvedSkillSpec extends WorkbenchSkillManifestSpec {
-    selectedAgentId: string;
-}
-export interface WorkbenchResolvedSource {
-    version: 4;
-    eval: AuthoredEvalSpec;
-    skill: ResolvedSkillSpec;
-}
 export interface GenericRunSpec {
     version: 4;
     name: string;
@@ -75,9 +42,6 @@ export interface GenericRunSpec {
         description?: string;
         files: WorkbenchPathRef;
         prepare?: WorkbenchSkillPrepareSpec;
-        defaultAgent: string;
-        selectedAgentId: string;
-        selectedAgentName: string;
         agents: Record<string, WorkbenchSkillAgentSpec>;
         improve?: {
             edits: string[];
@@ -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: {
-    evalSource: string;
-    skillSource: string;
-    selectedAgentId?: string | null;
-}): GenericRunSpec;
-export declare function parseWorkbenchSourceFiles(args: {
-    evalSource: string;
-    skillSource?: string;
-    selectedAgentId?: string | null;
-}): WorkbenchResolvedSource;
-export declare function serializeWorkbenchResolvedSourceYaml(source: WorkbenchResolvedSource): string;
-export declare function isWorkbenchSkillManifestPath(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":"AACA,OAAO,EAEL,KAAK,oBAAoB,EAEzB,KAAK,mBAAmB,EACxB,KAAK,0BAA0B,EAC/B,KAAK,+BAA+B,EACpC,KAAK,2BAA2B,EAChC,KAAK,uBAAuB,EAC7B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EACV,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAG1C,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,eAAe,eAAe,CAAC;AAE5C,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE;QACV,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,OAAO,CAAC,EAAE,+BAA+B,CAAC;CAC3C;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,0BAA0B,CAAC;CACpC;AAED,MAAM,WAAW,uBAAwB,SAAQ,0BAA0B;IACzE,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,qBAAqB,CAAC;CAC/B;AAED,MAAM,WAAW,yBAA0B,SAAQ,0BAA0B;IAC3E,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;CACnC;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,gBAAgB,CAAC;IACxB,OAAO,CAAC,EAAE,yBAAyB,CAAC;IACpC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;IAChD,OAAO,CAAC,EAAE,yBAAyB,CAAC;CACrC;AAED,MAAM,WAAW,iBAAkB,SAAQ,0BAA0B;IACnE,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,gBAAgB,CAAC;IACvB,KAAK,EAAE,iBAAiB,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,0BAA0B,CAAC;KACpC,CAAC;IACF,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,EAAE,gBAAgB,CAAC;QACxB,OAAO,CAAC,EAAE,yBAAyB,CAAC;QACpC,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,MAAM,CAAC;QACxB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;QAChD,OAAO,CAAC,EAAE;YACR,KAAK,EAAE,MAAM,EAAE,CAAC;YAChB,UAAU,CAAC,EAAE,qBAAqB,CAAC;YACnC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;SACnC,CAAC;KACH,CAAC;IACF,WAAW,EAAE,oBAAoB,CAAC;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,0BAA0B,CAAC;IACnC,aAAa,EAAE,0BAA0B,CAAC;IAC1C,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,GAAG,EAAE,0BAA0B,CAAC;IAChC,SAAS,EAAE,0BAA0B,CAAC;CACvC;AAED,MAAM,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAC5D,YAAY,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,MAAM,WAAW,iCAAiC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,oBAAoB,CAAC;IAClC,GAAG,EAAE,0BAA0B,CAAC;CACjC;AAQD,eAAO,MAAM,2BAA2B,EAAE,2BAKzC,CAAC;AAEF,wBAAgB,mCAAmC,CACjD,MAAM,EAAE,MAAM,GACb,uBAAuB,CAmBzB;AAED,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,MAAM,GACb,cAAc,CA+BhB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,GACb,oBAAoB,CAEtB;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,cAAc,GACnB,oBAAoB,CAStB;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,GAAG,cAAc,CAMjB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,GAAG,uBAAuB,CAuB1B;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,uBAAuB,GAC9B,MAAM,CAER;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAItE;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE;IACrD,IAAI,EAAE,cAAc,CAAC;IACrB,UAAU,EAAE,qBAAqB,CAAC;CACnC,GAAG,iCAAiC,CAMpC;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,cAAc,GAAG,0BAA0B,CAE/F;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,IAAI,EAAE,cAAc,CAAC;IACrB,UAAU,EAAE,mBAAmB,CAAC;CACjC,GAAG,mBAAmB,EAAE,CAGxB;AAED,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,mBAAmB,GAC9B,mBAAmB,EAAE,CAIvB;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,mBAAmB,GAC9B,mBAAmB,EAAE,CAIvB;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,oBAAoB,GAC5B,2BAA2B,CAiB7B;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,oBAAoB,GAC5B,+BAA+B,CAEjC;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM,CAEvE"}
+{"version":3,"file":"generic-spec.d.ts","sourceRoot":"","sources":["../src/generic-spec.ts"],"names":[],"mappings":"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"}