agent-hitch 0.2.0 → 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 +16 -10
- package/README.zh-CN.md +13 -8
- package/dist/bin/hitch.js +1 -1
- package/dist/bin/hitch.js.map +1 -1
- package/dist/scripts/check-architecture.js +159 -0
- package/dist/scripts/check-architecture.js.map +1 -0
- package/dist/scripts/check-release.js +1 -1
- package/dist/scripts/check-release.js.map +1 -1
- 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/{harbor-backend.js → backends/harbor/backend.js} +39 -14
- 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/{eval-tools.js → backends/harbor/tools.js} +2 -6
- 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/index.js +3 -0
- package/dist/src/controller-runtime/index.js.map +1 -0
- package/dist/src/controller-runtime/store.js +2 -7
- package/dist/src/controller-runtime/store.js.map +1 -1
- 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/{scheduler.js → daemon/scheduler.js} +6 -7
- package/dist/src/daemon/scheduler.js.map +1 -0
- package/dist/src/{daemon.js → daemon/server.js} +10 -155
- 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/{types.js → ids.js} +1 -1
- 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/{validate.js → validation.js} +194 -5
- 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 +3 -4
- package/dist/src/feedback/service.js.map +1 -1
- package/dist/src/{config.js → foundation/config.js} +1 -0
- package/dist/src/foundation/config.js.map +1 -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.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.map +1 -0
- package/dist/src/foundation/locks.js +114 -0
- package/dist/src/foundation/locks.js.map +1 -0
- package/dist/src/{package-root.js → foundation/package-root.js} +3 -2
- package/dist/src/foundation/package-root.js.map +1 -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/{harness-reference.js → revisions/reference.js} +16 -2
- 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/{events.js → runs/events.js} +1 -2
- package/dist/src/runs/events.js.map +1 -0
- package/dist/src/{engine.js → runs/executor.js} +166 -151
- 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/format.js +1 -1
- package/dist/src/trajectories/format.js.map +1 -1
- package/dist/src/trajectories/index.js +7 -0
- package/dist/src/trajectories/index.js.map +1 -0
- package/dist/src/trajectories/projector.js +1 -1
- package/dist/src/trajectories/projector.js.map +1 -1
- 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 +148 -8
- package/dist/src/trajectories/store.js.map +1 -1
- 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/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/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 +66 -23
- package/integrations/harbor/hitch_harbor_agent.py +375 -1
- package/package.json +21 -3
- package/dist/src/adapters.js +0 -461
- package/dist/src/adapters.js.map +0 -1
- package/dist/src/artifacts.js +0 -1081
- package/dist/src/artifacts.js.map +0 -1
- package/dist/src/cli.js +0 -699
- package/dist/src/cli.js.map +0 -1
- package/dist/src/config.js.map +0 -1
- package/dist/src/daemon.js.map +0 -1
- package/dist/src/domain/types.js.map +0 -1
- package/dist/src/domain/validate.js.map +0 -1
- package/dist/src/engine.js.map +0 -1
- package/dist/src/errors.js.map +0 -1
- package/dist/src/eval-tools.js.map +0 -1
- package/dist/src/evals.js +0 -313
- package/dist/src/evals.js.map +0 -1
- package/dist/src/events.js.map +0 -1
- package/dist/src/fs.js.map +0 -1
- package/dist/src/harbor-backend.js.map +0 -1
- package/dist/src/harness-reference.js.map +0 -1
- package/dist/src/line-stream.js.map +0 -1
- package/dist/src/locks.js +0 -38
- package/dist/src/locks.js.map +0 -1
- package/dist/src/package-root.js.map +0 -1
- package/dist/src/process.js.map +0 -1
- package/dist/src/registry.js +0 -81
- package/dist/src/registry.js.map +0 -1
- package/dist/src/scheduler.js.map +0 -1
- package/dist/src/workspaces.js +0 -858
- package/dist/src/workspaces.js.map +0 -1
- /package/dist/src/{errors.js → foundation/errors.js} +0 -0
- /package/dist/src/{fs.js → foundation/fs.js} +0 -0
- /package/dist/src/{line-stream.js → foundation/line-stream.js} +0 -0
- /package/dist/src/{process.js → foundation/process.js} +0 -0
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import { readFileSync } from "node:fs";
|
|
2
|
+
import { readFile } from "node:fs/promises";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { DEFAULT_MAX_CONCURRENT, invalidInput, parseDuration, positiveInteger } from "../foundation/index.js";
|
|
5
|
+
import { WORKSPACE_MODES } from "../workspaces/index.js";
|
|
6
|
+
export async function parseRunRequest(args) {
|
|
7
|
+
const harness = takeOption(args, "--harness");
|
|
8
|
+
const agent = takeOption(args, "--agent");
|
|
9
|
+
const model = takeOption(args, "--model") || "";
|
|
10
|
+
const cwd = takeOption(args, "--cwd") || process.cwd();
|
|
11
|
+
const workspaceMode = takeOption(args, "--workspace-mode") || "shared";
|
|
12
|
+
const promptValue = takeOption(args, "--prompt");
|
|
13
|
+
const promptFile = takeOption(args, "--prompt-file");
|
|
14
|
+
const timeout = parseDuration(takeOption(args, "--timeout") || "0");
|
|
15
|
+
const agentArgs = takeRepeatedOption(args, "--agent-arg");
|
|
16
|
+
const contextFile = takeOption(args, "--context-file");
|
|
17
|
+
const parentFile = takeOption(args, "--parent-file");
|
|
18
|
+
const modelIdentityFile = takeOption(args, "--model-identity-file");
|
|
19
|
+
const protocolIdentityFile = takeOption(args, "--protocol-identity-file");
|
|
20
|
+
if (harness && agent)
|
|
21
|
+
throw invalidInput("use only one of --harness and the legacy --agent option");
|
|
22
|
+
if (!harness && !agent)
|
|
23
|
+
throw invalidInput("--harness is required");
|
|
24
|
+
if (!WORKSPACE_MODES.has(workspaceMode))
|
|
25
|
+
throw invalidInput(`--workspace-mode must be one of: ${[...WORKSPACE_MODES].join(", ")}`);
|
|
26
|
+
if (agent?.includes("@"))
|
|
27
|
+
throw invalidInput("--agent accepts only a harness name; use --harness for revision selection");
|
|
28
|
+
if (promptValue !== undefined && promptFile)
|
|
29
|
+
throw invalidInput("use only one of --prompt and --prompt-file");
|
|
30
|
+
let prompt = promptValue;
|
|
31
|
+
if (promptFile)
|
|
32
|
+
prompt = await readFile(path.resolve(promptFile), "utf8");
|
|
33
|
+
if (prompt === undefined && !process.stdin.isTTY)
|
|
34
|
+
prompt = readFileSync(0, "utf8");
|
|
35
|
+
if (!prompt)
|
|
36
|
+
throw invalidInput("provide --prompt, --prompt-file, or stdin");
|
|
37
|
+
const loadInputFile = async (file, label) => {
|
|
38
|
+
if (!file)
|
|
39
|
+
return undefined;
|
|
40
|
+
try {
|
|
41
|
+
return JSON.parse(await readFile(path.resolve(file), "utf8"));
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
throw invalidInput(`${label} is not readable JSON: ${error.message}`, { cause: error });
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
const context = await loadInputFile(contextFile, "--context-file");
|
|
48
|
+
const parent = await loadInputFile(parentFile, "--parent-file");
|
|
49
|
+
const modelIdentity = await loadInputFile(modelIdentityFile, "--model-identity-file");
|
|
50
|
+
const protocolIdentity = await loadInputFile(protocolIdentityFile, "--protocol-identity-file");
|
|
51
|
+
return {
|
|
52
|
+
harness_ref: harness || `${agent}@installed`,
|
|
53
|
+
model,
|
|
54
|
+
cwd,
|
|
55
|
+
workspace_mode: workspaceMode,
|
|
56
|
+
prompt,
|
|
57
|
+
timeout_ms: timeout,
|
|
58
|
+
agent_args: agentArgs,
|
|
59
|
+
...(context !== undefined ? { context } : {}),
|
|
60
|
+
...(parent !== undefined ? { parent } : {}),
|
|
61
|
+
...(modelIdentity !== undefined ? { model_identity: modelIdentity } : {}),
|
|
62
|
+
...(protocolIdentity !== undefined ? { protocol_identity: protocolIdentity } : {}),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
export function parseEvalRequest(args) {
|
|
66
|
+
const backend = takeOption(args, "--backend") || "harbor";
|
|
67
|
+
const dataset = takeOption(args, "--dataset");
|
|
68
|
+
const harness = takeOption(args, "--harness");
|
|
69
|
+
const model = takeOption(args, "--model") || "";
|
|
70
|
+
const attempts = positiveInteger(takeOption(args, "--attempts") || 1, "--attempts");
|
|
71
|
+
const maxConcurrent = positiveInteger(takeOption(args, "--max-concurrent") || DEFAULT_MAX_CONCURRENT, "--max-concurrent");
|
|
72
|
+
const timeoutValue = takeOption(args, "--timeout");
|
|
73
|
+
const setupTimeoutValue = takeOption(args, "--setup-timeout");
|
|
74
|
+
const agentArgs = takeRepeatedOption(args, "--agent-arg");
|
|
75
|
+
const passEnv = takeRepeatedOption(args, "--pass-env");
|
|
76
|
+
if (!dataset)
|
|
77
|
+
throw invalidInput("--dataset is required");
|
|
78
|
+
if (!harness)
|
|
79
|
+
throw invalidInput("--harness is required");
|
|
80
|
+
return {
|
|
81
|
+
backend,
|
|
82
|
+
dataset,
|
|
83
|
+
harness_ref: harness,
|
|
84
|
+
model,
|
|
85
|
+
attempts,
|
|
86
|
+
max_concurrent: maxConcurrent,
|
|
87
|
+
timeout_ms: timeoutValue === undefined ? undefined : parseDuration(timeoutValue),
|
|
88
|
+
setup_timeout_ms: setupTimeoutValue === undefined ? undefined : parseDuration(setupTimeoutValue),
|
|
89
|
+
agent_args: agentArgs,
|
|
90
|
+
pass_env: passEnv,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
export function takeOption(args, name) {
|
|
94
|
+
const index = args.indexOf(name);
|
|
95
|
+
if (index < 0)
|
|
96
|
+
return undefined;
|
|
97
|
+
if (index === args.length - 1)
|
|
98
|
+
throw invalidInput(`${name} requires a value`);
|
|
99
|
+
const [value] = args.splice(index + 1, 1);
|
|
100
|
+
args.splice(index, 1);
|
|
101
|
+
return value;
|
|
102
|
+
}
|
|
103
|
+
export function takeRepeatedOption(args, name) {
|
|
104
|
+
const values = [];
|
|
105
|
+
for (;;) {
|
|
106
|
+
const value = takeOption(args, name);
|
|
107
|
+
if (value === undefined)
|
|
108
|
+
return values;
|
|
109
|
+
values.push(value);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
export function takeFlag(args, name) {
|
|
113
|
+
const index = args.indexOf(name);
|
|
114
|
+
if (index < 0)
|
|
115
|
+
return false;
|
|
116
|
+
args.splice(index, 1);
|
|
117
|
+
return true;
|
|
118
|
+
}
|
|
119
|
+
export function assertNoArgs(args) {
|
|
120
|
+
if (args.length > 0)
|
|
121
|
+
throw invalidInput(`unexpected argument: ${args[0]}`);
|
|
122
|
+
}
|
|
123
|
+
//# sourceMappingURL=arguments.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"arguments.js","sourceRoot":"","sources":["../../../src/cli/arguments.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
export async function compareCommand(args, root) {
|
|
2
|
+
const dimension = args.shift();
|
|
3
|
+
if (dimension !== "model" && dimension !== "harness")
|
|
4
|
+
throw invalidInput("compare requires model or harness");
|
|
5
|
+
const json = takeFlag(args, "--json");
|
|
6
|
+
const referenceRunId = takeOption(args, "--reference-run");
|
|
7
|
+
const query = takeRunQuery(args);
|
|
8
|
+
assertNoArgs(args);
|
|
9
|
+
const comparison = await compareRuns({
|
|
10
|
+
root,
|
|
11
|
+
dimension: dimension,
|
|
12
|
+
query,
|
|
13
|
+
...(referenceRunId ? { referenceRunId } : {}),
|
|
14
|
+
});
|
|
15
|
+
if (json) {
|
|
16
|
+
process.stdout.write(`${JSON.stringify(comparison, null, 2)}\n`);
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
process.stdout.write(`Strict ${dimension} comparison: ${comparison.strict ? "yes" : "no"}\n`);
|
|
20
|
+
for (const group of comparison.groups) {
|
|
21
|
+
process.stdout.write(` ${JSON.stringify(group.identity)} valid=${group.valid_observations} mean=${group.rewards.mean ?? "-"} failures=${group.agent_failures}\n`);
|
|
22
|
+
}
|
|
23
|
+
if (comparison.excluded.length)
|
|
24
|
+
process.stdout.write(` excluded: ${comparison.excluded.length}\n`);
|
|
25
|
+
}
|
|
26
|
+
export function takeRunQuery(args) {
|
|
27
|
+
const query = {};
|
|
28
|
+
const assign = (field, option) => {
|
|
29
|
+
const value = takeOption(args, option);
|
|
30
|
+
if (value !== undefined)
|
|
31
|
+
query[field] = value;
|
|
32
|
+
};
|
|
33
|
+
assign("context_kind", "--context-kind");
|
|
34
|
+
assign("benchmark_id", "--benchmark");
|
|
35
|
+
assign("benchmark_revision", "--benchmark-revision");
|
|
36
|
+
assign("task_id", "--task");
|
|
37
|
+
assign("task_digest", "--task-digest");
|
|
38
|
+
assign("seed_task_id", "--seed-task");
|
|
39
|
+
assign("seed_task_digest", "--seed-digest");
|
|
40
|
+
assign("iteration_id", "--iteration");
|
|
41
|
+
assign("harness_id", "--harness");
|
|
42
|
+
assign("revision_identity", "--harness-revision");
|
|
43
|
+
assign("model_provider", "--provider");
|
|
44
|
+
assign("requested_model", "--requested-model");
|
|
45
|
+
assign("effective_model", "--effective-model");
|
|
46
|
+
assign("eval_id", "--eval");
|
|
47
|
+
assign("status", "--status");
|
|
48
|
+
assign("created_from", "--from");
|
|
49
|
+
assign("created_to", "--to");
|
|
50
|
+
return query;
|
|
51
|
+
}
|
|
52
|
+
import { compareRuns } from "../../runs/index.js";
|
|
53
|
+
import { invalidInput } from "../../foundation/index.js";
|
|
54
|
+
import { assertNoArgs, takeFlag, takeOption } from "../arguments.js";
|
|
55
|
+
//# sourceMappingURL=compare.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compare.js","sourceRoot":"","sources":["../../../../src/cli/commands/compare.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { fileURLToPath } from "node:url";
|
|
2
|
+
import { DaemonServer, daemonClient, probeDaemonHealth, readDaemonLogs, startDetachedDaemon } from "../../daemon/index.js";
|
|
3
|
+
import { discoverAgents } from "../../adapters/index.js";
|
|
4
|
+
import { DEFAULT_MAX_CONCURRENT, DEFAULT_PORT, HitchError, SCHEMA_VERSION, delay, invalidInput, positiveInteger } from "../../foundation/index.js";
|
|
5
|
+
import { assertNoArgs, parseRunRequest, takeFlag, takeOption } from "../arguments.js";
|
|
6
|
+
import { waitForDaemonRun } from "../output.js";
|
|
7
|
+
const executable = fileURLToPath(new URL("../../../bin/hitch.js", import.meta.url));
|
|
8
|
+
export async function daemonCommand(args, root) {
|
|
9
|
+
const action = args.shift();
|
|
10
|
+
switch (action) {
|
|
11
|
+
case "serve": return daemonServe(args, root);
|
|
12
|
+
case "start": return daemonStart(args, root);
|
|
13
|
+
case "stop": return daemonStop(args, root);
|
|
14
|
+
case "status": return daemonStatus(args, root);
|
|
15
|
+
case "submit": return daemonSubmit(args, root);
|
|
16
|
+
case "cancel": return daemonCancel(args, root);
|
|
17
|
+
case "logs": return daemonLogs(args, root);
|
|
18
|
+
default: throw invalidInput("daemon requires start, serve, stop, status, submit, cancel, or logs");
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
async function daemonServe(args, root) {
|
|
22
|
+
const port = Number(takeOption(args, "--port") || DEFAULT_PORT);
|
|
23
|
+
const maxConcurrent = positiveInteger(takeOption(args, "--max-concurrent") || DEFAULT_MAX_CONCURRENT, "--max-concurrent");
|
|
24
|
+
assertNoArgs(args);
|
|
25
|
+
if (!Number.isInteger(port) || port < 0 || port > 65535)
|
|
26
|
+
throw invalidInput("--port must be between 0 and 65535");
|
|
27
|
+
const server = new DaemonServer({ root, port, maxConcurrent, discoverHarnesses: discoverAgents });
|
|
28
|
+
await server.start();
|
|
29
|
+
const shutdown = () => server.close().catch((error) => process.stderr.write(`shutdown error: ${error.message}\n`));
|
|
30
|
+
process.once("SIGINT", shutdown);
|
|
31
|
+
process.once("SIGTERM", shutdown);
|
|
32
|
+
await server.closed;
|
|
33
|
+
}
|
|
34
|
+
async function daemonStart(args, root) {
|
|
35
|
+
const foreground = takeFlag(args, "--foreground");
|
|
36
|
+
const port = Number(takeOption(args, "--port") || DEFAULT_PORT);
|
|
37
|
+
const maxConcurrent = positiveInteger(takeOption(args, "--max-concurrent") || DEFAULT_MAX_CONCURRENT, "--max-concurrent");
|
|
38
|
+
assertNoArgs(args);
|
|
39
|
+
const health = await probeDaemonHealth(root);
|
|
40
|
+
if (health?.status === "running")
|
|
41
|
+
throw new HitchError(`daemon is already running (pid ${health.pid})`, { code: "already_running", exitCode: 2 });
|
|
42
|
+
if (foreground)
|
|
43
|
+
return daemonServe(["--port", String(port), "--max-concurrent", String(maxConcurrent)], root);
|
|
44
|
+
const child = await startDetachedDaemon({ root, executable, port, maxConcurrent });
|
|
45
|
+
for (let attempt = 0; attempt < 50; attempt += 1) {
|
|
46
|
+
await delay(100);
|
|
47
|
+
const current = await probeDaemonHealth(root);
|
|
48
|
+
if (current?.status === "running" && current.pid === child.pid) {
|
|
49
|
+
process.stdout.write(`Hitch daemon started (pid ${current.pid}, port ${current.port})\n`);
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
throw new HitchError(`daemon did not become ready; see ${child.errorLog}`, { code: "daemon_start_failed", exitCode: 12 });
|
|
54
|
+
}
|
|
55
|
+
async function daemonStop(args, root) {
|
|
56
|
+
assertNoArgs(args);
|
|
57
|
+
const client = await daemonClient(root);
|
|
58
|
+
const response = await client.request("/shutdown", { method: "POST" });
|
|
59
|
+
process.stdout.write(`${response.status}\n`);
|
|
60
|
+
}
|
|
61
|
+
async function daemonStatus(args, root) {
|
|
62
|
+
const json = takeFlag(args, "--json");
|
|
63
|
+
assertNoArgs(args);
|
|
64
|
+
const health = await probeDaemonHealth(root);
|
|
65
|
+
if (!health) {
|
|
66
|
+
if (json)
|
|
67
|
+
process.stdout.write(`${JSON.stringify({ schema_version: SCHEMA_VERSION, status: "stopped" })}\n`);
|
|
68
|
+
else
|
|
69
|
+
process.stdout.write("Hitch daemon is stopped\n");
|
|
70
|
+
process.exitCode = 3;
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
if (json)
|
|
74
|
+
process.stdout.write(`${JSON.stringify(health, null, 2)}\n`);
|
|
75
|
+
else
|
|
76
|
+
process.stdout.write(`Hitch daemon is ${health.status} (pid ${health.pid}, port ${health.port}, ${health.scheduler?.running} running, ${health.scheduler?.queued} queued)\n`);
|
|
77
|
+
}
|
|
78
|
+
async function daemonSubmit(args, root) {
|
|
79
|
+
const wait = takeFlag(args, "--wait");
|
|
80
|
+
const output = takeOption(args, "--output") || "json";
|
|
81
|
+
const request = await parseRunRequest(args);
|
|
82
|
+
assertNoArgs(args);
|
|
83
|
+
const client = await daemonClient(root);
|
|
84
|
+
const accepted = await client.request("/v1/runs", { method: "POST", body: JSON.stringify(request) });
|
|
85
|
+
if (!wait) {
|
|
86
|
+
process.stdout.write(`${JSON.stringify(accepted, null, 2)}\n`);
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const result = await waitForDaemonRun(client, accepted.run_id, output);
|
|
90
|
+
process.exitCode = result.exit_code;
|
|
91
|
+
}
|
|
92
|
+
async function daemonCancel(args, root) {
|
|
93
|
+
const runId = args.shift();
|
|
94
|
+
if (!runId)
|
|
95
|
+
throw invalidInput("daemon cancel requires a run ID");
|
|
96
|
+
assertNoArgs(args);
|
|
97
|
+
const client = await daemonClient(root);
|
|
98
|
+
const response = await client.request(`/v1/runs/${runId}/cancel`, { method: "POST" });
|
|
99
|
+
process.stdout.write(`${JSON.stringify(response, null, 2)}\n`);
|
|
100
|
+
}
|
|
101
|
+
async function daemonLogs(args, root) {
|
|
102
|
+
const lines = positiveInteger(takeOption(args, "-n") || 50, "-n");
|
|
103
|
+
assertNoArgs(args);
|
|
104
|
+
process.stdout.write(`${await readDaemonLogs(root, lines)}\n`);
|
|
105
|
+
}
|
|
106
|
+
//# sourceMappingURL=daemon.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"daemon.js","sourceRoot":"","sources":["../../../../src/cli/commands/daemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import { DEFAULT_HARBOR_VERSION, doctorHarbor, setupHarbor } from "../../backends/index.js";
|
|
2
|
+
import { inspectEval, listEvals, runEval } from "../../evals/index.js";
|
|
3
|
+
import { SCHEMA_VERSION, invalidInput } from "../../foundation/index.js";
|
|
4
|
+
import { assertNoArgs, parseEvalRequest, takeFlag, takeOption } from "../arguments.js";
|
|
5
|
+
export async function evalCommand(args, root) {
|
|
6
|
+
const action = args.shift();
|
|
7
|
+
switch (action) {
|
|
8
|
+
case "run": return evalRunCommand(args, root);
|
|
9
|
+
case "list": return evalListCommand(args, root);
|
|
10
|
+
case "inspect": return evalInspectCommand(args, root);
|
|
11
|
+
case "setup": return evalSetupCommand(args, root);
|
|
12
|
+
case "doctor": return evalDoctorCommand(args, root);
|
|
13
|
+
default: throw invalidInput("eval requires run, list, inspect, setup, or doctor");
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
async function evalSetupCommand(args, root) {
|
|
17
|
+
const backend = args.shift();
|
|
18
|
+
if (backend !== "harbor")
|
|
19
|
+
throw invalidInput("eval setup currently supports only harbor");
|
|
20
|
+
const version = takeOption(args, "--version") || DEFAULT_HARBOR_VERSION;
|
|
21
|
+
const python = takeOption(args, "--python");
|
|
22
|
+
const force = takeFlag(args, "--force");
|
|
23
|
+
const json = takeFlag(args, "--json");
|
|
24
|
+
assertNoArgs(args);
|
|
25
|
+
const result = await setupHarbor({
|
|
26
|
+
root,
|
|
27
|
+
version,
|
|
28
|
+
...(python !== undefined ? { python } : {}),
|
|
29
|
+
force,
|
|
30
|
+
...(json ? {} : { onProgress: (message) => process.stderr.write(`${message}\n`) }),
|
|
31
|
+
});
|
|
32
|
+
if (json)
|
|
33
|
+
process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
|
|
34
|
+
else
|
|
35
|
+
process.stdout.write(`${result.cache_hit ? "Using" : "Installed"} Harbor ${result.version} at ${result.executable}\n`);
|
|
36
|
+
}
|
|
37
|
+
async function evalDoctorCommand(args, root) {
|
|
38
|
+
const json = takeFlag(args, "--json");
|
|
39
|
+
const python = takeOption(args, "--python");
|
|
40
|
+
const harbor = takeOption(args, "--harbor");
|
|
41
|
+
const docker = takeOption(args, "--docker");
|
|
42
|
+
assertNoArgs(args);
|
|
43
|
+
const result = await doctorHarbor({
|
|
44
|
+
root,
|
|
45
|
+
...(python !== undefined ? { python } : {}),
|
|
46
|
+
...(harbor !== undefined ? { harbor } : {}),
|
|
47
|
+
...(docker !== undefined ? { docker } : {}),
|
|
48
|
+
});
|
|
49
|
+
if (json) {
|
|
50
|
+
process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
process.stdout.write(`Harbor eval: ${result.status}\n`);
|
|
54
|
+
for (const [name, check] of Object.entries(result.checks)) {
|
|
55
|
+
const detail = check.version || check.message || (check.present?.length ? check.present.join(", ") : "");
|
|
56
|
+
process.stdout.write(` ${name.padEnd(12)} ${check.status}${detail ? ` ${detail}` : ""}\n`);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
if (!result.ready)
|
|
60
|
+
process.exitCode = 3;
|
|
61
|
+
}
|
|
62
|
+
async function evalRunCommand(args, root) {
|
|
63
|
+
const output = takeOption(args, "--output") || "json";
|
|
64
|
+
const harborExecutable = takeOption(args, "--harbor");
|
|
65
|
+
const request = parseEvalRequest(args);
|
|
66
|
+
assertNoArgs(args);
|
|
67
|
+
if (!new Set(["json", "jsonl"]).has(output))
|
|
68
|
+
throw invalidInput("--output must be json or jsonl");
|
|
69
|
+
const controller = new AbortController();
|
|
70
|
+
const cancel = () => controller.abort();
|
|
71
|
+
process.once("SIGINT", cancel);
|
|
72
|
+
process.once("SIGTERM", cancel);
|
|
73
|
+
try {
|
|
74
|
+
const result = await runEval({
|
|
75
|
+
request,
|
|
76
|
+
root,
|
|
77
|
+
...(harborExecutable !== undefined ? { harborExecutable } : {}),
|
|
78
|
+
signal: controller.signal,
|
|
79
|
+
...(output === "jsonl" ? { onEvent: (event) => process.stdout.write(`${JSON.stringify(event)}\n`) } : {}),
|
|
80
|
+
});
|
|
81
|
+
if (output === "json")
|
|
82
|
+
process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
|
|
83
|
+
process.exitCode = result.exit_code;
|
|
84
|
+
}
|
|
85
|
+
finally {
|
|
86
|
+
process.removeListener("SIGINT", cancel);
|
|
87
|
+
process.removeListener("SIGTERM", cancel);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
async function evalListCommand(args, root) {
|
|
91
|
+
const json = takeFlag(args, "--json");
|
|
92
|
+
assertNoArgs(args);
|
|
93
|
+
const evals = await listEvals({ root });
|
|
94
|
+
if (json) {
|
|
95
|
+
process.stdout.write(`${JSON.stringify({ schema_version: SCHEMA_VERSION, evals }, null, 2)}\n`);
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
if (evals.length === 0) {
|
|
99
|
+
process.stdout.write("No evals found\n");
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
for (const evaluation of evals) {
|
|
103
|
+
const reward = evaluation.primary_reward === null ? "-" : String(evaluation.primary_reward);
|
|
104
|
+
process.stdout.write(`${evaluation.eval_id} ${String(evaluation.status).padEnd(9)} reward=${reward} ${evaluation.harness_ref || "-"} ${evaluation.dataset || "-"}\n`);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
async function evalInspectCommand(args, root) {
|
|
108
|
+
const json = takeFlag(args, "--json");
|
|
109
|
+
const evalId = args.shift();
|
|
110
|
+
if (!evalId)
|
|
111
|
+
throw invalidInput("eval inspect requires an eval ID");
|
|
112
|
+
assertNoArgs(args);
|
|
113
|
+
const evaluation = await inspectEval(evalId, { root });
|
|
114
|
+
if (json) {
|
|
115
|
+
process.stdout.write(`${JSON.stringify(evaluation, null, 2)}\n`);
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
const result = evaluation.result;
|
|
119
|
+
process.stdout.write(`${evaluation.eval_id}: ${result?.status || "running"}\n`);
|
|
120
|
+
process.stdout.write(` dataset: ${evaluation.request?.dataset}\n`);
|
|
121
|
+
process.stdout.write(` harness: ${evaluation.plan?.candidate?.harness_ref || evaluation.request?.harness_ref}\n`);
|
|
122
|
+
process.stdout.write(` primary reward: ${result?.summary?.primary_reward ?? "-"}\n`);
|
|
123
|
+
process.stdout.write(` runtime storage: ${evaluation.runtime_storage}\n`);
|
|
124
|
+
process.stdout.write(` directory: ${evaluation.directory}\n`);
|
|
125
|
+
}
|
|
126
|
+
//# sourceMappingURL=eval.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eval.js","sourceRoot":"","sources":["../../../../src/cli/commands/eval.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { MessageFeedbackService, resolveFeedbackSession, trajectoryTargetValidator } from "../../feedback/index.js";
|
|
3
|
+
import { HitchError, SCHEMA_VERSION, invalidInput, statePaths } from "../../foundation/index.js";
|
|
4
|
+
import { assertNoArgs, takeFlag, takeOption } from "../arguments.js";
|
|
5
|
+
export async function feedbackCommand(args, root) {
|
|
6
|
+
const action = args.shift();
|
|
7
|
+
const runId = args.shift();
|
|
8
|
+
if (!runId)
|
|
9
|
+
throw invalidInput("feedback requires a run ID");
|
|
10
|
+
const runDirectory = path.join(statePaths(root).runs, runId);
|
|
11
|
+
const session = await resolveFeedbackSession(runDirectory);
|
|
12
|
+
if (!session) {
|
|
13
|
+
throw new HitchError(`run ${runId} has no canonical trajectory for feedback`, {
|
|
14
|
+
code: "session-not-found",
|
|
15
|
+
exitCode: 3,
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
const service = new MessageFeedbackService({
|
|
19
|
+
root: runDirectory,
|
|
20
|
+
validateTarget: await trajectoryTargetValidator(runDirectory),
|
|
21
|
+
});
|
|
22
|
+
if (action === "list") {
|
|
23
|
+
const json = takeFlag(args, "--json");
|
|
24
|
+
assertNoArgs(args);
|
|
25
|
+
const items = await service.list({ sessionId: session.sessionId }, session);
|
|
26
|
+
if (json) {
|
|
27
|
+
process.stdout.write(`${JSON.stringify({ schema_version: SCHEMA_VERSION, run_id: runId, session_id: session.sessionId, items }, null, 2)}\n`);
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
if (items.length === 0) {
|
|
31
|
+
process.stdout.write("No feedback\n");
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
for (const item of items) {
|
|
35
|
+
process.stdout.write(`${item.messageId} ${item.rating} v${item.version}${item.note ? ` ${item.note}` : ""}\n`);
|
|
36
|
+
}
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
if (action === "put") {
|
|
40
|
+
const json = takeFlag(args, "--json");
|
|
41
|
+
const messageId = takeOption(args, "--message");
|
|
42
|
+
const ratingValue = takeOption(args, "--rating");
|
|
43
|
+
const note = takeOption(args, "--note");
|
|
44
|
+
const ifVersion = takeOption(args, "--if-version");
|
|
45
|
+
assertNoArgs(args);
|
|
46
|
+
if (!messageId)
|
|
47
|
+
throw invalidInput("feedback put requires --message <id>");
|
|
48
|
+
if (ratingValue !== "positive" && ratingValue !== "negative") {
|
|
49
|
+
throw invalidInput("feedback put requires --rating positive|negative");
|
|
50
|
+
}
|
|
51
|
+
const item = await service.put({
|
|
52
|
+
sessionId: session.sessionId,
|
|
53
|
+
messageId,
|
|
54
|
+
rating: ratingValue,
|
|
55
|
+
...(note !== undefined ? { note } : {}),
|
|
56
|
+
ifVersion: ifVersion === undefined ? null : ifVersion,
|
|
57
|
+
}, session, { messageId });
|
|
58
|
+
if (json)
|
|
59
|
+
process.stdout.write(`${JSON.stringify({ schema_version: SCHEMA_VERSION, item }, null, 2)}\n`);
|
|
60
|
+
else
|
|
61
|
+
process.stdout.write(`${item.messageId}: ${item.rating} (v${item.version})\n`);
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
if (action === "delete") {
|
|
65
|
+
const json = takeFlag(args, "--json");
|
|
66
|
+
const messageId = takeOption(args, "--message");
|
|
67
|
+
const ifVersion = takeOption(args, "--if-version");
|
|
68
|
+
assertNoArgs(args);
|
|
69
|
+
if (!messageId)
|
|
70
|
+
throw invalidInput("feedback delete requires --message <id>");
|
|
71
|
+
await service.delete({
|
|
72
|
+
sessionId: session.sessionId,
|
|
73
|
+
messageId,
|
|
74
|
+
ifVersion: ifVersion === undefined ? null : ifVersion,
|
|
75
|
+
}, session);
|
|
76
|
+
if (json)
|
|
77
|
+
process.stdout.write(`${JSON.stringify({ schema_version: SCHEMA_VERSION, absent: true }, null, 2)}\n`);
|
|
78
|
+
else
|
|
79
|
+
process.stdout.write(`Deleted feedback for ${messageId}\n`);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
throw invalidInput("feedback requires list, put, or delete");
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=feedback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"feedback.js","sourceRoot":"","sources":["../../../../src/cli/commands/feedback.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { inspectAgent } from "../../adapters/index.js";
|
|
2
|
+
import { listPreparedArtifacts } from "../../artifacts/index.js";
|
|
3
|
+
import { SCHEMA_VERSION, invalidInput } from "../../foundation/index.js";
|
|
4
|
+
import { assertNoArgs, takeFlag } from "../arguments.js";
|
|
5
|
+
export async function inspectCommand(args, root) {
|
|
6
|
+
const json = takeFlag(args, "--json");
|
|
7
|
+
const id = args.shift();
|
|
8
|
+
if (!id)
|
|
9
|
+
throw invalidInput("inspect requires a harness name");
|
|
10
|
+
assertNoArgs(args);
|
|
11
|
+
const harness = {
|
|
12
|
+
...await inspectAgent(id),
|
|
13
|
+
prepared_artifacts: await listPreparedArtifacts(id, { root }),
|
|
14
|
+
};
|
|
15
|
+
if (json)
|
|
16
|
+
process.stdout.write(`${JSON.stringify({ schema_version: SCHEMA_VERSION, harness }, null, 2)}\n`);
|
|
17
|
+
else
|
|
18
|
+
process.stdout.write(`${harness.display_name}: ${harness.status}${harness.executable ? `\n executable: ${harness.executable}\n version: ${harness.version || "unknown"}` : ""}\n prepared artifacts: ${harness.prepared_artifacts.length}\n`);
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=inspect.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../../../src/cli/commands/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAc,EAAE,IAAY;IAC/D,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE;QAAE,MAAM,YAAY,CAAC,iCAAiC,CAAC,CAAC;IAC/D,YAAY,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,OAAO,GAAG;QACd,GAAG,MAAM,YAAY,CAAC,EAAE,CAAC;QACzB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;KAC9D,CAAC;IACF,IAAI,IAAI;QAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;;QACvG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,YAAY,KAAK,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,OAAO,CAAC,UAAU,gBAAgB,OAAO,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,2BAA2B,OAAO,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,CAAC;AACxP,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { discoverAgents } from "../../adapters/index.js";
|
|
2
|
+
import { SCHEMA_VERSION } from "../../foundation/index.js";
|
|
3
|
+
import { assertNoArgs, takeFlag } from "../arguments.js";
|
|
4
|
+
export async function listCommand(args) {
|
|
5
|
+
const json = takeFlag(args, "--json");
|
|
6
|
+
assertNoArgs(args);
|
|
7
|
+
const agents = await discoverAgents();
|
|
8
|
+
if (json) {
|
|
9
|
+
process.stdout.write(`${JSON.stringify({ schema_version: SCHEMA_VERSION, harnesses: agents }, null, 2)}\n`);
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
for (const agent of agents) {
|
|
13
|
+
const detail = agent.status === "available" ? `${agent.version || "version unknown"} ${agent.executable}` : "not installed";
|
|
14
|
+
process.stdout.write(`${agent.id.padEnd(10)} ${agent.status.padEnd(11)} ${detail}\n`);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=list.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/cli/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAc;IAC9C,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,YAAY,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,MAAM,GAAG,MAAM,cAAc,EAAE,CAAC;IACtC,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5G,OAAO;IACT,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,IAAI,iBAAiB,KAAK,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;QAC7H,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC;IACxF,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { prepareHarness } from "../../artifacts/index.js";
|
|
2
|
+
import { resolveHarness } from "../../revisions/index.js";
|
|
3
|
+
import { SCHEMA_VERSION, invalidInput } from "../../foundation/index.js";
|
|
4
|
+
import { assertNoArgs, takeFlag } from "../arguments.js";
|
|
5
|
+
import { loadInternalLocalGitSource, takeInternalLocalGitFlags } from "./run.js";
|
|
6
|
+
export async function prepareCommand(args, root) {
|
|
7
|
+
const json = takeFlag(args, "--json");
|
|
8
|
+
const internalFlags = takeInternalLocalGitFlags(args);
|
|
9
|
+
const reference = args.shift();
|
|
10
|
+
if (!reference)
|
|
11
|
+
throw invalidInput("prepare requires a harness reference");
|
|
12
|
+
assertNoArgs(args);
|
|
13
|
+
const internal = internalFlags ? await loadInternalLocalGitSource(internalFlags, reference) : null;
|
|
14
|
+
const resolved = internal?.resolution || await resolveHarness(reference, { root });
|
|
15
|
+
const artifact = await prepareHarness(resolved, { root, ...(internal ? { verifiedLocalGitSource: internal.source } : {}) });
|
|
16
|
+
if (json)
|
|
17
|
+
process.stdout.write(`${JSON.stringify({ schema_version: SCHEMA_VERSION, resolved_revision: resolved, artifact }, null, 2)}\n`);
|
|
18
|
+
else
|
|
19
|
+
process.stdout.write(`${artifact.cache_hit ? "Cached" : "Prepared"} ${resolved.canonical_ref} as ${artifact.artifact_id}\n`);
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=prepare.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../../../src/cli/commands/prepare.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAEjF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAc,EAAE,IAAY;IAC/D,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,MAAM,aAAa,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC/B,IAAI,CAAC,SAAS;QAAE,MAAM,YAAY,CAAC,sCAAsC,CAAC,CAAC;IAC3E,YAAY,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,0BAA0B,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnG,MAAM,QAAQ,GAAG,QAAQ,EAAE,UAAU,IAAI,MAAM,cAAc,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACnF,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5H,IAAI,IAAI;QAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;;QACrI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC,aAAa,OAAO,QAAQ,CAAC,WAAW,IAAI,CAAC,CAAC;AACpI,CAAC"}
|