@workbench-ai/workbench-protocol 0.0.42 → 0.0.44

package/dist/adapter-definition.d.ts

@@ -0,0 +1,46 @@
+import type { Json } from "@workbench-ai/workbench-contract";
+import type { WorkbenchAdapterAuthManifest, WorkbenchAdapterInvocationLike, WorkbenchAdapterManifest, WorkbenchAdapterOperation, WorkbenchAdapterSlotManifest } from "./adapter-manifest.ts";
+import { type WorkbenchAdapterOperationRequest, type WorkbenchAdapterOperationResult, type WorkbenchAdapterOperationResultValue } from "./adapter-protocol.ts";
+export interface WorkbenchAdapterDefinition<TContext = unknown> {
+    id: string;
+    setup?: string[];
+    auth?: WorkbenchAdapterAuthManifest;
+    tasks?: WorkbenchAdapterOperationDefinition<TContext>;
+    run?: WorkbenchAdapterOperationDefinition<TContext>;
+    score?: WorkbenchAdapterOperationDefinition<TContext>;
+    improve?: WorkbenchAdapterOperationDefinition<TContext>;
+    slots?: Record<string, WorkbenchAdapterSlotManifest>;
+}
+export interface WorkbenchAdapterOperationDefinition<TContext = unknown> {
+    command?: string;
+    handle?: WorkbenchAdapterOperationHandler<TContext>;
+}
+export interface WorkbenchAdapterHandlerContext<TContext = unknown> {
+    request: WorkbenchAdapterOperationRequest;
+    operation: WorkbenchAdapterOperation;
+    invocation: WorkbenchAdapterOperationRequest["invocation"];
+    with: Record<string, Json>;
+    paths: WorkbenchAdapterOperationRequest["paths"];
+    runtime: TContext;
+    slot(name: string): WorkbenchAdapterInvocationLike | null;
+    result<TValue extends WorkbenchAdapterOperationResultValue>(value: TValue, metadata?: Omit<WorkbenchAdapterOperationResult<TValue>, "protocol" | "operation" | "value">): WorkbenchAdapterOperationResult<TValue>;
+}
+export type WorkbenchAdapterOperationHandler<TContext = unknown> = (context: WorkbenchAdapterHandlerContext<TContext>) => WorkbenchAdapterHandlerReturn | Promise<WorkbenchAdapterHandlerReturn>;
+export type WorkbenchAdapterHandlerReturn = WorkbenchAdapterOperationResult | WorkbenchAdapterOperationResultValue | undefined | void;
+export interface RunDefinedWorkbenchAdapterOptions<TContext = unknown> {
+    requestPath?: string;
+    outputRoot?: string;
+    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 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 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;
+//# sourceMappingURL=adapter-definition.d.ts.map

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

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

package/dist/adapter-definition.js

@@ -0,0 +1,172 @@
+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";
+export function defineAdapter(definition) {
+    return definition;
+}
+export function defineTaskSource(definition = {}) {
+    return definition;
+}
+export function defineRunner(definition = {}) {
+    return definition;
+}
+export function defineScorer(definition = {}) {
+    return definition;
+}
+export function defineOptimizer(definition = {}) {
+    return definition;
+}
+export function adapterSlot(path, operation) {
+    return { path, 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);
+    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",
+        operations,
+        setup: definition.setup ? [...definition.setup] : [],
+        ...(definition.auth ? { auth: cloneJson(definition.auth) } : {}),
+        ...(definition.slots ? { slots: cloneJson(definition.slots) } : {}),
+    };
+}
+export async function runDefinedAdapter(definition, options = {}) {
+    let request = await readWorkbenchAdapterOperationRequest(options.requestPath);
+    if (request.invocation.use !== definition.id) {
+        throw new Error(`Adapter ${definition.id} cannot execute request for ${request.invocation.use}.`);
+    }
+    if (options.outputRoot && options.outputRoot !== request.paths.output) {
+        request = {
+            ...request,
+            paths: {
+                ...request.paths,
+                output: options.outputRoot,
+                result: workbenchAdapterOperationResultPath(options.outputRoot),
+            },
+        };
+    }
+    await ensureWorkbenchAdapterOutputDir(request);
+    const operationDefinition = operationDefinitionForRequest(definition, request.operation);
+    if (!operationDefinition) {
+        throw new Error(`Adapter ${definition.id} does not implement ${request.operation}.`);
+    }
+    if (!operationDefinition.handle) {
+        throw new Error(`Adapter ${definition.id} ${request.operation} does not define a handler.`);
+    }
+    const handlerResult = await operationDefinition.handle(adapterHandlerContext({
+        definition,
+        request,
+        runtime: options.runtime,
+    }));
+    if (await fileExists(request.paths.result)) {
+        return null;
+    }
+    const result = normalizeHandlerResult(request.operation, handlerResult);
+    await writeWorkbenchAdapterOperationResult(request.paths.output, result);
+    return result;
+}
+export function operationDefinitionForRequest(definition, operation) {
+    if (operation === "tasks.resolve") {
+        return definition.tasks;
+    }
+    if (operation === "subject.run") {
+        return definition.run;
+    }
+    if (operation === "trial.score") {
+        return definition.score;
+    }
+    if (operation === "subject.improve") {
+        return definition.improve;
+    }
+    return undefined;
+}
+export function adapterResult(operation, value, metadata = {}) {
+    return {
+        protocol: WORKBENCH_ADAPTER_RESULT_PROTOCOL,
+        operation,
+        ok: true,
+        ...metadata,
+        value,
+    };
+}
+export function adapterSlotInvocation(request, slots, name) {
+    const slot = slots?.[name];
+    if (!slot) {
+        return null;
+    }
+    const value = jsonPointerValue(adapterWithRecord(request), slot.path);
+    return isInvocationLike(value) ? value : null;
+}
+function addOperation(operations, adapterId, operation, definition) {
+    if (!definition) {
+        return;
+    }
+    operations[operation] = {
+        command: definition.command ?? adapterCommandName(adapterId),
+    };
+}
+function cloneJson(value) {
+    return JSON.parse(JSON.stringify(value));
+}
+function adapterHandlerContext(args) {
+    return {
+        request: args.request,
+        operation: args.request.operation,
+        invocation: args.request.invocation,
+        with: adapterWithRecord(args.request),
+        paths: args.request.paths,
+        runtime: args.runtime,
+        slot: (name) => adapterSlotInvocation(args.request, args.definition.slots, name),
+        result: (value, metadata = {}) => adapterResult(args.request.operation, value, metadata),
+    };
+}
+function normalizeHandlerResult(operation, result) {
+    if (isOperationResult(result)) {
+        return result;
+    }
+    return adapterResult(operation, result === undefined ? null : result);
+}
+function isOperationResult(value) {
+    return !!value &&
+        typeof value === "object" &&
+        !Array.isArray(value) &&
+        value.protocol === WORKBENCH_ADAPTER_RESULT_PROTOCOL &&
+        typeof value.operation === "string";
+}
+function adapterWithRecord(request) {
+    const value = request.invocation.with;
+    return value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : {};
+}
+function jsonPointerValue(root, pointer) {
+    if (pointer === "") {
+        return root;
+    }
+    let current = root;
+    for (const rawPart of pointer.slice(1).split("/")) {
+        const part = rawPart.replace(/~1/gu, "/").replace(/~0/gu, "~");
+        if (!current || typeof current !== "object") {
+            return undefined;
+        }
+        current = current[part];
+    }
+    return current;
+}
+function isInvocationLike(value) {
+    return !!value &&
+        typeof value === "object" &&
+        !Array.isArray(value) &&
+        typeof value.use === "string" &&
+        (value.use.length > 0);
+}
+async function fileExists(filePath) {
+    return fs.stat(filePath).then((stat) => stat.isFile(), () => false);
+}

