agent-hitch 0.2.7 → 0.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -2
- package/README.zh-CN.md +14 -2
- package/dist/bin/hitch.js +25 -3
- package/dist/bin/hitch.js.map +1 -1
- package/dist/scripts/canary-benchmark.js +54 -0
- package/dist/scripts/canary-benchmark.js.map +1 -0
- package/dist/scripts/canary-eval-scheduler-throughput.js +47 -0
- package/dist/scripts/canary-eval-scheduler-throughput.js.map +1 -0
- package/dist/scripts/check-architecture.js +3 -2
- package/dist/scripts/check-architecture.js.map +1 -1
- package/dist/src/adapters/catalog.js +2 -1
- package/dist/src/adapters/catalog.js.map +1 -1
- package/dist/src/adapters/providers/codex-auth.js +29 -0
- package/dist/src/adapters/providers/codex-auth.js.map +1 -0
- package/dist/src/adapters/providers/codex.js +23 -6
- package/dist/src/adapters/providers/codex.js.map +1 -1
- package/dist/src/adapters/providers/model-call.js +26 -0
- package/dist/src/adapters/providers/model-call.js.map +1 -0
- package/dist/src/artifacts/index.js +1 -1
- package/dist/src/artifacts/index.js.map +1 -1
- package/dist/src/artifacts/preparer.js +7 -2
- package/dist/src/artifacts/preparer.js.map +1 -1
- package/dist/src/backends/harbor/agent-budget.js +31 -0
- package/dist/src/backends/harbor/agent-budget.js.map +1 -0
- package/dist/src/backends/harbor/backend.js +6 -4
- package/dist/src/backends/harbor/backend.js.map +1 -1
- package/dist/src/backends/harbor/index.js +1 -0
- package/dist/src/backends/harbor/index.js.map +1 -1
- package/dist/src/backends/harbor/regrade.js +77 -0
- package/dist/src/backends/harbor/regrade.js.map +1 -0
- package/dist/src/backends/index.js +1 -0
- package/dist/src/backends/index.js.map +1 -1
- package/dist/src/benchmarks/index.js +3 -0
- package/dist/src/benchmarks/index.js.map +1 -0
- package/dist/src/benchmarks/loader.js +271 -0
- package/dist/src/benchmarks/loader.js.map +1 -0
- package/dist/src/benchmarks/metrics.js +16 -0
- package/dist/src/benchmarks/metrics.js.map +1 -0
- package/dist/src/benchmarks/toml.js +13 -0
- package/dist/src/benchmarks/toml.js.map +1 -0
- package/dist/src/benchmarks/validation.js +242 -0
- package/dist/src/benchmarks/validation.js.map +1 -0
- package/dist/src/cli/arguments.js +6 -4
- package/dist/src/cli/arguments.js.map +1 -1
- package/dist/src/cli/commands/benchmark.js +22 -0
- package/dist/src/cli/commands/benchmark.js.map +1 -0
- package/dist/src/cli/commands/capabilities.js +18 -0
- package/dist/src/cli/commands/capabilities.js.map +1 -0
- package/dist/src/cli/commands/eval.js +15 -3
- package/dist/src/cli/commands/eval.js.map +1 -1
- package/dist/src/cli/commands/run.js +37 -15
- package/dist/src/cli/commands/run.js.map +1 -1
- package/dist/src/cli/commands/trajectory.js +96 -5
- package/dist/src/cli/commands/trajectory.js.map +1 -1
- package/dist/src/cli/commands/verifier.js +36 -0
- package/dist/src/cli/commands/verifier.js.map +1 -0
- package/dist/src/cli/main.js +6 -0
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/cli/output.js +14 -2
- package/dist/src/cli/output.js.map +1 -1
- package/dist/src/control-plane/eval-control-work.js +5 -0
- package/dist/src/control-plane/eval-control-work.js.map +1 -1
- package/dist/src/control-plane/eval-scheduler.js +4 -1
- package/dist/src/control-plane/eval-scheduler.js.map +1 -1
- package/dist/src/control-plane/index.js +1 -1
- package/dist/src/control-plane/index.js.map +1 -1
- package/dist/src/control-plane/remote-result-transport.js +3 -0
- package/dist/src/control-plane/remote-result-transport.js.map +1 -1
- package/dist/src/control-plane/remote-work-coordinator.js +1 -0
- package/dist/src/control-plane/remote-work-coordinator.js.map +1 -1
- package/dist/src/control-plane/remote-work-item.js +62 -0
- package/dist/src/control-plane/remote-work-item.js.map +1 -0
- package/dist/src/control-plane/remote-work-recovery.js +44 -5
- package/dist/src/control-plane/remote-work-recovery.js.map +1 -1
- package/dist/src/control-plane/remote-worker-protocol.js +2 -23
- package/dist/src/control-plane/remote-worker-protocol.js.map +1 -1
- package/dist/src/control-plane/rerun-scheduler.js +51 -14
- package/dist/src/control-plane/rerun-scheduler.js.map +1 -1
- package/dist/src/control-plane/rerun-submission.js +10 -4
- package/dist/src/control-plane/rerun-submission.js.map +1 -1
- package/dist/src/control-plane/work-admission.js +2 -0
- package/dist/src/control-plane/work-admission.js.map +1 -1
- package/dist/src/control-plane/work-dispatcher.js +9 -1
- package/dist/src/control-plane/work-dispatcher.js.map +1 -1
- package/dist/src/controller-runtime/hash.js +7 -2
- package/dist/src/controller-runtime/hash.js.map +1 -1
- package/dist/src/daemon/auth.js +5 -0
- package/dist/src/daemon/auth.js.map +1 -1
- package/dist/src/domain/benchmarks.js +2 -0
- package/dist/src/domain/benchmarks.js.map +1 -0
- package/dist/src/domain/index.js +4 -0
- package/dist/src/domain/index.js.map +1 -1
- package/dist/src/domain/runs.js.map +1 -1
- package/dist/src/domain/validation.js +11 -4
- package/dist/src/domain/validation.js.map +1 -1
- package/dist/src/domain/verifier-evidence-validation.js +214 -0
- package/dist/src/domain/verifier-evidence-validation.js.map +1 -0
- package/dist/src/domain/verifier-evidence.js +3 -0
- package/dist/src/domain/verifier-evidence.js.map +1 -0
- package/dist/src/domain/verifier-score-contract.js +232 -0
- package/dist/src/domain/verifier-score-contract.js.map +1 -0
- package/dist/src/evals/benchmark-adapter-manifest.js +219 -0
- package/dist/src/evals/benchmark-adapter-manifest.js.map +1 -0
- package/dist/src/evals/benchmark-candidate.js +36 -0
- package/dist/src/evals/benchmark-candidate.js.map +1 -0
- package/dist/src/evals/benchmark-run.js +166 -0
- package/dist/src/evals/benchmark-run.js.map +1 -0
- package/dist/src/evals/collect-only-rerun.js +2 -1
- package/dist/src/evals/collect-only-rerun.js.map +1 -1
- package/dist/src/evals/directory.js +1 -1
- package/dist/src/evals/directory.js.map +1 -1
- package/dist/src/evals/duration-estimator.js +126 -0
- package/dist/src/evals/duration-estimator.js.map +1 -0
- package/dist/src/evals/eval-lifecycle-events.js +13 -0
- package/dist/src/evals/eval-lifecycle-events.js.map +1 -1
- package/dist/src/evals/eval-logical-plan.js +51 -0
- package/dist/src/evals/eval-logical-plan.js.map +1 -0
- package/dist/src/evals/eval-result-builder.js +81 -0
- package/dist/src/evals/eval-result-builder.js.map +1 -0
- package/dist/src/evals/evolution-baseline.js +191 -0
- package/dist/src/evals/evolution-baseline.js.map +1 -0
- package/dist/src/evals/execution-plan.js +39 -3
- package/dist/src/evals/execution-plan.js.map +1 -1
- package/dist/src/evals/failure-classifier.js +61 -0
- package/dist/src/evals/failure-classifier.js.map +1 -0
- package/dist/src/evals/harbor-artifact-builder.js +6 -2
- package/dist/src/evals/harbor-artifact-builder.js.map +1 -1
- package/dist/src/evals/harbor-bridge-error.js +41 -1
- package/dist/src/evals/harbor-bridge-error.js.map +1 -1
- package/dist/src/evals/harbor-node-runtime.js +146 -0
- package/dist/src/evals/harbor-node-runtime.js.map +1 -0
- package/dist/src/evals/index.js +15 -0
- package/dist/src/evals/index.js.map +1 -1
- package/dist/src/evals/infrastructure-retry.js +109 -22
- package/dist/src/evals/infrastructure-retry.js.map +1 -1
- package/dist/src/evals/native-phase-evidence.js +440 -0
- package/dist/src/evals/native-phase-evidence.js.map +1 -0
- package/dist/src/evals/physical-retry-work.js +31 -0
- package/dist/src/evals/physical-retry-work.js.map +1 -0
- package/dist/src/evals/planned-execution-support.js +22 -10
- package/dist/src/evals/planned-execution-support.js.map +1 -1
- package/dist/src/evals/planned-execution.js +120 -112
- package/dist/src/evals/planned-execution.js.map +1 -1
- package/dist/src/evals/planned-progress-publisher.js +62 -0
- package/dist/src/evals/planned-progress-publisher.js.map +1 -0
- package/dist/src/evals/planned-retry-execution.js +174 -0
- package/dist/src/evals/planned-retry-execution.js.map +1 -0
- package/dist/src/evals/planned-retry-lifecycle.js +4 -2
- package/dist/src/evals/planned-retry-lifecycle.js.map +1 -1
- package/dist/src/evals/preparation-rerun.js +225 -0
- package/dist/src/evals/preparation-rerun.js.map +1 -0
- package/dist/src/evals/progress.js +48 -8
- package/dist/src/evals/progress.js.map +1 -1
- package/dist/src/evals/recovery.js +54 -4
- package/dist/src/evals/recovery.js.map +1 -1
- package/dist/src/evals/regrade-evidence.js +77 -0
- package/dist/src/evals/regrade-evidence.js.map +1 -0
- package/dist/src/evals/remote-infrastructure-retry.js +84 -18
- package/dist/src/evals/remote-infrastructure-retry.js.map +1 -1
- package/dist/src/evals/request.js +21 -3
- package/dist/src/evals/request.js.map +1 -1
- package/dist/src/evals/rerun-inputs.js +19 -0
- package/dist/src/evals/rerun-inputs.js.map +1 -1
- package/dist/src/evals/rerun-types.js +2 -6
- package/dist/src/evals/rerun-types.js.map +1 -1
- package/dist/src/evals/rerun.js +27 -20
- package/dist/src/evals/rerun.js.map +1 -1
- package/dist/src/evals/result-helpers.js +13 -0
- package/dist/src/evals/result-helpers.js.map +1 -1
- package/dist/src/evals/retry-backoff.js +20 -0
- package/dist/src/evals/retry-backoff.js.map +1 -0
- package/dist/src/evals/retry-state.js +195 -0
- package/dist/src/evals/retry-state.js.map +1 -0
- package/dist/src/evals/scheduler-metrics.js +95 -0
- package/dist/src/evals/scheduler-metrics.js.map +1 -0
- package/dist/src/evals/scheduler-trace-replay.js +107 -0
- package/dist/src/evals/scheduler-trace-replay.js.map +1 -0
- package/dist/src/evals/service.js +87 -138
- package/dist/src/evals/service.js.map +1 -1
- package/dist/src/evals/trial-import.js +47 -50
- package/dist/src/evals/trial-import.js.map +1 -1
- package/dist/src/evals/trial-publication-recovery.js +45 -5
- package/dist/src/evals/trial-publication-recovery.js.map +1 -1
- package/dist/src/evals/trial-reference-validation.js +49 -0
- package/dist/src/evals/trial-reference-validation.js.map +1 -0
- package/dist/src/evals/verifier-artifacts.js +317 -0
- package/dist/src/evals/verifier-artifacts.js.map +1 -0
- package/dist/src/evals/verifier-eligibility.js +25 -0
- package/dist/src/evals/verifier-eligibility.js.map +1 -0
- package/dist/src/evals/verifier-only-rerun.js +210 -0
- package/dist/src/evals/verifier-only-rerun.js.map +1 -0
- package/dist/src/evals/verifier-runtime.js +61 -0
- package/dist/src/evals/verifier-runtime.js.map +1 -0
- package/dist/src/evals/verifier-score-artifacts.js +119 -0
- package/dist/src/evals/verifier-score-artifacts.js.map +1 -0
- package/dist/src/foundation/contained-file.js +85 -0
- package/dist/src/foundation/contained-file.js.map +1 -0
- package/dist/src/foundation/credential-redaction.js +26 -1
- package/dist/src/foundation/credential-redaction.js.map +1 -1
- package/dist/src/foundation/fs.js +2 -1
- package/dist/src/foundation/fs.js.map +1 -1
- package/dist/src/foundation/index.js +2 -1
- package/dist/src/foundation/index.js.map +1 -1
- package/dist/src/runs/adapter-process.js +12 -0
- package/dist/src/runs/adapter-process.js.map +1 -0
- package/dist/src/runs/executor.js +24 -30
- package/dist/src/runs/executor.js.map +1 -1
- package/dist/src/runs/finalizer.js +17 -0
- package/dist/src/runs/finalizer.js.map +1 -1
- package/dist/src/runs/index.js +5 -0
- package/dist/src/runs/index.js.map +1 -1
- package/dist/src/runs/phase-bundle.js +86 -0
- package/dist/src/runs/phase-bundle.js.map +1 -0
- package/dist/src/runs/phase-cancellation.js +107 -0
- package/dist/src/runs/phase-cancellation.js.map +1 -0
- package/dist/src/runs/phase-group.js +113 -0
- package/dist/src/runs/phase-group.js.map +1 -0
- package/dist/src/runs/query.js +1 -1
- package/dist/src/runs/query.js.map +1 -1
- package/dist/src/runs/records.js +3 -0
- package/dist/src/runs/records.js.map +1 -1
- package/dist/src/runs/request.js +4 -2
- package/dist/src/runs/request.js.map +1 -1
- package/dist/src/runs/verifier-evidence-redaction.js +61 -0
- package/dist/src/runs/verifier-evidence-redaction.js.map +1 -0
- package/dist/src/runs/verifier-evidence.js +459 -0
- package/dist/src/runs/verifier-evidence.js.map +1 -0
- package/dist/src/runs/verifier-structured-evidence.js +83 -0
- package/dist/src/runs/verifier-structured-evidence.js.map +1 -0
- package/dist/src/trajectories/analysis.js +288 -0
- package/dist/src/trajectories/analysis.js.map +1 -0
- package/dist/src/trajectories/chunk-projection.js +148 -0
- package/dist/src/trajectories/chunk-projection.js.map +1 -0
- package/dist/src/trajectories/content-projection.js +389 -0
- package/dist/src/trajectories/content-projection.js.map +1 -0
- package/dist/src/trajectories/dsh-chunk-contract.js +176 -0
- package/dist/src/trajectories/dsh-chunk-contract.js.map +1 -0
- package/dist/src/trajectories/dsh-contract.js +284 -0
- package/dist/src/trajectories/dsh-contract.js.map +1 -0
- package/dist/src/trajectories/events-chunk-drill.js +95 -0
- package/dist/src/trajectories/events-chunk-drill.js.map +1 -0
- package/dist/src/trajectories/events-page.js +367 -0
- package/dist/src/trajectories/events-page.js.map +1 -0
- package/dist/src/trajectories/index.js +3 -0
- package/dist/src/trajectories/index.js.map +1 -1
- package/dist/src/trajectories/request-attempt.js +47 -0
- package/dist/src/trajectories/request-attempt.js.map +1 -0
- package/dist/src/trajectories/stream-reader.js +311 -0
- package/dist/src/trajectories/stream-reader.js.map +1 -0
- package/dist/src/trajectories/surface-fold.js +126 -0
- package/dist/src/trajectories/surface-fold.js.map +1 -0
- package/dist/src/workers/remote-harbor-worker.js +3 -0
- package/dist/src/workers/remote-harbor-worker.js.map +1 -1
- package/docs/schemas/benchmark-hook-request-v1.schema.json +65 -0
- package/docs/schemas/benchmark-hook-response-v1.schema.json +75 -0
- package/docs/schemas/benchmark-hook-v1.schema.json +33 -0
- package/docs/schemas/benchmark-lock-v1.schema.json +351 -0
- package/docs/schemas/benchmark-metric-v1.schema.json +37 -0
- package/docs/schemas/benchmark-package-v1.schema.json +167 -0
- package/docs/schemas/benchmark-phase-group.schema.json +41 -0
- package/docs/schemas/benchmark-profile-v1.schema.json +141 -0
- package/docs/schemas/benchmark-task-v1.schema.json +384 -0
- package/docs/schemas/benchmark-tool-result-v1.schema.json +30 -0
- package/docs/schemas/error.schema.json +22 -0
- package/docs/schemas/eval-progress.schema.json +1 -15
- package/docs/schemas/eval-rerun-result.schema.json +6 -1
- package/docs/schemas/eval-rerun-submission.schema.json +3 -1
- package/docs/schemas/eval-result.schema.json +1 -15
- package/docs/schemas/eval-trial-publication.schema.json +1 -25
- package/docs/schemas/eval-trial-reference.schema.json +129 -0
- package/docs/schemas/regrade-assessment-reference.schema.json +11 -0
- package/docs/schemas/run-context.schema.json +15 -0
- package/docs/schemas/run-manifest.schema.json +4 -0
- package/docs/schemas/run-request.schema.json +4 -0
- package/docs/schemas/trajectory-analysis.schema.json +258 -0
- package/docs/schemas/trajectory-events-page.schema.json +40 -0
- package/docs/schemas/verifier-assessment.schema.json +77 -0
- package/docs/schemas/verifier-evidence.schema.json +276 -0
- package/integrations/harbor/hitch_benchmark.py +252 -0
- package/integrations/harbor/hitch_candidate_recycle.py +262 -0
- package/integrations/harbor/hitch_harbor_agent.py +541 -43
- package/integrations/harbor/hitch_harbor_environment.py +138 -0
- package/integrations/harbor/hitch_harbor_verifier.py +60 -2
- package/integrations/harbor/hitch_phase_supervisor.py +452 -0
- package/integrations/harbor/hitch_tool_client.mjs +91 -0
- package/integrations/model-call/cli.js +57 -0
- package/package.json +17 -6
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { chmod, copyFile, mkdir, mkdtemp, rm } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { ensureControllerRuntime, PACKAGE_ROOT, useControllerRuntimeById } from "../controller-runtime/index.js";
|
|
4
|
+
import { ensureDir, invalidInput, sha256JSON, statePaths } from "../foundation/index.js";
|
|
5
|
+
export const VERIFIER_ENVIRONMENT_PROVIDER = "integrations/harbor/hitch_harbor_environment.py";
|
|
6
|
+
/** Runtime changes for artifact-only regrades are restricted to one provider.
|
|
7
|
+
* The complete file membership, grader, normalizer, candidate and CLI stay fixed. */
|
|
8
|
+
export function verifierRuntimeRepair(source, replacement) {
|
|
9
|
+
if (source.runtime_id === replacement.runtime_id)
|
|
10
|
+
return null;
|
|
11
|
+
const before = source.manifest, after = replacement.manifest;
|
|
12
|
+
if (before.schema_version !== after.schema_version || before.node_range !== after.node_range
|
|
13
|
+
|| sha256JSON(before.entrypoints) !== sha256JSON(after.entrypoints)
|
|
14
|
+
|| before.files.length !== after.files.length)
|
|
15
|
+
throw invalidInput("verifier runtime repair changes its execution contract");
|
|
16
|
+
const changed = before.files.filter(file => {
|
|
17
|
+
const other = after.files.find(candidate => candidate.path === file.path);
|
|
18
|
+
if (!other || other.executable !== file.executable)
|
|
19
|
+
throw invalidInput("verifier runtime repair changes file membership or permissions");
|
|
20
|
+
return sha256JSON(file) !== sha256JSON(other);
|
|
21
|
+
});
|
|
22
|
+
if (changed.length !== 1 || changed[0].path !== VERIFIER_ENVIRONMENT_PROVIDER) {
|
|
23
|
+
throw invalidInput("verifier runtime repair may change only the Docker environment provider");
|
|
24
|
+
}
|
|
25
|
+
return {
|
|
26
|
+
schema_version: "1", kind: "verifier-environment-runtime-repair",
|
|
27
|
+
source_runtime_id: source.runtime_id, replacement_runtime_id: replacement.runtime_id,
|
|
28
|
+
path: VERIFIER_ENVIRONMENT_PROVIDER, source_sha256: changed[0].sha256,
|
|
29
|
+
replacement_sha256: after.files.find(file => file.path === VERIFIER_ENVIRONMENT_PROVIDER).sha256,
|
|
30
|
+
unchanged_file_count: before.files.length - 1,
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
/** Build a new immutable runtime without writing into the original CAS entry. */
|
|
34
|
+
export async function prepareVerifierEnvironmentRuntime(options) {
|
|
35
|
+
if (!/^sha256:[a-f0-9]{64}$/.test(options.sourceRuntimeId))
|
|
36
|
+
throw invalidInput("invalid source controller runtime ID");
|
|
37
|
+
const paths = statePaths(options.root);
|
|
38
|
+
const source = await useControllerRuntimeById(paths, options.sourceRuntimeId.slice(7));
|
|
39
|
+
if (!source.manifest.files.some(file => file.path === VERIFIER_ENVIRONMENT_PROVIDER))
|
|
40
|
+
throw invalidInput("source runtime has no Docker environment provider");
|
|
41
|
+
const staging = await mkdtemp(path.join(await ensureDir(paths.temporary), "verifier-runtime-"));
|
|
42
|
+
try {
|
|
43
|
+
for (const file of source.manifest.files) {
|
|
44
|
+
const target = path.join(staging, file.path);
|
|
45
|
+
await mkdir(path.dirname(target), { recursive: true });
|
|
46
|
+
await copyFile(path.join(source.directory, "payload", file.path), target);
|
|
47
|
+
await chmod(target, file.executable ? 0o755 : 0o644);
|
|
48
|
+
}
|
|
49
|
+
await copyFile(options.providerPath ?? path.join(PACKAGE_ROOT, VERIFIER_ENVIRONMENT_PROVIDER), path.join(staging, VERIFIER_ENVIRONMENT_PROVIDER));
|
|
50
|
+
await chmod(path.join(staging, VERIFIER_ENVIRONMENT_PROVIDER), source.manifest.files.find(file => file.path === VERIFIER_ENVIRONMENT_PROVIDER).executable ? 0o755 : 0o644);
|
|
51
|
+
const replacement = await ensureControllerRuntime({ root: options.root, payloadRoot: staging,
|
|
52
|
+
rules: source.manifest.files.map(file => ({ path: file.path, executable: file.executable })) });
|
|
53
|
+
verifierRuntimeRepair(source, replacement);
|
|
54
|
+
await useControllerRuntimeById(paths, options.sourceRuntimeId.slice(7));
|
|
55
|
+
return replacement;
|
|
56
|
+
}
|
|
57
|
+
finally {
|
|
58
|
+
await rm(staging, { recursive: true, force: true });
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=verifier-runtime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verifier-runtime.js","sourceRoot":"","sources":["../../../src/evals/verifier-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { realpath } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { MAX_VERIFIER_FEEDBACK_BYTES, MAX_VERIFIER_PROCESS_BYTES, assertVerifierScoreEvidenceConsistency, parseVerifierFeedback, parseVerifierProcessEvidence, parseVerifierScores, } from "../domain/index.js";
|
|
4
|
+
import { atomicWriteJSON, openContainedRegularFile, safeDiagnosticMessage, sha256Bytes } from "../foundation/index.js";
|
|
5
|
+
import { sanitizeVerifierJson } from "../runs/index.js";
|
|
6
|
+
import { loadBenchmarkAdapterManifest, scoreWithinRange } from "./benchmark-adapter-manifest.js";
|
|
7
|
+
/**
|
|
8
|
+
* Validate and persist only the two standard structured verifier artifacts.
|
|
9
|
+
* Arbitrary files in the verifier directory remain private and inaccessible.
|
|
10
|
+
*/
|
|
11
|
+
export async function captureVerifierScoreEvidence(input) {
|
|
12
|
+
try {
|
|
13
|
+
throwIfAborted(input.signal);
|
|
14
|
+
const adapterManifest = input.dataset === undefined ? null : await loadBenchmarkAdapterManifest(input.dataset);
|
|
15
|
+
if (adapterManifest && adapterManifest.dataset_digest !== input.benchmarkRevision) {
|
|
16
|
+
throw new TypeError("benchmark adapter manifest changed after eval admission");
|
|
17
|
+
}
|
|
18
|
+
const root = await realpath(input.trialDirectory);
|
|
19
|
+
const processSource = await optionalJson(root, "process.json", MAX_VERIFIER_PROCESS_BYTES, input.signal);
|
|
20
|
+
const feedbackSource = await optionalJson(root, "feedback.json", MAX_VERIFIER_FEEDBACK_BYTES, input.signal);
|
|
21
|
+
const scores = parseVerifierScores(input.verifierResult);
|
|
22
|
+
let processEvidence = processSource === undefined ? undefined : parseVerifierProcessEvidence(processSource.value);
|
|
23
|
+
let feedback = feedbackSource === undefined ? undefined : parseVerifierFeedback(feedbackSource.value, processEvidence);
|
|
24
|
+
assertVerifierScoreEvidenceConsistency({
|
|
25
|
+
scores,
|
|
26
|
+
...(processEvidence === undefined ? {} : { process: processEvidence }),
|
|
27
|
+
...(feedback === undefined ? {} : { feedback }),
|
|
28
|
+
});
|
|
29
|
+
if (adapterManifest) {
|
|
30
|
+
if (!scores || scores.normalization !== "standard")
|
|
31
|
+
throw new TypeError("standardized benchmark requires total_score");
|
|
32
|
+
if (!scoreWithinRange(scores.total_score, adapterManifest.scoring.total_score))
|
|
33
|
+
throw new TypeError("total_score is outside the benchmark range");
|
|
34
|
+
const processDefinition = adapterManifest.scoring.process_score;
|
|
35
|
+
if ((scores.process_score !== undefined) !== (processDefinition !== undefined)) {
|
|
36
|
+
throw new TypeError("process_score availability differs from the benchmark manifest");
|
|
37
|
+
}
|
|
38
|
+
if (processDefinition && scores.process_score !== undefined && !scoreWithinRange(scores.process_score, processDefinition)) {
|
|
39
|
+
throw new TypeError("process_score is outside the benchmark range");
|
|
40
|
+
}
|
|
41
|
+
if (processDefinition && processEvidence?.metric !== processDefinition.source_metric) {
|
|
42
|
+
throw new TypeError("process evidence metric differs from the benchmark manifest");
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
// Sanitize while credentials are still available, before sealing the run.
|
|
46
|
+
// Revalidate both artifacts before writing either: a redacted identifier or
|
|
47
|
+
// reference must fail closed instead of persisting an invalid contract.
|
|
48
|
+
const credentials = input.credentialValues ?? [];
|
|
49
|
+
processEvidence = processEvidence === undefined ? undefined : parseVerifierProcessEvidence(sanitizeVerifierJson(processEvidence, credentials).value);
|
|
50
|
+
feedback = feedback === undefined ? undefined : parseVerifierFeedback(sanitizeVerifierJson(feedback, credentials).value, processEvidence);
|
|
51
|
+
const structuredArtifacts = {};
|
|
52
|
+
if (processEvidence) {
|
|
53
|
+
const target = path.join(input.runDirectory, "verifier", "process.json");
|
|
54
|
+
await atomicWriteJSON(target, processEvidence);
|
|
55
|
+
structuredArtifacts.process = artifact("verifier/process.json", encoded(processEvidence));
|
|
56
|
+
}
|
|
57
|
+
if (feedback) {
|
|
58
|
+
const target = path.join(input.runDirectory, "verifier", "feedback.json");
|
|
59
|
+
await atomicWriteJSON(target, feedback);
|
|
60
|
+
structuredArtifacts.feedback = artifact("verifier/feedback.json", encoded(feedback));
|
|
61
|
+
}
|
|
62
|
+
return {
|
|
63
|
+
...(scores === undefined ? {} : { scores }),
|
|
64
|
+
...(processEvidence === undefined ? {} : { process: processEvidence }),
|
|
65
|
+
...(feedback === undefined ? {} : { feedback }),
|
|
66
|
+
...(Object.keys(structuredArtifacts).length === 0 ? {} : { structured_artifacts: structuredArtifacts }),
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
catch (error) {
|
|
70
|
+
if (input.signal?.aborted || error?.name === "AbortError")
|
|
71
|
+
throw error;
|
|
72
|
+
return {
|
|
73
|
+
issue: safeDiagnosticMessage(error, input.credentialValues ?? []).slice(0, 1024),
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
async function optionalJson(root, name, maximumBytes, signal) {
|
|
78
|
+
let safe;
|
|
79
|
+
try {
|
|
80
|
+
safe = await openContainedRegularFile(root, `verifier/${name}`, maximumBytes);
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
if (error.code === "ENOENT")
|
|
84
|
+
return undefined;
|
|
85
|
+
throw new TypeError(`unsafe structured verifier artifact: ${name}`, { cause: error });
|
|
86
|
+
}
|
|
87
|
+
try {
|
|
88
|
+
throwIfAborted(signal);
|
|
89
|
+
const bytes = await safe.handle.readFile();
|
|
90
|
+
await safe.assertUnchanged();
|
|
91
|
+
const value = JSON.parse(bytes.toString("utf8"));
|
|
92
|
+
if (!isJsonValue(value))
|
|
93
|
+
throw new TypeError(`${name} is not JSON data`);
|
|
94
|
+
return { value, bytes };
|
|
95
|
+
}
|
|
96
|
+
finally {
|
|
97
|
+
await safe.handle.close();
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
function artifact(ref, bytes) {
|
|
101
|
+
return { ref, bytes: bytes.length, sha256: sha256Bytes(bytes) };
|
|
102
|
+
}
|
|
103
|
+
function encoded(value) {
|
|
104
|
+
return Buffer.from(`${JSON.stringify(value, null, 2)}\n`, "utf8");
|
|
105
|
+
}
|
|
106
|
+
function isJsonValue(value) {
|
|
107
|
+
if (value === null || typeof value === "string" || typeof value === "boolean")
|
|
108
|
+
return true;
|
|
109
|
+
if (typeof value === "number")
|
|
110
|
+
return Number.isFinite(value);
|
|
111
|
+
if (Array.isArray(value))
|
|
112
|
+
return value.every(isJsonValue);
|
|
113
|
+
return Boolean(value) && typeof value === "object" && Object.values(value).every(isJsonValue);
|
|
114
|
+
}
|
|
115
|
+
function throwIfAborted(signal) {
|
|
116
|
+
if (signal?.aborted)
|
|
117
|
+
throw signal.reason ?? new DOMException("The operation was aborted", "AbortError");
|
|
118
|
+
}
|
|
119
|
+
//# sourceMappingURL=verifier-score-artifacts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verifier-score-artifacts.js","sourceRoot":"","sources":["../../../src/evals/verifier-score-artifacts.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import { constants } from "node:fs";
|
|
2
|
+
import { lstat, open, realpath } from "node:fs/promises";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
/** Open an untrusted relative file without following any directory or file symlink. */
|
|
5
|
+
export async function openContainedRegularFile(root, relative, maximumBytes = Number.MAX_SAFE_INTEGER) {
|
|
6
|
+
const segments = normalizedSegments(relative);
|
|
7
|
+
const canonicalRoot = await realpath(root);
|
|
8
|
+
if (canonicalRoot !== path.resolve(root))
|
|
9
|
+
throw new TypeError("contained file root must be canonical");
|
|
10
|
+
const parents = [];
|
|
11
|
+
let directory = canonicalRoot;
|
|
12
|
+
parents.push({ path: directory, stats: await safeDirectory(directory) });
|
|
13
|
+
for (const segment of segments.slice(0, -1)) {
|
|
14
|
+
directory = path.join(directory, segment);
|
|
15
|
+
const info = await safeDirectory(directory);
|
|
16
|
+
if (!isWithin(canonicalRoot, await realpath(directory)))
|
|
17
|
+
throw new TypeError("contained file parent escapes its root");
|
|
18
|
+
parents.push({ path: directory, stats: info });
|
|
19
|
+
}
|
|
20
|
+
const target = path.join(canonicalRoot, ...segments);
|
|
21
|
+
const before = await lstat(target);
|
|
22
|
+
if (before.isSymbolicLink() || !before.isFile() || before.nlink !== 1)
|
|
23
|
+
throw new TypeError("contained file is not a safe regular file");
|
|
24
|
+
const handle = await open(target, constants.O_RDONLY | constants.O_NOFOLLOW);
|
|
25
|
+
try {
|
|
26
|
+
const opened = await handle.stat();
|
|
27
|
+
const after = await lstat(target);
|
|
28
|
+
await assertParentsUnchanged(parents);
|
|
29
|
+
if (!sameFile(opened, before) || !sameFile(opened, after) || !isWithin(canonicalRoot, await realpath(target))) {
|
|
30
|
+
throw new TypeError("contained file identity changed while opening");
|
|
31
|
+
}
|
|
32
|
+
await assertParentsUnchanged(parents);
|
|
33
|
+
if (opened.size > maximumBytes)
|
|
34
|
+
throw new TypeError("contained file exceeds its limit");
|
|
35
|
+
return {
|
|
36
|
+
handle,
|
|
37
|
+
size: opened.size,
|
|
38
|
+
assertUnchanged: async () => {
|
|
39
|
+
const current = await handle.stat();
|
|
40
|
+
const pathname = await lstat(target);
|
|
41
|
+
await assertParentsUnchanged(parents);
|
|
42
|
+
if (!sameFile(opened, current) || !sameFile(opened, pathname)
|
|
43
|
+
|| current.size !== opened.size || current.mtimeMs !== opened.mtimeMs
|
|
44
|
+
|| !isWithin(canonicalRoot, await realpath(target))) {
|
|
45
|
+
throw new TypeError("contained file changed while being read");
|
|
46
|
+
}
|
|
47
|
+
await assertParentsUnchanged(parents);
|
|
48
|
+
},
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
await handle.close();
|
|
53
|
+
throw error;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
async function safeDirectory(directory) {
|
|
57
|
+
const info = await lstat(directory);
|
|
58
|
+
if (info.isSymbolicLink() || !info.isDirectory())
|
|
59
|
+
throw new TypeError("contained file parent is unsafe");
|
|
60
|
+
return info;
|
|
61
|
+
}
|
|
62
|
+
async function assertParentsUnchanged(parents) {
|
|
63
|
+
for (const parent of parents) {
|
|
64
|
+
const current = await safeDirectory(parent.path);
|
|
65
|
+
if (current.dev !== parent.stats.dev || current.ino !== parent.stats.ino) {
|
|
66
|
+
throw new TypeError("contained file parent changed while opening");
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
function normalizedSegments(relative) {
|
|
71
|
+
if (!relative || relative.includes("\\") || relative.startsWith("/"))
|
|
72
|
+
throw new TypeError("contained file path is invalid");
|
|
73
|
+
const segments = relative.split("/");
|
|
74
|
+
if (segments.some((segment) => !segment || segment === "." || segment === ".."))
|
|
75
|
+
throw new TypeError("contained file path is invalid");
|
|
76
|
+
return segments;
|
|
77
|
+
}
|
|
78
|
+
function sameFile(left, right) {
|
|
79
|
+
return left.dev === right.dev && left.ino === right.ino && left.isFile() && right.isFile() && right.nlink === 1;
|
|
80
|
+
}
|
|
81
|
+
function isWithin(root, candidate) {
|
|
82
|
+
const relative = path.relative(root, candidate);
|
|
83
|
+
return relative !== "" && !relative.startsWith("..") && !path.isAbsolute(relative);
|
|
84
|
+
}
|
|
85
|
+
//# sourceMappingURL=contained-file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contained-file.js","sourceRoot":"","sources":["../../../src/foundation/contained-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,16 @@ const TEXT_RULES = [
|
|
|
16
16
|
];
|
|
17
17
|
const SECRET_HEADER = /^(\s*(?:authorization|proxy-authorization|cookie|set-cookie|x-api-key|x-[a-z0-9-]*(?:secret|token|api-key)[a-z0-9-]*)\s*:\s*).+$/gim;
|
|
18
18
|
const NAMED_SECRET = /((?:"|')?(?:authorization|proxy-authorization|cookie|set-cookie|x-api-key|api[-_]?key|access[-_]?token|refresh[-_]?token|client[-_]?secret|secret|password|credential)(?:"|')?\s*[:=]\s*)("[^"]*"|'[^']*'|[^\s,;}\]]+)/gi;
|
|
19
|
+
/** Match credential-bearing JSON/header field names independently of current environment values. */
|
|
20
|
+
export function isSensitiveFieldName(value) {
|
|
21
|
+
const normalized = value
|
|
22
|
+
.replace(/([a-z0-9])([A-Z])/g, "$1_$2")
|
|
23
|
+
.toLowerCase()
|
|
24
|
+
.replace(/[^a-z0-9]+/g, "_");
|
|
25
|
+
const parts = normalized.split("_").filter(Boolean);
|
|
26
|
+
return parts.includes("token") || parts.includes("auth")
|
|
27
|
+
|| /authorization|cookie|api_key|client_secret|private_key|password|credential|(?:^|_)secret(?:_|$)/.test(normalized);
|
|
28
|
+
}
|
|
19
29
|
export function safeDiagnosticMessage(value, credentialValues = [], maxCharacters = 4_096) {
|
|
20
30
|
if (!Number.isSafeInteger(maxCharacters) || maxCharacters < 32)
|
|
21
31
|
throw new TypeError("diagnostic message limit is invalid");
|
|
@@ -64,8 +74,23 @@ export function credentialValuesFromEnv(names, env) {
|
|
|
64
74
|
if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name))
|
|
65
75
|
throw new TypeError(`invalid credential environment name: ${name}`);
|
|
66
76
|
const value = env[name];
|
|
67
|
-
if (value !== undefined && value.length > 0)
|
|
77
|
+
if (value !== undefined && value.length > 0) {
|
|
68
78
|
values.push(value);
|
|
79
|
+
// Structured credential files can be handed off as one environment value.
|
|
80
|
+
// Also redact their opaque strings when a client prints a nested token.
|
|
81
|
+
if (value.trimStart().startsWith("{")) {
|
|
82
|
+
try {
|
|
83
|
+
const collect = (entry) => {
|
|
84
|
+
if (typeof entry === "string" && entry.length >= 16)
|
|
85
|
+
values.push(entry);
|
|
86
|
+
else if (entry && typeof entry === "object")
|
|
87
|
+
Object.values(entry).forEach(collect);
|
|
88
|
+
};
|
|
89
|
+
collect(JSON.parse(value));
|
|
90
|
+
}
|
|
91
|
+
catch { /* Opaque non-JSON credentials retain the exact-value rule. */ }
|
|
92
|
+
}
|
|
93
|
+
}
|
|
69
94
|
}
|
|
70
95
|
return [...new Set(values)].sort((left, right) => right.length - left.length || left.localeCompare(right));
|
|
71
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-redaction.js","sourceRoot":"","sources":["../../../src/foundation/credential-redaction.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"credential-redaction.js","sourceRoot":"","sources":["../../../src/foundation/credential-redaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { mkdir, open, readFile, rename, rm, writeFile } from "node:fs/promises";
|
|
1
|
+
import { chmod, mkdir, open, readFile, rename, rm, writeFile } from "node:fs/promises";
|
|
2
2
|
import { randomBytes } from "node:crypto";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
export async function ensureDir(directory) {
|
|
@@ -41,5 +41,6 @@ export async function removeIfExists(file) {
|
|
|
41
41
|
export async function writePrivateFile(file, value) {
|
|
42
42
|
await ensureDir(path.dirname(file));
|
|
43
43
|
await writeFile(file, value, { mode: 0o600 });
|
|
44
|
+
await chmod(file, 0o600);
|
|
44
45
|
}
|
|
45
46
|
//# sourceMappingURL=fs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../../src/foundation/fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../../src/foundation/fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,SAAiB;IAC/C,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAc,IAAY,EAAE,QAAY;IACpE,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAM,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,EAAE,IAAI,KAAK,QAAQ,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,QAAQ,CAAC;QACnG,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,KAAc,EAAE,IAAI,GAAG,KAAK;IAC9E,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;IAC/F,MAAM,SAAS,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,MAAM,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAY,EAAE,KAAa;IAC1D,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC5C,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;IACnC,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY;IAC/C,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAY,EAAE,KAA0B;IAC7E,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,MAAM,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9C,MAAM,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC3B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export { DEFAULT_MAX_CONCURRENT, DEFAULT_PORT, SCHEMA_VERSION, defaultRoot, hitchRootId, parseDuration, positiveInteger, statePaths } from "./config.js";
|
|
2
2
|
export { HitchError, invalidInput } from "./errors.js";
|
|
3
3
|
export { appendLine, atomicWriteJSON, ensureDir, readJSON, removeIfExists, writePrivateFile } from "./fs.js";
|
|
4
|
+
export { openContainedRegularFile } from "./contained-file.js";
|
|
4
5
|
export { reclaimStaleLock } from "./locks.js";
|
|
5
6
|
export { withFileLock } from "./locks.js";
|
|
6
7
|
export { captureProcessIdentity, inspectProcessIdentity, validateProcessIdentity } from "./process-identity.js";
|
|
@@ -10,5 +11,5 @@ export { packageRoot, packageVersion } from "./package-root.js";
|
|
|
10
11
|
export { delay, terminateProcess } from "./process.js";
|
|
11
12
|
export { commandExecutable, commandVersion, detectVersion, fingerprintExecutable, prepareSpawnCommand, resolveExecutable, runCommand, selectVersionLine } from "./executable.js";
|
|
12
13
|
export { canonicalJSON, digest, sha256Bytes, sha256JSON } from "./hash.js";
|
|
13
|
-
export { CREDENTIAL_REDACTION_MARKER, PROVIDER_ENVIRONMENT_NAMES, createCredentialRedactionTransform, credentialValuesFromEnv, redactCredentialText, safeDiagnosticMessage } from "./credential-redaction.js";
|
|
14
|
+
export { CREDENTIAL_REDACTION_MARKER, PROVIDER_ENVIRONMENT_NAMES, createCredentialRedactionTransform, credentialValuesFromEnv, isSensitiveFieldName, redactCredentialText, safeDiagnosticMessage } from "./credential-redaction.js";
|
|
14
15
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/foundation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzJ,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAGhH,OAAO,EAAE,iCAAiC,EAAE,kCAAkC,EAAE,iCAAiC,EAAE,mCAAmC,EAAE,MAAM,mCAAmC,CAAC;AAElM,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEjL,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,kCAAkC,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/foundation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzJ,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC7G,OAAO,EAAE,wBAAwB,EAA6B,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAGhH,OAAO,EAAE,iCAAiC,EAAE,kCAAkC,EAAE,iCAAiC,EAAE,mCAAmC,EAAE,MAAM,mCAAmC,CAAC;AAElM,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEjL,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,kCAAkC,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/** Bind a verified artifact and its invocation prefix to the adapter request. */
|
|
2
|
+
export async function prepareAdapterProcess(adapter, request, artifact, resolution, runDirectory, runtimeHome) {
|
|
3
|
+
const specification = await adapter.process(request, artifact.executable, {
|
|
4
|
+
entrypoint_integrity: artifact.entrypoint_integrity,
|
|
5
|
+
observed_version: artifact.observed_version ?? undefined,
|
|
6
|
+
resolution, run_directory: runDirectory, runtime_home: runtimeHome,
|
|
7
|
+
});
|
|
8
|
+
if (artifact.entrypoint_args?.length)
|
|
9
|
+
specification.args.unshift(...artifact.entrypoint_args);
|
|
10
|
+
return specification;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=adapter-process.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adapter-process.js","sourceRoot":"","sources":["../../../src/runs/adapter-process.ts"],"names":[],"mappings":"AAGA,iFAAiF;AACjF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAA0B,EAC1B,OAAuB,EACvB,QAA0B,EAC1B,UAA4B,EAC5B,YAAoB,EACpB,WAAmB;IAEnB,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE;QACxE,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;QACnD,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB,IAAI,SAAS;QACxD,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW;KACnE,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,eAAe,EAAE,MAAM;QAAE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC9F,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
|
@@ -14,8 +14,14 @@ import { buildManifest, safeAgentArgsForPersistence } from "./manifest.js";
|
|
|
14
14
|
import { assertQueuedRunIdentity } from "./queued.js";
|
|
15
15
|
import { adapterFidelity, failureResult, mergeRedactions, providerModelId } from "./outcome.js";
|
|
16
16
|
import { writeResultBundleIndex } from "./bundle.js";
|
|
17
|
-
|
|
17
|
+
import { prepareAdapterProcess } from "./adapter-process.js";
|
|
18
|
+
import { completedRunManifest } from "./finalizer.js";
|
|
19
|
+
export async function executeRun({ runId, request, runsRoot, root = path.dirname(runsRoot), resolvedRevision, preparedArtifact, verifiedLocalGitSource, workspacePlan, onEvent, onProcess, signal, candidateDeadlineNs, }) {
|
|
18
20
|
const normalized = await validateRunRequest(request);
|
|
21
|
+
if (candidateDeadlineNs !== undefined && (typeof candidateDeadlineNs !== "bigint" || candidateDeadlineNs <= 0n
|
|
22
|
+
|| normalized.context.kind !== "benchmark_task" || !normalized.defer_benchmark_observation)) {
|
|
23
|
+
throw new HitchError("candidate deadline requires a managed benchmark task", { code: "invalid_input", exitCode: 2 });
|
|
24
|
+
}
|
|
19
25
|
const credentialValues = credentialValuesFromEnv(normalized.credential_names, process.env);
|
|
20
26
|
workspacePlan ||= await planWorkspace({ runId, sourceCwd: normalized.cwd, mode: normalized.workspace_mode, root });
|
|
21
27
|
const runDirectory = path.join(runsRoot, runId);
|
|
@@ -140,14 +146,7 @@ export async function executeRun({ runId, request, runsRoot, root = path.dirname
|
|
|
140
146
|
stage = "adapter_setup";
|
|
141
147
|
const adapterState = {};
|
|
142
148
|
const executionRequest = { ...normalized, cwd: workspaceLease.execution_workspace };
|
|
143
|
-
const specification = await adapter
|
|
144
|
-
observed_version: artifact.observed_version ?? undefined,
|
|
145
|
-
resolution,
|
|
146
|
-
run_directory: runDirectory,
|
|
147
|
-
runtime_home: runtimeHome,
|
|
148
|
-
});
|
|
149
|
-
if (artifact.entrypoint_args?.length)
|
|
150
|
-
specification.args.unshift(...artifact.entrypoint_args);
|
|
149
|
+
const specification = await prepareAdapterProcess(adapter, executionRequest, artifact, resolution, runDirectory, runtimeHome);
|
|
151
150
|
if (signal?.aborted) {
|
|
152
151
|
result = failureResult(runId, startedAt, "cancelled", "agent run cancelled before launch", 9);
|
|
153
152
|
sink.emit({ type: "run.failed", status: "cancelled", error: result.error });
|
|
@@ -162,6 +161,11 @@ export async function executeRun({ runId, request, runsRoot, root = path.dirname
|
|
|
162
161
|
};
|
|
163
162
|
delete childEnvironment.OLDPWD;
|
|
164
163
|
const invocation = prepareSpawnCommand(specification.executable, specification.args);
|
|
164
|
+
const remainingMs = candidateDeadlineNs === undefined ? normalized.timeout_ms
|
|
165
|
+
: Number((candidateDeadlineNs - process.hrtime.bigint()) / 1000000n);
|
|
166
|
+
if (candidateDeadlineNs !== undefined && remainingMs <= 0) {
|
|
167
|
+
throw new HitchError("candidate budget expired before model launch", { code: "timed_out", exitCode: 8 });
|
|
168
|
+
}
|
|
165
169
|
child = spawn(invocation.executable, invocation.args, {
|
|
166
170
|
cwd: workspaceLease.execution_workspace,
|
|
167
171
|
env: childEnvironment,
|
|
@@ -174,10 +178,16 @@ export async function executeRun({ runId, request, runsRoot, root = path.dirname
|
|
|
174
178
|
launched.stdin?.on("error", () => { });
|
|
175
179
|
onProcess?.({ child: launched });
|
|
176
180
|
abortHandler = () => {
|
|
181
|
+
if (cancelled)
|
|
182
|
+
return;
|
|
177
183
|
cancelled = true;
|
|
178
184
|
terminateProcess(launched).catch(() => { });
|
|
179
185
|
};
|
|
180
186
|
signal?.addEventListener("abort", abortHandler, { once: true });
|
|
187
|
+
// Cancellation can arrive during workspace launch or synchronously from
|
|
188
|
+
// onProcess, before this listener has been installed.
|
|
189
|
+
if (signal?.aborted)
|
|
190
|
+
abortHandler();
|
|
181
191
|
consumeLines(launched.stdout, (line) => {
|
|
182
192
|
if (adapter.translateLine) {
|
|
183
193
|
const safeLine = providerCapture?.appendText(line) ?? redactProviderText(line, new Map(), credentialValues);
|
|
@@ -239,11 +249,13 @@ export async function executeRun({ runId, request, runsRoot, root = path.dirname
|
|
|
239
249
|
launched.once("error", reject);
|
|
240
250
|
launched.once("close", (code, processSignal) => resolve({ code, signal: processSignal }));
|
|
241
251
|
});
|
|
242
|
-
if (normalized.timeout_ms > 0) {
|
|
252
|
+
if (normalized.timeout_ms > 0 || candidateDeadlineNs !== undefined) {
|
|
253
|
+
const processTimeoutMs = candidateDeadlineNs === undefined ? normalized.timeout_ms
|
|
254
|
+
: Math.max(1, Number((candidateDeadlineNs - process.hrtime.bigint()) / 1000000n));
|
|
243
255
|
timeout = setTimeout(async () => {
|
|
244
256
|
timedOut = true;
|
|
245
257
|
await terminateProcess(launched).catch(() => { });
|
|
246
|
-
},
|
|
258
|
+
}, processTimeoutMs);
|
|
247
259
|
timeout.unref?.();
|
|
248
260
|
}
|
|
249
261
|
launched.stdin?.end(specification.input);
|
|
@@ -466,25 +478,7 @@ export async function executeRun({ runId, request, runsRoot, root = path.dirname
|
|
|
466
478
|
result.effective_model = observedEffectiveModel;
|
|
467
479
|
}
|
|
468
480
|
await atomicWriteJSON(resultPath, result);
|
|
469
|
-
const
|
|
470
|
-
const observation = normalized.context.kind === "benchmark_task" && !normalized.defer_benchmark_observation
|
|
471
|
-
? {
|
|
472
|
-
status: "invalid",
|
|
473
|
-
invalid_reason: terminalStatus === "succeeded"
|
|
474
|
-
? "verifier_result_missing"
|
|
475
|
-
: terminalStatus === "cancelled"
|
|
476
|
-
? "cancelled"
|
|
477
|
-
: "infrastructure_failure",
|
|
478
|
-
}
|
|
479
|
-
: undefined;
|
|
480
|
-
const terminalManifest = {
|
|
481
|
-
...manifest,
|
|
482
|
-
status: terminalStatus,
|
|
483
|
-
result_ref: "result.json",
|
|
484
|
-
...(observation ? { observation } : {}),
|
|
485
|
-
completed_at: result.completed_at,
|
|
486
|
-
sealed: !normalized.defer_benchmark_observation,
|
|
487
|
-
};
|
|
481
|
+
const terminalManifest = completedRunManifest(manifest, result, normalized);
|
|
488
482
|
await atomicWriteJSON(manifestPath, terminalManifest);
|
|
489
483
|
if (terminalManifest.sealed)
|
|
490
484
|
await writeResultBundleIndex(runDirectory);
|