@workbench-ai/workbench-core 0.0.67 → 0.0.69

package/dist/remote-model.d.ts

@@ -0,0 +1,17 @@
+import { type WorkbenchRemoteKind } from "@workbench-ai/workbench-contract";
+export type { WorkbenchRemoteKind };
+export interface ParsedWorkbenchCloudRemoteUrl {
+    kind: "workbench-cloud";
+    url: string;
+    baseUrl: string;
+    owner: string;
+    skill: string;
+}
+export interface ParsedWorkbenchFileRemoteUrl {
+    kind: "file";
+    url: string;
+    path: string;
+}
+export type ParsedWorkbenchRemoteUrl = ParsedWorkbenchCloudRemoteUrl | ParsedWorkbenchFileRemoteUrl;
+export declare function parseWorkbenchRemoteUrl(rawUrl: string): ParsedWorkbenchRemoteUrl;
+//# sourceMappingURL=remote-model.d.ts.map

package/dist/remote-model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-model.d.ts","sourceRoot":"","sources":["../src/remote-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+B,KAAK,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAIzG,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,iBAAiB,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,wBAAwB,GAAG,6BAA6B,GAAG,4BAA4B,CAAC;AAEpG,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,wBAAwB,CAoEhF"}

package/dist/remote-model.js

@@ -0,0 +1,86 @@
+import { fileURLToPath } from "node:url";
+import { normalizeWorkbenchSkillName } from "@workbench-ai/workbench-contract";
+import { WorkbenchCodedError } from "./coded-errors.js";
+export function parseWorkbenchRemoteUrl(rawUrl) {
+    const trimmed = rawUrl.trim();
+    if (!trimmed) {
+        throw new WorkbenchCodedError("remote_invalid_url", "Workbench remote URL must be non-empty.", {
+            remediation: "Run workbench remote add --name NAME --url file:///absolute/path or workbench remote add --name NAME --url https://HOST/skills/OWNER/SKILL.",
+            exitCode: 2,
+        });
+    }
+    let url;
+    try {
+        url = new URL(trimmed);
+    }
+    catch {
+        throw new WorkbenchCodedError("remote_invalid_url", `Invalid Workbench remote URL: ${trimmed}`, {
+            remediation: "Use file:///absolute/path for local remotes or https://HOST/skills/OWNER/SKILL for Workbench Cloud remotes.",
+            subject: { url: trimmed },
+            exitCode: 2,
+        });
+    }
+    if (url.protocol === "file:") {
+        let filePath;
+        try {
+            filePath = fileURLToPath(url);
+        }
+        catch {
+            throw new WorkbenchCodedError("remote_invalid_url", `Invalid file Workbench remote URL: ${trimmed}`, {
+                remediation: "Use an absolute file URL such as file:///tmp/workbench-remote.",
+                subject: { url: trimmed },
+                exitCode: 2,
+            });
+        }
+        if (!filePath.startsWith("/")) {
+            throw new WorkbenchCodedError("remote_invalid_url", `File Workbench remote must use an absolute path: ${trimmed}`, {
+                remediation: "Use file:///absolute/path for local Workbench remotes.",
+                subject: { url: trimmed },
+                exitCode: 2,
+            });
+        }
+        return { kind: "file", url: url.toString(), path: filePath };
+    }
+    if (url.protocol !== "https:" && !(url.protocol === "http:" && isLoopbackHost(url.hostname))) {
+        throw new WorkbenchCodedError("remote_unsupported_scheme", `Unsupported Workbench remote scheme: ${url.protocol.replace(/:$/u, "")}`, {
+            remediation: "Use file:///absolute/path for local remotes or https://HOST/skills/OWNER/SKILL for Workbench Cloud remotes.",
+            subject: { url: trimmed, scheme: url.protocol.replace(/:$/u, "") },
+            exitCode: 2,
+        });
+    }
+    const segments = url.pathname.split("/").filter(Boolean).map((segment) => decodeURIComponent(segment));
+    if (segments.length !== 3 || segments[0] !== "skills") {
+        throw new WorkbenchCodedError("remote_invalid_skill_slug", `Workbench Cloud remote must use /skills/OWNER/SKILL: ${trimmed}`, {
+            remediation: "Run workbench remote add --name NAME --url https://HOST/skills/OWNER/SKILL.",
+            subject: { url: trimmed },
+            exitCode: 2,
+        });
+    }
+    const owner = validateRemoteSlug(segments[1], "owner", trimmed);
+    const skill = validateRemoteSlug(segments[2], "skill", trimmed);
+    url.hash = "";
+    url.search = "";
+    url.pathname = `/skills/${encodeURIComponent(owner)}/${encodeURIComponent(skill)}`;
+    return {
+        kind: "workbench-cloud",
+        url: url.toString().replace(/\/$/u, ""),
+        baseUrl: url.origin,
+        owner,
+        skill,
+    };
+}
+function validateRemoteSlug(value, label, displayUrl) {
+    const normalized = normalizeWorkbenchSkillName(value);
+    if (!normalized || normalized !== value) {
+        throw new WorkbenchCodedError("remote_invalid_skill_slug", `Workbench Cloud remote ${label} must be a URL-safe slug: ${value}`, {
+            remediation: "Use lowercase letters, numbers, and single hyphens in Workbench Cloud remote URLs.",
+            subject: { url: displayUrl, segment: label, value },
+            exitCode: 2,
+        });
+    }
+    return normalized;
+}
+function isLoopbackHost(hostname) {
+    const normalized = hostname.toLowerCase().replace(/^\[(.*)\]$/u, "$1");
+    return normalized === "localhost" || normalized === "127.0.0.1" || normalized === "::1";
+}