package/dist/adapter-manifest.d.ts

@@ -1,13 +1,19 @@
 export interface WorkbenchAdapterManifest {
     id: string;
-    protocol: "workbench.adapter.v1";
-    capabilities?: WorkbenchAdapterCapability[];
+    protocol: "workbench.adapter.v2";
+    operations: Partial<Record<WorkbenchAdapterOperation, WorkbenchAdapterOperationManifest>>;
     setup: string[];
-    command: string;
     auth?: WorkbenchAdapterAuthManifest;
-    refs?: string[];
+    slots?: Record<string, WorkbenchAdapterSlotManifest>;
+}
+export type WorkbenchAdapterOperation = "tasks.resolve" | "subject.run" | "trial.score" | "subject.improve";
+export interface WorkbenchAdapterOperationManifest {
+    command: string;
+}
+export interface WorkbenchAdapterSlotManifest {
+    path: string;
+    operation: WorkbenchAdapterOperation;
 }
-export type WorkbenchAdapterCapability = "task-source" | "runner" | "scorer" | "optimizer";
 export interface WorkbenchAdapterAuthManifest {
     methods?: Record<string, WorkbenchAdapterAuthMethodManifest>;
     slots?: Record<string, {
@@ -37,17 +43,25 @@ export interface WorkbenchAdapterAuthRequirement {
     slot?: string;
     profile: string;
 }
+export interface WorkbenchAdapterOperationRequirement {
+    invocation: WorkbenchAdapterInvocationLike;
+    operation: WorkbenchAdapterOperation;
+}
 export declare function adapterCommandName(adapterId: string): string;
+export declare function workbenchAdapterManifestSupportsOperation(manifest: WorkbenchAdapterManifest, operation: WorkbenchAdapterOperation): boolean;
+export declare function workbenchAdapterOperationCommand(manifest: WorkbenchAdapterManifest, operation: WorkbenchAdapterOperation): string;
 export declare function cloneWorkbenchAdapterManifest(manifest: WorkbenchAdapterManifest): WorkbenchAdapterManifest;
 export declare function parseWorkbenchAdapterManifest(source: string, label?: string): WorkbenchAdapterManifest;
 export declare function workbenchAdapterManifestRequiresAuth(manifest: WorkbenchAdapterManifest): boolean;
 export declare function collectWorkbenchAdapterInvocations(roots: readonly WorkbenchAdapterInvocationLike[], manifests: readonly WorkbenchAdapterManifest[] | Map<string, WorkbenchAdapterManifest>): WorkbenchAdapterInvocationLike[];
+export declare function collectWorkbenchAdapterOperationRequirements(roots: readonly WorkbenchAdapterOperationRequirement[], manifests: readonly WorkbenchAdapterManifest[] | Map<string, WorkbenchAdapterManifest>): WorkbenchAdapterOperationRequirement[];
+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;
-    grade?: WorkbenchAdapterInvocationLike;
 }>(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;
 //# 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":"AAEA,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,sBAAsB,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,yBAAyB,EAAE,iCAAiC,CAAC,CAAC,CAAC;IAC1F,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,4BAA4B,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;CACtD;AAED,MAAM,MAAM,yBAAyB,GACjC,eAAe,GACf,aAAa,GACb,aAAa,GACb,iBAAiB,CAAC;AAEtB,MAAM,WAAW,iCAAiC;IAChD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,yBAAyB,CAAC;CACtC;AAED,MAAM,WAAW,4BAA4B;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC;IAC7D,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC;KAC9D,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,kCAAkC;IACjD,GAAG,CAAC,EAAE,+BAA+B,EAAE,CAAC;IACxC,KAAK,CAAC,EAAE,gCAAgC,EAAE,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,8BAA8B;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,+BAA+B;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,oCAAoC;IACnD,UAAU,EAAE,8BAA8B,CAAC;IAC3C,SAAS,EAAE,yBAAyB,CAAC;CACtC;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,yCAAyC,CACvD,QAAQ,EAAE,wBAAwB,EAClC,SAAS,EAAE,yBAAyB,GACnC,OAAO,CAET;AAED,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,wBAAwB,EAClC,SAAS,EAAE,yBAAyB,GACnC,MAAM,CAMR;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,wBAAwB,GACjC,wBAAwB,CAQ1B;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,KAAK,SAA2B,GAC/B,wBAAwB,CA2B1B;AA2DD,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAET;AAED,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,SAAS,8BAA8B,EAAE,EAChD,SAAS,EAAE,SAAS,wBAAwB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACrF,8BAA8B,EAAE,CAUlC;AAED,wBAAgB,4CAA4C,CAC1D,KAAK,EAAE,SAAS,oCAAoC,EAAE,EACtD,SAAS,EAAE,SAAS,wBAAwB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACrF,oCAAoC,EAAE,CAkCxC;AAED,wBAAgB,sCAAsC,CACpD,KAAK,EAAE,SAAS,oCAAoC,EAAE,EACtD,SAAS,EAAE,SAAS,wBAAwB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACrF,MAAM,EAAE,CAeV;AAED,wBAAgB,sCAAsC,CACpD,KAAK,EAAE,SAAS,oCAAoC,EAAE,EACtD,SAAS,EAAE,SAAS,wBAAwB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACrF,IAAI,CAKN;AAED,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,SAAS,8BAA8B,EAAE,EAChD,SAAS,EAAE,SAAS,wBAAwB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACrF,+BAA+B,EAAE,CAcnC;AAED,wBAAgB,uCAAuC,CAAC,CAAC,SAAS;IAChE,OAAO,CAAC,EAAE,8BAA8B,CAAC;IACzC,GAAG,EAAE,8BAA8B,CAAC;IACpC,KAAK,CAAC,EAAE,8BAA8B,CAAC;CACxC,EACC,IAAI,EAAE,CAAC,EACP,SAAS,EAAE,SAAS,wBAAwB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACrF,CAAC,CAWH;AAED,wBAAgB,+BAA+B,CAAC,CAAC,SAAS,8BAA8B,EACtF,UAAU,EAAE,CAAC,EACb,SAAS,EAAE,SAAS,wBAAwB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACrF,CAAC,CAKH"}

package/dist/adapter-manifest.js

@@ -2,13 +2,23 @@ import YAML from "yaml";
 export function adapterCommandName(adapterId) {
     return `workbench-adapter-${adapterId}`;
 }
+export function workbenchAdapterManifestSupportsOperation(manifest, operation) {
+    return manifest.operations[operation] !== undefined;
+}
+export function workbenchAdapterOperationCommand(manifest, operation) {
+    const operationManifest = manifest.operations[operation];
+    if (!operationManifest) {
+        throw new Error(`Adapter ${manifest.id} does not implement ${operation}.`);
+    }
+    return operationManifest.command;
+}
 export function cloneWorkbenchAdapterManifest(manifest) {
     return {
         ...manifest,
-        ...(manifest.capabilities ? { capabilities: [...manifest.capabilities] } : {}),
+        operations: cloneJson(manifest.operations),
         setup: [...manifest.setup],
         ...(manifest.auth ? { auth: cloneJson(manifest.auth) } : {}),
-        ...(manifest.refs ? { refs: [...manifest.refs] } : {}),
+        ...(manifest.slots ? { slots: cloneJson(manifest.slots) } : {}),
     };
 }
 export function parseWorkbenchAdapterManifest(source, label = "workbench.adapter.yaml") {
@@ -17,42 +27,75 @@ export function parseWorkbenchAdapterManifest(source, label = "workbench.adapter
         throw new Error(`${label} must be a YAML object.`);
     }
     const record = parsed;
-    rejectUnknownManifestKeys(record, label, ["id", "protocol", "capabilities", "setup", "command", "auth", "refs"]);
+    rejectUnknownManifestKeys(record, label, ["id", "protocol", "operations", "setup", "auth", "slots"]);
     const id = readAdapterId(record.id, `${label}.id`);
-    if (record.protocol !== "workbench.adapter.v1") {
-        throw new Error(`${label}.protocol must be workbench.adapter.v1.`);
+    if (record.protocol !== "workbench.adapter.v2") {
+        throw new Error(`${label}.protocol must be workbench.adapter.v2.`);
     }
-    const command = typeof record.command === "string" && record.command.trim()
-        ? record.command.trim()
-        : adapterCommandName(id);
     const setup = record.setup === undefined
         ? []
         : readStringArray(record.setup, `${label}.setup`);
-    const capabilities = record.capabilities === undefined
-        ? undefined
-        : readAdapterCapabilities(record.capabilities, `${label}.capabilities`);
-    const refs = record.refs === undefined
+    const operations = readAdapterOperations(record.operations, `${label}.operations`, id);
+    const slots = record.slots === undefined
         ? undefined
-        : readAdapterRefs(record.refs, `${label}.refs`);
+        : readAdapterSlots(record.slots, `${label}.slots`);
     const auth = readAuth(record.auth, `${label}.auth`);
     return {
         id,
-        protocol: "workbench.adapter.v1",
-        ...(capabilities ? { capabilities } : {}),
+        protocol: "workbench.adapter.v2",
+        operations,
         setup,
-        command,
         ...(auth ? { auth } : {}),
-        ...(refs ? { refs } : {}),
+        ...(slots ? { slots } : {}),
     };
 }
-function readAdapterCapabilities(value, label) {
-    const allowed = new Set(["task-source", "runner", "scorer", "optimizer"]);
-    return readStringArray(value, label).map((entry, index) => {
-        if (!allowed.has(entry)) {
-            throw new Error(`${label}[${index}] must be task-source, runner, scorer, or optimizer.`);
+function readAdapterOperations(value, label, adapterId) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        throw new Error(`${label} must be an object.`);
+    }
+    const operations = {};
+    for (const [operation, rawConfig] of Object.entries(value).sort()) {
+        const normalizedOperation = readAdapterOperation(operation, `${label}.${operation}`);
+        if (!rawConfig || typeof rawConfig !== "object" || Array.isArray(rawConfig)) {
+            throw new Error(`${label}.${operation} must be an object.`);
         }
-        return entry;
-    });
+        const config = rawConfig;
+        rejectUnknownManifestKeys(config, `${label}.${operation}`, ["command"]);
+        operations[normalizedOperation] = {
+            command: config.command === undefined
+                ? adapterCommandName(adapterId)
+                : readNonEmptyString(config.command, `${label}.${operation}.command`),
+        };
+    }
+    if (Object.keys(operations).length === 0) {
+        throw new Error(`${label} must declare at least one operation.`);
+    }
+    return operations;
+}
+function readAdapterSlots(value, label) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        throw new Error(`${label} must be an object.`);
+    }
+    const slots = {};
+    for (const [slot, rawConfig] of Object.entries(value).sort()) {
+        if (!/^[a-z][a-z0-9-]*$/u.test(slot)) {
+            throw new Error(`${label} keys must be lowercase adapter slot names.`);
+        }
+        if (!rawConfig || typeof rawConfig !== "object" || Array.isArray(rawConfig)) {
+            throw new Error(`${label}.${slot} must be an object.`);
+        }
+        const config = rawConfig;
+        rejectUnknownManifestKeys(config, `${label}.${slot}`, ["path", "operation"]);
+        const slotPath = readJsonPointer(config.path, `${label}.${slot}.path`);
+        slots[slot] = {
+            path: slotPath,
+            operation: readAdapterOperation(config.operation, `${label}.${slot}.operation`),
+        };
+    }
+    if (Object.keys(slots).length === 0) {
+        throw new Error(`${label} must include at least one slot.`);
+    }
+    return slots;
 }
 export function workbenchAdapterManifestRequiresAuth(manifest) {
     return defaultWorkbenchAdapterAuthForManifest(manifest) !== undefined;
@@ -68,6 +111,63 @@ export function collectWorkbenchAdapterInvocations(roots, manifests) {
     }
     return collected;
 }
+export function collectWorkbenchAdapterOperationRequirements(roots, manifests) {
+    const manifestById = manifestMap(manifests);
+    const collected = [];
+    const queue = roots.flatMap((root) => {
+        const invocation = normalizeInvocationLike(root.invocation);
+        return invocation ? [{ invocation, operation: root.operation }] : [];
+    });
+    while (queue.length > 0) {
+        const requirement = queue.shift();
+        collected.push(requirement);
+        const manifest = manifestById.get(requirement.invocation.use);
+        const slots = manifest?.slots ? Object.values(manifest.slots) : [];
+        if (slots.length === 0) {
+            continue;
+        }
+        const config = invocationConfig(requirement.invocation);
+        for (const slot of slots) {
+            const value = readJsonPointerValue(config, slot.path);
+            if (Array.isArray(value)) {
+                for (const entry of value) {
+                    const nested = normalizeInvocationLike(entry);
+                    if (nested) {
+                        queue.push({ invocation: nested, operation: slot.operation });
+                    }
+                }
+                continue;
+            }
+            const nested = normalizeInvocationLike(value);
+            if (nested) {
+                queue.push({ invocation: nested, operation: slot.operation });
+            }
+        }
+    }
+    return collected;
+}
+export function collectWorkbenchAdapterOperationIssues(roots, manifests) {
+    const manifestById = manifestMap(manifests);
+    const issues = new Map();
+    for (const requirement of collectWorkbenchAdapterOperationRequirements(roots, manifestById)) {
+        const manifest = manifestById.get(requirement.invocation.use);
+        const key = `${requirement.invocation.use}:${requirement.operation}`;
+        if (!manifest) {
+            issues.set(key, `Adapter ${requirement.invocation.use} is referenced but is not installed.`);
+            continue;
+        }
+        if (!workbenchAdapterManifestSupportsOperation(manifest, requirement.operation)) {
+            issues.set(key, `Adapter ${requirement.invocation.use} does not implement ${requirement.operation}.`);
+        }
+    }
+    return [...issues.values()];
+}
+export function assertWorkbenchAdapterOperationSupport(roots, manifests) {
+    const issues = collectWorkbenchAdapterOperationIssues(roots, manifests);
+    if (issues.length > 0) {
+        throw new Error(issues.join("\n"));
+    }
+}
 export function collectWorkbenchAdapterAuthRequirements(roots, manifests) {
     const manifestById = manifestMap(manifests);
     const targets = new Map();
@@ -93,9 +193,6 @@ export function withDefaultWorkbenchAdapterAuthProfiles(spec, manifests) {
     if (clone.score) {
         clone.score = withDefaultWorkbenchAdapterAuth(clone.score, manifestById);
     }
-    if (clone.grade) {
-        clone.grade = withDefaultWorkbenchAdapterAuth(clone.grade, manifestById);
-    }
     return clone;
 }
 export function withDefaultWorkbenchAdapterAuth(invocation, manifests) {
@@ -109,12 +206,13 @@ function applyDefaultWorkbenchAdapterAuth(invocation, manifestById) {
             invocation.auth = defaultAuth;
         }
     }
-    if (!manifest?.refs?.length) {
+    const slots = manifest?.slots ? Object.values(manifest.slots) : [];
+    if (slots.length === 0) {
         return invocation;
     }
     const config = invocationConfig(invocation);
-    for (const pointer of manifest.refs) {
-        const value = readJsonPointer(config, pointer);
+    for (const slot of slots) {
+        const value = readJsonPointerValue(config, slot.path);
         if (Array.isArray(value)) {
             for (let index = 0; index < value.length; index += 1) {
                 const nested = normalizeInvocationLike(value[index]);
@@ -126,7 +224,7 @@ function applyDefaultWorkbenchAdapterAuth(invocation, manifestById) {
         }
         const nested = normalizeInvocationLike(value);
         if (nested) {
-            const parent = readJsonPointerParent(config, pointer);
+            const parent = readJsonPointerParent(config, slot.path);
             if (parent) {
                 const withDefaults = applyDefaultWorkbenchAdapterAuth(nested, manifestById);
                 if (Array.isArray(parent.container) && typeof parent.key === "number") {
@@ -142,12 +240,13 @@ function applyDefaultWorkbenchAdapterAuth(invocation, manifestById) {
 }
 function nestedWorkbenchAdapterInvocations(invocation, manifestById) {
     const manifest = manifestById.get(invocation.use);
-    if (!manifest?.refs?.length) {
+    const slots = manifest?.slots ? Object.values(manifest.slots) : [];
+    if (slots.length === 0) {
         return [];
     }
     const config = invocationConfig(invocation);
-    return manifest.refs.flatMap((pointer) => {
-        const value = readJsonPointer(config, pointer);
+    return slots.flatMap((slot) => {
+        const value = readJsonPointerValue(config, slot.path);
         if (Array.isArray(value)) {
             return value.map((entry) => normalizeInvocationLike(entry)).filter(isInvocationLike);
         }
@@ -235,7 +334,7 @@ function normalizeInvocationLike(value) {
 function isInvocationLike(value) {
     return value !== null;
 }
-function readJsonPointer(root, pointer) {
+function readJsonPointerValue(root, pointer) {
     if (pointer === "") {
         return root;
     }
@@ -266,7 +365,7 @@ function readJsonPointerParent(root, pointer) {
     }
     const rawSegments = pointer.slice(1).split("/");
     const last = decodeJsonPointerSegment(rawSegments.pop());
-    const parent = readJsonPointer(root, rawSegments.length === 0 ? "" : `/${rawSegments.join("/")}`);
+    const parent = readJsonPointerValue(root, rawSegments.length === 0 ? "" : `/${rawSegments.join("/")}`);
     if (Array.isArray(parent)) {
         const index = Number(last);
         return Number.isInteger(index) && index >= 0 && index < parent.length
@@ -302,14 +401,21 @@ function readStringArray(value, label) {
     }
     return value.map((entry) => entry.trim());
 }
-function readAdapterRefs(value, label) {
-    const refs = readStringArray(value, label);
-    for (const ref of refs) {
-        if (ref !== "" && !ref.startsWith("/")) {
-            throw new Error(`${label} entries must be JSON pointers.`);
-        }
+function readAdapterOperation(value, label) {
+    if (value === "tasks.resolve" ||
+        value === "subject.run" ||
+        value === "trial.score" ||
+        value === "subject.improve") {
+        return value;
+    }
+    throw new Error(`${label} must be tasks.resolve, subject.run, trial.score, or subject.improve.`);
+}
+function readJsonPointer(value, label) {
+    const pointer = readNonEmptyString(value, label);
+    if (pointer !== "" && !pointer.startsWith("/")) {
+        throw new Error(`${label} must be a JSON pointer.`);
     }
-    return refs;
+    return pointer;
 }
 function readAuth(value, label) {
     if (value === undefined) {