@cliangdev/conductor 0.6.1 → 0.7.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/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/config.js +38 -0
- package/dist/commands/config.js.map +1 -1
- package/dist/daemon/job-runner.d.ts +65 -0
- package/dist/daemon/job-runner.d.ts.map +1 -0
- package/dist/daemon/job-runner.js +336 -0
- package/dist/daemon/job-runner.js.map +1 -0
- package/dist/daemon/run-lifecycle.d.ts +7 -0
- package/dist/daemon/run-lifecycle.d.ts.map +1 -1
- package/dist/daemon/run-lifecycle.js +26 -0
- package/dist/daemon/run-lifecycle.js.map +1 -1
- package/dist/daemon/run-queue.d.ts +6 -1
- package/dist/daemon/run-queue.d.ts.map +1 -1
- package/dist/daemon/run-queue.js +42 -3
- package/dist/daemon/run-queue.js.map +1 -1
- package/dist/daemon/runner.d.ts +16 -0
- package/dist/daemon/runner.d.ts.map +1 -1
- package/dist/daemon/runner.js +25 -19
- package/dist/daemon/runner.js.map +1 -1
- package/dist/daemon/watcher.d.ts.map +1 -1
- package/dist/daemon/watcher.js +7 -1
- package/dist/daemon/watcher.js.map +1 -1
- package/dist/lib/config.d.ts +4 -0
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +5 -1
- package/dist/lib/config.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAyBnC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoIrD"}
|
package/dist/commands/config.js
CHANGED
|
@@ -10,6 +10,11 @@ function redactApiKey(apiKey) {
|
|
|
10
10
|
return '***';
|
|
11
11
|
return `${apiKey.slice(0, 4)}...${apiKey.slice(-4)}`;
|
|
12
12
|
}
|
|
13
|
+
function redactToken(token) {
|
|
14
|
+
if (!token)
|
|
15
|
+
return 'not set';
|
|
16
|
+
return redactApiKey(token);
|
|
17
|
+
}
|
|
13
18
|
export function registerConfig(program) {
|
|
14
19
|
const config = program
|
|
15
20
|
.command('config')
|
|
@@ -43,6 +48,7 @@ Examples:
|
|
|
43
48
|
projectName: cfg.projectName,
|
|
44
49
|
email: cfg.email,
|
|
45
50
|
apiKey: redactApiKey(cfg.apiKey),
|
|
51
|
+
claudeCodeOauthToken: redactToken(cfg.claudeCodeOauthToken),
|
|
46
52
|
};
|
|
47
53
|
process.stdout.write(JSON.stringify(output, null, 2) + '\n');
|
|
48
54
|
process.exit(0);
|
|
@@ -53,6 +59,7 @@ Examples:
|
|
|
53
59
|
console.log(`projectName: ${cfg.projectName}`);
|
|
54
60
|
console.log(`email: ${cfg.email}`);
|
|
55
61
|
console.log(`apiKey: ${redactApiKey(cfg.apiKey)}`);
|
|
62
|
+
console.log(`claudeCodeOauthToken: ${redactToken(cfg.claudeCodeOauthToken)}`);
|
|
56
63
|
});
|
|
57
64
|
config
|
|
58
65
|
.command('use <env>')
|
|
@@ -102,5 +109,36 @@ Examples:
|
|
|
102
109
|
writeConfig(cfg);
|
|
103
110
|
console.log(`API URL updated to: ${url}`);
|
|
104
111
|
});
|
|
112
|
+
config
|
|
113
|
+
.command('set-claude-code-oauth-token <token>')
|
|
114
|
+
.description('Store a Claude Code subscription token (from `claude setup-token`) for the claude-code workflow step')
|
|
115
|
+
.addHelpText('after', `
|
|
116
|
+
Examples:
|
|
117
|
+
conductor config set-claude-code-oauth-token sk-ant-oat01-...`)
|
|
118
|
+
.action((token) => {
|
|
119
|
+
const cfg = readConfig();
|
|
120
|
+
if (!cfg) {
|
|
121
|
+
console.error('No config found — run conductor login first');
|
|
122
|
+
process.exit(1);
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
cfg.claudeCodeOauthToken = token;
|
|
126
|
+
writeConfig(cfg);
|
|
127
|
+
console.log(`Claude Code OAuth token saved: ${redactToken(token)}`);
|
|
128
|
+
});
|
|
129
|
+
config
|
|
130
|
+
.command('unset-claude-code-oauth-token')
|
|
131
|
+
.description('Remove the stored Claude Code subscription token')
|
|
132
|
+
.action(() => {
|
|
133
|
+
const cfg = readConfig();
|
|
134
|
+
if (!cfg) {
|
|
135
|
+
console.error('No config found — run conductor login first');
|
|
136
|
+
process.exit(1);
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
delete cfg.claudeCodeOauthToken;
|
|
140
|
+
writeConfig(cfg);
|
|
141
|
+
console.log('Claude Code OAuth token removed.');
|
|
142
|
+
});
|
|
105
143
|
}
|
|
106
144
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAO1D,MAAM,OAAO,GAA2B;IACtC,IAAI,EAAE;QACJ,MAAM,EAAE,4DAA4D;QACpE,WAAW,EAAE,6DAA6D;KAC3E;CACF,CAAA;AAED,SAAS,YAAY,CAAC,MAAc;IAClC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,KAAK,CAAA;IACpC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAgB;IAC7C,MAAM,MAAM,GAAG,OAAO;SACnB,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,0BAA0B,CAAC;SACvC,WAAW,CAAC,OAAO,EAAE;;;;;0DAKgC,CAAC,CAAA;IAEzD,MAAM;SACH,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,+BAA+B,CAAC;SAC5C,MAAM,CAAC,QAAQ,EAAE,4CAA4C,CAAC;SAC9D,WAAW,CAAC,OAAO,EAAE;;;+BAGK,CAAC;SAC3B,MAAM,CAAC,CAAC,OAA2B,EAAE,EAAE;QACtC,MAAM,GAAG,GAAG,UAAU,EAAE,CAAA;QACxB,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAA;YAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACf,OAAM;QACR,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,MAAM,GAAG;gBACb,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import type { Config } from '../lib/config.js';
|
|
2
|
+
/**
|
|
3
|
+
* Pointer-only daemon event for the per-job dispatch protocol ("protocol 2").
|
|
4
|
+
* Carries no secrets/env — the daemon fetches the interpolated dispatch
|
|
5
|
+
* payload (env, steps, run token) at pickup. The events API delivers
|
|
6
|
+
* {eventId, type, payload: {...}}; the watcher flattens the payload into
|
|
7
|
+
* this top-level shape before enqueueing.
|
|
8
|
+
*/
|
|
9
|
+
export interface WorkflowJobEvent {
|
|
10
|
+
eventId: string;
|
|
11
|
+
type: string;
|
|
12
|
+
protocol: 2;
|
|
13
|
+
workflowRunId: string;
|
|
14
|
+
jobId: string;
|
|
15
|
+
jobRunId: string;
|
|
16
|
+
projectId: string;
|
|
17
|
+
workflowName: string;
|
|
18
|
+
}
|
|
19
|
+
export interface DispatchStep {
|
|
20
|
+
stepIndex: number;
|
|
21
|
+
workerJobId: string;
|
|
22
|
+
stepId: string;
|
|
23
|
+
stepName: string;
|
|
24
|
+
stepType: string;
|
|
25
|
+
prompt?: string;
|
|
26
|
+
env?: Record<string, string>;
|
|
27
|
+
timeoutMinutes?: number;
|
|
28
|
+
conductorMcp?: boolean;
|
|
29
|
+
allowedTools?: string;
|
|
30
|
+
maxTurns?: number;
|
|
31
|
+
inputsJson?: string;
|
|
32
|
+
outputSchemaJson?: string;
|
|
33
|
+
}
|
|
34
|
+
export interface DispatchPayload {
|
|
35
|
+
jobRunId: string;
|
|
36
|
+
protocol: number;
|
|
37
|
+
image?: string;
|
|
38
|
+
env: Record<string, string>;
|
|
39
|
+
steps: DispatchStep[];
|
|
40
|
+
runToken: string;
|
|
41
|
+
callbacks: {
|
|
42
|
+
logChunkUrlTemplate: string;
|
|
43
|
+
stepCompleteUrlTemplate: string;
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
export declare const DEFAULT_RUNNER_IMAGE = "ghcr.io/cliangdev/conductor-runner:3";
|
|
47
|
+
export declare const DEFAULT_TIMEOUT_MINUTES = 30;
|
|
48
|
+
/** Fills a `{workerJobId}` placeholder in a callback URL template. Templates
|
|
49
|
+
* with no placeholder (e.g. a run-scoped log-chunk URL) are returned as-is. */
|
|
50
|
+
export declare function fillTemplate(template: string, workerJobId: string): string;
|
|
51
|
+
/**
|
|
52
|
+
* Assembles the container env contract for a single step: job-level payload
|
|
53
|
+
* env, overridden by step-level env, overridden by the CONDUCTOR_* contract
|
|
54
|
+
* vars. `ANTHROPIC_API_KEY` is stripped unconditionally — self-hosted jobs
|
|
55
|
+
* must never carry it, even if it leaked into the payload's env — since it
|
|
56
|
+
* silently overrides subscription auth in `claude -p`.
|
|
57
|
+
*/
|
|
58
|
+
export declare function buildStepEnv(payload: DispatchPayload, step: DispatchStep, event: WorkflowJobEvent, config: Config, stepCompleteUrl: string, logChunkUrl: string): Record<string, string>;
|
|
59
|
+
/**
|
|
60
|
+
* Handles a single `workflow.job` event end-to-end: fetches the interpolated
|
|
61
|
+
* dispatch payload, runs each step sequentially (stopping at the first
|
|
62
|
+
* failure), posts the job-level completion, then acks the event.
|
|
63
|
+
*/
|
|
64
|
+
export declare function runWorkflowJob(event: WorkflowJobEvent, config: Config): Promise<void>;
|
|
65
|
+
//# sourceMappingURL=job-runner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-runner.d.ts","sourceRoot":"","sources":["../../src/daemon/job-runner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAM9C;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,CAAC,CAAA;IACX,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3B,KAAK,EAAE,YAAY,EAAE,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE;QACT,mBAAmB,EAAE,MAAM,CAAA;QAC3B,uBAAuB,EAAE,MAAM,CAAA;KAChC,CAAA;CACF;AAUD,eAAO,MAAM,oBAAoB,yCAAyC,CAAA;AAC1E,eAAO,MAAM,uBAAuB,KAAK,CAAA;AA6BzC;+EAC+E;AAC/E,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE1E;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,gBAAgB,EACvB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,GAClB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiCxB;AA8PD;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuC3F"}
|
|
@@ -0,0 +1,336 @@
|
|
|
1
|
+
import * as fs from 'fs';
|
|
2
|
+
import * as os from 'os';
|
|
3
|
+
import * as path from 'path';
|
|
4
|
+
import { randomUUID } from 'crypto';
|
|
5
|
+
import { spawnAndWait, buildEnvArgs } from './runner.js';
|
|
6
|
+
import { acknowledgeEvent, completeJob } from './run-lifecycle.js';
|
|
7
|
+
// ─── Constants ───────────────────────────────────────────────────────────────
|
|
8
|
+
export const DEFAULT_RUNNER_IMAGE = 'ghcr.io/cliangdev/conductor-runner:3';
|
|
9
|
+
export const DEFAULT_TIMEOUT_MINUTES = 30;
|
|
10
|
+
const LOG_BATCH_INTERVAL_MS = 2000;
|
|
11
|
+
/** Extra headroom for the daemon's kill backstop on claude-code steps: the
|
|
12
|
+
* entrypoint enforces the real timeout itself (SIGTERM→SIGKILL, then
|
|
13
|
+
* self-reports CLAUDE_TIMEOUT); killing at exactly the same moment would race
|
|
14
|
+
* that self-report. */
|
|
15
|
+
const CLAUDE_TIMEOUT_GRACE_MS = 2 * 60000;
|
|
16
|
+
/** conductor-claude-entrypoint exit taxonomy → job-level errorReason. */
|
|
17
|
+
const CLAUDE_EXIT_ERROR_REASONS = {
|
|
18
|
+
10: 'CLAUDE_AGENT_ERROR',
|
|
19
|
+
11: 'CLAUDE_AUTH_ERROR',
|
|
20
|
+
12: 'CLAUDE_RATE_LIMITED',
|
|
21
|
+
13: 'CLAUDE_TIMEOUT',
|
|
22
|
+
20: 'CLAUDE_CONFIG_ERROR',
|
|
23
|
+
};
|
|
24
|
+
/** Env keys that must never appear in `docker run -e KEY=VALUE` argv — visible to any local user
|
|
25
|
+
* via `ps`/procfs. These go into a `--env-file` instead (see {@link splitSecretEnv}). */
|
|
26
|
+
const DOCKER_ARGV_SECRET_KEYS = [
|
|
27
|
+
'CLAUDE_CODE_OAUTH_TOKEN',
|
|
28
|
+
'CONDUCTOR_API_KEY',
|
|
29
|
+
'CONDUCTOR_RUN_TOKEN',
|
|
30
|
+
'ANTHROPIC_API_KEY',
|
|
31
|
+
];
|
|
32
|
+
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
|
33
|
+
/** Fills a `{workerJobId}` placeholder in a callback URL template. Templates
|
|
34
|
+
* with no placeholder (e.g. a run-scoped log-chunk URL) are returned as-is. */
|
|
35
|
+
export function fillTemplate(template, workerJobId) {
|
|
36
|
+
return template.replace(/\{workerJobId\}/g, workerJobId);
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Assembles the container env contract for a single step: job-level payload
|
|
40
|
+
* env, overridden by step-level env, overridden by the CONDUCTOR_* contract
|
|
41
|
+
* vars. `ANTHROPIC_API_KEY` is stripped unconditionally — self-hosted jobs
|
|
42
|
+
* must never carry it, even if it leaked into the payload's env — since it
|
|
43
|
+
* silently overrides subscription auth in `claude -p`.
|
|
44
|
+
*/
|
|
45
|
+
export function buildStepEnv(payload, step, event, config, stepCompleteUrl, logChunkUrl) {
|
|
46
|
+
const baseEnv = { ...payload.env, ...(step.env ?? {}) };
|
|
47
|
+
delete baseEnv['ANTHROPIC_API_KEY'];
|
|
48
|
+
const contractEnv = {
|
|
49
|
+
CONDUCTOR_API_URL: config.apiUrl,
|
|
50
|
+
CONDUCTOR_PROJECT_ID: event.projectId,
|
|
51
|
+
CONDUCTOR_WORKFLOW_RUN_ID: event.workflowRunId,
|
|
52
|
+
CONDUCTOR_JOB_ID: event.jobId,
|
|
53
|
+
CONDUCTOR_WORKER_JOB_ID: step.workerJobId,
|
|
54
|
+
CONDUCTOR_RUN_TOKEN: payload.runToken,
|
|
55
|
+
CONDUCTOR_LOG_CHUNK_URL: logChunkUrl,
|
|
56
|
+
CONDUCTOR_STEP_COMPLETE_URL: stepCompleteUrl,
|
|
57
|
+
CONDUCTOR_TIMEOUT_MINUTES: String(step.timeoutMinutes ?? DEFAULT_TIMEOUT_MINUTES),
|
|
58
|
+
CONDUCTOR_MCP_ENABLED: step.conductorMcp ? 'true' : 'false',
|
|
59
|
+
};
|
|
60
|
+
if (step.conductorMcp) {
|
|
61
|
+
contractEnv.CONDUCTOR_API_KEY = config.apiKey;
|
|
62
|
+
}
|
|
63
|
+
if (step.stepType === 'claude-code') {
|
|
64
|
+
contractEnv.CONDUCTOR_STEP_PROMPT = step.prompt ?? '';
|
|
65
|
+
if (step.inputsJson !== undefined)
|
|
66
|
+
contractEnv.CONDUCTOR_STEP_INPUTS_JSON = step.inputsJson;
|
|
67
|
+
if (step.allowedTools !== undefined)
|
|
68
|
+
contractEnv.CONDUCTOR_ALLOWED_TOOLS = step.allowedTools;
|
|
69
|
+
if (step.maxTurns !== undefined)
|
|
70
|
+
contractEnv.CONDUCTOR_MAX_TURNS = String(step.maxTurns);
|
|
71
|
+
if (step.outputSchemaJson !== undefined)
|
|
72
|
+
contractEnv.CONDUCTOR_OUTPUT_SCHEMA_JSON = step.outputSchemaJson;
|
|
73
|
+
// Caller (runStep) guarantees this is present before reaching here.
|
|
74
|
+
contractEnv.CLAUDE_CODE_OAUTH_TOKEN = config.claudeCodeOauthToken ?? '';
|
|
75
|
+
}
|
|
76
|
+
const merged = { ...baseEnv, ...contractEnv };
|
|
77
|
+
delete merged['ANTHROPIC_API_KEY'];
|
|
78
|
+
return merged;
|
|
79
|
+
}
|
|
80
|
+
/** Redacts secret values (OAuth token, API key, run token) from a log line
|
|
81
|
+
* before it's posted upstream. */
|
|
82
|
+
function redactSecrets(line, secrets) {
|
|
83
|
+
let out = line;
|
|
84
|
+
for (const secret of secrets) {
|
|
85
|
+
if (!secret)
|
|
86
|
+
continue;
|
|
87
|
+
out = out.split(secret).join('***REDACTED***');
|
|
88
|
+
}
|
|
89
|
+
return out;
|
|
90
|
+
}
|
|
91
|
+
/** Batches log lines and POSTs them to the log-chunk callback as `{lines}`
|
|
92
|
+
* with the per-run token — the protocol-2 shape, distinct from the legacy
|
|
93
|
+
* `{chunk}` + apiKey shape in runner.ts's streamLogChunk. */
|
|
94
|
+
function createLogBatcher(logChunkUrl, runToken, secrets) {
|
|
95
|
+
let buffer = [];
|
|
96
|
+
let timer = null;
|
|
97
|
+
async function flush() {
|
|
98
|
+
if (buffer.length === 0)
|
|
99
|
+
return;
|
|
100
|
+
const lines = buffer;
|
|
101
|
+
buffer = [];
|
|
102
|
+
try {
|
|
103
|
+
await fetch(logChunkUrl, {
|
|
104
|
+
method: 'POST',
|
|
105
|
+
headers: {
|
|
106
|
+
'Content-Type': 'application/json',
|
|
107
|
+
Authorization: `Bearer ${runToken}`,
|
|
108
|
+
},
|
|
109
|
+
body: JSON.stringify({ lines }),
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
catch (err) {
|
|
113
|
+
console.error('[job-runner] Failed to stream log chunk:', err);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
function push(rawChunk) {
|
|
117
|
+
const redacted = redactSecrets(rawChunk, secrets);
|
|
118
|
+
for (const line of redacted.split('\n')) {
|
|
119
|
+
if (line.length > 0)
|
|
120
|
+
buffer.push(line);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
function start() {
|
|
124
|
+
timer = setInterval(() => {
|
|
125
|
+
void flush();
|
|
126
|
+
}, LOG_BATCH_INTERVAL_MS);
|
|
127
|
+
}
|
|
128
|
+
function stop() {
|
|
129
|
+
if (timer !== null) {
|
|
130
|
+
clearInterval(timer);
|
|
131
|
+
timer = null;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
return { push, flush, start, stop };
|
|
135
|
+
}
|
|
136
|
+
async function fetchDispatchPayload(event, config) {
|
|
137
|
+
const url = `${config.apiUrl}/api/v1/workflow-runs/${event.workflowRunId}/jobs/${event.jobId}/dispatch-payload`;
|
|
138
|
+
try {
|
|
139
|
+
const response = await fetch(url, {
|
|
140
|
+
headers: {
|
|
141
|
+
Authorization: `Bearer ${config.apiKey}`,
|
|
142
|
+
'Content-Type': 'application/json',
|
|
143
|
+
},
|
|
144
|
+
});
|
|
145
|
+
if (response.status === 404 || response.status === 410) {
|
|
146
|
+
return 'not-found';
|
|
147
|
+
}
|
|
148
|
+
if (!response.ok) {
|
|
149
|
+
console.error(`[job-runner] dispatch-payload fetch failed with status ${response.status}`);
|
|
150
|
+
return null;
|
|
151
|
+
}
|
|
152
|
+
return (await response.json());
|
|
153
|
+
}
|
|
154
|
+
catch (err) {
|
|
155
|
+
console.error('[job-runner] Failed to fetch dispatch payload:', err);
|
|
156
|
+
return null;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* Splits a step's container env into secret keys (never argv/procfs, see
|
|
161
|
+
* {@link DOCKER_ARGV_SECRET_KEYS}) and everything else, which still goes through `-e` args —
|
|
162
|
+
* `docker run --env-file` can't carry multiline values, and non-secret env is never multiline in
|
|
163
|
+
* practice (the claude-code prompt, which can be, is a secret-adjacent CONDUCTOR_STEP_PROMPT var
|
|
164
|
+
* that isn't in the secret list and stays on argv; only the four listed keys are ever redirected).
|
|
165
|
+
*/
|
|
166
|
+
function splitSecretEnv(env) {
|
|
167
|
+
const fileEnv = {};
|
|
168
|
+
const argEnv = {};
|
|
169
|
+
for (const [key, value] of Object.entries(env)) {
|
|
170
|
+
if (!DOCKER_ARGV_SECRET_KEYS.includes(key)) {
|
|
171
|
+
argEnv[key] = value;
|
|
172
|
+
continue;
|
|
173
|
+
}
|
|
174
|
+
if (value.includes('\n')) {
|
|
175
|
+
console.error(`[job-runner] ${key} contains a newline, which docker --env-file cannot carry; ` +
|
|
176
|
+
'omitting it from the container env');
|
|
177
|
+
continue;
|
|
178
|
+
}
|
|
179
|
+
fileEnv[key] = value;
|
|
180
|
+
}
|
|
181
|
+
return { fileEnv, argEnv };
|
|
182
|
+
}
|
|
183
|
+
/** Writes secret env vars to a mode-0600 temp file for `docker run --env-file`, keeping them out
|
|
184
|
+
* of process argv. Caller is responsible for deleting the returned path once the container exits. */
|
|
185
|
+
function writeSecretEnvFile(fileEnv) {
|
|
186
|
+
const filePath = path.join(os.tmpdir(), `conductor-env-${randomUUID()}.env`);
|
|
187
|
+
const contents = Object.entries(fileEnv)
|
|
188
|
+
.map(([key, value]) => `${key}=${value}`)
|
|
189
|
+
.join('\n');
|
|
190
|
+
fs.writeFileSync(filePath, contents + '\n', { mode: 0o600 });
|
|
191
|
+
return filePath;
|
|
192
|
+
}
|
|
193
|
+
async function postStepComplete(stepCompleteUrl, runToken, body) {
|
|
194
|
+
try {
|
|
195
|
+
await fetch(stepCompleteUrl, {
|
|
196
|
+
method: 'POST',
|
|
197
|
+
headers: {
|
|
198
|
+
'Content-Type': 'application/json',
|
|
199
|
+
Authorization: `Bearer ${runToken}`,
|
|
200
|
+
},
|
|
201
|
+
body: JSON.stringify(body),
|
|
202
|
+
});
|
|
203
|
+
}
|
|
204
|
+
catch (err) {
|
|
205
|
+
console.error('[job-runner] Failed to post step-complete:', err);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
// ─── Step execution ─────────────────────────────────────────────────────────
|
|
209
|
+
async function runStep(event, payload, step, config) {
|
|
210
|
+
const stepCompleteUrl = fillTemplate(payload.callbacks.stepCompleteUrlTemplate, step.workerJobId);
|
|
211
|
+
const logChunkUrl = fillTemplate(payload.callbacks.logChunkUrlTemplate, step.workerJobId);
|
|
212
|
+
const isClaudeCode = step.stepType === 'claude-code';
|
|
213
|
+
if (isClaudeCode && !config.claudeCodeOauthToken) {
|
|
214
|
+
const result = { status: 'FAILED', errorReason: 'CLAUDE_SUBSCRIPTION_NOT_CONFIGURED' };
|
|
215
|
+
await postStepComplete(stepCompleteUrl, payload.runToken, result);
|
|
216
|
+
return result;
|
|
217
|
+
}
|
|
218
|
+
const env = buildStepEnv(payload, step, event, config, stepCompleteUrl, logChunkUrl);
|
|
219
|
+
const { fileEnv, argEnv } = splitSecretEnv(env);
|
|
220
|
+
const envFilePath = Object.keys(fileEnv).length > 0 ? writeSecretEnvFile(fileEnv) : null;
|
|
221
|
+
const image = payload.image ?? DEFAULT_RUNNER_IMAGE;
|
|
222
|
+
const containerName = `conductor-job-${payload.jobRunId}-${step.stepIndex}`;
|
|
223
|
+
const command = isClaudeCode ? ['conductor-claude-entrypoint'] : [];
|
|
224
|
+
const runArgs = [
|
|
225
|
+
'run',
|
|
226
|
+
'--rm',
|
|
227
|
+
'--name',
|
|
228
|
+
containerName,
|
|
229
|
+
...(envFilePath ? ['--env-file', envFilePath] : []),
|
|
230
|
+
...buildEnvArgs(argEnv),
|
|
231
|
+
image,
|
|
232
|
+
...command,
|
|
233
|
+
];
|
|
234
|
+
const secrets = [payload.runToken, config.apiKey, config.claudeCodeOauthToken ?? ''];
|
|
235
|
+
const logBatcher = createLogBatcher(logChunkUrl, payload.runToken, secrets);
|
|
236
|
+
logBatcher.start();
|
|
237
|
+
let timedOut = false;
|
|
238
|
+
const timeoutMs = (step.timeoutMinutes ?? DEFAULT_TIMEOUT_MINUTES) * 60000 +
|
|
239
|
+
(isClaudeCode ? CLAUDE_TIMEOUT_GRACE_MS : 0);
|
|
240
|
+
const timeoutTimer = setTimeout(() => {
|
|
241
|
+
timedOut = true;
|
|
242
|
+
void spawnAndWait('docker', ['kill', containerName]);
|
|
243
|
+
}, timeoutMs);
|
|
244
|
+
let spawnFailed = false;
|
|
245
|
+
let exitCode;
|
|
246
|
+
try {
|
|
247
|
+
exitCode = await spawnAndWait('docker', runArgs, {
|
|
248
|
+
onLine: logBatcher.push,
|
|
249
|
+
onSpawnError: () => {
|
|
250
|
+
spawnFailed = true;
|
|
251
|
+
},
|
|
252
|
+
});
|
|
253
|
+
}
|
|
254
|
+
finally {
|
|
255
|
+
if (envFilePath) {
|
|
256
|
+
try {
|
|
257
|
+
fs.unlinkSync(envFilePath);
|
|
258
|
+
}
|
|
259
|
+
catch (err) {
|
|
260
|
+
console.error('[job-runner] Failed to remove secret env file:', err);
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
clearTimeout(timeoutTimer);
|
|
265
|
+
logBatcher.stop();
|
|
266
|
+
await logBatcher.flush();
|
|
267
|
+
if (timedOut) {
|
|
268
|
+
const result = { status: 'FAILED', errorReason: 'STEP_TIMEOUT', exitCode };
|
|
269
|
+
await postStepComplete(stepCompleteUrl, payload.runToken, result);
|
|
270
|
+
return result;
|
|
271
|
+
}
|
|
272
|
+
if (spawnFailed) {
|
|
273
|
+
const result = { status: 'FAILED', errorReason: 'STEP_LAUNCH_FAILED', exitCode };
|
|
274
|
+
await postStepComplete(stepCompleteUrl, payload.runToken, result);
|
|
275
|
+
return result;
|
|
276
|
+
}
|
|
277
|
+
if (isClaudeCode) {
|
|
278
|
+
// The container self-reports success/failure to CONDUCTOR_STEP_COMPLETE_URL
|
|
279
|
+
// as part of its own contract — the daemon must not double-post here.
|
|
280
|
+
// The exit code is only used to decide whether the job continues.
|
|
281
|
+
return exitCode === 0
|
|
282
|
+
? { status: 'SUCCESS' }
|
|
283
|
+
: {
|
|
284
|
+
status: 'FAILED',
|
|
285
|
+
errorReason: CLAUDE_EXIT_ERROR_REASONS[exitCode] ?? 'CLAUDE_AGENT_ERROR',
|
|
286
|
+
exitCode,
|
|
287
|
+
};
|
|
288
|
+
}
|
|
289
|
+
// Non-claude-code steps don't self-report; the daemon posts on their behalf.
|
|
290
|
+
const status = exitCode === 0 ? 'SUCCESS' : 'FAILED';
|
|
291
|
+
const result = status === 'SUCCESS' ? { status } : { status, errorReason: 'STEP_FAILED', exitCode };
|
|
292
|
+
await postStepComplete(stepCompleteUrl, payload.runToken, result);
|
|
293
|
+
return result;
|
|
294
|
+
}
|
|
295
|
+
// ─── Main ────────────────────────────────────────────────────────────────────
|
|
296
|
+
/**
|
|
297
|
+
* Handles a single `workflow.job` event end-to-end: fetches the interpolated
|
|
298
|
+
* dispatch payload, runs each step sequentially (stopping at the first
|
|
299
|
+
* failure), posts the job-level completion, then acks the event.
|
|
300
|
+
*/
|
|
301
|
+
export async function runWorkflowJob(event, config) {
|
|
302
|
+
const payload = await fetchDispatchPayload(event, config);
|
|
303
|
+
if (payload === 'not-found') {
|
|
304
|
+
// Job/run no longer exists server-side (e.g. cancelled) — nothing to
|
|
305
|
+
// report back to; just drop it.
|
|
306
|
+
await acknowledgeEvent(event.projectId, event.eventId, config);
|
|
307
|
+
return;
|
|
308
|
+
}
|
|
309
|
+
if (payload === null) {
|
|
310
|
+
// Transient failure — leave the event un-acked so the poller redelivers it.
|
|
311
|
+
return;
|
|
312
|
+
}
|
|
313
|
+
const image = payload.image ?? DEFAULT_RUNNER_IMAGE;
|
|
314
|
+
let jobStatus = 'SUCCESS';
|
|
315
|
+
let jobErrorReason;
|
|
316
|
+
let jobExitCode;
|
|
317
|
+
const pullCode = await spawnAndWait('docker', ['pull', image]);
|
|
318
|
+
if (pullCode !== 0) {
|
|
319
|
+
jobStatus = 'FAILED';
|
|
320
|
+
jobErrorReason = 'IMAGE_PULL_FAILED';
|
|
321
|
+
}
|
|
322
|
+
else {
|
|
323
|
+
for (const step of payload.steps) {
|
|
324
|
+
const result = await runStep(event, payload, step, config);
|
|
325
|
+
if (result.status === 'FAILED') {
|
|
326
|
+
jobStatus = 'FAILED';
|
|
327
|
+
jobErrorReason = result.errorReason;
|
|
328
|
+
jobExitCode = result.exitCode;
|
|
329
|
+
break;
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
await completeJob(event.workflowRunId, event.jobId, jobStatus, config, jobErrorReason, jobExitCode);
|
|
334
|
+
await acknowledgeEvent(event.projectId, event.eventId, config);
|
|
335
|
+
}
|
|
336
|
+
//# sourceMappingURL=job-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-runner.js","sourceRoot":"","sources":["../../src/daemon/job-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,4 +18,11 @@ export declare function acknowledgeEvent(projectId: string, eventId: string, con
|
|
|
18
18
|
* Used by the run queue orchestrator.
|
|
19
19
|
*/
|
|
20
20
|
export declare function completeRun(event: WorkflowTriggerEvent, status: 'SUCCESS' | 'FAILED', config: Config): Promise<void>;
|
|
21
|
+
/**
|
|
22
|
+
* POST /api/v1/workflow-runs/{runId}/jobs/{jobId}/complete
|
|
23
|
+
* Finalises a single self-hosted job under the per-job dispatch protocol.
|
|
24
|
+
* Errors are swallowed and logged — the caller acks the daemon event
|
|
25
|
+
* regardless, matching completeRun's fire-and-forget shape.
|
|
26
|
+
*/
|
|
27
|
+
export declare function completeJob(runId: string, jobId: string, status: 'SUCCESS' | 'FAILED', config: Config, errorReason?: string, exitCode?: number): Promise<void>;
|
|
21
28
|
//# sourceMappingURL=run-lifecycle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-lifecycle.d.ts","sourceRoot":"","sources":["../../src/daemon/run-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAIvD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,GAAG,QAAQ,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAaf;AAID;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAaf;AAID;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,SAAS,GAAG,QAAQ,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAGf"}
|
|
1
|
+
{"version":3,"file":"run-lifecycle.d.ts","sourceRoot":"","sources":["../../src/daemon/run-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAIvD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,GAAG,QAAQ,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAaf;AAID;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAaf;AAID;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,SAAS,GAAG,QAAQ,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAGf;AAID;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,GAAG,QAAQ,EAC5B,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAiBf"}
|
|
@@ -50,4 +50,30 @@ export async function completeRun(event, status, config) {
|
|
|
50
50
|
await updateRunStatus(event.workflowRunId, status, config);
|
|
51
51
|
await acknowledgeEvent(event.projectId, event.eventId, config);
|
|
52
52
|
}
|
|
53
|
+
// ─── completeJob (protocol 2) ──────────────────────────────────────────────────
|
|
54
|
+
/**
|
|
55
|
+
* POST /api/v1/workflow-runs/{runId}/jobs/{jobId}/complete
|
|
56
|
+
* Finalises a single self-hosted job under the per-job dispatch protocol.
|
|
57
|
+
* Errors are swallowed and logged — the caller acks the daemon event
|
|
58
|
+
* regardless, matching completeRun's fire-and-forget shape.
|
|
59
|
+
*/
|
|
60
|
+
export async function completeJob(runId, jobId, status, config, errorReason, exitCode) {
|
|
61
|
+
try {
|
|
62
|
+
await fetch(`${config.apiUrl}/api/v1/workflow-runs/${runId}/jobs/${jobId}/complete`, {
|
|
63
|
+
method: 'POST',
|
|
64
|
+
headers: {
|
|
65
|
+
'Content-Type': 'application/json',
|
|
66
|
+
Authorization: `Bearer ${config.apiKey}`,
|
|
67
|
+
},
|
|
68
|
+
body: JSON.stringify({
|
|
69
|
+
status,
|
|
70
|
+
...(errorReason !== undefined ? { errorReason } : {}),
|
|
71
|
+
...(exitCode !== undefined ? { exitCode } : {}),
|
|
72
|
+
}),
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
catch (err) {
|
|
76
|
+
console.error('[run-lifecycle] Failed to complete job:', err);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
53
79
|
//# sourceMappingURL=run-lifecycle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-lifecycle.js","sourceRoot":"","sources":["../../src/daemon/run-lifecycle.ts"],"names":[],"mappings":"AAGA,iFAAiF;AAEjF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,KAAa,EACb,MAA4B,EAC5B,MAAc;IAEd,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,yBAAyB,KAAK,EAAE,EAAE;YAC5D,MAAM,EAAE,OAAO;YACf,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;aACzC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;SACjC,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,8CAA8C,EAAE,GAAG,CAAC,CAAA;IACpE,CAAC;AACH,CAAC;AAED,iFAAiF;AAEjF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,OAAe,EACf,MAAc;IAEd,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,oBAAoB,SAAS,oBAAoB,EAAE;YAC7E,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;aACzC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC9C,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,8CAA8C,EAAE,GAAG,CAAC,CAAA;IACpE,CAAC;AACH,CAAC;AAED,iFAAiF;AAEjF;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,KAA2B,EAC3B,MAA4B,EAC5B,MAAc;IAEd,MAAM,eAAe,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC1D,MAAM,gBAAgB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;AAChE,CAAC"}
|
|
1
|
+
{"version":3,"file":"run-lifecycle.js","sourceRoot":"","sources":["../../src/daemon/run-lifecycle.ts"],"names":[],"mappings":"AAGA,iFAAiF;AAEjF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,KAAa,EACb,MAA4B,EAC5B,MAAc;IAEd,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,yBAAyB,KAAK,EAAE,EAAE;YAC5D,MAAM,EAAE,OAAO;YACf,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;aACzC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;SACjC,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,8CAA8C,EAAE,GAAG,CAAC,CAAA;IACpE,CAAC;AACH,CAAC;AAED,iFAAiF;AAEjF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,OAAe,EACf,MAAc;IAEd,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,oBAAoB,SAAS,oBAAoB,EAAE;YAC7E,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;aACzC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC9C,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,8CAA8C,EAAE,GAAG,CAAC,CAAA;IACpE,CAAC;AACH,CAAC;AAED,iFAAiF;AAEjF;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,KAA2B,EAC3B,MAA4B,EAC5B,MAAc;IAEd,MAAM,eAAe,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC1D,MAAM,gBAAgB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;AAChE,CAAC;AAED,kFAAkF;AAElF;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,KAAa,EACb,KAAa,EACb,MAA4B,EAC5B,MAAc,EACd,WAAoB,EACpB,QAAiB;IAEjB,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,yBAAyB,KAAK,SAAS,KAAK,WAAW,EAAE;YACnF,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;aACzC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,MAAM;gBACN,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrD,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChD,CAAC;SACH,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,GAAG,CAAC,CAAA;IAC/D,CAAC;AACH,CAAC"}
|
|
@@ -1,12 +1,17 @@
|
|
|
1
1
|
import type { Config } from '../lib/config.js';
|
|
2
2
|
import { type WorkflowTriggerEvent } from './runner.js';
|
|
3
|
+
import { type WorkflowJobEvent } from './job-runner.js';
|
|
3
4
|
export declare class RunQueue {
|
|
4
5
|
private maxConcurrent;
|
|
5
6
|
private activeCount;
|
|
6
7
|
private queue;
|
|
7
8
|
constructor(maxConcurrent?: number);
|
|
9
|
+
/** Legacy `workflow.trigger` path: one event carries the whole run's jobs. */
|
|
8
10
|
enqueue(event: WorkflowTriggerEvent, getConfig: () => Config): void;
|
|
11
|
+
/** Protocol-2 `workflow.job` path: one event per self-hosted job. */
|
|
12
|
+
enqueueJob(event: WorkflowJobEvent, getConfig: () => Config): void;
|
|
9
13
|
private processNext;
|
|
10
|
-
private
|
|
14
|
+
private runTriggerItem;
|
|
15
|
+
private runJobItem;
|
|
11
16
|
}
|
|
12
17
|
//# sourceMappingURL=run-queue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-queue.d.ts","sourceRoot":"","sources":["../../src/daemon/run-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAU,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"run-queue.d.ts","sourceRoot":"","sources":["../../src/daemon/run-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAU,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAG/D,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAMvE,qBAAa,QAAQ;IACnB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,WAAW,CAAY;IAC/B,OAAO,CAAC,KAAK,CAAkB;gBAEnB,aAAa,GAAE,MAAU;IAIrC,8EAA8E;IAC9E,OAAO,CAAC,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,MAAM,GAAG,IAAI;IAKnE,qEAAqE;IACrE,UAAU,CAAC,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,MAAM,GAAG,IAAI;IAKlE,OAAO,CAAC,WAAW;YAWL,cAAc;YAsCd,UAAU;CAkCzB"}
|
package/dist/daemon/run-queue.js
CHANGED
|
@@ -1,14 +1,21 @@
|
|
|
1
1
|
import { runJob } from './runner.js';
|
|
2
2
|
import { completeRun } from './run-lifecycle.js';
|
|
3
3
|
import { readDaemonState, writeDaemonState } from './state.js';
|
|
4
|
+
import { runWorkflowJob } from './job-runner.js';
|
|
4
5
|
export class RunQueue {
|
|
5
6
|
constructor(maxConcurrent = 1) {
|
|
6
7
|
this.activeCount = 0;
|
|
7
8
|
this.queue = [];
|
|
8
9
|
this.maxConcurrent = maxConcurrent;
|
|
9
10
|
}
|
|
11
|
+
/** Legacy `workflow.trigger` path: one event carries the whole run's jobs. */
|
|
10
12
|
enqueue(event, getConfig) {
|
|
11
|
-
this.queue.push({ event, getConfig });
|
|
13
|
+
this.queue.push({ kind: 'trigger', event, getConfig });
|
|
14
|
+
this.processNext();
|
|
15
|
+
}
|
|
16
|
+
/** Protocol-2 `workflow.job` path: one event per self-hosted job. */
|
|
17
|
+
enqueueJob(event, getConfig) {
|
|
18
|
+
this.queue.push({ kind: 'job', event, getConfig });
|
|
12
19
|
this.processNext();
|
|
13
20
|
}
|
|
14
21
|
processNext() {
|
|
@@ -16,12 +23,13 @@ export class RunQueue {
|
|
|
16
23
|
return;
|
|
17
24
|
const item = this.queue.shift();
|
|
18
25
|
this.activeCount++;
|
|
19
|
-
this.
|
|
26
|
+
const run = item.kind === 'trigger' ? this.runTriggerItem(item) : this.runJobItem(item);
|
|
27
|
+
run.finally(() => {
|
|
20
28
|
this.activeCount--;
|
|
21
29
|
this.processNext();
|
|
22
30
|
});
|
|
23
31
|
}
|
|
24
|
-
async
|
|
32
|
+
async runTriggerItem(item) {
|
|
25
33
|
const { event, getConfig } = item;
|
|
26
34
|
const config = getConfig();
|
|
27
35
|
const selfHostedJobs = event.jobs.filter((j) => j.runsOn === 'self-hosted');
|
|
@@ -55,5 +63,36 @@ export class RunQueue {
|
|
|
55
63
|
}
|
|
56
64
|
}
|
|
57
65
|
}
|
|
66
|
+
async runJobItem(item) {
|
|
67
|
+
const { event, getConfig } = item;
|
|
68
|
+
const config = getConfig();
|
|
69
|
+
// Protocol-2 events have no single "run" id worth keying activeRuns by —
|
|
70
|
+
// a run can dispatch many jobs — so the entry is keyed runId:jobId.
|
|
71
|
+
const activeRunKey = `${event.workflowRunId}:${event.jobId}`;
|
|
72
|
+
const stateBefore = readDaemonState();
|
|
73
|
+
if (stateBefore) {
|
|
74
|
+
writeDaemonState({
|
|
75
|
+
...stateBefore,
|
|
76
|
+
activeRuns: [
|
|
77
|
+
...stateBefore.activeRuns,
|
|
78
|
+
{
|
|
79
|
+
runId: activeRunKey,
|
|
80
|
+
issueTitle: event.workflowName,
|
|
81
|
+
jobName: event.jobId,
|
|
82
|
+
status: 'running',
|
|
83
|
+
startedAt: new Date().toISOString(),
|
|
84
|
+
},
|
|
85
|
+
],
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
await runWorkflowJob(event, config);
|
|
89
|
+
const stateAfter = readDaemonState();
|
|
90
|
+
if (stateAfter) {
|
|
91
|
+
writeDaemonState({
|
|
92
|
+
...stateAfter,
|
|
93
|
+
activeRuns: stateAfter.activeRuns.filter((r) => r.runId !== activeRunKey),
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
}
|
|
58
97
|
}
|
|
59
98
|
//# sourceMappingURL=run-queue.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-queue.js","sourceRoot":"","sources":["../../src/daemon/run-queue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAA6B,MAAM,aAAa,CAAA;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"run-queue.js","sourceRoot":"","sources":["../../src/daemon/run-queue.ts"],"names":[],"mappings":"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"}
|
package/dist/daemon/runner.d.ts
CHANGED
|
@@ -27,5 +27,21 @@ export interface WorkflowTriggerEvent {
|
|
|
27
27
|
};
|
|
28
28
|
jobs: JobConfig[];
|
|
29
29
|
}
|
|
30
|
+
/**
|
|
31
|
+
* Spawns a command and returns its exit code. `onLine` receives each raw
|
|
32
|
+
* stdout/stderr chunk as it arrives; `onSpawnError` fires when the command
|
|
33
|
+
* itself never launches (e.g. Docker not installed) — distinct from a
|
|
34
|
+
* nonzero exit — so callers that need to know whether a container actually
|
|
35
|
+
* ran (job-runner's claude-code self-report bookkeeping) can tell the two
|
|
36
|
+
* apart. Shared by runner.ts (legacy `workflow.trigger` jobs) and
|
|
37
|
+
* job-runner.ts (protocol-2 `workflow.job` steps) to avoid duplicating the
|
|
38
|
+
* spawn/stream/resolve plumbing.
|
|
39
|
+
*/
|
|
40
|
+
export declare function spawnAndWait(cmd: string, args: string[], opts?: {
|
|
41
|
+
onLine?: (line: string) => void;
|
|
42
|
+
onSpawnError?: (err: Error) => void;
|
|
43
|
+
}): Promise<number>;
|
|
44
|
+
/** Renders an env map as repeated `-e KEY=VALUE` docker CLI args. */
|
|
45
|
+
export declare function buildEnvArgs(env: Record<string, string>): string[];
|
|
30
46
|
export declare function runJob(event: WorkflowTriggerEvent, job: JobConfig, config: Config): Promise<'SUCCESS' | 'FAILED'>;
|
|
31
47
|
//# sourceMappingURL=runner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/daemon/runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAI9C,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7B,KAAK,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;QACZ,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;IACD,IAAI,EAAE,SAAS,EAAE,CAAA;CAClB;
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/daemon/runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAI9C,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7B,KAAK,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;QACZ,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;IACD,IAAI,EAAE,SAAS,EAAE,CAAA;CAClB;AAmBD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,CAAC,EAAE;IACL,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/B,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;CACpC,GACA,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAED,qEAAqE;AACrE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAMlE;AAID,wBAAsB,MAAM,CAC1B,KAAK,EAAE,oBAAoB,EAC3B,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,SAAS,GAAG,QAAQ,CAAC,CAiD/B"}
|
package/dist/daemon/runner.js
CHANGED
|
@@ -16,25 +16,26 @@ async function streamLogChunk(runId, chunk, config) {
|
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
/**
|
|
19
|
-
* Spawns a command and returns its exit code.
|
|
20
|
-
*
|
|
19
|
+
* Spawns a command and returns its exit code. `onLine` receives each raw
|
|
20
|
+
* stdout/stderr chunk as it arrives; `onSpawnError` fires when the command
|
|
21
|
+
* itself never launches (e.g. Docker not installed) — distinct from a
|
|
22
|
+
* nonzero exit — so callers that need to know whether a container actually
|
|
23
|
+
* ran (job-runner's claude-code self-report bookkeeping) can tell the two
|
|
24
|
+
* apart. Shared by runner.ts (legacy `workflow.trigger` jobs) and
|
|
25
|
+
* job-runner.ts (protocol-2 `workflow.job` steps) to avoid duplicating the
|
|
26
|
+
* spawn/stream/resolve plumbing.
|
|
21
27
|
*/
|
|
22
|
-
function spawnAndWait(cmd, args, opts) {
|
|
28
|
+
export function spawnAndWait(cmd, args, opts) {
|
|
23
29
|
return new Promise((resolve) => {
|
|
24
30
|
const proc = spawn(cmd, args);
|
|
25
31
|
proc.stdout?.on('data', (data) => {
|
|
26
|
-
|
|
27
|
-
if (opts?.runId && opts?.config) {
|
|
28
|
-
void streamLogChunk(opts.runId, line, opts.config);
|
|
29
|
-
}
|
|
32
|
+
opts?.onLine?.(data.toString());
|
|
30
33
|
});
|
|
31
34
|
proc.stderr?.on('data', (data) => {
|
|
32
|
-
|
|
33
|
-
if (opts?.runId && opts?.config) {
|
|
34
|
-
void streamLogChunk(opts.runId, line, opts.config);
|
|
35
|
-
}
|
|
35
|
+
opts?.onLine?.(data.toString());
|
|
36
36
|
});
|
|
37
|
-
proc.on('error', () => {
|
|
37
|
+
proc.on('error', (err) => {
|
|
38
|
+
opts?.onSpawnError?.(err);
|
|
38
39
|
resolve(1);
|
|
39
40
|
});
|
|
40
41
|
proc.on('close', (code) => {
|
|
@@ -42,6 +43,14 @@ function spawnAndWait(cmd, args, opts) {
|
|
|
42
43
|
});
|
|
43
44
|
});
|
|
44
45
|
}
|
|
46
|
+
/** Renders an env map as repeated `-e KEY=VALUE` docker CLI args. */
|
|
47
|
+
export function buildEnvArgs(env) {
|
|
48
|
+
const args = [];
|
|
49
|
+
for (const [key, value] of Object.entries(env)) {
|
|
50
|
+
args.push('-e', `${key}=${value}`);
|
|
51
|
+
}
|
|
52
|
+
return args;
|
|
53
|
+
}
|
|
45
54
|
// ─── Main ────────────────────────────────────────────────────────────────────
|
|
46
55
|
export async function runJob(event, job, config) {
|
|
47
56
|
const { workflowRunId } = event;
|
|
@@ -75,15 +84,12 @@ export async function runJob(event, job, config) {
|
|
|
75
84
|
...conductorEnv,
|
|
76
85
|
...(job.env ?? {}),
|
|
77
86
|
};
|
|
78
|
-
const envArgs = [];
|
|
79
|
-
for (const [key, value] of Object.entries(allEnv)) {
|
|
80
|
-
envArgs.push('-e', `${key}=${value}`);
|
|
81
|
-
}
|
|
82
87
|
// Step 5: Run container
|
|
83
|
-
const runArgs = ['run', '--rm', ...
|
|
88
|
+
const runArgs = ['run', '--rm', ...buildEnvArgs(allEnv), image];
|
|
84
89
|
const runCode = await spawnAndWait('docker', runArgs, {
|
|
85
|
-
|
|
86
|
-
|
|
90
|
+
onLine: (line) => {
|
|
91
|
+
void streamLogChunk(workflowRunId, line, config);
|
|
92
|
+
},
|
|
87
93
|
});
|
|
88
94
|
// Step 6: Return result
|
|
89
95
|
return runCode === 0 ? 'SUCCESS' : 'FAILED';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/daemon/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AA8BrC,gFAAgF;AAEhF,KAAK,UAAU,cAAc,CAAC,KAAa,EAAE,KAAa,EAAE,MAAc;IACxE,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,8BAA8B,KAAK,YAAY,EAAE;YAC3E,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;aACzC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC;SAChC,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAA;IAC5D,CAAC;AACH,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/daemon/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../../src/daemon/watcher.ts"],"names":[],"mappings":"AAKA,OAAO,EAAc,MAAM,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../../src/daemon/watcher.ts"],"names":[],"mappings":"AAKA,OAAO,EAAc,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAQrD,eAAO,MAAM,eAAe,QAA8C,CAAA;AAK1E,wBAAgB,uBAAuB,IAAI,IAAI,CAS9C;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAA;IAC3C,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,SAAS,EAAE,MAAM,CAAA;IACjB,wFAAwF;IACxF,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAEpC,eAAO,MAAM,cAAc,6BAAmD,CAAA;AAE9E,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,EAAE,EAAE,SAAM,GAAG,IAAI,CAOpE;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,GACf;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAM9C;AAED,wBAAgB,SAAS,IAAI,UAAU,EAAE,CAOxC;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAWtD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,UAAU,CAAC,GAAG,IAAI,CASnF;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAMnD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAWzD;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAevF;AAwBD,wBAAsB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCvF;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBzF;AAaD,wBAAsB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC1F;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B5F;AAED,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBnF;AAQD;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAAC,SAAS,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkDxE;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,MAAM,GAAG,IAAI,CAmD1D"}
|
package/dist/daemon/watcher.js
CHANGED
|
@@ -458,8 +458,14 @@ if (process.argv[1] === __filename) {
|
|
|
458
458
|
const runQueue = new RunQueue(getConfig().maxConcurrentRuns ?? 1);
|
|
459
459
|
startPoller(getConfig, async (events) => {
|
|
460
460
|
for (const event of events) {
|
|
461
|
+
// The events API delivers {eventId, type, payload: {...}} — the runners consume a flat
|
|
462
|
+
// shape, so spread the payload and let the envelope's eventId/type win.
|
|
463
|
+
const flat = { ...event.payload, eventId: event.eventId, type: event.type };
|
|
461
464
|
if (event.type === 'workflow.trigger') {
|
|
462
|
-
runQueue.enqueue(
|
|
465
|
+
runQueue.enqueue(flat, getConfig);
|
|
466
|
+
}
|
|
467
|
+
else if (event.type === 'workflow.job') {
|
|
468
|
+
runQueue.enqueueJob(flat, getConfig);
|
|
463
469
|
}
|
|
464
470
|
}
|
|
465
471
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../src/daemon/watcher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../src/daemon/watcher.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/config.d.ts
CHANGED
|
@@ -12,6 +12,10 @@ export interface Config {
|
|
|
12
12
|
localPath?: string;
|
|
13
13
|
maxConcurrentRuns?: number;
|
|
14
14
|
projects?: Record<string, ProjectEntry>;
|
|
15
|
+
/** `claude setup-token` output — enables the `claude-code` workflow step to run
|
|
16
|
+
* under the owner's Pro/Max subscription instead of a metered API key. Never
|
|
17
|
+
* transits the server; lives only in this local config file. */
|
|
18
|
+
claudeCodeOauthToken?: string;
|
|
15
19
|
}
|
|
16
20
|
export declare const CONFIG_PATH: string;
|
|
17
21
|
export declare function readConfig(): Config | null;
|
package/dist/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACvC;;oEAEgE;IAChE,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAC9B;AAED,eAAO,MAAM,WAAW,QAAuD,CAAA;AAE/E,wBAAgB,UAAU,IAAI,MAAM,GAAG,IAAI,CAqB1C;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAQhD;AAED,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAOzC"}
|
package/dist/lib/config.js
CHANGED
|
@@ -27,7 +27,11 @@ export function readConfig() {
|
|
|
27
27
|
export function writeConfig(config) {
|
|
28
28
|
const dir = path.dirname(CONFIG_PATH);
|
|
29
29
|
fs.mkdirSync(dir, { recursive: true });
|
|
30
|
-
|
|
30
|
+
// mode is only applied by the OS when the file is newly created, so an
|
|
31
|
+
// existing config.json (e.g. from before this field existed) needs an
|
|
32
|
+
// explicit chmod too — the file holds an OAuth token and API key.
|
|
33
|
+
fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2), { encoding: 'utf8', mode: 0o600 });
|
|
34
|
+
fs.chmodSync(CONFIG_PATH, 0o600);
|
|
31
35
|
}
|
|
32
36
|
export function clearConfig() {
|
|
33
37
|
try {
|
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AAuBxB,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,aAAa,CAAC,CAAA;AAE/E,MAAM,UAAU,UAAU;IACxB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAA;QACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAA;QAClC,iFAAiF;QACjF,wEAAwE;QACxE,+EAA+E;QAC/E,IACE,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;YAC/D,MAAM,CAAC,SAAS;YAChB,MAAM,CAAC,SAAS,EAChB,CAAC;YACD,MAAM,CAAC,QAAQ,GAAG;gBAChB,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE;aACrF,CAAA;QACH,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAc;IACxC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACrC,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACtC,uEAAuE;IACvE,sEAAsE;IACtE,kEAAkE;IAClE,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IACjG,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,WAAW;IACzB,IAAI,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,kCAAkC;IACpC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,MAAM,MAAM,GAAG,UAAU,EAAE,CAAA;IAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAC5D,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC7D,MAAM,GAAG,GAAG,KAAgC,CAAA;IAC5C,OAAO,CACL,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ;QACjC,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,QAAQ;QACpC,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,QAAQ;QACtC,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,QAAQ;QAChC,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAClC,CAAA;AACH,CAAC"}
|
package/package.json
CHANGED