@coralai/sps-cli 0.33.0 → 0.34.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +33 -5
- package/dist/commands/acpCommand.d.ts.map +1 -1
- package/dist/commands/acpCommand.js +21 -1
- package/dist/commands/acpCommand.js.map +1 -1
- package/dist/commands/agentCommand.d.ts.map +1 -1
- package/dist/commands/agentCommand.js +25 -15
- package/dist/commands/agentCommand.js.map +1 -1
- package/dist/commands/agentDaemon.d.ts.map +1 -1
- package/dist/commands/agentDaemon.js +19 -2
- package/dist/commands/agentDaemon.js.map +1 -1
- package/dist/commands/agentRenderer.d.ts.map +1 -1
- package/dist/commands/agentRenderer.js +18 -3
- package/dist/commands/agentRenderer.js.map +1 -1
- package/dist/commands/cardAdd.d.ts.map +1 -1
- package/dist/commands/cardAdd.js +22 -2
- package/dist/commands/cardAdd.js.map +1 -1
- package/dist/commands/cardDashboard.d.ts.map +1 -1
- package/dist/commands/cardDashboard.js +30 -5
- package/dist/commands/cardDashboard.js.map +1 -1
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +35 -69
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/logs.d.ts.map +1 -1
- package/dist/commands/logs.js +18 -8
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/monitorTick.d.ts.map +1 -1
- package/dist/commands/monitorTick.js +23 -3
- package/dist/commands/monitorTick.js.map +1 -1
- package/dist/commands/pipelineRunner.d.ts.map +1 -1
- package/dist/commands/pipelineRunner.js +21 -7
- package/dist/commands/pipelineRunner.js.map +1 -1
- package/dist/commands/pipelineTick.d.ts.map +1 -1
- package/dist/commands/pipelineTick.js +18 -12
- package/dist/commands/pipelineTick.js.map +1 -1
- package/dist/commands/pmCommand.d.ts.map +1 -1
- package/dist/commands/pmCommand.js +21 -1
- package/dist/commands/pmCommand.js.map +1 -1
- package/dist/commands/projectInit.d.ts.map +1 -1
- package/dist/commands/projectInit.js +22 -2
- package/dist/commands/projectInit.js.map +1 -1
- package/dist/commands/qaTick.d.ts.map +1 -1
- package/dist/commands/qaTick.js +19 -12
- package/dist/commands/qaTick.js.map +1 -1
- package/dist/commands/reset.d.ts.map +1 -1
- package/dist/commands/reset.js +21 -25
- package/dist/commands/reset.js.map +1 -1
- package/dist/commands/schedulerTick.d.ts.map +1 -1
- package/dist/commands/schedulerTick.js +23 -3
- package/dist/commands/schedulerTick.js.map +1 -1
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +68 -30
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +20 -7
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/stop.d.ts.map +1 -1
- package/dist/commands/stop.js +19 -14
- package/dist/commands/stop.js.map +1 -1
- package/dist/commands/tick.d.ts.map +1 -1
- package/dist/commands/tick.js +34 -26
- package/dist/commands/tick.js.map +1 -1
- package/dist/commands/workerDashboard.d.ts.map +1 -1
- package/dist/commands/workerDashboard.js +25 -5
- package/dist/commands/workerDashboard.js.map +1 -1
- package/dist/commands/workerLaunch.d.ts.map +1 -1
- package/dist/commands/workerLaunch.js +17 -12
- package/dist/commands/workerLaunch.js.map +1 -1
- package/dist/commands/workerPs.d.ts +0 -4
- package/dist/commands/workerPs.d.ts.map +1 -1
- package/dist/commands/workerPs.js +22 -6
- package/dist/commands/workerPs.js.map +1 -1
- package/dist/core/config.d.ts +4 -9
- package/dist/core/config.d.ts.map +1 -1
- package/dist/core/config.js +20 -19
- package/dist/core/config.js.map +1 -1
- package/dist/core/config.test.js +21 -23
- package/dist/core/config.test.js.map +1 -1
- package/dist/core/context.d.ts +15 -0
- package/dist/core/context.d.ts.map +1 -1
- package/dist/core/context.js +15 -0
- package/dist/core/context.js.map +1 -1
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +17 -10
- package/dist/core/lock.js.map +1 -1
- package/dist/core/lock.test.js +18 -3
- package/dist/core/lock.test.js.map +1 -1
- package/dist/core/logger.d.ts.map +1 -1
- package/dist/core/logger.js +16 -1
- package/dist/core/logger.js.map +1 -1
- package/dist/core/memory.d.ts +85 -0
- package/dist/core/memory.d.ts.map +1 -0
- package/dist/core/memory.js +414 -0
- package/dist/core/memory.js.map +1 -0
- package/dist/core/paths.d.ts +0 -1
- package/dist/core/paths.d.ts.map +1 -1
- package/dist/core/paths.js +16 -4
- package/dist/core/paths.js.map +1 -1
- package/dist/core/pipelineConfig.d.ts +6 -4
- package/dist/core/pipelineConfig.d.ts.map +1 -1
- package/dist/core/pipelineConfig.js +67 -30
- package/dist/core/pipelineConfig.js.map +1 -1
- package/dist/core/projectPipelineAdapter.d.ts +15 -9
- package/dist/core/projectPipelineAdapter.d.ts.map +1 -1
- package/dist/core/projectPipelineAdapter.js +96 -52
- package/dist/core/projectPipelineAdapter.js.map +1 -1
- package/dist/core/queue.d.ts.map +1 -1
- package/dist/core/queue.js +16 -1
- package/dist/core/queue.js.map +1 -1
- package/dist/core/queue.test.js +19 -4
- package/dist/core/queue.test.js.map +1 -1
- package/dist/core/runtimeSnapshot.d.ts +1 -1
- package/dist/core/runtimeSnapshot.d.ts.map +1 -1
- package/dist/core/runtimeSnapshot.js +18 -3
- package/dist/core/runtimeSnapshot.js.map +1 -1
- package/dist/core/runtimeStore.d.ts +1 -1
- package/dist/core/runtimeStore.d.ts.map +1 -1
- package/dist/core/runtimeStore.js +15 -0
- package/dist/core/runtimeStore.js.map +1 -1
- package/dist/core/sessionContext.d.ts +1 -1
- package/dist/core/sessionContext.d.ts.map +1 -1
- package/dist/core/sessionContext.js +12 -3
- package/dist/core/sessionContext.js.map +1 -1
- package/dist/core/sessionLiveness.d.ts +17 -1
- package/dist/core/sessionLiveness.d.ts.map +1 -1
- package/dist/core/sessionLiveness.js +3 -13
- package/dist/core/sessionLiveness.js.map +1 -1
- package/dist/core/shellEnv.d.ts +15 -0
- package/dist/core/shellEnv.d.ts.map +1 -1
- package/dist/core/shellEnv.js +13 -3
- package/dist/core/shellEnv.js.map +1 -1
- package/dist/core/shellEnv.test.js +19 -4
- package/dist/core/shellEnv.test.js.map +1 -1
- package/dist/core/state.d.ts +3 -3
- package/dist/core/state.d.ts.map +1 -1
- package/dist/core/state.js +16 -1
- package/dist/core/state.js.map +1 -1
- package/dist/core/state.test.js +19 -4
- package/dist/core/state.test.js.map +1 -1
- package/dist/core/taskPrompts.d.ts +15 -8
- package/dist/core/taskPrompts.d.ts.map +1 -1
- package/dist/core/taskPrompts.js +0 -37
- package/dist/core/taskPrompts.js.map +1 -1
- package/dist/core/workerRuntimeSummary.d.ts.map +1 -1
- package/dist/core/workerRuntimeSummary.js +15 -0
- package/dist/core/workerRuntimeSummary.js.map +1 -1
- package/dist/daemon/daemonClient.d.ts +16 -1
- package/dist/daemon/daemonClient.d.ts.map +1 -1
- package/dist/daemon/daemonClient.js +13 -4
- package/dist/daemon/daemonClient.js.map +1 -1
- package/dist/daemon/sessionDaemon.d.ts +15 -0
- package/dist/daemon/sessionDaemon.d.ts.map +1 -1
- package/dist/daemon/sessionDaemon.js +12 -8
- package/dist/daemon/sessionDaemon.js.map +1 -1
- package/dist/engines/CloseoutEngine.js +1 -1
- package/dist/engines/CloseoutEngine.js.map +1 -1
- package/dist/engines/EventHandler.d.ts +18 -9
- package/dist/engines/EventHandler.d.ts.map +1 -1
- package/dist/engines/EventHandler.js +24 -9
- package/dist/engines/EventHandler.js.map +1 -1
- package/dist/engines/ExecutionEngine.d.ts.map +1 -1
- package/dist/engines/ExecutionEngine.js +6 -18
- package/dist/engines/ExecutionEngine.js.map +1 -1
- package/dist/engines/MonitorEngine.d.ts +21 -4
- package/dist/engines/MonitorEngine.d.ts.map +1 -1
- package/dist/engines/MonitorEngine.js +29 -9
- package/dist/engines/MonitorEngine.js.map +1 -1
- package/dist/engines/SchedulerEngine.d.ts +20 -2
- package/dist/engines/SchedulerEngine.d.ts.map +1 -1
- package/dist/engines/SchedulerEngine.js +21 -3
- package/dist/engines/SchedulerEngine.js.map +1 -1
- package/dist/engines/StageEngine.d.ts +98 -0
- package/dist/engines/StageEngine.d.ts.map +1 -0
- package/dist/engines/StageEngine.js +1111 -0
- package/dist/engines/StageEngine.js.map +1 -0
- package/dist/engines/engine-pipeline-adapter.test.d.ts +15 -0
- package/dist/engines/engine-pipeline-adapter.test.d.ts.map +1 -1
- package/dist/engines/engine-pipeline-adapter.test.js +44 -31
- package/dist/engines/engine-pipeline-adapter.test.js.map +1 -1
- package/dist/interfaces/ACPClient.d.ts +16 -1
- package/dist/interfaces/ACPClient.d.ts.map +1 -1
- package/dist/interfaces/ACPClient.js +15 -0
- package/dist/interfaces/ACPClient.js.map +1 -1
- package/dist/interfaces/AgentRuntime.d.ts +16 -1
- package/dist/interfaces/AgentRuntime.d.ts.map +1 -1
- package/dist/interfaces/AgentRuntime.js +15 -0
- package/dist/interfaces/AgentRuntime.js.map +1 -1
- package/dist/interfaces/Notifier.d.ts +15 -0
- package/dist/interfaces/Notifier.d.ts.map +1 -1
- package/dist/interfaces/Notifier.js +15 -0
- package/dist/interfaces/Notifier.js.map +1 -1
- package/dist/interfaces/RepoBackend.d.ts +15 -0
- package/dist/interfaces/RepoBackend.d.ts.map +1 -1
- package/dist/interfaces/RepoBackend.js +15 -0
- package/dist/interfaces/RepoBackend.js.map +1 -1
- package/dist/interfaces/TaskBackend.d.ts +15 -0
- package/dist/interfaces/TaskBackend.d.ts.map +1 -1
- package/dist/interfaces/TaskBackend.js +15 -0
- package/dist/interfaces/TaskBackend.js.map +1 -1
- package/dist/main.d.ts +15 -0
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +140 -31
- package/dist/main.js.map +1 -1
- package/dist/manager/completion-judge.d.ts +15 -0
- package/dist/manager/completion-judge.d.ts.map +1 -1
- package/dist/manager/completion-judge.js +14 -5
- package/dist/manager/completion-judge.js.map +1 -1
- package/dist/manager/completion-judge.test.d.ts +15 -0
- package/dist/manager/completion-judge.test.d.ts.map +1 -1
- package/dist/manager/completion-judge.test.js +19 -4
- package/dist/manager/completion-judge.test.js.map +1 -1
- package/dist/manager/integration-queue.d.ts +12 -6
- package/dist/manager/integration-queue.d.ts.map +1 -1
- package/dist/manager/integration-queue.js +11 -5
- package/dist/manager/integration-queue.js.map +1 -1
- package/dist/manager/integration-queue.test.d.ts +15 -0
- package/dist/manager/integration-queue.test.d.ts.map +1 -1
- package/dist/manager/integration-queue.test.js +19 -4
- package/dist/manager/integration-queue.test.js.map +1 -1
- package/dist/manager/pm-client.d.ts.map +1 -1
- package/dist/manager/pm-client.js +12 -5
- package/dist/manager/pm-client.js.map +1 -1
- package/dist/manager/resource-limiter.d.ts.map +1 -1
- package/dist/manager/resource-limiter.js +12 -3
- package/dist/manager/resource-limiter.js.map +1 -1
- package/dist/manager/resource-limiter.test.d.ts +15 -0
- package/dist/manager/resource-limiter.test.d.ts.map +1 -1
- package/dist/manager/resource-limiter.test.js +16 -1
- package/dist/manager/resource-limiter.test.js.map +1 -1
- package/dist/manager/runtime-coordinator.d.ts +15 -0
- package/dist/manager/runtime-coordinator.d.ts.map +1 -1
- package/dist/manager/runtime-coordinator.js +19 -4
- package/dist/manager/runtime-coordinator.js.map +1 -1
- package/dist/manager/supervisor.d.ts +15 -11
- package/dist/manager/supervisor.d.ts.map +1 -1
- package/dist/manager/supervisor.js +7 -103
- package/dist/manager/supervisor.js.map +1 -1
- package/dist/manager/supervisor.test.d.ts +15 -0
- package/dist/manager/supervisor.test.d.ts.map +1 -1
- package/dist/manager/supervisor.test.js +23 -52
- package/dist/manager/supervisor.test.js.map +1 -1
- package/dist/manager/worker-manager-impl.d.ts +4 -4
- package/dist/manager/worker-manager-impl.d.ts.map +1 -1
- package/dist/manager/worker-manager-impl.js +31 -40
- package/dist/manager/worker-manager-impl.js.map +1 -1
- package/dist/manager/worker-manager-impl.test.d.ts +15 -0
- package/dist/manager/worker-manager-impl.test.d.ts.map +1 -1
- package/dist/manager/worker-manager-impl.test.js +40 -144
- package/dist/manager/worker-manager-impl.test.js.map +1 -1
- package/dist/manager/worker-manager.d.ts +13 -8
- package/dist/manager/worker-manager.d.ts.map +1 -1
- package/dist/manager/worker-manager.js +11 -6
- package/dist/manager/worker-manager.js.map +1 -1
- package/dist/models/acp.d.ts +15 -0
- package/dist/models/acp.d.ts.map +1 -1
- package/dist/models/acp.js +15 -0
- package/dist/models/acp.js.map +1 -1
- package/dist/models/types.d.ts +15 -0
- package/dist/models/types.d.ts.map +1 -1
- package/dist/models/types.js +15 -0
- package/dist/models/types.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.map +1 -1
- package/dist/providers/GitLabRepoBackend.d.ts +0 -4
- package/dist/providers/GitLabRepoBackend.d.ts.map +1 -1
- package/dist/providers/GitLabRepoBackend.js +15 -4
- package/dist/providers/GitLabRepoBackend.js.map +1 -1
- package/dist/providers/LocalACPClient.d.ts +15 -0
- package/dist/providers/LocalACPClient.d.ts.map +1 -1
- package/dist/providers/LocalACPClient.js.map +1 -1
- package/dist/providers/MarkdownTaskBackend.d.ts +6 -1
- package/dist/providers/MarkdownTaskBackend.d.ts.map +1 -1
- package/dist/providers/MarkdownTaskBackend.js +67 -26
- package/dist/providers/MarkdownTaskBackend.js.map +1 -1
- package/dist/providers/MatrixNotifier.d.ts +15 -0
- package/dist/providers/MatrixNotifier.d.ts.map +1 -1
- package/dist/providers/MatrixNotifier.js.map +1 -1
- package/dist/providers/PlaneTaskBackend.d.ts +0 -6
- package/dist/providers/PlaneTaskBackend.d.ts.map +1 -1
- package/dist/providers/PlaneTaskBackend.js +15 -6
- package/dist/providers/PlaneTaskBackend.js.map +1 -1
- package/dist/providers/TrelloTaskBackend.d.ts +15 -7
- package/dist/providers/TrelloTaskBackend.d.ts.map +1 -1
- package/dist/providers/TrelloTaskBackend.js +0 -8
- package/dist/providers/TrelloTaskBackend.js.map +1 -1
- package/dist/providers/adapters/AcpSdkAdapter.d.ts +1 -1
- package/dist/providers/adapters/AcpSdkAdapter.d.ts.map +1 -1
- package/dist/providers/adapters/AcpSdkAdapter.js +32 -32
- package/dist/providers/adapters/AcpSdkAdapter.js.map +1 -1
- package/dist/providers/adapters/acp-fs-handlers.d.ts.map +1 -1
- package/dist/providers/adapters/acp-fs-handlers.js +13 -4
- package/dist/providers/adapters/acp-fs-handlers.js.map +1 -1
- package/dist/providers/adapters/acp-fs-handlers.test.js +17 -2
- package/dist/providers/adapters/acp-fs-handlers.test.js.map +1 -1
- package/dist/providers/adapters/acp-permissions.d.ts +12 -5
- package/dist/providers/adapters/acp-permissions.d.ts.map +1 -1
- package/dist/providers/adapters/acp-permissions.js +12 -5
- package/dist/providers/adapters/acp-permissions.js.map +1 -1
- package/dist/providers/adapters/acp-permissions.test.js +17 -2
- package/dist/providers/adapters/acp-permissions.test.js.map +1 -1
- package/dist/providers/adapters/acp-session-accumulator.d.ts.map +1 -1
- package/dist/providers/adapters/acp-session-accumulator.js +12 -4
- package/dist/providers/adapters/acp-session-accumulator.js.map +1 -1
- package/dist/providers/adapters/acp-session-accumulator.test.js +16 -1
- package/dist/providers/adapters/acp-session-accumulator.test.js.map +1 -1
- package/dist/providers/adapters/acp-terminal-manager.d.ts.map +1 -1
- package/dist/providers/adapters/acp-terminal-manager.js +12 -3
- package/dist/providers/adapters/acp-terminal-manager.js.map +1 -1
- package/dist/providers/adapters/acp-terminal-manager.test.js +16 -1
- package/dist/providers/adapters/acp-terminal-manager.test.js.map +1 -1
- package/dist/providers/outputParser.d.ts +16 -1
- package/dist/providers/outputParser.d.ts.map +1 -1
- package/dist/providers/outputParser.js +14 -3
- package/dist/providers/outputParser.js.map +1 -1
- package/dist/providers/outputParser.test.js +19 -4
- package/dist/providers/outputParser.test.js.map +1 -1
- package/dist/providers/registry.d.ts +20 -5
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js +6 -6
- package/dist/providers/registry.js.map +1 -1
- package/dist/providers/streamRenderer.d.ts +13 -1
- package/dist/providers/streamRenderer.d.ts.map +1 -1
- package/dist/providers/streamRenderer.js +13 -1
- package/dist/providers/streamRenderer.js.map +1 -1
- package/dist/test-setup.js +12 -3
- package/dist/test-setup.js.map +1 -1
- package/package.json +4 -3
- package/skills/dev-worker/SKILL.md +40 -0
- package/skills/sps-pipeline/SKILL.md +273 -0
- package/profiles/_template.md +0 -48
- package/profiles/critic.md +0 -35
- /package/{profiles → skills/dev-worker/references}/architect.md +0 -0
- /package/{profiles → skills/dev-worker/references}/backend.md +0 -0
- /package/{profiles → skills/dev-worker/references}/frontend.md +0 -0
- /package/{profiles → skills/dev-worker/references}/fullstack.md +0 -0
- /package/{profiles → skills/dev-worker/references}/optimizer.md +0 -0
- /package/{profiles → skills/dev-worker/references}/phaser.md +0 -0
- /package/{profiles → skills/dev-worker/references}/prototyper.md +0 -0
- /package/{profiles → skills/dev-worker/references}/reviewer.md +0 -0
- /package/{profiles → skills/dev-worker/references}/security.md +0 -0
- /package/{profiles → skills/dev-worker/references}/senior.md +0 -0
- /package/{profiles → skills/dev-worker/references}/typescript.md +0 -0
- /package/{profiles → skills/dev-worker/references}/writer.md +0 -0
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* @module supervisor
|
|
3
|
+
* @description 进程监管器,管理 Worker 句柄生命周期、终止与孤儿监控
|
|
3
4
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
* -
|
|
5
|
+
* @author eddy
|
|
6
|
+
* @organization wykj
|
|
7
|
+
* @ownership wykj/eddy
|
|
8
|
+
*
|
|
9
|
+
* @created 2026-03-25
|
|
10
|
+
* @updated 2026-04-03
|
|
11
|
+
*
|
|
12
|
+
* @role manager
|
|
13
|
+
* @layer manager
|
|
14
|
+
* @boundedContext worker-lifecycle
|
|
9
15
|
*/
|
|
10
|
-
import {
|
|
16
|
+
import type { ChildProcess } from 'node:child_process';
|
|
11
17
|
export interface SpawnOpts {
|
|
12
18
|
/** Unique worker ID: `${project}:${slot}:${seq}` */
|
|
13
19
|
id: string;
|
|
@@ -31,7 +37,7 @@ export interface ExitEvent {
|
|
|
31
37
|
}
|
|
32
38
|
export interface WorkerHandle {
|
|
33
39
|
id: string;
|
|
34
|
-
transport: '
|
|
40
|
+
transport: 'acp-sdk';
|
|
35
41
|
pid: number | null;
|
|
36
42
|
child: ChildProcess | null;
|
|
37
43
|
outputFile: string | null;
|
|
@@ -60,7 +66,6 @@ export declare class ProcessSupervisor {
|
|
|
60
66
|
/** Pending PostAction promises (from exit callbacks) */
|
|
61
67
|
private readonly pendingActions;
|
|
62
68
|
constructor();
|
|
63
|
-
spawn(opts: SpawnOpts): WorkerHandle;
|
|
64
69
|
kill(id: string): Promise<void>;
|
|
65
70
|
get(id: string): WorkerHandle | undefined;
|
|
66
71
|
getByProject(project: string): WorkerHandle[];
|
|
@@ -69,7 +74,7 @@ export declare class ProcessSupervisor {
|
|
|
69
74
|
get activeCount(): number;
|
|
70
75
|
registerAcpHandle(handle: Omit<WorkerHandle, 'child' | 'transport'> & {
|
|
71
76
|
child?: ChildProcess | null;
|
|
72
|
-
transport?: 'acp';
|
|
77
|
+
transport?: 'acp-sdk';
|
|
73
78
|
}): WorkerHandle;
|
|
74
79
|
updateAcpHandle(id: string, patch: Partial<Pick<WorkerHandle, 'sessionId' | 'runId' | 'sessionState' | 'remoteStatus' | 'lastEventAt' | 'exitCode' | 'exitedAt' | 'outputFile'>>): WorkerHandle | undefined;
|
|
75
80
|
/**
|
|
@@ -90,7 +95,6 @@ export declare class ProcessSupervisor {
|
|
|
90
95
|
private loadGlobalEnv;
|
|
91
96
|
private loadProjectEnv;
|
|
92
97
|
reloadGlobalEnv(): void;
|
|
93
|
-
private buildArgs;
|
|
94
98
|
private extractSessionId;
|
|
95
99
|
private log;
|
|
96
100
|
private normalizeAcpHandle;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
* ProcessSupervisor — manages worker process lifecycle.
|
|
3
|
-
*
|
|
4
|
-
* Replaces ClaudePrintProvider's spawn logic with:
|
|
5
|
-
* - fd redirect (not Node pipe) for reliable output
|
|
6
|
-
* - Held child handles (no unref) for reliable exit detection
|
|
7
|
-
* - Three-layer env merge (system + global creds + project conf)
|
|
8
|
-
* - Exit callbacks that fire immediately in the tick process
|
|
9
|
-
*/
|
|
10
|
-
import { spawn } from 'node:child_process';
|
|
11
|
-
import { openSync, closeSync, mkdirSync, existsSync } from 'node:fs';
|
|
12
|
-
import { resolve, dirname } from 'node:path';
|
|
1
|
+
import { existsSync } from 'node:fs';
|
|
13
2
|
import { homedir } from 'node:os';
|
|
14
|
-
import {
|
|
3
|
+
import { resolve } from 'node:path';
|
|
15
4
|
import { parseShellConf, sourceCombinedConf } from '../core/shellEnv.js';
|
|
5
|
+
import { extractLastAssistantText, isProcessAlive, killProcessGroup, parseClaudeSessionId, parseCodexSessionId } from '../providers/outputParser.js';
|
|
16
6
|
// ─── Supervisor ─────────────────────────────────────────────────
|
|
17
7
|
export class ProcessSupervisor {
|
|
18
8
|
/** Global env: process.env + ~/.coral/env (Layer 1+2) */
|
|
@@ -26,83 +16,13 @@ export class ProcessSupervisor {
|
|
|
26
16
|
constructor() {
|
|
27
17
|
this.globalEnv = this.loadGlobalEnv();
|
|
28
18
|
}
|
|
29
|
-
// ─── Spawn
|
|
30
|
-
spawn(opts) {
|
|
31
|
-
// Load project conf (Layer 3) and merge
|
|
32
|
-
const projectEnv = this.loadProjectEnv(opts.project);
|
|
33
|
-
const env = { ...this.globalEnv, ...projectEnv };
|
|
34
|
-
// Build CLI args
|
|
35
|
-
const args = this.buildArgs(opts);
|
|
36
|
-
// Ensure output directory exists
|
|
37
|
-
mkdirSync(dirname(opts.outputFile), { recursive: true });
|
|
38
|
-
// fd redirect: OS kernel writes stdout/stderr directly to file
|
|
39
|
-
const fd = openSync(opts.outputFile, 'a');
|
|
40
|
-
let child;
|
|
41
|
-
try {
|
|
42
|
-
child = spawn(opts.tool === 'claude' ? 'claude' : 'codex', args, {
|
|
43
|
-
cwd: opts.worktree,
|
|
44
|
-
stdio: ['pipe', fd, fd],
|
|
45
|
-
detached: true,
|
|
46
|
-
env,
|
|
47
|
-
});
|
|
48
|
-
// Write prompt to stdin and close
|
|
49
|
-
child.stdin.write(opts.prompt);
|
|
50
|
-
child.stdin.end();
|
|
51
|
-
}
|
|
52
|
-
finally {
|
|
53
|
-
// Close fd on Node side — child inherits it, OS guarantees write
|
|
54
|
-
// Always close to prevent fd leak even if spawn throws (H4 fix)
|
|
55
|
-
closeSync(fd);
|
|
56
|
-
}
|
|
57
|
-
// DO NOT call child.unref() — tick process holds the handle
|
|
58
|
-
// This ensures exit callback fires reliably
|
|
59
|
-
const handle = {
|
|
60
|
-
id: opts.id,
|
|
61
|
-
transport: 'proc',
|
|
62
|
-
pid: child.pid ?? 0,
|
|
63
|
-
child,
|
|
64
|
-
outputFile: opts.outputFile,
|
|
65
|
-
project: opts.project,
|
|
66
|
-
seq: opts.seq,
|
|
67
|
-
slot: opts.slot,
|
|
68
|
-
branch: opts.branch,
|
|
69
|
-
worktree: opts.worktree,
|
|
70
|
-
tool: opts.tool,
|
|
71
|
-
exitCode: null,
|
|
72
|
-
sessionId: opts.resumeSessionId || null,
|
|
73
|
-
runId: null,
|
|
74
|
-
sessionState: null,
|
|
75
|
-
remoteStatus: null,
|
|
76
|
-
lastEventAt: null,
|
|
77
|
-
startedAt: new Date().toISOString(),
|
|
78
|
-
exitedAt: null,
|
|
79
|
-
};
|
|
80
|
-
this.upsertHandle(handle);
|
|
81
|
-
child.on('exit', (code) => {
|
|
82
|
-
handle.exitCode = code ?? 1;
|
|
83
|
-
handle.exitedAt = new Date().toISOString();
|
|
84
|
-
// Extract session ID for potential --resume retry
|
|
85
|
-
if (!handle.sessionId) {
|
|
86
|
-
handle.sessionId = this.extractSessionId(handle);
|
|
87
|
-
}
|
|
88
|
-
// Queue PostActions as tracked promise (not fire-and-forget)
|
|
89
|
-
const result = opts.onExit(handle.exitCode);
|
|
90
|
-
if (result && typeof result.then === 'function') {
|
|
91
|
-
const promise = result.catch(err => {
|
|
92
|
-
this.log(`PostActions error for ${opts.id}: ${err}`);
|
|
93
|
-
});
|
|
94
|
-
this.pendingActions.push(promise);
|
|
95
|
-
}
|
|
96
|
-
});
|
|
97
|
-
this.log(`Spawned ${opts.tool} for ${opts.id} (pid=${child.pid}), output=${opts.outputFile}`);
|
|
98
|
-
return handle;
|
|
99
|
-
}
|
|
19
|
+
// ─── Spawn (removed — all workers use ACP transport via AgentRuntime) ──
|
|
100
20
|
// ─── Kill / Query ───────────────────────────────────────────
|
|
101
21
|
async kill(id) {
|
|
102
22
|
const handle = this.workers.get(id);
|
|
103
23
|
if (!handle)
|
|
104
24
|
return;
|
|
105
|
-
if (handle.
|
|
25
|
+
if (handle.pid && handle.pid > 0 && isProcessAlive(handle.pid)) {
|
|
106
26
|
await killProcessGroup(handle.pid);
|
|
107
27
|
}
|
|
108
28
|
this.workers.delete(id);
|
|
@@ -161,7 +81,7 @@ export class ProcessSupervisor {
|
|
|
161
81
|
// Store handle without child reference
|
|
162
82
|
const orphanHandle = {
|
|
163
83
|
...handle,
|
|
164
|
-
transport: '
|
|
84
|
+
transport: 'acp-sdk',
|
|
165
85
|
child: null,
|
|
166
86
|
pid,
|
|
167
87
|
outputFile: handle.outputFile ?? null,
|
|
@@ -235,22 +155,6 @@ export class ProcessSupervisor {
|
|
|
235
155
|
this.log('Global environment reloaded');
|
|
236
156
|
}
|
|
237
157
|
// ─── Helpers ────────────────────────────────────────────────
|
|
238
|
-
buildArgs(opts) {
|
|
239
|
-
if (opts.tool === 'claude') {
|
|
240
|
-
const args = ['-p', '--verbose', '--output-format', 'stream-json', '--dangerously-skip-permissions'];
|
|
241
|
-
if (opts.resumeSessionId)
|
|
242
|
-
args.push('--resume', opts.resumeSessionId);
|
|
243
|
-
return args;
|
|
244
|
-
}
|
|
245
|
-
// Codex workers need full local access in SPS worktrees.
|
|
246
|
-
// `--full-auto` is still too restrictive for git worktrees because git
|
|
247
|
-
// metadata lives under the source repo's .git/worktrees/... path, and some
|
|
248
|
-
// local proxy setups also require localhost access from inside the worker.
|
|
249
|
-
if (opts.resumeSessionId) {
|
|
250
|
-
return ['exec', 'resume', opts.resumeSessionId, '-', '--json', '--sandbox', 'danger-full-access'];
|
|
251
|
-
}
|
|
252
|
-
return ['exec', '-', '--json', '--sandbox', 'danger-full-access'];
|
|
253
|
-
}
|
|
254
158
|
extractSessionId(handle) {
|
|
255
159
|
if (!handle.outputFile)
|
|
256
160
|
return null;
|
|
@@ -264,7 +168,7 @@ export class ProcessSupervisor {
|
|
|
264
168
|
normalizeAcpHandle(handle) {
|
|
265
169
|
return {
|
|
266
170
|
...handle,
|
|
267
|
-
transport: 'acp',
|
|
171
|
+
transport: 'acp-sdk',
|
|
268
172
|
pid: null,
|
|
269
173
|
child: handle.child ?? null,
|
|
270
174
|
outputFile: handle.outputFile ?? null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module supervisor.test
|
|
3
|
+
* @description ProcessSupervisor 单元测试
|
|
4
|
+
*
|
|
5
|
+
* @author eddy
|
|
6
|
+
* @organization wykj
|
|
7
|
+
* @ownership wykj/eddy
|
|
8
|
+
*
|
|
9
|
+
* @created 2026-03-29
|
|
10
|
+
* @updated 2026-04-03
|
|
11
|
+
*
|
|
12
|
+
* @role test
|
|
13
|
+
* @layer manager
|
|
14
|
+
* @boundedContext worker-lifecycle
|
|
15
|
+
*/
|
|
1
16
|
export {};
|
|
2
17
|
//# sourceMappingURL=supervisor.test.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.test.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.test.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"supervisor.test.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG"}
|
|
@@ -1,7 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
/**
|
|
2
|
+
* @module supervisor.test
|
|
3
|
+
* @description ProcessSupervisor 单元测试
|
|
4
|
+
*
|
|
5
|
+
* @author eddy
|
|
6
|
+
* @organization wykj
|
|
7
|
+
* @ownership wykj/eddy
|
|
8
|
+
*
|
|
9
|
+
* @created 2026-03-29
|
|
10
|
+
* @updated 2026-04-03
|
|
11
|
+
*
|
|
12
|
+
* @role test
|
|
13
|
+
* @layer manager
|
|
14
|
+
* @boundedContext worker-lifecycle
|
|
15
|
+
*/
|
|
16
|
+
import { mkdtempSync } from 'node:fs';
|
|
4
17
|
import { tmpdir } from 'node:os';
|
|
18
|
+
import { join } from 'node:path';
|
|
19
|
+
import { beforeEach, describe, expect, it } from 'vitest';
|
|
5
20
|
import { ProcessSupervisor } from './supervisor.js';
|
|
6
21
|
// ─── Helpers ──────────────────────────────────────────────────────
|
|
7
22
|
function makeTempDir() {
|
|
@@ -48,11 +63,11 @@ describe('ProcessSupervisor', () => {
|
|
|
48
63
|
expect(sup.getAll()).toEqual([]);
|
|
49
64
|
});
|
|
50
65
|
it('registerAcpHandle adds a handle', () => {
|
|
51
|
-
const handle = makeHandle('test:worker-1:5', { transport: 'acp' });
|
|
66
|
+
const handle = makeHandle('test:worker-1:5', { transport: 'acp-sdk' });
|
|
52
67
|
sup.registerAcpHandle(handle);
|
|
53
68
|
expect(sup.activeCount).toBe(1);
|
|
54
69
|
expect(sup.get('test:worker-1:5')).toBeDefined();
|
|
55
|
-
expect(sup.get('test:worker-1:5').transport).toBe('acp');
|
|
70
|
+
expect(sup.get('test:worker-1:5').transport).toBe('acp-sdk');
|
|
56
71
|
});
|
|
57
72
|
it('getByProject filters by project', () => {
|
|
58
73
|
sup.registerAcpHandle(makeHandle('proj-a:w1:1', { project: 'proj-a' }));
|
|
@@ -125,7 +140,7 @@ describe('ProcessSupervisor', () => {
|
|
|
125
140
|
it('normalizes transport to acp', () => {
|
|
126
141
|
const handle = makeHandle('test:w1:1');
|
|
127
142
|
const registered = sup.registerAcpHandle(handle);
|
|
128
|
-
expect(registered.transport).toBe('acp');
|
|
143
|
+
expect(registered.transport).toBe('acp-sdk');
|
|
129
144
|
expect(registered.pid).toBeNull();
|
|
130
145
|
});
|
|
131
146
|
it('preserves sessionId and runId', () => {
|
|
@@ -164,50 +179,6 @@ describe('ProcessSupervisor', () => {
|
|
|
164
179
|
expect(sup.activeCount).toBe(0);
|
|
165
180
|
});
|
|
166
181
|
});
|
|
167
|
-
describe('spawn (codex — fast exit)', () => {
|
|
168
|
-
let tempDir;
|
|
169
|
-
beforeEach(() => {
|
|
170
|
-
tempDir = makeTempDir();
|
|
171
|
-
});
|
|
172
|
-
afterEach(() => {
|
|
173
|
-
for (const h of sup.getAll()) {
|
|
174
|
-
if (h.pid && h.pid > 0) {
|
|
175
|
-
try {
|
|
176
|
-
process.kill(h.pid, 'SIGKILL');
|
|
177
|
-
}
|
|
178
|
-
catch { /* ignore */ }
|
|
179
|
-
}
|
|
180
|
-
}
|
|
181
|
-
rmSync(tempDir, { recursive: true, force: true });
|
|
182
|
-
});
|
|
183
|
-
it('creates output file and tracks handle on spawn', () => {
|
|
184
|
-
const outputFile = join(tempDir, 'output.jsonl');
|
|
185
|
-
// codex likely not installed — spawn will throw ENOENT
|
|
186
|
-
// but the fd/outputFile setup happens before spawn
|
|
187
|
-
try {
|
|
188
|
-
sup.spawn({
|
|
189
|
-
id: 'test:w1:1',
|
|
190
|
-
project: 'test',
|
|
191
|
-
seq: '1',
|
|
192
|
-
slot: 'worker-1',
|
|
193
|
-
worktree: tempDir,
|
|
194
|
-
branch: 'feat-1',
|
|
195
|
-
prompt: 'test',
|
|
196
|
-
outputFile,
|
|
197
|
-
tool: 'codex',
|
|
198
|
-
onExit: () => { },
|
|
199
|
-
});
|
|
200
|
-
// If spawn succeeds (codex installed), handle should be tracked
|
|
201
|
-
expect(sup.get('test:w1:1')).toBeDefined();
|
|
202
|
-
}
|
|
203
|
-
catch {
|
|
204
|
-
// spawn throws ENOENT — expected when codex not installed
|
|
205
|
-
// The output file was still created by the fd redirect
|
|
206
|
-
const { existsSync } = require('node:fs');
|
|
207
|
-
expect(existsSync(outputFile)).toBe(true);
|
|
208
|
-
}
|
|
209
|
-
});
|
|
210
|
-
});
|
|
211
182
|
describe('reloadGlobalEnv', () => {
|
|
212
183
|
it('reloads without error', () => {
|
|
213
184
|
expect(() => sup.reloadGlobalEnv()).not.toThrow();
|
|
@@ -215,7 +186,7 @@ describe('ProcessSupervisor', () => {
|
|
|
215
186
|
});
|
|
216
187
|
describe('monitorOrphanPid', () => {
|
|
217
188
|
it('registers orphan handle and tracks it', () => {
|
|
218
|
-
const handle = { ...makeHandle('test:w1:1', { pid: 99999 }), transport: '
|
|
189
|
+
const handle = { ...makeHandle('test:w1:1', { pid: 99999 }), transport: 'acp-sdk' };
|
|
219
190
|
sup.monitorOrphanPid('test:w1:1', 99999, handle, () => { });
|
|
220
191
|
expect(sup.get('test:w1:1')).toBeDefined();
|
|
221
192
|
expect(sup.activeCount).toBe(1);
|
|
@@ -223,7 +194,7 @@ describe('ProcessSupervisor', () => {
|
|
|
223
194
|
});
|
|
224
195
|
it('calls onDead when PID dies (dead PID detected on first poll)', async () => {
|
|
225
196
|
const deadPid = 4_000_000;
|
|
226
|
-
const handle = { ...makeHandle('test:w1:dead', { pid: deadPid }), transport: '
|
|
197
|
+
const handle = { ...makeHandle('test:w1:dead', { pid: deadPid }), transport: 'acp-sdk' };
|
|
227
198
|
const deadPromise = new Promise((resolve) => {
|
|
228
199
|
sup.monitorOrphanPid('test:w1:dead', deadPid, handle, (exitCode) => resolve(exitCode));
|
|
229
200
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.test.js","sourceRoot":"","sources":["../../src/manager/supervisor.test.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"supervisor.test.js","sourceRoot":"","sources":["../../src/manager/supervisor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type { ProcessSupervisor } from './supervisor.js';
|
|
2
|
-
import type { CompletionJudge } from './completion-judge.js';
|
|
3
|
-
import type { ResourceLimiter } from './resource-limiter.js';
|
|
4
1
|
import type { AgentRuntime } from '../interfaces/AgentRuntime.js';
|
|
2
|
+
import type { CompletionJudge } from './completion-judge.js';
|
|
5
3
|
import { IntegrationQueue } from './integration-queue.js';
|
|
6
|
-
import type {
|
|
4
|
+
import type { ResourceLimiter } from './resource-limiter.js';
|
|
5
|
+
import type { ProcessSupervisor } from './supervisor.js';
|
|
6
|
+
import type { InspectQuery, RecoveryContext, RecoveryResult, TaskCancelRequest, TaskConfirmRequest, TaskInputRequest, TaskResumeRequest, TaskRunRequest, TaskRunResponse, WorkerEventHandler, WorkerManager, WorkerSnapshot } from './worker-manager.js';
|
|
7
7
|
export interface WorkerManagerDeps {
|
|
8
8
|
supervisor: ProcessSupervisor;
|
|
9
9
|
completionJudge: CompletionJudge;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-manager-impl.d.ts","sourceRoot":"","sources":["../../src/manager/worker-manager-impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-manager-impl.d.ts","sourceRoot":"","sources":["../../src/manager/worker-manager-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* @module worker-manager-impl
|
|
3
|
+
* @description WorkerManager 接口的具体实现,整合 Supervisor/Judge/Limiter 为统一 ACP 接口
|
|
3
4
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
5
|
+
* @author eddy
|
|
6
|
+
* @organization wykj
|
|
7
|
+
* @ownership wykj/eddy
|
|
7
8
|
*
|
|
8
|
-
*
|
|
9
|
+
* @created 2026-03-28
|
|
10
|
+
* @updated 2026-04-03
|
|
11
|
+
*
|
|
12
|
+
* @role manager
|
|
13
|
+
* @layer manager
|
|
14
|
+
* @boundedContext worker-lifecycle
|
|
9
15
|
*/
|
|
10
16
|
import { execFileSync } from 'node:child_process';
|
|
11
|
-
import { readState, writeState
|
|
17
|
+
import { createIdleWorkerSlot, readState, writeState } from '../core/state.js';
|
|
12
18
|
import { IntegrationQueue } from './integration-queue.js';
|
|
13
19
|
// ─── Timeout Defaults ──────────────────────────────────────────
|
|
14
20
|
const DEFAULT_TIMEOUTS = {
|
|
@@ -273,36 +279,21 @@ export class WorkerManagerImpl {
|
|
|
273
279
|
let sessionId;
|
|
274
280
|
let resourceAcquired = true; // track whether resource was released by spawn-fail path
|
|
275
281
|
try {
|
|
276
|
-
if (
|
|
277
|
-
|
|
278
|
-
id: workerId, project, seq: taskId, slot, worktree: cwd, branch,
|
|
279
|
-
prompt, outputFile, tool, resumeSessionId,
|
|
280
|
-
onExit: (exitCode) => this.handleExit({
|
|
281
|
-
workerId, taskId, cardId, project, phase, slot, branch, cwd,
|
|
282
|
-
targetBranch, outputFile, tool, transport, exitCode, maxRetries,
|
|
283
|
-
completionStrategy: ctx.completionStrategy,
|
|
284
|
-
}),
|
|
285
|
-
});
|
|
286
|
-
pid = handle.pid;
|
|
287
|
-
sessionId = handle.sessionId ?? undefined;
|
|
288
|
-
}
|
|
289
|
-
else if (transport === 'acp-sdk') {
|
|
290
|
-
if (!this.agentRuntime) {
|
|
291
|
-
throw new Error(`${transport} transport requires agentRuntime`);
|
|
292
|
-
}
|
|
293
|
-
const session = resumeSessionId
|
|
294
|
-
? await this.agentRuntime.resumeRun(slot, prompt)
|
|
295
|
-
: await this.agentRuntime.startRun(slot, prompt, tool, cwd);
|
|
296
|
-
sessionId = session.sessionId;
|
|
297
|
-
pid = session.pid ?? null;
|
|
298
|
-
// ACP completion monitor — polls inspectRun until terminal state
|
|
299
|
-
this.monitorAcpCompletion({
|
|
300
|
-
workerId, taskId, cardId, project, phase, slot, branch, cwd,
|
|
301
|
-
targetBranch, outputFile, tool, transport, maxRetries,
|
|
302
|
-
sessionName: session.sessionName,
|
|
303
|
-
completionStrategy: ctx.completionStrategy,
|
|
304
|
-
});
|
|
282
|
+
if (!this.agentRuntime) {
|
|
283
|
+
throw new Error('acp-sdk transport requires agentRuntime');
|
|
305
284
|
}
|
|
285
|
+
const session = resumeSessionId
|
|
286
|
+
? await this.agentRuntime.resumeRun(slot, prompt)
|
|
287
|
+
: await this.agentRuntime.startRun(slot, prompt, tool, cwd);
|
|
288
|
+
sessionId = session.sessionId;
|
|
289
|
+
pid = session.pid ?? null;
|
|
290
|
+
// ACP completion monitor — polls inspectRun until terminal state
|
|
291
|
+
this.monitorAcpCompletion({
|
|
292
|
+
workerId, taskId, cardId, project, phase, slot, branch, cwd,
|
|
293
|
+
targetBranch, outputFile, tool, transport, maxRetries,
|
|
294
|
+
sessionName: session.sessionName,
|
|
295
|
+
completionStrategy: ctx.completionStrategy,
|
|
296
|
+
});
|
|
306
297
|
}
|
|
307
298
|
catch (err) {
|
|
308
299
|
this.log(`Spawn failed for ${taskId}: ${err instanceof Error ? err.message : String(err)}`);
|
|
@@ -565,7 +556,7 @@ export class WorkerManagerImpl {
|
|
|
565
556
|
? 'integration' : 'development';
|
|
566
557
|
this.resourceLimiter.tryAcquire();
|
|
567
558
|
this.supervisor.monitorOrphanPid(workerId, pid, {
|
|
568
|
-
id: workerId, transport: '
|
|
559
|
+
id: workerId, transport: 'acp-sdk', pid,
|
|
569
560
|
outputFile: null, project: ctx.project, seq, slot,
|
|
570
561
|
branch: lease.branch ?? '', worktree: lease.worktree ?? '',
|
|
571
562
|
tool: 'claude', exitCode: null, sessionId: lease.sessionId ?? null,
|
|
@@ -577,7 +568,7 @@ export class WorkerManagerImpl {
|
|
|
577
568
|
workerId, taskId: seq, cardId: seq, project: ctx.project,
|
|
578
569
|
phase, slot, branch: lease.branch ?? '',
|
|
579
570
|
cwd: lease.worktree ?? '', targetBranch: ctx.baseBranch,
|
|
580
|
-
outputFile: '', tool: 'claude', transport: '
|
|
571
|
+
outputFile: '', tool: 'claude', transport: 'acp-sdk',
|
|
581
572
|
exitCode, maxRetries: 0,
|
|
582
573
|
}));
|
|
583
574
|
this.taskSlotMap.set(seq, slot);
|
|
@@ -643,7 +634,7 @@ export class WorkerManagerImpl {
|
|
|
643
634
|
taskId: seq, cardId: seq, project: ctx.project,
|
|
644
635
|
prompt: '', // Prompt will be regenerated by SPS
|
|
645
636
|
cwd: lease.worktree ?? '', branch: lease.branch ?? '',
|
|
646
|
-
targetBranch: ctx.baseBranch, tool: 'claude', transport: '
|
|
637
|
+
targetBranch: ctx.baseBranch, tool: 'claude', transport: 'acp-sdk',
|
|
647
638
|
outputFile: '', enqueuedAt: lease.lastTransitionAt,
|
|
648
639
|
});
|
|
649
640
|
result.queueRebuilt++;
|
|
@@ -706,8 +697,8 @@ export class WorkerManagerImpl {
|
|
|
706
697
|
state.workers[slot] = {
|
|
707
698
|
...createIdleWorkerSlot(), status: 'active', seq: seqNum,
|
|
708
699
|
branch: ctx.branch, worktree: ctx.cwd, claimedAt: ctx.nowIso, lastHeartbeat: ctx.nowIso,
|
|
709
|
-
mode:
|
|
710
|
-
outputFile:
|
|
700
|
+
mode: 'acp-sdk', transport: 'acp-sdk', agent: ctx.tool,
|
|
701
|
+
outputFile: null,
|
|
711
702
|
};
|
|
712
703
|
state.activeCards[ctx.seq] = {
|
|
713
704
|
seq: seqNum, state: 'Inprogress', worker: slot, mrUrl: null,
|