@overlordai/worker 1.0.53 → 1.0.54
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/clean-output-buffer.d.ts +21 -0
- package/dist/clean-output-buffer.d.ts.map +1 -0
- package/dist/clean-output-buffer.js +70 -0
- package/dist/clean-output-buffer.js.map +1 -0
- package/dist/config.d.ts +4 -4
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +54 -39
- package/dist/config.js.map +1 -1
- package/dist/executor/base.executor.d.ts +30 -11
- package/dist/executor/base.executor.d.ts.map +1 -1
- package/dist/executor/base.executor.js +25 -2
- package/dist/executor/base.executor.js.map +1 -1
- package/dist/executor/claude.executor.d.ts +7 -8
- package/dist/executor/claude.executor.d.ts.map +1 -1
- package/dist/executor/claude.executor.js +36 -26
- package/dist/executor/claude.executor.js.map +1 -1
- package/dist/executor/codex.executor.d.ts +7 -8
- package/dist/executor/codex.executor.d.ts.map +1 -1
- package/dist/executor/codex.executor.js +64 -26
- package/dist/executor/codex.executor.js.map +1 -1
- package/dist/executor/cursor.executor.d.ts +6 -7
- package/dist/executor/cursor.executor.d.ts.map +1 -1
- package/dist/executor/cursor.executor.js +12 -22
- package/dist/executor/cursor.executor.js.map +1 -1
- package/dist/executor/custom.executor.d.ts +15 -7
- package/dist/executor/custom.executor.d.ts.map +1 -1
- package/dist/executor/custom.executor.js +25 -28
- package/dist/executor/custom.executor.js.map +1 -1
- package/dist/git-operations.d.ts +14 -12
- package/dist/git-operations.d.ts.map +1 -1
- package/dist/git-operations.js +50 -98
- package/dist/git-operations.js.map +1 -1
- package/dist/git-token-helper.d.ts +27 -0
- package/dist/git-token-helper.d.ts.map +1 -0
- package/dist/git-token-helper.js +114 -0
- package/dist/git-token-helper.js.map +1 -0
- package/dist/healthz.d.ts.map +1 -1
- package/dist/healthz.js +3 -7
- package/dist/healthz.js.map +1 -1
- package/dist/http-post.d.ts +2 -0
- package/dist/http-post.d.ts.map +1 -0
- package/dist/http-post.js +74 -0
- package/dist/http-post.js.map +1 -0
- package/dist/jwt-manager.d.ts +2 -3
- package/dist/jwt-manager.d.ts.map +1 -1
- package/dist/jwt-manager.js +5 -43
- package/dist/jwt-manager.js.map +1 -1
- package/dist/lease-manager.d.ts +4 -1
- package/dist/lease-manager.d.ts.map +1 -1
- package/dist/lease-manager.js +2 -6
- package/dist/lease-manager.js.map +1 -1
- package/dist/main.js +147 -277
- package/dist/main.js.map +1 -1
- package/dist/orphan-reaper.d.ts +1 -1
- package/dist/orphan-reaper.d.ts.map +1 -1
- package/dist/orphan-reaper.js +46 -30
- package/dist/orphan-reaper.js.map +1 -1
- package/dist/pipeline-compiler.d.ts +10 -0
- package/dist/pipeline-compiler.d.ts.map +1 -0
- package/dist/pipeline-compiler.js +179 -0
- package/dist/pipeline-compiler.js.map +1 -0
- package/dist/pipeline-parser.d.ts.map +1 -1
- package/dist/pipeline-parser.js +4 -3
- package/dist/pipeline-parser.js.map +1 -1
- package/dist/pipeline-runner.d.ts +1 -0
- package/dist/pipeline-runner.d.ts.map +1 -1
- package/dist/pipeline-runner.js +37 -27
- package/dist/pipeline-runner.js.map +1 -1
- package/dist/project-mutex.d.ts +1 -0
- package/dist/project-mutex.d.ts.map +1 -1
- package/dist/project-mutex.js +9 -1
- package/dist/project-mutex.js.map +1 -1
- package/dist/pty-manager.d.ts +2 -0
- package/dist/pty-manager.d.ts.map +1 -1
- package/dist/pty-manager.js +68 -42
- package/dist/pty-manager.js.map +1 -1
- package/dist/pty-relay-client.d.ts +38 -0
- package/dist/pty-relay-client.d.ts.map +1 -0
- package/dist/pty-relay-client.js +146 -0
- package/dist/pty-relay-client.js.map +1 -0
- package/dist/pty-stdin-writer.d.ts +11 -0
- package/dist/pty-stdin-writer.d.ts.map +1 -0
- package/dist/pty-stdin-writer.js +22 -0
- package/dist/pty-stdin-writer.js.map +1 -0
- package/dist/ringbuffer.d.ts +2 -0
- package/dist/ringbuffer.d.ts.map +1 -1
- package/dist/ringbuffer.js +10 -1
- package/dist/ringbuffer.js.map +1 -1
- package/dist/stage-monitor.d.ts +72 -0
- package/dist/stage-monitor.d.ts.map +1 -0
- package/dist/stage-monitor.js +234 -0
- package/dist/stage-monitor.js.map +1 -0
- package/dist/task-handler.d.ts +18 -12
- package/dist/task-handler.d.ts.map +1 -1
- package/dist/task-handler.js +298 -78
- package/dist/task-handler.js.map +1 -1
- package/dist/tunnel-manager.d.ts +16 -6
- package/dist/tunnel-manager.d.ts.map +1 -1
- package/dist/tunnel-manager.js +117 -16
- package/dist/tunnel-manager.js.map +1 -1
- package/dist/worker-client.d.ts +16 -7
- package/dist/worker-client.d.ts.map +1 -1
- package/dist/worker-client.js +40 -52
- package/dist/worker-client.js.map +1 -1
- package/dist/workspace-manager.d.ts +1 -0
- package/dist/workspace-manager.d.ts.map +1 -1
- package/dist/workspace-manager.js +102 -82
- package/dist/workspace-manager.js.map +1 -1
- package/package.json +4 -2
package/dist/orphan-reaper.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orphan-reaper.d.ts","sourceRoot":"","sources":["../src/orphan-reaper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orphan-reaper.d.ts","sourceRoot":"","sources":["../src/orphan-reaper.ts"],"names":[],"mappings":"AAwCA,qBAAa,YAAY;WACV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;mBAiBb,SAAS;mBAmCT,UAAU;CAiChC"}
|
package/dist/orphan-reaper.js
CHANGED
|
@@ -43,16 +43,47 @@ const os = __importStar(require("node:os"));
|
|
|
43
43
|
const pino_1 = __importDefault(require("pino"));
|
|
44
44
|
const safe_env_js_1 = require("./safe-env.js");
|
|
45
45
|
const log = (0, pino_1.default)({ name: 'orphan-reaper' });
|
|
46
|
+
function sleep(ms) {
|
|
47
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
48
|
+
}
|
|
49
|
+
/** Send SIGTERM, wait up to 5 seconds, then SIGKILL if still alive. */
|
|
50
|
+
async function gracefulKill(pid) {
|
|
51
|
+
try {
|
|
52
|
+
process.kill(pid, 'SIGTERM');
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return; // Process already gone
|
|
56
|
+
}
|
|
57
|
+
// Check if process died within 5 seconds
|
|
58
|
+
const deadline = Date.now() + 5_000;
|
|
59
|
+
while (Date.now() < deadline) {
|
|
60
|
+
try {
|
|
61
|
+
process.kill(pid, 0); // Check if alive
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
return; // Process is gone
|
|
65
|
+
}
|
|
66
|
+
await sleep(500);
|
|
67
|
+
}
|
|
68
|
+
// Still alive — force kill
|
|
69
|
+
try {
|
|
70
|
+
log.info({ pid }, 'Process did not exit after SIGTERM, sending SIGKILL');
|
|
71
|
+
process.kill(pid, 'SIGKILL');
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
// Process may have exited between check and kill
|
|
75
|
+
}
|
|
76
|
+
}
|
|
46
77
|
class OrphanReaper {
|
|
47
|
-
static reap() {
|
|
78
|
+
static async reap() {
|
|
48
79
|
const platform = os.platform();
|
|
49
80
|
log.info({ platform }, 'Scanning for orphan processes');
|
|
50
81
|
try {
|
|
51
82
|
if (platform === 'linux') {
|
|
52
|
-
OrphanReaper.reapLinux();
|
|
83
|
+
await OrphanReaper.reapLinux();
|
|
53
84
|
}
|
|
54
85
|
else if (platform === 'darwin') {
|
|
55
|
-
OrphanReaper.reapDarwin();
|
|
86
|
+
await OrphanReaper.reapDarwin();
|
|
56
87
|
}
|
|
57
88
|
else {
|
|
58
89
|
log.warn({ platform }, 'Orphan reaping not supported on this platform');
|
|
@@ -62,7 +93,7 @@ class OrphanReaper {
|
|
|
62
93
|
log.error({ err }, 'Error during orphan reaping');
|
|
63
94
|
}
|
|
64
95
|
}
|
|
65
|
-
static reapLinux() {
|
|
96
|
+
static async reapLinux() {
|
|
66
97
|
const procDir = '/proc';
|
|
67
98
|
let entries;
|
|
68
99
|
try {
|
|
@@ -84,8 +115,8 @@ class OrphanReaper {
|
|
|
84
115
|
continue;
|
|
85
116
|
const environ = fs.readFileSync(environPath, 'utf-8');
|
|
86
117
|
if (environ.includes('OVERLORD_TASK_ID=')) {
|
|
87
|
-
log.info({ pid }, '
|
|
88
|
-
|
|
118
|
+
log.info({ pid }, 'Terminating orphan process');
|
|
119
|
+
await gracefulKill(pid);
|
|
89
120
|
killed++;
|
|
90
121
|
}
|
|
91
122
|
}
|
|
@@ -95,7 +126,7 @@ class OrphanReaper {
|
|
|
95
126
|
}
|
|
96
127
|
log.info({ killed }, 'Orphan reaping complete (Linux)');
|
|
97
128
|
}
|
|
98
|
-
static reapDarwin() {
|
|
129
|
+
static async reapDarwin() {
|
|
99
130
|
let output;
|
|
100
131
|
try {
|
|
101
132
|
output = (0, node_child_process_1.execFileSync)('ps', ['-eo', 'pid,command'], { encoding: 'utf-8', timeout: 10000, env: (0, safe_env_js_1.buildSafeEnv)() });
|
|
@@ -105,41 +136,26 @@ class OrphanReaper {
|
|
|
105
136
|
return;
|
|
106
137
|
}
|
|
107
138
|
const myPid = process.pid;
|
|
108
|
-
const lines = output.split('\n');
|
|
109
139
|
let killed = 0;
|
|
110
|
-
|
|
111
|
-
// On macOS we can't easily read environ from ps, so check /dev/fd approach
|
|
112
|
-
// Instead, use a heuristic: look for processes whose command includes overlord markers
|
|
113
|
-
const overlordPids = [];
|
|
114
|
-
for (const line of lines) {
|
|
140
|
+
for (const line of output.split('\n')) {
|
|
115
141
|
const trimmed = line.trim();
|
|
116
142
|
if (!trimmed)
|
|
117
143
|
continue;
|
|
118
|
-
const
|
|
119
|
-
const pid = parseInt(parts[0] || '', 10);
|
|
144
|
+
const pid = parseInt(trimmed.split(/\s+/)[0] || '', 10);
|
|
120
145
|
if (isNaN(pid) || pid === myPid || pid <= 1)
|
|
121
146
|
continue;
|
|
122
|
-
// Try to read the environment of the process via /proc emulation or launchctl
|
|
123
147
|
let envOutput = '';
|
|
124
148
|
try {
|
|
125
149
|
envOutput = (0, node_child_process_1.execFileSync)('ps', ['-p', String(pid), '-wwE'], { encoding: 'utf-8', timeout: 5000 });
|
|
126
150
|
}
|
|
127
151
|
catch {
|
|
128
|
-
|
|
129
|
-
}
|
|
130
|
-
if (envOutput.includes('OVERLORD_TASK_ID=')) {
|
|
131
|
-
overlordPids.push(pid);
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
for (const pid of overlordPids) {
|
|
135
|
-
try {
|
|
136
|
-
log.info({ pid }, 'Killing orphan process');
|
|
137
|
-
process.kill(pid, 'SIGKILL');
|
|
138
|
-
killed++;
|
|
139
|
-
}
|
|
140
|
-
catch {
|
|
141
|
-
// Process may already be gone
|
|
152
|
+
continue;
|
|
142
153
|
}
|
|
154
|
+
if (!envOutput.includes('OVERLORD_TASK_ID='))
|
|
155
|
+
continue;
|
|
156
|
+
log.info({ pid }, 'Terminating orphan process');
|
|
157
|
+
await gracefulKill(pid);
|
|
158
|
+
killed++;
|
|
143
159
|
}
|
|
144
160
|
log.info({ killed }, 'Orphan reaping complete (macOS)');
|
|
145
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orphan-reaper.js","sourceRoot":"","sources":["../src/orphan-reaper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2DAAkD;AAClD,4CAA8B;AAC9B,4CAA8B;AAC9B,gDAAwB;AACxB,+CAA6C;AAE7C,MAAM,GAAG,GAAG,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;AAE5C,MAAa,YAAY;IACvB,MAAM,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"orphan-reaper.js","sourceRoot":"","sources":["../src/orphan-reaper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { PipelineConfig, PipelineRunState } from '@overlordai/protocol';
|
|
2
|
+
export declare const DEFAULT_PIPELINE: PipelineConfig;
|
|
3
|
+
export declare class PipelineCompiler {
|
|
4
|
+
compile(pipeline: PipelineConfig | null, taskDescription: string, variables: Record<string, string>): {
|
|
5
|
+
prompt: string;
|
|
6
|
+
nonce: string;
|
|
7
|
+
};
|
|
8
|
+
compileResume(pipeline: PipelineConfig, state: PipelineRunState, nonce: string, reason: 'takeover_release' | 'context_reinjection'): string;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=pipeline-compiler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pipeline-compiler.d.ts","sourceRoot":"","sources":["../src/pipeline-compiler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAI7E,eAAO,MAAM,gBAAgB,EAAE,cAyC9B,CAAC;AAyBF,qBAAa,gBAAgB;IAC3B,OAAO,CACL,QAAQ,EAAE,cAAc,GAAG,IAAI,EAC/B,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IA6EpC,aAAa,CACX,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,gBAAgB,EACvB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,kBAAkB,GAAG,qBAAqB,GACjD,MAAM;CAuEV"}
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.PipelineCompiler = exports.DEFAULT_PIPELINE = void 0;
|
|
7
|
+
const node_crypto_1 = __importDefault(require("node:crypto"));
|
|
8
|
+
const pino_1 = __importDefault(require("pino"));
|
|
9
|
+
const logger = (0, pino_1.default)({ name: 'pipeline-compiler' });
|
|
10
|
+
exports.DEFAULT_PIPELINE = {
|
|
11
|
+
preamble: `遵循项目现有的代码风格、架构模式和约定。
|
|
12
|
+
如果项目有 CLAUDE.md、AGENTS.md 或类似的开发指南,请严格遵守。`,
|
|
13
|
+
stages: [
|
|
14
|
+
{
|
|
15
|
+
name: 'implement',
|
|
16
|
+
label: '实现',
|
|
17
|
+
prompt: '根据任务描述,在当前分支上实现功能或修复问题。确保代码质量高、结构清晰,遵循项目约定。',
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
name: 'test',
|
|
21
|
+
label: '测试',
|
|
22
|
+
prompt: '为你的改动编写完备的测试用例,确保覆盖核心逻辑和边界情况。运行 $TEST_COMMAND 确认测试通过。',
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
name: 'verify',
|
|
26
|
+
label: '验证',
|
|
27
|
+
prompt: '运行项目的完整测试套件,确保你的改动没有破坏现有功能。如有失败,修复后重新验证。',
|
|
28
|
+
onFailure: { goto: 'implement', maxLoops: 3 },
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
name: 'review',
|
|
32
|
+
label: '审查',
|
|
33
|
+
prompt: '审查你所有的变更(git diff),检查代码质量、安全性、性能和可维护性问题。按 P1-P5 分级列出发现的问题。',
|
|
34
|
+
gate: '没有 P1-P3 级别的问题',
|
|
35
|
+
onFailure: { goto: 'implement', maxLoops: 3 },
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
name: 'submit',
|
|
39
|
+
label: '提交 MR',
|
|
40
|
+
prompt: `将所有改动提交到当前分支($BRANCH),然后创建合并请求。
|
|
41
|
+
- GitHub: gh pr create
|
|
42
|
+
- GitLab: glab mr create
|
|
43
|
+
- Reviewers: $REVIEWERS
|
|
44
|
+
当前项目使用 $GIT_PLATFORM。`,
|
|
45
|
+
},
|
|
46
|
+
],
|
|
47
|
+
};
|
|
48
|
+
const OVERLORD_MARKER_RE = /\[\[OVERLORD:[^\]]*\]\]/g;
|
|
49
|
+
function sanitize(input) {
|
|
50
|
+
return input.replace(OVERLORD_MARKER_RE, '');
|
|
51
|
+
}
|
|
52
|
+
function substituteVars(text, globalVars, stageParams, stageName) {
|
|
53
|
+
return text.replace(/\$([A-Z_]+(?::[a-zA-Z_][a-zA-Z0-9_]*)?)/g, (_match, varName) => {
|
|
54
|
+
// Check stage params first, then global vars
|
|
55
|
+
if (stageParams && varName in stageParams)
|
|
56
|
+
return stageParams[varName];
|
|
57
|
+
if (varName in globalVars)
|
|
58
|
+
return globalVars[varName];
|
|
59
|
+
// $STAGE_RESULT:xxx is a runtime reference — keep it as-is
|
|
60
|
+
if (varName.startsWith('STAGE_RESULT:'))
|
|
61
|
+
return `$${varName}`;
|
|
62
|
+
logger.warn({ varName, stageName }, 'Pipeline variable not found, using empty string');
|
|
63
|
+
return '';
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
class PipelineCompiler {
|
|
67
|
+
compile(pipeline, taskDescription, variables) {
|
|
68
|
+
const p = pipeline ?? exports.DEFAULT_PIPELINE;
|
|
69
|
+
const nonce = node_crypto_1.default.randomBytes(4).toString('hex');
|
|
70
|
+
const vars = {
|
|
71
|
+
TASK_DESCRIPTION: taskDescription,
|
|
72
|
+
...variables,
|
|
73
|
+
};
|
|
74
|
+
const parts = [];
|
|
75
|
+
// Preamble
|
|
76
|
+
if (p.preamble) {
|
|
77
|
+
parts.push(sanitize(p.preamble));
|
|
78
|
+
parts.push('');
|
|
79
|
+
}
|
|
80
|
+
// Task description
|
|
81
|
+
parts.push(`你的任务:${sanitize(taskDescription)}`);
|
|
82
|
+
parts.push('');
|
|
83
|
+
parts.push('---');
|
|
84
|
+
parts.push('');
|
|
85
|
+
// Marker protocol
|
|
86
|
+
parts.push('## 执行协议');
|
|
87
|
+
parts.push('');
|
|
88
|
+
parts.push('按以下步骤执行任务。你必须遵循以下输出约定以报告进度:');
|
|
89
|
+
parts.push('');
|
|
90
|
+
parts.push(`- 开始一个步骤时,在**单独一行**输出:\`[[OVERLORD:${nonce}:{name}:START]]\``);
|
|
91
|
+
parts.push(`- 完成一个步骤时,在单独一行输出:\`[[OVERLORD:${nonce}:{name}:DONE]]\``);
|
|
92
|
+
parts.push(`- 步骤失败时,在单独一行输出:\`[[OVERLORD:${nonce}:{name}:FAIL:{简短原因}]]\``);
|
|
93
|
+
parts.push(`- 如果步骤需要等待人工确认,在单独一行输出:\`[[OVERLORD:${nonce}:{name}:WAIT_CONFIRM]]\`,然后**停止所有操作**,直到 stdin 确认`);
|
|
94
|
+
parts.push(`- 如果步骤有重要结果,在单独一行输出:\`[[OVERLORD:${nonce}:{name}:RESULT:{结果摘要}]]\``);
|
|
95
|
+
parts.push('');
|
|
96
|
+
parts.push('---');
|
|
97
|
+
parts.push('');
|
|
98
|
+
// Steps
|
|
99
|
+
parts.push('## 步骤');
|
|
100
|
+
parts.push('');
|
|
101
|
+
for (let i = 0; i < p.stages.length; i++) {
|
|
102
|
+
const stage = p.stages[i];
|
|
103
|
+
const stepNum = i + 1;
|
|
104
|
+
const heading = stage.label ?? stage.name;
|
|
105
|
+
parts.push(`### Step ${stepNum}: ${heading}`);
|
|
106
|
+
parts.push(substituteVars(sanitize(stage.prompt), vars, stage.params, stage.name));
|
|
107
|
+
if (stage.gate) {
|
|
108
|
+
parts.push(`✅ 通过条件:${stage.gate}`);
|
|
109
|
+
}
|
|
110
|
+
if (stage.onFailure) {
|
|
111
|
+
const gotoIndex = p.stages.findIndex(s => s.name === stage.onFailure.goto);
|
|
112
|
+
parts.push(`⚠️ 如果不满足条件,回到 Step ${gotoIndex + 1}(最多循环 ${stage.onFailure.maxLoops} 次)`);
|
|
113
|
+
}
|
|
114
|
+
if (stage.requireConfirm) {
|
|
115
|
+
parts.push(`⏸️ 执行前请输出 WAIT_CONFIRM 标记,然后完全停止所有操作,等待 stdin 确认后再继续。`);
|
|
116
|
+
}
|
|
117
|
+
parts.push('');
|
|
118
|
+
}
|
|
119
|
+
return { prompt: parts.join('\n').trimEnd() + '\n', nonce };
|
|
120
|
+
}
|
|
121
|
+
compileResume(pipeline, state, nonce, reason) {
|
|
122
|
+
const parts = [];
|
|
123
|
+
parts.push('---');
|
|
124
|
+
if (reason === 'takeover_release') {
|
|
125
|
+
parts.push('你的任务执行被人工接管了一段时间。人工操作已结束。');
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
parts.push('【Pipeline 提醒】你正在执行一个多步骤任务。');
|
|
129
|
+
}
|
|
130
|
+
parts.push('');
|
|
131
|
+
parts.push('当前进度:');
|
|
132
|
+
const STATUS_ICON = {
|
|
133
|
+
done: '✅',
|
|
134
|
+
running: '🔄',
|
|
135
|
+
pending: '⏳',
|
|
136
|
+
failed: '❌',
|
|
137
|
+
skipped: '⏭️',
|
|
138
|
+
waiting_confirm: '⏸️',
|
|
139
|
+
};
|
|
140
|
+
const STATUS_LABEL = {
|
|
141
|
+
done: '已完成',
|
|
142
|
+
running: '正在执行',
|
|
143
|
+
};
|
|
144
|
+
let runningStepNum = -1;
|
|
145
|
+
let runningName = '';
|
|
146
|
+
for (let i = 0; i < state.stages.length; i++) {
|
|
147
|
+
const s = state.stages[i];
|
|
148
|
+
const icon = STATUS_ICON[s.status] ?? '⏳';
|
|
149
|
+
const label = STATUS_LABEL[s.status] ?? s.status;
|
|
150
|
+
parts.push(`- ${icon} Step ${i + 1} (${s.name}): ${label}`);
|
|
151
|
+
if (s.status === 'running') {
|
|
152
|
+
runningStepNum = i + 1;
|
|
153
|
+
runningName = s.name;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
parts.push('');
|
|
157
|
+
if (runningStepNum > 0) {
|
|
158
|
+
parts.push(`请从 Step ${runningStepNum} (${runningName}) 继续,并保持 [[OVERLORD:${nonce}:...]] 标记输出。`);
|
|
159
|
+
}
|
|
160
|
+
parts.push('');
|
|
161
|
+
if (reason === 'context_reinjection') {
|
|
162
|
+
parts.push('完整步骤列表:');
|
|
163
|
+
for (let i = 0; i < pipeline.stages.length; i++) {
|
|
164
|
+
const stage = pipeline.stages[i];
|
|
165
|
+
const heading = stage.label ?? stage.name;
|
|
166
|
+
parts.push(`${i + 1}. ${heading}`);
|
|
167
|
+
}
|
|
168
|
+
parts.push('');
|
|
169
|
+
}
|
|
170
|
+
if (reason === 'takeover_release') {
|
|
171
|
+
parts.push('人工操作已结束。请先确认你当前的实际进度,然后继续执行。');
|
|
172
|
+
parts.push('');
|
|
173
|
+
}
|
|
174
|
+
parts.push('---');
|
|
175
|
+
return parts.join('\n');
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
exports.PipelineCompiler = PipelineCompiler;
|
|
179
|
+
//# sourceMappingURL=pipeline-compiler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pipeline-compiler.js","sourceRoot":"","sources":["../src/pipeline-compiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-parser.d.ts","sourceRoot":"","sources":["../src/pipeline-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAIf,MAAM,sBAAsB,CAAC;AAoB9B,qBAAa,cAAc;IACzB;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,eAAe,EAAE,MAAM,GAAG,cAAc;IAiD1E,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAgBnC,OAAO,CAAC,MAAM,CAAC,UAAU;
|
|
1
|
+
{"version":3,"file":"pipeline-parser.d.ts","sourceRoot":"","sources":["../src/pipeline-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAIf,MAAM,sBAAsB,CAAC;AAoB9B,qBAAa,cAAc;IACzB;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,eAAe,EAAE,MAAM,GAAG,cAAc;IAiD1E,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAgBnC,OAAO,CAAC,MAAM,CAAC,UAAU;IA2FzB,OAAO,CAAC,MAAM,CAAC,cAAc;IAW7B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAY/B,OAAO,CAAC,MAAM,CAAC,eAAe;CAgB/B"}
|
package/dist/pipeline-parser.js
CHANGED
|
@@ -92,10 +92,11 @@ class PipelineParser {
|
|
|
92
92
|
const type = PipelineParser.parseStageType(obj['type']);
|
|
93
93
|
const confirm = typeof obj['confirm'] === 'boolean' ? obj['confirm'] : defaults.confirm;
|
|
94
94
|
const isInteractive = type !== undefined || confirm;
|
|
95
|
-
// command: required for non-interactive stages
|
|
95
|
+
// command OR prompt: required for non-interactive stages
|
|
96
96
|
const command = typeof obj['command'] === 'string' ? obj['command'] : undefined;
|
|
97
|
-
|
|
98
|
-
|
|
97
|
+
const prompt = typeof obj['prompt'] === 'string' ? obj['prompt'] : undefined;
|
|
98
|
+
if (!isInteractive && command === undefined && prompt === undefined) {
|
|
99
|
+
throw new Error(`Non-interactive stage "${name}" at index ${index} requires a "command" or "prompt" field`);
|
|
99
100
|
}
|
|
100
101
|
// Merge with defaults
|
|
101
102
|
const stage = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-parser.js","sourceRoot":"","sources":["../src/pipeline-parser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pipeline-parser.js","sourceRoot":"","sources":["../src/pipeline-parser.ts"],"names":[],"mappings":";;;;;;AAMA,mDAG8B;AAC9B,gDAAwB;AAExB,MAAM,GAAG,GAAG,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;AAE9C,MAAM,sBAAsB,GAAkB;IAC5C,OAAO,EAAE,mCAAwB;IACjC,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,KAAK;IACd,YAAY,EAAE,KAAK;CACpB,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,iBAAiB,GAAuB,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAE7E,MAAa,cAAc;IACzB;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,IAAmB,EAAE,eAAuB;QACvD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,cAAc,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,GAAY,CAAC;QACjB,IAAI,CAAC;YACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,GAAG,GAAG,GAA8B,CAAC;QAE3C,iBAAiB;QACjB,MAAM,WAAW,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAA2B,CAAC;QACtE,MAAM,QAAQ,GAAkB;YAC9B,OAAO,EAAE,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,OAAO;YACvG,OAAO,EAAE,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,OAAO;YACvG,OAAO,EAAE,OAAO,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,OAAO;YACxG,YAAY,EAAE,OAAO,WAAW,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,sBAAsB,CAAC,YAAY;SAC7H,CAAC;QAEF,eAAe;QACf,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,MAAM,MAAM,GAAkB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAU,EAAE,GAAW,EAAE,EAAE;YACtE,OAAO,cAAc,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,2BAA2B;QAC3B,cAAc,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAEpD,0BAA0B;QAC1B,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAEvC,GAAG,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,8BAA8B,CAAC,CAAC;QAEzE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAEO,MAAM,CAAC,oBAAoB,CAAC,eAAuB;QACzD,OAAO;YACL,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,eAAe;oBACxB,OAAO,EAAE,sBAAsB,CAAC,OAAO;oBACvC,OAAO,EAAE,sBAAsB,CAAC,OAAO;oBACvC,OAAO,EAAE,sBAAsB,CAAC,OAAO;oBACvC,YAAY,EAAE,sBAAsB,CAAC,YAAY;iBAClD;aACF;YACD,QAAQ,EAAE,EAAE,GAAG,sBAAsB,EAAE;SACxC,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,UAAU,CACvB,GAAY,EACZ,KAAa,EACb,QAAuB,EACvB,UAAuB;QAEvB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,wBAAwB,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,GAAG,GAAG,GAA8B,CAAC;QAE3C,mBAAmB;QACnB,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,oCAAoC,CAAC,CAAC;QAC/E,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,cAAc,KAAK,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAErB,2BAA2B;QAC3B,MAAM,IAAI,GAAG,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QACxF,MAAM,aAAa,GAAG,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC;QAEpD,yDAAyD;QACzD,MAAM,OAAO,GAAG,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAChF,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7E,IAAI,CAAC,aAAa,IAAI,OAAO,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACpE,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,cAAc,KAAK,yCAAyC,CAAC,CAAC;QAC9G,CAAC;QAED,sBAAsB;QACtB,MAAM,KAAK,GAAgB;YACzB,IAAI;YACJ,OAAO;YACP,IAAI;YACJ,OAAO,EAAE,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO;YAC/E,OAAO,EAAE,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO;YAC/E,OAAO;YACP,YAAY,EAAE,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY;SACrG,CAAC;QAEF,8BAA8B;QAC9B,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;YACtC,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YAClC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,SAAS,CAA2B,CAAC;QAC3D,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC9C,KAAK,CAAC,cAAc,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,iBAAiB,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC/C,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;QACxD,CAAC;aAAM,IAAI,aAAa,EAAE,CAAC;YACzB,KAAK,CAAC,eAAe,GAAG,sCAA2B,GAAG,IAAI,CAAC;QAC7D,CAAC;QAED,YAAY;QACZ,IAAI,OAAO,GAAG,CAAC,WAAW,CAAC,KAAK,QAAQ,IAAI,GAAG,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE,CAAC;YACtE,MAAM,OAAO,GAAG,GAAG,CAAC,WAAW,CAA4B,CAAC;YAC5D,IAAI,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CAAC,UAAU,IAAI,sCAAsC,CAAC,CAAC;YACxE,CAAC;YACD,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC;YACnG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;gBAChD,MAAM,IAAI,KAAK,CAAC,UAAU,IAAI,iDAAiD,CAAC,CAAC;YACnF,CAAC;YACD,KAAK,CAAC,SAAS,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;QACxD,CAAC;QAED,MAAM;QACN,IAAI,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,QAAQ,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACxF,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAA2B,CAAC;QACnD,CAAC;QAED,wCAAwC;QACxC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,cAAc,IAAI,6BAA6B,CAAC,CAAC;QAC7F,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,KAAc;QAC1C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO,SAAS,CAAC;QAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,oCAAoC,OAAO,KAAK,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAyB,CAAC,EAAE,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,uBAAuB,KAAK,sBAAsB,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpG,CAAC;QACD,OAAO,KAAyB,CAAC;IACnC,CAAC;IAEO,MAAM,CAAC,gBAAgB,CAAC,MAAqB,EAAE,UAAuB;QAC5E,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;gBAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC1C,MAAM,IAAI,KAAK,CACb,UAAU,KAAK,CAAC,IAAI,mDAAmD,KAAK,CAAC,SAAS,CAAC,IAAI,GAAG,CAC/F,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,MAAqB;QAClD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACjD,MAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,CAAC,IAAI,yCAAyC,CAAC,CAAC;gBACxF,CAAC;gBAED,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC/D,IAAI,KAAK,CAAC,cAAc,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;oBACjF,MAAM,IAAI,KAAK,CACb,iBAAiB,KAAK,CAAC,IAAI,qBAAqB,KAAK,CAAC,cAAc,4BAA4B,CACjG,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAxMD,wCAwMC"}
|
|
@@ -65,6 +65,7 @@ export declare class PipelineRunner extends EventEmitter {
|
|
|
65
65
|
private noOutputAlertTimer;
|
|
66
66
|
private stageResolve;
|
|
67
67
|
private confirmResolve;
|
|
68
|
+
private resumeResolve;
|
|
68
69
|
constructor(taskId: number, sessionId: string, ptySession: PtySession, leaseChecker: LeaseChecker, promptDetector: PromptDetector);
|
|
69
70
|
/**
|
|
70
71
|
* Start pipeline execution.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-runner.d.ts","sourceRoot":"","sources":["../src/pipeline-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAGV,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,EAAiB,KAAK,cAAc,EAAwB,MAAM,qBAAqB,CAAC;AAO/F,oDAAoD;AACpD,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,IAAI,MAAM,CAAC;IACzB,gBAAgB,CAAC,IAAI,IAAI,CAAC;IAC1B,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9C,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAClD,aAAa,CAAC,IAAI,IAAI,CAAC;CACxB;AAED,2CAA2C;AAC3C,MAAM,WAAW,YAAY;IAC3B,YAAY,IAAI,OAAO,CAAC;CACzB;AAID,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,iBAAiB,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC7E,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAChD,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACnD,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAChE,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAChD,eAAe,EAAE;QACf,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,MAAM;QACjB,IAAI,EAAE,gBAAgB;QACtB,MAAM,EAAE,MAAM,GAAG,SAAS;QAC1B,OAAO,EAAE,iBAAiB,EAAE,GAAG,SAAS;QACxC,OAAO,EAAE,MAAM,GAAG,SAAS;KAC5B,CAAC;CACH;AAID,UAAU,cAAc;IACtB,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAQD,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAiB9D;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,UAAU,GAAG,OAAO,GAC7B,OAAO,CAQT;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAEtD;AAeD,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,cAAc,CAAiB;IAEvC,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,aAAa,CAA8B;IAEnD,OAAO,CAAC,KAAK,CAMX;IAEF,OAAO,CAAC,iBAAiB,CAAc;IAEvC,2FAA2F;IAC3F,OAAO,CAAC,SAAS,CAAS;IAE1B,iFAAiF;IACjF,OAAO,CAAC,QAAQ,CAA8B;IAG9C,OAAO,CAAC,cAAc,CAA+C;IACrE,OAAO,CAAC,iBAAiB,CAA8C;IACvE,OAAO,CAAC,gBAAgB,CAA8C;IACtE,OAAO,CAAC,mBAAmB,CAA8C;IACzE,OAAO,CAAC,kBAAkB,CAA8C;IAGxE,OAAO,CAAC,YAAY,CAA2D;IAG/E,OAAO,CAAC,cAAc,CAAkD;
|
|
1
|
+
{"version":3,"file":"pipeline-runner.d.ts","sourceRoot":"","sources":["../src/pipeline-runner.ts"],"names":[],"mappings":"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"}
|
package/dist/pipeline-runner.js
CHANGED
|
@@ -87,6 +87,8 @@ class PipelineRunner extends node_events_1.EventEmitter {
|
|
|
87
87
|
stageResolve = null;
|
|
88
88
|
// Confirm resolve
|
|
89
89
|
confirmResolve = null;
|
|
90
|
+
// Resume resolve for waitWhileSuspended
|
|
91
|
+
resumeResolve = null;
|
|
90
92
|
constructor(taskId, sessionId, ptySession, leaseChecker, promptDetector) {
|
|
91
93
|
super();
|
|
92
94
|
this.taskId = taskId;
|
|
@@ -142,6 +144,11 @@ class PipelineRunner extends node_events_1.EventEmitter {
|
|
|
142
144
|
log.info({ taskId: this.taskId }, 'Pipeline resumed');
|
|
143
145
|
this.state.status = 'running';
|
|
144
146
|
this.state.suspendReason = undefined;
|
|
147
|
+
// Wake the waitWhileSuspended promise
|
|
148
|
+
if (this.resumeResolve) {
|
|
149
|
+
this.resumeResolve();
|
|
150
|
+
this.resumeResolve = null;
|
|
151
|
+
}
|
|
145
152
|
}
|
|
146
153
|
/**
|
|
147
154
|
* Confirm an interactive stage with a user-provided result.
|
|
@@ -178,6 +185,11 @@ class PipelineRunner extends node_events_1.EventEmitter {
|
|
|
178
185
|
this.clearConfirmTimeout();
|
|
179
186
|
this.clearNoOutputAlert();
|
|
180
187
|
clearOwnership(this.sessionId);
|
|
188
|
+
// Unblock waitWhileSuspended if still waiting
|
|
189
|
+
if (this.resumeResolve) {
|
|
190
|
+
this.resumeResolve();
|
|
191
|
+
this.resumeResolve = null;
|
|
192
|
+
}
|
|
181
193
|
}
|
|
182
194
|
// -- Event registration helpers (typed) --
|
|
183
195
|
onStageChanged(handler) {
|
|
@@ -357,10 +369,30 @@ class PipelineRunner extends node_events_1.EventEmitter {
|
|
|
357
369
|
// Initialize detector
|
|
358
370
|
this.stageDetector = new stage_detector_js_1.StageDetector(stage.name, this.promptDetector);
|
|
359
371
|
this.stageResolve = resolve;
|
|
360
|
-
//
|
|
372
|
+
// Try detection on new data arrival (event-driven)
|
|
373
|
+
const tryDetect = () => {
|
|
374
|
+
if (this.state.status === 'suspended')
|
|
375
|
+
return;
|
|
376
|
+
if (!this.stageDetector)
|
|
377
|
+
return;
|
|
378
|
+
const cleanOutput = this.ptySession.getCleanOutput();
|
|
379
|
+
const result = this.stageDetector.detect(cleanOutput);
|
|
380
|
+
if (result && result.confidence === 'low') {
|
|
381
|
+
return; // Don't trust low-confidence keyword detection alone
|
|
382
|
+
}
|
|
383
|
+
if (result && this.stageResolve) {
|
|
384
|
+
this.clearDetectionTimer();
|
|
385
|
+
this.clearStageTimeout();
|
|
386
|
+
this.clearNoOutputAlert();
|
|
387
|
+
this.stageResolve(result);
|
|
388
|
+
this.stageResolve = null;
|
|
389
|
+
}
|
|
390
|
+
};
|
|
391
|
+
// Listen for PTY output — run detection on each chunk
|
|
361
392
|
this.ptySession.onData(() => {
|
|
362
393
|
this.stageDetector?.onOutput();
|
|
363
394
|
this.resetNoOutputAlert(stage);
|
|
395
|
+
tryDetect();
|
|
364
396
|
});
|
|
365
397
|
// Listen for process exit
|
|
366
398
|
this.ptySession.onExit((exitCode) => {
|
|
@@ -373,25 +405,10 @@ class PipelineRunner extends node_events_1.EventEmitter {
|
|
|
373
405
|
this.stageResolve = null;
|
|
374
406
|
}
|
|
375
407
|
});
|
|
376
|
-
//
|
|
408
|
+
// Fallback polling at a slower rate for edge cases (e.g. prompt detection
|
|
409
|
+
// that relies on absence of output rather than new data)
|
|
377
410
|
this.detectionTimer = setInterval(() => {
|
|
378
|
-
|
|
379
|
-
return; // Don't detect while suspended
|
|
380
|
-
if (!this.stageDetector)
|
|
381
|
-
return;
|
|
382
|
-
const cleanOutput = this.ptySession.getCleanOutput();
|
|
383
|
-
const result = this.stageDetector.detect(cleanOutput);
|
|
384
|
-
if (result && result.confidence === 'low') {
|
|
385
|
-
// Don't trust low-confidence keyword detection alone
|
|
386
|
-
return; // keep polling
|
|
387
|
-
}
|
|
388
|
-
if (result && this.stageResolve) {
|
|
389
|
-
this.clearDetectionTimer();
|
|
390
|
-
this.clearStageTimeout();
|
|
391
|
-
this.clearNoOutputAlert();
|
|
392
|
-
this.stageResolve(result);
|
|
393
|
-
this.stageResolve = null;
|
|
394
|
-
}
|
|
411
|
+
tryDetect();
|
|
395
412
|
}, DETECTION_POLL_MS);
|
|
396
413
|
if (this.detectionTimer.unref)
|
|
397
414
|
this.detectionTimer.unref();
|
|
@@ -496,14 +513,7 @@ class PipelineRunner extends node_events_1.EventEmitter {
|
|
|
496
513
|
return Promise.resolve();
|
|
497
514
|
}
|
|
498
515
|
return new Promise((resolve) => {
|
|
499
|
-
|
|
500
|
-
if (this.state.status !== 'suspended' || this.destroyed) {
|
|
501
|
-
clearInterval(interval);
|
|
502
|
-
resolve();
|
|
503
|
-
}
|
|
504
|
-
}, 500);
|
|
505
|
-
if (interval.unref)
|
|
506
|
-
interval.unref();
|
|
516
|
+
this.resumeResolve = resolve;
|
|
507
517
|
});
|
|
508
518
|
}
|
|
509
519
|
// -- Task-level timeout --
|