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
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { createWriteStream } from "node:fs";
|
|
3
|
+
import { readFile } from "node:fs/promises";
|
|
4
|
+
import { pipeline } from "node:stream/promises";
|
|
5
|
+
import { fileURLToPath } from "node:url";
|
|
6
|
+
import { HitchError, consumeLines, createCredentialRedactionTransform, credentialValuesFromEnv, terminateProcess } from "../../foundation/index.js";
|
|
7
|
+
const SUPERVISOR_PATH = fileURLToPath(new URL("./supervisor.js", import.meta.url));
|
|
8
|
+
export function invokeHarbor(executable, args, { cwd, env, stdoutPath, stderrPath, signal, emit, onStarted, onExited, persistAcrossParentExit, exitStatusPath, redactEnvNames = [] }) {
|
|
9
|
+
if (onStarted && persistAcrossParentExit) {
|
|
10
|
+
if (!exitStatusPath)
|
|
11
|
+
throw new TypeError("recoverable Harbor process requires an exit status path");
|
|
12
|
+
return invokeRecoverableHarbor(executable, args, {
|
|
13
|
+
cwd,
|
|
14
|
+
env,
|
|
15
|
+
stdoutPath,
|
|
16
|
+
stderrPath,
|
|
17
|
+
emit,
|
|
18
|
+
onStarted,
|
|
19
|
+
exitStatusPath,
|
|
20
|
+
redactEnvNames,
|
|
21
|
+
...(signal ? { signal } : {}),
|
|
22
|
+
...(onExited ? { onExited } : {}),
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
return new Promise((resolve, reject) => {
|
|
26
|
+
const credentialValues = credentialValuesFromEnv(redactEnvNames, env);
|
|
27
|
+
const stdout = createWriteStream(stdoutPath, { flags: "w", mode: 0o600 });
|
|
28
|
+
const stderr = createWriteStream(stderrPath, { flags: "w", mode: 0o600 });
|
|
29
|
+
const child = spawn(executable, args, {
|
|
30
|
+
cwd,
|
|
31
|
+
env,
|
|
32
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
33
|
+
detached: process.platform !== "win32",
|
|
34
|
+
windowsHide: true,
|
|
35
|
+
});
|
|
36
|
+
const safeStdout = createCredentialRedactionTransform(credentialValues);
|
|
37
|
+
const safeStderr = createCredentialRedactionTransform(credentialValues);
|
|
38
|
+
consumeLines(safeStdout, (line) => emit({ type: "eval.backend.output", stream: "stdout", text: line }));
|
|
39
|
+
consumeLines(safeStderr, (line) => emit({ type: "eval.backend.output", stream: "stderr", text: line }));
|
|
40
|
+
let settled = false;
|
|
41
|
+
const abort = () => terminateProcess(child).catch(() => { });
|
|
42
|
+
const streams = Promise.all([
|
|
43
|
+
pipeline(child.stdout, safeStdout, stdout),
|
|
44
|
+
pipeline(child.stderr, safeStderr, stderr),
|
|
45
|
+
]);
|
|
46
|
+
streams.catch((error) => {
|
|
47
|
+
if (settled)
|
|
48
|
+
return;
|
|
49
|
+
settled = true;
|
|
50
|
+
signal?.removeEventListener("abort", abort);
|
|
51
|
+
abort();
|
|
52
|
+
reject(new HitchError(`failed to persist Harbor output: ${error.message}`, {
|
|
53
|
+
code: "harbor_log_write_failed",
|
|
54
|
+
exitCode: 12,
|
|
55
|
+
cause: error,
|
|
56
|
+
}));
|
|
57
|
+
});
|
|
58
|
+
signal?.addEventListener("abort", abort, { once: true });
|
|
59
|
+
const started = child.pid === undefined ? Promise.resolve() : Promise.resolve(onStarted?.(child.pid));
|
|
60
|
+
started.catch((error) => {
|
|
61
|
+
if (settled)
|
|
62
|
+
return;
|
|
63
|
+
settled = true;
|
|
64
|
+
signal?.removeEventListener("abort", abort);
|
|
65
|
+
abort();
|
|
66
|
+
stdout.destroy();
|
|
67
|
+
stderr.destroy();
|
|
68
|
+
reject(new HitchError(`failed to record Harbor process identity: ${error.message}`, {
|
|
69
|
+
code: "provider_process_record_failed",
|
|
70
|
+
exitCode: 12,
|
|
71
|
+
cause: error,
|
|
72
|
+
}));
|
|
73
|
+
});
|
|
74
|
+
child.once("error", (error) => {
|
|
75
|
+
if (settled)
|
|
76
|
+
return;
|
|
77
|
+
settled = true;
|
|
78
|
+
signal?.removeEventListener("abort", abort);
|
|
79
|
+
stdout.destroy();
|
|
80
|
+
stderr.destroy();
|
|
81
|
+
reject(new HitchError(`failed to launch Harbor: ${error.message}`, {
|
|
82
|
+
code: "harbor_launch_failed",
|
|
83
|
+
exitCode: 6,
|
|
84
|
+
cause: error,
|
|
85
|
+
}));
|
|
86
|
+
});
|
|
87
|
+
child.once("close", (code, processSignal) => {
|
|
88
|
+
if (settled)
|
|
89
|
+
return;
|
|
90
|
+
settled = true;
|
|
91
|
+
signal?.removeEventListener("abort", abort);
|
|
92
|
+
const result = { code, signal: processSignal };
|
|
93
|
+
Promise.all([started, streams])
|
|
94
|
+
.then(async () => { await onExited?.(result); resolve(result); })
|
|
95
|
+
.catch(reject);
|
|
96
|
+
});
|
|
97
|
+
if (signal?.aborted)
|
|
98
|
+
abort();
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
function invokeRecoverableHarbor(executable, args, { cwd, env, stdoutPath, stderrPath, signal, emit, onStarted, onExited, exitStatusPath, redactEnvNames }) {
|
|
102
|
+
return new Promise((resolve, reject) => {
|
|
103
|
+
credentialValuesFromEnv(redactEnvNames, env);
|
|
104
|
+
const child = spawn(process.execPath, [
|
|
105
|
+
SUPERVISOR_PATH, exitStatusPath, stdoutPath, stderrPath, JSON.stringify(redactEnvNames), executable, ...args,
|
|
106
|
+
], {
|
|
107
|
+
cwd,
|
|
108
|
+
env,
|
|
109
|
+
stdio: "ignore",
|
|
110
|
+
detached: process.platform !== "win32",
|
|
111
|
+
windowsHide: true,
|
|
112
|
+
});
|
|
113
|
+
let settled = false;
|
|
114
|
+
const abort = () => terminateProcess(child).catch(() => { });
|
|
115
|
+
signal?.addEventListener("abort", abort, { once: true });
|
|
116
|
+
const started = child.pid === undefined
|
|
117
|
+
? Promise.reject(new HitchError("Harbor process has no PID", { code: "harbor_launch_failed", exitCode: 6 }))
|
|
118
|
+
: Promise.resolve(onStarted(child.pid));
|
|
119
|
+
started.then(() => emit({ type: "eval.backend.process-recorded", process_id: child.pid })).catch((error) => {
|
|
120
|
+
if (settled)
|
|
121
|
+
return;
|
|
122
|
+
settled = true;
|
|
123
|
+
signal?.removeEventListener("abort", abort);
|
|
124
|
+
abort();
|
|
125
|
+
reject(new HitchError(`failed to record Harbor process identity: ${error.message}`, {
|
|
126
|
+
code: "provider_process_record_failed",
|
|
127
|
+
exitCode: 12,
|
|
128
|
+
cause: error,
|
|
129
|
+
}));
|
|
130
|
+
});
|
|
131
|
+
child.once("error", (error) => {
|
|
132
|
+
if (settled)
|
|
133
|
+
return;
|
|
134
|
+
settled = true;
|
|
135
|
+
signal?.removeEventListener("abort", abort);
|
|
136
|
+
reject(new HitchError(`failed to launch Harbor: ${error.message}`, { code: "harbor_launch_failed", exitCode: 6, cause: error }));
|
|
137
|
+
});
|
|
138
|
+
child.once("close", (code, processSignal) => {
|
|
139
|
+
if (settled)
|
|
140
|
+
return;
|
|
141
|
+
settled = true;
|
|
142
|
+
signal?.removeEventListener("abort", abort);
|
|
143
|
+
started.then(async () => {
|
|
144
|
+
const result = await readHarborProcessExitStatus(exitStatusPath) ?? { code, signal: processSignal };
|
|
145
|
+
await onExited?.(result);
|
|
146
|
+
resolve(result);
|
|
147
|
+
}).catch(reject);
|
|
148
|
+
});
|
|
149
|
+
if (signal?.aborted)
|
|
150
|
+
abort();
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
export async function readHarborProcessExitStatus(file) {
|
|
154
|
+
let value;
|
|
155
|
+
try {
|
|
156
|
+
value = JSON.parse(await readFile(file, "utf8"));
|
|
157
|
+
}
|
|
158
|
+
catch (error) {
|
|
159
|
+
if (error.code === "ENOENT")
|
|
160
|
+
return null;
|
|
161
|
+
if (error instanceof SyntaxError)
|
|
162
|
+
throw new TypeError("Harbor process exit status is invalid");
|
|
163
|
+
throw error;
|
|
164
|
+
}
|
|
165
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
166
|
+
throw new TypeError("Harbor process exit status is invalid");
|
|
167
|
+
const record = value;
|
|
168
|
+
if (Object.keys(record).some((key) => !new Set(["schema_version", "process_exit_code", "signal", "completed_at"]).has(key))
|
|
169
|
+
|| record.schema_version !== "1"
|
|
170
|
+
|| (record.process_exit_code !== null && !Number.isSafeInteger(record.process_exit_code))
|
|
171
|
+
|| (record.signal !== null && typeof record.signal !== "string")
|
|
172
|
+
|| typeof record.completed_at !== "string" || !Number.isFinite(Date.parse(record.completed_at))) {
|
|
173
|
+
throw new TypeError("Harbor process exit status is invalid");
|
|
174
|
+
}
|
|
175
|
+
return { code: record.process_exit_code, signal: record.signal };
|
|
176
|
+
}
|
|
177
|
+
//# sourceMappingURL=process.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../../src/backends/harbor/process.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { HitchError } from "../../foundation/index.js";
|
|
2
|
+
export const HARBOR_NODE_VERSION = "22.23.0";
|
|
3
|
+
export const HARBOR_NODE_VERSION_WITH_PREFIX = `v${HARBOR_NODE_VERSION}`;
|
|
4
|
+
export const HARBOR_PNPM_VERSION = "10.17.1";
|
|
5
|
+
export const DEFAULT_HARBOR_TRIAL_DOCKER_PLATFORM = "linux/amd64";
|
|
6
|
+
export function harborTrialRuntimeContract(dockerPlatform) {
|
|
7
|
+
const normalized = normalizeDockerPlatform(dockerPlatform);
|
|
8
|
+
const artifactPlatform = normalized === "linux/amd64" ? "linux-x64"
|
|
9
|
+
: normalized === "linux/arm64" ? "linux-arm64"
|
|
10
|
+
: null;
|
|
11
|
+
if (artifactPlatform === null) {
|
|
12
|
+
throw new HitchError(`unsupported Harbor trial runtime platform: ${dockerPlatform || "unknown"}`, {
|
|
13
|
+
code: "harbor_trial_runtime_platform_unsupported",
|
|
14
|
+
exitCode: 12,
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
return {
|
|
18
|
+
dockerPlatform: normalized,
|
|
19
|
+
artifactPlatform,
|
|
20
|
+
nodeVersion: HARBOR_NODE_VERSION_WITH_PREFIX,
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
function normalizeDockerPlatform(value) {
|
|
24
|
+
const [os, rawArchitecture, extra] = value.trim().toLowerCase().split("/");
|
|
25
|
+
const architecture = rawArchitecture === "x86_64" || rawArchitecture === "x86-64" ? "amd64"
|
|
26
|
+
: rawArchitecture === "aarch64" ? "arm64"
|
|
27
|
+
: rawArchitecture;
|
|
28
|
+
return extra === undefined && os && architecture ? `${os}/${architecture}` : value.trim().toLowerCase();
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=runtime-toolchain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-toolchain.js","sourceRoot":"","sources":["../../../../src/backends/harbor/runtime-toolchain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,MAAM,CAAC,MAAM,mBAAmB,GAAG,SAAS,CAAC;AAC7C,MAAM,CAAC,MAAM,+BAA+B,GAAG,IAAI,mBAAmB,EAAE,CAAC;AACzE,MAAM,CAAC,MAAM,mBAAmB,GAAG,SAAS,CAAC;AAa7C,MAAM,CAAC,MAAM,oCAAoC,GAAG,aAAa,CAAC;AAElE,MAAM,UAAU,0BAA0B,CAAC,cAAsB;IAC/D,MAAM,UAAU,GAAG,uBAAuB,CAAC,cAAc,CAAC,CAAC;IAC3D,MAAM,gBAAgB,GAAG,UAAU,KAAK,aAAa,CAAC,CAAC,CAAC,WAAW;QACjE,CAAC,CAAC,UAAU,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa;YAC5C,CAAC,CAAC,IAAI,CAAC;IACX,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,UAAU,CAAC,8CAA8C,cAAc,IAAI,SAAS,EAAE,EAAE;YAChG,IAAI,EAAE,2CAA2C;YACjD,QAAQ,EAAE,EAAE;SACb,CAAC,CAAC;IACL,CAAC;IACD,OAAO;QACL,cAAc,EAAE,UAAU;QAC1B,gBAAgB;QAChB,WAAW,EAAE,+BAA+B;KAC7C,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAa;IAC5C,MAAM,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3E,MAAM,YAAY,GAAG,eAAe,KAAK,QAAQ,IAAI,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO;QACzF,CAAC,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO;YACvC,CAAC,CAAC,eAAe,CAAC;IACtB,OAAO,KAAK,KAAK,SAAS,IAAI,EAAE,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAC1G,CAAC"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { createWriteStream } from "node:fs";
|
|
3
|
+
import { rename, writeFile } from "node:fs/promises";
|
|
4
|
+
import { pipeline } from "node:stream/promises";
|
|
5
|
+
import { createCredentialRedactionTransform, credentialValuesFromEnv } from "../../foundation/index.js";
|
|
6
|
+
async function main() {
|
|
7
|
+
const [, , statusPath, stdoutPath, stderrPath, redactionNamesJSON, executable, ...args] = process.argv;
|
|
8
|
+
if (!statusPath || !stdoutPath || !stderrPath || !redactionNamesJSON || !executable) {
|
|
9
|
+
process.stderr.write("Harbor supervisor requires status/log paths, redaction names, and executable\n");
|
|
10
|
+
process.exitCode = 2;
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
const redactionNames = parseRedactionNames(redactionNamesJSON);
|
|
14
|
+
const result = await supervise(executable, args, stdoutPath, stderrPath, redactionNames);
|
|
15
|
+
await persist(statusPath, result);
|
|
16
|
+
process.exitCode = result.process_exit_code === null ? 1 : Math.max(0, Math.min(255, result.process_exit_code));
|
|
17
|
+
}
|
|
18
|
+
function supervise(executable, args, stdoutPath, stderrPath, redactionNames) {
|
|
19
|
+
return new Promise((resolve) => {
|
|
20
|
+
const credentialValues = credentialValuesFromEnv(redactionNames, process.env);
|
|
21
|
+
const child = spawn(executable, args, {
|
|
22
|
+
cwd: process.cwd(),
|
|
23
|
+
env: process.env,
|
|
24
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
25
|
+
windowsHide: true,
|
|
26
|
+
});
|
|
27
|
+
const streams = Promise.all([
|
|
28
|
+
pipeline(child.stdout, createCredentialRedactionTransform(credentialValues), createWriteStream(stdoutPath, { flags: "w", mode: 0o600 })),
|
|
29
|
+
pipeline(child.stderr, createCredentialRedactionTransform(credentialValues), createWriteStream(stderrPath, { flags: "w", mode: 0o600 })),
|
|
30
|
+
]);
|
|
31
|
+
let settled = false;
|
|
32
|
+
const finish = (code, signal) => {
|
|
33
|
+
if (settled)
|
|
34
|
+
return;
|
|
35
|
+
settled = true;
|
|
36
|
+
streams.then(() => resolve(status(code, signal)), () => resolve(status(74, null)));
|
|
37
|
+
};
|
|
38
|
+
child.once("error", () => finish(127, null));
|
|
39
|
+
child.once("close", (code, signal) => {
|
|
40
|
+
finish(code, signal);
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
function parseRedactionNames(value) {
|
|
45
|
+
let parsed;
|
|
46
|
+
try {
|
|
47
|
+
parsed = JSON.parse(value);
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
throw new TypeError("Harbor supervisor redaction names are invalid JSON");
|
|
51
|
+
}
|
|
52
|
+
if (!Array.isArray(parsed) || parsed.some((name) => typeof name !== "string" || !/^[A-Za-z_][A-Za-z0-9_]*$/.test(name))
|
|
53
|
+
|| new Set(parsed).size !== parsed.length)
|
|
54
|
+
throw new TypeError("Harbor supervisor redaction names are invalid");
|
|
55
|
+
return [...parsed].sort();
|
|
56
|
+
}
|
|
57
|
+
function status(processExitCode, signal) {
|
|
58
|
+
return {
|
|
59
|
+
schema_version: "1",
|
|
60
|
+
process_exit_code: processExitCode,
|
|
61
|
+
signal,
|
|
62
|
+
completed_at: new Date().toISOString(),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
async function persist(file, result) {
|
|
66
|
+
const temporary = `${file}.${process.pid}.tmp`;
|
|
67
|
+
await writeFile(temporary, `${JSON.stringify(result)}\n`, { mode: 0o600 });
|
|
68
|
+
await rename(temporary, file);
|
|
69
|
+
}
|
|
70
|
+
main().catch((error) => {
|
|
71
|
+
process.stderr.write(`Harbor supervisor failed: ${error.message}\n`);
|
|
72
|
+
process.exitCode = 1;
|
|
73
|
+
});
|
|
74
|
+
//# sourceMappingURL=supervisor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../../../src/backends/harbor/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
import { constants } from "node:fs";
|
|
2
|
+
import { access, lstat, readFile } from "node:fs/promises";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { HitchError, packageRoot, resolveExecutable, runCommand } from "../../foundation/index.js";
|
|
5
|
+
import { locateHarbor } from "./tools.js";
|
|
6
|
+
const INSPECTOR = path.join(packageRoot(), "integrations", "harbor", "hitch_harbor_task_resources.py");
|
|
7
|
+
export async function inspectHarborTaskResources(input) {
|
|
8
|
+
const env = input.env ?? process.env;
|
|
9
|
+
const harbor = await locateHarbor({ root: input.root, explicit: input.harborExecutable, env });
|
|
10
|
+
if (!harbor.executable)
|
|
11
|
+
throw unavailable(`Harbor executable not found: ${harbor.requested}`);
|
|
12
|
+
const python = await harborPython(harbor.executable, env);
|
|
13
|
+
if (!python)
|
|
14
|
+
throw unavailable("could not locate Harbor's Python interpreter");
|
|
15
|
+
let output;
|
|
16
|
+
try {
|
|
17
|
+
output = (await runCommand(python, [input.inspectorPath ?? INSPECTOR, input.taskDirectory], {
|
|
18
|
+
env,
|
|
19
|
+
...(input.signal ? { signal: input.signal } : {}),
|
|
20
|
+
timeoutMs: 10_000,
|
|
21
|
+
failureCode: "task_resource_inspection_failed",
|
|
22
|
+
failureExitCode: 10,
|
|
23
|
+
})).stdout;
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
if (error instanceof HitchError)
|
|
27
|
+
throw error;
|
|
28
|
+
throw unavailable(error?.message || String(error));
|
|
29
|
+
}
|
|
30
|
+
try {
|
|
31
|
+
return parseHarborTaskResourceDeclaration(JSON.parse(output));
|
|
32
|
+
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
throw new HitchError(`Harbor task resource inspector returned invalid output: ${error.message}`, {
|
|
35
|
+
code: "task_resource_inspection_invalid",
|
|
36
|
+
exitCode: 10,
|
|
37
|
+
cause: error,
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
export function parseHarborTaskResourceDeclaration(value) {
|
|
42
|
+
const root = exactRecord(value, [
|
|
43
|
+
"schema_version", "task", "verifier", "compose_services", "provider_sidecars",
|
|
44
|
+
"environment_images", "environment_image_fallbacks",
|
|
45
|
+
"environment_builds",
|
|
46
|
+
], "task resource declaration", ["runtime_platform"]);
|
|
47
|
+
if (root.schema_version !== "1")
|
|
48
|
+
throw new TypeError("task resource declaration schema is invalid");
|
|
49
|
+
const runtimePlatform = root.runtime_platform === undefined ? undefined : normalizeRuntimePlatform(root.runtime_platform);
|
|
50
|
+
const task = resourcePair(root.task, "task resources");
|
|
51
|
+
const verifierRecord = exactRecord(root.verifier, ["separate"], "verifier resources", ["environment"]);
|
|
52
|
+
if (typeof verifierRecord.separate !== "boolean")
|
|
53
|
+
throw new TypeError("verifier resource mode is invalid");
|
|
54
|
+
const verifier = {
|
|
55
|
+
separate: verifierRecord.separate,
|
|
56
|
+
...(verifierRecord.environment === undefined ? {} : { environment: resourcePair(verifierRecord.environment, "verifier environment resources") }),
|
|
57
|
+
};
|
|
58
|
+
if (!Array.isArray(root.compose_services))
|
|
59
|
+
throw new TypeError("Compose resource services are invalid");
|
|
60
|
+
const composeServices = root.compose_services.map((entry, index) => {
|
|
61
|
+
const service = exactRecord(entry, ["name", "replicas"], `Compose service ${index}`, ["cpu_millis", "memory_bytes", "gpu_count"]);
|
|
62
|
+
if (typeof service.name !== "string" || !service.name || !Number.isSafeInteger(service.replicas) || service.replicas < 1) {
|
|
63
|
+
throw new TypeError(`Compose service ${index} identity is invalid`);
|
|
64
|
+
}
|
|
65
|
+
return { name: service.name, replicas: service.replicas, ...resourcePair(service, `Compose service ${index} resources`) };
|
|
66
|
+
});
|
|
67
|
+
if (new Set(composeServices.map((service) => service.name)).size !== composeServices.length)
|
|
68
|
+
throw new TypeError("Compose service names are duplicated");
|
|
69
|
+
const sidecars = exactRecord(root.provider_sidecars, ["main_egress", "verifier_egress"], "provider sidecars");
|
|
70
|
+
if (typeof sidecars.main_egress !== "boolean" || typeof sidecars.verifier_egress !== "boolean")
|
|
71
|
+
throw new TypeError("provider sidecar declaration is invalid");
|
|
72
|
+
const environmentImages = imageDeclarations(root.environment_images);
|
|
73
|
+
const environmentImageFallbacks = imageFallbacks(root.environment_image_fallbacks);
|
|
74
|
+
const environmentBuilds = imageBuilds(root.environment_builds);
|
|
75
|
+
return {
|
|
76
|
+
schema_version: "1",
|
|
77
|
+
...(runtimePlatform ? { runtime_platform: runtimePlatform } : {}),
|
|
78
|
+
task,
|
|
79
|
+
verifier,
|
|
80
|
+
compose_services: composeServices,
|
|
81
|
+
provider_sidecars: { main_egress: sidecars.main_egress, verifier_egress: sidecars.verifier_egress },
|
|
82
|
+
environment_images: environmentImages,
|
|
83
|
+
environment_image_fallbacks: environmentImageFallbacks,
|
|
84
|
+
environment_builds: environmentBuilds,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
function normalizeRuntimePlatform(value) {
|
|
88
|
+
if (typeof value !== "string")
|
|
89
|
+
throw new TypeError("task runtime platform is invalid");
|
|
90
|
+
const normalized = value.trim().toLowerCase()
|
|
91
|
+
.replace(/^linux\/x86_64$/, "linux/amd64")
|
|
92
|
+
.replace(/^linux\/aarch64$/, "linux/arm64");
|
|
93
|
+
if (normalized !== "linux/amd64" && normalized !== "linux/arm64") {
|
|
94
|
+
throw new TypeError("task runtime platform is unsupported");
|
|
95
|
+
}
|
|
96
|
+
return normalized;
|
|
97
|
+
}
|
|
98
|
+
function imageBuilds(value) {
|
|
99
|
+
if (!Array.isArray(value))
|
|
100
|
+
throw new TypeError("environment build declarations are invalid");
|
|
101
|
+
return value.map((entry, index) => {
|
|
102
|
+
const record = exactRecord(entry, ["source", "service", "context", "dockerfile"], `environment build ${index}`);
|
|
103
|
+
if (record.source !== "task" || record.service !== "main" || record.context !== "environment" || record.dockerfile !== "Dockerfile") {
|
|
104
|
+
throw new TypeError(`environment build ${index} is invalid`);
|
|
105
|
+
}
|
|
106
|
+
return record;
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
function imageDeclarations(value) {
|
|
110
|
+
if (!Array.isArray(value))
|
|
111
|
+
throw new TypeError("environment image declarations are invalid");
|
|
112
|
+
const result = value.map((entry, index) => {
|
|
113
|
+
const record = exactRecord(entry, ["source", "service", "reference"], `environment image ${index}`);
|
|
114
|
+
if (!new Set(["task", "verifier", "compose"]).has(record.source)
|
|
115
|
+
|| typeof record.service !== "string" || !record.service
|
|
116
|
+
|| typeof record.reference !== "string" || !validImageReference(record.reference)) {
|
|
117
|
+
throw new TypeError(`environment image ${index} is invalid`);
|
|
118
|
+
}
|
|
119
|
+
return record;
|
|
120
|
+
});
|
|
121
|
+
const keys = result.map((entry) => `${entry.source}\0${entry.service}`);
|
|
122
|
+
if (new Set(keys).size !== keys.length)
|
|
123
|
+
throw new TypeError("environment image declarations are duplicated");
|
|
124
|
+
return result;
|
|
125
|
+
}
|
|
126
|
+
function imageFallbacks(value) {
|
|
127
|
+
if (!Array.isArray(value))
|
|
128
|
+
throw new TypeError("environment image fallbacks are invalid");
|
|
129
|
+
return value.map((entry, index) => {
|
|
130
|
+
const record = exactRecord(entry, ["source", "service", "code"], `environment image fallback ${index}`);
|
|
131
|
+
if (!new Set(["task", "verifier", "compose"]).has(record.source)
|
|
132
|
+
|| typeof record.service !== "string" || !record.service
|
|
133
|
+
|| (record.code !== "backend-build" && record.code !== "dynamic-image")) {
|
|
134
|
+
throw new TypeError(`environment image fallback ${index} is invalid`);
|
|
135
|
+
}
|
|
136
|
+
return record;
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
function validImageReference(value) {
|
|
140
|
+
return value.length <= 1_024 && !/[\s\0]/.test(value) && !value.includes("://") && !value.includes("$");
|
|
141
|
+
}
|
|
142
|
+
async function harborPython(harborExecutable, env) {
|
|
143
|
+
const sibling = path.join(path.dirname(harborExecutable), process.platform === "win32" ? "python.exe" : "python");
|
|
144
|
+
const candidates = [env.HITCH_HARBOR_PYTHON_PATH, sibling];
|
|
145
|
+
if (process.platform !== "win32") {
|
|
146
|
+
try {
|
|
147
|
+
const firstLine = (await readFile(harborExecutable, "utf8")).split(/\r?\n/, 1)[0] || "";
|
|
148
|
+
const shebang = firstLine.match(/^#!([^\s]+)$/)?.[1];
|
|
149
|
+
if (shebang)
|
|
150
|
+
candidates.unshift(shebang);
|
|
151
|
+
}
|
|
152
|
+
catch { /* locateHarbor already validated executable access */ }
|
|
153
|
+
}
|
|
154
|
+
for (const candidate of candidates) {
|
|
155
|
+
if (!candidate)
|
|
156
|
+
continue;
|
|
157
|
+
const resolved = path.isAbsolute(candidate) || candidate.includes("/") || candidate.includes("\\")
|
|
158
|
+
? await preserveExecutableShim(candidate)
|
|
159
|
+
: await resolveExecutable(candidate, env.PATH || "", env.PATHEXT);
|
|
160
|
+
if (resolved)
|
|
161
|
+
return resolved;
|
|
162
|
+
}
|
|
163
|
+
return null;
|
|
164
|
+
}
|
|
165
|
+
async function preserveExecutableShim(candidate) {
|
|
166
|
+
const resolved = path.resolve(candidate);
|
|
167
|
+
try {
|
|
168
|
+
await access(resolved, constants.X_OK);
|
|
169
|
+
if ((await lstat(resolved)).isDirectory())
|
|
170
|
+
return null;
|
|
171
|
+
// A virtualenv's python is commonly a symlink to the base interpreter.
|
|
172
|
+
// Spawning the symlink is what activates the venv prefix and site-packages;
|
|
173
|
+
// realpath would silently turn it back into the system interpreter.
|
|
174
|
+
return resolved;
|
|
175
|
+
}
|
|
176
|
+
catch {
|
|
177
|
+
return null;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
function resourcePair(value, label) {
|
|
181
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
182
|
+
throw new TypeError(`${label} must be an object`);
|
|
183
|
+
const record = value;
|
|
184
|
+
for (const field of ["cpu_millis", "memory_bytes", "gpu_count"]) {
|
|
185
|
+
if (record[field] !== undefined && (!Number.isSafeInteger(record[field]) || record[field] < 1))
|
|
186
|
+
throw new TypeError(`${label} ${field} is invalid`);
|
|
187
|
+
}
|
|
188
|
+
return {
|
|
189
|
+
...(record.cpu_millis === undefined ? {} : { cpu_millis: record.cpu_millis }),
|
|
190
|
+
...(record.memory_bytes === undefined ? {} : { memory_bytes: record.memory_bytes }),
|
|
191
|
+
...(record.gpu_count === undefined ? {} : { gpu_count: record.gpu_count }),
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
function exactRecord(value, required, label, optional = []) {
|
|
195
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
196
|
+
throw new TypeError(`${label} must be an object`);
|
|
197
|
+
const record = value;
|
|
198
|
+
const allowed = new Set([...required, ...optional]);
|
|
199
|
+
if (required.some((key) => !(key in record)) || Object.keys(record).some((key) => !allowed.has(key)))
|
|
200
|
+
throw new TypeError(`${label} fields are invalid`);
|
|
201
|
+
return record;
|
|
202
|
+
}
|
|
203
|
+
function unavailable(message) {
|
|
204
|
+
return new HitchError(`Harbor task resource inspection is unavailable: ${message}`, { code: "task_resource_inspection_unavailable", exitCode: 10 });
|
|
205
|
+
}
|
|
206
|
+
//# sourceMappingURL=task-resources.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-resources.js","sourceRoot":"","sources":["../../../../src/backends/harbor/task-resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACnG,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,gCAAgC,CAAC,CAAC;AAiCvG,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,KAOhD;IACC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,MAAM,CAAC,UAAU;QAAE,MAAM,WAAW,CAAC,gCAAgC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC9F,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAC1D,IAAI,CAAC,MAAM;QAAE,MAAM,WAAW,CAAC,8CAA8C,CAAC,CAAC;IAC/E,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,aAAa,IAAI,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE;YAC1F,GAAG;YACH,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjD,SAAS,EAAE,MAAM;YACjB,WAAW,EAAE,iCAAiC;YAC9C,eAAe,EAAE,EAAE;SACpB,CAAC,CAAC,CAAC,MAAM,CAAC;IACb,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,UAAU;YAAE,MAAM,KAAK,CAAC;QAC7C,MAAM,WAAW,CAAE,KAAe,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,CAAC;QACH,OAAO,kCAAkC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAChE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,UAAU,CAAC,2DAA4D,KAAe,CAAC,OAAO,EAAE,EAAE;YAC1G,IAAI,EAAE,kCAAkC;YACxC,QAAQ,EAAE,EAAE;YACZ,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kCAAkC,CAAC,KAAc;IAC/D,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE;QAC9B,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB;QAC7E,oBAAoB,EAAE,6BAA6B;QACnD,oBAAoB;KACrB,EAAE,2BAA2B,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACtD,IAAI,IAAI,CAAC,cAAc,KAAK,GAAG;QAAE,MAAM,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;IACpG,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC1H,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,EAAE,oBAAoB,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IACvG,IAAI,OAAO,cAAc,CAAC,QAAQ,KAAK,SAAS;QAAE,MAAM,IAAI,SAAS,CAAC,mCAAmC,CAAC,CAAC;IAC3G,MAAM,QAAQ,GAAG;QACf,QAAQ,EAAE,cAAc,CAAC,QAAQ;QACjC,GAAG,CAAC,cAAc,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,cAAc,CAAC,WAAW,EAAE,gCAAgC,CAAC,EAAE,CAAC;KACjJ,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAAE,MAAM,IAAI,SAAS,CAAC,uCAAuC,CAAC,CAAC;IACxG,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,mBAAmB,KAAK,EAAE,EAAE,CAAC,YAAY,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;QAClI,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAK,OAAO,CAAC,QAAmB,GAAG,CAAC,EAAE,CAAC;YACrI,MAAM,IAAI,SAAS,CAAC,mBAAmB,KAAK,sBAAsB,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAkB,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,mBAAmB,KAAK,YAAY,CAAC,EAAE,CAAC;IACtI,CAAC,CAAC,CAAC;IACH,IAAI,IAAI,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,MAAM;QAAE,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IACzJ,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,aAAa,EAAE,iBAAiB,CAAC,EAAE,mBAAmB,CAAC,CAAC;IAC9G,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,SAAS,IAAI,OAAO,QAAQ,CAAC,eAAe,KAAK,SAAS;QAAE,MAAM,IAAI,SAAS,CAAC,yCAAyC,CAAC,CAAC;IAC/J,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACrE,MAAM,yBAAyB,GAAG,cAAc,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IACnF,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC/D,OAAO;QACL,cAAc,EAAE,GAAG;QACnB,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,IAAI;QACJ,QAAQ;QACR,gBAAgB,EAAE,eAAe;QACjC,iBAAiB,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,eAAe,EAAE,QAAQ,CAAC,eAAe,EAAE;QACnG,kBAAkB,EAAE,iBAAiB;QACrC,2BAA2B,EAAE,yBAAyB;QACtD,kBAAkB,EAAE,iBAAiB;KACtC,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAc;IAC9C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,MAAM,IAAI,SAAS,CAAC,kCAAkC,CAAC,CAAC;IACvF,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE;SAC1C,OAAO,CAAC,iBAAiB,EAAE,aAAa,CAAC;SACzC,OAAO,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;IAC9C,IAAI,UAAU,KAAK,aAAa,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;QACjE,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,SAAS,CAAC,4CAA4C,CAAC,CAAC;IAC7F,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,EAAE,qBAAqB,KAAK,EAAE,CAAC,CAAC;QAChH,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,IAAI,MAAM,CAAC,UAAU,KAAK,YAAY,EAAE,CAAC;YACpI,MAAM,IAAI,SAAS,CAAC,qBAAqB,KAAK,aAAa,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,MAAwD,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,SAAS,CAAC,4CAA4C,CAAC,CAAC;IAC7F,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACxC,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,qBAAqB,KAAK,EAAE,CAAC,CAAC;QACpG,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAgB,CAAC;eACrE,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,OAAO;eACrD,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YACpF,MAAM,IAAI,SAAS,CAAC,qBAAqB,KAAK,aAAa,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,MAAwD,CAAC;IAClE,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACxE,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,SAAS,CAAC,+CAA+C,CAAC,CAAC;IAC7G,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,SAAS,CAAC,yCAAyC,CAAC,CAAC;IAC1F,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,8BAA8B,KAAK,EAAE,CAAC,CAAC;QACxG,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAgB,CAAC;eACrE,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,OAAO;eACrD,CAAC,MAAM,CAAC,IAAI,KAAK,eAAe,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,SAAS,CAAC,8BAA8B,KAAK,aAAa,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,MAAqD,CAAC;IAC/D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa;IACxC,OAAO,KAAK,CAAC,MAAM,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC1G,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,gBAAwB,EAAE,GAAsB;IAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAClH,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;IAC3D,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,CAAC,MAAM,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACxF,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACrD,IAAI,OAAO;gBAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;QAAC,MAAM,CAAC,CAAC,sDAAsD,CAAC,CAAC;IACpE,CAAC;IACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS;YAAE,SAAS;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;YAChG,CAAC,CAAC,MAAM,sBAAsB,CAAC,SAAS,CAAC;YACzC,CAAC,CAAC,MAAM,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACpE,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,SAAiB;IACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,EAAE;YAAE,OAAO,IAAI,CAAC;QACvD,uEAAuE;QACvE,4EAA4E;QAC5E,oEAAoE;QACpE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,KAAc,EAAE,KAAa;IACjD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,SAAS,CAAC,GAAG,KAAK,oBAAoB,CAAC,CAAC;IACnH,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,KAAK,MAAM,KAAK,IAAI,CAAC,YAAY,EAAE,cAAc,EAAE,WAAW,CAAU,EAAE,CAAC;QACzE,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAK,MAAM,CAAC,KAAK,CAAY,GAAG,CAAC,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,GAAG,KAAK,IAAI,KAAK,aAAa,CAAC,CAAC;IAClK,CAAC;IACD,OAAO;QACL,GAAG,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAoB,EAAE,CAAC;QACvF,GAAG,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAsB,EAAE,CAAC;QAC7F,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAmB,EAAE,CAAC;KACrF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAc,EAAE,QAAkB,EAAE,KAAa,EAAE,WAAqB,EAAE;IAC7F,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,SAAS,CAAC,GAAG,KAAK,oBAAoB,CAAC,CAAC;IACnH,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;IACpD,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAAE,MAAM,IAAI,SAAS,CAAC,GAAG,KAAK,qBAAqB,CAAC,CAAC;IACzJ,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,WAAW,CAAC,OAAe;IAClC,OAAO,IAAI,UAAU,CAAC,mDAAmD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,sCAAsC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;AACtJ,CAAC"}
|
|
@@ -2,32 +2,9 @@ import { constants } from "node:fs";
|
|
|
2
2
|
import { access, mkdir, rm } from "node:fs/promises";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { spawn } from "node:child_process";
|
|
5
|
-
import { HitchError, SCHEMA_VERSION, atomicWriteJSON, detectVersion, ensureDir, invalidInput, readJSON, resolveExecutable, statePaths, terminateProcess } from "../../foundation/index.js";
|
|
5
|
+
import { HitchError, PROVIDER_ENVIRONMENT_NAMES, SCHEMA_VERSION, atomicWriteJSON, detectVersion, ensureDir, invalidInput, readJSON, resolveExecutable, statePaths, terminateProcess } from "../../foundation/index.js";
|
|
6
6
|
export const DEFAULT_HARBOR_VERSION = "0.21.0";
|
|
7
|
-
export const HARBOR_CREDENTIAL_ENV = [
|
|
8
|
-
"DEEPSEEK_API_KEY",
|
|
9
|
-
"DEEPSEEK_BASE_URL",
|
|
10
|
-
"OPENAI_API_KEY",
|
|
11
|
-
"OPENAI_BASE_URL",
|
|
12
|
-
"OPENAI_ORG_ID",
|
|
13
|
-
"OPENAI_ORGANIZATION",
|
|
14
|
-
"ANTHROPIC_API_KEY",
|
|
15
|
-
"ANTHROPIC_AUTH_TOKEN",
|
|
16
|
-
"ANTHROPIC_BASE_URL",
|
|
17
|
-
"CLAUDE_CODE_OAUTH_TOKEN",
|
|
18
|
-
"GOOGLE_API_KEY",
|
|
19
|
-
"GEMINI_API_KEY",
|
|
20
|
-
"AZURE_OPENAI_API_KEY",
|
|
21
|
-
"AZURE_OPENAI_ENDPOINT",
|
|
22
|
-
"AZURE_OPENAI_API_VERSION",
|
|
23
|
-
"AWS_ACCESS_KEY_ID",
|
|
24
|
-
"AWS_SECRET_ACCESS_KEY",
|
|
25
|
-
"AWS_SESSION_TOKEN",
|
|
26
|
-
"AWS_REGION",
|
|
27
|
-
"AWS_DEFAULT_REGION",
|
|
28
|
-
"GITHUB_TOKEN",
|
|
29
|
-
"GH_TOKEN",
|
|
30
|
-
];
|
|
7
|
+
export const HARBOR_CREDENTIAL_ENV = [...PROVIDER_ENVIRONMENT_NAMES];
|
|
31
8
|
const PROVIDER_CREDENTIAL_ENV = [
|
|
32
9
|
"DEEPSEEK_API_KEY",
|
|
33
10
|
"OPENAI_API_KEY",
|
|
@@ -136,7 +113,7 @@ export async function doctorHarbor({ root, python, harbor, docker, env = process
|
|
|
136
113
|
const pythonInfo = await findPython({ explicit: python, env });
|
|
137
114
|
const harborInfo = await locateHarbor({ root, explicit: harbor, env });
|
|
138
115
|
const dockerConfigured = docker || env.HITCH_DOCKER_PATH || "docker";
|
|
139
|
-
const dockerExecutable = await resolveExecutable(dockerConfigured, env.PATH || "");
|
|
116
|
+
const dockerExecutable = await resolveExecutable(dockerConfigured, env.PATH || "", env.PATHEXT);
|
|
140
117
|
let dockerVersion = "";
|
|
141
118
|
let dockerDiagnostic = "";
|
|
142
119
|
if (dockerExecutable) {
|
|
@@ -174,7 +151,7 @@ export async function doctorHarbor({ root, python, harbor, docker, env = process
|
|
|
174
151
|
export async function locateHarbor({ root, explicit, env = process.env } = {}) {
|
|
175
152
|
const configured = explicit || env.HITCH_HARBOR_PATH;
|
|
176
153
|
if (configured) {
|
|
177
|
-
const executable = await resolveExecutable(configured, env.PATH || "");
|
|
154
|
+
const executable = await resolveExecutable(configured, env.PATH || "", env.PATHEXT);
|
|
178
155
|
return {
|
|
179
156
|
executable,
|
|
180
157
|
version: executable ? await installedHarborVersion(executable) : "",
|
|
@@ -191,7 +168,7 @@ export async function locateHarbor({ root, explicit, env = process.env } = {}) {
|
|
|
191
168
|
requested: managed,
|
|
192
169
|
};
|
|
193
170
|
}
|
|
194
|
-
const executable = await resolveExecutable("harbor", env.PATH || "");
|
|
171
|
+
const executable = await resolveExecutable("harbor", env.PATH || "", env.PATHEXT);
|
|
195
172
|
return {
|
|
196
173
|
executable,
|
|
197
174
|
version: executable ? await installedHarborVersion(executable) : "",
|
|
@@ -219,7 +196,7 @@ async function findPython({ explicit, env }) {
|
|
|
219
196
|
const candidates = requested ? [requested] : ["python3.13", "python3.12", "python3"];
|
|
220
197
|
let firstFound = null;
|
|
221
198
|
for (const candidate of candidates) {
|
|
222
|
-
const executable = await resolveExecutable(candidate, env.PATH || "");
|
|
199
|
+
const executable = await resolveExecutable(candidate, env.PATH || "", env.PATHEXT);
|
|
223
200
|
if (!executable)
|
|
224
201
|
continue;
|
|
225
202
|
const result = await captureCommand(executable, ["-c", "import sys; print('.'.join(map(str, sys.version_info[:3])))"], {
|