agent-hitch 0.2.7 → 0.2.9
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 +12 -2
- 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 +42 -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 +73 -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 +30 -74
- 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 +666 -68
- package/integrations/harbor/hitch_harbor_environment.py +138 -0
- package/integrations/harbor/hitch_harbor_verifier.py +60 -2
- package/integrations/harbor/hitch_phase_supervisor.py +452 -0
- package/integrations/harbor/hitch_tool_client.mjs +91 -0
- package/integrations/model-call/cli.js +57 -0
- package/package.json +17 -6
|
@@ -0,0 +1,284 @@
|
|
|
1
|
+
import { IncrementalChunkInvariant, validateContentBlock } from "./dsh-chunk-contract.js";
|
|
2
|
+
const EVENT_ENVELOPE_KEYS = new Set(["type", "seq", "time", "data", "surfaceOp", "sourceEventSeqs", "ignorable"]);
|
|
3
|
+
const ADAPTER_DEFAULT_KEYS = new Set(["reasoningEffort", "maxTokens"]);
|
|
4
|
+
/** Canonical counterpart of DSH canonicalHeader(). Validation happens before normalization. */
|
|
5
|
+
export function canonicalRequestHeader(value) {
|
|
6
|
+
const header = record(value, "request header");
|
|
7
|
+
const config = record(header.config, "request header config");
|
|
8
|
+
nonEmptyString(config.provider, "request header config.provider");
|
|
9
|
+
nonEmptyString(config.model, "request header config.model");
|
|
10
|
+
if (config.reasoningEffort !== undefined)
|
|
11
|
+
nonEmptyString(config.reasoningEffort, "request header config.reasoningEffort");
|
|
12
|
+
const adapterDefaults = validateAdapterDefaults(header.adapterDefaults, config);
|
|
13
|
+
if (header.system !== undefined && typeof header.system !== "string")
|
|
14
|
+
throw new Error("request header system must be a string");
|
|
15
|
+
if (header.tools !== undefined && !Array.isArray(header.tools))
|
|
16
|
+
throw new Error("request header tools must be an array");
|
|
17
|
+
return {
|
|
18
|
+
config,
|
|
19
|
+
...(adapterDefaults?.reasoningEffort === true || adapterDefaults?.maxTokens === true ? { adapterDefaults } : {}),
|
|
20
|
+
...(typeof header.system === "string" && header.system.length > 0 ? { system: header.system } : {}),
|
|
21
|
+
...(Array.isArray(header.tools) && header.tools.length > 0 ? { tools: header.tools } : {}),
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
/** Validate DSH's current replay boundary without retaining prior events. */
|
|
25
|
+
export class IncrementalDshInvariant {
|
|
26
|
+
openTurn = null;
|
|
27
|
+
openStep = null;
|
|
28
|
+
nextTurn = 1;
|
|
29
|
+
nextStep = 1;
|
|
30
|
+
pendingCalls = new Set();
|
|
31
|
+
scheduledRetries = new Set();
|
|
32
|
+
chunkStream = null;
|
|
33
|
+
accept(event, raw) {
|
|
34
|
+
const envelope = record(raw, `session event at seq ${event.seq}`);
|
|
35
|
+
if (!event.ignorable
|
|
36
|
+
&& (!/^[a-z][a-z0-9-]*(?:\/[a-z][a-z0-9-]*)+$/.test(event.type) || event.type.length > 128)) {
|
|
37
|
+
throw new Error(`session event at seq ${event.seq} has an invalid event type`);
|
|
38
|
+
}
|
|
39
|
+
if (event.ignorable && event.type.length > 1_024) {
|
|
40
|
+
throw new Error(`session event at seq ${event.seq} has an event type longer than 1024 characters`);
|
|
41
|
+
}
|
|
42
|
+
if (Object.keys(envelope).some((key) => !EVENT_ENVELOPE_KEYS.has(key))) {
|
|
43
|
+
throw new Error(`session event at seq ${event.seq} has an invalid event envelope`);
|
|
44
|
+
}
|
|
45
|
+
if (envelope.ignorable !== undefined && envelope.ignorable !== true) {
|
|
46
|
+
throw new Error(`session event at seq ${event.seq} has an invalid ignorable marker`);
|
|
47
|
+
}
|
|
48
|
+
if (event.sourceEventSeqs?.some((seq) => !Number.isSafeInteger(seq) || seq < 0)) {
|
|
49
|
+
throw new Error(`session event at seq ${event.seq} has invalid sourceEventSeqs`);
|
|
50
|
+
}
|
|
51
|
+
const rawSurfaceOp = envelope.surfaceOp;
|
|
52
|
+
if (rawSurfaceOp !== undefined && rawSurfaceOp !== "append") {
|
|
53
|
+
const op = record(rawSurfaceOp, `session event at seq ${event.seq} surfaceOp`);
|
|
54
|
+
if (Object.keys(op).sort().join(",") !== "end,op,start" || op.op !== "replace"
|
|
55
|
+
|| !Number.isSafeInteger(op.start) || op.start < 0
|
|
56
|
+
|| !Number.isSafeInteger(op.end) || op.end < 0) {
|
|
57
|
+
throw new Error(`session event at seq ${event.seq} has an invalid replace surfaceOp`);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
if (event.type === "request/header-delta")
|
|
61
|
+
throw new Error("legacy request/header-delta is unsupported");
|
|
62
|
+
this.validateShape(event);
|
|
63
|
+
this.validateRelations(event);
|
|
64
|
+
}
|
|
65
|
+
validateShape(event) {
|
|
66
|
+
const data = record(event.data, `${event.type} data`);
|
|
67
|
+
switch (event.type) {
|
|
68
|
+
case "request/header": {
|
|
69
|
+
if (!new Set(["initial", "resume", "change"]).has(String(data.reason))) {
|
|
70
|
+
throw new Error("request/header reason must be initial, resume, or change");
|
|
71
|
+
}
|
|
72
|
+
canonicalRequestHeader(data.header);
|
|
73
|
+
break;
|
|
74
|
+
}
|
|
75
|
+
case "user/message":
|
|
76
|
+
validateMessage(data, "user", "user/message");
|
|
77
|
+
break;
|
|
78
|
+
case "assistant/message":
|
|
79
|
+
stepIdentity(data, "assistant/message");
|
|
80
|
+
validateMessage(record(data.message, "assistant/message message"), "assistant", "assistant/message");
|
|
81
|
+
validateModelSource(record(data.message, "assistant/message message").source);
|
|
82
|
+
this.chunkStream?.assertReadyForMessage();
|
|
83
|
+
break;
|
|
84
|
+
case "tool/result": {
|
|
85
|
+
stepIdentity(data, "tool/result");
|
|
86
|
+
const message = record(data.message, "tool/result message");
|
|
87
|
+
validateMessage(message, "user", "tool/result");
|
|
88
|
+
const source = record(message.source, "tool/result source");
|
|
89
|
+
if (source.kind !== "tool")
|
|
90
|
+
throw new Error("tool/result message must have tool source");
|
|
91
|
+
const callId = nonEmptyString(source.callId, "tool/result source.callId");
|
|
92
|
+
const content = message.content;
|
|
93
|
+
const block = content.length === 1 ? record(content[0], "tool/result content block") : null;
|
|
94
|
+
if (!block || block.type !== "tool-result" || !Array.isArray(block.content) || block.toolCallId !== callId) {
|
|
95
|
+
throw new Error("tool/result message must contain one matching tool-result block");
|
|
96
|
+
}
|
|
97
|
+
break;
|
|
98
|
+
}
|
|
99
|
+
case "assistant/chunk": {
|
|
100
|
+
stepIdentity(data, "assistant/chunk");
|
|
101
|
+
this.chunkStream?.accept(data.chunk);
|
|
102
|
+
break;
|
|
103
|
+
}
|
|
104
|
+
case "llm/retry":
|
|
105
|
+
stepIdentity(data, "llm/retry");
|
|
106
|
+
nonEmptyString(data.retryId, "llm/retry retryId");
|
|
107
|
+
if (!Number.isSafeInteger(data.retry) || data.retry < 1) {
|
|
108
|
+
throw new Error("llm/retry retry must be a positive safe integer");
|
|
109
|
+
}
|
|
110
|
+
break;
|
|
111
|
+
case "llm/retry-started":
|
|
112
|
+
stepIdentity(data, "llm/retry-started");
|
|
113
|
+
nonEmptyString(data.retryId, "llm/retry-started retryId");
|
|
114
|
+
if (!Number.isSafeInteger(data.retry) || data.retry < 1) {
|
|
115
|
+
throw new Error("llm/retry-started retry must be a positive safe integer");
|
|
116
|
+
}
|
|
117
|
+
break;
|
|
118
|
+
case "turn/start":
|
|
119
|
+
case "turn/end":
|
|
120
|
+
nonNegativeInteger(data.turn, `${event.type} turn`);
|
|
121
|
+
break;
|
|
122
|
+
case "step/start":
|
|
123
|
+
case "step/end":
|
|
124
|
+
stepIdentity(data, event.type);
|
|
125
|
+
break;
|
|
126
|
+
case "tool/call":
|
|
127
|
+
stepIdentity(data, "tool/call");
|
|
128
|
+
nonEmptyString(data.callId, "tool/call callId");
|
|
129
|
+
nonEmptyString(data.name, "tool/call name");
|
|
130
|
+
if (typeof data.arguments !== "string")
|
|
131
|
+
throw new Error("tool/call arguments must be a string");
|
|
132
|
+
break;
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
validateRelations(event) {
|
|
136
|
+
const data = event.data;
|
|
137
|
+
switch (event.type) {
|
|
138
|
+
case "turn/start": {
|
|
139
|
+
const turn = data.turn;
|
|
140
|
+
if (this.openTurn !== null)
|
|
141
|
+
throw new Error(`turn/start ${turn} while turn ${this.openTurn} is open`);
|
|
142
|
+
if (turn !== this.nextTurn)
|
|
143
|
+
throw new Error(`turn/start expected turn ${this.nextTurn}, got ${turn}`);
|
|
144
|
+
this.openTurn = turn;
|
|
145
|
+
this.nextStep = 1;
|
|
146
|
+
break;
|
|
147
|
+
}
|
|
148
|
+
case "turn/end": {
|
|
149
|
+
const turn = data.turn;
|
|
150
|
+
if (this.openTurn !== turn || this.openStep !== null)
|
|
151
|
+
throw new Error(`turn/end ${turn} does not close the current turn`);
|
|
152
|
+
this.openTurn = null;
|
|
153
|
+
this.nextTurn += 1;
|
|
154
|
+
break;
|
|
155
|
+
}
|
|
156
|
+
case "step/start": {
|
|
157
|
+
const { turn, step } = data;
|
|
158
|
+
if (this.openTurn !== turn || this.openStep !== null || step !== this.nextStep) {
|
|
159
|
+
throw new Error(`step/start ${turn}/${step} does not match the current turn/next step`);
|
|
160
|
+
}
|
|
161
|
+
this.openStep = step;
|
|
162
|
+
this.chunkStream = new IncrementalChunkInvariant();
|
|
163
|
+
break;
|
|
164
|
+
}
|
|
165
|
+
case "step/end": {
|
|
166
|
+
this.requireOpenStep(event.type, data.turn, data.step);
|
|
167
|
+
this.pendingCalls.clear();
|
|
168
|
+
this.scheduledRetries.clear();
|
|
169
|
+
this.openStep = null;
|
|
170
|
+
this.chunkStream = null;
|
|
171
|
+
this.nextStep += 1;
|
|
172
|
+
break;
|
|
173
|
+
}
|
|
174
|
+
case "assistant/chunk":
|
|
175
|
+
case "assistant/message":
|
|
176
|
+
this.requireOpenStep(event.type, data.turn, data.step);
|
|
177
|
+
break;
|
|
178
|
+
case "llm/retry": {
|
|
179
|
+
this.requireOpenStep(event.type, data.turn, data.step);
|
|
180
|
+
const key = retryKey(data);
|
|
181
|
+
if (this.scheduledRetries.has(key))
|
|
182
|
+
throw new Error("llm/retry repeats a scheduled retry attempt");
|
|
183
|
+
this.scheduledRetries.add(key);
|
|
184
|
+
break;
|
|
185
|
+
}
|
|
186
|
+
case "llm/retry-started": {
|
|
187
|
+
this.requireOpenStep(event.type, data.turn, data.step);
|
|
188
|
+
const key = retryKey(data);
|
|
189
|
+
if (!this.scheduledRetries.delete(key))
|
|
190
|
+
throw new Error("llm/retry-started pairs no prior scheduled attempt");
|
|
191
|
+
this.chunkStream?.assertReadyForRetry();
|
|
192
|
+
this.chunkStream = new IncrementalChunkInvariant();
|
|
193
|
+
break;
|
|
194
|
+
}
|
|
195
|
+
case "tool/call": {
|
|
196
|
+
this.requireOpenStep(event.type, data.turn, data.step);
|
|
197
|
+
const callId = data.callId;
|
|
198
|
+
this.pendingCalls.add(callId);
|
|
199
|
+
break;
|
|
200
|
+
}
|
|
201
|
+
case "tool/result": {
|
|
202
|
+
if (event.surfaceOp !== "append") {
|
|
203
|
+
if (this.openTurn === null)
|
|
204
|
+
throw new Error("tool/result replacement is outside an open turn");
|
|
205
|
+
break;
|
|
206
|
+
}
|
|
207
|
+
this.requireOpenStep(event.type, data.turn, data.step);
|
|
208
|
+
const message = data.message;
|
|
209
|
+
const source = message.source;
|
|
210
|
+
const callId = source.callId;
|
|
211
|
+
const content = message.content;
|
|
212
|
+
const synthetic = content[0]?.isError === true
|
|
213
|
+
&& data.error?.code === "TOOL_NOT_STARTED";
|
|
214
|
+
if (!this.pendingCalls.has(callId) && !synthetic)
|
|
215
|
+
throw new Error("tool/result has no prior tool/call in this step");
|
|
216
|
+
this.pendingCalls.delete(callId);
|
|
217
|
+
break;
|
|
218
|
+
}
|
|
219
|
+
case "request/header":
|
|
220
|
+
case "request/context":
|
|
221
|
+
case "todo/write":
|
|
222
|
+
if (this.openTurn === null)
|
|
223
|
+
throw new Error(`${event.type} is outside an open turn`);
|
|
224
|
+
break;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
requireOpenStep(kind, turn, step) {
|
|
228
|
+
if (this.openTurn !== turn || this.openStep !== step) {
|
|
229
|
+
throw new Error(`${kind} names turn ${turn}/step ${step} but open is ${this.openTurn}/step ${this.openStep}`);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
function validateAdapterDefaults(value, config) {
|
|
234
|
+
if (value === undefined)
|
|
235
|
+
return undefined;
|
|
236
|
+
const defaults = record(value, "request header adapterDefaults");
|
|
237
|
+
if (Object.keys(defaults).some((key) => !ADAPTER_DEFAULT_KEYS.has(key))
|
|
238
|
+
|| Object.values(defaults).some((marker) => marker !== true)
|
|
239
|
+
|| (defaults.reasoningEffort === true && config.reasoningEffort === undefined)
|
|
240
|
+
|| (defaults.maxTokens === true && config.maxTokens === undefined)) {
|
|
241
|
+
throw new Error("request header adapterDefaults are invalid");
|
|
242
|
+
}
|
|
243
|
+
return defaults;
|
|
244
|
+
}
|
|
245
|
+
function validateMessage(message, role, label) {
|
|
246
|
+
nonEmptyString(message.id, `${label} message.id`);
|
|
247
|
+
if (message.role !== role)
|
|
248
|
+
throw new Error(`${label} message must have role ${role}`);
|
|
249
|
+
const source = record(message.source, `${label} message.source`);
|
|
250
|
+
nonEmptyString(source.kind, `${label} message.source.kind`);
|
|
251
|
+
if (!Array.isArray(message.content))
|
|
252
|
+
throw new Error(`${label} message content must be an array`);
|
|
253
|
+
message.content.forEach((entry, index) => validateContentBlock(entry, `${label} message.content[${index}]`));
|
|
254
|
+
}
|
|
255
|
+
function validateModelSource(value) {
|
|
256
|
+
const source = record(value, "assistant/message source");
|
|
257
|
+
if (source.kind !== "model")
|
|
258
|
+
throw new Error("assistant/message must have model source");
|
|
259
|
+
nonEmptyString(source.provider, "assistant/message source.provider");
|
|
260
|
+
nonEmptyString(source.model, "assistant/message source.model");
|
|
261
|
+
}
|
|
262
|
+
function stepIdentity(data, label) {
|
|
263
|
+
nonNegativeInteger(data.turn, `${label} turn`);
|
|
264
|
+
nonNegativeInteger(data.step, `${label} step`);
|
|
265
|
+
}
|
|
266
|
+
function retryKey(data) {
|
|
267
|
+
return `${String(data.retryId)}\u0000${String(data.retry)}`;
|
|
268
|
+
}
|
|
269
|
+
function record(value, label) {
|
|
270
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
271
|
+
throw new Error(`${label} must be an object`);
|
|
272
|
+
return value;
|
|
273
|
+
}
|
|
274
|
+
function nonEmptyString(value, label) {
|
|
275
|
+
if (typeof value !== "string" || value.length === 0)
|
|
276
|
+
throw new Error(`${label} must be a non-empty string`);
|
|
277
|
+
return value;
|
|
278
|
+
}
|
|
279
|
+
function nonNegativeInteger(value, label) {
|
|
280
|
+
if (!Number.isSafeInteger(value) || value < 0)
|
|
281
|
+
throw new Error(`${label} must be a non-negative safe integer`);
|
|
282
|
+
return value;
|
|
283
|
+
}
|
|
284
|
+
//# sourceMappingURL=dsh-contract.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dsh-contract.js","sourceRoot":"","sources":["../../../src/trajectories/dsh-contract.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { HitchError } from "../foundation/index.js";
|
|
2
|
+
import { IncrementalRequestAttemptTracker } from "./request-attempt.js";
|
|
3
|
+
import { scanCanonicalTrajectory } from "./stream-reader.js";
|
|
4
|
+
export function canonicalChunkDeltaField(field) {
|
|
5
|
+
const canonical = field?.startsWith("event.") ? field.slice("event.".length) : field;
|
|
6
|
+
return canonical === "data.chunk.delta"
|
|
7
|
+
|| canonical === "data.chunk.text"
|
|
8
|
+
|| canonical === "data.chunk.argumentsDelta"
|
|
9
|
+
? canonical
|
|
10
|
+
: undefined;
|
|
11
|
+
}
|
|
12
|
+
/** Track independently redacted content streams within one request attempt. */
|
|
13
|
+
export class IncrementalChunkStreamTracker {
|
|
14
|
+
openBlocks = new Map();
|
|
15
|
+
accept(event, attempt) {
|
|
16
|
+
if (event.type !== "assistant/chunk")
|
|
17
|
+
return undefined;
|
|
18
|
+
const data = event.data;
|
|
19
|
+
const chunk = data.chunk;
|
|
20
|
+
if (!Number.isSafeInteger(data.turn) || !Number.isSafeInteger(data.step) || !Number.isSafeInteger(chunk.index)) {
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
const key = streamKey(data.turn, data.step, attempt, chunk.index);
|
|
24
|
+
if (chunk.type === "block-start") {
|
|
25
|
+
const streamKind = chunk.blockType === "text" || chunk.blockType === "reasoning"
|
|
26
|
+
? chunk.blockType
|
|
27
|
+
: chunk.blockType === "tool-call" ? "tool_arguments" : undefined;
|
|
28
|
+
if (!streamKind)
|
|
29
|
+
return undefined;
|
|
30
|
+
const identity = {
|
|
31
|
+
turn: data.turn,
|
|
32
|
+
step: data.step,
|
|
33
|
+
attempt,
|
|
34
|
+
blockIndex: chunk.index,
|
|
35
|
+
blockStartSeq: event.seq,
|
|
36
|
+
streamKind,
|
|
37
|
+
};
|
|
38
|
+
this.openBlocks.set(key, identity);
|
|
39
|
+
return identity;
|
|
40
|
+
}
|
|
41
|
+
const identity = this.openBlocks.get(key);
|
|
42
|
+
if (chunk.type === "block-end")
|
|
43
|
+
this.openBlocks.delete(key);
|
|
44
|
+
return identity;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
/** Locate the selected chunk and its request attempt before projecting any delta text. */
|
|
48
|
+
export async function locateChunkDrillTarget(source, filter, deltaField) {
|
|
49
|
+
let target;
|
|
50
|
+
const requestAttempts = new IncrementalRequestAttemptTracker();
|
|
51
|
+
const chunkStreams = new IncrementalChunkStreamTracker();
|
|
52
|
+
await scanCanonicalTrajectory(source, (event) => {
|
|
53
|
+
const requestAttempt = requestAttempts.accept(event);
|
|
54
|
+
const data = event.data;
|
|
55
|
+
const attempt = requestAttempt?.attempt
|
|
56
|
+
?? (Number.isSafeInteger(data.turn) && Number.isSafeInteger(data.step)
|
|
57
|
+
? requestAttempts.current(data.turn, data.step).attempt
|
|
58
|
+
: 0);
|
|
59
|
+
const stream = chunkStreams.accept(event, attempt);
|
|
60
|
+
if (event.seq !== filter.seq_start || (filter.types && !filter.types.includes(event.type)))
|
|
61
|
+
return;
|
|
62
|
+
if (event.type !== "assistant/chunk" || !Number.isSafeInteger(data.turn) || !Number.isSafeInteger(data.step)) {
|
|
63
|
+
throw new HitchError(`trajectory event ${event.seq} is not an assistant chunk`, { code: "trajectory_field_not_found", exitCode: 3 });
|
|
64
|
+
}
|
|
65
|
+
if (!stream || !fieldMatchesStream(deltaField, stream.streamKind)) {
|
|
66
|
+
throw new HitchError(`trajectory event ${event.seq} does not identify the requested chunk stream`, {
|
|
67
|
+
code: "trajectory_field_not_found",
|
|
68
|
+
exitCode: 3,
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
target = {
|
|
72
|
+
...stream,
|
|
73
|
+
firstSeq: event.seq,
|
|
74
|
+
field: filter.field,
|
|
75
|
+
deltaField,
|
|
76
|
+
};
|
|
77
|
+
});
|
|
78
|
+
return target;
|
|
79
|
+
}
|
|
80
|
+
export function sameChunkStream(left, right) {
|
|
81
|
+
return left.turn === right.turn && left.step === right.step && left.attempt === right.attempt
|
|
82
|
+
&& left.blockIndex === right.blockIndex && left.blockStartSeq === right.blockStartSeq
|
|
83
|
+
&& left.streamKind === right.streamKind;
|
|
84
|
+
}
|
|
85
|
+
function fieldMatchesStream(field, kind) {
|
|
86
|
+
if (field === "data.chunk.text")
|
|
87
|
+
return kind === "text" || kind === "reasoning";
|
|
88
|
+
if (field === "data.chunk.argumentsDelta")
|
|
89
|
+
return kind === "tool_arguments";
|
|
90
|
+
return true;
|
|
91
|
+
}
|
|
92
|
+
function streamKey(turn, step, attempt, index) {
|
|
93
|
+
return `${turn}:${step}:${attempt}:${index}`;
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=events-chunk-drill.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"events-chunk-drill.js","sourceRoot":"","sources":["../../../src/trajectories/events-chunk-drill.ts"],"names":[],"mappings":"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"}
|