@coralai/sps-cli 0.20.0 → 0.21.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 +9 -8
- package/dist/commands/pipelineTick.d.ts.map +1 -1
- package/dist/commands/pipelineTick.js +3 -2
- package/dist/commands/pipelineTick.js.map +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +22 -7
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/tick.d.ts.map +1 -1
- package/dist/commands/tick.js +4 -3
- package/dist/commands/tick.js.map +1 -1
- package/dist/commands/workerDashboard.d.ts.map +1 -1
- package/dist/commands/workerDashboard.js +28 -8
- package/dist/commands/workerDashboard.js.map +1 -1
- package/dist/commands/workerLaunch.d.ts.map +1 -1
- package/dist/commands/workerLaunch.js +3 -2
- package/dist/commands/workerLaunch.js.map +1 -1
- package/dist/core/state.d.ts +13 -1
- package/dist/core/state.d.ts.map +1 -1
- package/dist/core/state.js +11 -0
- package/dist/core/state.js.map +1 -1
- package/dist/engines/CloseoutEngine.d.ts.map +1 -1
- package/dist/engines/CloseoutEngine.js +6 -0
- package/dist/engines/CloseoutEngine.js.map +1 -1
- package/dist/engines/ExecutionEngine.d.ts +9 -1
- package/dist/engines/ExecutionEngine.d.ts.map +1 -1
- package/dist/engines/ExecutionEngine.js +197 -29
- package/dist/engines/ExecutionEngine.js.map +1 -1
- package/dist/engines/MonitorEngine.d.ts +1 -0
- package/dist/engines/MonitorEngine.d.ts.map +1 -1
- package/dist/engines/MonitorEngine.js +34 -0
- package/dist/engines/MonitorEngine.js.map +1 -1
- package/dist/interfaces/AgentRuntime.d.ts +2 -2
- package/dist/interfaces/AgentRuntime.d.ts.map +1 -1
- package/dist/manager/post-actions.d.ts.map +1 -1
- package/dist/manager/post-actions.js +4 -2
- package/dist/manager/post-actions.js.map +1 -1
- package/dist/manager/recovery.d.ts +4 -0
- package/dist/manager/recovery.d.ts.map +1 -1
- package/dist/manager/recovery.js +121 -0
- package/dist/manager/recovery.js.map +1 -1
- package/dist/manager/supervisor.d.ts +13 -3
- package/dist/manager/supervisor.d.ts.map +1 -1
- package/dist/manager/supervisor.js +51 -2
- package/dist/manager/supervisor.js.map +1 -1
- package/dist/providers/ACPWorkerRuntime.d.ts +2 -2
- package/dist/providers/ACPWorkerRuntime.d.ts.map +1 -1
- package/dist/providers/ACPWorkerRuntime.js +9 -7
- package/dist/providers/ACPWorkerRuntime.js.map +1 -1
- package/dist/providers/adapters/CodexACPAdapter.d.ts.map +1 -1
- package/dist/providers/adapters/CodexACPAdapter.js +12 -6
- package/dist/providers/adapters/CodexACPAdapter.js.map +1 -1
- package/dist/providers/registry.d.ts +3 -0
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js +4 -0
- package/dist/providers/registry.js.map +1 -1
- package/package.json +1 -1
package/dist/manager/recovery.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { readState, writeState } from '../core/state.js';
|
|
2
2
|
import { resolveGitlabProjectId } from '../core/config.js';
|
|
3
|
+
import { ProjectContext } from '../core/context.js';
|
|
3
4
|
import { isProcessAlive } from '../providers/outputParser.js';
|
|
5
|
+
import { ACPWorkerRuntime } from '../providers/ACPWorkerRuntime.js';
|
|
4
6
|
// ─── Recovery ───────────────────────────────────────────────────
|
|
5
7
|
export class Recovery {
|
|
6
8
|
supervisor;
|
|
@@ -28,6 +30,17 @@ export class Recovery {
|
|
|
28
30
|
// Recover active, merging, and resolving slots
|
|
29
31
|
if (!['active', 'merging', 'resolving'].includes(slot.status))
|
|
30
32
|
continue;
|
|
33
|
+
if (slot.transport === 'acp' || slot.mode === 'acp') {
|
|
34
|
+
result.found++;
|
|
35
|
+
const recovered = await this.recoverAcpSlot(project, slotName, seqString(slot.seq), slot, postActions);
|
|
36
|
+
if (recovered === 'alive')
|
|
37
|
+
result.alive++;
|
|
38
|
+
if (recovered === 'completed')
|
|
39
|
+
result.completed++;
|
|
40
|
+
if (recovered === 'failed')
|
|
41
|
+
result.failed++;
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
31
44
|
// For merging slots without PID: reset to active so completion flow picks it up
|
|
32
45
|
if ((slot.status === 'merging' || slot.status === 'resolving') && !slot.pid) {
|
|
33
46
|
process.stderr.write(`[recovery] ${project.name}:${slotName}:${slot.seq}: slot in ${slot.status} state without PID, resetting\n`);
|
|
@@ -51,6 +64,7 @@ export class Recovery {
|
|
|
51
64
|
const buildOnExit = this.buildOnExitCallback(project, slotName, slot, seq, postActions);
|
|
52
65
|
this.supervisor.monitorOrphanPid(workerId, slot.pid, {
|
|
53
66
|
id: workerId,
|
|
67
|
+
transport: 'proc',
|
|
54
68
|
pid: slot.pid,
|
|
55
69
|
outputFile: slot.outputFile || '',
|
|
56
70
|
project: project.name,
|
|
@@ -61,6 +75,10 @@ export class Recovery {
|
|
|
61
75
|
tool: (project.config.WORKER_TOOL || 'claude'),
|
|
62
76
|
exitCode: null,
|
|
63
77
|
sessionId: slot.sessionId || null,
|
|
78
|
+
runId: slot.runId || null,
|
|
79
|
+
sessionState: slot.sessionState || null,
|
|
80
|
+
remoteStatus: slot.remoteStatus || null,
|
|
81
|
+
lastEventAt: slot.lastEventAt || null,
|
|
64
82
|
startedAt: slot.claimedAt || new Date().toISOString(),
|
|
65
83
|
exitedAt: null,
|
|
66
84
|
}, buildOnExit);
|
|
@@ -146,5 +164,108 @@ export class Recovery {
|
|
|
146
164
|
log(msg) {
|
|
147
165
|
process.stderr.write(`[recovery] ${msg}\n`);
|
|
148
166
|
}
|
|
167
|
+
async recoverAcpSlot(project, slotName, seq, slot, postActions) {
|
|
168
|
+
const ctx = ProjectContext.load(project.name);
|
|
169
|
+
const runtime = new ACPWorkerRuntime(ctx);
|
|
170
|
+
const inspected = await runtime.inspect(slotName);
|
|
171
|
+
const session = inspected.sessions[slotName];
|
|
172
|
+
const workerId = `${project.name}:${slotName}:${seq}`;
|
|
173
|
+
if (session && session.currentRun && this.isActiveRun(session.currentRun.status)) {
|
|
174
|
+
this.resourceLimiter.tryAcquire();
|
|
175
|
+
this.supervisor.registerAcpHandle({
|
|
176
|
+
id: workerId,
|
|
177
|
+
pid: null,
|
|
178
|
+
outputFile: null,
|
|
179
|
+
project: project.name,
|
|
180
|
+
seq,
|
|
181
|
+
slot: slotName,
|
|
182
|
+
branch: slot.branch || '',
|
|
183
|
+
worktree: slot.worktree || '',
|
|
184
|
+
tool: session.tool,
|
|
185
|
+
exitCode: null,
|
|
186
|
+
sessionId: session.sessionId,
|
|
187
|
+
runId: session.currentRun.runId,
|
|
188
|
+
sessionState: session.sessionState,
|
|
189
|
+
remoteStatus: session.currentRun.status,
|
|
190
|
+
lastEventAt: session.lastSeenAt,
|
|
191
|
+
startedAt: slot.claimedAt || new Date().toISOString(),
|
|
192
|
+
exitedAt: null,
|
|
193
|
+
});
|
|
194
|
+
this.syncAcpSlot(project, slotName, session);
|
|
195
|
+
this.log(`Recovered active ACP worker ${workerId} (session ${session.sessionId}, run ${session.currentRun.runId})`);
|
|
196
|
+
return 'alive';
|
|
197
|
+
}
|
|
198
|
+
const exitCode = this.acpExitCode(session?.currentRun?.status);
|
|
199
|
+
const judgeInput = {
|
|
200
|
+
worktree: slot.worktree || '',
|
|
201
|
+
branch: slot.branch || '',
|
|
202
|
+
baseBranch: project.config.GITLAB_MERGE_BRANCH,
|
|
203
|
+
outputFile: null,
|
|
204
|
+
exitCode,
|
|
205
|
+
logsDir: project.logsDir,
|
|
206
|
+
};
|
|
207
|
+
if (session) {
|
|
208
|
+
this.syncAcpSlot(project, slotName, session);
|
|
209
|
+
this.supervisor.registerAcpHandle({
|
|
210
|
+
id: workerId,
|
|
211
|
+
pid: null,
|
|
212
|
+
outputFile: null,
|
|
213
|
+
project: project.name,
|
|
214
|
+
seq,
|
|
215
|
+
slot: slotName,
|
|
216
|
+
branch: slot.branch || '',
|
|
217
|
+
worktree: slot.worktree || '',
|
|
218
|
+
tool: session.tool,
|
|
219
|
+
exitCode,
|
|
220
|
+
sessionId: session.sessionId,
|
|
221
|
+
runId: session.currentRun?.runId || null,
|
|
222
|
+
sessionState: session.sessionState,
|
|
223
|
+
remoteStatus: session.currentRun?.status || 'lost',
|
|
224
|
+
lastEventAt: session.lastSeenAt,
|
|
225
|
+
startedAt: slot.claimedAt || new Date().toISOString(),
|
|
226
|
+
exitedAt: new Date().toISOString(),
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
const completion = this.judge.judge(judgeInput);
|
|
230
|
+
const postActionCtx = this.buildPostActionContext(project, slotName, seq, slot);
|
|
231
|
+
const state = readState(project.stateFile, project.config.MAX_CONCURRENT_WORKERS);
|
|
232
|
+
const card = state.activeCards[seq];
|
|
233
|
+
const retryCount = card?.retryCount ?? 0;
|
|
234
|
+
if (completion.status === 'completed') {
|
|
235
|
+
await postActions.executeCompletion(postActionCtx, completion, session?.sessionId || null);
|
|
236
|
+
return 'completed';
|
|
237
|
+
}
|
|
238
|
+
await postActions.executeFailure(postActionCtx, completion, exitCode, null, retryCount, { onExit: this.buildOnExitCallback(project, slotName, slot, seq, postActions) });
|
|
239
|
+
return 'failed';
|
|
240
|
+
}
|
|
241
|
+
syncAcpSlot(project, slotName, session) {
|
|
242
|
+
const state = readState(project.stateFile, project.config.MAX_CONCURRENT_WORKERS);
|
|
243
|
+
const slot = state.workers[slotName];
|
|
244
|
+
if (!slot)
|
|
245
|
+
return;
|
|
246
|
+
slot.mode = 'acp';
|
|
247
|
+
slot.transport = 'acp';
|
|
248
|
+
slot.agent = session.tool;
|
|
249
|
+
slot.tmuxSession = session.sessionName;
|
|
250
|
+
slot.sessionId = session.sessionId;
|
|
251
|
+
slot.runId = session.currentRun?.runId || null;
|
|
252
|
+
slot.sessionState = session.sessionState;
|
|
253
|
+
slot.remoteStatus = session.currentRun?.status || null;
|
|
254
|
+
slot.lastEventAt = session.lastSeenAt;
|
|
255
|
+
slot.pid = null;
|
|
256
|
+
slot.outputFile = null;
|
|
257
|
+
slot.exitCode = null;
|
|
258
|
+
slot.lastHeartbeat = new Date().toISOString();
|
|
259
|
+
writeState(project.stateFile, state, 'recovery-acp-sync');
|
|
260
|
+
}
|
|
261
|
+
isActiveRun(status) {
|
|
262
|
+
return ['submitted', 'running', 'waiting_input'].includes(status);
|
|
263
|
+
}
|
|
264
|
+
acpExitCode(status) {
|
|
265
|
+
return status === 'completed' ? 0 : 1;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
function seqString(seq) {
|
|
269
|
+
return seq == null ? '' : String(seq);
|
|
149
270
|
}
|
|
150
271
|
//# sourceMappingURL=recovery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../src/manager/recovery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../src/manager/recovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,9 +31,10 @@ export interface ExitEvent {
|
|
|
31
31
|
}
|
|
32
32
|
export interface WorkerHandle {
|
|
33
33
|
id: string;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
transport: 'proc' | 'acp';
|
|
35
|
+
pid: number | null;
|
|
36
|
+
child: ChildProcess | null;
|
|
37
|
+
outputFile: string | null;
|
|
37
38
|
project: string;
|
|
38
39
|
seq: string;
|
|
39
40
|
slot: string;
|
|
@@ -42,6 +43,10 @@ export interface WorkerHandle {
|
|
|
42
43
|
tool: 'claude' | 'codex';
|
|
43
44
|
exitCode: number | null;
|
|
44
45
|
sessionId: string | null;
|
|
46
|
+
runId: string | null;
|
|
47
|
+
sessionState: 'booting' | 'ready' | 'busy' | 'draining' | 'offline' | null;
|
|
48
|
+
remoteStatus: 'submitted' | 'running' | 'waiting_input' | 'completed' | 'failed' | 'cancelled' | 'lost' | null;
|
|
49
|
+
lastEventAt: string | null;
|
|
45
50
|
startedAt: string;
|
|
46
51
|
exitedAt: string | null;
|
|
47
52
|
}
|
|
@@ -62,6 +67,11 @@ export declare class ProcessSupervisor {
|
|
|
62
67
|
getAll(): WorkerHandle[];
|
|
63
68
|
remove(id: string): void;
|
|
64
69
|
get activeCount(): number;
|
|
70
|
+
registerAcpHandle(handle: Omit<WorkerHandle, 'child' | 'transport'> & {
|
|
71
|
+
child?: ChildProcess | null;
|
|
72
|
+
transport?: 'acp';
|
|
73
|
+
}): WorkerHandle;
|
|
74
|
+
updateAcpHandle(id: string, patch: Partial<Pick<WorkerHandle, 'sessionId' | 'runId' | 'sessionState' | 'remoteStatus' | 'lastEventAt' | 'exitCode' | 'exitedAt' | 'outputFile'>>): WorkerHandle | undefined;
|
|
65
75
|
/**
|
|
66
76
|
* Wait for all pending PostAction promises to settle.
|
|
67
77
|
* Called by tick after each cycle to ensure exit callbacks complete.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAS9D,MAAM,WAAW,SAAS;IACxB,oDAAoD;IACpD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sFAAsF;IACtF,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CACpD;AAED,4CAA4C;AAC5C,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,7 @@ export class ProcessSupervisor {
|
|
|
57
57
|
// This ensures exit callback fires reliably
|
|
58
58
|
const handle = {
|
|
59
59
|
id: opts.id,
|
|
60
|
+
transport: 'proc',
|
|
60
61
|
pid: child.pid ?? 0,
|
|
61
62
|
child,
|
|
62
63
|
outputFile: opts.outputFile,
|
|
@@ -68,6 +69,10 @@ export class ProcessSupervisor {
|
|
|
68
69
|
tool: opts.tool,
|
|
69
70
|
exitCode: null,
|
|
70
71
|
sessionId: opts.resumeSessionId || null,
|
|
72
|
+
runId: null,
|
|
73
|
+
sessionState: null,
|
|
74
|
+
remoteStatus: null,
|
|
75
|
+
lastEventAt: null,
|
|
71
76
|
startedAt: new Date().toISOString(),
|
|
72
77
|
exitedAt: null,
|
|
73
78
|
};
|
|
@@ -96,7 +101,7 @@ export class ProcessSupervisor {
|
|
|
96
101
|
const handle = this.workers.get(id);
|
|
97
102
|
if (!handle)
|
|
98
103
|
return;
|
|
99
|
-
if (handle.pid > 0 && isProcessAlive(handle.pid)) {
|
|
104
|
+
if (handle.transport === 'proc' && handle.pid && handle.pid > 0 && isProcessAlive(handle.pid)) {
|
|
100
105
|
await killProcessGroup(handle.pid);
|
|
101
106
|
}
|
|
102
107
|
this.workers.delete(id);
|
|
@@ -121,6 +126,40 @@ export class ProcessSupervisor {
|
|
|
121
126
|
get activeCount() {
|
|
122
127
|
return this.workers.size;
|
|
123
128
|
}
|
|
129
|
+
registerAcpHandle(handle) {
|
|
130
|
+
const next = {
|
|
131
|
+
...handle,
|
|
132
|
+
transport: 'acp',
|
|
133
|
+
pid: null,
|
|
134
|
+
child: handle.child ?? null,
|
|
135
|
+
outputFile: handle.outputFile ?? null,
|
|
136
|
+
runId: handle.runId ?? null,
|
|
137
|
+
sessionState: handle.sessionState ?? null,
|
|
138
|
+
remoteStatus: handle.remoteStatus ?? null,
|
|
139
|
+
lastEventAt: handle.lastEventAt ?? null,
|
|
140
|
+
};
|
|
141
|
+
this.workers.set(next.id, next);
|
|
142
|
+
return next;
|
|
143
|
+
}
|
|
144
|
+
updateAcpHandle(id, patch) {
|
|
145
|
+
const current = this.workers.get(id);
|
|
146
|
+
if (!current)
|
|
147
|
+
return undefined;
|
|
148
|
+
const next = {
|
|
149
|
+
...current,
|
|
150
|
+
...patch,
|
|
151
|
+
transport: 'acp',
|
|
152
|
+
pid: null,
|
|
153
|
+
child: current.child ?? null,
|
|
154
|
+
outputFile: patch.outputFile ?? current.outputFile ?? null,
|
|
155
|
+
runId: patch.runId ?? current.runId ?? null,
|
|
156
|
+
sessionState: patch.sessionState ?? current.sessionState ?? null,
|
|
157
|
+
remoteStatus: patch.remoteStatus ?? current.remoteStatus ?? null,
|
|
158
|
+
lastEventAt: patch.lastEventAt ?? current.lastEventAt ?? null,
|
|
159
|
+
};
|
|
160
|
+
this.workers.set(id, next);
|
|
161
|
+
return next;
|
|
162
|
+
}
|
|
124
163
|
/**
|
|
125
164
|
* Wait for all pending PostAction promises to settle.
|
|
126
165
|
* Called by tick after each cycle to ensure exit callbacks complete.
|
|
@@ -138,7 +177,17 @@ export class ProcessSupervisor {
|
|
|
138
177
|
*/
|
|
139
178
|
monitorOrphanPid(id, pid, handle, onDead) {
|
|
140
179
|
// Store handle without child reference
|
|
141
|
-
const orphanHandle = {
|
|
180
|
+
const orphanHandle = {
|
|
181
|
+
...handle,
|
|
182
|
+
transport: 'proc',
|
|
183
|
+
child: null,
|
|
184
|
+
pid,
|
|
185
|
+
outputFile: handle.outputFile ?? null,
|
|
186
|
+
runId: handle.runId ?? null,
|
|
187
|
+
sessionState: handle.sessionState ?? null,
|
|
188
|
+
remoteStatus: handle.remoteStatus ?? null,
|
|
189
|
+
lastEventAt: handle.lastEventAt ?? null,
|
|
190
|
+
};
|
|
142
191
|
this.workers.set(id, orphanHandle);
|
|
143
192
|
const timer = setInterval(() => {
|
|
144
193
|
if (!isProcessAlive(pid)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ export declare class ACPWorkerRuntime implements AgentRuntime {
|
|
|
6
6
|
private readonly ctx;
|
|
7
7
|
private readonly client;
|
|
8
8
|
constructor(ctx: ProjectContext, client?: ACPClient);
|
|
9
|
-
ensureSession(slot: string, tool?: ACPTool): Promise<ACPSessionRecord>;
|
|
10
|
-
startRun(slot: string, prompt: string, tool?: ACPTool): Promise<ACPSessionRecord>;
|
|
9
|
+
ensureSession(slot: string, tool?: ACPTool, cwdOverride?: string): Promise<ACPSessionRecord>;
|
|
10
|
+
startRun(slot: string, prompt: string, tool?: ACPTool, cwdOverride?: string): Promise<ACPSessionRecord>;
|
|
11
11
|
inspect(slot?: string): Promise<ACPState>;
|
|
12
12
|
stopSession(slot: string): Promise<void>;
|
|
13
13
|
private normalizeSlot;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ACPWorkerRuntime.d.ts","sourceRoot":"","sources":["../../src/providers/ACPWorkerRuntime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,EAEV,QAAQ,EACR,gBAAgB,EAGhB,OAAO,EACR,MAAM,kBAAkB,CAAC;AAgB1B,qBAAa,gBAAiB,YAAW,YAAY;IAEjD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,GAAG,EAAE,cAAc,EACnB,MAAM,GAAE,SAAgC;IAGrD,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ACPWorkerRuntime.d.ts","sourceRoot":"","sources":["../../src/providers/ACPWorkerRuntime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,EAEV,QAAQ,EACR,gBAAgB,EAGhB,OAAO,EACR,MAAM,kBAAkB,CAAC;AAgB1B,qBAAa,gBAAiB,YAAW,YAAY;IAEjD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,GAAG,EAAE,cAAc,EACnB,MAAM,GAAE,SAAgC;IAGrD,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAsC5F,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2CvG,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAwDzC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC9C,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,aAAa;CAQtB"}
|
|
@@ -17,18 +17,20 @@ export class ACPWorkerRuntime {
|
|
|
17
17
|
this.ctx = ctx;
|
|
18
18
|
this.client = client;
|
|
19
19
|
}
|
|
20
|
-
async ensureSession(slot, tool) {
|
|
20
|
+
async ensureSession(slot, tool, cwdOverride) {
|
|
21
21
|
const state = readACPState(this.ctx.paths.acpStateFile);
|
|
22
22
|
const normalizedSlot = this.normalizeSlot(slot);
|
|
23
23
|
const selectedTool = tool || this.defaultTool();
|
|
24
24
|
const existing = state.sessions[normalizedSlot];
|
|
25
25
|
const sessionName = existing?.sessionName || this.buildSessionName(normalizedSlot);
|
|
26
|
-
const cwd = existing?.cwd || this.ctx.paths.repoDir;
|
|
26
|
+
const cwd = cwdOverride || existing?.cwd || this.ctx.paths.repoDir;
|
|
27
|
+
const resetExisting = !existing || (!!cwdOverride && existing.cwd !== cwdOverride);
|
|
28
|
+
const retainedRun = resetExisting ? null : (existing?.currentRun || null);
|
|
27
29
|
const result = await this.client.ensureSession({
|
|
28
30
|
sessionName,
|
|
29
31
|
tool: selectedTool,
|
|
30
32
|
cwd,
|
|
31
|
-
resetExisting
|
|
33
|
+
resetExisting,
|
|
32
34
|
});
|
|
33
35
|
const session = this.upsertSession(state, normalizedSlot, {
|
|
34
36
|
slot: normalizedSlot,
|
|
@@ -37,10 +39,10 @@ export class ACPWorkerRuntime {
|
|
|
37
39
|
sessionName,
|
|
38
40
|
cwd,
|
|
39
41
|
status: result.sessionState === 'ready'
|
|
40
|
-
? (
|
|
42
|
+
? (retainedRun ? 'active' : 'idle')
|
|
41
43
|
: 'launching',
|
|
42
44
|
sessionState: result.sessionState,
|
|
43
|
-
currentRun:
|
|
45
|
+
currentRun: retainedRun,
|
|
44
46
|
createdAt: existing?.createdAt || now(),
|
|
45
47
|
updatedAt: now(),
|
|
46
48
|
lastSeenAt: result.lastSeenAt,
|
|
@@ -49,10 +51,10 @@ export class ACPWorkerRuntime {
|
|
|
49
51
|
writeACPState(this.ctx.paths.acpStateFile, state, 'acp-ensure-session');
|
|
50
52
|
return session;
|
|
51
53
|
}
|
|
52
|
-
async startRun(slot, prompt, tool) {
|
|
54
|
+
async startRun(slot, prompt, tool, cwdOverride) {
|
|
53
55
|
const normalizedSlot = this.normalizeSlot(slot);
|
|
54
56
|
const state = readACPState(this.ctx.paths.acpStateFile);
|
|
55
|
-
const session = await this.ensureSession(normalizedSlot, tool);
|
|
57
|
+
const session = await this.ensureSession(normalizedSlot, tool, cwdOverride);
|
|
56
58
|
if (session.sessionState !== 'ready') {
|
|
57
59
|
throw new Error(`ACP session ${session.sessionId} is not ready (state=${session.sessionState})`);
|
|
58
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ACPWorkerRuntime.js","sourceRoot":"","sources":["../../src/providers/ACPWorkerRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,SAAS,GAAG;IACV,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,aAAa,CAAC,MAAc;IACnC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;AACxE,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA8B;IACzD,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,OAAO,gBAAgB;IAER;IACA;IAFnB,YACmB,GAAmB,EACnB,SAAoB,IAAI,cAAc,EAAE;QADxC,QAAG,GAAH,GAAG,CAAgB;QACnB,WAAM,GAAN,MAAM,CAAkC;IACxD,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAC,IAAY,EAAE,IAAc;
|
|
1
|
+
{"version":3,"file":"ACPWorkerRuntime.js","sourceRoot":"","sources":["../../src/providers/ACPWorkerRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodexACPAdapter.d.ts","sourceRoot":"","sources":["../../../src/providers/adapters/CodexACPAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"CodexACPAdapter.d.ts","sourceRoot":"","sources":["../../../src/providers/adapters/CodexACPAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAkBvC,qBAAa,eAAe;IACpB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAetE,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;IAyBvD,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAYzE,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAqB7D,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;YAO3C,gBAAgB;YAoChB,SAAS;CAuCxB"}
|
|
@@ -3,6 +3,7 @@ const CODEX_READY = /›\s.*$/m;
|
|
|
3
3
|
const CODEX_MODEL_LINE = /codex.*default.*·|gpt-.*codex/i;
|
|
4
4
|
const CODEX_UPDATE_PROMPT = /Update available|Skip until next version|Press enter to continue/i;
|
|
5
5
|
const CODEX_RATE_LIMIT_PROMPT = /rate limit|Switch to .+codex-mini|Keep current model/i;
|
|
6
|
+
const CODEX_TRUST_PROMPT = /Do you trust the contents of this directory|1\.\s+Yes, continue|Working with untrusted contents/i;
|
|
6
7
|
function isReady(text) {
|
|
7
8
|
return (CODEX_MODEL_LINE.test(text) && CODEX_READY.test(text))
|
|
8
9
|
|| (/OpenAI Codex/i.test(text) && /›/m.test(text));
|
|
@@ -66,12 +67,12 @@ export class CodexACPAdapter {
|
|
|
66
67
|
}
|
|
67
68
|
const pane = capturePaneText(input.sessionName, 120);
|
|
68
69
|
let runState = 'running';
|
|
69
|
-
if (
|
|
70
|
-
runState = 'waiting_input';
|
|
71
|
-
}
|
|
72
|
-
else if (isReady(pane)) {
|
|
70
|
+
if (isReady(pane)) {
|
|
73
71
|
runState = 'completed';
|
|
74
72
|
}
|
|
73
|
+
else if (waitingInput(pane)) {
|
|
74
|
+
runState = 'waiting_input';
|
|
75
|
+
}
|
|
75
76
|
return {
|
|
76
77
|
runState,
|
|
77
78
|
paneText: pane,
|
|
@@ -124,6 +125,8 @@ export class CodexACPAdapter {
|
|
|
124
125
|
await sleep(5_000);
|
|
125
126
|
while (Date.now() < deadline) {
|
|
126
127
|
const text = capturePaneText(session, 30);
|
|
128
|
+
if (isReady(text))
|
|
129
|
+
return true;
|
|
127
130
|
if (CODEX_UPDATE_PROMPT.test(text)) {
|
|
128
131
|
if (/1\. Update now/i.test(text)) {
|
|
129
132
|
tmux(['send-keys', '-t', session, 'Down']);
|
|
@@ -135,6 +138,11 @@ export class CodexACPAdapter {
|
|
|
135
138
|
await sleep(3_000);
|
|
136
139
|
continue;
|
|
137
140
|
}
|
|
141
|
+
if (CODEX_TRUST_PROMPT.test(text)) {
|
|
142
|
+
tmux(['send-keys', '-t', session, 'Enter']);
|
|
143
|
+
await sleep(3_000);
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
138
146
|
if (CODEX_RATE_LIMIT_PROMPT.test(text)) {
|
|
139
147
|
tmux(['send-keys', '-t', session, 'Escape']);
|
|
140
148
|
await sleep(500);
|
|
@@ -142,8 +150,6 @@ export class CodexACPAdapter {
|
|
|
142
150
|
await sleep(2_000);
|
|
143
151
|
continue;
|
|
144
152
|
}
|
|
145
|
-
if (isReady(text))
|
|
146
|
-
return true;
|
|
147
153
|
await sleep(3_000);
|
|
148
154
|
}
|
|
149
155
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodexACPAdapter.js","sourceRoot":"","sources":["../../../src/providers/adapters/CodexACPAdapter.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAEzF,MAAM,WAAW,GAAG,SAAS,CAAC;AAC9B,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,mBAAmB,GAAG,mEAAmE,CAAC;AAChG,MAAM,uBAAuB,GAAG,uDAAuD,CAAC;
|
|
1
|
+
{"version":3,"file":"CodexACPAdapter.js","sourceRoot":"","sources":["../../../src/providers/adapters/CodexACPAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,11 @@ import type { TaskBackend } from '../interfaces/TaskBackend.js';
|
|
|
3
3
|
import type { WorkerProvider } from '../interfaces/WorkerProvider.js';
|
|
4
4
|
import type { RepoBackend } from '../interfaces/RepoBackend.js';
|
|
5
5
|
import type { Notifier } from '../interfaces/Notifier.js';
|
|
6
|
+
import type { AgentRuntime } from '../interfaces/AgentRuntime.js';
|
|
7
|
+
import { ProjectContext } from '../core/context.js';
|
|
6
8
|
export declare function createTaskBackend(config: ProjectConfig): TaskBackend;
|
|
7
9
|
export declare function createWorkerProvider(config: ProjectConfig): WorkerProvider;
|
|
8
10
|
export declare function createRepoBackend(config: ProjectConfig): RepoBackend;
|
|
9
11
|
export declare function createNotifier(config: ProjectConfig): Notifier;
|
|
12
|
+
export declare function createAgentRuntime(ctx: ProjectContext): AgentRuntime;
|
|
10
13
|
//# sourceMappingURL=registry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAOpE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,GAAG,cAAc,CAkB1E;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAEpE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,QAAQ,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,cAAc,GAAG,YAAY,CAEpE"}
|
|
@@ -7,6 +7,7 @@ import { ClaudeTmuxProvider } from './ClaudeTmuxProvider.js';
|
|
|
7
7
|
import { CodexTmuxProvider } from './CodexTmuxProvider.js';
|
|
8
8
|
import { GitLabRepoBackend } from './GitLabRepoBackend.js';
|
|
9
9
|
import { MatrixNotifier } from './MatrixNotifier.js';
|
|
10
|
+
import { ACPWorkerRuntime } from './ACPWorkerRuntime.js';
|
|
10
11
|
export function createTaskBackend(config) {
|
|
11
12
|
switch (config.PM_TOOL) {
|
|
12
13
|
case 'plane': return new PlaneTaskBackend(config);
|
|
@@ -38,4 +39,7 @@ export function createRepoBackend(config) {
|
|
|
38
39
|
export function createNotifier(config) {
|
|
39
40
|
return new MatrixNotifier(config);
|
|
40
41
|
}
|
|
42
|
+
export function createAgentRuntime(ctx) {
|
|
43
|
+
return new ACPWorkerRuntime(ctx);
|
|
44
|
+
}
|
|
41
45
|
//# sourceMappingURL=registry.js.map
|