@workbench-ai/workbench-protocol 0.0.44 → 0.0.45

package/dist/adapter-definition.d.ts

@@ -5,9 +5,9 @@ export interface WorkbenchAdapterDefinition<TContext = unknown> {
     id: string;
     setup?: string[];
     auth?: WorkbenchAdapterAuthManifest;
-    tasks?: WorkbenchAdapterOperationDefinition<TContext>;
-    run?: WorkbenchAdapterOperationDefinition<TContext>;
-    score?: WorkbenchAdapterOperationDefinition<TContext>;
+    engineResolve?: WorkbenchAdapterOperationDefinition<TContext>;
+    engineRun?: WorkbenchAdapterOperationDefinition<TContext>;
+    subject?: WorkbenchAdapterOperationDefinition<TContext>;
     improve?: WorkbenchAdapterOperationDefinition<TContext>;
     slots?: Record<string, WorkbenchAdapterSlotManifest>;
 }
@@ -33,13 +33,14 @@ export interface RunDefinedWorkbenchAdapterOptions<TContext = unknown> {
     runtime?: TContext;
 }
 export declare function defineAdapter<TContext = unknown>(definition: WorkbenchAdapterDefinition<TContext>): WorkbenchAdapterDefinition<TContext>;
-export declare function defineTaskSource<TContext = unknown>(definition?: WorkbenchAdapterOperationDefinition<TContext>): WorkbenchAdapterOperationDefinition<TContext>;
-export declare function defineRunner<TContext = unknown>(definition?: WorkbenchAdapterOperationDefinition<TContext>): WorkbenchAdapterOperationDefinition<TContext>;
-export declare function defineScorer<TContext = unknown>(definition?: WorkbenchAdapterOperationDefinition<TContext>): WorkbenchAdapterOperationDefinition<TContext>;
+export declare function defineEngineResolver<TContext = unknown>(definition?: WorkbenchAdapterOperationDefinition<TContext>): WorkbenchAdapterOperationDefinition<TContext>;
+export declare function defineSubject<TContext = unknown>(definition?: WorkbenchAdapterOperationDefinition<TContext>): WorkbenchAdapterOperationDefinition<TContext>;
+export declare function defineEngineRunner<TContext = unknown>(definition?: WorkbenchAdapterOperationDefinition<TContext>): WorkbenchAdapterOperationDefinition<TContext>;
 export declare function defineOptimizer<TContext = unknown>(definition?: WorkbenchAdapterOperationDefinition<TContext>): WorkbenchAdapterOperationDefinition<TContext>;
 export declare function adapterSlot(path: string, operation: WorkbenchAdapterOperation): WorkbenchAdapterSlotManifest;
 export declare function workbenchAdapterManifestFromDefinition(definition: WorkbenchAdapterDefinition): WorkbenchAdapterManifest;
 export declare function runDefinedAdapter<TContext = unknown>(definition: WorkbenchAdapterDefinition<TContext>, options?: RunDefinedWorkbenchAdapterOptions<TContext>): Promise<WorkbenchAdapterOperationResult | null>;
+export declare function runSubjectFromEngine<TContext = unknown>(context: WorkbenchAdapterHandlerContext<TContext>): Promise<WorkbenchAdapterOperationResult>;
 export declare function operationDefinitionForRequest<TContext = unknown>(definition: WorkbenchAdapterDefinition<TContext>, operation: WorkbenchAdapterOperation): WorkbenchAdapterOperationDefinition<TContext> | undefined;
 export declare function adapterResult<TValue extends WorkbenchAdapterOperationResultValue>(operation: WorkbenchAdapterOperation, value: TValue, metadata?: Omit<WorkbenchAdapterOperationResult<TValue>, "protocol" | "operation" | "value">): WorkbenchAdapterOperationResult<TValue>;
 export declare function adapterSlotInvocation(request: WorkbenchAdapterOperationRequest, slots: Record<string, WorkbenchAdapterSlotManifest> | undefined, name: string): WorkbenchAdapterInvocationLike | null;

package/dist/adapter-definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter-definition.d.ts","sourceRoot":"","sources":["../src/adapter-definition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter-definition.d.ts","sourceRoot":"","sources":["../src/adapter-definition.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EACV,4BAA4B,EAC5B,8BAA8B,EAC9B,wBAAwB,EACxB,yBAAyB,EAEzB,4BAA4B,EAC7B,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAQL,KAAK,gCAAgC,EACrC,KAAK,+BAA+B,EACpC,KAAK,oCAAoC,EAC1C,MAAM,uBAAuB,CAAC;AAI/B,MAAM,WAAW,0BAA0B,CAAC,QAAQ,GAAG,OAAO;IAC5D,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,4BAA4B,CAAC;IACpC,aAAa,CAAC,EAAE,mCAAmC,CAAC,QAAQ,CAAC,CAAC;IAC9D,SAAS,CAAC,EAAE,mCAAmC,CAAC,QAAQ,CAAC,CAAC;IAC1D,OAAO,CAAC,EAAE,mCAAmC,CAAC,QAAQ,CAAC,CAAC;IACxD,OAAO,CAAC,EAAE,mCAAmC,CAAC,QAAQ,CAAC,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;CACtD;AAED,MAAM,WAAW,mCAAmC,CAAC,QAAQ,GAAG,OAAO;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,gCAAgC,CAAC,QAAQ,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,8BAA8B,CAAC,QAAQ,GAAG,OAAO;IAChE,OAAO,EAAE,gCAAgC,CAAC;IAC1C,SAAS,EAAE,yBAAyB,CAAC;IACrC,UAAU,EAAE,gCAAgC,CAAC,YAAY,CAAC,CAAC;IAC3D,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC3B,KAAK,EAAE,gCAAgC,CAAC,OAAO,CAAC,CAAC;IACjD,OAAO,EAAE,QAAQ,CAAC;IAClB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,8BAA8B,GAAG,IAAI,CAAC;IAC1D,MAAM,CAAC,MAAM,SAAS,oCAAoC,EACxD,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,GAC3F,+BAA+B,CAAC,MAAM,CAAC,CAAC;CAC5C;AAED,MAAM,MAAM,gCAAgC,CAAC,QAAQ,GAAG,OAAO,IAAI,CACjE,OAAO,EAAE,8BAA8B,CAAC,QAAQ,CAAC,KAC9C,6BAA6B,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC;AAE5E,MAAM,MAAM,6BAA6B,GACrC,+BAA+B,GAC/B,oCAAoC,GACpC,SAAS,GACT,IAAI,CAAC;AAET,MAAM,WAAW,iCAAiC,CAAC,QAAQ,GAAG,OAAO;IACnE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB;AAED,wBAAgB,aAAa,CAAC,QAAQ,GAAG,OAAO,EAC9C,UAAU,EAAE,0BAA0B,CAAC,QAAQ,CAAC,GAC/C,0BAA0B,CAAC,QAAQ,CAAC,CAEtC;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,GAAG,OAAO,EACrD,UAAU,GAAE,mCAAmC,CAAC,QAAQ,CAAM,GAC7D,mCAAmC,CAAC,QAAQ,CAAC,CAE/C;AAED,wBAAgB,aAAa,CAAC,QAAQ,GAAG,OAAO,EAC9C,UAAU,GAAE,mCAAmC,CAAC,QAAQ,CAAM,GAC7D,mCAAmC,CAAC,QAAQ,CAAC,CAE/C;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,GAAG,OAAO,EACnD,UAAU,GAAE,mCAAmC,CAAC,QAAQ,CAAM,GAC7D,mCAAmC,CAAC,QAAQ,CAAC,CAE/C;AAED,wBAAgB,eAAe,CAAC,QAAQ,GAAG,OAAO,EAChD,UAAU,GAAE,mCAAmC,CAAC,QAAQ,CAAM,GAC7D,mCAAmC,CAAC,QAAQ,CAAC,CAE/C;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,yBAAyB,GACnC,4BAA4B,CAE9B;AAED,wBAAgB,sCAAsC,CACpD,UAAU,EAAE,0BAA0B,GACrC,wBAAwB,CAiB1B;AAED,wBAAsB,iBAAiB,CAAC,QAAQ,GAAG,OAAO,EACxD,UAAU,EAAE,0BAA0B,CAAC,QAAQ,CAAC,EAChD,OAAO,GAAE,iCAAiC,CAAC,QAAQ,CAAM,GACxD,OAAO,CAAC,+BAA+B,GAAG,IAAI,CAAC,CAkCjD;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,GAAG,OAAO,EAC3D,OAAO,EAAE,8BAA8B,CAAC,QAAQ,CAAC,GAChD,OAAO,CAAC,+BAA+B,CAAC,CAuD1C;AAsBD,wBAAgB,6BAA6B,CAAC,QAAQ,GAAG,OAAO,EAC9D,UAAU,EAAE,0BAA0B,CAAC,QAAQ,CAAC,EAChD,SAAS,EAAE,yBAAyB,GACnC,mCAAmC,CAAC,QAAQ,CAAC,GAAG,SAAS,CAc3D;AAED,wBAAgB,aAAa,CAAC,MAAM,SAAS,oCAAoC,EAC/E,SAAS,EAAE,yBAAyB,EACpC,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,WAAW,GAAG,OAAO,CAAM,GAC/F,+BAA+B,CAAC,MAAM,CAAC,CAQzC;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,gCAAgC,EACzC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,GAAG,SAAS,EAC/D,IAAI,EAAE,MAAM,GACX,8BAA8B,GAAG,IAAI,CAOvC"}