package/dist/runtime-dockerfile.d.ts

@@ -7,7 +7,7 @@ export interface WorkbenchRuntimeAdapterInstallerFile {
 export interface WorkbenchRuntimeAdapterInstaller {
     id: string;
     source: string;
-    setup: readonly string[];
+    install: readonly string[];
     files?: readonly WorkbenchRuntimeAdapterInstallerFile[];
 }
 export declare function composeRuntimeDockerfileWithAdapterInstallers(dockerfile: string, adapters: readonly WorkbenchRuntimeAdapterInstaller[]): string;

package/dist/runtime-dockerfile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-dockerfile.d.ts","sourceRoot":"","sources":["../src/runtime-dockerfile.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,oCAAoC;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,gCAAgC;IAC/C,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,KAAK,CAAC,EAAE,SAAS,oCAAoC,EAAE,CAAC;CACzD;AAED,wBAAgB,6CAA6C,CAC3D,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,SAAS,gCAAgC,EAAE,GACpD,MAAM,CAiCR"}
+{"version":3,"file":"runtime-dockerfile.d.ts","sourceRoot":"","sources":["../src/runtime-dockerfile.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,oCAAoC;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,gCAAgC;IAC/C,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,SAAS,oCAAoC,EAAE,CAAC;CACzD;AAED,wBAAgB,6CAA6C,CAC3D,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,SAAS,gCAAgC,EAAE,GACpD,MAAM,CAiCR"}

package/dist/runtime-dockerfile.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 export function composeRuntimeDockerfileWithAdapterInstallers(dockerfile, adapters) {
-    const installAdapters = adapters.filter((adapter) => adapter.setup.length > 0 || (adapter.files?.length ?? 0) > 0);
+    const installAdapters = adapters.filter((adapter) => adapter.install.length > 0 || (adapter.files?.length ?? 0) > 0);
     if (installAdapters.length === 0) {
         return dockerfile;
     }
@@ -8,7 +8,7 @@ export function composeRuntimeDockerfileWithAdapterInstallers(dockerfile, adapte
     const lines = [
         dockerfile.trimEnd(),
         "",
-        "# Workbench adapter setup. The benchmark Dockerfile owns task dependencies;",
+        "# Workbench adapter install commands. The eval Dockerfile owns case dependencies;",
         "# adapter manifests own adapter runtime dependencies.",
         "USER root",
     ];
@@ -19,13 +19,13 @@ export function composeRuntimeDockerfileWithAdapterInstallers(dockerfile, adapte
             lines.push(...adapterSourceDockerfileLines(adapter));
             lines.push(`WORKDIR /opt/workbench-adapters/${adapter.id}`);
         }
-        for (const command of adapter.setup) {
+        for (const command of adapter.install) {
             lines.push(`RUN ${command}`);
         }
     }
     if (finalUser) {
         lines.push("");
-        lines.push(`# Restore benchmark runtime user.`);
+        lines.push(`# Restore eval runtime user.`);
         lines.push(`USER ${finalUser}`);
     }
     lines.push("WORKDIR /workspace", "");

package/dist/sandbox-backends/docker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/sandbox-backends/docker.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EACV,8BAA8B,EAC/B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,KAAK,wBAAwB,EAE7B,KAAK,yBAAyB,EAE9B,KAAK,YAAY,EAClB,MAAM,qBAAqB,CAAC;AA6C7B,wBAAgB,oCAAoC,IACjD,wBAAwB,CAY1B;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,8BAA8B,EACpC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,yBAAyB,GACnC,YAAY,CAmDd"}
+{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/sandbox-backends/docker.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EACV,8BAA8B,EAC/B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,KAAK,wBAAwB,EAE7B,KAAK,yBAAyB,EAE9B,KAAK,YAAY,EAClB,MAAM,qBAAqB,CAAC;AA8C7B,wBAAgB,oCAAoC,IACjD,wBAAwB,CAY1B;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,8BAA8B,EACpC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,yBAAyB,GACnC,YAAY,CAmDd"}

package/dist/sandbox-backends/docker.js

@@ -17,6 +17,7 @@ const BUILT_IN_ENVIRONMENT_IMAGES = {
 };
 const DOCKER_RUNTIME_MOUNT = "/workbench-runtime";
 const DOCKER_DEFAULT_WORKSPACE = "/workspace";
+const mutableDockerTemplateImageBuilds = new Map();
 export function createDockerSandboxBackendDescriptor() {
     return {
         name: DOCKER_SANDBOX_BACKEND,
@@ -98,18 +99,33 @@ async function prepareDockerTemplateImage(execution, args, execFileAsync) {
     ]);
     const sourceHash = args.environmentVersion?.sourceHash?.trim() || createHash("sha256").update(dockerfile).digest("hex");
     const image = `workbench/sandbox-${safeDockerImageSegment(args.environmentVersion?.id ?? "env")}:${sourceHash.slice(0, 16)}`;
-    const imageExists = await execFileAsync("docker", ["image", "inspect", image], { maxBuffer: 1024 * 1024 })
-        .then(() => true, () => false);
-    if (imageExists) {
+    const pending = mutableDockerTemplateImageBuilds.get(image);
+    if (pending) {
+        return await pending;
+    }
+    const build = (async () => {
+        const imageExists = await execFileAsync("docker", ["image", "inspect", image], { maxBuffer: 1024 * 1024 })
+            .then(() => true, () => false);
+        if (imageExists) {
+            return image;
+        }
+        const contextRoot = path.join(args.workdir ?? os.tmpdir(), "workbench-docker-environments", sourceHash.slice(0, 32));
+        const dockerfilePath = path.join(contextRoot, "Dockerfile");
+        await fs.rm(contextRoot, { recursive: true, force: true }).catch(() => undefined);
+        await fs.mkdir(contextRoot, { recursive: true });
+        await fs.writeFile(dockerfilePath, `${dockerfile}\n`, { mode: 0o600 });
+        await execFileAsync("docker", ["build", "-t", image, "-f", dockerfilePath, contextRoot], { maxBuffer: 20 * 1024 * 1024 });
         return image;
+    })();
+    mutableDockerTemplateImageBuilds.set(image, build);
+    try {
+        return await build;
+    }
+    finally {
+        if (mutableDockerTemplateImageBuilds.get(image) === build) {
+            mutableDockerTemplateImageBuilds.delete(image);
+        }
     }
-    const contextRoot = path.join(args.workdir ?? os.tmpdir(), "workbench-docker-environments", sourceHash.slice(0, 32));
-    const dockerfilePath = path.join(contextRoot, "Dockerfile");
-    await fs.rm(contextRoot, { recursive: true, force: true }).catch(() => undefined);
-    await fs.mkdir(contextRoot, { recursive: true });
-    await fs.writeFile(dockerfilePath, `${dockerfile}\n`, { mode: 0o600 });
-    await execFileAsync("docker", ["build", "-t", image, "-f", dockerfilePath, contextRoot], { maxBuffer: 20 * 1024 * 1024 });
-    return image;
 }
 async function prepareDockerSandboxWorkspace(args, request, startedAt) {
     const [{ execFile }, fs, os, path, { promisify }] = await Promise.all([
@@ -168,7 +184,7 @@ async function runDockerSandboxExecution(args, sandbox, execution) {
     const runtimeImport = readRequiredMetadataString(metadata, "runtimeImport", DOCKER_SANDBOX_BACKEND);
     const sandboxUid = readRequiredMetadataNumber(metadata, "sandboxUid", DOCKER_SANDBOX_BACKEND);
     const sandboxGid = readRequiredMetadataNumber(metadata, "sandboxGid", DOCKER_SANDBOX_BACKEND);
-    const progressTarget = readOptionalProgressTarget(metadata.progressTarget);
+    const progressTarget = args.progress ?? readOptionalProgressTarget(metadata.progressTarget);
     const network = asRuntimeRecord(metadata.network);
     const resources = execution.policy.resources;
     const tmpfsSize = dockerSize(resources.diskGb);
@@ -213,6 +229,8 @@ async function runDockerSandboxExecution(args, sandbox, execution) {
         "--env",
         "USER=workbench",
         "--env",
+        `PATH=${DOCKER_RUNTIME_MOUNT}/node_modules/.bin:/usr/local/bin:/usr/bin:/bin`,
+        "--env",
         `WORKBENCH_WORKSPACE_ROOT=${workspaceRoot}`,
         "--env",
         `WORKBENCH_RUNTIME_IMPORT=${runtimeImport}`,
@@ -564,17 +582,17 @@ function findDockerSourceRoot() {
     }
     const cwd = process.cwd();
     const moduleDir = path.dirname(fileURLToPath(import.meta.url));
-    const candidates = [
+    const roots = [
         cwd,
         path.resolve(cwd, ".."),
         path.resolve(cwd, "../.."),
         path.resolve(cwd, "../../.."),
         path.resolve(moduleDir, "../../../../../.."),
     ];
-    for (const candidate of candidates) {
-        if (existsSync(path.join(candidate, "products/workbench/packages/core/worker/sandbox-adapter-runner.cjs")) &&
-            existsSync(path.join(candidate, "products/workbench/packages/core/src/index.ts"))) {
-            return candidate;
+    for (const root of roots) {
+        if (existsSync(path.join(root, "products/workbench/packages/core/worker/sandbox-adapter-runner.cjs")) &&
+            existsSync(path.join(root, "products/workbench/packages/core/src/index.ts"))) {
+            return root;
         }
     }
     return null;

package/dist/sandbox-inputs.js

@@ -32,7 +32,7 @@ export function createWorkbenchSandboxFileStore(args) {
     };
 }
 export function materializeWorkbenchSandboxInput(args, execution, input) {
-    if (input.name === "candidate") {
+    if (input.name === "skill" || input.name === "skills") {
         return materializedFileInput(input, args.baseFiles);
     }
     if (input.name === "case") {
@@ -165,8 +165,8 @@ export async function executionResultFromCompletedSandboxJob(args) {
     };
 }
 export function outputPayloadForContract(output, outputName) {
-    if (outputName === "candidate_patch") {
-        return isJsonPayload(output.candidatePatch) ? output.candidatePatch : undefined;
+    if (outputName === "skill_patch") {
+        return isJsonPayload(output.skillPatch) ? output.skillPatch : undefined;
     }
     if (outputName === "result") {
         return isJsonPayload(output.result) ? output.result : undefined;

package/dist/sandbox-plane.d.ts.map

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

package/dist/sandbox-plane.js

@@ -1,4 +1,5 @@
 import { assertWorkbenchExecutionIsolation, validateWorkbenchExecutionOutputPayloads, } from "./execution-outputs.js";
+const SANDBOX_SETUP_TTL_BUFFER_MS = 15 * 60_000;
 export async function executeValidatedSandboxExecution(plane, execution, options) {
     assertWorkbenchExecutionIsolation(execution);
     assertSandboxBackendSupportsNetworkPolicy(plane.backend, execution);
@@ -146,7 +147,7 @@ export function createWorkbenchSandboxExecutionMetadata(args) {
         },
         capability: {
             ...args.capability,
-            candidate: { ...args.capability.candidate },
+            skill: { ...args.capability.skill },
             inputs: args.capability.inputs.map((input) => ({ ...input })),
             network: { ...args.capability.network },
         },
@@ -178,7 +179,7 @@ export function collectSandboxHandleScopeIssues(sandbox, allocation, execution)
 }
 export function createWorkbenchSandboxAllocation(execution, options) {
     const nowMs = options.now ? Date.parse(options.now) : Date.now();
-    const ttlMs = options.ttlMs ?? Math.max(60_000, execution.policy.resources.timeoutMinutes * 60_000 + 60_000);
+    const ttlMs = options.ttlMs ?? workbenchSandboxLifetimeTtlMs(execution);
     const safeExecutionId = execution.id.replace(/[^a-z0-9_]+/giu, "_");
     const nonce = allocationNonce();
     return {
@@ -208,14 +209,14 @@ function allocationNonce() {
 }
 export function createWorkbenchExecutionCapability(execution, options = {}) {
     const nowMs = options.now ? Date.parse(options.now) : Date.now();
-    const ttlMs = options.ttlMs ?? Math.max(60_000, execution.policy.resources.timeoutMinutes * 60_000 + 60_000);
+    const ttlMs = options.ttlMs ?? workbenchSandboxLifetimeTtlMs(execution);
     return {
         executionId: execution.id,
-        candidate: {
+        skill: {
             tenantId: execution.policy.tenantId,
             projectId: execution.projectId,
             runId: execution.runId,
-            ...(execution.candidateId ? { candidateId: execution.candidateId } : {}),
+            ...(execution.versionId ? { versionId: execution.versionId } : {}),
         },
         inputs: execution.inputs.map((input) => ({ ...input })),
         outputPrefix: options.outputPrefix ?? `executions/${execution.id}/outputs/`,
@@ -223,19 +224,22 @@ export function createWorkbenchExecutionCapability(execution, options = {}) {
         expiresAt: new Date(nowMs + ttlMs).toISOString(),
     };
 }
+function workbenchSandboxLifetimeTtlMs(execution) {
+    return Math.max(60_000, execution.policy.resources.timeoutMinutes * 60_000 + SANDBOX_SETUP_TTL_BUFFER_MS);
+}
 export function collectExecutionCapabilityScopeIssues(capability, execution, options = {}) {
     const issues = [];
     if (capability.executionId !== execution.id) {
         issues.push(`Capability execution id ${capability.executionId} does not match ${execution.id}.`);
     }
-    if (capability.candidate.tenantId !== execution.policy.tenantId) {
+    if (capability.skill.tenantId !== execution.policy.tenantId) {
         issues.push(`Capability tenant id does not match execution ${execution.id}.`);
     }
-    if (capability.candidate.projectId !== execution.projectId || capability.candidate.runId !== execution.runId) {
+    if (capability.skill.projectId !== execution.projectId || capability.skill.runId !== execution.runId) {
         issues.push(`Capability project/run scope does not match execution ${execution.id}.`);
     }
-    if ((capability.candidate.candidateId ?? null) !== (execution.candidateId ?? null)) {
-        issues.push(`Capability candidate scope does not match execution ${execution.id}.`);
+    if ((capability.skill.versionId ?? null) !== (execution.versionId ?? null)) {
+        issues.push(`Capability skill version scope does not match execution ${execution.id}.`);
     }
     if (!capability.outputPrefix.startsWith(`executions/${execution.id}/`)) {
         issues.push(`Capability output prefix must be scoped under executions/${execution.id}/.`);

package/dist/skill-patch.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"skill-patch.d.ts","sourceRoot":"","sources":["../src/skill-patch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC1C,KAAK,EAAE,mBAAmB,CAAC;IAC3B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,6BAA6B,GAAG,mBAAmB,EAAE,CAgDpG"}

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workbench-ai/workbench-core",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/workbench-ai/workbench.git",
@@ -22,8 +22,8 @@
   ],
   "dependencies": {
     "yaml": "^2.8.2",
-    "@workbench-ai/workbench-contract": "0.0.67",
-    "@workbench-ai/workbench-protocol": "0.0.67"
+    "@workbench-ai/workbench-contract": "0.0.69",
+    "@workbench-ai/workbench-protocol": "0.0.69"
   },
   "devDependencies": {
     "@types/node": "^24.3.1",

package/worker/sandbox-adapter-runner.cjs

@@ -214,7 +214,7 @@ function runtimeInputsFromInputBundle(bundle) {
     }
   }
   return {
-    baseFiles: filesByName.get("candidate") || [],
+    baseFiles: filesByName.get("skills") || filesByName.get("skill") || [],
     engineResolveFiles: filesByName.get("case") || [],
     traceFiles: filesByName.get("traces") || [],
   };
@@ -262,7 +262,7 @@ function isJson(value) {
 
 function collectExecutionMismatchIssues(jobExecution, execution) {
   const issues = [];
-  for (const key of ["id", "projectId", "runId", "candidateId", "purpose"]) {
+  for (const key of ["id", "projectId", "runId", "versionId", "purpose"]) {
     if ((jobExecution[key] ?? null) !== (execution[key] ?? null)) {
       issues.push(`job execution ${key} does not match request execution ${key}.`);
     }

package/dist/candidate-patch.d.ts

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

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

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

package/dist/execution-evidence.d.ts

@@ -1,22 +0,0 @@
-import type { CandidateCaseReview, RemoteWorkbenchJob, RemoteWorkbenchJobStatus, WorkbenchExecutionEventRole, WorkbenchExecutionSpec, WorkbenchExecutionTrace, WorkbenchExecutionEvidence, WorkbenchTraceSession } from "@workbench-ai/workbench-contract";
-export declare function buildCandidateCaseExecutionRefs(args: {
-    jobs: readonly RemoteWorkbenchJob[];
-    candidateId: string;
-    caseId: string;
-    sampleIndex?: number;
-}): CandidateCaseReview["executions"];
-export declare function buildWorkbenchExecutionEvidence(args: {
-    jobs: readonly RemoteWorkbenchJob[];
-    traceIdPrefix: string;
-    traceForJob: (job: RemoteWorkbenchJob, role: WorkbenchExecutionEventRole) => WorkbenchExecutionTrace;
-    traceSessionsForJob?: (job: RemoteWorkbenchJob, role: WorkbenchExecutionEventRole) => WorkbenchTraceSession[];
-}): WorkbenchExecutionEvidence[];
-export declare function readWorkbenchExecutionPurpose(job: RemoteWorkbenchJob): WorkbenchExecutionSpec["purpose"] | null;
-export declare function readWorkbenchExecutionId(job: RemoteWorkbenchJob): string | null;
-export declare function readWorkbenchExecutionMetadataString(job: RemoteWorkbenchJob, key: string): string | null;
-export declare function readWorkbenchExecutionMetadataNumber(job: RemoteWorkbenchJob, key: string): number | null;
-export declare function isWorkbenchExecutionActive(execution: CandidateCaseReview["executions"][number]): boolean;
-export declare function resolveWorkbenchJobGroupStatus(jobs: readonly {
-    status: RemoteWorkbenchJobStatus;
-}[]): RemoteWorkbenchJobStatus;
-//# sourceMappingURL=execution-evidence.d.ts.map

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

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