@autodidacticon/orchestrator 0.1.0 → 0.3.0
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 +60 -33
- package/dist/src/agent/mcp-shim.js +1 -1
- package/dist/src/agent/server.js +11 -6
- package/dist/src/agent/server.js.map +1 -1
- package/dist/src/brief/compose.js +8 -1
- package/dist/src/brief/compose.js.map +1 -1
- package/dist/src/config.js +23 -3
- package/dist/src/config.js.map +1 -1
- package/dist/src/graph/load.js +4 -0
- package/dist/src/graph/load.js.map +1 -1
- package/dist/src/import/mapping.js +29 -5
- package/dist/src/import/mapping.js.map +1 -1
- package/dist/src/index.js +8 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/launch/launch.js +5 -1
- package/dist/src/launch/launch.js.map +1 -1
- package/dist/src/log.js +20 -0
- package/dist/src/log.js.map +1 -0
- package/dist/src/loop/orchestrator.js +94 -3
- package/dist/src/loop/orchestrator.js.map +1 -1
- package/dist/src/loop/tick.js +2 -1
- package/dist/src/loop/tick.js.map +1 -1
- package/dist/src/main.js +115 -33
- package/dist/src/main.js.map +1 -1
- package/dist/src/operator/cli.js +40 -2
- package/dist/src/operator/cli.js.map +1 -1
- package/dist/src/operator/mcp-server.js +41 -9
- package/dist/src/operator/mcp-server.js.map +1 -1
- package/dist/src/operator/mcp.js +1 -1
- package/dist/src/operator/routes.js +62 -5
- package/dist/src/operator/routes.js.map +1 -1
- package/dist/src/runner/claude-code.js +1 -1
- package/dist/src/runner/claude-code.js.map +1 -1
- package/dist/src/runner/command.js +24 -0
- package/dist/src/runner/command.js.map +1 -0
- package/dist/src/runner/selection.js +20 -0
- package/dist/src/runner/selection.js.map +1 -0
- package/dist/src/runner/subprocess.js +7 -1
- package/dist/src/runner/subprocess.js.map +1 -1
- package/dist/src/runs/childEnv.js +32 -0
- package/dist/src/runs/childEnv.js.map +1 -0
- package/dist/src/runs/lifecycle.js +102 -5
- package/dist/src/runs/lifecycle.js.map +1 -1
- package/dist/src/runs/resolve.js +217 -0
- package/dist/src/runs/resolve.js.map +1 -0
- package/dist/src/runs/runDir.js +63 -13
- package/dist/src/runs/runDir.js.map +1 -1
- package/dist/src/state/store.js.map +1 -1
- package/dist/src/toolchain/branch.js +19 -0
- package/dist/src/toolchain/branch.js.map +1 -0
- package/dist/src/toolchain/detect.js +115 -0
- package/dist/src/toolchain/detect.js.map +1 -0
- package/dist/src/toolchain/tools.js +56 -0
- package/dist/src/toolchain/tools.js.map +1 -0
- package/dist/src/verify/verifier.js +9 -3
- package/dist/src/verify/verifier.js.map +1 -1
- package/hosts/claude-code/.claude-plugin/plugin.json +1 -1
- package/hosts/claude-code/package-lock.json +1247 -0
- package/hosts/claude-code/package.json +1 -1
- package/hosts/claude-code/skills/import/SKILL.md +66 -14
- package/hosts/claude-code/skills/run/SKILL.md +83 -21
- package/hosts/claude-code/skills/work/SKILL.md +25 -6
- package/hosts/claude-code/workflows/work.js +23 -9
- package/package.json +1 -1
|
@@ -7,6 +7,7 @@ import { existsSync, openSync, readdirSync, readFileSync, writeFileSync } from '
|
|
|
7
7
|
import path from 'node:path';
|
|
8
8
|
import { fileURLToPath } from 'node:url';
|
|
9
9
|
import { pidAlive } from '../runner/subprocess.js';
|
|
10
|
+
import { overridesSchema, START_ONLY_KEYS } from './resolve.js';
|
|
10
11
|
import { DAEMON_PID, ensureRunDir, orchHome, readDaemonJson, readRepoFile, resolveRepoPath, runPaths } from './runDir.js';
|
|
11
12
|
/** A liveness probe; `probe=1` keeps it from counting as activity for the idle exit. */
|
|
12
13
|
export async function health(url, timeoutMs = 1500) {
|
|
@@ -20,6 +21,33 @@ export async function health(url, timeoutMs = 1500) {
|
|
|
20
21
|
return undefined;
|
|
21
22
|
}
|
|
22
23
|
}
|
|
24
|
+
/** True for localhost, 127.0.0.0/8, and ::1; false for any other host or an unparseable URL. */
|
|
25
|
+
export function isLoopbackUrl(url) {
|
|
26
|
+
let host;
|
|
27
|
+
try {
|
|
28
|
+
host = new URL(url).hostname.toLowerCase();
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
if (host.startsWith('[') && host.endsWith(']'))
|
|
34
|
+
host = host.slice(1, -1);
|
|
35
|
+
return host === 'localhost' || host.endsWith('.localhost') || host === '::1' || /^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(host);
|
|
36
|
+
}
|
|
37
|
+
/** `ORCH_URL` when it names a non-loopback host: a daemon this machine did not spawn and must not spawn. */
|
|
38
|
+
export function remoteDaemonUrl(env = process.env) {
|
|
39
|
+
const url = env['ORCH_URL']?.trim();
|
|
40
|
+
return url && !isLoopbackUrl(url) ? url.replace(/\/+$/, '') : undefined;
|
|
41
|
+
}
|
|
42
|
+
function remoteUnreachable(url) {
|
|
43
|
+
return new Error(`the daemon at ${url} (ORCH_URL) is unreachable; it runs remotely, so no local daemon is started`);
|
|
44
|
+
}
|
|
45
|
+
/** Refuse a local spawn for a remote daemon: it is reachable (and not ours to start) or reported unreachable. */
|
|
46
|
+
async function refuseRemote(url) {
|
|
47
|
+
if (await health(url))
|
|
48
|
+
throw new Error(`the daemon runs remotely at ${url} (ORCH_URL); it is not started from this machine`);
|
|
49
|
+
throw remoteUnreachable(url);
|
|
50
|
+
}
|
|
23
51
|
export async function daemonState(runDir) {
|
|
24
52
|
let pid;
|
|
25
53
|
try {
|
|
@@ -46,6 +74,42 @@ export function daemonCommand() {
|
|
|
46
74
|
const loader = path.resolve(here, '../../node_modules/tsx/dist/loader.mjs');
|
|
47
75
|
return { command: process.execPath, args: ['--import', loader, ts] };
|
|
48
76
|
}
|
|
77
|
+
async function readConfig(url) {
|
|
78
|
+
try {
|
|
79
|
+
const res = await fetch(`${url}/v1/config`, { signal: AbortSignal.timeout(3000) });
|
|
80
|
+
return res.ok ? (await res.json()) : undefined;
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
/** Runtime keys go through the route; start-only keys are refused here, so the rest still lands. */
|
|
87
|
+
async function applyOverrides(url, overrides) {
|
|
88
|
+
const rejected = [];
|
|
89
|
+
const runtime = {};
|
|
90
|
+
for (const [k, v] of Object.entries(overrides)) {
|
|
91
|
+
if (v === undefined)
|
|
92
|
+
continue;
|
|
93
|
+
if (START_ONLY_KEYS.includes(k))
|
|
94
|
+
rejected.push({ key: k, reason: `${k} is start-only: it applies when the daemon is spawned, and this daemon is already running` });
|
|
95
|
+
else
|
|
96
|
+
runtime[k] = v;
|
|
97
|
+
}
|
|
98
|
+
let applied = [];
|
|
99
|
+
if (Object.keys(runtime).length) {
|
|
100
|
+
const res = await fetch(`${url}/v1/config`, { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify(runtime), signal: AbortSignal.timeout(5000) });
|
|
101
|
+
const body = (await res.json().catch(() => ({})));
|
|
102
|
+
if (res.ok)
|
|
103
|
+
applied = body.applied ?? Object.keys(runtime);
|
|
104
|
+
else
|
|
105
|
+
for (const k of Object.keys(runtime))
|
|
106
|
+
rejected.push({ key: k, reason: body.error ?? `status ${res.status}` });
|
|
107
|
+
}
|
|
108
|
+
return { applied, rejected };
|
|
109
|
+
}
|
|
110
|
+
function configFields(report) {
|
|
111
|
+
return report ? { config: report.config, toolchain: report.toolchain, needsConfig: report.needsConfig } : {};
|
|
112
|
+
}
|
|
49
113
|
function modeOf(status) {
|
|
50
114
|
const m = status?.['runner']?.mode;
|
|
51
115
|
return m === 'spawn' || m === 'pull' || m === 'mixed' ? m : undefined;
|
|
@@ -55,19 +119,40 @@ export async function startDaemon(opts = {}) {
|
|
|
55
119
|
const env = opts.env ?? process.env;
|
|
56
120
|
const repo = await resolveRepoPath({ repo: opts.repo, cwd: opts.cwd, env });
|
|
57
121
|
const paths = ensureRunDir(repo, env);
|
|
122
|
+
const checked = overridesSchema.safeParse(opts.overrides ?? {});
|
|
123
|
+
if (!checked.success) {
|
|
124
|
+
const issue = checked.error.issues[0];
|
|
125
|
+
throw new Error(`invalid configuration argument ${String(issue?.path[0] ?? '')}: ${issue?.message ?? 'invalid value'}`);
|
|
126
|
+
}
|
|
127
|
+
const overrides = checked.data;
|
|
58
128
|
const state = await daemonState(paths.runDir);
|
|
59
129
|
if (state.healthy && state.pid && state.url) {
|
|
60
130
|
const info = readDaemonJson(paths.runDir);
|
|
61
131
|
if (opts.mode) {
|
|
62
132
|
await fetch(`${state.url}/v1/runner`, { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ mode: opts.mode }), signal: AbortSignal.timeout(3000) });
|
|
63
133
|
}
|
|
134
|
+
const outcome = await applyOverrides(state.url, overrides);
|
|
64
135
|
const mode = opts.mode ?? modeOf(await health(state.url));
|
|
65
|
-
return { ...info, runDir: paths.runDir, graphPath: paths.graphPath, started: false, ...(mode ? { mode } : {}) };
|
|
136
|
+
return { ...info, runDir: paths.runDir, graphPath: paths.graphPath, started: false, ...(mode ? { mode } : {}), ...configFields(await readConfig(state.url)), applied: outcome.applied, rejected: outcome.rejected };
|
|
66
137
|
}
|
|
138
|
+
const remote = remoteDaemonUrl(env);
|
|
139
|
+
if (remote)
|
|
140
|
+
await refuseRemote(remote);
|
|
67
141
|
const { command, args } = daemonCommand();
|
|
68
142
|
const fd = openSync(paths.daemonLog, 'a');
|
|
69
143
|
const modeArgs = opts.mode ? ['--mode', opts.mode] : opts.defaultMode ? ['--default-mode', opts.defaultMode] : [];
|
|
70
|
-
|
|
144
|
+
// Values become `--set` flags the daemon stores before resolving; a null (clear) goes through the route once it is up.
|
|
145
|
+
const setArgs = [];
|
|
146
|
+
const clears = {};
|
|
147
|
+
for (const [k, v] of Object.entries(overrides)) {
|
|
148
|
+
if (v === undefined)
|
|
149
|
+
continue;
|
|
150
|
+
if (v === null)
|
|
151
|
+
clears[k] = null;
|
|
152
|
+
else
|
|
153
|
+
setArgs.push('--set', `${k}=${typeof v === 'string' ? v : JSON.stringify(v)}`);
|
|
154
|
+
}
|
|
155
|
+
const child = spawn(command, [...args, '--repo', repo, ...modeArgs, ...setArgs], {
|
|
71
156
|
cwd: repo,
|
|
72
157
|
env: { ...env, ...opts.extraEnv },
|
|
73
158
|
detached: true,
|
|
@@ -83,7 +168,9 @@ export async function startDaemon(opts = {}) {
|
|
|
83
168
|
const status = info && info.pid === child.pid ? await health(info.url) : undefined;
|
|
84
169
|
if (info && status) {
|
|
85
170
|
const mode = modeOf(status) ?? opts.mode;
|
|
86
|
-
|
|
171
|
+
const applied = Object.entries(overrides).filter(([, v]) => v !== undefined && v !== null).map(([k]) => k);
|
|
172
|
+
const cleared = Object.keys(clears).length ? await applyOverrides(info.url, clears) : { applied: [], rejected: [] };
|
|
173
|
+
return { ...info, runDir: paths.runDir, graphPath: paths.graphPath, started: true, ...(mode ? { mode } : {}), ...configFields(await readConfig(info.url)), applied: [...applied, ...cleared.applied], rejected: cleared.rejected };
|
|
87
174
|
}
|
|
88
175
|
if (!pidAlive(child.pid))
|
|
89
176
|
break;
|
|
@@ -141,10 +228,18 @@ export async function stopDaemon(opts = {}) {
|
|
|
141
228
|
* Start the daemon again for a run directory that holds a store, when the last
|
|
142
229
|
* exit was idle or a crash; refuse after an explicit stop or signal. Returns
|
|
143
230
|
* undefined when there is nothing to revive (no store, or a daemon already
|
|
144
|
-
* healthy).
|
|
231
|
+
* healthy). When `ORCH_URL` names a non-loopback host nothing is spawned:
|
|
232
|
+
* a reachable remote daemon needs no revival, an unreachable one is reported
|
|
233
|
+
* as such. See specs/operator-control "Revive on demand" and "Container mode".
|
|
145
234
|
*/
|
|
146
235
|
export async function reviveDaemon(opts = {}) {
|
|
147
236
|
const env = opts.env ?? process.env;
|
|
237
|
+
const remote = remoteDaemonUrl(env);
|
|
238
|
+
if (remote) {
|
|
239
|
+
if (await health(remote))
|
|
240
|
+
return undefined;
|
|
241
|
+
throw remoteUnreachable(remote);
|
|
242
|
+
}
|
|
148
243
|
const repo = await resolveRepoPath({ repo: opts.repo, cwd: opts.cwd, env });
|
|
149
244
|
const paths = runPaths(repo, env);
|
|
150
245
|
if (!existsSync(path.join(paths.runDir, 'store.sqlite')))
|
|
@@ -153,7 +248,9 @@ export async function reviveDaemon(opts = {}) {
|
|
|
153
248
|
if (state.healthy)
|
|
154
249
|
return undefined;
|
|
155
250
|
if (state.exit && state.exit.reason !== 'idle') {
|
|
156
|
-
|
|
251
|
+
const by = state.exit.by;
|
|
252
|
+
const who = by?.attachment ? ` by attachment ${by.attachment}` : by?.remote ? ` by a client at ${by.remote}` : '';
|
|
253
|
+
throw new Error(`the daemon for ${repo} was stopped at ${new Date(state.exit.at).toISOString()} (${state.exit.reason}${who}); call start to run it again`);
|
|
157
254
|
}
|
|
158
255
|
return startDaemon(opts);
|
|
159
256
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/runs/lifecycle.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/runs/lifecycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Layered configuration: argument, file, pinned (the integration branch only),
|
|
3
|
+
* detected, default. Scalars take the first layer; the allow list composes.
|
|
4
|
+
* Every value carries its provenance. See specs/toolchain-discovery
|
|
5
|
+
* "Resolution order and provenance".
|
|
6
|
+
*/
|
|
7
|
+
import { z } from 'zod';
|
|
8
|
+
import { configSchema } from '../config.js';
|
|
9
|
+
import { hasAllowedToolsSlot, hasEffortSlot, hasModelSlot } from '../runner/command.js';
|
|
10
|
+
import { effortSchema, modelSchema } from '../runner/selection.js';
|
|
11
|
+
import { composeAllowedTools, isSafeRule } from '../toolchain/tools.js';
|
|
12
|
+
export const OVERRIDABLE_KEYS = ['checkCommand', 'integrationBranch', 'capacity', 'allowedTools', 'runnerCommand', 'model', 'effort'];
|
|
13
|
+
export const START_ONLY_KEYS = ['integrationBranch'];
|
|
14
|
+
const rule = z.string().refine(isSafeRule, (r) => ({ message: `rule ${JSON.stringify(r)} must not be empty or contain a double quote, backslash, dollar sign, or backtick` }));
|
|
15
|
+
/** An override document: a value sets the key, null clears it. */
|
|
16
|
+
export const overridesSchema = z
|
|
17
|
+
.object({
|
|
18
|
+
checkCommand: z.string().min(1).nullable().optional(),
|
|
19
|
+
integrationBranch: z.string().min(1).nullable().optional(),
|
|
20
|
+
capacity: z.number().int().positive().nullable().optional(),
|
|
21
|
+
allowedTools: z.array(rule).nullable().optional(),
|
|
22
|
+
runnerCommand: z.string().min(1).nullable().optional(),
|
|
23
|
+
model: modelSchema.nullable().optional(),
|
|
24
|
+
effort: effortSchema.nullable().optional(),
|
|
25
|
+
})
|
|
26
|
+
.strict();
|
|
27
|
+
const DEFAULTS = configSchema.parse({});
|
|
28
|
+
function fileHas(raw, key) {
|
|
29
|
+
return raw !== undefined && raw[key] !== undefined && raw[key] !== null;
|
|
30
|
+
}
|
|
31
|
+
function fileClaude(raw) {
|
|
32
|
+
const runner = raw?.['runner'];
|
|
33
|
+
const claude = runner && typeof runner === 'object' ? runner['claude'] : undefined;
|
|
34
|
+
if (!claude || typeof claude !== 'object')
|
|
35
|
+
return {};
|
|
36
|
+
const c = claude;
|
|
37
|
+
return {
|
|
38
|
+
allowedTools: Array.isArray(c['allowedTools']) ? c['allowedTools'].map(String) : undefined,
|
|
39
|
+
deriveTools: typeof c['deriveTools'] === 'boolean' ? c['deriveTools'] : undefined,
|
|
40
|
+
model: typeof c['model'] === 'string' ? c['model'] : undefined,
|
|
41
|
+
effort: typeof c['effort'] === 'string' ? c['effort'] : undefined,
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
/** Merge a patch into an override document: a null clears the key. */
|
|
45
|
+
export function mergeOverrides(current, patch) {
|
|
46
|
+
const out = { ...current };
|
|
47
|
+
for (const [k, v] of Object.entries(patch)) {
|
|
48
|
+
if (v === null)
|
|
49
|
+
delete out[k];
|
|
50
|
+
else if (v !== undefined)
|
|
51
|
+
out[k] = v;
|
|
52
|
+
}
|
|
53
|
+
return out;
|
|
54
|
+
}
|
|
55
|
+
export function resolveLayers(inputs, overrides = {}) {
|
|
56
|
+
const { base, fileRaw, detected, pinned } = inputs;
|
|
57
|
+
const provenance = {};
|
|
58
|
+
// An in-memory config with no file (the harnesses) stands for the file layer.
|
|
59
|
+
const fileCheck = fileRaw === undefined || fileHas(fileRaw, 'checkCommand') ? base.checkCommand : undefined;
|
|
60
|
+
const checkCommand = overrides.checkCommand ?? fileCheck ?? detected?.toolchain?.checkCommand;
|
|
61
|
+
provenance.checkCommand = overrides.checkCommand ? 'argument' : fileCheck !== undefined ? 'file' : detected?.toolchain?.checkCommand ? 'detected' : 'unresolved';
|
|
62
|
+
let integrationBranch;
|
|
63
|
+
if (overrides.integrationBranch) {
|
|
64
|
+
integrationBranch = overrides.integrationBranch;
|
|
65
|
+
provenance.integrationBranch = 'argument';
|
|
66
|
+
}
|
|
67
|
+
else if (fileHas(fileRaw, 'integrationBranch')) {
|
|
68
|
+
integrationBranch = base.integrationBranch;
|
|
69
|
+
provenance.integrationBranch = 'file';
|
|
70
|
+
}
|
|
71
|
+
else if (pinned) {
|
|
72
|
+
integrationBranch = pinned;
|
|
73
|
+
provenance.integrationBranch = 'pinned';
|
|
74
|
+
}
|
|
75
|
+
else if (detected?.integrationBranch) {
|
|
76
|
+
integrationBranch = detected.integrationBranch;
|
|
77
|
+
provenance.integrationBranch = 'detected';
|
|
78
|
+
}
|
|
79
|
+
else if (fileRaw === undefined && base.integrationBranch !== DEFAULTS.integrationBranch) {
|
|
80
|
+
integrationBranch = base.integrationBranch;
|
|
81
|
+
provenance.integrationBranch = 'file';
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
integrationBranch = base.integrationBranch;
|
|
85
|
+
provenance.integrationBranch = 'default';
|
|
86
|
+
}
|
|
87
|
+
const capacity = overrides.capacity ?? base.capacity;
|
|
88
|
+
provenance.capacity = overrides.capacity ? 'argument' : fileHas(fileRaw, 'capacity') || (fileRaw === undefined && base.capacity !== DEFAULTS.capacity) ? 'file' : 'default';
|
|
89
|
+
const runnerCommand = overrides.runnerCommand ?? base.runnerCommand;
|
|
90
|
+
provenance.runnerCommand = overrides.runnerCommand ? 'argument' : fileHas(fileRaw, 'runnerCommand') || (fileRaw === undefined && base.runnerCommand !== DEFAULTS.runnerCommand) ? 'file' : 'default';
|
|
91
|
+
const claude = fileClaude(fileRaw);
|
|
92
|
+
const composed = composeAllowedTools({
|
|
93
|
+
record: detected?.toolchain,
|
|
94
|
+
deriveTools: claude.deriveTools ?? base.runner.claude.deriveTools,
|
|
95
|
+
fileRules: claude.allowedTools ?? base.runner.claude.allowedTools,
|
|
96
|
+
argumentRules: overrides.allowedTools ?? [],
|
|
97
|
+
});
|
|
98
|
+
provenance.allowedTools = 'composed';
|
|
99
|
+
// Model and effort: argument over file over default; an in-memory config with no file stands for the file layer.
|
|
100
|
+
const model = overrides.model ?? base.runner.claude.model;
|
|
101
|
+
provenance.model = overrides.model ? 'argument' : claude.model !== undefined || (fileRaw === undefined && base.runner.claude.model !== DEFAULTS.runner.claude.model) ? 'file' : 'default';
|
|
102
|
+
const effort = overrides.effort ?? base.runner.claude.effort;
|
|
103
|
+
provenance.effort = overrides.effort ? 'argument' : claude.effort !== undefined || (fileRaw === undefined && base.runner.claude.effort !== DEFAULTS.runner.claude.effort) ? 'file' : 'default';
|
|
104
|
+
const needsConfig = checkCommand === undefined ? ['checkCommand'] : [];
|
|
105
|
+
return {
|
|
106
|
+
config: { ...base, checkCommand, integrationBranch, capacity, runnerCommand, runner: { ...base.runner, claude: { ...base.runner.claude, model, effort } } },
|
|
107
|
+
provenance,
|
|
108
|
+
allowedTools: { ...composed, applied: hasAllowedToolsSlot(runnerCommand) },
|
|
109
|
+
model: { value: model, applied: hasModelSlot(runnerCommand) },
|
|
110
|
+
effort: { value: effort, applied: hasEffortSlot(runnerCommand) },
|
|
111
|
+
toolchain: detected?.toolchain,
|
|
112
|
+
needsConfig,
|
|
113
|
+
overrides,
|
|
114
|
+
inputs,
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
/** The compact form appended as the `config.resolved` event. */
|
|
118
|
+
export function configSummary(report) {
|
|
119
|
+
const c = report.config;
|
|
120
|
+
return {
|
|
121
|
+
checkCommand: c.checkCommand,
|
|
122
|
+
integrationBranch: c.integrationBranch,
|
|
123
|
+
capacity: c.capacity,
|
|
124
|
+
runnerCommand: { source: c.runnerCommand.source },
|
|
125
|
+
allowedTools: { source: c.allowedTools.source, count: c.allowedTools.value.length, applied: c.allowedTools.applied, parts: Object.fromEntries(Object.entries(c.allowedTools.parts).map(([k, v]) => [k, v.length])) },
|
|
126
|
+
model: c.model,
|
|
127
|
+
effort: c.effort,
|
|
128
|
+
toolchain: report.toolchain ? { kinds: report.toolchain.kinds, checkCommand: report.toolchain.checkCommand, checkFrom: report.toolchain.checkFrom, packageManager: report.toolchain.packageManager } : undefined,
|
|
129
|
+
needsConfig: report.needsConfig,
|
|
130
|
+
overrides: Object.keys(report.overrides),
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
/** The override document kept in the store under `config.overrides`; empty when absent or unreadable. */
|
|
134
|
+
export function readOverrides(store) {
|
|
135
|
+
const raw = store.getKv('config.overrides');
|
|
136
|
+
if (!raw)
|
|
137
|
+
return {};
|
|
138
|
+
try {
|
|
139
|
+
const parsed = overridesSchema.safeParse(JSON.parse(raw));
|
|
140
|
+
return parsed.success ? parsed.data : {};
|
|
141
|
+
}
|
|
142
|
+
catch {
|
|
143
|
+
return {};
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
/**
|
|
147
|
+
* `--set key=value` flags into an override document: `capacity` as an integer,
|
|
148
|
+
* `allowedTools` as a JSON array or one rule per flag (appended), `model` and
|
|
149
|
+
* `effort` checked by their shape rules, the rest as strings. Throws a usage error on an unknown key or a bad value.
|
|
150
|
+
*/
|
|
151
|
+
export function parseSetFlags(flags) {
|
|
152
|
+
const out = {};
|
|
153
|
+
for (const flag of flags) {
|
|
154
|
+
const eq = flag.indexOf('=');
|
|
155
|
+
if (eq <= 0)
|
|
156
|
+
throw new Error(`--set expects key=value, not ${JSON.stringify(flag)}`);
|
|
157
|
+
const key = flag.slice(0, eq).trim();
|
|
158
|
+
const raw = flag.slice(eq + 1);
|
|
159
|
+
if (!OVERRIDABLE_KEYS.includes(key))
|
|
160
|
+
throw new Error(`--set: unknown key ${JSON.stringify(key)}; one of ${OVERRIDABLE_KEYS.join(', ')}`);
|
|
161
|
+
if (key === 'capacity') {
|
|
162
|
+
const n = Number(raw);
|
|
163
|
+
if (!raw.trim() || !Number.isInteger(n) || n <= 0)
|
|
164
|
+
throw new Error(`--set capacity expects a positive integer, not ${JSON.stringify(raw)}`);
|
|
165
|
+
out[key] = n;
|
|
166
|
+
}
|
|
167
|
+
else if (key === 'allowedTools') {
|
|
168
|
+
let rules;
|
|
169
|
+
if (raw.trim().startsWith('[')) {
|
|
170
|
+
let parsed;
|
|
171
|
+
try {
|
|
172
|
+
parsed = JSON.parse(raw);
|
|
173
|
+
}
|
|
174
|
+
catch {
|
|
175
|
+
parsed = undefined;
|
|
176
|
+
}
|
|
177
|
+
if (!Array.isArray(parsed) || !parsed.every((r) => typeof r === 'string'))
|
|
178
|
+
throw new Error(`--set allowedTools expects a JSON array of rules or one rule, not ${JSON.stringify(raw)}`);
|
|
179
|
+
rules = parsed;
|
|
180
|
+
}
|
|
181
|
+
else {
|
|
182
|
+
rules = [raw];
|
|
183
|
+
}
|
|
184
|
+
out[key] = [...(out[key] ?? []), ...rules];
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
if (!raw.trim())
|
|
188
|
+
throw new Error(`--set ${key} expects a non-empty value`);
|
|
189
|
+
out[key] = raw;
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
const parsed = overridesSchema.safeParse(out);
|
|
193
|
+
if (!parsed.success) {
|
|
194
|
+
const issue = parsed.error.issues[0];
|
|
195
|
+
throw new Error(`--set ${String(issue?.path[0] ?? '')}: ${issue?.message ?? 'invalid value'}`);
|
|
196
|
+
}
|
|
197
|
+
return parsed.data;
|
|
198
|
+
}
|
|
199
|
+
export function reportOf(resolved, now) {
|
|
200
|
+
return {
|
|
201
|
+
resolvedAt: now,
|
|
202
|
+
repo: resolved.config.repoPath,
|
|
203
|
+
config: {
|
|
204
|
+
checkCommand: { value: resolved.config.checkCommand, source: resolved.provenance.checkCommand },
|
|
205
|
+
integrationBranch: { value: resolved.config.integrationBranch, source: resolved.provenance.integrationBranch },
|
|
206
|
+
capacity: { value: resolved.config.capacity, source: resolved.provenance.capacity },
|
|
207
|
+
runnerCommand: { value: resolved.config.runnerCommand, source: resolved.provenance.runnerCommand },
|
|
208
|
+
allowedTools: { value: resolved.allowedTools.value, source: 'composed', parts: resolved.allowedTools.parts, applied: resolved.allowedTools.applied },
|
|
209
|
+
model: { value: resolved.model.value, source: resolved.provenance.model, applied: resolved.model.applied },
|
|
210
|
+
effort: { value: resolved.effort.value, source: resolved.provenance.effort, applied: resolved.effort.applied },
|
|
211
|
+
},
|
|
212
|
+
toolchain: resolved.toolchain,
|
|
213
|
+
overrides: resolved.overrides,
|
|
214
|
+
needsConfig: resolved.needsConfig,
|
|
215
|
+
};
|
|
216
|
+
}
|
|
217
|
+
//# sourceMappingURL=resolve.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/runs/resolve.ts"],"names":[],"mappings":"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"}
|
package/dist/src/runs/runDir.js
CHANGED
|
@@ -4,12 +4,15 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { execFile } from 'node:child_process';
|
|
6
6
|
import { createHash } from 'node:crypto';
|
|
7
|
-
import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from 'node:fs';
|
|
7
|
+
import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, writeFileSync } from 'node:fs';
|
|
8
8
|
import { homedir } from 'node:os';
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import { promisify } from 'node:util';
|
|
11
|
-
import { configSchema, defaultConfig } from '../config.js';
|
|
11
|
+
import { configSchema, defaultConfig, loadConfig } from '../config.js';
|
|
12
12
|
import { parse as parseYaml } from 'yaml';
|
|
13
|
+
import { detectIntegrationBranch } from '../toolchain/branch.js';
|
|
14
|
+
import { detectToolchain } from '../toolchain/detect.js';
|
|
15
|
+
import { resolveLayers } from './resolve.js';
|
|
13
16
|
const execFileP = promisify(execFile);
|
|
14
17
|
export const REPO_FILE = 'repo';
|
|
15
18
|
export const DAEMON_JSON = 'daemon.json';
|
|
@@ -17,6 +20,8 @@ export const DAEMON_PID = 'daemon.pid';
|
|
|
17
20
|
export const DAEMON_LOG = 'daemon.log';
|
|
18
21
|
export const GRAPH_FILE = 'graph.yaml';
|
|
19
22
|
export const CONFIG_FILE = 'orchestrator.yaml';
|
|
23
|
+
/** The resolved configuration with provenance, written beside daemon.json. See specs/toolchain-discovery "Resolved configuration record". */
|
|
24
|
+
export const CONFIG_JSON = 'config.json';
|
|
20
25
|
export function orchHome(env = process.env) {
|
|
21
26
|
return env['ORCH_HOME'] ?? path.join(homedir(), '.orchestrator');
|
|
22
27
|
}
|
|
@@ -100,25 +105,70 @@ export function readRepoConfigRaw(realRepoPath) {
|
|
|
100
105
|
return undefined;
|
|
101
106
|
}
|
|
102
107
|
}
|
|
103
|
-
/**
|
|
104
|
-
|
|
105
|
-
* dataDir and graphPath default to the run directory unless the file sets them.
|
|
106
|
-
*/
|
|
107
|
-
export async function resolveRunConfig(realRepoPath, env = process.env) {
|
|
108
|
+
/** The file layer and defaults for a run: <repo>/orchestrator.yaml when present. dataDir and graphPath default to the run directory unless the file sets them. */
|
|
109
|
+
function baseRunConfig(realRepoPath, env) {
|
|
108
110
|
const p = runPaths(realRepoPath, env);
|
|
109
111
|
const file = path.join(realRepoPath, CONFIG_FILE);
|
|
110
112
|
if (!existsSync(file)) {
|
|
111
|
-
return defaultConfig({ repoPath: realRepoPath, dataDir: p.runDir, graphPath: p.graphPath, runDir: p.runDir });
|
|
113
|
+
return { config: defaultConfig({ repoPath: realRepoPath, dataDir: p.runDir, graphPath: p.graphPath, runDir: p.runDir }), fileRaw: undefined };
|
|
112
114
|
}
|
|
113
115
|
const raw = (parseYaml(readFileSync(file, 'utf8')) ?? {});
|
|
114
116
|
const cfg = configSchema.parse(raw);
|
|
115
117
|
const abs = (v) => (path.isAbsolute(v) ? v : path.resolve(realRepoPath, v));
|
|
116
118
|
return {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
119
|
+
config: {
|
|
120
|
+
...cfg,
|
|
121
|
+
repoPath: raw['repoPath'] ? abs(String(raw['repoPath'])) : realRepoPath,
|
|
122
|
+
dataDir: raw['dataDir'] ? abs(String(raw['dataDir'])) : p.runDir,
|
|
123
|
+
graphPath: raw['graphPath'] ? abs(String(raw['graphPath'])) : p.graphPath,
|
|
124
|
+
runDir: p.runDir,
|
|
125
|
+
},
|
|
126
|
+
fileRaw: raw,
|
|
122
127
|
};
|
|
123
128
|
}
|
|
129
|
+
/** Detection from the repository: the toolchain table and the integration branch. See specs/toolchain-discovery. */
|
|
130
|
+
export async function detectRepo(repo) {
|
|
131
|
+
const [toolchain, integrationBranch] = await Promise.all([detectToolchain(repo), detectIntegrationBranch(repo)]);
|
|
132
|
+
return { toolchain, integrationBranch };
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* The resolved configuration for a run: arguments over <repo>/orchestrator.yaml
|
|
136
|
+
* over the pinned branch over detection over defaults, with provenance.
|
|
137
|
+
* Callers that only need the values read `.config`.
|
|
138
|
+
*/
|
|
139
|
+
export async function resolveRunConfig(realRepoPath, env = process.env, opts = {}) {
|
|
140
|
+
const { config, fileRaw } = baseRunConfig(realRepoPath, env);
|
|
141
|
+
const detected = opts.detect === false ? undefined : await detectRepo(config.repoPath);
|
|
142
|
+
return resolveLayers({ base: config, fileRaw, detected, pinned: opts.pinned }, opts.overrides ?? {});
|
|
143
|
+
}
|
|
144
|
+
/** The same resolution over an explicit config file (`orchestrator --config`). */
|
|
145
|
+
export async function resolveFileConfig(file, opts = {}) {
|
|
146
|
+
const config = await loadConfig(file);
|
|
147
|
+
let fileRaw = {};
|
|
148
|
+
try {
|
|
149
|
+
const raw = parseYaml(readFileSync(file, 'utf8'));
|
|
150
|
+
if (raw && typeof raw === 'object')
|
|
151
|
+
fileRaw = raw;
|
|
152
|
+
}
|
|
153
|
+
catch {
|
|
154
|
+
/* loadConfig already parsed it */
|
|
155
|
+
}
|
|
156
|
+
const detected = opts.detect === false ? undefined : await detectRepo(config.repoPath);
|
|
157
|
+
return resolveLayers({ base: config, fileRaw, detected, pinned: opts.pinned }, opts.overrides ?? {});
|
|
158
|
+
}
|
|
159
|
+
/** Atomic write of the resolved configuration record (temp file and rename). */
|
|
160
|
+
export function writeConfigJson(runDir, record) {
|
|
161
|
+
const target = path.join(runDir, CONFIG_JSON);
|
|
162
|
+
const tmp = `${target}.${process.pid}.tmp`;
|
|
163
|
+
writeFileSync(tmp, `${JSON.stringify(record, null, 2)}\n`, 'utf8');
|
|
164
|
+
renameSync(tmp, target);
|
|
165
|
+
}
|
|
166
|
+
export function readConfigJson(runDir) {
|
|
167
|
+
try {
|
|
168
|
+
return JSON.parse(readFileSync(path.join(runDir, CONFIG_JSON), 'utf8'));
|
|
169
|
+
}
|
|
170
|
+
catch {
|
|
171
|
+
return undefined;
|
|
172
|
+
}
|
|
173
|
+
}
|
|
124
174
|
//# sourceMappingURL=runDir.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runDir.js","sourceRoot":"","sources":["../../../src/runs/runDir.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"runDir.js","sourceRoot":"","sources":["../../../src/runs/runDir.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/state/store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/state/store.ts"],"names":[],"mappings":"AAuPA,4DAA4D;AAC5D,MAAM,UAAU,SAAS,CAAC,KAAY;IACpC,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACnC,OAAO,GAAG,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAmB,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAY,EAAE,GAAkB;IACzD,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,KAAY;IAClC,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAY,EAAE,EAAU;IAC/C,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAC3B,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Integration branch detection: the remote's default branch when it exists
|
|
3
|
+
* locally, else the checked-out branch, else nothing (the default applies).
|
|
4
|
+
* See specs/toolchain-discovery "Integration branch detection and pinning".
|
|
5
|
+
*/
|
|
6
|
+
import { git } from '../workspace/git.js';
|
|
7
|
+
export async function detectIntegrationBranch(repo) {
|
|
8
|
+
const originHead = await git(repo, ['symbolic-ref', '-q', 'refs/remotes/origin/HEAD'], { allowFail: true });
|
|
9
|
+
if (originHead.code === 0) {
|
|
10
|
+
const name = originHead.stdout.trim().replace(/^refs\/remotes\/origin\//, '');
|
|
11
|
+
if (name && (await git(repo, ['show-ref', '--verify', '--quiet', `refs/heads/${name}`], { allowFail: true })).code === 0)
|
|
12
|
+
return name;
|
|
13
|
+
}
|
|
14
|
+
const current = await git(repo, ['symbolic-ref', '-q', '--short', 'HEAD'], { allowFail: true });
|
|
15
|
+
if (current.code === 0 && current.stdout.trim())
|
|
16
|
+
return current.stdout.trim();
|
|
17
|
+
return undefined;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=branch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../../src/toolchain/branch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,IAAY;IACxD,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,cAAc,EAAE,IAAI,EAAE,0BAA0B,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5G,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC;QAC9E,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,IAAI,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;IACxI,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChG,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC9E,OAAO,SAAS,CAAC;AACnB,CAAC"}
|