package/dist/adapter-definition.js

@@ -1,36 +1,40 @@
 import { promises as fs } from "node:fs";
-import { adapterCommandName, } from "./adapter-manifest.js";
-import { WORKBENCH_ADAPTER_RESULT_PROTOCOL, ensureWorkbenchAdapterOutputDir, readWorkbenchAdapterOperationRequest, workbenchAdapterOperationResultPath, writeWorkbenchAdapterOperationResult, } from "./adapter-protocol.js";
+import { execFile } from "node:child_process";
+import path from "node:path";
+import { promisify } from "node:util";
+import { WORKBENCH_ADAPTER_MANIFEST_PROTOCOL, adapterCommandName, normalizeWorkbenchAdapterOperation, } from "./adapter-manifest.js";
+import { WORKBENCH_ADAPTER_RESULT_PROTOCOL, ensureWorkbenchAdapterOutputDir, assertWorkbenchAdapterOperationResultOk, readWorkbenchAdapterOperationRequest, readWorkbenchAdapterOperationResult, workbenchAdapterOperationResultPath, writeWorkbenchAdapterOperationResult, } from "./adapter-protocol.js";
+const execFileAsync = promisify(execFile);
 export function defineAdapter(definition) {
     return definition;
 }
-export function defineTaskSource(definition = {}) {
+export function defineEngineResolver(definition = {}) {
     return definition;
 }
-export function defineRunner(definition = {}) {
+export function defineSubject(definition = {}) {
     return definition;
 }
-export function defineScorer(definition = {}) {
+export function defineEngineRunner(definition = {}) {
     return definition;
 }
 export function defineOptimizer(definition = {}) {
     return definition;
 }
 export function adapterSlot(path, operation) {
-    return { path, operation };
+    return { path, operation: normalizeWorkbenchAdapterOperation(operation, "adapter slot operation") };
 }
 export function workbenchAdapterManifestFromDefinition(definition) {
     const operations = {};
-    addOperation(operations, definition.id, "tasks.resolve", definition.tasks);
-    addOperation(operations, definition.id, "subject.run", definition.run);
-    addOperation(operations, definition.id, "trial.score", definition.score);
-    addOperation(operations, definition.id, "subject.improve", definition.improve);
+    addOperation(operations, definition.id, "engine.resolve", definition.engineResolve);
+    addOperation(operations, definition.id, "engine.run", definition.engineRun);
+    addOperation(operations, definition.id, "subject.run", definition.subject);
+    addOperation(operations, definition.id, "optimizer.improve", definition.improve);
     if (Object.keys(operations).length === 0) {
         throw new Error(`Adapter ${definition.id} must define at least one operation.`);
     }
     return {
         id: definition.id,
-        protocol: "workbench.adapter.v2",
+        protocol: WORKBENCH_ADAPTER_MANIFEST_PROTOCOL,
         operations,
         setup: definition.setup ? [...definition.setup] : [],
         ...(definition.auth ? { auth: cloneJson(definition.auth) } : {}),
@@ -72,17 +76,82 @@ export async function runDefinedAdapter(definition, options = {}) {
     await writeWorkbenchAdapterOperationResult(request.paths.output, result);
     return result;
 }
+export async function runSubjectFromEngine(context) {
+    if (context.operation !== "engine.run") {
+        throw new Error("runSubjectFromEngine can only be used while handling engine.run.");
+    }
+    const subject = context.request.context?.subject?.run;
+    if (!subject?.command) {
+        throw new Error("engine.run request context.subject.run.command is required to invoke the subject.");
+    }
+    const nestedRoot = path.join(context.paths.output, ".workbench", "internal", "subject-run", safeInternalPathSegment(context.request.id));
+    const nestedOutput = path.join(nestedRoot, "output");
+    const requestPath = path.join(nestedRoot, "request.json");
+    const resultPath = workbenchAdapterOperationResultPath(nestedOutput);
+    const subjectPaths = { ...context.paths };
+    delete subjectPaths.enginePrivate;
+    await fs.mkdir(nestedOutput, { recursive: true });
+    await fs.writeFile(requestPath, `${JSON.stringify({
+        ...context.request,
+        id: `${context.request.id}:subject`,
+        operation: "subject.run",
+        invocation: {
+            use: subject.use,
+            with: subject.with ?? {},
+            ...(subject.auth !== undefined ? { auth: subject.auth } : {}),
+        },
+        ...(context.request.auth !== undefined
+            ? { auth: adapterScopedAuth(context.request.auth, subject.use) }
+            : {}),
+        paths: {
+            ...subjectPaths,
+            output: nestedOutput,
+            result: resultPath,
+        },
+    }, null, 2)}\n`);
+    await execFileAsync("sh", ["-c", subject.command], {
+        cwd: context.paths.cwd ?? context.paths.workspace,
+        env: {
+            ...process.env,
+            WORKBENCH_ADAPTER_REQUEST: requestPath,
+            WORKBENCH_OUTPUT: nestedOutput,
+            WORKBENCH_RESULT: resultPath,
+        },
+        maxBuffer: 10 * 1024 * 1024,
+    });
+    const result = await readWorkbenchAdapterOperationResult(nestedOutput, "subject.run");
+    assertWorkbenchAdapterOperationResultOk(result, `Subject adapter ${subject.use} subject.run`);
+    return result;
+}
+function safeInternalPathSegment(value) {
+    const safe = value.replace(/[^a-z0-9._-]+/giu, "_").replace(/^_+|_+$/gu, "");
+    return safe || "subject";
+}
+function adapterScopedAuth(auth, adapterId) {
+    if (!auth || typeof auth !== "object" || Array.isArray(auth)) {
+        return auth;
+    }
+    const record = cloneJson(auth);
+    const adapters = record.adapters;
+    if (adapters && typeof adapters === "object" && !Array.isArray(adapters)) {
+        const scoped = adapters[adapterId];
+        if (scoped !== undefined) {
+            record.self = scoped;
+        }
+    }
+    return record;
+}
 export function operationDefinitionForRequest(definition, operation) {
-    if (operation === "tasks.resolve") {
-        return definition.tasks;
+    if (operation === "engine.resolve") {
+        return definition.engineResolve;
     }
-    if (operation === "subject.run") {
-        return definition.run;
+    if (operation === "engine.run") {
+        return definition.engineRun;
     }
-    if (operation === "trial.score") {
-        return definition.score;
+    if (operation === "subject.run") {
+        return definition.subject;
     }
-    if (operation === "subject.improve") {
+    if (operation === "optimizer.improve") {
         return definition.improve;
     }
     return undefined;
@@ -90,7 +159,7 @@ export function operationDefinitionForRequest(definition, operation) {
 export function adapterResult(operation, value, metadata = {}) {
     return {
         protocol: WORKBENCH_ADAPTER_RESULT_PROTOCOL,
-        operation,
+        operation: normalizeWorkbenchAdapterOperation(operation, "adapter result operation"),
         ok: true,
         ...metadata,
         value,

package/dist/adapter-manifest.d.ts

@@ -1,12 +1,14 @@
+export declare const WORKBENCH_ADAPTER_MANIFEST_PROTOCOL = "workbench.adapter.v3";
 export interface WorkbenchAdapterManifest {
     id: string;
-    protocol: "workbench.adapter.v2";
+    protocol: typeof WORKBENCH_ADAPTER_MANIFEST_PROTOCOL;
     operations: Partial<Record<WorkbenchAdapterOperation, WorkbenchAdapterOperationManifest>>;
     setup: string[];
     auth?: WorkbenchAdapterAuthManifest;
     slots?: Record<string, WorkbenchAdapterSlotManifest>;
 }
-export type WorkbenchAdapterOperation = "tasks.resolve" | "subject.run" | "trial.score" | "subject.improve";
+export type WorkbenchPrimitiveAdapterOperation = "engine.resolve" | "engine.run" | "subject.run" | "optimizer.improve";
+export type WorkbenchAdapterOperation = WorkbenchPrimitiveAdapterOperation;
 export interface WorkbenchAdapterOperationManifest {
     command: string;
 }
@@ -58,10 +60,7 @@ export declare function collectWorkbenchAdapterOperationRequirements(roots: read
 export declare function collectWorkbenchAdapterOperationIssues(roots: readonly WorkbenchAdapterOperationRequirement[], manifests: readonly WorkbenchAdapterManifest[] | Map<string, WorkbenchAdapterManifest>): string[];
 export declare function assertWorkbenchAdapterOperationSupport(roots: readonly WorkbenchAdapterOperationRequirement[], manifests: readonly WorkbenchAdapterManifest[] | Map<string, WorkbenchAdapterManifest>): void;
 export declare function collectWorkbenchAdapterAuthRequirements(roots: readonly WorkbenchAdapterInvocationLike[], manifests: readonly WorkbenchAdapterManifest[] | Map<string, WorkbenchAdapterManifest>): WorkbenchAdapterAuthRequirement[];
-export declare function withDefaultWorkbenchAdapterAuthProfiles<T extends {
-    improve?: WorkbenchAdapterInvocationLike;
-    run: WorkbenchAdapterInvocationLike;
-    score?: WorkbenchAdapterInvocationLike;
-}>(spec: T, manifests: readonly WorkbenchAdapterManifest[] | Map<string, WorkbenchAdapterManifest>): T;
+export declare function withDefaultWorkbenchAdapterAuthProfiles<T extends Record<string, unknown>>(spec: T, manifests: readonly WorkbenchAdapterManifest[] | Map<string, WorkbenchAdapterManifest>): T;
 export declare function withDefaultWorkbenchAdapterAuth<T extends WorkbenchAdapterInvocationLike>(invocation: T, manifests: readonly WorkbenchAdapterManifest[] | Map<string, WorkbenchAdapterManifest>): T;
+export declare function normalizeWorkbenchAdapterOperation(value: unknown, label: string): WorkbenchAdapterOperation;
 //# sourceMappingURL=adapter-manifest.d.ts.map

package/dist/adapter-manifest.d.ts.map

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

package/dist/adapter-manifest.js

@@ -1,14 +1,16 @@
 import YAML from "yaml";
+export const WORKBENCH_ADAPTER_MANIFEST_PROTOCOL = "workbench.adapter.v3";
 export function adapterCommandName(adapterId) {
     return `workbench-adapter-${adapterId}`;
 }
 export function workbenchAdapterManifestSupportsOperation(manifest, operation) {
-    return manifest.operations[operation] !== undefined;
+    return manifest.operations[normalizeWorkbenchAdapterOperation(operation, "adapter operation")] !== undefined;
 }
 export function workbenchAdapterOperationCommand(manifest, operation) {
-    const operationManifest = manifest.operations[operation];
+    const normalizedOperation = normalizeWorkbenchAdapterOperation(operation, "adapter operation");
+    const operationManifest = manifest.operations[normalizedOperation];
     if (!operationManifest) {
-        throw new Error(`Adapter ${manifest.id} does not implement ${operation}.`);
+        throw new Error(`Adapter ${manifest.id} does not implement ${normalizedOperation}.`);
     }
     return operationManifest.command;
 }
@@ -29,8 +31,8 @@ export function parseWorkbenchAdapterManifest(source, label = "workbench.adapter
     const record = parsed;
     rejectUnknownManifestKeys(record, label, ["id", "protocol", "operations", "setup", "auth", "slots"]);
     const id = readAdapterId(record.id, `${label}.id`);
-    if (record.protocol !== "workbench.adapter.v2") {
-        throw new Error(`${label}.protocol must be workbench.adapter.v2.`);
+    if (record.protocol !== WORKBENCH_ADAPTER_MANIFEST_PROTOCOL) {
+        throw new Error(`${label}.protocol must be ${WORKBENCH_ADAPTER_MANIFEST_PROTOCOL}.`);
     }
     const setup = record.setup === undefined
         ? []
@@ -42,7 +44,7 @@ export function parseWorkbenchAdapterManifest(source, label = "workbench.adapter
     const auth = readAuth(record.auth, `${label}.auth`);
     return {
         id,
-        protocol: "workbench.adapter.v2",
+        protocol: WORKBENCH_ADAPTER_MANIFEST_PROTOCOL,
         operations,
         setup,
         ...(auth ? { auth } : {}),
@@ -61,6 +63,9 @@ function readAdapterOperations(value, label, adapterId) {
         }
         const config = rawConfig;
         rejectUnknownManifestKeys(config, `${label}.${operation}`, ["command"]);
+        if (operations[normalizedOperation]) {
+            throw new Error(`${label} declares ${normalizedOperation} more than once.`);
+        }
         operations[normalizedOperation] = {
             command: config.command === undefined
                 ? adapterCommandName(adapterId)
@@ -116,7 +121,10 @@ export function collectWorkbenchAdapterOperationRequirements(roots, manifests) {
     const collected = [];
     const queue = roots.flatMap((root) => {
         const invocation = normalizeInvocationLike(root.invocation);
-        return invocation ? [{ invocation, operation: root.operation }] : [];
+        return invocation ? [{
+                invocation,
+                operation: normalizeWorkbenchAdapterOperation(root.operation, "adapter operation requirement"),
+            }] : [];
     });
     while (queue.length > 0) {
         const requirement = queue.shift();
@@ -186,15 +194,17 @@ export function collectWorkbenchAdapterAuthRequirements(roots, manifests) {
 export function withDefaultWorkbenchAdapterAuthProfiles(spec, manifests) {
     const manifestById = manifestMap(manifests);
     const clone = cloneJson(spec);
-    if (clone.improve) {
-        clone.improve = withDefaultWorkbenchAdapterAuth(clone.improve, manifestById);
-    }
-    clone.run = withDefaultWorkbenchAdapterAuth(clone.run, manifestById);
-    if (clone.score) {
-        clone.score = withDefaultWorkbenchAdapterAuth(clone.score, manifestById);
-    }
+    applyInvocationDefault(clone, "engine", manifestById);
+    applyInvocationDefault(clone, "run", manifestById);
+    applyInvocationDefault(clone, "improve", manifestById);
     return clone;
 }
+function applyInvocationDefault(record, key, manifestById) {
+    const invocation = normalizeInvocationLike(record[key]);
+    if (invocation) {
+        record[key] = withDefaultWorkbenchAdapterAuth(invocation, manifestById);
+    }
+}
 export function withDefaultWorkbenchAdapterAuth(invocation, manifests) {
     return applyDefaultWorkbenchAdapterAuth(cloneJson(invocation), manifestMap(manifests));
 }
@@ -402,13 +412,16 @@ function readStringArray(value, label) {
     return value.map((entry) => entry.trim());
 }
 function readAdapterOperation(value, label) {
-    if (value === "tasks.resolve" ||
+    return normalizeWorkbenchAdapterOperation(value, label);
+}
+export function normalizeWorkbenchAdapterOperation(value, label) {
+    if (value === "engine.resolve" ||
+        value === "engine.run" ||
         value === "subject.run" ||
-        value === "trial.score" ||
-        value === "subject.improve") {
+        value === "optimizer.improve") {
         return value;
     }
-    throw new Error(`${label} must be tasks.resolve, subject.run, trial.score, or subject.improve.`);
+    throw new Error(`${label} must be engine.resolve, engine.run, subject.run, or optimizer.improve.`);
 }
 function readJsonPointer(value, label) {
     const pointer = readNonEmptyString(value, label);

package/dist/adapter-protocol.d.ts

@@ -1,7 +1,7 @@
-import type { Json, UsageSummary, WorkbenchScorecard, WorkbenchSubjectPatch } from "@workbench-ai/workbench-contract";
-import { type WorkbenchTaskSourceResult } from "./task-source-result.ts";
+import type { Json, UsageSummary, WorkbenchResult, WorkbenchSubjectPatch } from "@workbench-ai/workbench-contract";
+import { type WorkbenchEngineResolveResult } from "./engine-resolve-result.ts";
 import type { WorkbenchAdapterOperation } from "./adapter-manifest.ts";
-export declare const WORKBENCH_ADAPTER_PROTOCOL = "workbench.adapter.v2";
+export declare const WORKBENCH_ADAPTER_PROTOCOL = "workbench.adapter.v3";
 export declare const WORKBENCH_ADAPTER_RESULT_PROTOCOL = "workbench.adapter-result.v1";
 export declare const WORKBENCH_ADAPTER_RESULT_FILE = "workbench-result.json";
 export interface WorkbenchAdapterOperationRequest {
@@ -23,34 +23,39 @@ export interface WorkbenchAdapterOperationRequest {
         subject?: {
             id?: string;
             path?: string;
+            run?: {
+                use: string;
+                with?: Json;
+                auth?: Json;
+                command?: string;
+            };
         };
         optimizer?: {
             edits?: string[];
         };
-        trial?: {
-            trialIndex?: number;
+        attempt?: {
+            attemptIndex?: number;
             sampleIndex?: number;
             caseId?: string;
         };
-        task?: {
-            text?: string;
+        case?: {
+            id?: string;
+            prompt?: string;
         };
     };
     paths: {
         workspace: string;
         output: string;
         result: string;
-        input?: string;
-        task?: string;
+        case?: string;
         traces?: string;
         cwd?: string;
         subject?: string;
-        tests?: string;
+        enginePrivate?: string;
         logs?: string;
-        artifacts?: string;
     };
 }
-export type WorkbenchAdapterOperationResultValue = WorkbenchTaskSourceResult | WorkbenchScorecard | WorkbenchSubjectPatch | Json | null;
+export type WorkbenchAdapterOperationResultValue = WorkbenchEngineResolveResult | WorkbenchResult | WorkbenchSubjectPatch | Json | null;
 export interface WorkbenchAdapterOperationResult<TValue extends WorkbenchAdapterOperationResultValue = WorkbenchAdapterOperationResultValue> {
     protocol: typeof WORKBENCH_ADAPTER_RESULT_PROTOCOL;
     operation: WorkbenchAdapterOperation;

package/dist/adapter-protocol.d.ts.map

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

package/dist/adapter-protocol.js

@@ -1,7 +1,8 @@
 import { promises as fs } from "node:fs";
 import path from "node:path";
-import { normalizeWorkbenchTaskSourceResult, } from "./task-source-result.js";
-export const WORKBENCH_ADAPTER_PROTOCOL = "workbench.adapter.v2";
+import { normalizeWorkbenchEngineResolveResult, } from "./engine-resolve-result.js";
+import { normalizeWorkbenchAdapterOperation, } from "./adapter-manifest.js";
+export const WORKBENCH_ADAPTER_PROTOCOL = "workbench.adapter.v3";
 export const WORKBENCH_ADAPTER_RESULT_PROTOCOL = "workbench.adapter-result.v1";
 export const WORKBENCH_ADAPTER_RESULT_FILE = "workbench-result.json";
 export async function readWorkbenchAdapterOperationRequest(configuredPath) {
@@ -19,6 +20,17 @@ export function normalizeWorkbenchAdapterOperationRequest(value) {
     }
     const invocation = requiredJsonRecord(record.invocation, "adapter request invocation");
     const paths = requiredJsonRecord(record.paths, "adapter request paths");
+    rejectUnknownJsonKeys(paths, "adapter request paths", [
+        "workspace",
+        "cwd",
+        "output",
+        "result",
+        "subject",
+        "case",
+        "traces",
+        "enginePrivate",
+        "logs",
+    ]);
     const operation = requiredOperation(record.operation, "adapter request operation");
     const use = requiredString(invocation.use, "adapter request invocation.use");
     return {
@@ -37,14 +49,12 @@ export function normalizeWorkbenchAdapterOperationRequest(value) {
             workspace: requiredString(paths.workspace, "adapter request paths.workspace"),
             output: requiredString(paths.output, "adapter request paths.output"),
             result: requiredString(paths.result, "adapter request paths.result"),
-            ...(typeof paths.input === "string" ? { input: paths.input } : {}),
-            ...(typeof paths.task === "string" ? { task: paths.task } : {}),
+            ...(typeof paths.case === "string" ? { case: paths.case } : {}),
             ...(typeof paths.traces === "string" ? { traces: paths.traces } : {}),
             ...(typeof paths.cwd === "string" ? { cwd: paths.cwd } : {}),
             ...(typeof paths.subject === "string" ? { subject: paths.subject } : {}),
-            ...(typeof paths.tests === "string" ? { tests: paths.tests } : {}),
+            ...(typeof paths.enginePrivate === "string" ? { enginePrivate: paths.enginePrivate } : {}),
             ...(typeof paths.logs === "string" ? { logs: paths.logs } : {}),
-            ...(typeof paths.artifacts === "string" ? { artifacts: paths.artifacts } : {}),
         },
     };
 }
@@ -70,8 +80,11 @@ export function normalizeWorkbenchAdapterOperationResult(value, operation) {
         throw new Error(`${WORKBENCH_ADAPTER_RESULT_FILE}.protocol must be ${WORKBENCH_ADAPTER_RESULT_PROTOCOL}.`);
     }
     const resultOperation = requiredOperation(record.operation, `${WORKBENCH_ADAPTER_RESULT_FILE}.operation`);
-    if (operation && resultOperation !== operation) {
-        throw new Error(`${WORKBENCH_ADAPTER_RESULT_FILE}.operation must be ${operation}.`);
+    const expectedOperation = operation
+        ? normalizeWorkbenchAdapterOperation(operation, "expected adapter result operation")
+        : undefined;
+    if (expectedOperation && resultOperation !== expectedOperation) {
+        throw new Error(`${WORKBENCH_ADAPTER_RESULT_FILE}.operation must be ${expectedOperation}.`);
     }
     return {
         protocol: WORKBENCH_ADAPTER_RESULT_PROTOCOL,
@@ -92,13 +105,13 @@ export function assertWorkbenchAdapterOperationResultOk(result, label = "Adapter
     throw new Error(`${label} returned ok false${result.summary ? `: ${result.summary}` : "."}`);
 }
 function normalizeOperationResultValue(operation, value) {
-    if (operation === "tasks.resolve") {
-        return normalizeWorkbenchTaskSourceResult(value);
+    if (operation === "engine.resolve") {
+        return normalizeWorkbenchEngineResolveResult(value);
     }
-    if (operation === "trial.score") {
-        return normalizeScorecard(value, `${WORKBENCH_ADAPTER_RESULT_FILE}.value`);
+    if (operation === "engine.run") {
+        return normalizeResult(value, `${WORKBENCH_ADAPTER_RESULT_FILE}.value`);
     }
-    if (operation === "subject.improve") {
+    if (operation === "optimizer.improve") {
         return normalizeSubjectPatch(value, `${WORKBENCH_ADAPTER_RESULT_FILE}.value`);
     }
     if (value === undefined || value === null) {
@@ -112,8 +125,8 @@ function normalizeAdapterRequestContext(value) {
         ...(record.benchmark !== undefined ? { benchmark: normalizeBenchmarkContext(record.benchmark) } : {}),
         ...(record.subject !== undefined ? { subject: normalizeSubjectContext(record.subject) } : {}),
         ...(record.optimizer !== undefined ? { optimizer: normalizeOptimizerContext(record.optimizer) } : {}),
-        ...(record.trial !== undefined ? { trial: normalizeTrialContext(record.trial) } : {}),
-        ...(record.task !== undefined ? { task: normalizeTaskContext(record.task) } : {}),
+        ...(record.attempt !== undefined ? { attempt: normalizeAttemptContext(record.attempt) } : {}),
+        ...(record.case !== undefined ? { case: normalizeCaseContext(record.case) } : {}),
     };
 }
 function normalizeBenchmarkContext(value) {
@@ -128,6 +141,17 @@ function normalizeSubjectContext(value) {
     return {
         ...(typeof record.id === "string" ? { id: record.id } : {}),
         ...(typeof record.path === "string" ? { path: record.path } : {}),
+        ...(record.run !== undefined ? { run: normalizeContextInvocation(record.run, "adapter request context.subject.run") } : {}),
+    };
+}
+function normalizeContextInvocation(value, label) {
+    const record = requiredJsonRecord(value, label);
+    const use = requiredString(record.use, `${label}.use`);
+    return {
+        use,
+        with: record.with !== undefined ? record.with : {},
+        ...(record.auth !== undefined ? { auth: record.auth } : {}),
+        ...(typeof record.command === "string" && record.command.trim() ? { command: record.command } : {}),
     };
 }
 function normalizeOptimizerContext(value) {
@@ -138,21 +162,22 @@ function normalizeOptimizerContext(value) {
             : [],
     };
 }
-function normalizeTrialContext(value) {
-    const record = requiredJsonRecord(value, "adapter request context.trial");
+function normalizeAttemptContext(value) {
+    const record = requiredJsonRecord(value, "adapter request context.attempt");
     return {
-        ...(typeof record.trialIndex === "number" ? { trialIndex: record.trialIndex } : {}),
+        ...(typeof record.attemptIndex === "number" ? { attemptIndex: record.attemptIndex } : {}),
         ...(typeof record.sampleIndex === "number" ? { sampleIndex: record.sampleIndex } : {}),
         ...(typeof record.caseId === "string" ? { caseId: record.caseId } : {}),
     };
 }
-function normalizeTaskContext(value) {
-    const record = requiredJsonRecord(value, "adapter request context.task");
+function normalizeCaseContext(value) {
+    const record = requiredJsonRecord(value, "adapter request context.case");
     return {
-        ...(typeof record.text === "string" ? { text: record.text } : {}),
+        ...(typeof record.id === "string" ? { id: record.id } : {}),
+        ...(typeof record.prompt === "string" ? { prompt: record.prompt } : {}),
     };
 }
-function normalizeScorecard(value, label) {
+function normalizeResult(value, label) {
     const record = requiredJsonRecord(value, label);
     if (typeof record.score !== "number" || !Number.isFinite(record.score)) {
         throw new Error(`${label}.score must be a finite number.`);
@@ -198,14 +223,15 @@ function requiredJsonRecord(value, label) {
     }
     return value;
 }
-function requiredOperation(value, label) {
-    if (value === "tasks.resolve" ||
-        value === "subject.run" ||
-        value === "trial.score" ||
-        value === "subject.improve") {
-        return value;
+function rejectUnknownJsonKeys(record, label, allowed) {
+    const allowedSet = new Set(allowed);
+    const unknown = Object.keys(record).filter((key) => !allowedSet.has(key));
+    if (unknown.length > 0) {
+        throw new Error(`${label} includes unsupported fields: ${unknown.join(", ")}.`);
     }
-    throw new Error(`${label} must be tasks.resolve, subject.run, trial.score, or subject.improve.`);
+}
+function requiredOperation(value, label) {
+    return normalizeWorkbenchAdapterOperation(value, label);
 }
 function requiredString(value, label) {
     if (typeof value !== "string" || value.length === 0) {

package/dist/engine-resolve-result.d.ts

@@ -0,0 +1,31 @@
+import type { SurfaceSnapshotFile, WorkbenchExecutionNetworkPolicy, WorkbenchExecutionResources } from "@workbench-ai/workbench-contract";
+export interface WorkbenchEngineCaseEnvironmentSpec {
+    dockerfile?: string;
+    workdir?: string;
+    resources?: Partial<WorkbenchExecutionResources>;
+    network?: WorkbenchExecutionNetworkPolicy;
+}
+export interface WorkbenchEngineCaseSpec {
+    version: 3;
+    prompt: string;
+    environment?: WorkbenchEngineCaseEnvironmentSpec;
+}
+export interface WorkbenchEngineCaseFiles {
+    subjectVisible?: SurfaceSnapshotFile[];
+    enginePrivate?: SurfaceSnapshotFile[];
+    source?: SurfaceSnapshotFile[];
+}
+export interface WorkbenchEngineCase {
+    id: string;
+    case: WorkbenchEngineCaseSpec;
+    files: WorkbenchEngineCaseFiles;
+}
+export interface WorkbenchEngineResolveResult {
+    cases: WorkbenchEngineCase[];
+    environment?: WorkbenchEngineCaseEnvironmentSpec;
+}
+export declare function normalizeWorkbenchEngineResolveResult(value: unknown, label?: string): WorkbenchEngineResolveResult;
+export declare function normalizeWorkbenchEngineCase(value: unknown, label: string): WorkbenchEngineCase;
+export declare function normalizeWorkbenchEngineCaseFiles(value: unknown, label: string): WorkbenchEngineCaseFiles;
+export declare function normalizeWorkbenchEngineCaseSpec(value: unknown, label: string): WorkbenchEngineCaseSpec;
+//# sourceMappingURL=engine-resolve-result.d.ts.map

package/dist/engine-resolve-result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"engine-resolve-result.d.ts","sourceRoot":"","sources":["../src/engine-resolve-result.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,mBAAmB,EACnB,+BAA+B,EAC/B,2BAA2B,EAC5B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,kCAAkC;IACjD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACjD,OAAO,CAAC,EAAE,+BAA+B,CAAC;CAC3C;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,kCAAkC,CAAC;CAClD;AAED,MAAM,WAAW,wBAAwB;IACvC,cAAc,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACvC,aAAa,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,uBAAuB,CAAC;IAC9B,KAAK,EAAE,wBAAwB,CAAC;CACjC;AAED,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC7B,WAAW,CAAC,EAAE,kCAAkC,CAAC;CAClD;AAED,wBAAgB,qCAAqC,CACnD,KAAK,EAAE,OAAO,EACd,KAAK,SAA0B,GAC9B,4BAA4B,CAkB9B;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,GACZ,mBAAmB,CAWrB;AAED,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,GACZ,wBAAwB,CAc1B;AAED,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,GACZ,uBAAuB,CAezB"}

package/dist/{task-source-result.js → engine-resolve-result.js}

@@ -1,63 +1,69 @@
 import path from "node:path";
-export function normalizeWorkbenchTaskSourceResult(value, label = "tasks.resolve result") {
+export function normalizeWorkbenchEngineResolveResult(value, label = "engine.resolve result") {
     const record = requiredRecord(value, label);
-    if (!Array.isArray(record.tasks)) {
-        throw new Error(`${label}.tasks must be an array.`);
+    if (!Array.isArray(record.cases)) {
+        throw new Error(`${label}.cases must be an array.`);
     }
-    const tasks = record.tasks.map((entry, index) => normalizeWorkbenchTaskBundle(entry, `${label}.tasks[${index}]`));
-    const duplicate = firstDuplicate(tasks.map((task) => task.id));
+    const cases = record.cases.map((entry, index) => normalizeWorkbenchEngineCase(entry, `${label}.cases[${index}]`));
+    const duplicate = firstDuplicate(cases.map((engineCase) => engineCase.id));
     if (duplicate) {
-        throw new Error(`${label} contains duplicate task id: ${duplicate}`);
+        throw new Error(`${label} contains duplicate case id: ${duplicate}`);
     }
     return {
-        tasks,
+        cases,
         ...(record.environment !== undefined
-            ? { environment: normalizeTaskEnvironment(record.environment, `${label}.environment`) }
+            ? { environment: normalizeCaseEnvironment(record.environment, `${label}.environment`) }
             : {}),
     };
 }
-export function normalizeWorkbenchTaskBundle(value, label) {
+export function normalizeWorkbenchEngineCase(value, label) {
     const record = requiredRecord(value, label);
+    rejectUnknownKeys(record, label, ["id", "case", "files"]);
     if (typeof record.id !== "string" || record.id.trim().length === 0) {
         throw new Error(`${label}.id must be a non-empty string.`);
     }
     return {
         id: normalizeRelativePath(record.id, `${label}.id`),
-        task: normalizeWorkbenchTaskSpec(record.task, `${label}.task`),
-        publicFiles: normalizeTaskSourceFiles(record.publicFiles, `${label}.publicFiles`),
-        testFiles: normalizeTaskSourceFiles(record.testFiles, `${label}.testFiles`),
-        ...(record.solutionFiles !== undefined
-            ? { solutionFiles: normalizeTaskSourceFiles(record.solutionFiles, `${label}.solutionFiles`) }
+        case: normalizeWorkbenchEngineCaseSpec(record.case, `${label}.case`),
+        files: normalizeWorkbenchEngineCaseFiles(record.files, `${label}.files`),
+    };
+}
+export function normalizeWorkbenchEngineCaseFiles(value, label) {
+    const record = requiredRecord(value, label);
+    rejectUnknownKeys(record, label, ["subjectVisible", "enginePrivate", "source"]);
+    return {
+        ...(record.subjectVisible !== undefined
+            ? { subjectVisible: normalizeEngineResolveFiles(record.subjectVisible, `${label}.subjectVisible`) }
             : {}),
-        ...(record.sourceFiles !== undefined
-            ? { sourceFiles: normalizeTaskSourceFiles(record.sourceFiles, `${label}.sourceFiles`) }
+        ...(record.enginePrivate !== undefined
+            ? { enginePrivate: normalizeEngineResolveFiles(record.enginePrivate, `${label}.enginePrivate`) }
+            : {}),
+        ...(record.source !== undefined
+            ? { source: normalizeEngineResolveFiles(record.source, `${label}.source`) }
             : {}),
     };
 }
-export function normalizeWorkbenchTaskSpec(value, label) {
+export function normalizeWorkbenchEngineCaseSpec(value, label) {
     const record = requiredRecord(value, label);
-    if (record.version !== 2) {
-        throw new Error(`${label}.version must be 2.`);
+    if (record.version !== 3) {
+        throw new Error(`${label}.version must be 3.`);
     }
-    if (typeof record.task !== "string" || record.task.trim().length === 0) {
-        throw new Error(`${label}.task must be a non-empty string.`);
+    if (typeof record.prompt !== "string" || record.prompt.trim().length === 0) {
+        throw new Error(`${label}.prompt must be a non-empty string.`);
     }
     return {
-        version: 2,
-        task: record.task,
+        version: 3,
+        prompt: record.prompt,
         ...(record.environment !== undefined
-            ? { environment: normalizeTaskEnvironment(record.environment, `${label}.environment`) }
-            : {}),
-        ...(record.score !== undefined
-            ? { score: normalizeAdapterInvocation(record.score, `${label}.score`) }
+            ? { environment: normalizeCaseEnvironment(record.environment, `${label}.environment`) }
             : {}),
     };
 }
-function normalizeTaskEnvironment(value, label) {
+function normalizeCaseEnvironment(value, label) {
     const record = requiredRecord(value, label);
     const resources = record.resources === undefined
         ? undefined
-        : normalizeTaskResources(record.resources, `${label}.resources`);
+        : normalizeCaseResources(record.resources, `${label}.resources`);
     const network = record.network === undefined
         ? undefined
         : normalizeNetworkPolicy(record.network, `${label}.network`);
@@ -72,7 +78,7 @@ function normalizeTaskEnvironment(value, label) {
         ...(network ? { network } : {}),
     };
 }
-function normalizeTaskResources(value, label) {
+function normalizeCaseResources(value, label) {
     const record = requiredRecord(value, label);
     return {
         ...(typeof record.cpu === "number" ? { cpu: record.cpu } : {}),
@@ -95,18 +101,7 @@ function normalizeNetworkPolicy(value, label) {
             : {}),
     };
 }
-function normalizeAdapterInvocation(value, label) {
-    const record = requiredRecord(value, label);
-    if (typeof record.use !== "string" || record.use.trim().length === 0) {
-        throw new Error(`${label}.use must be a non-empty string.`);
-    }
-    return {
-        use: record.use,
-        with: record.with === undefined ? {} : record.with,
-        ...(record.auth !== undefined ? { auth: record.auth } : {}),
-    };
-}
-function normalizeTaskSourceFiles(value, label) {
+function normalizeEngineResolveFiles(value, label) {
     if (value === undefined) {
         return [];
     }
@@ -138,7 +133,7 @@ function normalizeRelativePath(filePath, label) {
         throw new Error(`${label} must be a non-empty relative path.`);
     }
     if (normalized === ".." || normalized.startsWith("../") || path.posix.isAbsolute(normalized)) {
-        throw new Error(`${label} must not escape the task-source result.`);
+        throw new Error(`${label} must not escape the engine-resolve result.`);
     }
     return normalized;
 }
@@ -148,6 +143,13 @@ function requiredRecord(value, label) {
     }
     return value;
 }
+function rejectUnknownKeys(record, label, allowed) {
+    const allowedSet = new Set(allowed);
+    const unknown = Object.keys(record).filter((key) => !allowedSet.has(key));
+    if (unknown.length > 0) {
+        throw new Error(`${label} includes unsupported fields: ${unknown.join(", ")}.`);
+    }
+}
 function firstDuplicate(values) {
     const seen = new Set();
     for (const value of values) {

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export { adapterCommandName, assertWorkbenchAdapterOperationSupport, cloneWorkbenchAdapterManifest, collectWorkbenchAdapterAuthRequirements, collectWorkbenchAdapterInvocations, collectWorkbenchAdapterOperationIssues, collectWorkbenchAdapterOperationRequirements, parseWorkbenchAdapterManifest, workbenchAdapterManifestSupportsOperation, workbenchAdapterOperationCommand, workbenchAdapterManifestRequiresAuth, withDefaultWorkbenchAdapterAuth, withDefaultWorkbenchAdapterAuthProfiles, type WorkbenchAdapterOperation, type WorkbenchAdapterOperationManifest, type WorkbenchAdapterSlotManifest, type WorkbenchAdapterAuthEnvManifest, type WorkbenchAdapterAuthFileManifest, type WorkbenchAdapterAuthManifest, type WorkbenchAdapterAuthMethodManifest, type WorkbenchAdapterAuthRequirement, type WorkbenchAdapterInvocationLike, type WorkbenchAdapterManifest, type WorkbenchAdapterOperationRequirement, } from "./adapter-manifest.ts";
+export { WORKBENCH_ADAPTER_MANIFEST_PROTOCOL, adapterCommandName, assertWorkbenchAdapterOperationSupport, cloneWorkbenchAdapterManifest, collectWorkbenchAdapterAuthRequirements, collectWorkbenchAdapterInvocations, collectWorkbenchAdapterOperationIssues, collectWorkbenchAdapterOperationRequirements, parseWorkbenchAdapterManifest, normalizeWorkbenchAdapterOperation, workbenchAdapterManifestSupportsOperation, workbenchAdapterOperationCommand, workbenchAdapterManifestRequiresAuth, withDefaultWorkbenchAdapterAuth, withDefaultWorkbenchAdapterAuthProfiles, type WorkbenchPrimitiveAdapterOperation, type WorkbenchAdapterOperation, type WorkbenchAdapterOperationManifest, type WorkbenchAdapterSlotManifest, type WorkbenchAdapterAuthEnvManifest, type WorkbenchAdapterAuthFileManifest, type WorkbenchAdapterAuthManifest, type WorkbenchAdapterAuthMethodManifest, type WorkbenchAdapterAuthRequirement, type WorkbenchAdapterInvocationLike, type WorkbenchAdapterManifest, type WorkbenchAdapterOperationRequirement, } from "./adapter-manifest.ts";
 export { WORKBENCH_ADAPTER_PROTOCOL, WORKBENCH_ADAPTER_RESULT_FILE, WORKBENCH_ADAPTER_RESULT_PROTOCOL, assertWorkbenchAdapterOperationResultOk, ensureWorkbenchAdapterOutputDir, normalizeWorkbenchAdapterOperationRequest, normalizeWorkbenchAdapterOperationResult, readWorkbenchAdapterOperationRequest, readWorkbenchAdapterOperationResult, workbenchAdapterOperationResultPath, writeWorkbenchAdapterOperationResult, type WorkbenchAdapterOperationRequest, type WorkbenchAdapterOperationResult, type WorkbenchAdapterOperationResultValue, } from "./adapter-protocol.ts";
-export { normalizeWorkbenchTaskBundle, normalizeWorkbenchTaskSourceResult, normalizeWorkbenchTaskSpec, type WorkbenchTaskBundle, type WorkbenchTaskEnvironmentSpec, type WorkbenchTaskSourceResult, type WorkbenchTaskSpec, } from "./task-source-result.ts";
-export { adapterResult, adapterSlot, adapterSlotInvocation, defineAdapter, defineOptimizer, defineRunner, defineScorer, defineTaskSource, operationDefinitionForRequest, runDefinedAdapter, workbenchAdapterManifestFromDefinition, type WorkbenchAdapterDefinition, type WorkbenchAdapterHandlerContext, type WorkbenchAdapterHandlerReturn, type WorkbenchAdapterOperationDefinition, type WorkbenchAdapterOperationHandler, type RunDefinedWorkbenchAdapterOptions, } from "./adapter-definition.ts";
+export { normalizeWorkbenchEngineCase, normalizeWorkbenchEngineCaseFiles, normalizeWorkbenchEngineCaseSpec, normalizeWorkbenchEngineResolveResult, type WorkbenchEngineCase, type WorkbenchEngineCaseFiles, type WorkbenchEngineCaseEnvironmentSpec, type WorkbenchEngineCaseSpec, type WorkbenchEngineResolveResult, } from "./engine-resolve-result.ts";
+export { adapterResult, adapterSlot, adapterSlotInvocation, defineAdapter, defineEngineResolver, defineSubject, defineEngineRunner, defineOptimizer, operationDefinitionForRequest, runSubjectFromEngine, runDefinedAdapter, workbenchAdapterManifestFromDefinition, type WorkbenchAdapterDefinition, type WorkbenchAdapterHandlerContext, type WorkbenchAdapterHandlerReturn, type WorkbenchAdapterOperationDefinition, type WorkbenchAdapterOperationHandler, type RunDefinedWorkbenchAdapterOptions, } from "./adapter-definition.ts";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,sCAAsC,EACtC,6BAA6B,EAC7B,uCAAuC,EACvC,kCAAkC,EAClC,sCAAsC,EACtC,4CAA4C,EAC5C,6BAA6B,EAC7B,yCAAyC,EACzC,gCAAgC,EAChC,oCAAoC,EACpC,+BAA+B,EAC/B,uCAAuC,EACvC,KAAK,yBAAyB,EAC9B,KAAK,iCAAiC,EACtC,KAAK,4BAA4B,EACjC,KAAK,+BAA+B,EACpC,KAAK,gCAAgC,EACrC,KAAK,4BAA4B,EACjC,KAAK,kCAAkC,EACvC,KAAK,+BAA+B,EACpC,KAAK,8BAA8B,EACnC,KAAK,wBAAwB,EAC7B,KAAK,oCAAoC,GAC1C,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,EAC7B,iCAAiC,EACjC,uCAAuC,EACvC,+BAA+B,EAC/B,yCAAyC,EACzC,wCAAwC,EACxC,oCAAoC,EACpC,mCAAmC,EACnC,mCAAmC,EACnC,oCAAoC,EACpC,KAAK,gCAAgC,EACrC,KAAK,+BAA+B,EACpC,KAAK,oCAAoC,GAC1C,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,4BAA4B,EAC5B,kCAAkC,EAClC,0BAA0B,EAC1B,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,yBAAyB,EAC9B,KAAK,iBAAiB,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,aAAa,EACb,WAAW,EACX,qBAAqB,EACrB,aAAa,EACb,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,6BAA6B,EAC7B,iBAAiB,EACjB,sCAAsC,EACtC,KAAK,0BAA0B,EAC/B,KAAK,8BAA8B,EACnC,KAAK,6BAA6B,EAClC,KAAK,mCAAmC,EACxC,KAAK,gCAAgC,EACrC,KAAK,iCAAiC,GACvC,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EACnC,kBAAkB,EAClB,sCAAsC,EACtC,6BAA6B,EAC7B,uCAAuC,EACvC,kCAAkC,EAClC,sCAAsC,EACtC,4CAA4C,EAC5C,6BAA6B,EAC7B,kCAAkC,EAClC,yCAAyC,EACzC,gCAAgC,EAChC,oCAAoC,EACpC,+BAA+B,EAC/B,uCAAuC,EACvC,KAAK,kCAAkC,EACvC,KAAK,yBAAyB,EAC9B,KAAK,iCAAiC,EACtC,KAAK,4BAA4B,EACjC,KAAK,+BAA+B,EACpC,KAAK,gCAAgC,EACrC,KAAK,4BAA4B,EACjC,KAAK,kCAAkC,EACvC,KAAK,+BAA+B,EACpC,KAAK,8BAA8B,EACnC,KAAK,wBAAwB,EAC7B,KAAK,oCAAoC,GAC1C,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,EAC7B,iCAAiC,EACjC,uCAAuC,EACvC,+BAA+B,EAC/B,yCAAyC,EACzC,wCAAwC,EACxC,oCAAoC,EACpC,mCAAmC,EACnC,mCAAmC,EACnC,oCAAoC,EACpC,KAAK,gCAAgC,EACrC,KAAK,+BAA+B,EACpC,KAAK,oCAAoC,GAC1C,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,4BAA4B,EAC5B,iCAAiC,EACjC,gCAAgC,EAChC,qCAAqC,EACrC,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC7B,KAAK,kCAAkC,EACvC,KAAK,uBAAuB,EAC5B,KAAK,4BAA4B,GAClC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,aAAa,EACb,WAAW,EACX,qBAAqB,EACrB,aAAa,EACb,oBAAoB,EACpB,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,6BAA6B,EAC7B,oBAAoB,EACpB,iBAAiB,EACjB,sCAAsC,EACtC,KAAK,0BAA0B,EAC/B,KAAK,8BAA8B,EACnC,KAAK,6BAA6B,EAClC,KAAK,mCAAmC,EACxC,KAAK,gCAAgC,EACrC,KAAK,iCAAiC,GACvC,MAAM,yBAAyB,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
-export { adapterCommandName, assertWorkbenchAdapterOperationSupport, cloneWorkbenchAdapterManifest, collectWorkbenchAdapterAuthRequirements, collectWorkbenchAdapterInvocations, collectWorkbenchAdapterOperationIssues, collectWorkbenchAdapterOperationRequirements, parseWorkbenchAdapterManifest, workbenchAdapterManifestSupportsOperation, workbenchAdapterOperationCommand, workbenchAdapterManifestRequiresAuth, withDefaultWorkbenchAdapterAuth, withDefaultWorkbenchAdapterAuthProfiles, } from "./adapter-manifest.js";
+export { WORKBENCH_ADAPTER_MANIFEST_PROTOCOL, adapterCommandName, assertWorkbenchAdapterOperationSupport, cloneWorkbenchAdapterManifest, collectWorkbenchAdapterAuthRequirements, collectWorkbenchAdapterInvocations, collectWorkbenchAdapterOperationIssues, collectWorkbenchAdapterOperationRequirements, parseWorkbenchAdapterManifest, normalizeWorkbenchAdapterOperation, workbenchAdapterManifestSupportsOperation, workbenchAdapterOperationCommand, workbenchAdapterManifestRequiresAuth, withDefaultWorkbenchAdapterAuth, withDefaultWorkbenchAdapterAuthProfiles, } from "./adapter-manifest.js";
 export { WORKBENCH_ADAPTER_PROTOCOL, WORKBENCH_ADAPTER_RESULT_FILE, WORKBENCH_ADAPTER_RESULT_PROTOCOL, assertWorkbenchAdapterOperationResultOk, ensureWorkbenchAdapterOutputDir, normalizeWorkbenchAdapterOperationRequest, normalizeWorkbenchAdapterOperationResult, readWorkbenchAdapterOperationRequest, readWorkbenchAdapterOperationResult, workbenchAdapterOperationResultPath, writeWorkbenchAdapterOperationResult, } from "./adapter-protocol.js";
-export { normalizeWorkbenchTaskBundle, normalizeWorkbenchTaskSourceResult, normalizeWorkbenchTaskSpec, } from "./task-source-result.js";
-export { adapterResult, adapterSlot, adapterSlotInvocation, defineAdapter, defineOptimizer, defineRunner, defineScorer, defineTaskSource, operationDefinitionForRequest, runDefinedAdapter, workbenchAdapterManifestFromDefinition, } from "./adapter-definition.js";
+export { normalizeWorkbenchEngineCase, normalizeWorkbenchEngineCaseFiles, normalizeWorkbenchEngineCaseSpec, normalizeWorkbenchEngineResolveResult, } from "./engine-resolve-result.js";
+export { adapterResult, adapterSlot, adapterSlotInvocation, defineAdapter, defineEngineResolver, defineSubject, defineEngineRunner, defineOptimizer, operationDefinitionForRequest, runSubjectFromEngine, runDefinedAdapter, workbenchAdapterManifestFromDefinition, } from "./adapter-definition.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workbench-ai/workbench-protocol",
-  "version": "0.0.44",
+  "version": "0.0.45",
   "type": "module",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "yaml": "^2.8.2",
-    "@workbench-ai/workbench-contract": "0.0.44"
+    "@workbench-ai/workbench-contract": "0.0.45"
   },
   "devDependencies": {
     "@types/node": "^24.3.1",

package/dist/task-source-result.d.ts

@@ -1,29 +0,0 @@
-import type { SurfaceSnapshotFile, WorkbenchAdapterInvocation, WorkbenchExecutionNetworkPolicy, WorkbenchExecutionResources } from "@workbench-ai/workbench-contract";
-export interface WorkbenchTaskEnvironmentSpec {
-    dockerfile?: string;
-    workdir?: string;
-    resources?: Partial<WorkbenchExecutionResources>;
-    network?: WorkbenchExecutionNetworkPolicy;
-}
-export interface WorkbenchTaskSpec {
-    version: 2;
-    task: string;
-    environment?: WorkbenchTaskEnvironmentSpec;
-    score?: WorkbenchAdapterInvocation;
-}
-export interface WorkbenchTaskBundle {
-    id: string;
-    task: WorkbenchTaskSpec;
-    publicFiles: SurfaceSnapshotFile[];
-    testFiles: SurfaceSnapshotFile[];
-    solutionFiles?: SurfaceSnapshotFile[];
-    sourceFiles?: SurfaceSnapshotFile[];
-}
-export interface WorkbenchTaskSourceResult {
-    tasks: WorkbenchTaskBundle[];
-    environment?: WorkbenchTaskEnvironmentSpec;
-}
-export declare function normalizeWorkbenchTaskSourceResult(value: unknown, label?: string): WorkbenchTaskSourceResult;
-export declare function normalizeWorkbenchTaskBundle(value: unknown, label: string): WorkbenchTaskBundle;
-export declare function normalizeWorkbenchTaskSpec(value: unknown, label: string): WorkbenchTaskSpec;
-//# sourceMappingURL=task-source-result.d.ts.map

package/dist/task-source-result.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"task-source-result.d.ts","sourceRoot":"","sources":["../src/task-source-result.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,mBAAmB,EACnB,0BAA0B,EAC1B,+BAA+B,EAC/B,2BAA2B,EAC5B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACjD,OAAO,CAAC,EAAE,+BAA+B,CAAC;CAC3C;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,4BAA4B,CAAC;IAC3C,KAAK,CAAC,EAAE,0BAA0B,CAAC;CACpC;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,iBAAiB,CAAC;IACxB,WAAW,EAAE,mBAAmB,EAAE,CAAC;IACnC,SAAS,EAAE,mBAAmB,EAAE,CAAC;IACjC,aAAa,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACtC,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC7B,WAAW,CAAC,EAAE,4BAA4B,CAAC;CAC5C;AAED,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,OAAO,EACd,KAAK,SAAyB,GAC7B,yBAAyB,CAkB3B;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,GACZ,mBAAmB,CAiBrB;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,GACZ,iBAAiB,CAkBnB"}