agent-hitch 0.2.7 → 0.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -2
- package/README.zh-CN.md +14 -2
- package/dist/bin/hitch.js +25 -3
- package/dist/bin/hitch.js.map +1 -1
- package/dist/scripts/canary-benchmark.js +54 -0
- package/dist/scripts/canary-benchmark.js.map +1 -0
- package/dist/scripts/canary-eval-scheduler-throughput.js +47 -0
- package/dist/scripts/canary-eval-scheduler-throughput.js.map +1 -0
- package/dist/scripts/check-architecture.js +3 -2
- package/dist/scripts/check-architecture.js.map +1 -1
- package/dist/src/adapters/catalog.js +2 -1
- package/dist/src/adapters/catalog.js.map +1 -1
- package/dist/src/adapters/providers/codex-auth.js +29 -0
- package/dist/src/adapters/providers/codex-auth.js.map +1 -0
- package/dist/src/adapters/providers/codex.js +23 -6
- package/dist/src/adapters/providers/codex.js.map +1 -1
- package/dist/src/adapters/providers/model-call.js +26 -0
- package/dist/src/adapters/providers/model-call.js.map +1 -0
- package/dist/src/artifacts/index.js +1 -1
- package/dist/src/artifacts/index.js.map +1 -1
- package/dist/src/artifacts/preparer.js +7 -2
- package/dist/src/artifacts/preparer.js.map +1 -1
- package/dist/src/backends/harbor/agent-budget.js +31 -0
- package/dist/src/backends/harbor/agent-budget.js.map +1 -0
- package/dist/src/backends/harbor/backend.js +6 -4
- package/dist/src/backends/harbor/backend.js.map +1 -1
- package/dist/src/backends/harbor/index.js +1 -0
- package/dist/src/backends/harbor/index.js.map +1 -1
- package/dist/src/backends/harbor/regrade.js +77 -0
- package/dist/src/backends/harbor/regrade.js.map +1 -0
- package/dist/src/backends/index.js +1 -0
- package/dist/src/backends/index.js.map +1 -1
- package/dist/src/benchmarks/index.js +3 -0
- package/dist/src/benchmarks/index.js.map +1 -0
- package/dist/src/benchmarks/loader.js +271 -0
- package/dist/src/benchmarks/loader.js.map +1 -0
- package/dist/src/benchmarks/metrics.js +16 -0
- package/dist/src/benchmarks/metrics.js.map +1 -0
- package/dist/src/benchmarks/toml.js +13 -0
- package/dist/src/benchmarks/toml.js.map +1 -0
- package/dist/src/benchmarks/validation.js +242 -0
- package/dist/src/benchmarks/validation.js.map +1 -0
- package/dist/src/cli/arguments.js +6 -4
- package/dist/src/cli/arguments.js.map +1 -1
- package/dist/src/cli/commands/benchmark.js +22 -0
- package/dist/src/cli/commands/benchmark.js.map +1 -0
- package/dist/src/cli/commands/capabilities.js +18 -0
- package/dist/src/cli/commands/capabilities.js.map +1 -0
- package/dist/src/cli/commands/eval.js +15 -3
- package/dist/src/cli/commands/eval.js.map +1 -1
- package/dist/src/cli/commands/run.js +37 -15
- package/dist/src/cli/commands/run.js.map +1 -1
- package/dist/src/cli/commands/trajectory.js +96 -5
- package/dist/src/cli/commands/trajectory.js.map +1 -1
- package/dist/src/cli/commands/verifier.js +36 -0
- package/dist/src/cli/commands/verifier.js.map +1 -0
- package/dist/src/cli/main.js +6 -0
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/cli/output.js +14 -2
- package/dist/src/cli/output.js.map +1 -1
- package/dist/src/control-plane/eval-control-work.js +5 -0
- package/dist/src/control-plane/eval-control-work.js.map +1 -1
- package/dist/src/control-plane/eval-scheduler.js +4 -1
- package/dist/src/control-plane/eval-scheduler.js.map +1 -1
- package/dist/src/control-plane/index.js +1 -1
- package/dist/src/control-plane/index.js.map +1 -1
- package/dist/src/control-plane/remote-result-transport.js +3 -0
- package/dist/src/control-plane/remote-result-transport.js.map +1 -1
- package/dist/src/control-plane/remote-work-coordinator.js +1 -0
- package/dist/src/control-plane/remote-work-coordinator.js.map +1 -1
- package/dist/src/control-plane/remote-work-item.js +62 -0
- package/dist/src/control-plane/remote-work-item.js.map +1 -0
- package/dist/src/control-plane/remote-work-recovery.js +44 -5
- package/dist/src/control-plane/remote-work-recovery.js.map +1 -1
- package/dist/src/control-plane/remote-worker-protocol.js +2 -23
- package/dist/src/control-plane/remote-worker-protocol.js.map +1 -1
- package/dist/src/control-plane/rerun-scheduler.js +51 -14
- package/dist/src/control-plane/rerun-scheduler.js.map +1 -1
- package/dist/src/control-plane/rerun-submission.js +10 -4
- package/dist/src/control-plane/rerun-submission.js.map +1 -1
- package/dist/src/control-plane/work-admission.js +2 -0
- package/dist/src/control-plane/work-admission.js.map +1 -1
- package/dist/src/control-plane/work-dispatcher.js +9 -1
- package/dist/src/control-plane/work-dispatcher.js.map +1 -1
- package/dist/src/controller-runtime/hash.js +7 -2
- package/dist/src/controller-runtime/hash.js.map +1 -1
- package/dist/src/daemon/auth.js +5 -0
- package/dist/src/daemon/auth.js.map +1 -1
- package/dist/src/domain/benchmarks.js +2 -0
- package/dist/src/domain/benchmarks.js.map +1 -0
- package/dist/src/domain/index.js +4 -0
- package/dist/src/domain/index.js.map +1 -1
- package/dist/src/domain/runs.js.map +1 -1
- package/dist/src/domain/validation.js +11 -4
- package/dist/src/domain/validation.js.map +1 -1
- package/dist/src/domain/verifier-evidence-validation.js +214 -0
- package/dist/src/domain/verifier-evidence-validation.js.map +1 -0
- package/dist/src/domain/verifier-evidence.js +3 -0
- package/dist/src/domain/verifier-evidence.js.map +1 -0
- package/dist/src/domain/verifier-score-contract.js +232 -0
- package/dist/src/domain/verifier-score-contract.js.map +1 -0
- package/dist/src/evals/benchmark-adapter-manifest.js +219 -0
- package/dist/src/evals/benchmark-adapter-manifest.js.map +1 -0
- package/dist/src/evals/benchmark-candidate.js +36 -0
- package/dist/src/evals/benchmark-candidate.js.map +1 -0
- package/dist/src/evals/benchmark-run.js +166 -0
- package/dist/src/evals/benchmark-run.js.map +1 -0
- package/dist/src/evals/collect-only-rerun.js +2 -1
- package/dist/src/evals/collect-only-rerun.js.map +1 -1
- package/dist/src/evals/directory.js +1 -1
- package/dist/src/evals/directory.js.map +1 -1
- package/dist/src/evals/duration-estimator.js +126 -0
- package/dist/src/evals/duration-estimator.js.map +1 -0
- package/dist/src/evals/eval-lifecycle-events.js +13 -0
- package/dist/src/evals/eval-lifecycle-events.js.map +1 -1
- package/dist/src/evals/eval-logical-plan.js +51 -0
- package/dist/src/evals/eval-logical-plan.js.map +1 -0
- package/dist/src/evals/eval-result-builder.js +81 -0
- package/dist/src/evals/eval-result-builder.js.map +1 -0
- package/dist/src/evals/evolution-baseline.js +191 -0
- package/dist/src/evals/evolution-baseline.js.map +1 -0
- package/dist/src/evals/execution-plan.js +39 -3
- package/dist/src/evals/execution-plan.js.map +1 -1
- package/dist/src/evals/failure-classifier.js +61 -0
- package/dist/src/evals/failure-classifier.js.map +1 -0
- package/dist/src/evals/harbor-artifact-builder.js +6 -2
- package/dist/src/evals/harbor-artifact-builder.js.map +1 -1
- package/dist/src/evals/harbor-bridge-error.js +41 -1
- package/dist/src/evals/harbor-bridge-error.js.map +1 -1
- package/dist/src/evals/harbor-node-runtime.js +146 -0
- package/dist/src/evals/harbor-node-runtime.js.map +1 -0
- package/dist/src/evals/index.js +15 -0
- package/dist/src/evals/index.js.map +1 -1
- package/dist/src/evals/infrastructure-retry.js +109 -22
- package/dist/src/evals/infrastructure-retry.js.map +1 -1
- package/dist/src/evals/native-phase-evidence.js +440 -0
- package/dist/src/evals/native-phase-evidence.js.map +1 -0
- package/dist/src/evals/physical-retry-work.js +31 -0
- package/dist/src/evals/physical-retry-work.js.map +1 -0
- package/dist/src/evals/planned-execution-support.js +22 -10
- package/dist/src/evals/planned-execution-support.js.map +1 -1
- package/dist/src/evals/planned-execution.js +120 -112
- package/dist/src/evals/planned-execution.js.map +1 -1
- package/dist/src/evals/planned-progress-publisher.js +62 -0
- package/dist/src/evals/planned-progress-publisher.js.map +1 -0
- package/dist/src/evals/planned-retry-execution.js +174 -0
- package/dist/src/evals/planned-retry-execution.js.map +1 -0
- package/dist/src/evals/planned-retry-lifecycle.js +4 -2
- package/dist/src/evals/planned-retry-lifecycle.js.map +1 -1
- package/dist/src/evals/preparation-rerun.js +225 -0
- package/dist/src/evals/preparation-rerun.js.map +1 -0
- package/dist/src/evals/progress.js +48 -8
- package/dist/src/evals/progress.js.map +1 -1
- package/dist/src/evals/recovery.js +54 -4
- package/dist/src/evals/recovery.js.map +1 -1
- package/dist/src/evals/regrade-evidence.js +77 -0
- package/dist/src/evals/regrade-evidence.js.map +1 -0
- package/dist/src/evals/remote-infrastructure-retry.js +84 -18
- package/dist/src/evals/remote-infrastructure-retry.js.map +1 -1
- package/dist/src/evals/request.js +21 -3
- package/dist/src/evals/request.js.map +1 -1
- package/dist/src/evals/rerun-inputs.js +19 -0
- package/dist/src/evals/rerun-inputs.js.map +1 -1
- package/dist/src/evals/rerun-types.js +2 -6
- package/dist/src/evals/rerun-types.js.map +1 -1
- package/dist/src/evals/rerun.js +27 -20
- package/dist/src/evals/rerun.js.map +1 -1
- package/dist/src/evals/result-helpers.js +13 -0
- package/dist/src/evals/result-helpers.js.map +1 -1
- package/dist/src/evals/retry-backoff.js +20 -0
- package/dist/src/evals/retry-backoff.js.map +1 -0
- package/dist/src/evals/retry-state.js +195 -0
- package/dist/src/evals/retry-state.js.map +1 -0
- package/dist/src/evals/scheduler-metrics.js +95 -0
- package/dist/src/evals/scheduler-metrics.js.map +1 -0
- package/dist/src/evals/scheduler-trace-replay.js +107 -0
- package/dist/src/evals/scheduler-trace-replay.js.map +1 -0
- package/dist/src/evals/service.js +87 -138
- package/dist/src/evals/service.js.map +1 -1
- package/dist/src/evals/trial-import.js +47 -50
- package/dist/src/evals/trial-import.js.map +1 -1
- package/dist/src/evals/trial-publication-recovery.js +45 -5
- package/dist/src/evals/trial-publication-recovery.js.map +1 -1
- package/dist/src/evals/trial-reference-validation.js +49 -0
- package/dist/src/evals/trial-reference-validation.js.map +1 -0
- package/dist/src/evals/verifier-artifacts.js +317 -0
- package/dist/src/evals/verifier-artifacts.js.map +1 -0
- package/dist/src/evals/verifier-eligibility.js +25 -0
- package/dist/src/evals/verifier-eligibility.js.map +1 -0
- package/dist/src/evals/verifier-only-rerun.js +210 -0
- package/dist/src/evals/verifier-only-rerun.js.map +1 -0
- package/dist/src/evals/verifier-runtime.js +61 -0
- package/dist/src/evals/verifier-runtime.js.map +1 -0
- package/dist/src/evals/verifier-score-artifacts.js +119 -0
- package/dist/src/evals/verifier-score-artifacts.js.map +1 -0
- package/dist/src/foundation/contained-file.js +85 -0
- package/dist/src/foundation/contained-file.js.map +1 -0
- package/dist/src/foundation/credential-redaction.js +26 -1
- package/dist/src/foundation/credential-redaction.js.map +1 -1
- package/dist/src/foundation/fs.js +2 -1
- package/dist/src/foundation/fs.js.map +1 -1
- package/dist/src/foundation/index.js +2 -1
- package/dist/src/foundation/index.js.map +1 -1
- package/dist/src/runs/adapter-process.js +12 -0
- package/dist/src/runs/adapter-process.js.map +1 -0
- package/dist/src/runs/executor.js +24 -30
- package/dist/src/runs/executor.js.map +1 -1
- package/dist/src/runs/finalizer.js +17 -0
- package/dist/src/runs/finalizer.js.map +1 -1
- package/dist/src/runs/index.js +5 -0
- package/dist/src/runs/index.js.map +1 -1
- package/dist/src/runs/phase-bundle.js +86 -0
- package/dist/src/runs/phase-bundle.js.map +1 -0
- package/dist/src/runs/phase-cancellation.js +107 -0
- package/dist/src/runs/phase-cancellation.js.map +1 -0
- package/dist/src/runs/phase-group.js +113 -0
- package/dist/src/runs/phase-group.js.map +1 -0
- package/dist/src/runs/query.js +1 -1
- package/dist/src/runs/query.js.map +1 -1
- package/dist/src/runs/records.js +3 -0
- package/dist/src/runs/records.js.map +1 -1
- package/dist/src/runs/request.js +4 -2
- package/dist/src/runs/request.js.map +1 -1
- package/dist/src/runs/verifier-evidence-redaction.js +61 -0
- package/dist/src/runs/verifier-evidence-redaction.js.map +1 -0
- package/dist/src/runs/verifier-evidence.js +459 -0
- package/dist/src/runs/verifier-evidence.js.map +1 -0
- package/dist/src/runs/verifier-structured-evidence.js +83 -0
- package/dist/src/runs/verifier-structured-evidence.js.map +1 -0
- package/dist/src/trajectories/analysis.js +288 -0
- package/dist/src/trajectories/analysis.js.map +1 -0
- package/dist/src/trajectories/chunk-projection.js +148 -0
- package/dist/src/trajectories/chunk-projection.js.map +1 -0
- package/dist/src/trajectories/content-projection.js +389 -0
- package/dist/src/trajectories/content-projection.js.map +1 -0
- package/dist/src/trajectories/dsh-chunk-contract.js +176 -0
- package/dist/src/trajectories/dsh-chunk-contract.js.map +1 -0
- package/dist/src/trajectories/dsh-contract.js +284 -0
- package/dist/src/trajectories/dsh-contract.js.map +1 -0
- package/dist/src/trajectories/events-chunk-drill.js +95 -0
- package/dist/src/trajectories/events-chunk-drill.js.map +1 -0
- package/dist/src/trajectories/events-page.js +367 -0
- package/dist/src/trajectories/events-page.js.map +1 -0
- package/dist/src/trajectories/index.js +3 -0
- package/dist/src/trajectories/index.js.map +1 -1
- package/dist/src/trajectories/request-attempt.js +47 -0
- package/dist/src/trajectories/request-attempt.js.map +1 -0
- package/dist/src/trajectories/stream-reader.js +311 -0
- package/dist/src/trajectories/stream-reader.js.map +1 -0
- package/dist/src/trajectories/surface-fold.js +126 -0
- package/dist/src/trajectories/surface-fold.js.map +1 -0
- package/dist/src/workers/remote-harbor-worker.js +3 -0
- package/dist/src/workers/remote-harbor-worker.js.map +1 -1
- package/docs/schemas/benchmark-hook-request-v1.schema.json +65 -0
- package/docs/schemas/benchmark-hook-response-v1.schema.json +75 -0
- package/docs/schemas/benchmark-hook-v1.schema.json +33 -0
- package/docs/schemas/benchmark-lock-v1.schema.json +351 -0
- package/docs/schemas/benchmark-metric-v1.schema.json +37 -0
- package/docs/schemas/benchmark-package-v1.schema.json +167 -0
- package/docs/schemas/benchmark-phase-group.schema.json +41 -0
- package/docs/schemas/benchmark-profile-v1.schema.json +141 -0
- package/docs/schemas/benchmark-task-v1.schema.json +384 -0
- package/docs/schemas/benchmark-tool-result-v1.schema.json +30 -0
- package/docs/schemas/error.schema.json +22 -0
- package/docs/schemas/eval-progress.schema.json +1 -15
- package/docs/schemas/eval-rerun-result.schema.json +6 -1
- package/docs/schemas/eval-rerun-submission.schema.json +3 -1
- package/docs/schemas/eval-result.schema.json +1 -15
- package/docs/schemas/eval-trial-publication.schema.json +1 -25
- package/docs/schemas/eval-trial-reference.schema.json +129 -0
- package/docs/schemas/regrade-assessment-reference.schema.json +11 -0
- package/docs/schemas/run-context.schema.json +15 -0
- package/docs/schemas/run-manifest.schema.json +4 -0
- package/docs/schemas/run-request.schema.json +4 -0
- package/docs/schemas/trajectory-analysis.schema.json +258 -0
- package/docs/schemas/trajectory-events-page.schema.json +40 -0
- package/docs/schemas/verifier-assessment.schema.json +77 -0
- package/docs/schemas/verifier-evidence.schema.json +276 -0
- package/integrations/harbor/hitch_benchmark.py +252 -0
- package/integrations/harbor/hitch_candidate_recycle.py +262 -0
- package/integrations/harbor/hitch_harbor_agent.py +541 -43
- package/integrations/harbor/hitch_harbor_environment.py +138 -0
- package/integrations/harbor/hitch_harbor_verifier.py +60 -2
- package/integrations/harbor/hitch_phase_supervisor.py +452 -0
- package/integrations/harbor/hitch_tool_client.mjs +91 -0
- package/integrations/model-call/cli.js +57 -0
- package/package.json +17 -6
package/README.md
CHANGED
|
@@ -59,12 +59,24 @@ hitch run \
|
|
|
59
59
|
--output jsonl
|
|
60
60
|
```
|
|
61
61
|
|
|
62
|
-
The output includes a run ID. Use
|
|
62
|
+
The output includes a run ID. Use bounded trajectory and verifier views for
|
|
63
|
+
automated consumers, or the full trajectory inspect view for explicit auditing:
|
|
63
64
|
|
|
64
65
|
```bash
|
|
66
|
+
hitch trajectory project RUN_ID --profile analysis --json
|
|
67
|
+
hitch trajectory events RUN_ID --types tool/call,tool/result --limit 100 --json
|
|
65
68
|
hitch trajectory inspect RUN_ID
|
|
69
|
+
hitch verifier inspect RUN_ID --json
|
|
66
70
|
```
|
|
67
71
|
|
|
72
|
+
`project` reconstructs the DSH surface and coalesces streaming chunks per request
|
|
73
|
+
attempt, keeping retries and their finish reasons separate. `events`
|
|
74
|
+
filters and pages at the source; `--field` drill-down additionally requires the
|
|
75
|
+
`canonical_sha256` returned by either bounded view. Streamed views fail closed
|
|
76
|
+
for legacy trajectory refs that do not pin a canonical SHA-256.
|
|
77
|
+
Commands invoked with `--json` emit a stable JSON error envelope on stderr when
|
|
78
|
+
they fail.
|
|
79
|
+
|
|
68
80
|
Every run is stored below `~/.hitch/runs/RUN_ID` with its manifest, result,
|
|
69
81
|
events, logs, and trajectory.
|
|
70
82
|
|
|
@@ -105,12 +117,13 @@ Hitch records the chain from request to result:
|
|
|
105
117
|
- normalized control-plane events and raw process logs;
|
|
106
118
|
- redacted provider-native events where supported;
|
|
107
119
|
- DSH-compatible canonical trajectory with SHA-256-bound files; and
|
|
108
|
-
- versioned message feedback and evaluation evidence.
|
|
120
|
+
- versioned message feedback and bounded verifier/evaluation evidence.
|
|
109
121
|
|
|
110
122
|
Use the CLI to query runs and attach feedback without rewriting the trajectory:
|
|
111
123
|
|
|
112
124
|
```bash
|
|
113
125
|
hitch runs list --json
|
|
126
|
+
hitch verifier inspect RUN_ID --json
|
|
114
127
|
hitch feedback list RUN_ID --json
|
|
115
128
|
hitch feedback put RUN_ID \
|
|
116
129
|
--message MESSAGE_ID \
|
|
@@ -173,6 +186,7 @@ run the real NVIDIA gate through the manually dispatched
|
|
|
173
186
|
|
|
174
187
|
- [Design and architecture](docs/design.md)
|
|
175
188
|
- [Harbor-backed evals](docs/evals.md)
|
|
189
|
+
- [Verifier evidence](docs/verifier-evidence.md)
|
|
176
190
|
- [Workspace isolation](docs/workspaces.md)
|
|
177
191
|
- [Daemon design](docs/daemon.md)
|
|
178
192
|
- [Hitch 0.2 development spec](docs/hitch-0.2-development-spec.md)
|
package/README.zh-CN.md
CHANGED
|
@@ -59,12 +59,22 @@ hitch run \
|
|
|
59
59
|
--output jsonl
|
|
60
60
|
```
|
|
61
61
|
|
|
62
|
-
输出中包含 run ID
|
|
62
|
+
输出中包含 run ID。自动化消费者应使用有界的轨迹和 verifier 视图,完整轨迹
|
|
63
|
+
inspect 仅用于显式审计:
|
|
63
64
|
|
|
64
65
|
```bash
|
|
66
|
+
hitch trajectory project RUN_ID --profile analysis --json
|
|
67
|
+
hitch trajectory events RUN_ID --types tool/call,tool/result --limit 100 --json
|
|
65
68
|
hitch trajectory inspect RUN_ID
|
|
69
|
+
hitch verifier inspect RUN_ID --json
|
|
66
70
|
```
|
|
67
71
|
|
|
72
|
+
`project` 会重建 DSH surface,并按请求 attempt 合并流式 chunk,使 retry 及其
|
|
73
|
+
finish reason 保持独立;`events` 在源端完成过滤和分页。
|
|
74
|
+
使用 `--field` 钻取字段时,还必须传入任一有界视图返回的 `canonical_sha256`。
|
|
75
|
+
对于没有固定 canonical SHA-256 的旧版 trajectory ref,流式视图会 fail closed。
|
|
76
|
+
使用 `--json` 调用的命令失败时,会在 stderr 返回稳定的 JSON 错误 envelope。
|
|
77
|
+
|
|
68
78
|
每次运行的 manifest、结果、事件、日志和轨迹都会保存在
|
|
69
79
|
`~/.hitch/runs/RUN_ID` 下。
|
|
70
80
|
|
|
@@ -105,12 +115,13 @@ Hitch 记录从请求到结果的完整链路:
|
|
|
105
115
|
- 规范化控制面事件与原始进程日志;
|
|
106
116
|
- 支持场景下经过脱敏的 provider-native 事件;
|
|
107
117
|
- 采用 SHA-256 绑定文件、兼容 DSH 的规范化轨迹;
|
|
108
|
-
-
|
|
118
|
+
- 带版本的消息反馈,以及有界的 verifier/评测证据。
|
|
109
119
|
|
|
110
120
|
可以通过 CLI 查询运行,并在不改写轨迹的情况下附加反馈:
|
|
111
121
|
|
|
112
122
|
```bash
|
|
113
123
|
hitch runs list --json
|
|
124
|
+
hitch verifier inspect RUN_ID --json
|
|
114
125
|
hitch feedback list RUN_ID --json
|
|
115
126
|
hitch feedback put RUN_ID \
|
|
116
127
|
--message MESSAGE_ID \
|
|
@@ -159,6 +170,7 @@ hitch run --daemon --harness codex@version:0.92.0 --prompt-file task.md
|
|
|
159
170
|
|
|
160
171
|
- [设计与架构](docs/design.md)
|
|
161
172
|
- [Harbor 评测](docs/evals.md)
|
|
173
|
+
- [Verifier evidence](docs/verifier-evidence.md)
|
|
162
174
|
- [工作区隔离](docs/workspaces.md)
|
|
163
175
|
- [守护进程设计](docs/daemon.md)
|
|
164
176
|
- [Hitch 0.2 开发规范](docs/hitch-0.2-development-spec.md)
|
package/dist/bin/hitch.js
CHANGED
|
@@ -1,9 +1,31 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { main } from "../src/cli/index.js";
|
|
3
|
-
|
|
3
|
+
import { SCHEMA_VERSION } from "../src/foundation/index.js";
|
|
4
|
+
const argv = process.argv.slice(2);
|
|
5
|
+
main(argv).catch((error) => {
|
|
4
6
|
const message = error instanceof Error ? error.message : String(error);
|
|
5
|
-
process.stderr.write(`hitch: ${message}\n`);
|
|
6
7
|
const exitCode = error.exitCode;
|
|
7
|
-
|
|
8
|
+
const normalizedExitCode = Number.isInteger(exitCode) ? exitCode : 12;
|
|
9
|
+
if (requestsJson(argv)) {
|
|
10
|
+
const rawCode = error.code;
|
|
11
|
+
process.stderr.write(`${JSON.stringify({
|
|
12
|
+
schema_version: SCHEMA_VERSION,
|
|
13
|
+
kind: "error",
|
|
14
|
+
error: {
|
|
15
|
+
code: typeof rawCode === "string" ? rawCode : "internal_error",
|
|
16
|
+
message,
|
|
17
|
+
exit_code: normalizedExitCode,
|
|
18
|
+
},
|
|
19
|
+
})}\n`);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
process.stderr.write(`hitch: ${message}\n`);
|
|
23
|
+
}
|
|
24
|
+
process.exitCode = normalizedExitCode;
|
|
8
25
|
});
|
|
26
|
+
function requestsJson(args) {
|
|
27
|
+
if (args.includes("--json"))
|
|
28
|
+
return true;
|
|
29
|
+
return args.some((value, index) => value === "--output" && args[index + 1] === "json");
|
|
30
|
+
}
|
|
9
31
|
//# sourceMappingURL=hitch.js.map
|
package/dist/bin/hitch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hitch.js","sourceRoot":"","sources":["../../bin/hitch.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"hitch.js","sourceRoot":"","sources":["../../bin/hitch.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;IAClC,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAI,KAAgC,CAAC,QAAQ,CAAC;IAC5D,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;IAChF,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACvB,MAAM,OAAO,GAAI,KAA4B,CAAC,IAAI,CAAC;QACnD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;YACrC,cAAc,EAAE,cAAc;YAC9B,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB;gBAC9D,OAAO;gBACP,SAAS,EAAE,kBAAkB;aAC9B;SACF,CAAC,IAAI,CAAC,CAAC;IACV,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,CAAC,QAAQ,GAAG,kBAAkB,CAAC;AACxC,CAAC,CAAC,CAAC;AAEH,SAAS,YAAY,CAAC,IAAuB;IAC3C,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,UAAU,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;AACzF,CAAC"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
/** Explicit Docker canary. Fixture harness is deterministic and calls no model. */
|
|
2
|
+
import assert from "node:assert/strict";
|
|
3
|
+
import { mkdir, mkdtemp, readFile, writeFile } from "node:fs/promises";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { tmpdir } from "node:os";
|
|
6
|
+
import { pathToFileURL } from "node:url";
|
|
7
|
+
import { validateBenchmark } from "../src/benchmarks/index.js";
|
|
8
|
+
import { exportStandardBenchmarkDataset, runEval } from "../src/evals/index.js";
|
|
9
|
+
import { atomicWriteJSON, runCommand } from "../src/foundation/index.js";
|
|
10
|
+
import { writeBenchmarkFixture } from "../test-support/benchmark-fixture.js";
|
|
11
|
+
if (process.argv[2] !== "--fixture")
|
|
12
|
+
throw new Error("Usage: node dist/scripts/canary-benchmark.js --fixture");
|
|
13
|
+
const directory = await mkdtemp(path.join(tmpdir(), "hitch-benchmark-canary-"));
|
|
14
|
+
const packageDir = path.join(directory, "package");
|
|
15
|
+
await writeBenchmarkFixture(packageDir, { benchmark: "runtime-created-counter", task: "reach-seven", tool: "bump_value", metric: "goal_met" });
|
|
16
|
+
await validateBenchmark(packageDir);
|
|
17
|
+
const dataset = path.join(directory, "dataset");
|
|
18
|
+
await exportStandardBenchmarkDataset(packageDir, dataset);
|
|
19
|
+
const harnessDir = path.join(directory, "harness");
|
|
20
|
+
await mkdir(harnessDir);
|
|
21
|
+
const metadata = { name: "hitch-benchmark-deterministic-fixture", version: "1.0.0", private: true, scripts: { build: "node build.js" } };
|
|
22
|
+
await atomicWriteJSON(path.join(harnessDir, "package.json"), metadata);
|
|
23
|
+
await atomicWriteJSON(path.join(harnessDir, "package-lock.json"), { name: metadata.name, version: "1.0.0", lockfileVersion: 3, requires: true, packages: { "": { name: metadata.name, version: "1.0.0" } } });
|
|
24
|
+
const code = `#!/usr/bin/env node
|
|
25
|
+
if (process.argv.includes('--version')) { console.log('pi 1.0.0'); process.exit(0); }
|
|
26
|
+
const fs=require('node:fs'), child=require('node:child_process');
|
|
27
|
+
let prompt=''; process.stdin.setEncoding('utf8'); process.stdin.on('data', x=>prompt+=x);
|
|
28
|
+
process.stdin.on('end',()=>{
|
|
29
|
+
const binding=JSON.parse(fs.readFileSync('/tmp/hitch-tool-binding.json','utf8'));
|
|
30
|
+
const result=child.execFileSync(process.execPath,['/tmp/hitch-tools.mjs',binding.tools[0].name,JSON.stringify({amount:7})],{encoding:'utf8'});
|
|
31
|
+
console.log(JSON.stringify({type:'session',version:3,id:'fixture_session',cwd:process.cwd()}));
|
|
32
|
+
console.log(JSON.stringify({type:'message_update',assistantMessageEvent:{type:'text_delta',contentIndex:0,delta:result}}));
|
|
33
|
+
console.log(JSON.stringify({type:'message_end',message:{role:'assistant',content:[{type:'text',text:result}],usage:{input:0,output:0,cacheRead:0,cacheWrite:0,totalTokens:0,cost:{input:0,output:0,cacheRead:0,cacheWrite:0,total:0}},stopReason:'stop'}}));
|
|
34
|
+
});
|
|
35
|
+
`;
|
|
36
|
+
await writeFile(path.join(harnessDir, "build.js"), `const fs=require('node:fs'); fs.mkdirSync('packages/coding-agent/dist',{recursive:true}); fs.writeFileSync('packages/coding-agent/dist/cli.js',${JSON.stringify(code)},{mode:0o755});\n`);
|
|
37
|
+
await runCommand("git", ["init", harnessDir]);
|
|
38
|
+
await runCommand("git", ["-C", harnessDir, "add", "."]);
|
|
39
|
+
await runCommand("git", ["-C", harnessDir, "-c", "user.name=Hitch Fixture", "-c", "user.email=fixture@example.test", "commit", "-m", "deterministic tool-server canary"]);
|
|
40
|
+
const revision = (await runCommand("git", ["-C", harnessDir, "rev-parse", "HEAD"])).stdout.trim();
|
|
41
|
+
console.log(JSON.stringify({ directory, candidate: "deterministic-fixture", revision }));
|
|
42
|
+
const result = await runEval({
|
|
43
|
+
root: path.resolve(".hitch/benchmark-fixture-state"),
|
|
44
|
+
request: { dataset, harness_ref: `pi@git+${pathToFileURL(harnessDir).href}#${revision}`, model: "fixture", max_concurrent: 1, attempts: 1 },
|
|
45
|
+
onEvent: (event) => console.log(JSON.stringify(event)),
|
|
46
|
+
});
|
|
47
|
+
await atomicWriteJSON(path.join(directory, "result.json"), result);
|
|
48
|
+
assert.equal(result.exit_code, 0, JSON.stringify(result));
|
|
49
|
+
// A score must be present and one, proving the candidate called the new tool.
|
|
50
|
+
const resultText = await readFile(path.join(directory, "result.json"), "utf8");
|
|
51
|
+
assert.match(resultText, /"reward":\s*1/);
|
|
52
|
+
assert.match(resultText, /"total_score":\s*1/);
|
|
53
|
+
console.log(JSON.stringify({ passed: true, directory, result }, null, 2));
|
|
54
|
+
//# sourceMappingURL=canary-benchmark.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canary-benchmark.js","sourceRoot":"","sources":["../../scripts/canary-benchmark.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { readFile } from "node:fs/promises";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { replaySchedulerTrace } from "../src/evals/index.js";
|
|
5
|
+
const fixturePath = path.resolve("test", "fixtures", "eval-scheduler-throughput-trace.json");
|
|
6
|
+
const fixture = JSON.parse(await readFile(fixturePath, "utf8"));
|
|
7
|
+
assert.equal(fixture.schema_version, "1");
|
|
8
|
+
assert.equal(fixture.source.physical_trials, 142);
|
|
9
|
+
assert.equal(fixture.work.length, fixture.source.physical_trials);
|
|
10
|
+
assert.equal(fixture.work.reduce((sum, work) => sum + work.duration_ms, 0), 154_958_000);
|
|
11
|
+
const phases = ["seed-baseline", "seed-candidate", "heldout-baseline", "heldout-candidate"];
|
|
12
|
+
const replay = (selected, policy, retryScheduling) => replaySchedulerTrace(fixture.work.filter((work) => selected.includes(work.phase)).map((work) => ({
|
|
13
|
+
...work,
|
|
14
|
+
task_id: `${work.phase}:${work.task_id}`,
|
|
15
|
+
})), { slots: fixture.slots, policy, retryScheduling });
|
|
16
|
+
const phaseResults = Object.fromEntries(phases.map((phase) => [phase, {
|
|
17
|
+
fifo_batch_ms: replay([phase], "fifo-v1", "batch-v1").makespan_ms,
|
|
18
|
+
critical_path_batch_ms: replay([phase], "critical-path-v1", "batch-v1").makespan_ms,
|
|
19
|
+
critical_path_immediate_ms: replay([phase], "critical-path-v1", "immediate-v1").makespan_ms,
|
|
20
|
+
}]));
|
|
21
|
+
const value = (phase, field) => phaseResults[phase][field];
|
|
22
|
+
const fifoBatchMs = fixture.meta_agent_duration_ms + phases.reduce((sum, phase) => sum + value(phase, "fifo_batch_ms"), 0);
|
|
23
|
+
const criticalPathImmediateMs = fixture.meta_agent_duration_ms + phases.reduce((sum, phase) => sum + value(phase, "critical_path_immediate_ms"), 0);
|
|
24
|
+
const firstRunMs = replay(["seed-baseline", "heldout-baseline"], "critical-path-v1", "immediate-v1").makespan_ms
|
|
25
|
+
+ fixture.meta_agent_duration_ms
|
|
26
|
+
+ value("seed-candidate", "critical_path_immediate_ms")
|
|
27
|
+
+ value("heldout-candidate", "critical_path_immediate_ms");
|
|
28
|
+
const candidateOnlyMs = fixture.meta_agent_duration_ms
|
|
29
|
+
+ value("seed-candidate", "critical_path_immediate_ms")
|
|
30
|
+
+ value("heldout-candidate", "critical_path_immediate_ms");
|
|
31
|
+
assert.ok(fifoBatchMs <= 555 * 60_000, `FIFO/barrier baseline exceeded 555 minutes: ${minutes(fifoBatchMs)}`);
|
|
32
|
+
assert.ok(criticalPathImmediateMs <= 475 * 60_000, `critical-path/immediate replay exceeded 475 minutes: ${minutes(criticalPathImmediateMs)}`);
|
|
33
|
+
assert.ok(firstRunMs <= 425 * 60_000, `first-run replay exceeded 425 minutes: ${minutes(firstRunMs)}`);
|
|
34
|
+
assert.ok(candidateOnlyMs <= 240 * 60_000, `Candidate-only replay exceeded 240 minutes: ${minutes(candidateOnlyMs)}`);
|
|
35
|
+
assert.ok(phases.every((phase) => replay([phase], "critical-path-v1", "immediate-v1").runnable_idle_ms === 0));
|
|
36
|
+
process.stdout.write(`${JSON.stringify({
|
|
37
|
+
schema_version: "1",
|
|
38
|
+
source: fixture.source,
|
|
39
|
+
slots: fixture.slots,
|
|
40
|
+
fifo_batch_minutes: minutes(fifoBatchMs),
|
|
41
|
+
critical_path_immediate_minutes: minutes(criticalPathImmediateMs),
|
|
42
|
+
first_run_minutes: minutes(firstRunMs),
|
|
43
|
+
candidate_only_minutes: minutes(candidateOnlyMs),
|
|
44
|
+
phase_results: Object.fromEntries(Object.entries(phaseResults).map(([phase, result]) => [phase, Object.fromEntries(Object.entries(result).map(([key, duration]) => [key.replace("_ms", "_minutes"), minutes(duration)]))])),
|
|
45
|
+
}, null, 2)}\n`);
|
|
46
|
+
function minutes(durationMs) { return Math.round(durationMs / 600) / 100; }
|
|
47
|
+
//# sourceMappingURL=canary-eval-scheduler-throughput.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canary-eval-scheduler-throughput.js","sourceRoot":"","sources":["../../scripts/canary-eval-scheduler-throughput.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,13 @@ import { readFile, readdir } from "node:fs/promises";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
const SRC_ROOT = path.resolve("src");
|
|
4
4
|
const MODULES = new Set([
|
|
5
|
-
"domain", "foundation", "adapters", "revisions", "artifacts", "controller-runtime",
|
|
5
|
+
"domain", "foundation", "benchmarks", "adapters", "revisions", "artifacts", "controller-runtime",
|
|
6
6
|
"images", "model-access", "trajectories", "feedback", "workspaces", "runs", "backends", "evals", "control-plane", "workers", "daemon", "cli",
|
|
7
7
|
]);
|
|
8
8
|
const ALLOWED = new Map([
|
|
9
9
|
["domain", new Set()],
|
|
10
10
|
["foundation", new Set(["domain"])],
|
|
11
|
+
["benchmarks", new Set(["domain", "foundation"])],
|
|
11
12
|
["adapters", new Set(["domain", "foundation"])],
|
|
12
13
|
["revisions", new Set(["domain", "foundation", "adapters"])],
|
|
13
14
|
["artifacts", new Set(["domain", "foundation", "adapters", "revisions"])],
|
|
@@ -19,7 +20,7 @@ const ALLOWED = new Map([
|
|
|
19
20
|
["workspaces", new Set(["domain", "foundation"])],
|
|
20
21
|
["runs", new Set(["domain", "foundation", "adapters", "revisions", "artifacts", "workspaces", "trajectories", "model-access"])],
|
|
21
22
|
["backends", new Set(["domain", "foundation"])],
|
|
22
|
-
["evals", new Set(["domain", "foundation", "backends", "runs", "artifacts", "revisions", "controller-runtime", "workspaces", "trajectories", "model-access"])],
|
|
23
|
+
["evals", new Set(["domain", "foundation", "benchmarks", "backends", "runs", "artifacts", "revisions", "controller-runtime", "workspaces", "trajectories", "model-access"])],
|
|
23
24
|
["control-plane", new Set(["domain", "foundation", "adapters", "model-access", "evals", "images"])],
|
|
24
25
|
["workers", new Set(["domain", "foundation", "artifacts", "backends", "controller-runtime", "evals", "control-plane"])],
|
|
25
26
|
["daemon", new Set(["domain", "foundation", "runs", "workspaces", "control-plane"])],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-architecture.js","sourceRoot":"","sources":["../../scripts/check-architecture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACrC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;IACtB,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,oBAAoB;
|
|
1
|
+
{"version":3,"file":"check-architecture.js","sourceRoot":"","sources":["../../scripts/check-architecture.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,8 @@ import { codexAdapter } from "./providers/codex.js";
|
|
|
5
5
|
import { deepseekAdapter } from "./providers/deepseek.js";
|
|
6
6
|
import { opencodeAdapter } from "./providers/opencode.js";
|
|
7
7
|
import { piAdapter } from "./providers/pi.js";
|
|
8
|
-
|
|
8
|
+
import { modelCallAdapter } from "./providers/model-call.js";
|
|
9
|
+
const definitions = Object.fromEntries([codexAdapter, claudeAdapter, piAdapter, opencodeAdapter, deepseekAdapter, modelCallAdapter].map((definition) => [definition.id, definition]));
|
|
9
10
|
export function listDefinitions() {
|
|
10
11
|
return Object.values(definitions).map(publicDefinition);
|
|
11
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/adapters/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/adapters/catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { mkdtempSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { tmpdir } from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
/** Explicit credential handoff for isolated Harbor containers. Never included in
|
|
5
|
+
* the exported run's runtime-home, task tree, command line or artifact image.
|
|
6
|
+
* The container provider owns deletion when the trial is released.
|
|
7
|
+
*/
|
|
8
|
+
export function codexContainerAuth(env = process.env) {
|
|
9
|
+
const encoded = env.HITCH_CODEX_AUTH_JSON;
|
|
10
|
+
if (!encoded)
|
|
11
|
+
return undefined;
|
|
12
|
+
if (env.HITCH_HARBOR_INTERNAL !== "1")
|
|
13
|
+
throw new Error("HITCH_CODEX_AUTH_JSON is only supported inside a managed Harbor container");
|
|
14
|
+
if (encoded.length > 100_000)
|
|
15
|
+
throw new Error("Codex auth document exceeds size limit");
|
|
16
|
+
let document;
|
|
17
|
+
try {
|
|
18
|
+
document = JSON.parse(encoded);
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
throw new Error("Codex auth document is invalid JSON");
|
|
22
|
+
}
|
|
23
|
+
if (!document || typeof document !== "object" || Array.isArray(document))
|
|
24
|
+
throw new Error("Codex auth document must be an object");
|
|
25
|
+
const directory = mkdtempSync(path.join(tmpdir(), "hitch-codex-auth-"));
|
|
26
|
+
writeFileSync(path.join(directory, "auth.json"), encoded, { mode: 0o600 });
|
|
27
|
+
return { CODEX_HOME: directory };
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=codex-auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-auth.js","sourceRoot":"","sources":["../../../../src/adapters/providers/codex-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG;IAClD,MAAM,OAAO,GAAG,GAAG,CAAC,qBAAqB,CAAC;IAC1C,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,IAAI,GAAG,CAAC,qBAAqB,KAAK,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAC;IACpI,IAAI,OAAO,CAAC,MAAM,GAAG,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IACxF,IAAI,QAAiB,CAAC;IACtB,IAAI,CAAC;QAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAAC,CAAC;IACzG,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IACnI,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC;IACxE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3E,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AACnC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { asString, codexSupportsEphemeral } from "./shared.js";
|
|
2
|
+
import { codexContainerAuth } from "./codex-auth.js";
|
|
2
3
|
export const codexAdapter = {
|
|
3
4
|
id: "codex",
|
|
4
5
|
display_name: "Codex CLI",
|
|
@@ -40,36 +41,52 @@ export const codexAdapter = {
|
|
|
40
41
|
if (request.model)
|
|
41
42
|
args.push("--model", request.model);
|
|
42
43
|
args.push(...request.agent_args, "-");
|
|
43
|
-
|
|
44
|
+
const auth = codexContainerAuth();
|
|
45
|
+
return { executable, args, input: request.prompt, ...(auth ? { env: auth } : {}) };
|
|
44
46
|
},
|
|
45
|
-
translate(event) {
|
|
47
|
+
translate(event, state = {}) {
|
|
48
|
+
const pendingCommands = (state.pendingCommands ??= {});
|
|
46
49
|
if (event.type === "thread.started") {
|
|
47
50
|
return [{ type: "session.created", session_id: asString(event.thread_id) }];
|
|
48
51
|
}
|
|
49
52
|
if (event.type === "item.completed" && event.item?.type === "agent_message") {
|
|
50
|
-
return [{ type: "message.
|
|
53
|
+
return [{ type: "message.completed", text: asString(event.item.text) }];
|
|
51
54
|
}
|
|
52
55
|
const toolTypes = new Set(["command_execution", "file_change", "mcp_tool_call", "web_search"]);
|
|
53
56
|
const item = (event.item || {});
|
|
54
57
|
if (event.type === "item.started" && toolTypes.has(item.type)) {
|
|
58
|
+
if (item.type === "command_execution")
|
|
59
|
+
pendingCommands[asString(item.id)] = item;
|
|
55
60
|
return [{
|
|
56
61
|
type: "tool.started",
|
|
57
62
|
call_id: asString(item.id),
|
|
58
63
|
name: asString(item.type),
|
|
64
|
+
input: item.type === "command_execution" ? { command: item.command } : item,
|
|
59
65
|
native: item,
|
|
60
66
|
}];
|
|
61
67
|
}
|
|
62
68
|
if (event.type === "item.completed" && toolTypes.has(item.type)) {
|
|
69
|
+
delete pendingCommands[asString(item.id)];
|
|
63
70
|
return [{
|
|
64
71
|
type: "tool.completed",
|
|
65
72
|
call_id: asString(item.id),
|
|
66
73
|
name: asString(item.type),
|
|
67
|
-
status: item.status || "
|
|
74
|
+
status: item.status === "failed" || (typeof item.exit_code === "number" && item.exit_code !== 0) ? "failed" : "succeeded",
|
|
75
|
+
output: item.aggregated_output ?? item,
|
|
68
76
|
native: item,
|
|
69
77
|
}];
|
|
70
78
|
}
|
|
71
|
-
if (event.type === "turn.completed"
|
|
72
|
-
|
|
79
|
+
if (event.type === "turn.completed") {
|
|
80
|
+
// Codex can finish while a long-lived server remains in progress. Close
|
|
81
|
+
// the observation with an explicitly unknown outcome, never success.
|
|
82
|
+
const detached = Object.entries(pendingCommands).map(([id, command]) => ({
|
|
83
|
+
type: "tool.completed", call_id: id, name: "command_execution", status: "unknown",
|
|
84
|
+
output: "Codex turn ended without a command completion event; process outcome is unknown.",
|
|
85
|
+
native: { ...command, hitch_observation: "open_at_turn_end" },
|
|
86
|
+
}));
|
|
87
|
+
for (const id of Object.keys(pendingCommands))
|
|
88
|
+
delete pendingCommands[id];
|
|
89
|
+
return [...detached, ...(event.usage ? [{ type: "usage.updated", usage: event.usage }] : [])];
|
|
73
90
|
}
|
|
74
91
|
if (event.type === "error") {
|
|
75
92
|
return [{ type: "diagnostic", level: "error", message: asString(event.message) || "Codex error" }];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../../src/adapters/providers/codex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../../src/adapters/providers/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { readFile } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { sha256Bytes, invalidInput, packageRoot } from "../../foundation/index.js";
|
|
4
|
+
export const modelCallAdapter = {
|
|
5
|
+
id: "model-call", display_name: "Hitch single model request", command: "hitch-model-call", path_env: "HITCH_MODEL_CALL_PATH", version_args: ["--version"],
|
|
6
|
+
revision_sources: { commit: { type: "git", url: "https://github.com/rsi-gear/agent-hitch.git", commands: [], entrypoint: "integrations/model-call/cli.js" } },
|
|
7
|
+
capabilities: { non_interactive: true, streaming: false, structured_messages: true, structured_tool_events: false, sessions: false, resume: false, model_selection: true, graceful_cancel: true },
|
|
8
|
+
requirements: { network: "required", credential_names: ["OPENAI_API_KEY"], endpoint_override: "supported", capture: { native_events: true, native_session: false, model_proxy_compatible: true } },
|
|
9
|
+
async process(request, executable, runtime = {}) {
|
|
10
|
+
if (request.agent_args.length)
|
|
11
|
+
throw invalidInput("model-call does not accept agent arguments or tool overrides");
|
|
12
|
+
// An arbitrary custom Git revision cannot claim the no-tools capability.
|
|
13
|
+
const approved = sha256Bytes(await readFile(path.join(packageRoot(), "integrations/model-call/cli.js")));
|
|
14
|
+
if (runtime.entrypoint_integrity !== approved)
|
|
15
|
+
throw invalidInput("model-call runner differs from the trusted implementation in this Hitch runtime");
|
|
16
|
+
return { executable, args: ["--model", request.model], input: request.prompt };
|
|
17
|
+
},
|
|
18
|
+
translate(event) {
|
|
19
|
+
if (event.type === "message.completed" && typeof event.text === "string")
|
|
20
|
+
return [{ type: "message.completed", text: event.text }];
|
|
21
|
+
if (event.type === "usage.updated" && event.usage && typeof event.usage === "object")
|
|
22
|
+
return [{ type: "usage.updated", usage: event.usage }];
|
|
23
|
+
return [{ type: "provider.event", provider_type: String(event.type), native: event }];
|
|
24
|
+
},
|
|
25
|
+
};
|
|
26
|
+
//# sourceMappingURL=model-call.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-call.js","sourceRoot":"","sources":["../../../../src/adapters/providers/model-call.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAEnF,MAAM,CAAC,MAAM,gBAAgB,GAAsB;IACjD,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,4BAA4B,EAAE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,uBAAuB,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC;IACzJ,gBAAgB,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,6CAA6C,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,gCAAgC,EAAE,EAAE;IAC7J,YAAY,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE;IACjM,YAAY,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,EAAE;IAClM,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,EAAE;QAC7C,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM;YAAE,MAAM,YAAY,CAAC,8DAA8D,CAAC,CAAC;QAClH,yEAAyE;QACzE,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,gCAAgC,CAAC,CAAC,CAAC,CAAC;QACzG,IAAI,OAAO,CAAC,oBAAoB,KAAK,QAAQ;YAAE,MAAM,YAAY,CAAC,iFAAiF,CAAC,CAAC;QACrJ,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;IACjF,CAAC;IACD,SAAS,CAAC,KAAK;QACb,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACnI,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,IAAI,KAAK,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;YAAE,OAAO,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,CAAC,KAAgC,EAAE,CAAC,CAAC;QACxK,OAAO,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACxF,CAAC;CACF,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { listPreparedArtifacts, prepareHarness } from "./preparer.js";
|
|
2
2
|
export { loadPreparedArtifact, preparedArtifactDirectory } from "./store.js";
|
|
3
|
-
export { artifactMatches } from "./integrity.js";
|
|
3
|
+
export { artifactDirectoryIntegrity, artifactMatches } from "./integrity.js";
|
|
4
4
|
export { assertPreparedArtifactRevision } from "./handoff.js";
|
|
5
5
|
export { resolveHarness } from "../revisions/index.js";
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/artifacts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/artifacts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAE9D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { randomBytes } from "node:crypto";
|
|
|
2
2
|
import { chmod, lstat, readdir, rm, writeFile } from "node:fs/promises";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { getAdapter } from "../adapters/index.js";
|
|
5
|
-
import { SCHEMA_VERSION, HitchError, atomicWriteJSON, commandExecutable, commandVersion, detectVersion, digest, ensureDir, fingerprintExecutable, readJSON, runCommand, statePaths } from "../foundation/index.js";
|
|
5
|
+
import { SCHEMA_VERSION, HitchError, atomicWriteJSON, commandExecutable, commandVersion, detectVersion, digest, ensureDir, fingerprintExecutable, readJSON, runCommand, selectVersionLine, statePaths } from "../foundation/index.js";
|
|
6
6
|
import { gitCacheDirectory } from "../revisions/index.js";
|
|
7
7
|
import { artifactDirectoryIntegrity, artifactInvocation, artifactMatches, assertEntrypoint, assertGlobalNpmResolution, assertNpmResolution, entrypointLauncher, npmPackageEntrypoint, optionalFileDigest, sourceLockIdentity } from "./integrity.js";
|
|
8
8
|
import { artifactManifest, promoteArtifact, readCachedArtifact, withArtifactLock } from "./store.js";
|
|
@@ -170,7 +170,12 @@ async function prepareNpmArtifact(resolved, adapter, source, paths, preparationK
|
|
|
170
170
|
const toolchain = { node: process.version, npm: await commandVersion(npm, env, signal) };
|
|
171
171
|
const launcher = entrypointLauncher(entrypoint);
|
|
172
172
|
const invocation = artifactInvocation({ entrypoint, launcher }, staging);
|
|
173
|
-
|
|
173
|
+
// A crashing Node launcher prints the Node version in its stack trace.
|
|
174
|
+
// Require a successful probe before accepting any reported version.
|
|
175
|
+
const versionProbe = await runCommand(invocation.executable, [...invocation.entrypoint_args, ...adapter.version_args], {
|
|
176
|
+
env, signal, timeoutMs: 30_000, failureCode: "artifact_version_probe_failed", failureExitCode: 5,
|
|
177
|
+
});
|
|
178
|
+
const observedVersion = selectVersionLine(versionProbe.stdout, versionProbe.stderr);
|
|
174
179
|
throwIfAborted(signal);
|
|
175
180
|
assertObservedVersion(observedVersion, resolved.revision.version || "", resolved.canonical_ref);
|
|
176
181
|
const entrypointIntegrity = await fingerprintExecutable(stagedExecutable);
|