@coralai/sps-cli 0.24.4 → 0.24.5
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/core/config.d.ts.map +1 -1
- package/dist/core/config.js +3 -70
- package/dist/core/config.js.map +1 -1
- package/dist/core/config.test.d.ts +2 -0
- package/dist/core/config.test.d.ts.map +1 -0
- package/dist/core/config.test.js +363 -0
- package/dist/core/config.test.js.map +1 -0
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +8 -5
- package/dist/core/lock.js.map +1 -1
- package/dist/core/lock.test.d.ts +2 -0
- package/dist/core/lock.test.d.ts.map +1 -0
- package/dist/core/lock.test.js +103 -0
- package/dist/core/lock.test.js.map +1 -0
- package/dist/core/queue.test.d.ts +2 -0
- package/dist/core/queue.test.d.ts.map +1 -0
- package/dist/core/queue.test.js +99 -0
- package/dist/core/queue.test.js.map +1 -0
- package/dist/core/shellEnv.d.ts +20 -0
- package/dist/core/shellEnv.d.ts.map +1 -0
- package/dist/core/shellEnv.js +78 -0
- package/dist/core/shellEnv.js.map +1 -0
- package/dist/core/shellEnv.test.d.ts +2 -0
- package/dist/core/shellEnv.test.d.ts.map +1 -0
- package/dist/core/shellEnv.test.js +101 -0
- package/dist/core/shellEnv.test.js.map +1 -0
- package/dist/core/state.test.d.ts +2 -0
- package/dist/core/state.test.d.ts.map +1 -0
- package/dist/core/state.test.js +322 -0
- package/dist/core/state.test.js.map +1 -0
- package/dist/manager/completion-judge.test.d.ts +2 -0
- package/dist/manager/completion-judge.test.d.ts.map +1 -0
- package/dist/manager/completion-judge.test.js +215 -0
- package/dist/manager/completion-judge.test.js.map +1 -0
- package/dist/manager/integration-queue.test.d.ts +2 -0
- package/dist/manager/integration-queue.test.d.ts.map +1 -0
- package/dist/manager/integration-queue.test.js +195 -0
- package/dist/manager/integration-queue.test.js.map +1 -0
- package/dist/manager/resource-limiter.test.d.ts +2 -0
- package/dist/manager/resource-limiter.test.d.ts.map +1 -0
- package/dist/manager/resource-limiter.test.js +103 -0
- package/dist/manager/resource-limiter.test.js.map +1 -0
- package/dist/manager/supervisor.d.ts +0 -1
- package/dist/manager/supervisor.d.ts.map +1 -1
- package/dist/manager/supervisor.js +5 -40
- package/dist/manager/supervisor.js.map +1 -1
- package/dist/manager/supervisor.test.d.ts +2 -0
- package/dist/manager/supervisor.test.d.ts.map +1 -0
- package/dist/manager/supervisor.test.js +245 -0
- package/dist/manager/supervisor.test.js.map +1 -0
- package/dist/manager/worker-manager-impl.d.ts.map +1 -1
- package/dist/manager/worker-manager-impl.js +7 -0
- package/dist/manager/worker-manager-impl.js.map +1 -1
- package/dist/manager/worker-manager-impl.test.d.ts +2 -0
- package/dist/manager/worker-manager-impl.test.d.ts.map +1 -0
- package/dist/manager/worker-manager-impl.test.js +528 -0
- package/dist/manager/worker-manager-impl.test.js.map +1 -0
- package/dist/providers/outputParser.test.d.ts +2 -0
- package/dist/providers/outputParser.test.d.ts.map +1 -0
- package/dist/providers/outputParser.test.js +203 -0
- package/dist/providers/outputParser.test.js.map +1 -0
- package/dist/test-setup.d.ts +2 -0
- package/dist/test-setup.d.ts.map +1 -0
- package/dist/test-setup.js +18 -0
- package/dist/test-setup.js.map +1 -0
- package/package.json +7 -2
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import { mkdtempSync, rmSync } from 'node:fs';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { tmpdir } from 'node:os';
|
|
5
|
+
import { IntegrationQueue } from './integration-queue.js';
|
|
6
|
+
import { writeState, createIdleWorkerSlot } from '../core/state.js';
|
|
7
|
+
// ─── Helpers ──────────────────────────────────────────────────────
|
|
8
|
+
function makeTempDir() {
|
|
9
|
+
return mkdtempSync(join(tmpdir(), 'sps-iq-test-'));
|
|
10
|
+
}
|
|
11
|
+
function initState(stateFile, maxWorkers = 1) {
|
|
12
|
+
const workers = {};
|
|
13
|
+
for (let i = 1; i <= maxWorkers; i++) {
|
|
14
|
+
workers[`worker-${i}`] = createIdleWorkerSlot();
|
|
15
|
+
}
|
|
16
|
+
const state = {
|
|
17
|
+
version: 1, generation: 0,
|
|
18
|
+
updatedAt: new Date().toISOString(), updatedBy: 'test',
|
|
19
|
+
workers, activeCards: {}, leases: {},
|
|
20
|
+
worktreeEvidence: {}, worktreeCleanup: [],
|
|
21
|
+
sessions: {}, integrationQueues: {}, pendingPMActions: [],
|
|
22
|
+
};
|
|
23
|
+
writeState(stateFile, state, 'test-init');
|
|
24
|
+
}
|
|
25
|
+
function makeEntry(taskId, project = 'myapp', targetBranch = 'main') {
|
|
26
|
+
return {
|
|
27
|
+
taskId, cardId: taskId, project,
|
|
28
|
+
prompt: `integrate task ${taskId}`,
|
|
29
|
+
cwd: `/tmp/wt-${taskId}`,
|
|
30
|
+
branch: `feat-${taskId}`,
|
|
31
|
+
targetBranch,
|
|
32
|
+
tool: 'claude', transport: 'proc',
|
|
33
|
+
outputFile: `/tmp/out-${taskId}.jsonl`,
|
|
34
|
+
enqueuedAt: new Date().toISOString(),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
// ─── Tests ────────────────────────────────────────────────────────
|
|
38
|
+
describe('IntegrationQueue', () => {
|
|
39
|
+
let tempDir;
|
|
40
|
+
let stateFile;
|
|
41
|
+
let iq;
|
|
42
|
+
beforeEach(() => {
|
|
43
|
+
tempDir = makeTempDir();
|
|
44
|
+
stateFile = join(tempDir, 'state.json');
|
|
45
|
+
initState(stateFile);
|
|
46
|
+
iq = new IntegrationQueue(stateFile, 1);
|
|
47
|
+
});
|
|
48
|
+
afterEach(() => {
|
|
49
|
+
rmSync(tempDir, { recursive: true, force: true });
|
|
50
|
+
});
|
|
51
|
+
describe('enqueue', () => {
|
|
52
|
+
it('first entry becomes active immediately', () => {
|
|
53
|
+
const result = iq.enqueue(makeEntry('1'));
|
|
54
|
+
expect(result.queued).toBe(false);
|
|
55
|
+
expect(result.position).toBe(0);
|
|
56
|
+
});
|
|
57
|
+
it('second entry is queued as waiting', () => {
|
|
58
|
+
iq.enqueue(makeEntry('1'));
|
|
59
|
+
const result = iq.enqueue(makeEntry('2'));
|
|
60
|
+
expect(result.queued).toBe(true);
|
|
61
|
+
expect(result.position).toBe(1);
|
|
62
|
+
});
|
|
63
|
+
it('third entry gets position 2', () => {
|
|
64
|
+
iq.enqueue(makeEntry('1'));
|
|
65
|
+
iq.enqueue(makeEntry('2'));
|
|
66
|
+
const result = iq.enqueue(makeEntry('3'));
|
|
67
|
+
expect(result.queued).toBe(true);
|
|
68
|
+
expect(result.position).toBe(2);
|
|
69
|
+
});
|
|
70
|
+
it('different targetBranches have independent queues', () => {
|
|
71
|
+
iq.enqueue(makeEntry('1', 'myapp', 'main'));
|
|
72
|
+
const r2 = iq.enqueue(makeEntry('2', 'myapp', 'develop'));
|
|
73
|
+
// Different queue key — becomes active, not queued
|
|
74
|
+
expect(r2.queued).toBe(false);
|
|
75
|
+
expect(r2.position).toBe(0);
|
|
76
|
+
});
|
|
77
|
+
it('different projects have independent queues', () => {
|
|
78
|
+
iq.enqueue(makeEntry('1', 'proj-a', 'main'));
|
|
79
|
+
const r2 = iq.enqueue(makeEntry('2', 'proj-b', 'main'));
|
|
80
|
+
expect(r2.queued).toBe(false);
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
describe('getActive', () => {
|
|
84
|
+
it('returns null when queue is empty', () => {
|
|
85
|
+
expect(iq.getActive('myapp', 'main')).toBeNull();
|
|
86
|
+
});
|
|
87
|
+
it('returns the active entry', () => {
|
|
88
|
+
iq.enqueue(makeEntry('1'));
|
|
89
|
+
const active = iq.getActive('myapp', 'main');
|
|
90
|
+
expect(active).not.toBeNull();
|
|
91
|
+
expect(active.taskId).toBe('1');
|
|
92
|
+
});
|
|
93
|
+
it('returns null for wrong project', () => {
|
|
94
|
+
iq.enqueue(makeEntry('1', 'myapp'));
|
|
95
|
+
expect(iq.getActive('other', 'main')).toBeNull();
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
describe('getPosition', () => {
|
|
99
|
+
it('returns -1 for unknown task', () => {
|
|
100
|
+
expect(iq.getPosition('999')).toBe(-1);
|
|
101
|
+
});
|
|
102
|
+
it('returns 0 for active task', () => {
|
|
103
|
+
iq.enqueue(makeEntry('1'));
|
|
104
|
+
expect(iq.getPosition('1')).toBe(0);
|
|
105
|
+
});
|
|
106
|
+
it('returns 1-based position for waiting tasks', () => {
|
|
107
|
+
iq.enqueue(makeEntry('1'));
|
|
108
|
+
iq.enqueue(makeEntry('2'));
|
|
109
|
+
iq.enqueue(makeEntry('3'));
|
|
110
|
+
expect(iq.getPosition('2')).toBe(1);
|
|
111
|
+
expect(iq.getPosition('3')).toBe(2);
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
describe('dequeueNext', () => {
|
|
115
|
+
it('returns null when queue is empty', () => {
|
|
116
|
+
expect(iq.dequeueNext('myapp', 'main')).toBeNull();
|
|
117
|
+
});
|
|
118
|
+
it('promotes waiting entry to active', () => {
|
|
119
|
+
iq.enqueue(makeEntry('1'));
|
|
120
|
+
iq.enqueue(makeEntry('2'));
|
|
121
|
+
iq.enqueue(makeEntry('3'));
|
|
122
|
+
const next = iq.dequeueNext('myapp', 'main');
|
|
123
|
+
expect(next).not.toBeNull();
|
|
124
|
+
expect(next.taskId).toBe('2');
|
|
125
|
+
// Now 2 should be active
|
|
126
|
+
const active = iq.getActive('myapp', 'main');
|
|
127
|
+
expect(active.taskId).toBe('2');
|
|
128
|
+
});
|
|
129
|
+
it('returns null after all waiting entries are consumed', () => {
|
|
130
|
+
iq.enqueue(makeEntry('1'));
|
|
131
|
+
iq.enqueue(makeEntry('2'));
|
|
132
|
+
const next1 = iq.dequeueNext('myapp', 'main');
|
|
133
|
+
expect(next1.taskId).toBe('2');
|
|
134
|
+
const next2 = iq.dequeueNext('myapp', 'main');
|
|
135
|
+
expect(next2).toBeNull();
|
|
136
|
+
});
|
|
137
|
+
it('cleans up queue key when fully drained', () => {
|
|
138
|
+
iq.enqueue(makeEntry('1'));
|
|
139
|
+
iq.dequeueNext('myapp', 'main'); // Drains active, no waiting
|
|
140
|
+
// Queue should be gone — getActive returns null
|
|
141
|
+
expect(iq.getActive('myapp', 'main')).toBeNull();
|
|
142
|
+
});
|
|
143
|
+
});
|
|
144
|
+
describe('remove', () => {
|
|
145
|
+
it('removes a waiting task', () => {
|
|
146
|
+
iq.enqueue(makeEntry('1'));
|
|
147
|
+
iq.enqueue(makeEntry('2'));
|
|
148
|
+
iq.enqueue(makeEntry('3'));
|
|
149
|
+
const removed = iq.remove('2');
|
|
150
|
+
expect(removed).toBe(true);
|
|
151
|
+
expect(iq.getPosition('2')).toBe(-1);
|
|
152
|
+
// Task 3 should now be position 1
|
|
153
|
+
expect(iq.getPosition('3')).toBe(1);
|
|
154
|
+
});
|
|
155
|
+
it('returns false for unknown task', () => {
|
|
156
|
+
expect(iq.remove('999')).toBe(false);
|
|
157
|
+
});
|
|
158
|
+
it('does not remove active task', () => {
|
|
159
|
+
iq.enqueue(makeEntry('1'));
|
|
160
|
+
// remove() only targets waiting list
|
|
161
|
+
const removed = iq.remove('1');
|
|
162
|
+
expect(removed).toBe(false);
|
|
163
|
+
expect(iq.getActive('myapp', 'main').taskId).toBe('1');
|
|
164
|
+
});
|
|
165
|
+
});
|
|
166
|
+
describe('list', () => {
|
|
167
|
+
it('returns empty when no queues', () => {
|
|
168
|
+
expect(iq.list()).toEqual([]);
|
|
169
|
+
});
|
|
170
|
+
it('returns all queues', () => {
|
|
171
|
+
iq.enqueue(makeEntry('1', 'proj-a', 'main'));
|
|
172
|
+
iq.enqueue(makeEntry('2', 'proj-b', 'main'));
|
|
173
|
+
expect(iq.list()).toHaveLength(2);
|
|
174
|
+
});
|
|
175
|
+
it('filters by project', () => {
|
|
176
|
+
iq.enqueue(makeEntry('1', 'proj-a', 'main'));
|
|
177
|
+
iq.enqueue(makeEntry('2', 'proj-b', 'main'));
|
|
178
|
+
expect(iq.list('proj-a')).toHaveLength(1);
|
|
179
|
+
expect(iq.list('proj-c')).toHaveLength(0);
|
|
180
|
+
});
|
|
181
|
+
});
|
|
182
|
+
describe('persistence', () => {
|
|
183
|
+
it('survives queue reconstruction', () => {
|
|
184
|
+
iq.enqueue(makeEntry('1'));
|
|
185
|
+
iq.enqueue(makeEntry('2'));
|
|
186
|
+
iq.enqueue(makeEntry('3'));
|
|
187
|
+
// Create a new IntegrationQueue instance pointing to the same state file
|
|
188
|
+
const iq2 = new IntegrationQueue(stateFile, 1);
|
|
189
|
+
expect(iq2.getActive('myapp', 'main').taskId).toBe('1');
|
|
190
|
+
expect(iq2.getPosition('2')).toBe(1);
|
|
191
|
+
expect(iq2.getPosition('3')).toBe(2);
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
});
|
|
195
|
+
//# sourceMappingURL=integration-queue.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"integration-queue.test.js","sourceRoot":"","sources":["../../src/manager/integration-queue.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resource-limiter.test.d.ts","sourceRoot":"","sources":["../../src/manager/resource-limiter.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { ResourceLimiter } from './resource-limiter.js';
|
|
3
|
+
describe('ResourceLimiter', () => {
|
|
4
|
+
describe('tryAcquire / release', () => {
|
|
5
|
+
it('acquires when under limit', () => {
|
|
6
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 2 });
|
|
7
|
+
expect(limiter.tryAcquire()).toBe(true);
|
|
8
|
+
expect(limiter.tryAcquire()).toBe(true);
|
|
9
|
+
});
|
|
10
|
+
it('rejects when at capacity', () => {
|
|
11
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 1 });
|
|
12
|
+
expect(limiter.tryAcquire()).toBe(true);
|
|
13
|
+
expect(limiter.tryAcquire()).toBe(false);
|
|
14
|
+
});
|
|
15
|
+
it('allows acquire after release', () => {
|
|
16
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 1 });
|
|
17
|
+
expect(limiter.tryAcquire()).toBe(true);
|
|
18
|
+
expect(limiter.tryAcquire()).toBe(false);
|
|
19
|
+
limiter.release();
|
|
20
|
+
expect(limiter.tryAcquire()).toBe(true);
|
|
21
|
+
});
|
|
22
|
+
it('release does not go below zero', () => {
|
|
23
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 2 });
|
|
24
|
+
limiter.release(); // Already at 0
|
|
25
|
+
limiter.release(); // Still at 0
|
|
26
|
+
// Should still allow max acquires
|
|
27
|
+
expect(limiter.tryAcquire()).toBe(true);
|
|
28
|
+
expect(limiter.tryAcquire()).toBe(true);
|
|
29
|
+
expect(limiter.tryAcquire()).toBe(false);
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
describe('tryAcquireDetailed', () => {
|
|
33
|
+
it('returns structured result with stats', () => {
|
|
34
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 2 });
|
|
35
|
+
const result = limiter.tryAcquireDetailed();
|
|
36
|
+
expect(result.acquired).toBe(true);
|
|
37
|
+
expect(result.stats.active).toBe(1);
|
|
38
|
+
expect(result.stats.max).toBe(2);
|
|
39
|
+
expect(result.stats.canLaunch).toBe(true);
|
|
40
|
+
});
|
|
41
|
+
it('returns blockReason when at capacity', () => {
|
|
42
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 1 });
|
|
43
|
+
limiter.tryAcquire();
|
|
44
|
+
const result = limiter.tryAcquireDetailed();
|
|
45
|
+
expect(result.acquired).toBe(false);
|
|
46
|
+
expect(result.stats.blockReason).toBe('workers');
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
describe('getStats', () => {
|
|
50
|
+
it('reports correct active count', () => {
|
|
51
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 5 });
|
|
52
|
+
limiter.tryAcquire();
|
|
53
|
+
limiter.tryAcquire();
|
|
54
|
+
const stats = limiter.getStats();
|
|
55
|
+
expect(stats.active).toBe(2);
|
|
56
|
+
expect(stats.max).toBe(5);
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
describe('setActiveCount', () => {
|
|
60
|
+
it('overrides internal active count for recovery', () => {
|
|
61
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 3 });
|
|
62
|
+
limiter.setActiveCount(2);
|
|
63
|
+
expect(limiter.getStats().active).toBe(2);
|
|
64
|
+
expect(limiter.tryAcquire()).toBe(true);
|
|
65
|
+
expect(limiter.tryAcquire()).toBe(false); // Now at 3
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
describe('enforceStagger', () => {
|
|
69
|
+
it('resolves immediately on first call', async () => {
|
|
70
|
+
const limiter = new ResourceLimiter({ staggerDelayMs: 100 });
|
|
71
|
+
const start = Date.now();
|
|
72
|
+
await limiter.enforceStagger();
|
|
73
|
+
const elapsed = Date.now() - start;
|
|
74
|
+
expect(elapsed).toBeLessThan(50);
|
|
75
|
+
});
|
|
76
|
+
it('delays subsequent calls within stagger window', async () => {
|
|
77
|
+
const limiter = new ResourceLimiter({ staggerDelayMs: 100 });
|
|
78
|
+
await limiter.enforceStagger();
|
|
79
|
+
const start = Date.now();
|
|
80
|
+
await limiter.enforceStagger();
|
|
81
|
+
const elapsed = Date.now() - start;
|
|
82
|
+
// Should have waited ~100ms
|
|
83
|
+
expect(elapsed).toBeGreaterThanOrEqual(50);
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
describe('formatBlockReason', () => {
|
|
87
|
+
it('formats worker cap message', () => {
|
|
88
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 1 });
|
|
89
|
+
limiter.tryAcquire();
|
|
90
|
+
const stats = limiter.getStats();
|
|
91
|
+
const msg = limiter.formatBlockReason(stats);
|
|
92
|
+
expect(msg).toContain('worker cap reached');
|
|
93
|
+
expect(msg).toContain('1/1');
|
|
94
|
+
});
|
|
95
|
+
it('formats available message when not blocked', () => {
|
|
96
|
+
const limiter = new ResourceLimiter({ maxGlobalWorkers: 5 });
|
|
97
|
+
const stats = limiter.getStats();
|
|
98
|
+
const msg = limiter.formatBlockReason(stats);
|
|
99
|
+
expect(msg).toContain('resources available');
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
//# sourceMappingURL=resource-limiter.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resource-limiter.test.js","sourceRoot":"","sources":["../../src/manager/resource-limiter.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,11 @@
|
|
|
8
8
|
* - Exit callbacks that fire immediately in the tick process
|
|
9
9
|
*/
|
|
10
10
|
import { spawn } from 'node:child_process';
|
|
11
|
-
import { openSync, closeSync, mkdirSync,
|
|
11
|
+
import { openSync, closeSync, mkdirSync, existsSync } from 'node:fs';
|
|
12
12
|
import { resolve, dirname } from 'node:path';
|
|
13
13
|
import { homedir } from 'node:os';
|
|
14
|
-
import { isProcessAlive, killProcessGroup, parseClaudeSessionId, parseCodexSessionId } from '../providers/outputParser.js';
|
|
14
|
+
import { isProcessAlive, killProcessGroup, parseClaudeSessionId, parseCodexSessionId, extractLastAssistantText } from '../providers/outputParser.js';
|
|
15
|
+
import { parseShellConf, sourceCombinedConf } from '../core/shellEnv.js';
|
|
15
16
|
// ─── Supervisor ─────────────────────────────────────────────────
|
|
16
17
|
export class ProcessSupervisor {
|
|
17
18
|
/** Global env: process.env + ~/.coral/env (Layer 1+2) */
|
|
@@ -198,7 +199,6 @@ export class ProcessSupervisor {
|
|
|
198
199
|
if (!handle.outputFile)
|
|
199
200
|
return 1;
|
|
200
201
|
try {
|
|
201
|
-
const { extractLastAssistantText } = require('../providers/outputParser.js');
|
|
202
202
|
const lastText = extractLastAssistantText(handle.outputFile);
|
|
203
203
|
// If worker produced meaningful output and said "done", likely succeeded
|
|
204
204
|
if (/\b(done|完成|全部完成|已推送)\b|🎉/i.test(lastText)) {
|
|
@@ -213,8 +213,7 @@ export class ProcessSupervisor {
|
|
|
213
213
|
const env = { ...process.env };
|
|
214
214
|
const envPath = resolve(homedir(), '.coral', 'env');
|
|
215
215
|
if (existsSync(envPath)) {
|
|
216
|
-
|
|
217
|
-
Object.assign(env, parsed);
|
|
216
|
+
Object.assign(env, parseShellConf(envPath));
|
|
218
217
|
}
|
|
219
218
|
return env;
|
|
220
219
|
}
|
|
@@ -222,26 +221,8 @@ export class ProcessSupervisor {
|
|
|
222
221
|
const confPath = resolve(homedir(), '.coral', 'projects', project, 'conf');
|
|
223
222
|
if (!existsSync(confPath))
|
|
224
223
|
return {};
|
|
225
|
-
// Source both files in one bash context so conf can reference ~/.coral/env vars
|
|
226
224
|
const envPath = resolve(homedir(), '.coral', 'env');
|
|
227
|
-
|
|
228
|
-
const { execSync } = require('node:child_process');
|
|
229
|
-
const sources = [];
|
|
230
|
-
if (existsSync(envPath))
|
|
231
|
-
sources.push(`source "${envPath}" 2>/dev/null`);
|
|
232
|
-
sources.push(`source "${confPath}" 2>/dev/null`);
|
|
233
|
-
const output = execSync(`bash -c 'set -a; ${sources.join('; ')}; env'`, { encoding: 'utf-8', timeout: 5000 });
|
|
234
|
-
const result = {};
|
|
235
|
-
for (const line of output.split('\n')) {
|
|
236
|
-
const idx = line.indexOf('=');
|
|
237
|
-
if (idx > 0)
|
|
238
|
-
result[line.slice(0, idx)] = line.slice(idx + 1);
|
|
239
|
-
}
|
|
240
|
-
return result;
|
|
241
|
-
}
|
|
242
|
-
catch {
|
|
243
|
-
return this.parseShellFile(confPath);
|
|
244
|
-
}
|
|
225
|
+
return sourceCombinedConf([envPath, confPath]);
|
|
245
226
|
}
|
|
246
227
|
reloadGlobalEnv() {
|
|
247
228
|
this.globalEnv = this.loadGlobalEnv();
|
|
@@ -271,22 +252,6 @@ export class ProcessSupervisor {
|
|
|
271
252
|
return parseClaudeSessionId(handle.outputFile);
|
|
272
253
|
return parseCodexSessionId(handle.outputFile);
|
|
273
254
|
}
|
|
274
|
-
parseShellFile(filePath) {
|
|
275
|
-
const result = {};
|
|
276
|
-
try {
|
|
277
|
-
const content = readFileSync(filePath, 'utf-8');
|
|
278
|
-
for (const line of content.split('\n')) {
|
|
279
|
-
const trimmed = line.trim();
|
|
280
|
-
if (!trimmed || trimmed.startsWith('#'))
|
|
281
|
-
continue;
|
|
282
|
-
const match = trimmed.match(/^(?:export\s+)?([A-Z_][A-Z0-9_]*)=["']?(.*?)["']?\s*$/);
|
|
283
|
-
if (match)
|
|
284
|
-
result[match[1]] = match[2];
|
|
285
|
-
}
|
|
286
|
-
}
|
|
287
|
-
catch { /* ignore */ }
|
|
288
|
-
return result;
|
|
289
|
-
}
|
|
290
255
|
log(msg) {
|
|
291
256
|
process.stderr.write(`[supervisor] ${msg}\n`);
|
|
292
257
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"supervisor.test.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.test.ts"],"names":[],"mappings":""}
|