agent-hitch 0.2.6 → 0.2.7
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 +14 -1
- package/dist/scripts/canary-buildkit-secrets.js +166 -0
- package/dist/scripts/canary-buildkit-secrets.js.map +1 -0
- package/dist/scripts/canary-collision-domains.js +77 -0
- package/dist/scripts/canary-collision-domains.js.map +1 -0
- package/dist/scripts/canary-docker-image-observation.js +181 -0
- package/dist/scripts/canary-docker-image-observation.js.map +1 -0
- package/dist/scripts/canary-gpu-hardware.js +95 -0
- package/dist/scripts/canary-gpu-hardware.js.map +1 -0
- package/dist/scripts/canary-harbor-load.js +365 -0
- package/dist/scripts/canary-harbor-load.js.map +1 -0
- package/dist/scripts/canary-packaged-harness.js +75 -0
- package/dist/scripts/canary-packaged-harness.js.map +1 -0
- package/dist/scripts/canary-resource-load.js +188 -0
- package/dist/scripts/canary-resource-load.js.map +1 -0
- package/dist/scripts/check-architecture.js +8 -4
- package/dist/scripts/check-architecture.js.map +1 -1
- package/dist/scripts/docker-reaper-crash-child.js +21 -0
- package/dist/scripts/docker-reaper-crash-child.js.map +1 -0
- package/dist/src/adapters/catalog.js +1 -0
- package/dist/src/adapters/catalog.js.map +1 -1
- package/dist/src/adapters/discovery.js +1 -1
- package/dist/src/adapters/discovery.js.map +1 -1
- package/dist/src/adapters/providers/claude.js +6 -0
- package/dist/src/adapters/providers/claude.js.map +1 -1
- package/dist/src/adapters/providers/codex.js +6 -0
- package/dist/src/adapters/providers/codex.js.map +1 -1
- package/dist/src/adapters/providers/deepseek.js +6 -0
- package/dist/src/adapters/providers/deepseek.js.map +1 -1
- package/dist/src/adapters/providers/opencode.js +6 -0
- package/dist/src/adapters/providers/opencode.js.map +1 -1
- package/dist/src/adapters/providers/pi.js +6 -0
- package/dist/src/adapters/providers/pi.js.map +1 -1
- package/dist/src/artifacts/index.js +1 -0
- package/dist/src/artifacts/index.js.map +1 -1
- package/dist/src/backends/harbor/backend.js +53 -103
- package/dist/src/backends/harbor/backend.js.map +1 -1
- package/dist/src/backends/harbor/environment-config.js +92 -0
- package/dist/src/backends/harbor/environment-config.js.map +1 -0
- package/dist/src/backends/harbor/index.js +5 -1
- package/dist/src/backends/harbor/index.js.map +1 -1
- package/dist/src/backends/harbor/model-proxy-config.js +23 -0
- package/dist/src/backends/harbor/model-proxy-config.js.map +1 -0
- package/dist/src/backends/harbor/process.js +177 -0
- package/dist/src/backends/harbor/process.js.map +1 -0
- package/dist/src/backends/harbor/runtime-toolchain.js +30 -0
- package/dist/src/backends/harbor/runtime-toolchain.js.map +1 -0
- package/dist/src/backends/harbor/supervisor.js +74 -0
- package/dist/src/backends/harbor/supervisor.js.map +1 -0
- package/dist/src/backends/harbor/task-resources.js +206 -0
- package/dist/src/backends/harbor/task-resources.js.map +1 -0
- package/dist/src/backends/harbor/tools.js +6 -29
- package/dist/src/backends/harbor/tools.js.map +1 -1
- package/dist/src/backends/index.js +4 -1
- package/dist/src/backends/index.js.map +1 -1
- package/dist/src/cli/commands/daemon.js +135 -8
- package/dist/src/cli/commands/daemon.js.map +1 -1
- package/dist/src/cli/commands/eval.js +214 -4
- package/dist/src/cli/commands/eval.js.map +1 -1
- package/dist/src/cli/commands/images.js +40 -0
- package/dist/src/cli/commands/images.js.map +1 -0
- package/dist/src/cli/commands/run.js +6 -3
- package/dist/src/cli/commands/run.js.map +1 -1
- package/dist/src/cli/commands/runs.js +25 -3
- package/dist/src/cli/commands/runs.js.map +1 -1
- package/dist/src/cli/commands/worker.js +79 -0
- package/dist/src/cli/commands/worker.js.map +1 -0
- package/dist/src/cli/main.js +4 -0
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/cli/output.js +71 -3
- package/dist/src/cli/output.js.map +1 -1
- package/dist/src/control-plane/build-admission.js +69 -0
- package/dist/src/control-plane/build-admission.js.map +1 -0
- package/dist/src/control-plane/build-records.js +6 -0
- package/dist/src/control-plane/build-records.js.map +1 -0
- package/dist/src/control-plane/collisions.js +40 -0
- package/dist/src/control-plane/collisions.js.map +1 -0
- package/dist/src/control-plane/eval-control-state.js +22 -0
- package/dist/src/control-plane/eval-control-state.js.map +1 -0
- package/dist/src/control-plane/eval-control-work.js +39 -0
- package/dist/src/control-plane/eval-control-work.js.map +1 -0
- package/dist/src/control-plane/eval-image-resolution.js +52 -0
- package/dist/src/control-plane/eval-image-resolution.js.map +1 -0
- package/dist/src/control-plane/eval-image-services.js +30 -0
- package/dist/src/control-plane/eval-image-services.js.map +1 -0
- package/dist/src/control-plane/eval-records.js +252 -0
- package/dist/src/control-plane/eval-records.js.map +1 -0
- package/dist/src/control-plane/eval-recovery.js +181 -0
- package/dist/src/control-plane/eval-recovery.js.map +1 -0
- package/dist/src/control-plane/eval-scheduler.js +447 -0
- package/dist/src/control-plane/eval-scheduler.js.map +1 -0
- package/dist/src/control-plane/index.js +20 -0
- package/dist/src/control-plane/index.js.map +1 -0
- package/dist/src/control-plane/local-worker.js +49 -0
- package/dist/src/control-plane/local-worker.js.map +1 -0
- package/dist/src/control-plane/model-capture-planning.js +12 -0
- package/dist/src/control-plane/model-capture-planning.js.map +1 -0
- package/dist/src/control-plane/remote-result-transport.js +172 -0
- package/dist/src/control-plane/remote-result-transport.js.map +1 -0
- package/dist/src/control-plane/remote-work-coordinator.js +332 -0
- package/dist/src/control-plane/remote-work-coordinator.js.map +1 -0
- package/dist/src/control-plane/remote-work-inputs.js +266 -0
- package/dist/src/control-plane/remote-work-inputs.js.map +1 -0
- package/dist/src/control-plane/remote-work-recovery.js +181 -0
- package/dist/src/control-plane/remote-work-recovery.js.map +1 -0
- package/dist/src/control-plane/remote-worker-artifacts.js +135 -0
- package/dist/src/control-plane/remote-worker-artifacts.js.map +1 -0
- package/dist/src/control-plane/remote-worker-client.js +202 -0
- package/dist/src/control-plane/remote-worker-client.js.map +1 -0
- package/dist/src/control-plane/remote-worker-configuration.js +34 -0
- package/dist/src/control-plane/remote-worker-configuration.js.map +1 -0
- package/dist/src/control-plane/remote-worker-credentials.js +58 -0
- package/dist/src/control-plane/remote-worker-credentials.js.map +1 -0
- package/dist/src/control-plane/remote-worker-protocol.js +510 -0
- package/dist/src/control-plane/remote-worker-protocol.js.map +1 -0
- package/dist/src/control-plane/remote-worker-runner.js +214 -0
- package/dist/src/control-plane/remote-worker-runner.js.map +1 -0
- package/dist/src/control-plane/remote-workers.js +377 -0
- package/dist/src/control-plane/remote-workers.js.map +1 -0
- package/dist/src/control-plane/rerun-scheduler.js +411 -0
- package/dist/src/control-plane/rerun-scheduler.js.map +1 -0
- package/dist/src/control-plane/rerun-submission.js +56 -0
- package/dist/src/control-plane/rerun-submission.js.map +1 -0
- package/dist/src/control-plane/resources.js +182 -0
- package/dist/src/control-plane/resources.js.map +1 -0
- package/dist/src/control-plane/scheduler-eval-entry.js +32 -0
- package/dist/src/control-plane/scheduler-eval-entry.js.map +1 -0
- package/dist/src/control-plane/synthetic-result.js +21 -0
- package/dist/src/control-plane/synthetic-result.js.map +1 -0
- package/dist/src/control-plane/work-admission.js +21 -0
- package/dist/src/control-plane/work-admission.js.map +1 -0
- package/dist/src/control-plane/work-dispatcher.js +229 -0
- package/dist/src/control-plane/work-dispatcher.js.map +1 -0
- package/dist/src/controller-runtime/hash.js +12 -1
- package/dist/src/controller-runtime/hash.js.map +1 -1
- package/dist/src/controller-runtime/index.js +1 -1
- package/dist/src/controller-runtime/index.js.map +1 -1
- package/dist/src/controller-runtime/store.js +15 -6
- package/dist/src/controller-runtime/store.js.map +1 -1
- package/dist/src/daemon/client.js.map +1 -1
- package/dist/src/daemon/event-stream.js +46 -0
- package/dist/src/daemon/event-stream.js.map +1 -0
- package/dist/src/daemon/health.js +66 -0
- package/dist/src/daemon/health.js.map +1 -0
- package/dist/src/daemon/launcher.js +28 -1
- package/dist/src/daemon/launcher.js.map +1 -1
- package/dist/src/daemon/logging.js +23 -0
- package/dist/src/daemon/logging.js.map +1 -0
- package/dist/src/daemon/scheduler.js +26 -5
- package/dist/src/daemon/scheduler.js.map +1 -1
- package/dist/src/daemon/server.js +255 -98
- package/dist/src/daemon/server.js.map +1 -1
- package/dist/src/daemon/telemetry.js +163 -0
- package/dist/src/daemon/telemetry.js.map +1 -0
- package/dist/src/daemon/worker-routes.js +219 -0
- package/dist/src/daemon/worker-routes.js.map +1 -0
- package/dist/src/domain/bundles.js +2 -0
- package/dist/src/domain/bundles.js.map +1 -0
- package/dist/src/domain/control-plane.js +2 -0
- package/dist/src/domain/control-plane.js.map +1 -0
- package/dist/src/domain/execution-evidence.js +2 -0
- package/dist/src/domain/execution-evidence.js.map +1 -0
- package/dist/src/domain/execution-plan.js +2 -0
- package/dist/src/domain/execution-plan.js.map +1 -0
- package/dist/src/domain/images.js +2 -0
- package/dist/src/domain/images.js.map +1 -0
- package/dist/src/domain/index.js +9 -0
- package/dist/src/domain/index.js.map +1 -1
- package/dist/src/domain/interactions.js +2 -0
- package/dist/src/domain/interactions.js.map +1 -0
- package/dist/src/domain/providers.js +2 -0
- package/dist/src/domain/providers.js.map +1 -0
- package/dist/src/domain/resources.js +2 -0
- package/dist/src/domain/resources.js.map +1 -0
- package/dist/src/domain/workers.js +2 -0
- package/dist/src/domain/workers.js.map +1 -0
- package/dist/src/evals/collect-only-rerun.js +182 -0
- package/dist/src/evals/collect-only-rerun.js.map +1 -0
- package/dist/src/evals/directory.js +30 -0
- package/dist/src/evals/directory.js.map +1 -0
- package/dist/src/evals/docker-engine-stats.js +89 -0
- package/dist/src/evals/docker-engine-stats.js.map +1 -0
- package/dist/src/evals/docker-ownership.js +51 -0
- package/dist/src/evals/docker-ownership.js.map +1 -0
- package/dist/src/evals/docker-reaper.js +144 -0
- package/dist/src/evals/docker-reaper.js.map +1 -0
- package/dist/src/evals/docker-resource-observer.js +207 -0
- package/dist/src/evals/docker-resource-observer.js.map +1 -0
- package/dist/src/evals/environment-image-planning.js +164 -0
- package/dist/src/evals/environment-image-planning.js.map +1 -0
- package/dist/src/evals/eval-artifact-planning.js +56 -0
- package/dist/src/evals/eval-artifact-planning.js.map +1 -0
- package/dist/src/evals/eval-finalization.js +10 -0
- package/dist/src/evals/eval-finalization.js.map +1 -0
- package/dist/src/evals/eval-lifecycle-events.js +16 -0
- package/dist/src/evals/eval-lifecycle-events.js.map +1 -0
- package/dist/src/evals/events.js +53 -5
- package/dist/src/evals/events.js.map +1 -1
- package/dist/src/evals/execution-evidence.js +116 -0
- package/dist/src/evals/execution-evidence.js.map +1 -0
- package/dist/src/evals/execution-leases.js +342 -0
- package/dist/src/evals/execution-leases.js.map +1 -0
- package/dist/src/evals/execution-plan-artifacts.js +72 -0
- package/dist/src/evals/execution-plan-artifacts.js.map +1 -0
- package/dist/src/evals/execution-plan-images.js +69 -0
- package/dist/src/evals/execution-plan-images.js.map +1 -0
- package/dist/src/evals/execution-plan-resources.js +174 -0
- package/dist/src/evals/execution-plan-resources.js.map +1 -0
- package/dist/src/evals/execution-plan.js +415 -0
- package/dist/src/evals/execution-plan.js.map +1 -0
- package/dist/src/evals/harbor-artifact-builder-image.js +99 -0
- package/dist/src/evals/harbor-artifact-builder-image.js.map +1 -0
- package/dist/src/evals/harbor-artifact-builder.js +354 -0
- package/dist/src/evals/harbor-artifact-builder.js.map +1 -0
- package/dist/src/evals/harbor-bridge-error.js +18 -3
- package/dist/src/evals/harbor-bridge-error.js.map +1 -1
- package/dist/src/evals/harbor-phase-timings.js +60 -0
- package/dist/src/evals/harbor-phase-timings.js.map +1 -0
- package/dist/src/evals/index.js +25 -2
- package/dist/src/evals/index.js.map +1 -1
- package/dist/src/evals/infrastructure-retry.js +100 -63
- package/dist/src/evals/infrastructure-retry.js.map +1 -1
- package/dist/src/evals/interaction-capture-import.js +49 -0
- package/dist/src/evals/interaction-capture-import.js.map +1 -0
- package/dist/src/evals/local-docker-provider.js +372 -0
- package/dist/src/evals/local-docker-provider.js.map +1 -0
- package/dist/src/evals/local-eval-planning.js +80 -0
- package/dist/src/evals/local-eval-planning.js.map +1 -0
- package/dist/src/evals/model-capture-plan.js +22 -0
- package/dist/src/evals/model-capture-plan.js.map +1 -0
- package/dist/src/evals/model-capture-runtime.js +114 -0
- package/dist/src/evals/model-capture-runtime.js.map +1 -0
- package/dist/src/evals/model-proxy-runtime-state.js +53 -0
- package/dist/src/evals/model-proxy-runtime-state.js.map +1 -0
- package/dist/src/evals/planned-execution-support.js +54 -0
- package/dist/src/evals/planned-execution-support.js.map +1 -0
- package/dist/src/evals/planned-execution.js +461 -0
- package/dist/src/evals/planned-execution.js.map +1 -0
- package/dist/src/evals/planned-remote-execution.js +40 -0
- package/dist/src/evals/planned-remote-execution.js.map +1 -0
- package/dist/src/evals/planned-retry-lifecycle.js +186 -0
- package/dist/src/evals/planned-retry-lifecycle.js.map +1 -0
- package/dist/src/evals/prepared-harness.js +76 -0
- package/dist/src/evals/prepared-harness.js.map +1 -0
- package/dist/src/evals/progress.js +4 -4
- package/dist/src/evals/progress.js.map +1 -1
- package/dist/src/evals/records.js +20 -3
- package/dist/src/evals/records.js.map +1 -1
- package/dist/src/evals/recovery.js +192 -0
- package/dist/src/evals/recovery.js.map +1 -0
- package/dist/src/evals/remote-infrastructure-retry.js +99 -0
- package/dist/src/evals/remote-infrastructure-retry.js.map +1 -0
- package/dist/src/evals/rerun-inputs.js +89 -0
- package/dist/src/evals/rerun-inputs.js.map +1 -0
- package/dist/src/evals/rerun-slots.js +4 -3
- package/dist/src/evals/rerun-slots.js.map +1 -1
- package/dist/src/evals/rerun-types.js +49 -0
- package/dist/src/evals/rerun-types.js.map +1 -0
- package/dist/src/evals/rerun.js +113 -75
- package/dist/src/evals/rerun.js.map +1 -1
- package/dist/src/evals/result-helpers.js +65 -0
- package/dist/src/evals/result-helpers.js.map +1 -0
- package/dist/src/evals/resume-state.js +36 -0
- package/dist/src/evals/resume-state.js.map +1 -0
- package/dist/src/evals/service-types.js +2 -0
- package/dist/src/evals/service-types.js.map +1 -0
- package/dist/src/evals/service.js +292 -257
- package/dist/src/evals/service.js.map +1 -1
- package/dist/src/evals/task-resources.js +209 -0
- package/dist/src/evals/task-resources.js.map +1 -0
- package/dist/src/evals/trial-environment-evidence.js +87 -0
- package/dist/src/evals/trial-environment-evidence.js.map +1 -0
- package/dist/src/evals/trial-execution-evidence.js +13 -0
- package/dist/src/evals/trial-execution-evidence.js.map +1 -0
- package/dist/src/evals/trial-import-identity.js +31 -0
- package/dist/src/evals/trial-import-identity.js.map +1 -0
- package/dist/src/evals/trial-import.js +143 -145
- package/dist/src/evals/trial-import.js.map +1 -1
- package/dist/src/evals/trial-publication-recovery.js +104 -0
- package/dist/src/evals/trial-publication-recovery.js.map +1 -0
- package/dist/src/evals/trial-publication.js +25 -0
- package/dist/src/evals/trial-publication.js.map +1 -0
- package/dist/src/evals/work-item-artifacts.js +23 -0
- package/dist/src/evals/work-item-artifacts.js.map +1 -0
- package/dist/src/foundation/config.js +17 -0
- package/dist/src/foundation/config.js.map +1 -1
- package/dist/src/foundation/credential-redaction.js +137 -0
- package/dist/src/foundation/credential-redaction.js.map +1 -0
- package/dist/src/foundation/environment-image-references.js +59 -0
- package/dist/src/foundation/environment-image-references.js.map +1 -0
- package/dist/src/foundation/executable.js +45 -5
- package/dist/src/foundation/executable.js.map +1 -1
- package/dist/src/foundation/index.js +5 -2
- package/dist/src/foundation/index.js.map +1 -1
- package/dist/src/foundation/process-identity.js +69 -0
- package/dist/src/foundation/process-identity.js.map +1 -0
- package/dist/src/images/context.js +47 -0
- package/dist/src/images/context.js.map +1 -0
- package/dist/src/images/docker-buildkit.js +137 -0
- package/dist/src/images/docker-buildkit.js.map +1 -0
- package/dist/src/images/dockerfile.js +67 -0
- package/dist/src/images/dockerfile.js.map +1 -0
- package/dist/src/images/gc.js +261 -0
- package/dist/src/images/gc.js.map +1 -0
- package/dist/src/images/index.js +10 -0
- package/dist/src/images/index.js.map +1 -0
- package/dist/src/images/manifest.js +109 -0
- package/dist/src/images/manifest.js.map +1 -0
- package/dist/src/images/ownership.js +5 -0
- package/dist/src/images/ownership.js.map +1 -0
- package/dist/src/images/records.js +32 -0
- package/dist/src/images/records.js.map +1 -0
- package/dist/src/images/registry.js +154 -0
- package/dist/src/images/registry.js.map +1 -0
- package/dist/src/images/service.js +224 -0
- package/dist/src/images/service.js.map +1 -0
- package/dist/src/model-access/capture.js +255 -0
- package/dist/src/model-access/capture.js.map +1 -0
- package/dist/src/model-access/index.js +5 -0
- package/dist/src/model-access/index.js.map +1 -0
- package/dist/src/model-access/policy.js +49 -0
- package/dist/src/model-access/policy.js.map +1 -0
- package/dist/src/model-access/proxy.js +336 -0
- package/dist/src/model-access/proxy.js.map +1 -0
- package/dist/src/model-access/records.js +167 -0
- package/dist/src/model-access/records.js.map +1 -0
- package/dist/src/runs/bundle.js +450 -0
- package/dist/src/runs/bundle.js.map +1 -0
- package/dist/src/runs/events.js +12 -1
- package/dist/src/runs/events.js.map +1 -1
- package/dist/src/runs/executor.js +24 -17
- package/dist/src/runs/executor.js.map +1 -1
- package/dist/src/runs/index.js +3 -1
- package/dist/src/runs/index.js.map +1 -1
- package/dist/src/runs/manifest.js +5 -5
- package/dist/src/runs/manifest.js.map +1 -1
- package/dist/src/runs/request.js +6 -1
- package/dist/src/runs/request.js.map +1 -1
- package/dist/src/runs/training-candidate.js +161 -0
- package/dist/src/runs/training-candidate.js.map +1 -0
- package/dist/src/trajectories/provider-capture.js +15 -24
- package/dist/src/trajectories/provider-capture.js.map +1 -1
- package/dist/src/trajectories/providers/deepseek.js +3 -3
- package/dist/src/trajectories/providers/deepseek.js.map +1 -1
- package/dist/src/workers/index.js +3 -0
- package/dist/src/workers/index.js.map +1 -0
- package/dist/src/workers/remote-harbor-work-spec.js +97 -0
- package/dist/src/workers/remote-harbor-work-spec.js.map +1 -0
- package/dist/src/workers/remote-harbor-worker.js +220 -0
- package/dist/src/workers/remote-harbor-worker.js.map +1 -0
- package/docs/schemas/environment-build-index.schema.json +13 -0
- package/docs/schemas/environment-build-record.schema.json +25 -0
- package/docs/schemas/environment-image-manifest.schema.json +62 -0
- package/docs/schemas/eval-control.schema.json +36 -0
- package/docs/schemas/eval-execution-plan.schema.json +216 -0
- package/docs/schemas/eval-rerun-result.schema.json +53 -0
- package/docs/schemas/eval-rerun-state.schema.json +61 -0
- package/docs/schemas/eval-rerun-submission.schema.json +58 -0
- package/docs/schemas/eval-result.schema.json +34 -1
- package/docs/schemas/eval-submission-input.schema.json +14 -0
- package/docs/schemas/eval-submission.schema.json +68 -0
- package/docs/schemas/eval-trial-publication.schema.json +39 -0
- package/docs/schemas/execution-evidence.schema.json +96 -0
- package/docs/schemas/execution-lease.schema.json +50 -0
- package/docs/schemas/execution-provider-status.schema.json +65 -0
- package/docs/schemas/execution-worker.schema.json +53 -0
- package/docs/schemas/harbor-process-exit.schema.json +14 -0
- package/docs/schemas/interaction-capture-ref.schema.json +45 -0
- package/docs/schemas/local-provider-execution.schema.json +33 -0
- package/docs/schemas/model-interaction.schema.json +41 -0
- package/docs/schemas/remote-result-envelope.schema.json +32 -0
- package/docs/schemas/remote-tree-envelope.schema.json +25 -0
- package/docs/schemas/remote-work-offer.schema.json +58 -0
- package/docs/schemas/remote-work-receipt.schema.json +50 -0
- package/docs/schemas/remote-worker-artifact.schema.json +17 -0
- package/docs/schemas/remote-worker-event.schema.json +18 -0
- package/docs/schemas/remote-worker-heartbeat.schema.json +37 -0
- package/docs/schemas/remote-worker-registration.schema.json +52 -0
- package/docs/schemas/result-bundle-index.schema.json +133 -0
- package/docs/schemas/run-environment-images.schema.json +39 -0
- package/docs/schemas/training-data-candidate.schema.json +46 -0
- package/integrations/harbor/hitch_harbor_agent.py +171 -539
- package/integrations/harbor/hitch_harbor_environment.py +331 -0
- package/integrations/harbor/hitch_harbor_task_resources.py +275 -0
- package/integrations/harbor/hitch_harbor_verifier.py +23 -0
- package/package.json +14 -1
|
@@ -2,16 +2,12 @@ import { createHash } from "node:crypto";
|
|
|
2
2
|
import { createWriteStream } from "node:fs";
|
|
3
3
|
import { readFile, stat } from "node:fs/promises";
|
|
4
4
|
import path from "node:path";
|
|
5
|
-
import { ensureDir } from "../foundation/index.js";
|
|
5
|
+
import { ensureDir, redactCredentialText } from "../foundation/index.js";
|
|
6
6
|
const SENSITIVE_FIELD = /(?:^|[_-])(?:api[_-]?key|authorization|token|secret|password|credential|cookie)(?:$|[_-])/i;
|
|
7
|
-
const SECRET_TEXT_RULES = [
|
|
8
|
-
{ id: "authorization-bearer-v1", pattern: /\bBearer\s+[A-Za-z0-9._~+\/-]{8,}/gi, replacement: "Bearer [REDACTED]" },
|
|
9
|
-
{ id: "provider-api-key-v1", pattern: /\b(?:sk|rk|pk)-[A-Za-z0-9_-]{12,}\b/g, replacement: "[REDACTED]" },
|
|
10
|
-
];
|
|
11
7
|
function increment(redactions, rule, count = 1) {
|
|
12
8
|
redactions.set(rule, (redactions.get(rule) || 0) + count);
|
|
13
9
|
}
|
|
14
|
-
export function redactProviderJSON(value) {
|
|
10
|
+
export function redactProviderJSON(value, credentialValues = []) {
|
|
15
11
|
const redactions = new Map();
|
|
16
12
|
const visit = (current, key) => {
|
|
17
13
|
if (key && SENSITIVE_FIELD.test(key)) {
|
|
@@ -24,38 +20,33 @@ export function redactProviderJSON(value) {
|
|
|
24
20
|
return Object.fromEntries(Object.entries(current).map(([entryKey, entry]) => [entryKey, visit(entry, entryKey)]));
|
|
25
21
|
}
|
|
26
22
|
if (typeof current === "string")
|
|
27
|
-
return redactProviderText(current, redactions);
|
|
23
|
+
return redactProviderText(current, redactions, credentialValues);
|
|
28
24
|
return current;
|
|
29
25
|
};
|
|
30
26
|
return { value: visit(value), redactions };
|
|
31
27
|
}
|
|
32
|
-
export function redactProviderText(value, existing = new Map()) {
|
|
33
|
-
|
|
34
|
-
for (const rule of
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
count += 1;
|
|
38
|
-
return rule.replacement;
|
|
39
|
-
});
|
|
40
|
-
if (count > 0)
|
|
41
|
-
increment(existing, rule.id, count);
|
|
42
|
-
}
|
|
43
|
-
return output;
|
|
28
|
+
export function redactProviderText(value, existing = new Map(), credentialValues = []) {
|
|
29
|
+
const result = redactCredentialText(value, credentialValues);
|
|
30
|
+
for (const [rule, count] of result.redactions)
|
|
31
|
+
increment(existing, rule, count);
|
|
32
|
+
return result.text;
|
|
44
33
|
}
|
|
45
34
|
/** Append-only capture of provider output before canonical projection. */
|
|
46
35
|
export class ProviderCaptureWriter {
|
|
47
36
|
target;
|
|
48
37
|
relativePath;
|
|
49
38
|
structured;
|
|
39
|
+
credentialValues;
|
|
50
40
|
stream;
|
|
51
41
|
pending = Promise.resolve();
|
|
52
42
|
closed = false;
|
|
53
43
|
counts = new Map();
|
|
54
44
|
streamError;
|
|
55
|
-
constructor(target, relativePath, structured, stream) {
|
|
45
|
+
constructor(target, relativePath, structured, credentialValues, stream) {
|
|
56
46
|
this.target = target;
|
|
57
47
|
this.relativePath = relativePath;
|
|
58
48
|
this.structured = structured;
|
|
49
|
+
this.credentialValues = [...credentialValues];
|
|
59
50
|
this.stream = stream;
|
|
60
51
|
stream.on("error", (error) => { this.streamError ||= error; });
|
|
61
52
|
}
|
|
@@ -65,12 +56,12 @@ export class ProviderCaptureWriter {
|
|
|
65
56
|
: "trajectory/provider/transcript.txt";
|
|
66
57
|
const target = path.join(options.runDirectory, ...relativePath.split("/"));
|
|
67
58
|
await ensureDir(path.dirname(target));
|
|
68
|
-
return new ProviderCaptureWriter(target, relativePath, options.structured, createWriteStream(target, { flags: "ax", mode: 0o600 }));
|
|
59
|
+
return new ProviderCaptureWriter(target, relativePath, options.structured, options.credentialValues ?? [], createWriteStream(target, { flags: "ax", mode: 0o600 }));
|
|
69
60
|
}
|
|
70
61
|
appendJSON(value) {
|
|
71
62
|
if (!this.structured)
|
|
72
63
|
throw new Error("provider capture is not in structured mode");
|
|
73
|
-
const redacted = redactProviderJSON(value);
|
|
64
|
+
const redacted = redactProviderJSON(value, this.credentialValues);
|
|
74
65
|
this.merge(redacted.redactions);
|
|
75
66
|
this.enqueue(`${JSON.stringify(redacted.value)}\n`);
|
|
76
67
|
return redacted.value;
|
|
@@ -78,14 +69,14 @@ export class ProviderCaptureWriter {
|
|
|
78
69
|
appendUnparsed(line) {
|
|
79
70
|
if (!this.structured)
|
|
80
71
|
return this.appendText(line);
|
|
81
|
-
const safe = redactProviderText(line, this.counts);
|
|
72
|
+
const safe = redactProviderText(line, this.counts, this.credentialValues);
|
|
82
73
|
this.enqueue(`${JSON.stringify({ hitch_envelope: { kind: "unparsed_provider_line" }, provider_payload: { text: safe } })}\n`);
|
|
83
74
|
return safe;
|
|
84
75
|
}
|
|
85
76
|
appendText(line) {
|
|
86
77
|
if (this.structured)
|
|
87
78
|
throw new Error("provider capture is in structured mode");
|
|
88
|
-
const safe = redactProviderText(line, this.counts);
|
|
79
|
+
const safe = redactProviderText(line, this.counts, this.credentialValues);
|
|
89
80
|
this.enqueue(`${safe}\n`);
|
|
90
81
|
return safe;
|
|
91
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-capture.js","sourceRoot":"","sources":["../../../src/trajectories/provider-capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-capture.js","sourceRoot":"","sources":["../../../src/trajectories/provider-capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEzE,MAAM,eAAe,GAAG,4FAA4F,CAAC;AAMrH,SAAS,SAAS,CAAC,UAA+B,EAAE,IAAY,EAAE,KAAK,GAAG,CAAC;IACzE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc,EAAE,mBAAsC,EAAE;IACzF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC7C,MAAM,KAAK,GAAG,CAAC,OAAgB,EAAE,GAAY,EAAW,EAAE;QACxD,IAAI,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,SAAS,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;YAC5C,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACxE,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC3C,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAkC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/I,CAAC;QACD,IAAI,OAAO,OAAO,KAAK,QAAQ;YAAE,OAAO,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAClG,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IACF,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAa,EAAE,WAAW,IAAI,GAAG,EAAkB,EAAE,mBAAsC,EAAE;IAC9H,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAC7D,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,UAAU;QAAE,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC;AAQD,0EAA0E;AAC1E,MAAM,OAAO,qBAAqB;IACf,MAAM,CAAS;IACf,YAAY,CAAS;IACrB,UAAU,CAAU;IACpB,gBAAgB,CAAW;IAC3B,MAAM,CAAc;IAC7B,OAAO,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3C,MAAM,GAAG,KAAK,CAAC;IACN,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,WAAW,CAAoB;IAEvC,YAAoB,MAAc,EAAE,YAAoB,EAAE,UAAmB,EAAE,gBAAmC,EAAE,MAAmB;QACrI,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,gBAAgB,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE,GAAG,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAA+B;QAC/C,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU;YACrC,CAAC,CAAC,kCAAkC;YACpC,CAAC,CAAC,oCAAoC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3E,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QACtC,OAAO,IAAI,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,gBAAgB,IAAI,EAAE,EAAE,iBAAiB,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACtK,CAAC;IAED,UAAU,CAAC,KAAc;QACvB,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QACpF,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAClE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpD,OAAO,QAAQ,CAAC,KAAK,CAAC;IACxB,CAAC;IAED,cAAc,CAAC,IAAY;QACzB,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC1E,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAC9H,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,IAAY;QACrB,IAAI,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC/E,MAAM,IAAI,GAAG,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC1E,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,UAA+B;QAC3C,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,UAAU;YAAE,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC9E,CAAC;IAEO,OAAO,CAAC,KAAa;QAC3B,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACtE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,MAAM,IAAI,CAAC,OAAO,CAAC;YACnB,MAAM,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,CAAC,WAAW,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtF,OAAO;YACL,IAAI,EAAE;gBACJ,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,qBAAqB;gBACjE,IAAI,EAAE,IAAI,CAAC,YAAY;gBACvB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,2BAA2B;gBAClF,MAAM,EAAE,UAAU,MAAM,EAAE;gBAC1B,KAAK,EAAE,IAAI,CAAC,IAAI;aACjB;YACD,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;iBACnC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;iBACpD,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;SACnD,CAAC;IACJ,CAAC;CACF;AAED,SAAS,WAAW,CAAC,MAAmB;IACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -23,7 +23,7 @@ export async function importDeepseekNativeSession(options) {
|
|
|
23
23
|
}
|
|
24
24
|
if (located.jsonl.length === 0)
|
|
25
25
|
return null;
|
|
26
|
-
const sessions = await Promise.all(located.jsonl.map((source) => readNativeSession(source)));
|
|
26
|
+
const sessions = await Promise.all(located.jsonl.map((source) => readNativeSession(source, options.credentialValues ?? [])));
|
|
27
27
|
const roots = sessions.filter((session) => session.header.parentSession === undefined);
|
|
28
28
|
if (roots.length !== 1) {
|
|
29
29
|
throw new Error(`DeepSeek wrote ${roots.length} root native sessions for one run; refusing an ambiguous import`);
|
|
@@ -74,7 +74,7 @@ export async function importDeepseekNativeSession(options) {
|
|
|
74
74
|
result.effectiveModel = effectiveModel;
|
|
75
75
|
return result;
|
|
76
76
|
}
|
|
77
|
-
async function readNativeSession(source) {
|
|
77
|
+
async function readNativeSession(source, credentialValues) {
|
|
78
78
|
const input = await readFile(source, "utf8");
|
|
79
79
|
const lines = input.split(/\r?\n/).filter((line) => line.length > 0);
|
|
80
80
|
if (lines.length === 0)
|
|
@@ -82,7 +82,7 @@ async function readNativeSession(source) {
|
|
|
82
82
|
const redactions = new Map();
|
|
83
83
|
const providerRows = [];
|
|
84
84
|
const redact = (value) => {
|
|
85
|
-
const result = redactProviderJSON(value);
|
|
85
|
+
const result = redactProviderJSON(value, credentialValues);
|
|
86
86
|
for (const [rule, count] of result.redactions) {
|
|
87
87
|
redactions.set(rule, (redactions.get(rule) || 0) + count);
|
|
88
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deepseek.js","sourceRoot":"","sources":["../../../../src/trajectories/providers/deepseek.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAE1F,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC;IACpC,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU;IAClD,gBAAgB,EAAE,cAAc,EAAE,iBAAiB,EAAE,mBAAmB;IACxE,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAYH;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,
|
|
1
|
+
{"version":3,"file":"deepseek.js","sourceRoot":"","sources":["../../../../src/trajectories/providers/deepseek.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/workers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { HitchError } from "../foundation/index.js";
|
|
2
|
+
import { parseEvalExecutionPlan } from "../evals/index.js";
|
|
3
|
+
export function parseRemoteHarborWorkSpec(value, offer) {
|
|
4
|
+
const spec = exact(value, [
|
|
5
|
+
"schema_version", "request", "plan", "work", "resolution", "harness_artifact", "controller_runtime", "task", "credential_names",
|
|
6
|
+
], "remote Harbor work spec", ["credential_names"]);
|
|
7
|
+
if (spec.schema_version !== "1")
|
|
8
|
+
throw specError("remote Harbor work spec version is invalid");
|
|
9
|
+
const request = parseRequest(spec.request);
|
|
10
|
+
const plan = parseEvalExecutionPlan(spec.plan);
|
|
11
|
+
const work = plan.work_items.find((entry) => entry.work_id === offer.work.work_id);
|
|
12
|
+
if (!work || JSON.stringify(work) !== JSON.stringify(offer.work) || plan.eval_id !== offer.lease.eval_id
|
|
13
|
+
|| plan.provider !== offer.lease.provider || request.backend !== "harbor")
|
|
14
|
+
throw specError("remote Harbor work graph does not match its offer");
|
|
15
|
+
const resolution = parseResolution(spec.resolution);
|
|
16
|
+
const harnessArtifact = parseArtifact(spec.harness_artifact);
|
|
17
|
+
const runtime = exact(spec.controller_runtime, ["runtime_id", "directory"], "remote controller runtime");
|
|
18
|
+
const task = exact(spec.task, ["task_id", "directory"], "remote task input");
|
|
19
|
+
const credentialNames = spec.credential_names === undefined && offer.credential_names === undefined
|
|
20
|
+
? []
|
|
21
|
+
: environmentNames(spec.credential_names) ? [...spec.credential_names].sort() : (() => { throw specError("remote credential names are invalid"); })();
|
|
22
|
+
if (runtime.directory !== "controller-runtime" || typeof runtime.runtime_id !== "string" || !/^sha256:[a-f0-9]{64}$/.test(runtime.runtime_id)
|
|
23
|
+
|| task.directory !== "task-input" || task.task_id !== work.task_ids[0] || work.task_ids.length !== 1
|
|
24
|
+
|| harnessArtifact.directory !== "harness-artifact" || harnessArtifact.harness_id !== resolution.harness_id
|
|
25
|
+
|| work.artifact_id !== undefined && harnessArtifact.artifact_id !== work.artifact_id
|
|
26
|
+
|| harnessArtifact.revision_identity !== resolution.identity || request.harness_ref !== resolution.requested_ref
|
|
27
|
+
|| request.benchmark_id !== plan.benchmark.id || request.benchmark_revision !== plan.benchmark.revision
|
|
28
|
+
|| JSON.stringify(credentialNames) !== JSON.stringify(offer.credential_names ?? [])) {
|
|
29
|
+
throw specError("remote Harbor work inputs do not match their pinned identities");
|
|
30
|
+
}
|
|
31
|
+
return {
|
|
32
|
+
schema_version: "1", request, plan, work, resolution, harness_artifact: harnessArtifact,
|
|
33
|
+
controller_runtime: { runtime_id: runtime.runtime_id, directory: "controller-runtime" },
|
|
34
|
+
task: { task_id: task.task_id, directory: "task-input" },
|
|
35
|
+
credential_names: credentialNames,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
function parseRequest(value) {
|
|
39
|
+
const request = exact(value, [
|
|
40
|
+
"schema_version", "backend", "dataset", "harness_ref", "model", "attempts", "max_concurrent",
|
|
41
|
+
"infrastructure_retries", "infrastructure_retry_backoff_ms", "timeout_ms", "setup_timeout_ms",
|
|
42
|
+
"agent_args", "pass_env", "benchmark_id", "benchmark_revision",
|
|
43
|
+
], "remote eval request");
|
|
44
|
+
if (typeof request.schema_version !== "string" || request.backend !== "harbor" || request.dataset !== "task-input"
|
|
45
|
+
|| !text(request.harness_ref) || typeof request.model !== "string"
|
|
46
|
+
|| !positive(request.attempts) || !positive(request.max_concurrent)
|
|
47
|
+
|| !nonnegative(request.infrastructure_retries) || !nonnegative(request.infrastructure_retry_backoff_ms)
|
|
48
|
+
|| !nonnegative(request.timeout_ms) || !nonnegative(request.setup_timeout_ms)
|
|
49
|
+
|| !stringArray(request.agent_args, 4_096) || !environmentNames(request.pass_env)
|
|
50
|
+
|| !text(request.benchmark_id) || !text(request.benchmark_revision))
|
|
51
|
+
throw specError("remote eval request is invalid");
|
|
52
|
+
return request;
|
|
53
|
+
}
|
|
54
|
+
function parseResolution(value) {
|
|
55
|
+
const resolution = exact(value, [
|
|
56
|
+
"schema_version", "requested_ref", "canonical_ref", "harness_id", "selector", "source", "revision", "identity", "resolved_at",
|
|
57
|
+
], "remote resolved revision");
|
|
58
|
+
if (typeof resolution.schema_version !== "string" || !text(resolution.requested_ref) || !text(resolution.canonical_ref)
|
|
59
|
+
|| !text(resolution.harness_id) || typeof resolution.identity !== "string" || !/^sha256:[a-f0-9]{64}$/.test(resolution.identity)
|
|
60
|
+
|| typeof resolution.resolved_at !== "string" || !Number.isFinite(Date.parse(resolution.resolved_at))
|
|
61
|
+
|| !object(resolution.selector) || !object(resolution.source) || !object(resolution.revision))
|
|
62
|
+
throw specError("remote resolved revision is invalid");
|
|
63
|
+
return resolution;
|
|
64
|
+
}
|
|
65
|
+
function parseArtifact(value) {
|
|
66
|
+
const artifact = exact(value, [
|
|
67
|
+
"directory", "artifact_id", "artifact_integrity", "entrypoint_integrity", "harness_id", "revision_identity",
|
|
68
|
+
"adapter_version", "recipe_version", "platform", "node_version", "source_type",
|
|
69
|
+
], "remote prepared artifact");
|
|
70
|
+
if (artifact.directory !== "harness-artifact"
|
|
71
|
+
|| !digest(artifact.artifact_id) || !digest(artifact.artifact_integrity) || !digest(artifact.entrypoint_integrity)
|
|
72
|
+
|| !text(artifact.harness_id) || !digest(artifact.revision_identity) || !text(artifact.adapter_version)
|
|
73
|
+
|| !text(artifact.recipe_version) || !text(artifact.platform) || !text(artifact.node_version) || !text(artifact.source_type)) {
|
|
74
|
+
throw specError("remote prepared artifact is invalid");
|
|
75
|
+
}
|
|
76
|
+
return artifact;
|
|
77
|
+
}
|
|
78
|
+
function exact(value, keys, label, optional = []) {
|
|
79
|
+
if (!object(value))
|
|
80
|
+
throw specError(`${label} must be an object`);
|
|
81
|
+
if (keys.some((key) => !(key in value) && !optional.includes(key)) || Object.keys(value).some((key) => !keys.includes(key)))
|
|
82
|
+
throw specError(`${label} fields are invalid`);
|
|
83
|
+
return value;
|
|
84
|
+
}
|
|
85
|
+
function object(value) { return Boolean(value) && typeof value === "object" && !Array.isArray(value); }
|
|
86
|
+
function digest(value) { return typeof value === "string" && /^sha256:[a-f0-9]{64}$/.test(value); }
|
|
87
|
+
function positive(value) { return Number.isSafeInteger(value) && value >= 1; }
|
|
88
|
+
function nonnegative(value) { return Number.isSafeInteger(value) && value >= 0; }
|
|
89
|
+
function text(value) { return typeof value === "string" && value.length > 0 && value.length <= 4_096 && !/[\0\r\n]/.test(value); }
|
|
90
|
+
function stringArray(value, maximum) {
|
|
91
|
+
return Array.isArray(value) && value.length <= maximum && value.every((entry) => typeof entry === "string" && entry.length <= maximum && !/[\0]/.test(entry));
|
|
92
|
+
}
|
|
93
|
+
function environmentNames(value) {
|
|
94
|
+
return Array.isArray(value) && value.length <= 256 && value.every((entry) => typeof entry === "string" && /^[A-Za-z_][A-Za-z0-9_]*$/.test(entry)) && new Set(value).size === value.length;
|
|
95
|
+
}
|
|
96
|
+
function specError(message) { return new HitchError(message, { code: "remote_work_spec_invalid", exitCode: 12 }); }
|
|
97
|
+
//# sourceMappingURL=remote-harbor-work-spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-harbor-work-spec.js","sourceRoot":"","sources":["../../../src/workers/remote-harbor-work-spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,220 @@
|
|
|
1
|
+
import { chmod, lstat, mkdir, readdir, rm } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { loadPreparedArtifact } from "../artifacts/index.js";
|
|
4
|
+
import { runHarborBackend } from "../backends/index.js";
|
|
5
|
+
import { useControllerRuntimeDirectory } from "../controller-runtime/index.js";
|
|
6
|
+
import { atomicWriteJSON, ensureDir, statePaths } from "../foundation/index.js";
|
|
7
|
+
import { dockerResourceOwnership, importEvalTrialRun, reapOwnedDockerResources, releaseExecutionLease, resolvedImageMapping, runtimeResourcesForTask, startDockerResourceObserver, startEvalModelCaptureRuntime } from "../evals/index.js";
|
|
8
|
+
import { encodeRemoteResultEnvelope, materializeRemoteTreeEnvelope } from "../control-plane/index.js";
|
|
9
|
+
import { parseRemoteHarborWorkSpec } from "./remote-harbor-work-spec.js";
|
|
10
|
+
export function remoteHarborWorker(options) {
|
|
11
|
+
if (!options.root)
|
|
12
|
+
throw new TypeError("remote Harbor worker root is required");
|
|
13
|
+
const root = path.resolve(options.root);
|
|
14
|
+
const env = options.env ?? process.env;
|
|
15
|
+
return async ({ offer, inputs, credentials, signal, emit }) => {
|
|
16
|
+
const workspace = path.join(statePaths(root).workerStaging, offer.lease.lease_id, `epoch-${String(offer.lease.epoch).padStart(6, "0")}`);
|
|
17
|
+
await removeWorkerWorkspace(workspace);
|
|
18
|
+
await mkdir(workspace, { recursive: true, mode: 0o700 });
|
|
19
|
+
const spec = parseRemoteHarborWorkSpec(parseJSON(required(inputs, "work-spec")), offer);
|
|
20
|
+
if (JSON.stringify([...credentials.keys()].sort()) !== JSON.stringify(spec.credential_names)) {
|
|
21
|
+
throw new TypeError("remote credential envelope does not match its work spec");
|
|
22
|
+
}
|
|
23
|
+
const executionEnv = { ...env, ...Object.fromEntries(credentials) };
|
|
24
|
+
const harnessDirectory = path.join(workspace, "harness-artifact");
|
|
25
|
+
const runtimeDirectory = path.join(workspace, "controller-runtime");
|
|
26
|
+
const datasetDirectory = await ensureDir(path.join(workspace, "dataset"));
|
|
27
|
+
await Promise.all([
|
|
28
|
+
materializeRemoteTreeEnvelope(parseJSON(required(inputs, "harness-artifact")), harnessDirectory),
|
|
29
|
+
materializeRemoteTreeEnvelope(parseJSON(required(inputs, "controller-runtime")), runtimeDirectory),
|
|
30
|
+
materializeRemoteTreeEnvelope(parseJSON(required(inputs, "task-input")), path.join(datasetDirectory, spec.task.task_id)),
|
|
31
|
+
]);
|
|
32
|
+
const prepared = await loadPreparedArtifact(harnessDirectory, spec.harness_artifact);
|
|
33
|
+
if (JSON.stringify(prepared.resolved_revision) !== JSON.stringify(spec.resolution)
|
|
34
|
+
|| prepared.toolchain.node !== spec.harness_artifact.node_version)
|
|
35
|
+
throw new TypeError("remote prepared artifact evidence does not match its work spec");
|
|
36
|
+
const runtime = await useControllerRuntimeDirectory(runtimeDirectory, spec.controller_runtime.runtime_id);
|
|
37
|
+
const evalDirectory = await ensureDir(path.join(statePaths(root).evals, offer.lease.eval_id));
|
|
38
|
+
await persistRunningLease(evalDirectory, offer.lease);
|
|
39
|
+
const taskId = spec.task.task_id;
|
|
40
|
+
const runtimeResources = runtimeResourcesForTask(spec.plan, taskId, offer.lease.reservation);
|
|
41
|
+
const ownership = dockerResourceOwnership(root, offer.lease, taskId);
|
|
42
|
+
const observer = startDockerResourceObserver({
|
|
43
|
+
ownership, workerId: offer.worker_id, collisionDomainId: offer.lease.collision_domain_id,
|
|
44
|
+
reservation: offer.lease.reservation, mainLimits: runtimeResources.mainLimits,
|
|
45
|
+
sidecarLimits: runtimeResources.sidecarLimits, env, signal,
|
|
46
|
+
});
|
|
47
|
+
const backendDirectory = path.join(evalDirectory, "remote-work", offer.work.work_id, `epoch-${String(offer.lease.epoch).padStart(6, "0")}`);
|
|
48
|
+
const captureRuntime = await startEvalModelCaptureRuntime({
|
|
49
|
+
plan: spec.plan.model_capture ?? { requested_mode: "native", effective_mode: "native", required: false },
|
|
50
|
+
evalId: offer.lease.eval_id,
|
|
51
|
+
// A remote worker may run multiple work items from one eval concurrently.
|
|
52
|
+
// Keep the capability token, append state and capture files lease-local.
|
|
53
|
+
evalDirectory: backendDirectory,
|
|
54
|
+
env: executionEnv,
|
|
55
|
+
runtimeTopology: "in-sandbox",
|
|
56
|
+
preservePlanOnOptionalFailure: true,
|
|
57
|
+
});
|
|
58
|
+
let stoppedEvidence;
|
|
59
|
+
const stopObserver = async () => stoppedEvidence ??= await observer.stop();
|
|
60
|
+
const release = releaseRemoteResources({
|
|
61
|
+
root, evalDirectory, lease: offer.lease, workspace, env,
|
|
62
|
+
...(options.dockerExecutable ? { dockerExecutable: options.dockerExecutable } : {}),
|
|
63
|
+
});
|
|
64
|
+
let eventTail = Promise.resolve();
|
|
65
|
+
const publishEvent = (event) => {
|
|
66
|
+
eventTail = eventTail.then(() => emit(String(event.type ?? "harbor.event"), event));
|
|
67
|
+
};
|
|
68
|
+
try {
|
|
69
|
+
const run = await runHarborBackend({
|
|
70
|
+
evalId: offer.lease.eval_id, evalDirectory, backendDirectory,
|
|
71
|
+
logicalAttempt: offer.work.logical_attempt, taskNames: [taskId],
|
|
72
|
+
request: { ...spec.request, dataset: datasetDirectory, attempts: 1, max_concurrent: 1 },
|
|
73
|
+
root, resolvedRevision: spec.resolution, runtimeDirectory: runtime.directory,
|
|
74
|
+
runtimeId: runtime.runtime_id, preparedArtifact: preparedUse(prepared, harnessDirectory, spec.harness_artifact),
|
|
75
|
+
executionResources: runtimeResources.mainLimits,
|
|
76
|
+
...(Object.keys(runtimeResources.sidecarLimits).length > 0 ? { dockerServiceLimits: runtimeResources.sidecarLimits } : {}),
|
|
77
|
+
dockerOwnership: ownership, resolvedImages: resolvedImageMapping(offer.work.image_refs ?? []),
|
|
78
|
+
...(captureRuntime.exporter ? { modelProxy: captureRuntime.exporter.route } : {}),
|
|
79
|
+
env: executionEnv, ...(options.harborExecutable ? { harborExecutable: options.harborExecutable } : {}), signal,
|
|
80
|
+
...(options.trialBundleGraceMs === undefined ? {} : { trialBundleGraceMs: options.trialBundleGraceMs }),
|
|
81
|
+
emit: publishEvent,
|
|
82
|
+
});
|
|
83
|
+
await eventTail;
|
|
84
|
+
const executionEvidence = await stopObserver();
|
|
85
|
+
if (signal.aborted)
|
|
86
|
+
return { status: "cancelled", artifacts: [failureDiagnostic("cancelled")], release };
|
|
87
|
+
const trial = singleTrial(run.rawResult, taskId);
|
|
88
|
+
if (run.backend.process_exit_code !== 0 || !trial)
|
|
89
|
+
return {
|
|
90
|
+
status: "failed", artifacts: [failureDiagnostic(run.rawResult ? "harbor-process-failed" : "harbor-result-missing")], release,
|
|
91
|
+
};
|
|
92
|
+
const ref = await importEvalTrialRun({
|
|
93
|
+
root, evalId: offer.lease.eval_id, evalDirectory, harborJobDirectory: path.join(backendDirectory, "job"),
|
|
94
|
+
expectedAttempt: offer.work.logical_attempt,
|
|
95
|
+
request: spec.request, resolvedRevision: spec.resolution,
|
|
96
|
+
benchmarkId: spec.request.benchmark_id, benchmarkRevision: spec.request.benchmark_revision,
|
|
97
|
+
runtimeId: runtime.runtime_id, executionEvidence,
|
|
98
|
+
...(spec.plan.model_capture ? { modelCapturePlan: spec.plan.model_capture } : {}),
|
|
99
|
+
...(captureRuntime.exporter ? { interactionCaptureExporter: captureRuntime.exporter } : {}),
|
|
100
|
+
requireCompleteMarker: true, allowMissingBundleDiagnostic: true,
|
|
101
|
+
}, trial);
|
|
102
|
+
const body = await encodeRemoteResultEnvelope({
|
|
103
|
+
evalId: offer.lease.eval_id, workId: offer.work.work_id,
|
|
104
|
+
leaseId: offer.lease.lease_id, leaseEpoch: offer.lease.epoch, trial,
|
|
105
|
+
bundleDirectory: path.join(statePaths(root).runs, ref.run_id),
|
|
106
|
+
});
|
|
107
|
+
return { status: "succeeded", artifacts: [{ kind: "result-bundle", body }], release };
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
await eventTail.catch(() => undefined);
|
|
111
|
+
await stopObserver().catch(() => undefined);
|
|
112
|
+
return { status: signal.aborted ? "cancelled" : "failed", artifacts: [failureDiagnostic(errorCode(error))], release };
|
|
113
|
+
}
|
|
114
|
+
finally {
|
|
115
|
+
await captureRuntime.close().catch(() => undefined);
|
|
116
|
+
for (const name of spec.credential_names)
|
|
117
|
+
delete executionEnv[name];
|
|
118
|
+
}
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
/** Recover cleanup after a worker restart without re-executing accepted work. */
|
|
122
|
+
export async function releaseRemoteHarborOffer(options, offer) {
|
|
123
|
+
const root = path.resolve(options.root);
|
|
124
|
+
const evalDirectory = path.join(statePaths(root).evals, offer.lease.eval_id);
|
|
125
|
+
const workspace = path.join(statePaths(root).workerStaging, offer.lease.lease_id, `epoch-${String(offer.lease.epoch).padStart(6, "0")}`);
|
|
126
|
+
await releaseRemoteResources({
|
|
127
|
+
root, evalDirectory, lease: offer.lease, workspace, env: options.env ?? process.env,
|
|
128
|
+
...(options.dockerExecutable ? { dockerExecutable: options.dockerExecutable } : {}),
|
|
129
|
+
})();
|
|
130
|
+
}
|
|
131
|
+
function releaseRemoteResources(input) {
|
|
132
|
+
let done = false;
|
|
133
|
+
return async () => {
|
|
134
|
+
if (done)
|
|
135
|
+
return;
|
|
136
|
+
const leaseFile = path.join(input.evalDirectory, "leases", `${input.lease.lease_id}.json`);
|
|
137
|
+
if (!(await lstat(leaseFile).catch(() => null))?.isFile()) {
|
|
138
|
+
await removeWorkerWorkspace(input.workspace);
|
|
139
|
+
done = true;
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
await releaseExecutionLease({ evalDirectory: input.evalDirectory, leaseId: input.lease.lease_id, expectedEpoch: input.lease.epoch });
|
|
143
|
+
const report = await reapOwnedDockerResources({
|
|
144
|
+
root: input.root, leaseIds: [input.lease.lease_id], env: input.env,
|
|
145
|
+
...(input.dockerExecutable ? { dockerExecutable: input.dockerExecutable } : {}),
|
|
146
|
+
});
|
|
147
|
+
if (report.issues.length > 0 || report.retained.length > 0)
|
|
148
|
+
throw new Error("remote Harbor resource cleanup is incomplete");
|
|
149
|
+
await removeWorkerWorkspace(input.workspace);
|
|
150
|
+
done = true;
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
async function removeWorkerWorkspace(directory) {
|
|
154
|
+
const info = await lstat(directory).catch(() => null);
|
|
155
|
+
if (!info)
|
|
156
|
+
return;
|
|
157
|
+
if (!info.isDirectory() || info.isSymbolicLink())
|
|
158
|
+
throw new TypeError("remote worker workspace is not a regular directory");
|
|
159
|
+
await makeTreeWritable(directory);
|
|
160
|
+
await rm(directory, { recursive: true, force: true });
|
|
161
|
+
}
|
|
162
|
+
async function makeTreeWritable(directory) {
|
|
163
|
+
for (const entry of await readdir(directory, { withFileTypes: true })) {
|
|
164
|
+
const target = path.join(directory, entry.name);
|
|
165
|
+
if (entry.isDirectory()) {
|
|
166
|
+
await makeTreeWritable(target);
|
|
167
|
+
await chmod(target, 0o700);
|
|
168
|
+
}
|
|
169
|
+
else if (!entry.isSymbolicLink())
|
|
170
|
+
await chmod(target, 0o600);
|
|
171
|
+
}
|
|
172
|
+
await chmod(directory, 0o700);
|
|
173
|
+
}
|
|
174
|
+
async function persistRunningLease(evalDirectory, lease) {
|
|
175
|
+
const now = new Date().toISOString();
|
|
176
|
+
await atomicWriteJSON(path.join(await ensureDir(path.join(evalDirectory, "leases")), `${lease.lease_id}.json`), {
|
|
177
|
+
...lease, state: "running", accepted_at: lease.accepted_at ?? now, heartbeat_at: now,
|
|
178
|
+
resource_epochs: lease.resource_epochs ?? [lease.epoch],
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
function preparedUse(prepared, directory, pinned) {
|
|
182
|
+
return {
|
|
183
|
+
directory,
|
|
184
|
+
artifact_id: prepared.artifact_id, artifact_integrity: prepared.artifact_integrity,
|
|
185
|
+
entrypoint_integrity: prepared.entrypoint_integrity, harness_id: prepared.harness_id,
|
|
186
|
+
revision_identity: prepared.revision_identity, adapter_version: prepared.adapter_version,
|
|
187
|
+
recipe_version: prepared.recipe_version, platform: prepared.platform,
|
|
188
|
+
node_version: prepared.toolchain.node || pinned.node_version, source_type: prepared.source_type,
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
function singleTrial(raw, taskId) {
|
|
192
|
+
const trials = Array.isArray(raw?.trial_results) ? raw.trial_results : [];
|
|
193
|
+
if (trials.length !== 1 || !trials[0] || typeof trials[0] !== "object" || Array.isArray(trials[0])
|
|
194
|
+
|| trials[0].task_name !== taskId)
|
|
195
|
+
return null;
|
|
196
|
+
return trials[0];
|
|
197
|
+
}
|
|
198
|
+
function required(inputs, kind) {
|
|
199
|
+
const body = inputs.get(kind);
|
|
200
|
+
if (!body)
|
|
201
|
+
throw new TypeError(`remote Harbor worker input is missing: ${kind}`);
|
|
202
|
+
return body;
|
|
203
|
+
}
|
|
204
|
+
function parseJSON(body) {
|
|
205
|
+
try {
|
|
206
|
+
return JSON.parse(body.toString("utf8"));
|
|
207
|
+
}
|
|
208
|
+
catch {
|
|
209
|
+
throw new TypeError("remote Harbor worker input is not valid JSON");
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
function failureDiagnostic(code) {
|
|
213
|
+
const safe = /^[a-z0-9][a-z0-9._-]{0,127}$/.test(code) ? code : "remote-worker-failed";
|
|
214
|
+
return { kind: "diagnostic", body: Buffer.from(`${JSON.stringify({ schema_version: "1", code: safe, at: new Date().toISOString() })}\n`) };
|
|
215
|
+
}
|
|
216
|
+
function errorCode(error) {
|
|
217
|
+
const code = error?.code;
|
|
218
|
+
return typeof code === "string" ? code : "remote-worker-failed";
|
|
219
|
+
}
|
|
220
|
+
//# sourceMappingURL=remote-harbor-worker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-harbor-worker.js","sourceRoot":"","sources":["../../../src/workers/remote-harbor-worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
|
3
|
+
"$id": "https://agent-hitch.local/schemas/environment-build-index.schema.json",
|
|
4
|
+
"title": "Hitch environment build index V1",
|
|
5
|
+
"type": "object",
|
|
6
|
+
"additionalProperties": false,
|
|
7
|
+
"required": ["schema_version", "build_id", "cache_key"],
|
|
8
|
+
"properties": {
|
|
9
|
+
"schema_version": { "const": "1" },
|
|
10
|
+
"build_id": { "type": "string", "pattern": "^build_[a-f0-9]{32}$" },
|
|
11
|
+
"cache_key": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" }
|
|
12
|
+
}
|
|
13
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
|
3
|
+
"$id": "https://agent-hitch.local/schemas/environment-build-record.schema.json",
|
|
4
|
+
"title": "Hitch environment build record V1",
|
|
5
|
+
"type": "object",
|
|
6
|
+
"additionalProperties": false,
|
|
7
|
+
"required": ["schema_version", "build_id", "cache_key", "state", "owner_id", "builder_id", "started_at"],
|
|
8
|
+
"properties": {
|
|
9
|
+
"schema_version": { "const": "1" },
|
|
10
|
+
"build_id": { "type": "string", "pattern": "^build_[a-f0-9]{32}$" },
|
|
11
|
+
"cache_key": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
|
|
12
|
+
"state": { "enum": ["running", "succeeded", "failed"] },
|
|
13
|
+
"owner_id": { "type": "string", "minLength": 1 },
|
|
14
|
+
"builder_id": { "type": "string", "minLength": 1 },
|
|
15
|
+
"started_at": { "type": "string", "format": "date-time" },
|
|
16
|
+
"completed_at": { "type": "string", "format": "date-time" },
|
|
17
|
+
"image_id": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
|
|
18
|
+
"error": {
|
|
19
|
+
"type": "object",
|
|
20
|
+
"additionalProperties": false,
|
|
21
|
+
"required": ["code", "message"],
|
|
22
|
+
"properties": { "code": { "type": "string", "minLength": 1 }, "message": { "type": "string", "minLength": 1 } }
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
}
|