@workbench-ai/workbench-built-in-adapters 0.0.64 → 0.0.66

package/dist/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAEV,IAAI,EAKL,MAAM,kCAAkC,CAAC;AAc1C,OAAO,KAAK,EAEV,0BAA0B,EAG3B,MAAM,iBAAiB,CAAC;AAQzB,MAAM,WAAW,4CAA4C;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC;AA4CD,wBAAsB,qCAAqC,CACzD,IAAI,GAAE,4CAAiD,GACtD,OAAO,CAAC,IAAI,CAAC,CAiEf"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAEV,IAAI,EAKL,MAAM,kCAAkC,CAAC;AAoB1C,OAAO,KAAK,EAEV,0BAA0B,EAG3B,MAAM,iBAAiB,CAAC;AAQzB,MAAM,WAAW,4CAA4C;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC;AAwDD,wBAAsB,qCAAqC,CACzD,IAAI,GAAE,4CAAiD,GACtD,OAAO,CAAC,IAAI,CAAC,CAiDf"}

package/dist/execute.js

@@ -2,10 +2,16 @@ import { spawn } from "node:child_process";
 import { promises as fs } from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { jsonRecord, normalizeRelativePath, readSurfaceFiles, writeSurfaceFiles, } from "@workbench-ai/workbench-core";
 import { ensureWorkbenchAdapterOutputDir, readWorkbenchAdapterOperationResult, readWorkbenchAdapterOperationRequest, runWorkbenchRuntimeOperationSequence, writeWorkbenchAdapterOperationResult, workbenchAdapterOperationResultPath, } from "@workbench-ai/workbench-protocol";
 import YAML from "yaml";
 import { isWorkbenchBuiltInAdapterId, adapterCommandName, } from "./manifests.js";
 import { importWorkbenchRuntime } from "./runtime.js";
