@workbench-ai/workbench 0.0.51 → 0.0.52

package/dist/benchmark-fingerprint.d.ts

@@ -1,6 +1,4 @@
-import type { SurfaceSnapshotFile } from "@workbench-ai/workbench-core";
-import type { LocalProjectSource } from "./project-source.js";
+import { type LocalProjectSource } from "./project-source.js";
 export declare function localBenchmarkFingerprint(project: LocalProjectSource): string;
 export declare function localCandidateFingerprint(project: LocalProjectSource): string;
-export declare function benchmarkFingerprintForFiles(files: readonly SurfaceSnapshotFile[]): string;
 //# sourceMappingURL=benchmark-fingerprint.d.ts.map

package/dist/benchmark-fingerprint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"benchmark-fingerprint.d.ts","sourceRoot":"","sources":["../src/benchmark-fingerprint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAO7E;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAM7E;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,SAAS,mBAAmB,EAAE,GACpC,MAAM,CAgBR"}
+{"version":3,"file":"benchmark-fingerprint.d.ts","sourceRoot":"","sources":["../src/benchmark-fingerprint.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAE7B,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAW7E;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAO7E"}

package/dist/benchmark-fingerprint.js

@@ -1,99 +1,31 @@
-import { createHash } from "node:crypto";
+import { engineResolveBindingForSpec, workbenchBenchmarkContentFingerprint, workbenchCandidateContentFingerprint, } from "@workbench-ai/workbench-core";
+import { hostedEngineResolveFiles, } from "./project-source.js";
 export function localBenchmarkFingerprint(project) {
-    return benchmarkFingerprintForFiles([
-        textFile("benchmark.yaml", project.benchmarkSource),
-        ...prefixFiles(project.engineResolveFiles.map(toSurfaceFile), project.engineResolveFingerprintPath),
-        ...benchmarkDockerfileFiles(project),
-        ...benchmarkAdapterFiles(project),
-    ]);
+    return workbenchBenchmarkContentFingerprint({
+        sourceYaml: project.specSource,
+        engineResolveFiles: hostedEngineResolveFiles(project).map(toSurfaceFile),
+        engineResolveBinding: engineResolveBindingForSpec(project.spec),
+        adapterFiles: project.adapterFiles.map(toSurfaceFile),
+        adapterManifests: project.adapters.map((adapter) => adapter.manifest),
+        runtimeFiles: project.dockerfileFiles.map(toSurfaceFile),
+        resources: project.spec.environment.resources ?? {},
+        network: project.spec.environment.network?.egress === "open" ? "on" : "off",
+    });
 }
 export function localCandidateFingerprint(project) {
-    const hash = createHash("sha256");
-    hash.update("workbench-candidate-v1\0");
-    hash.update(project.candidateSource);
-    hashSurfaceFiles(hash, project.candidateFiles);
-    return hash.digest("hex");
-}
-export function benchmarkFingerprintForFiles(files) {
-    const hash = createHash("sha256");
-    hash.update("workbench-benchmark-fingerprint-v1\0");
-    for (const file of files
-        .map((entry) => ({ ...entry, path: normalizeLocalPath(entry.path) }))
-        .sort((left, right) => left.path.localeCompare(right.path))) {
-        hash.update(file.path);
-        hash.update("\0");
-        hash.update(file.encoding ?? "utf8");
-        hash.update("\0");
-        hash.update(file.executable ? "1" : "0");
-        hash.update("\0");
-        hash.update(file.content);
-        hash.update("\0");
-    }
-    return hash.digest("hex");
-}
-function benchmarkDockerfileFiles(project) {
-    const dockerfilePath = normalizeLocalPath(project.spec.environment.dockerfile);
-    return project.dockerfileFiles.filter((file) => normalizeLocalPath(file.path) === dockerfilePath).map(toSurfaceFile);
-}
-function benchmarkAdapterFiles(project) {
-    const roots = project.benchmarkAdapterSources.map(normalizeLocalPath);
-    const adapterIdRoots = project.benchmarkAdapterIds.map((id) => normalizeLocalPath(`adapters/${id}`));
-    const allRoots = [...roots, ...adapterIdRoots];
-    if (allRoots.length === 0) {
-        return [];
-    }
-    return project.adapterFiles.filter((file) => allRoots.some((root) => isWithinLocalPath(file.path, root))).map(toSurfaceFile);
-}
-function hashSurfaceFiles(hash, files) {
-    for (const file of files.slice().sort((left, right) => left.path.localeCompare(right.path))) {
-        hash.update("\0file\0");
-        hash.update(file.path);
-        hash.update("\0");
-        hash.update(file.encoding ?? "utf8");
-        hash.update("\0");
-        hash.update(file.content);
-        hash.update("\0");
-        hash.update(file.executable ? "1" : "0");
-    }
-}
-function prefixFiles(files, rootPath) {
-    const root = normalizeLocalPath(rootPath);
-    return files.map((file) => {
-        const filePath = normalizeLocalPath(file.path);
-        return {
-            ...file,
-            path: isWithinLocalPath(filePath, root) ? filePath : `${root}/${filePath}`,
-        };
+    return workbenchCandidateContentFingerprint({
+        sourceYaml: project.specSource,
+        candidateFiles: project.candidateFiles.map(toSurfaceFile),
+        adapterFiles: project.adapterFiles.map(toSurfaceFile),
+        adapterManifests: project.adapters.map((adapter) => adapter.manifest),
     });
 }
-function textFile(filePath, content) {
-    return {
-        path: filePath,
-        kind: "text",
-        encoding: "utf8",
-        content,
-        executable: false,
-    };
-}
 function toSurfaceFile(file) {
     return {
         path: file.path,
-        kind: "text",
+        kind: "kind" in file ? file.kind : file.encoding === "base64" ? "binary" : "text",
         encoding: file.encoding ?? "utf8",
         content: file.content,
-        executable: file.executable ?? false,
+        executable: file.executable === true,
     };
 }
-function isWithinLocalPath(filePath, rootPath) {
-    const normalizedFile = normalizeLocalPath(filePath);
-    const normalizedRoot = normalizeLocalPath(rootPath);
-    return normalizedFile === normalizedRoot ||
-        normalizedFile.startsWith(`${normalizedRoot}/`);
-}
-function normalizeLocalPath(value) {
-    return value
-        .replace(/\\/gu, "/")
-        .replace(/^\/+/u, "")
-        .replace(/\/+/gu, "/")
-        .replace(/^(?:\.\/)+/u, "");
-}

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

@@ -1 +1 @@
-{"version":3,"file":"command-model.d.ts","sourceRoot":"","sources":["../src/command-model.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,6BAA6B,sHAC2E,CAAC;AAOtH,eAAO,MAAM,2BAA2B,QAA0C,CAAC;AA0EnF,eAAO,MAAM,SAAS,QAAuB,CAAC;AAoY9C,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE/D"}
+{"version":3,"file":"command-model.d.ts","sourceRoot":"","sources":["../src/command-model.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,6BAA6B,sHAC2E,CAAC;AAOtH,eAAO,MAAM,2BAA2B,QAA0C,CAAC;AA4EnF,eAAO,MAAM,SAAS,QAAuB,CAAC;AAoY9C,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE/D"}

package/dist/command-model.js

@@ -35,8 +35,10 @@ const rootLines = [
     "  workbench adapters test ID|SOURCE [--dir DIR] [--request PATH] [--output DIR] [--json]",
     "",
     "Runs:",
-    "  workbench eval [SOURCE] [--dir DIR] [--hosted] [--benchmark OWNER/BENCHMARK] [--candidate CANDIDATE_ID] [--base CANDIDATE_ID] [--runs RUNS|all] [--samples N] [--rerun] [--watch] [--dry-run] [--json]",
-    "  workbench improve [SOURCE] [--dir DIR] [--hosted] [--benchmark OWNER/BENCHMARK] [--from CANDIDATE_ID] [--base CANDIDATE_ID] [--runs RUN] [--budget N] [--samples N] [--rerun] [--watch] [--dry-run] [--json]",
+    "  workbench eval [SOURCE] [--dir DIR] [--candidate CANDIDATE_ID] [--runs RUNS|all] [--samples N] [--rerun] [--json]",
+    "  workbench eval --hosted [SOURCE] [--dir DIR] [--benchmark OWNER/BENCHMARK] [--candidate CANDIDATE_ID] [--runs RUNS|all] [--samples N] [--rerun] [--watch] [--dry-run] [--json]",
+    "  workbench improve [SOURCE] [--dir DIR] [--from CANDIDATE_ID] [--runs RUN] [--budget N] [--samples N] [--rerun] [--json]",
+    "  workbench improve --hosted [SOURCE] [--dir DIR] [--benchmark OWNER/BENCHMARK] [--base CANDIDATE_ID] [--runs RUN] [--budget N] [--samples N] [--rerun] [--watch] [--dry-run] [--json]",
     "  workbench retry TARGET_ID [--dir DIR] [--hosted] [--benchmark OWNER/BENCHMARK] [--watch] [--interval-ms N] [--timeout-ms N] [--json]",
     "  workbench open [SOURCE|OWNER/BENCHMARK|RUN_ID|CANDIDATE_ID] [--dir DIR] [--hosted] [--benchmark OWNER/BENCHMARK] [--run RUN_ID] [--host HOST] [--port N] [--no-open] [--json]",
     "  workbench restore [--dir DIR] [--candidate CANDIDATE_ID] [--dry-run] [--yes] [--json]",
@@ -124,7 +126,7 @@ const commandHelp = Object.fromEntries(Object.entries({
     eval: withSourceDirectoryHelp(withLifecycleHelp([
         "Usage:",
         "  workbench eval [SOURCE] [--dir DIR] [--candidate CANDIDATE_ID] [--runs RUNS|all] [--samples N] [--rerun] [--json]",
-        "  workbench eval --hosted [SOURCE] [--dir DIR] [--benchmark OWNER/BENCHMARK] [--base CANDIDATE_ID] [--runs RUNS|all] [--samples N] [--rerun] [--watch] [--dry-run] [--json]",
+        "  workbench eval --hosted [SOURCE] [--dir DIR] [--benchmark OWNER/BENCHMARK] [--candidate CANDIDATE_ID] [--runs RUNS|all] [--samples N] [--rerun] [--watch] [--dry-run] [--json]",
         "",
         "Ensure the selected candidate run has an evaluation for the current benchmark. Without --hosted, execution writes local records. With --hosted, Workbench starts or reuses a hosted run against the configured remote or --benchmark target. Completed work is reused only when candidate, run configuration, source, adapters, benchmark, and samples match; use --rerun to intentionally spend again.",
         "",