@workbench-ai/workbench-core 0.0.68 → 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-utils.d.ts

@@ -18,6 +18,6 @@ export declare function resolveDockerRuntimeImageRef(imageRef: string, options:
 }): string;
 export declare function normalizeRuntimeRegistry(value: string): string;
 export declare function normalizeWorkbenchWorkerId(value: unknown): string | undefined;
-export declare function resolveWorkbenchWorkerId(skills: readonly unknown[], fallback: string): string;
+export declare function resolveWorkbenchWorkerId(candidates: readonly unknown[], fallback: string): string;
 export declare function quoteShellArg(value: string): string;
 //# sourceMappingURL=runtime-utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"runtime-utils.d.ts","sourceRoot":"","sources":["../src/runtime-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAE1C,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAEvE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAIvE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAI/D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE9D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE9D;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAU9D;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,mBAAmB,EAAE,GACpC,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;CAAO,GACvD,OAAO,CAAC,mBAAmB,EAAE,CAAC,CA+ChC;AAwBD,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,kCAAkC,EAAE,IAAI,CAWtG;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,GAChF,MAAM,CASR;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9D;AAeD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAS7E;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAS7F;AAoBD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKnD"}
+{"version":3,"file":"runtime-utils.d.ts","sourceRoot":"","sources":["../src/runtime-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAE1C,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAEvE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAIvE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAI/D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE9D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE9D;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAU9D;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,mBAAmB,EAAE,GACpC,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;CAAO,GACvD,OAAO,CAAC,mBAAmB,EAAE,CAAC,CA+ChC;AAwBD,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,kCAAkC,EAAE,IAAI,CAWtG;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,GAChF,MAAM,CASR;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9D;AAeD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAS7E;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,SAAS,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CASjG;AAoBD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKnD"}

package/dist/runtime-utils.js

@@ -167,9 +167,9 @@ export function normalizeWorkbenchWorkerId(value) {
     }
     return NON_IDENTIFYING_WORKER_IDS.has(normalized.toLowerCase()) ? undefined : normalized;
 }
-export function resolveWorkbenchWorkerId(skills, fallback) {
-    for (const skill of skills) {
-        const normalized = normalizeWorkbenchWorkerId(skill);
+export function resolveWorkbenchWorkerId(candidates, fallback) {
+    for (const candidate of candidates) {
+        const normalized = normalizeWorkbenchWorkerId(candidate);
         if (normalized) {
             return normalized;
         }

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);
@@ -566,17 +582,17 @@ function findDockerSourceRoot() {
     }
     const cwd = process.cwd();
     const moduleDir = path.dirname(fileURLToPath(import.meta.url));
-    const skills = [
+    const roots = [
         cwd,
         path.resolve(cwd, ".."),
         path.resolve(cwd, "../.."),
         path.resolve(cwd, "../../.."),
         path.resolve(moduleDir, "../../../../../.."),
     ];
-    for (const skill of skills) {
-        if (existsSync(path.join(skill, "products/workbench/packages/core/worker/sandbox-adapter-runner.cjs")) &&
-            existsSync(path.join(skill, "products/workbench/packages/core/src/index.ts"))) {
-            return skill;
+    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workbench-ai/workbench-core",
-  "version": "0.0.68",
+  "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.68",
-    "@workbench-ai/workbench-protocol": "0.0.68"
+    "@workbench-ai/workbench-contract": "0.0.69",
+    "@workbench-ai/workbench-protocol": "0.0.69"
   },
   "devDependencies": {
     "@types/node": "^24.3.1",