+const DIRECT_ADAPTER_HANDLERS = {
+    command: executeCommandAdapterRequest,
+    tests: executeTestsEngineRequest,
+    workbench: executeWorkbenchEngineRequest,
+};
 const TASK_CONTROL_FILE = "task.yaml";
 const DEFAULT_RUBRIC_PARALLELISM = 4;
 export async function executeWorkbenchBuiltInAdapterCommand(args = {}) {
@@ -21,49 +27,33 @@ export async function executeWorkbenchBuiltInAdapterCommand(args = {}) {
         request.paths.output = args.outputRoot;
     }
     await ensureWorkbenchAdapterOutputDir(request);
-    if (adapterId === "workbench") {
-        await executeWorkbenchEngineRequest(request);
-        return;
-    }
-    if (adapterId === "command") {
-        await executeCommandAdapterRequest(request);
-        return;
-    }
-    if (adapterId === "tests") {
-        await executeTestsEngineRequest(request);
+    const agentOptions = {
+        agentExecutor: args.agentExecutor,
+        adapterAuthRoot: args.adapterAuthRoot,
+        adapterAuthRequest: args.adapterAuthRequest ?? request.auth,
+        adapterAuthEnv: args.adapterAuthEnv,
+    };
+    const directHandler = DIRECT_ADAPTER_HANDLERS[adapterId];
+    if (directHandler) {
+        await directHandler(request);
         return;
     }
     if (adapterId === "rubric") {
         if (request.operation !== "engine.run") {
             throw new Error(`Rubric adapter cannot handle ${request.operation}.`);
         }
-        await writeRubricJudgeResult(request, workloadFromAdapterOperationRequest(request), builtInRubricSpecFromRequest(request), {
-            agentExecutor: args.agentExecutor,
-            adapterAuthRoot: args.adapterAuthRoot,
-            adapterAuthRequest: args.adapterAuthRequest ?? request.auth,
-            adapterAuthEnv: args.adapterAuthEnv,
-        });
+        await writeRubricJudgeResult(request, workloadFromAdapterOperationRequest(request), builtInRubricSpecFromRequest(request), agentOptions);
         return;
     }
     if (isBuiltInAgentAdapterId(adapterId)) {
         const workload = workloadFromAdapterOperationRequest(request);
         const agent = builtInAgentSpecFromRequest(request);
         if (request.operation === "candidate.improve") {
-            await writeAgentCandidateRevisionOutput(request, workload, agent, {
-                agentExecutor: args.agentExecutor,
-                adapterAuthRoot: args.adapterAuthRoot,
-                adapterAuthRequest: args.adapterAuthRequest ?? request.auth,
-                adapterAuthEnv: args.adapterAuthEnv,
-            });
+            await writeAgentCandidateRevisionOutput(request, workload, agent, agentOptions);
             return;
         }
         if (request.operation === "candidate.run") {
-            await writeAgentCandidateOutput(request, workload, agent, {
-                agentExecutor: args.agentExecutor,
-                adapterAuthRoot: args.adapterAuthRoot,
-                adapterAuthRequest: args.adapterAuthRequest ?? request.auth,
-                adapterAuthEnv: args.adapterAuthEnv,
-            });
+            await writeAgentCandidateOutput(request, workload, agent, agentOptions);
             return;
         }
         throw new Error(`Agent adapter ${adapterId} cannot handle ${request.operation}.`);
@@ -270,7 +260,7 @@ async function readOptionalSurfaceFiles(root) {
     if (!root) {
         return [];
     }
-    return await readSurfaceFilesRecursive(root).catch((error) => {
+    return await readSurfaceFiles(root).catch((error) => {
         if (error.code === "ENOENT") {
             return [];
         }
@@ -434,26 +424,14 @@ async function snapshotEditableCandidateWorkspace(request) {
     };
 }
 async function readEditableCandidateWorkspaceFiles(root, edits) {
-    const files = [];
-    for (const edit of edits) {
-        const normalized = normalizeRelativePath(edit);
-        if (!normalized || isRuntimeWorkspacePath(normalized)) {
-            continue;
-        }
-        const absolutePath = path.join(root, normalized);
-        const stat = await fs.stat(absolutePath).catch(() => null);
-        if (!stat) {
-            continue;
-        }
-        if (stat.isDirectory()) {
-            await readSurfaceFilesInto(root, normalized, files);
-            continue;
-        }
-        if (stat.isFile()) {
-            files.push(await readSurfaceFile(root, normalized));
-        }
+    const editPaths = edits
+        .map(normalizeRelativePath)
+        .filter((filePath) => !isRuntimeWorkspacePath(filePath));
+    if (editPaths.length === 0) {
+        return [];
     }
-    return dedupeSurfaceFiles(files.filter((file) => isCandidateEditPath(file.path, edits) &&
+    const files = await readSurfaceFiles(root);
+    return dedupeSurfaceFiles(files.filter((file) => isCandidateEditPath(file.path, editPaths) &&
         !isRuntimeWorkspacePath(file.path)));
 }
 async function firstExistingFile(files) {
@@ -499,7 +477,7 @@ async function listWorkbenchTaskDirectories(root) {
     return tasks.sort((left, right) => left.localeCompare(right));
 }
 async function readWorkbenchEngineCase(args) {
-    const sourceFiles = await readSurfaceFilesRecursive(args.taskDir);
+    const sourceFiles = await readSurfaceFiles(args.taskDir);
     const taskFile = sourceFiles.find((file) => normalizeRelativePath(file.path) === TASK_CONTROL_FILE && file.encoding === "utf8");
     if (!taskFile) {
         throw new Error(`Task ${args.id} is missing ${TASK_CONTROL_FILE}.`);
@@ -579,42 +557,6 @@ function stripTaskDirectory(files, prefix) {
         return [{ ...file, path: normalized.slice(prefix.length) }];
     }).sort((left, right) => left.path.localeCompare(right.path));
 }
-async function readSurfaceFilesRecursive(root) {
-    const result = [];
-    await readSurfaceFilesInto(root, "", result);
-    return result.sort((left, right) => left.path.localeCompare(right.path));
-}
-async function readSurfaceFilesInto(root, relativeDir, result) {
-    const entries = await fs.readdir(path.join(root, relativeDir), { withFileTypes: true });
-    for (const entry of entries) {
-        const relativePath = normalizeRelativePath(path.join(relativeDir, entry.name));
-        const absolutePath = path.join(root, relativePath);
-        if (entry.isDirectory()) {
-            await readSurfaceFilesInto(root, relativePath, result);
-            continue;
-        }
-        if (!entry.isFile()) {
-            continue;
-        }
-        result.push(await readSurfaceFile(root, relativePath));
-    }
-}
-async function readSurfaceFile(root, relativePath) {
-    const absolutePath = path.join(root, normalizeRelativePath(relativePath));
-    const [body, stat] = await Promise.all([
-        fs.readFile(absolutePath),
-        fs.stat(absolutePath),
-    ]);
-    const text = body.toString("utf8");
-    const isUtf8 = Buffer.from(text, "utf8").equals(body);
-    return {
-        path: normalizeRelativePath(relativePath),
-        kind: isUtf8 ? "text" : "binary",
-        encoding: isUtf8 ? "utf8" : "base64",
-        content: isUtf8 ? text : body.toString("base64"),
-        executable: (stat.mode & 0o111) !== 0,
-    };
-}
 async function fileExists(filePath) {
     return fs.stat(filePath).then((stat) => stat.isFile(), () => false);
 }
@@ -1340,9 +1282,9 @@ function requireWorkloadTask(workload, label) {
     }
 }
 async function createCandidatePatchFromWorkspace(args) {
-    const before = new Map((await readSurfaceFilesRecursive(args.beforeRoot))
+    const before = new Map((await readSurfaceFiles(args.beforeRoot))
         .map((file) => [normalizeRelativePath(file.path), file]));
-    const changedFiles = (await readSurfaceFilesRecursive(args.afterRoot))
+    const changedFiles = (await readSurfaceFiles(args.afterRoot))
         .map((file) => ({ ...file, path: normalizeRelativePath(file.path) }))
         .filter((file) => isCandidateEditPath(file.path, args.edits) &&
         !isRuntimeWorkspacePath(file.path) &&
@@ -1371,19 +1313,6 @@ function isRuntimeWorkspacePath(filePath) {
         normalized === "private" ||
         normalized.startsWith("private/");
 }
-async function writeSurfaceFiles(root, files) {
-    for (const file of files) {
-        const target = path.join(root, normalizeRelativePath(file.path));
-        await fs.mkdir(path.dirname(target), { recursive: true });
-        const body = file.encoding === "base64"
-            ? Buffer.from(file.content, "base64")
-            : Buffer.from(file.content, "utf8");
-        await fs.writeFile(target, body);
-        if (file.executable) {
-            await fs.chmod(target, 0o755).catch(() => undefined);
-        }
-    }
-}
 function isCandidateEditPath(filePath, edits) {
     const normalized = normalizeRelativePath(filePath);
     return edits.some((entry) => {
@@ -1391,10 +1320,6 @@ function isCandidateEditPath(filePath, edits) {
         return normalized === editPath || normalized.startsWith(`${editPath}/`);
     });
 }
-function normalizeRelativePath(filePath) {
-    const normalized = filePath.replace(/\\/gu, "/").replace(/^\/+/u, "");
-    return normalized.split("/").filter(Boolean).join("/");
-}
 function parseAgentJsonObject(output, label) {
     const trimmed = output.trim();
     const start = trimmed.indexOf("{");
@@ -1491,16 +1416,3 @@ function weightedCriteriaScore(criteria, specCriteria) {
     }
     return denominator > 0 ? Number((numerator / denominator).toFixed(6)) : undefined;
 }
-function jsonRecord(value) {
-    return value && typeof value === "object" && !Array.isArray(value)
-        ? value
-        : {};
-}
-function isJsonPayload(value) {
-    return value === null ||
-        typeof value === "string" ||
-        typeof value === "number" ||
-        typeof value === "boolean" ||
-        (Array.isArray(value) && value.every(isJsonPayload)) ||
-        (typeof value === "object" && value !== null && Object.values(value).every(isJsonPayload));
-}

package/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@workbench-ai/workbench-built-in-adapters",
-  "version": "0.0.64",
+  "version": "0.0.66",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/workbench-ai/workbench.git",
+    "directory": "packages/built-in-adapters"
+  },
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,10 +34,10 @@
     "yaml": "^2.8.2",
     "@workbench-ai/agent-driver-anthropic-claude-code": "0.0.46",
     "@workbench-ai/agent-driver-openai-codex": "0.0.46",
-    "@workbench-ai/workbench-protocol": "0.0.64",
+    "@workbench-ai/workbench-contract": "0.0.66",
     "@workbench-ai/agent-driver": "0.0.46",
-    "@workbench-ai/workbench-contract": "0.0.64",
-    "@workbench-ai/workbench-core": "0.0.64"
+    "@workbench-ai/workbench-core": "0.0.66",
+    "@workbench-ai/workbench-protocol": "0.0.66"
   },
   "devDependencies": {
     "@types/node": "^24.3.1",