agent-hitch 0.1.1 → 0.2.1
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 +235 -132
- package/README.zh-CN.md +335 -0
- package/dist/bin/hitch.js +9 -0
- package/dist/bin/hitch.js.map +1 -0
- package/dist/scripts/check-architecture.js +159 -0
- package/dist/scripts/check-architecture.js.map +1 -0
- package/dist/scripts/check-release.js +25 -0
- package/dist/scripts/check-release.js.map +1 -0
- package/dist/scripts/check-syntax.js +32 -0
- package/dist/scripts/check-syntax.js.map +1 -0
- package/dist/src/adapters/catalog.js +55 -0
- package/dist/src/adapters/catalog.js.map +1 -0
- package/dist/src/adapters/contract.js +2 -0
- package/dist/src/adapters/contract.js.map +1 -0
- package/dist/src/adapters/discovery.js +22 -0
- package/dist/src/adapters/discovery.js.map +1 -0
- package/dist/src/adapters/index.js +3 -0
- package/dist/src/adapters/index.js.map +1 -0
- package/dist/src/adapters/providers/claude.js +69 -0
- package/dist/src/adapters/providers/claude.js.map +1 -0
- package/dist/src/adapters/providers/codex.js +74 -0
- package/dist/src/adapters/providers/codex.js.map +1 -0
- package/dist/src/adapters/providers/deepseek.js +51 -0
- package/dist/src/adapters/providers/deepseek.js.map +1 -0
- package/dist/src/adapters/providers/opencode.js +73 -0
- package/dist/src/adapters/providers/opencode.js.map +1 -0
- package/dist/src/adapters/providers/pi.js +82 -0
- package/dist/src/adapters/providers/pi.js.map +1 -0
- package/dist/src/adapters/providers/shared.js +82 -0
- package/dist/src/adapters/providers/shared.js.map +1 -0
- package/dist/src/artifacts/index.js +3 -0
- package/dist/src/artifacts/index.js.map +1 -0
- package/dist/src/artifacts/integrity.js +188 -0
- package/dist/src/artifacts/integrity.js.map +1 -0
- package/dist/src/artifacts/preparer.js +379 -0
- package/dist/src/artifacts/preparer.js.map +1 -0
- package/dist/src/artifacts/store.js +87 -0
- package/dist/src/artifacts/store.js.map +1 -0
- package/dist/src/artifacts/types.js +2 -0
- package/dist/src/artifacts/types.js.map +1 -0
- package/dist/src/backends/contract.js +2 -0
- package/dist/src/backends/contract.js.map +1 -0
- package/dist/src/backends/harbor/backend.js +305 -0
- package/dist/src/backends/harbor/backend.js.map +1 -0
- package/dist/src/backends/harbor/index.js +4 -0
- package/dist/src/backends/harbor/index.js.map +1 -0
- package/dist/src/backends/harbor/local-git-transport.js +447 -0
- package/dist/src/backends/harbor/local-git-transport.js.map +1 -0
- package/dist/src/backends/harbor/tools.js +314 -0
- package/dist/src/backends/harbor/tools.js.map +1 -0
- package/dist/src/backends/index.js +4 -0
- package/dist/src/backends/index.js.map +1 -0
- package/dist/src/cli/arguments.js +123 -0
- package/dist/src/cli/arguments.js.map +1 -0
- package/dist/src/cli/commands/compare.js +55 -0
- package/dist/src/cli/commands/compare.js.map +1 -0
- package/dist/src/cli/commands/daemon.js +106 -0
- package/dist/src/cli/commands/daemon.js.map +1 -0
- package/dist/src/cli/commands/eval.js +126 -0
- package/dist/src/cli/commands/eval.js.map +1 -0
- package/dist/src/cli/commands/feedback.js +84 -0
- package/dist/src/cli/commands/feedback.js.map +1 -0
- package/dist/src/cli/commands/inspect.js +20 -0
- package/dist/src/cli/commands/inspect.js.map +1 -0
- package/dist/src/cli/commands/list.js +17 -0
- package/dist/src/cli/commands/list.js.map +1 -0
- package/dist/src/cli/commands/prepare.js +21 -0
- package/dist/src/cli/commands/prepare.js.map +1 -0
- package/dist/src/cli/commands/resolve.js +17 -0
- package/dist/src/cli/commands/resolve.js.map +1 -0
- package/dist/src/cli/commands/run.js +83 -0
- package/dist/src/cli/commands/run.js.map +1 -0
- package/dist/src/cli/commands/runs.js +45 -0
- package/dist/src/cli/commands/runs.js.map +1 -0
- package/dist/src/cli/commands/trajectory.js +31 -0
- package/dist/src/cli/commands/trajectory.js.map +1 -0
- package/dist/src/cli/commands/workspace.js +44 -0
- package/dist/src/cli/commands/workspace.js.map +1 -0
- package/dist/src/cli/index.js +2 -0
- package/dist/src/cli/index.js.map +1 -0
- package/dist/src/cli/main.js +48 -0
- package/dist/src/cli/main.js.map +1 -0
- package/dist/src/cli/output.js +96 -0
- package/dist/src/cli/output.js.map +1 -0
- package/dist/src/controller-runtime/hash.js +353 -0
- package/dist/src/controller-runtime/hash.js.map +1 -0
- package/dist/src/controller-runtime/index.js +3 -0
- package/dist/src/controller-runtime/index.js.map +1 -0
- package/dist/src/controller-runtime/store.js +318 -0
- package/dist/src/controller-runtime/store.js.map +1 -0
- package/dist/src/daemon/auth.js +108 -0
- package/dist/src/daemon/auth.js.map +1 -0
- package/dist/src/daemon/client.js +76 -0
- package/dist/src/daemon/client.js.map +1 -0
- package/dist/src/daemon/index.js +5 -0
- package/dist/src/daemon/index.js.map +1 -0
- package/dist/src/daemon/launcher.js +24 -0
- package/dist/src/daemon/launcher.js.map +1 -0
- package/dist/src/daemon/scheduler.js +161 -0
- package/dist/src/daemon/scheduler.js.map +1 -0
- package/dist/src/daemon/server.js +316 -0
- package/dist/src/daemon/server.js.map +1 -0
- package/dist/src/domain/artifacts.js +2 -0
- package/dist/src/domain/artifacts.js.map +1 -0
- package/dist/src/domain/controller-runtime.js +2 -0
- package/dist/src/domain/controller-runtime.js.map +1 -0
- package/dist/src/domain/eval-records.js +2 -0
- package/dist/src/domain/eval-records.js.map +1 -0
- package/dist/src/domain/evals.js +2 -0
- package/dist/src/domain/evals.js.map +1 -0
- package/dist/src/domain/feedback.js +2 -0
- package/dist/src/domain/feedback.js.map +1 -0
- package/dist/src/domain/ids.js +10 -0
- package/dist/src/domain/ids.js.map +1 -0
- package/dist/src/domain/index.js +11 -0
- package/dist/src/domain/index.js.map +1 -0
- package/dist/src/domain/revisions.js +2 -0
- package/dist/src/domain/revisions.js.map +1 -0
- package/dist/src/domain/runs.js +3 -0
- package/dist/src/domain/runs.js.map +1 -0
- package/dist/src/domain/trajectories.js +2 -0
- package/dist/src/domain/trajectories.js.map +1 -0
- package/dist/src/domain/validation.js +429 -0
- package/dist/src/domain/validation.js.map +1 -0
- package/dist/src/domain/workspaces.js +2 -0
- package/dist/src/domain/workspaces.js.map +1 -0
- package/dist/src/evals/events.js +67 -0
- package/dist/src/evals/events.js.map +1 -0
- package/dist/src/evals/index.js +5 -0
- package/dist/src/evals/index.js.map +1 -0
- package/dist/src/evals/records.js +55 -0
- package/dist/src/evals/records.js.map +1 -0
- package/dist/src/evals/request.js +109 -0
- package/dist/src/evals/request.js.map +1 -0
- package/dist/src/evals/service.js +227 -0
- package/dist/src/evals/service.js.map +1 -0
- package/dist/src/evals/trial-import.js +394 -0
- package/dist/src/evals/trial-import.js.map +1 -0
- package/dist/src/feedback/index.js +2 -0
- package/dist/src/feedback/index.js.map +1 -0
- package/dist/src/feedback/service.js +314 -0
- package/dist/src/feedback/service.js.map +1 -0
- package/dist/src/foundation/config.js +54 -0
- package/dist/src/foundation/config.js.map +1 -0
- package/dist/src/foundation/errors.js +14 -0
- package/dist/src/foundation/errors.js.map +1 -0
- package/dist/src/foundation/executable.js +135 -0
- package/dist/src/foundation/executable.js.map +1 -0
- package/dist/src/foundation/fs.js +45 -0
- package/dist/src/foundation/fs.js.map +1 -0
- package/dist/src/foundation/hash.js +24 -0
- package/dist/src/foundation/hash.js.map +1 -0
- package/dist/src/foundation/index.js +11 -0
- package/dist/src/foundation/index.js.map +1 -0
- package/dist/src/foundation/line-stream.js +20 -0
- package/dist/src/foundation/line-stream.js.map +1 -0
- package/dist/src/foundation/locks.js +114 -0
- package/dist/src/foundation/locks.js.map +1 -0
- package/dist/src/foundation/package-root.js +41 -0
- package/dist/src/foundation/package-root.js.map +1 -0
- package/dist/src/foundation/process.js +50 -0
- package/dist/src/foundation/process.js.map +1 -0
- package/dist/src/revisions/index.js +4 -0
- package/dist/src/revisions/index.js.map +1 -0
- package/dist/src/revisions/reference.js +97 -0
- package/dist/src/revisions/reference.js.map +1 -0
- package/dist/src/revisions/resolver.js +25 -0
- package/dist/src/revisions/resolver.js.map +1 -0
- package/dist/src/revisions/sources/git.js +180 -0
- package/dist/src/revisions/sources/git.js.map +1 -0
- package/dist/src/revisions/sources/installed.js +45 -0
- package/dist/src/revisions/sources/installed.js.map +1 -0
- package/dist/src/revisions/sources/npm.js +97 -0
- package/dist/src/revisions/sources/npm.js.map +1 -0
- package/dist/src/runs/compare.js +132 -0
- package/dist/src/runs/compare.js.map +1 -0
- package/dist/src/runs/events.js +79 -0
- package/dist/src/runs/events.js.map +1 -0
- package/dist/src/runs/executor.js +480 -0
- package/dist/src/runs/executor.js.map +1 -0
- package/dist/src/runs/finalizer.js +22 -0
- package/dist/src/runs/finalizer.js.map +1 -0
- package/dist/src/runs/identity.js +35 -0
- package/dist/src/runs/identity.js.map +1 -0
- package/dist/src/runs/index.js +11 -0
- package/dist/src/runs/index.js.map +1 -0
- package/dist/src/runs/manifest.js +70 -0
- package/dist/src/runs/manifest.js.map +1 -0
- package/dist/src/runs/outcome.js +49 -0
- package/dist/src/runs/outcome.js.map +1 -0
- package/dist/src/runs/query.js +104 -0
- package/dist/src/runs/query.js.map +1 -0
- package/dist/src/runs/queued.js +54 -0
- package/dist/src/runs/queued.js.map +1 -0
- package/dist/src/runs/records.js +288 -0
- package/dist/src/runs/records.js.map +1 -0
- package/dist/src/runs/request.js +169 -0
- package/dist/src/runs/request.js.map +1 -0
- package/dist/src/trajectories/contract.js +17 -0
- package/dist/src/trajectories/contract.js.map +1 -0
- package/dist/src/trajectories/format.js +127 -0
- package/dist/src/trajectories/format.js.map +1 -0
- package/dist/src/trajectories/index.js +7 -0
- package/dist/src/trajectories/index.js.map +1 -0
- package/dist/src/trajectories/projector.js +385 -0
- package/dist/src/trajectories/projector.js.map +1 -0
- package/dist/src/trajectories/provider-capture.js +133 -0
- package/dist/src/trajectories/provider-capture.js.map +1 -0
- package/dist/src/trajectories/providers/deepseek.js +179 -0
- package/dist/src/trajectories/providers/deepseek.js.map +1 -0
- package/dist/src/trajectories/store.js +421 -0
- package/dist/src/trajectories/store.js.map +1 -0
- package/dist/src/workspaces/copy.js +142 -0
- package/dist/src/workspaces/copy.js.map +1 -0
- package/dist/src/workspaces/digest.js +47 -0
- package/dist/src/workspaces/digest.js.map +1 -0
- package/dist/src/workspaces/git.js +164 -0
- package/dist/src/workspaces/git.js.map +1 -0
- package/dist/src/workspaces/index.js +6 -0
- package/dist/src/workspaces/index.js.map +1 -0
- package/dist/src/workspaces/lifecycle.js +313 -0
- package/dist/src/workspaces/lifecycle.js.map +1 -0
- package/dist/src/workspaces/planner.js +80 -0
- package/dist/src/workspaces/planner.js.map +1 -0
- package/dist/src/workspaces/store.js +25 -0
- package/dist/src/workspaces/store.js.map +1 -0
- package/dist/src/workspaces/types.js +4 -0
- package/dist/src/workspaces/types.js.map +1 -0
- package/dist/src/workspaces/utils.js +56 -0
- package/dist/src/workspaces/utils.js.map +1 -0
- package/docs/schemas/controller-runtime-manifest.schema.json +57 -0
- package/docs/schemas/controller-runtime-ref.schema.json +16 -0
- package/docs/schemas/eval-request.schema.json +2 -0
- package/docs/schemas/eval-result.schema.json +36 -1
- package/docs/schemas/local-git-transport-manifest.schema.json +34 -0
- package/docs/schemas/message-feedback.schema.json +37 -0
- package/docs/schemas/result.schema.json +9 -0
- package/docs/schemas/run-context.schema.json +39 -0
- package/docs/schemas/run-manifest.schema.json +81 -0
- package/docs/schemas/run-request.schema.json +16 -1
- package/docs/schemas/trajectory-ref.schema.json +73 -0
- package/integrations/harbor/hitch_harbor_agent.py +551 -5
- package/package.json +37 -11
- package/bin/hitch.js +0 -9
- package/src/adapters.js +0 -435
- package/src/artifacts.js +0 -949
- package/src/cli.js +0 -505
- package/src/config.js +0 -51
- package/src/daemon.js +0 -416
- package/src/engine.js +0 -400
- package/src/errors.js +0 -12
- package/src/eval-tools.js +0 -334
- package/src/evals.js +0 -276
- package/src/events.js +0 -69
- package/src/fs.js +0 -43
- package/src/harbor-backend.js +0 -285
- package/src/harness-reference.js +0 -78
- package/src/line-stream.js +0 -17
- package/src/locks.js +0 -33
- package/src/process.js +0 -49
- package/src/registry.js +0 -84
- package/src/scheduler.js +0 -156
- package/src/workspaces.js +0 -893
|
@@ -0,0 +1,385 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Projector that turns normalized Hitch adapter events (and plain-text output
|
|
3
|
+
* for `minimal` fidelity) into a canonical DSH-compatible trajectory
|
|
4
|
+
* (spec §5.4, §5.5). It owns the turn/step bracket state machine and the
|
|
5
|
+
* tool-call pairing invariant.
|
|
6
|
+
*/
|
|
7
|
+
import { randomUUID } from "node:crypto";
|
|
8
|
+
const EVENT_TYPE_KEYS = new Set([
|
|
9
|
+
"turn/start", "turn/end", "step/start", "step/end",
|
|
10
|
+
"user/message", "assistant/chunk", "assistant/message",
|
|
11
|
+
"tool/call", "tool/result",
|
|
12
|
+
]);
|
|
13
|
+
export class TrajectoryProjector {
|
|
14
|
+
header;
|
|
15
|
+
events = [];
|
|
16
|
+
fidelity;
|
|
17
|
+
prompt;
|
|
18
|
+
modelSource;
|
|
19
|
+
seq = 0;
|
|
20
|
+
// DSH's current persistence format numbers turns from one. A zero turn is
|
|
21
|
+
// reserved for an older pre-react-loop envelope and is rejected on load.
|
|
22
|
+
turn = 1;
|
|
23
|
+
step = 1;
|
|
24
|
+
stepOpen = false;
|
|
25
|
+
promptRecorded = false;
|
|
26
|
+
requestHeaderRecorded = false;
|
|
27
|
+
turnOpen = false;
|
|
28
|
+
assistantOpen = false;
|
|
29
|
+
assistantText = "";
|
|
30
|
+
assistantUsage;
|
|
31
|
+
lastAssistantEvent;
|
|
32
|
+
openCalls = new Map();
|
|
33
|
+
finalOutput = "";
|
|
34
|
+
providerSessionId;
|
|
35
|
+
finalized = false;
|
|
36
|
+
constructor(options) {
|
|
37
|
+
this.fidelity = options.fidelity;
|
|
38
|
+
this.prompt = options.prompt;
|
|
39
|
+
this.modelSource = parseModelSource(options.model);
|
|
40
|
+
this.header = {
|
|
41
|
+
type: "session",
|
|
42
|
+
version: 0,
|
|
43
|
+
id: options.runId,
|
|
44
|
+
createdAt: Date.now(),
|
|
45
|
+
cwd: options.cwd,
|
|
46
|
+
delegationDepth: 0,
|
|
47
|
+
...(options.agentPreset ? { agentPreset: options.agentPreset } : {}),
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
get sessionId() {
|
|
51
|
+
return this.header.id;
|
|
52
|
+
}
|
|
53
|
+
get sessionHeader() {
|
|
54
|
+
return this.header;
|
|
55
|
+
}
|
|
56
|
+
get eventCount() {
|
|
57
|
+
return this.events.length;
|
|
58
|
+
}
|
|
59
|
+
/** Feed one normalized Hitch event into the projector. */
|
|
60
|
+
feed(event) {
|
|
61
|
+
if (this.finalized)
|
|
62
|
+
throw new Error("cannot feed a finalized trajectory");
|
|
63
|
+
switch (event.type) {
|
|
64
|
+
case "session.created":
|
|
65
|
+
this.providerSessionId ||= event.session_id;
|
|
66
|
+
this.ensureSessionOpen();
|
|
67
|
+
break;
|
|
68
|
+
case "message.delta":
|
|
69
|
+
this.advanceAfterCompletedStep();
|
|
70
|
+
this.ensureStepOpen();
|
|
71
|
+
this.assistantOpen = true;
|
|
72
|
+
this.assistantText += event.text;
|
|
73
|
+
break;
|
|
74
|
+
case "message.completed":
|
|
75
|
+
this.advanceAfterCompletedStep();
|
|
76
|
+
this.ensureStepOpen();
|
|
77
|
+
this.assistantOpen = true;
|
|
78
|
+
// A completed message is the authoritative final text for the step:
|
|
79
|
+
// it replaces any deltas accumulated so far (the original engine
|
|
80
|
+
// overwrote `finalMessage` on `message.completed`).
|
|
81
|
+
this.assistantText = event.text;
|
|
82
|
+
this.closeAssistantMessage();
|
|
83
|
+
break;
|
|
84
|
+
case "tool.started":
|
|
85
|
+
this.ensureStepOpen();
|
|
86
|
+
this.openCalls.set(event.call_id, { callId: event.call_id, name: event.name });
|
|
87
|
+
this.append({
|
|
88
|
+
type: "tool/call",
|
|
89
|
+
data: {
|
|
90
|
+
turn: this.turn,
|
|
91
|
+
step: this.step,
|
|
92
|
+
callId: event.call_id,
|
|
93
|
+
name: event.name,
|
|
94
|
+
arguments: event.input === undefined ? "{}" : JSON.stringify(event.input),
|
|
95
|
+
},
|
|
96
|
+
});
|
|
97
|
+
break;
|
|
98
|
+
case "tool.completed": {
|
|
99
|
+
const open = this.openCalls.get(event.call_id);
|
|
100
|
+
if (!open) {
|
|
101
|
+
// A result without a recorded call cannot be paired; record it as a
|
|
102
|
+
// namespaced informational event rather than fabricating a call.
|
|
103
|
+
this.append({
|
|
104
|
+
type: "hitch/unpaired-tool-result",
|
|
105
|
+
data: { call_id: event.call_id, status: event.status, output: event.output ?? null },
|
|
106
|
+
ignorable: true,
|
|
107
|
+
});
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
this.openCalls.delete(event.call_id);
|
|
111
|
+
const isError = event.status !== "succeeded";
|
|
112
|
+
this.append({
|
|
113
|
+
type: "tool/result",
|
|
114
|
+
data: {
|
|
115
|
+
turn: this.turn,
|
|
116
|
+
step: this.step,
|
|
117
|
+
message: {
|
|
118
|
+
id: randomUUID(),
|
|
119
|
+
role: "user",
|
|
120
|
+
content: [{
|
|
121
|
+
type: "tool-result",
|
|
122
|
+
toolCallId: event.call_id,
|
|
123
|
+
content: [{ type: "text", text: toolResultText(event.output) }],
|
|
124
|
+
isError,
|
|
125
|
+
}],
|
|
126
|
+
source: { kind: "tool", callId: event.call_id },
|
|
127
|
+
},
|
|
128
|
+
...(isError ? { error: { name: open.name, code: "tool_failed" } } : {}),
|
|
129
|
+
},
|
|
130
|
+
surfaceOp: "append",
|
|
131
|
+
});
|
|
132
|
+
break;
|
|
133
|
+
}
|
|
134
|
+
case "usage.updated":
|
|
135
|
+
const usage = normalizeUsage(event.usage);
|
|
136
|
+
if (!usage)
|
|
137
|
+
break;
|
|
138
|
+
if (this.assistantOpen) {
|
|
139
|
+
this.assistantUsage = usage;
|
|
140
|
+
}
|
|
141
|
+
else if (this.lastAssistantEvent && this.lastAssistantEvent.type === "assistant/message") {
|
|
142
|
+
// Some adapters (Pi, OpenCode) emit usage after `message.completed`
|
|
143
|
+
// closed the assistant message. Attach it to the just-closed
|
|
144
|
+
// assistant/message so the canonical record carries the accounting.
|
|
145
|
+
const data = this.lastAssistantEvent.data;
|
|
146
|
+
if (!("usage" in data))
|
|
147
|
+
data.usage = usage;
|
|
148
|
+
}
|
|
149
|
+
break;
|
|
150
|
+
case "diagnostic":
|
|
151
|
+
this.append({
|
|
152
|
+
type: "hitch/diagnostic",
|
|
153
|
+
data: { level: event.level, message: event.message },
|
|
154
|
+
ignorable: true,
|
|
155
|
+
});
|
|
156
|
+
break;
|
|
157
|
+
case "provider.event":
|
|
158
|
+
this.append({
|
|
159
|
+
type: "hitch/provider-event",
|
|
160
|
+
data: { provider_type: event.provider_type, native: event.native },
|
|
161
|
+
ignorable: true,
|
|
162
|
+
});
|
|
163
|
+
break;
|
|
164
|
+
default:
|
|
165
|
+
this.append({
|
|
166
|
+
type: "hitch/unknown-event",
|
|
167
|
+
data: { native: event },
|
|
168
|
+
ignorable: true,
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
/** Feed raw plain-text output (minimal fidelity). */
|
|
173
|
+
feedText(text) {
|
|
174
|
+
this.ensureStepOpen();
|
|
175
|
+
this.assistantOpen = true;
|
|
176
|
+
this.assistantText += text;
|
|
177
|
+
}
|
|
178
|
+
/**
|
|
179
|
+
* Close the trajectory. `status` selects the terminal turn reason.
|
|
180
|
+
* Returns the finalized projection.
|
|
181
|
+
*/
|
|
182
|
+
finalize(status) {
|
|
183
|
+
if (this.finalized)
|
|
184
|
+
return this.project();
|
|
185
|
+
this.finalized = true;
|
|
186
|
+
// A timeout/cancellation/crash with no recorded work still gets a valid
|
|
187
|
+
// terminal boundary (spec §5.4): open and close the session so the log is
|
|
188
|
+
// structurally complete even when nothing was emitted.
|
|
189
|
+
if (this.events.length === 0 && status !== "succeeded")
|
|
190
|
+
this.ensureSessionOpen();
|
|
191
|
+
if (this.assistantOpen && this.assistantText)
|
|
192
|
+
this.closeAssistantMessage(status !== "succeeded");
|
|
193
|
+
if (this.stepOpen) {
|
|
194
|
+
// A successful run may not end with open tool calls: the harness claimed
|
|
195
|
+
// to finish cleanly, so an unpaired call is evidence of a broken
|
|
196
|
+
// trajectory, not an interruption. Only failed/timed_out/cancelled runs
|
|
197
|
+
// may synthesize unknown-outcome results for interrupted calls (spec
|
|
198
|
+
// §5.4: a completed run has no open call).
|
|
199
|
+
if (status === "succeeded" && this.openCalls.size > 0) {
|
|
200
|
+
const open = [...this.openCalls.values()].map((call) => call.callId).join(", ");
|
|
201
|
+
throw new Error(`trajectory finalization failed: run succeeded with open tool calls: ${open}`);
|
|
202
|
+
}
|
|
203
|
+
for (const open of [...this.openCalls.values()]) {
|
|
204
|
+
this.openCalls.delete(open.callId);
|
|
205
|
+
this.append({
|
|
206
|
+
type: "tool/result",
|
|
207
|
+
data: {
|
|
208
|
+
turn: this.turn,
|
|
209
|
+
step: this.step,
|
|
210
|
+
message: {
|
|
211
|
+
id: randomUUID(),
|
|
212
|
+
role: "user",
|
|
213
|
+
content: [{
|
|
214
|
+
type: "tool-result",
|
|
215
|
+
toolCallId: open.callId,
|
|
216
|
+
content: [{ type: "text", text: `tool call interrupted: ${open.name} outcome unknown` }],
|
|
217
|
+
isError: true,
|
|
218
|
+
}],
|
|
219
|
+
source: { kind: "tool", callId: open.callId },
|
|
220
|
+
},
|
|
221
|
+
error: { name: open.name, code: "TOOL_OUTCOME_UNKNOWN" },
|
|
222
|
+
},
|
|
223
|
+
surfaceOp: "append",
|
|
224
|
+
});
|
|
225
|
+
}
|
|
226
|
+
this.append({ type: "step/end", data: { turn: this.turn, step: this.step } });
|
|
227
|
+
this.stepOpen = false;
|
|
228
|
+
}
|
|
229
|
+
if (this.turnOpen) {
|
|
230
|
+
this.append({
|
|
231
|
+
type: "turn/end",
|
|
232
|
+
data: { turn: this.turn, reason: terminalReason(status) },
|
|
233
|
+
});
|
|
234
|
+
this.turnOpen = false;
|
|
235
|
+
}
|
|
236
|
+
return this.project();
|
|
237
|
+
}
|
|
238
|
+
ensureSessionOpen() {
|
|
239
|
+
if (this.turnOpen)
|
|
240
|
+
return;
|
|
241
|
+
this.turnOpen = true;
|
|
242
|
+
this.append({
|
|
243
|
+
type: "turn/start",
|
|
244
|
+
data: { turn: this.turn },
|
|
245
|
+
});
|
|
246
|
+
}
|
|
247
|
+
appendPrompt() {
|
|
248
|
+
if (this.promptRecorded)
|
|
249
|
+
return;
|
|
250
|
+
this.append({
|
|
251
|
+
type: "user/message",
|
|
252
|
+
data: {
|
|
253
|
+
id: randomUUID(),
|
|
254
|
+
role: "user",
|
|
255
|
+
content: [{ type: "text", text: this.prompt }],
|
|
256
|
+
source: { kind: "user" },
|
|
257
|
+
},
|
|
258
|
+
surfaceOp: "append",
|
|
259
|
+
});
|
|
260
|
+
this.promptRecorded = true;
|
|
261
|
+
}
|
|
262
|
+
ensureStepOpen() {
|
|
263
|
+
this.ensureSessionOpen();
|
|
264
|
+
if (this.stepOpen)
|
|
265
|
+
return;
|
|
266
|
+
this.stepOpen = true;
|
|
267
|
+
this.append({ type: "step/start", data: { turn: this.turn, step: this.step } });
|
|
268
|
+
this.appendPrompt();
|
|
269
|
+
if (!this.requestHeaderRecorded) {
|
|
270
|
+
this.append({
|
|
271
|
+
type: "request/header",
|
|
272
|
+
data: {
|
|
273
|
+
header: { config: { ...this.modelSource } },
|
|
274
|
+
reason: "initial",
|
|
275
|
+
},
|
|
276
|
+
});
|
|
277
|
+
this.requestHeaderRecorded = true;
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
/** A new model reply after a completed reply starts the next DSH react step. */
|
|
281
|
+
advanceAfterCompletedStep() {
|
|
282
|
+
if (!this.stepOpen || this.assistantOpen || !this.lastAssistantEvent || this.openCalls.size > 0)
|
|
283
|
+
return;
|
|
284
|
+
this.append({ type: "step/end", data: { turn: this.turn, step: this.step } });
|
|
285
|
+
this.step += 1;
|
|
286
|
+
this.stepOpen = false;
|
|
287
|
+
this.lastAssistantEvent = undefined;
|
|
288
|
+
}
|
|
289
|
+
closeAssistantMessage(interrupted = false) {
|
|
290
|
+
if (!this.assistantOpen)
|
|
291
|
+
return;
|
|
292
|
+
const text = this.assistantText;
|
|
293
|
+
if (text)
|
|
294
|
+
this.finalOutput = text;
|
|
295
|
+
this.lastAssistantEvent = this.append({
|
|
296
|
+
type: "assistant/message",
|
|
297
|
+
data: {
|
|
298
|
+
turn: this.turn,
|
|
299
|
+
step: this.step,
|
|
300
|
+
message: {
|
|
301
|
+
id: randomUUID(),
|
|
302
|
+
role: "assistant",
|
|
303
|
+
content: [{ type: "text", text }],
|
|
304
|
+
source: { kind: "model", ...this.modelSource },
|
|
305
|
+
},
|
|
306
|
+
...(this.assistantUsage ? { usage: this.assistantUsage } : {}),
|
|
307
|
+
...(interrupted ? { interrupted: true } : {}),
|
|
308
|
+
},
|
|
309
|
+
sourceEventSeqs: [],
|
|
310
|
+
surfaceOp: "append",
|
|
311
|
+
});
|
|
312
|
+
this.assistantOpen = false;
|
|
313
|
+
this.assistantText = "";
|
|
314
|
+
this.assistantUsage = undefined;
|
|
315
|
+
}
|
|
316
|
+
append(event) {
|
|
317
|
+
const framed = {
|
|
318
|
+
...event,
|
|
319
|
+
seq: this.seq,
|
|
320
|
+
time: Date.now(),
|
|
321
|
+
};
|
|
322
|
+
this.seq += 1;
|
|
323
|
+
this.events.push(framed);
|
|
324
|
+
return framed;
|
|
325
|
+
}
|
|
326
|
+
project() {
|
|
327
|
+
const result = {
|
|
328
|
+
header: { ...this.header },
|
|
329
|
+
events: [...this.events],
|
|
330
|
+
finalOutput: this.finalOutput,
|
|
331
|
+
fidelity: this.fidelity,
|
|
332
|
+
};
|
|
333
|
+
if (this.providerSessionId)
|
|
334
|
+
result.providerSessionId = this.providerSessionId;
|
|
335
|
+
return result;
|
|
336
|
+
}
|
|
337
|
+
}
|
|
338
|
+
function parseModelSource(model) {
|
|
339
|
+
const separator = model.indexOf("/");
|
|
340
|
+
if (separator > 0 && separator < model.length - 1) {
|
|
341
|
+
return { provider: model.slice(0, separator), model: model.slice(separator + 1) };
|
|
342
|
+
}
|
|
343
|
+
return { provider: "hitch", model: model || "unknown" };
|
|
344
|
+
}
|
|
345
|
+
/** Convert native harness accounting into the canonical DSH usage envelope. */
|
|
346
|
+
function normalizeUsage(usage) {
|
|
347
|
+
const cache = usage.cache && typeof usage.cache === "object" ? usage.cache : {};
|
|
348
|
+
const number = (...values) => {
|
|
349
|
+
for (const value of values)
|
|
350
|
+
if (typeof value === "number" && Number.isFinite(value))
|
|
351
|
+
return value;
|
|
352
|
+
return 0;
|
|
353
|
+
};
|
|
354
|
+
const input = number(usage.inputTokens, usage.uncachedInputTokens, usage.input_tokens, usage.input);
|
|
355
|
+
const output = number(usage.outputTokens, usage.output_tokens, usage.output);
|
|
356
|
+
const cacheRead = number(usage.cacheReadTokens, usage.cached_input_tokens, usage.cacheRead, cache.read);
|
|
357
|
+
const cacheWrite = number(usage.cacheWriteTokens, usage.cache_write_input_tokens, usage.cacheWrite, cache.write);
|
|
358
|
+
return { inputTokens: input, outputTokens: output, cacheReadTokens: cacheRead, cacheWriteTokens: cacheWrite };
|
|
359
|
+
}
|
|
360
|
+
function toolResultText(output) {
|
|
361
|
+
if (typeof output === "string")
|
|
362
|
+
return output;
|
|
363
|
+
if (output === undefined || output === null)
|
|
364
|
+
return "";
|
|
365
|
+
try {
|
|
366
|
+
return JSON.stringify(output);
|
|
367
|
+
}
|
|
368
|
+
catch {
|
|
369
|
+
return String(output);
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
function terminalReason(status) {
|
|
373
|
+
switch (status) {
|
|
374
|
+
case "succeeded":
|
|
375
|
+
return { kind: "completed" };
|
|
376
|
+
case "cancelled":
|
|
377
|
+
return { kind: "aborted", reason: { kind: "user" } };
|
|
378
|
+
case "timed_out":
|
|
379
|
+
return { kind: "aborted", reason: { kind: "hook", reason: "timeout" } };
|
|
380
|
+
case "failed":
|
|
381
|
+
return { kind: "error", error: { message: "agent process failed", code: "UNKNOWN" } };
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
export { EVENT_TYPE_KEYS };
|
|
385
|
+
//# sourceMappingURL=projector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projector.js","sourceRoot":"","sources":["../../../src/trajectories/projector.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { createWriteStream } from "node:fs";
|
|
3
|
+
import { readFile, stat } from "node:fs/promises";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { ensureDir } from "../foundation/index.js";
|
|
6
|
+
const SENSITIVE_FIELD = /(?:^|[_-])(?:api[_-]?key|authorization|token|secret|password|credential|cookie)(?:$|[_-])/i;
|
|
7
|
+
const SECRET_TEXT_RULES = [
|
|
8
|
+
{ id: "authorization-bearer-v1", pattern: /\bBearer\s+[A-Za-z0-9._~+\/-]{8,}/gi, replacement: "Bearer [REDACTED]" },
|
|
9
|
+
{ id: "provider-api-key-v1", pattern: /\b(?:sk|rk|pk)-[A-Za-z0-9_-]{12,}\b/g, replacement: "[REDACTED]" },
|
|
10
|
+
];
|
|
11
|
+
function increment(redactions, rule, count = 1) {
|
|
12
|
+
redactions.set(rule, (redactions.get(rule) || 0) + count);
|
|
13
|
+
}
|
|
14
|
+
export function redactProviderJSON(value) {
|
|
15
|
+
const redactions = new Map();
|
|
16
|
+
const visit = (current, key) => {
|
|
17
|
+
if (key && SENSITIVE_FIELD.test(key)) {
|
|
18
|
+
increment(redactions, "sensitive-field-v1");
|
|
19
|
+
return "[REDACTED]";
|
|
20
|
+
}
|
|
21
|
+
if (Array.isArray(current))
|
|
22
|
+
return current.map((entry) => visit(entry));
|
|
23
|
+
if (current && typeof current === "object") {
|
|
24
|
+
return Object.fromEntries(Object.entries(current).map(([entryKey, entry]) => [entryKey, visit(entry, entryKey)]));
|
|
25
|
+
}
|
|
26
|
+
if (typeof current === "string")
|
|
27
|
+
return redactProviderText(current, redactions);
|
|
28
|
+
return current;
|
|
29
|
+
};
|
|
30
|
+
return { value: visit(value), redactions };
|
|
31
|
+
}
|
|
32
|
+
export function redactProviderText(value, existing = new Map()) {
|
|
33
|
+
let output = value;
|
|
34
|
+
for (const rule of SECRET_TEXT_RULES) {
|
|
35
|
+
let count = 0;
|
|
36
|
+
output = output.replace(rule.pattern, () => {
|
|
37
|
+
count += 1;
|
|
38
|
+
return rule.replacement;
|
|
39
|
+
});
|
|
40
|
+
if (count > 0)
|
|
41
|
+
increment(existing, rule.id, count);
|
|
42
|
+
}
|
|
43
|
+
return output;
|
|
44
|
+
}
|
|
45
|
+
/** Append-only capture of provider output before canonical projection. */
|
|
46
|
+
export class ProviderCaptureWriter {
|
|
47
|
+
target;
|
|
48
|
+
relativePath;
|
|
49
|
+
structured;
|
|
50
|
+
stream;
|
|
51
|
+
pending = Promise.resolve();
|
|
52
|
+
closed = false;
|
|
53
|
+
counts = new Map();
|
|
54
|
+
streamError;
|
|
55
|
+
constructor(target, relativePath, structured, stream) {
|
|
56
|
+
this.target = target;
|
|
57
|
+
this.relativePath = relativePath;
|
|
58
|
+
this.structured = structured;
|
|
59
|
+
this.stream = stream;
|
|
60
|
+
stream.on("error", (error) => { this.streamError ||= error; });
|
|
61
|
+
}
|
|
62
|
+
static async open(options) {
|
|
63
|
+
const relativePath = options.structured
|
|
64
|
+
? "trajectory/provider/events.jsonl"
|
|
65
|
+
: "trajectory/provider/transcript.txt";
|
|
66
|
+
const target = path.join(options.runDirectory, ...relativePath.split("/"));
|
|
67
|
+
await ensureDir(path.dirname(target));
|
|
68
|
+
return new ProviderCaptureWriter(target, relativePath, options.structured, createWriteStream(target, { flags: "ax", mode: 0o600 }));
|
|
69
|
+
}
|
|
70
|
+
appendJSON(value) {
|
|
71
|
+
if (!this.structured)
|
|
72
|
+
throw new Error("provider capture is not in structured mode");
|
|
73
|
+
const redacted = redactProviderJSON(value);
|
|
74
|
+
this.merge(redacted.redactions);
|
|
75
|
+
this.enqueue(`${JSON.stringify(redacted.value)}\n`);
|
|
76
|
+
return redacted.value;
|
|
77
|
+
}
|
|
78
|
+
appendUnparsed(line) {
|
|
79
|
+
if (!this.structured)
|
|
80
|
+
return this.appendText(line);
|
|
81
|
+
const safe = redactProviderText(line, this.counts);
|
|
82
|
+
this.enqueue(`${JSON.stringify({ hitch_envelope: { kind: "unparsed_provider_line" }, provider_payload: { text: safe } })}\n`);
|
|
83
|
+
return safe;
|
|
84
|
+
}
|
|
85
|
+
appendText(line) {
|
|
86
|
+
if (this.structured)
|
|
87
|
+
throw new Error("provider capture is in structured mode");
|
|
88
|
+
const safe = redactProviderText(line, this.counts);
|
|
89
|
+
this.enqueue(`${safe}\n`);
|
|
90
|
+
return safe;
|
|
91
|
+
}
|
|
92
|
+
merge(redactions) {
|
|
93
|
+
for (const [rule, count] of redactions)
|
|
94
|
+
increment(this.counts, rule, count);
|
|
95
|
+
}
|
|
96
|
+
enqueue(chunk) {
|
|
97
|
+
if (this.closed)
|
|
98
|
+
throw new Error("provider capture writer is closed");
|
|
99
|
+
this.pending = this.pending.then(() => new Promise((resolve, reject) => {
|
|
100
|
+
this.stream.write(chunk, (error) => error ? reject(error) : resolve());
|
|
101
|
+
}));
|
|
102
|
+
}
|
|
103
|
+
async close() {
|
|
104
|
+
if (!this.closed) {
|
|
105
|
+
this.closed = true;
|
|
106
|
+
await this.pending;
|
|
107
|
+
await closeStream(this.stream);
|
|
108
|
+
}
|
|
109
|
+
if (this.streamError)
|
|
110
|
+
throw this.streamError;
|
|
111
|
+
const info = await stat(this.target);
|
|
112
|
+
const digest = createHash("sha256").update(await readFile(this.target)).digest("hex");
|
|
113
|
+
return {
|
|
114
|
+
file: {
|
|
115
|
+
role: this.structured ? "provider_events" : "provider_transcript",
|
|
116
|
+
path: this.relativePath,
|
|
117
|
+
media_type: this.structured ? "application/x-ndjson" : "text/plain; charset=utf-8",
|
|
118
|
+
sha256: `sha256:${digest}`,
|
|
119
|
+
bytes: info.size,
|
|
120
|
+
},
|
|
121
|
+
redactions: [...this.counts.entries()]
|
|
122
|
+
.sort(([left], [right]) => left.localeCompare(right))
|
|
123
|
+
.map(([rule_id, count]) => ({ rule_id, count })),
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
function closeStream(stream) {
|
|
128
|
+
return new Promise((resolve, reject) => {
|
|
129
|
+
stream.once("error", reject);
|
|
130
|
+
stream.end(resolve);
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
//# sourceMappingURL=provider-capture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-capture.js","sourceRoot":"","sources":["../../../src/trajectories/provider-capture.ts"],"names":[],"mappings":"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"}
|