steroids-cli 0.8.21 → 0.8.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/llm.d.ts.map +1 -1
- package/dist/commands/llm.js +4 -0
- package/dist/commands/llm.js.map +1 -1
- package/dist/commands/loop-phases.d.ts +1 -1
- package/dist/commands/loop-phases.d.ts.map +1 -1
- package/dist/commands/loop-phases.js +3 -3
- package/dist/commands/loop-phases.js.map +1 -1
- package/dist/commands/runners.js +4 -0
- package/dist/commands/runners.js.map +1 -1
- package/dist/commands/tasks.d.ts.map +1 -1
- package/dist/commands/tasks.js +86 -33
- package/dist/commands/tasks.js.map +1 -1
- package/dist/database/queries.d.ts +14 -0
- package/dist/database/queries.d.ts.map +1 -1
- package/dist/database/queries.js +46 -0
- package/dist/database/queries.js.map +1 -1
- package/dist/database/schema.d.ts +2 -2
- package/dist/database/schema.d.ts.map +1 -1
- package/dist/database/schema.js +30 -0
- package/dist/database/schema.js.map +1 -1
- package/dist/orchestrator/task-selector.d.ts +7 -2
- package/dist/orchestrator/task-selector.d.ts.map +1 -1
- package/dist/orchestrator/task-selector.js +91 -14
- package/dist/orchestrator/task-selector.js.map +1 -1
- package/dist/parallel/clone.d.ts +41 -0
- package/dist/parallel/clone.d.ts.map +1 -0
- package/dist/parallel/clone.js +176 -0
- package/dist/parallel/clone.js.map +1 -0
- package/dist/parallel/clone.test.d.ts +2 -0
- package/dist/parallel/clone.test.d.ts.map +1 -0
- package/dist/parallel/clone.test.js +252 -0
- package/dist/parallel/clone.test.js.map +1 -0
- package/dist/parallel/merge-conflict.d.ts +22 -0
- package/dist/parallel/merge-conflict.d.ts.map +1 -0
- package/dist/parallel/merge-conflict.js +227 -0
- package/dist/parallel/merge-conflict.js.map +1 -0
- package/dist/parallel/merge-errors.d.ts +10 -0
- package/dist/parallel/merge-errors.d.ts.map +1 -0
- package/dist/parallel/merge-errors.js +16 -0
- package/dist/parallel/merge-errors.js.map +1 -0
- package/dist/parallel/merge-git.d.ts +25 -0
- package/dist/parallel/merge-git.d.ts.map +1 -0
- package/dist/parallel/merge-git.js +134 -0
- package/dist/parallel/merge-git.js.map +1 -0
- package/dist/parallel/merge-lock.d.ts +26 -0
- package/dist/parallel/merge-lock.d.ts.map +1 -0
- package/dist/parallel/merge-lock.js +58 -0
- package/dist/parallel/merge-lock.js.map +1 -0
- package/dist/parallel/merge-progress.d.ts +20 -0
- package/dist/parallel/merge-progress.d.ts.map +1 -0
- package/dist/parallel/merge-progress.js +36 -0
- package/dist/parallel/merge-progress.js.map +1 -0
- package/dist/parallel/merge.d.ts +39 -0
- package/dist/parallel/merge.d.ts.map +1 -0
- package/dist/parallel/merge.js +231 -0
- package/dist/parallel/merge.js.map +1 -0
- package/dist/parallel/merge.test.d.ts +5 -0
- package/dist/parallel/merge.test.d.ts.map +1 -0
- package/dist/parallel/merge.test.js +322 -0
- package/dist/parallel/merge.test.js.map +1 -0
- package/dist/parallel/scheduler.d.ts +43 -0
- package/dist/parallel/scheduler.d.ts.map +1 -0
- package/dist/parallel/scheduler.js +281 -0
- package/dist/parallel/scheduler.js.map +1 -0
- package/dist/runners/daemon.d.ts +11 -1
- package/dist/runners/daemon.d.ts.map +1 -1
- package/dist/runners/daemon.js +18 -4
- package/dist/runners/daemon.js.map +1 -1
- package/dist/runners/global-db.d.ts.map +1 -1
- package/dist/runners/global-db.js +42 -1
- package/dist/runners/global-db.js.map +1 -1
- package/dist/runners/orchestrator-loop.d.ts +3 -0
- package/dist/runners/orchestrator-loop.d.ts.map +1 -1
- package/dist/runners/orchestrator-loop.js +19 -9
- package/dist/runners/orchestrator-loop.js.map +1 -1
- package/dist/runners/wakeup.d.ts.map +1 -1
- package/dist/runners/wakeup.js +2 -1
- package/dist/runners/wakeup.js.map +1 -1
- package/migrations/011_add_merge_locks_and_progress.sql +39 -0
- package/migrations/manifest.json +9 -1
- package/package.json +1 -1
|
@@ -0,0 +1,322 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Tests for parallel merge orchestration and conflict recovery.
|
|
4
|
+
*/
|
|
5
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
6
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
|
|
10
|
+
const globals_1 = require("@jest/globals");
|
|
11
|
+
const node_fs_1 = require("node:fs");
|
|
12
|
+
const node_fs_2 = require("node:fs");
|
|
13
|
+
const node_os_1 = require("node:os");
|
|
14
|
+
const node_path_1 = require("node:path");
|
|
15
|
+
const schema_js_1 = require("../database/schema.js");
|
|
16
|
+
const clone_js_1 = require("./clone.js");
|
|
17
|
+
const mockExecFileSync = globals_1.jest.fn();
|
|
18
|
+
globals_1.jest.unstable_mockModule('node:child_process', () => ({
|
|
19
|
+
execFileSync: mockExecFileSync,
|
|
20
|
+
}));
|
|
21
|
+
const mockOpenDatabase = globals_1.jest.fn();
|
|
22
|
+
const mockClose = globals_1.jest.fn();
|
|
23
|
+
let db;
|
|
24
|
+
globals_1.jest.unstable_mockModule('../database/connection.js', () => ({
|
|
25
|
+
openDatabase: mockOpenDatabase,
|
|
26
|
+
getDbPath: globals_1.jest.fn().mockReturnValue('/tmp/steroids.db'),
|
|
27
|
+
}));
|
|
28
|
+
const mockLoadConfig = globals_1.jest.fn();
|
|
29
|
+
globals_1.jest.unstable_mockModule('../config/loader.js', () => ({
|
|
30
|
+
loadConfig: mockLoadConfig,
|
|
31
|
+
}));
|
|
32
|
+
const mockProviderInvoke = globals_1.jest.fn();
|
|
33
|
+
globals_1.jest.unstable_mockModule('../providers/registry.js', () => ({
|
|
34
|
+
getProviderRegistry: () => ({
|
|
35
|
+
get: () => ({ invoke: mockProviderInvoke }),
|
|
36
|
+
}),
|
|
37
|
+
}));
|
|
38
|
+
const mockLogInvocation = globals_1.jest.fn();
|
|
39
|
+
globals_1.jest.unstable_mockModule('../providers/invocation-logger.js', () => ({
|
|
40
|
+
logInvocation: mockLogInvocation,
|
|
41
|
+
}));
|
|
42
|
+
let mergeModule;
|
|
43
|
+
let lockModule;
|
|
44
|
+
let progressModule;
|
|
45
|
+
let conflictModule;
|
|
46
|
+
let gitPlan = [];
|
|
47
|
+
let invocationOutputs = [];
|
|
48
|
+
function createDb() {
|
|
49
|
+
const next = new better_sqlite3_1.default(':memory:');
|
|
50
|
+
next.exec(schema_js_1.SCHEMA_SQL);
|
|
51
|
+
return next;
|
|
52
|
+
}
|
|
53
|
+
function setGitPlan(steps) {
|
|
54
|
+
gitPlan = steps.map((step) => ({ ...step }));
|
|
55
|
+
}
|
|
56
|
+
function queueInvocationOutputs(outputs) {
|
|
57
|
+
invocationOutputs = [...outputs];
|
|
58
|
+
}
|
|
59
|
+
function takeGitOutput(args) {
|
|
60
|
+
const step = gitPlan.shift();
|
|
61
|
+
if (!step) {
|
|
62
|
+
throw new Error(`Unexpected git command: git ${args.join(' ')}`);
|
|
63
|
+
}
|
|
64
|
+
(0, globals_1.expect)(step.args).toEqual(globals_1.expect.arrayContaining(args));
|
|
65
|
+
if (step.error) {
|
|
66
|
+
throw new Error(step.error);
|
|
67
|
+
}
|
|
68
|
+
return step.output ?? '';
|
|
69
|
+
}
|
|
70
|
+
(0, globals_1.beforeEach)(async () => {
|
|
71
|
+
db = createDb();
|
|
72
|
+
mockOpenDatabase.mockReturnValue({ db, close: mockClose });
|
|
73
|
+
globals_1.jest.clearAllMocks();
|
|
74
|
+
mockClose.mockClear();
|
|
75
|
+
gitPlan = [];
|
|
76
|
+
invocationOutputs = [];
|
|
77
|
+
mockExecFileSync.mockImplementation(((command, args) => {
|
|
78
|
+
if (command !== 'git') {
|
|
79
|
+
throw new Error(`Unexpected command ${command}`);
|
|
80
|
+
}
|
|
81
|
+
if (!Array.isArray(args)) {
|
|
82
|
+
throw new Error('Invalid git args');
|
|
83
|
+
}
|
|
84
|
+
return takeGitOutput(args);
|
|
85
|
+
}));
|
|
86
|
+
mockLoadConfig.mockReturnValue({
|
|
87
|
+
ai: {
|
|
88
|
+
coder: { provider: 'mock', model: 'mock-model' },
|
|
89
|
+
reviewer: { provider: 'mock', model: 'mock-model' },
|
|
90
|
+
},
|
|
91
|
+
});
|
|
92
|
+
mockLogInvocation.mockImplementation(async () => ({
|
|
93
|
+
success: true,
|
|
94
|
+
exitCode: 0,
|
|
95
|
+
stdout: invocationOutputs.shift() ?? 'APPROVE',
|
|
96
|
+
stderr: '',
|
|
97
|
+
duration: 1,
|
|
98
|
+
timedOut: false,
|
|
99
|
+
}));
|
|
100
|
+
[mergeModule, lockModule, progressModule, conflictModule] = await Promise.all([
|
|
101
|
+
import('./merge.js'),
|
|
102
|
+
import('./merge-lock.js'),
|
|
103
|
+
import('./merge-progress.js'),
|
|
104
|
+
import('./merge-conflict.js'),
|
|
105
|
+
]);
|
|
106
|
+
});
|
|
107
|
+
(0, globals_1.afterEach)(() => {
|
|
108
|
+
if (db) {
|
|
109
|
+
db.close();
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
(0, globals_1.describe)('parseReviewDecision', () => {
|
|
113
|
+
(0, globals_1.it)('parses explicit APPROVE', () => {
|
|
114
|
+
const result = conflictModule.parseReviewDecision('APPROVE - looks good');
|
|
115
|
+
(0, globals_1.expect)(result.decision).toBe('approve');
|
|
116
|
+
});
|
|
117
|
+
(0, globals_1.it)('parses explicit REJECT', () => {
|
|
118
|
+
const result = conflictModule.parseReviewDecision('REJECT - this is incorrect');
|
|
119
|
+
(0, globals_1.expect)(result.decision).toBe('reject');
|
|
120
|
+
});
|
|
121
|
+
(0, globals_1.it)('treats ambiguous responses as reject', () => {
|
|
122
|
+
const result = conflictModule.parseReviewDecision('This is partly APPROVE, but also REJECT for conflicts');
|
|
123
|
+
(0, globals_1.expect)(result.decision).toBe('reject');
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
(0, globals_1.describe)('merge lock behavior', () => {
|
|
127
|
+
(0, globals_1.it)('acquires lock when none exists', () => {
|
|
128
|
+
const result = lockModule.acquireMergeLock(db, {
|
|
129
|
+
sessionId: 'session-1',
|
|
130
|
+
runnerId: 'runner-a',
|
|
131
|
+
timeoutMinutes: 120,
|
|
132
|
+
});
|
|
133
|
+
(0, globals_1.expect)(result.acquired).toBe(true);
|
|
134
|
+
(0, globals_1.expect)(result.lock?.runner_id).toBe('runner-a');
|
|
135
|
+
});
|
|
136
|
+
(0, globals_1.it)('rejects lock when held by another active runner', () => {
|
|
137
|
+
const lockRow = new Date(Date.now() + 60 * 60 * 1000).toISOString();
|
|
138
|
+
db.prepare('INSERT INTO merge_locks (session_id, runner_id, acquired_at, expires_at, heartbeat_at) VALUES (?, ?, datetime("now"), ?, datetime("now"))').run('session-2', 'runner-current', lockRow);
|
|
139
|
+
const result = lockModule.acquireMergeLock(db, {
|
|
140
|
+
sessionId: 'session-2',
|
|
141
|
+
runnerId: 'runner-other',
|
|
142
|
+
timeoutMinutes: 120,
|
|
143
|
+
});
|
|
144
|
+
(0, globals_1.expect)(result.acquired).toBe(false);
|
|
145
|
+
(0, globals_1.expect)(result.lock?.runner_id).toBe('runner-current');
|
|
146
|
+
});
|
|
147
|
+
(0, globals_1.it)('replaces lock when expired', () => {
|
|
148
|
+
const stale = new Date(Date.now() - 60_000).toISOString();
|
|
149
|
+
db.prepare('INSERT INTO merge_locks (session_id, runner_id, acquired_at, expires_at, heartbeat_at) VALUES (?, ?, datetime("now"), ?, datetime("now"))').run('session-3', 'runner-stale', stale);
|
|
150
|
+
const result = lockModule.acquireMergeLock(db, {
|
|
151
|
+
sessionId: 'session-3',
|
|
152
|
+
runnerId: 'runner-fresh',
|
|
153
|
+
timeoutMinutes: 120,
|
|
154
|
+
});
|
|
155
|
+
(0, globals_1.expect)(result.acquired).toBe(true);
|
|
156
|
+
(0, globals_1.expect)(result.lock?.runner_id).toBe('runner-fresh');
|
|
157
|
+
});
|
|
158
|
+
(0, globals_1.it)('refreshes existing lock heartbeat', () => {
|
|
159
|
+
lockModule.acquireMergeLock(db, {
|
|
160
|
+
sessionId: 'session-4',
|
|
161
|
+
runnerId: 'runner-refresh',
|
|
162
|
+
timeoutMinutes: 120,
|
|
163
|
+
});
|
|
164
|
+
const before = lockModule.getLatestMergeLock(db, 'session-4');
|
|
165
|
+
(0, globals_1.expect)(before).toBeTruthy();
|
|
166
|
+
const after = lockModule.refreshMergeLock(db, 'session-4', 'runner-refresh', 120);
|
|
167
|
+
(0, globals_1.expect)(after.id).toBe(before.id);
|
|
168
|
+
(0, globals_1.expect)(new Date(after.heartbeat_at).getTime()).toBeGreaterThanOrEqual(new Date(before.heartbeat_at).getTime());
|
|
169
|
+
});
|
|
170
|
+
});
|
|
171
|
+
(0, globals_1.describe)('merge progress tracking', () => {
|
|
172
|
+
(0, globals_1.it)('stores and clears progress entries', () => {
|
|
173
|
+
progressModule.upsertProgressEntry(db, 'session-progress', 'ws-1', 0, 'abc123', 'applied');
|
|
174
|
+
progressModule.upsertProgressEntry(db, 'session-progress', 'ws-1', 1, 'def456', 'conflict', 'task-1');
|
|
175
|
+
const rows = progressModule.listMergeProgress(db, 'session-progress');
|
|
176
|
+
(0, globals_1.expect)(rows).toHaveLength(2);
|
|
177
|
+
(0, globals_1.expect)(progressModule.getMergeProgressForWorkstream(rows, 'ws-1').map((row) => row.position)).toEqual([0, 1]);
|
|
178
|
+
progressModule.clearProgressEntry(db, 'session-progress', 'ws-1', 0);
|
|
179
|
+
const remaining = progressModule.listMergeProgress(db, 'session-progress');
|
|
180
|
+
(0, globals_1.expect)(remaining.map((row) => row.position)).toEqual([1]);
|
|
181
|
+
});
|
|
182
|
+
});
|
|
183
|
+
(0, globals_1.describe)('runParallelMerge integration', () => {
|
|
184
|
+
const createProjectAndWorkspace = () => {
|
|
185
|
+
const projectPath = (0, node_fs_2.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), 'steroids-merge-XXXXXX'));
|
|
186
|
+
const workspaceRoot = (0, node_fs_2.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), 'steroids-merge-workspace-XXXXXX'));
|
|
187
|
+
(0, node_fs_1.mkdirSync)((0, node_path_1.resolve)(projectPath, '.git'), { recursive: true });
|
|
188
|
+
return { projectPath, workspaceRoot };
|
|
189
|
+
};
|
|
190
|
+
(0, globals_1.it)('merges successfully with clean cherry-pick path', async () => {
|
|
191
|
+
const { projectPath, workspaceRoot } = createProjectAndWorkspace();
|
|
192
|
+
setGitPlan([
|
|
193
|
+
{ args: ['status', '--porcelain'], output: '' },
|
|
194
|
+
{ args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
|
|
195
|
+
{ args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
|
|
196
|
+
{ args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-a\ncommit-b' },
|
|
197
|
+
{ args: ['cherry-pick', 'commit-a'], output: '' },
|
|
198
|
+
{ args: ['cherry-pick', 'commit-b'], output: '' },
|
|
199
|
+
{ args: ['push', 'origin', 'main'], output: 'ok' },
|
|
200
|
+
{ args: ['push', 'origin', '--delete', 'steroids/ws-alpha'], output: '' },
|
|
201
|
+
{ args: ['remote', 'prune', 'origin'], output: '' },
|
|
202
|
+
]);
|
|
203
|
+
const result = await mergeModule.runParallelMerge({
|
|
204
|
+
projectPath,
|
|
205
|
+
sessionId: 'merge-session',
|
|
206
|
+
runnerId: 'runner-1',
|
|
207
|
+
workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
|
|
208
|
+
remoteWorkspaceRoot: workspaceRoot,
|
|
209
|
+
});
|
|
210
|
+
(0, globals_1.expect)(result.success).toBe(true);
|
|
211
|
+
(0, globals_1.expect)(result.completedCommits).toBe(2);
|
|
212
|
+
(0, globals_1.expect)(result.errors).toHaveLength(0);
|
|
213
|
+
(0, globals_1.expect)(mockOpenDatabase).toHaveBeenCalledWith(projectPath);
|
|
214
|
+
});
|
|
215
|
+
(0, globals_1.it)('resumes from prior progress rows', async () => {
|
|
216
|
+
progressModule.upsertProgressEntry(db, 'resume-session', 'alpha', 0, 'commit-a', 'applied');
|
|
217
|
+
const { projectPath } = createProjectAndWorkspace();
|
|
218
|
+
setGitPlan([
|
|
219
|
+
{ args: ['status', '--porcelain'], output: '' },
|
|
220
|
+
{ args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
|
|
221
|
+
{ args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
|
|
222
|
+
{ args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-a\ncommit-b' },
|
|
223
|
+
{ args: ['cherry-pick', 'commit-b'], output: '' },
|
|
224
|
+
{ args: ['push', 'origin', 'main'], output: 'ok' },
|
|
225
|
+
{ args: ['push', 'origin', '--delete', 'steroids/ws-alpha'], output: '' },
|
|
226
|
+
{ args: ['remote', 'prune', 'origin'], output: '' },
|
|
227
|
+
]);
|
|
228
|
+
const result = await mergeModule.runParallelMerge({
|
|
229
|
+
projectPath,
|
|
230
|
+
sessionId: 'resume-session',
|
|
231
|
+
runnerId: 'runner-1',
|
|
232
|
+
workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
|
|
233
|
+
});
|
|
234
|
+
(0, globals_1.expect)(result.success).toBe(true);
|
|
235
|
+
(0, globals_1.expect)(result.completedCommits).toBe(2);
|
|
236
|
+
const rows = progressModule.listMergeProgress(db, 'resume-session');
|
|
237
|
+
(0, globals_1.expect)(rows).toHaveLength(2);
|
|
238
|
+
});
|
|
239
|
+
(0, globals_1.it)('handles merge conflict with coder/reviewer loop', async () => {
|
|
240
|
+
const { projectPath } = createProjectAndWorkspace();
|
|
241
|
+
queueInvocationOutputs([
|
|
242
|
+
'coder resolved',
|
|
243
|
+
'APPROVE - conflict resolved',
|
|
244
|
+
]);
|
|
245
|
+
(0, node_fs_1.mkdirSync)((0, node_path_1.resolve)(projectPath, '.git'), { recursive: true });
|
|
246
|
+
(0, node_fs_1.writeFileSync)((0, node_path_1.resolve)(projectPath, '.git', 'CHERRY_PICK_HEAD'), '0000000000000000000000000000000000000000');
|
|
247
|
+
setGitPlan([
|
|
248
|
+
{ args: ['status', '--porcelain'], output: '' },
|
|
249
|
+
{ args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
|
|
250
|
+
{ args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
|
|
251
|
+
{ args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-conflict' },
|
|
252
|
+
{ args: ['cherry-pick', 'commit-conflict'], error: 'CONFLICT: could not apply commit-conflict' },
|
|
253
|
+
{ args: ['show', 'commit-conflict', '--'], output: 'patch' },
|
|
254
|
+
{ args: ['log', '-1', '--format=%s%n%b', 'commit-conflict'], output: 'Conflicting commit' },
|
|
255
|
+
{ args: ['diff', '--name-only', '--diff-filter=U'], output: 'src/file.ts' },
|
|
256
|
+
{ args: ['diff', '--name-only', '--diff-filter=U'], output: '' },
|
|
257
|
+
{ args: ['diff', '--cached', '--name-only'], output: 'src/file.ts' },
|
|
258
|
+
{ args: ['diff', '--cached'], output: 'staged diff' },
|
|
259
|
+
{ args: ['diff', '--name-only', '--diff-filter=U'], output: '' },
|
|
260
|
+
{ args: ['-c', 'core.editor=true', 'cherry-pick', '--continue'], output: '' },
|
|
261
|
+
{ args: ['push', 'origin', 'main'], output: 'ok' },
|
|
262
|
+
{ args: ['push', 'origin', '--delete', 'steroids/ws-alpha'], output: '' },
|
|
263
|
+
{ args: ['remote', 'prune', 'origin'], output: '' },
|
|
264
|
+
]);
|
|
265
|
+
const result = await mergeModule.runParallelMerge({
|
|
266
|
+
projectPath,
|
|
267
|
+
sessionId: 'conflict-session',
|
|
268
|
+
runnerId: 'runner-1',
|
|
269
|
+
workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
|
|
270
|
+
});
|
|
271
|
+
(0, globals_1.expect)(result.success).toBe(true);
|
|
272
|
+
(0, globals_1.expect)(result.completedCommits).toBe(1);
|
|
273
|
+
(0, globals_1.expect)(result.conflicts).toBe(1);
|
|
274
|
+
});
|
|
275
|
+
(0, globals_1.it)('cleans workspace directory after successful merge', async () => {
|
|
276
|
+
const { projectPath, workspaceRoot } = createProjectAndWorkspace();
|
|
277
|
+
const projectHash = (0, clone_js_1.getProjectHash)(projectPath);
|
|
278
|
+
const sessionPath = (0, node_path_1.resolve)(workspaceRoot, projectHash, 'ws-alpha');
|
|
279
|
+
(0, node_fs_1.mkdirSync)(sessionPath, { recursive: true });
|
|
280
|
+
(0, node_fs_1.writeFileSync)((0, node_path_1.resolve)(sessionPath, '.keep'), 'cleanup target');
|
|
281
|
+
setGitPlan([
|
|
282
|
+
{ args: ['status', '--porcelain'], output: '' },
|
|
283
|
+
{ args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
|
|
284
|
+
{ args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
|
|
285
|
+
{ args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-a' },
|
|
286
|
+
{ args: ['cherry-pick', 'commit-a'], output: '' },
|
|
287
|
+
{ args: ['push', 'origin', 'main'], output: 'ok' },
|
|
288
|
+
{ args: ['push', 'origin', '--delete', 'steroids/ws-alpha'], output: '' },
|
|
289
|
+
{ args: ['remote', 'prune', 'origin'], output: '' },
|
|
290
|
+
]);
|
|
291
|
+
const result = await mergeModule.runParallelMerge({
|
|
292
|
+
projectPath,
|
|
293
|
+
sessionId: 'cleanup-session',
|
|
294
|
+
runnerId: 'runner-1',
|
|
295
|
+
workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
|
|
296
|
+
remoteWorkspaceRoot: workspaceRoot,
|
|
297
|
+
cleanupOnSuccess: true,
|
|
298
|
+
});
|
|
299
|
+
(0, globals_1.expect)(result.success).toBe(true);
|
|
300
|
+
(0, globals_1.expect)((0, node_fs_1.existsSync)(sessionPath)).toBe(false);
|
|
301
|
+
});
|
|
302
|
+
(0, globals_1.it)('reports push failures as errors', async () => {
|
|
303
|
+
const { projectPath } = createProjectAndWorkspace();
|
|
304
|
+
setGitPlan([
|
|
305
|
+
{ args: ['status', '--porcelain'], output: '' },
|
|
306
|
+
{ args: ['fetch', '--prune', 'origin', 'steroids/ws-alpha'], output: '' },
|
|
307
|
+
{ args: ['pull', '--ff-only', 'origin', 'main'], output: '' },
|
|
308
|
+
{ args: ['log', 'main..origin/steroids/ws-alpha', '--format=%H', '--reverse'], output: 'commit-a' },
|
|
309
|
+
{ args: ['cherry-pick', 'commit-a'], output: '' },
|
|
310
|
+
{ args: ['push', 'origin', 'main'], output: 'error: failed to push' },
|
|
311
|
+
]);
|
|
312
|
+
const result = await mergeModule.runParallelMerge({
|
|
313
|
+
projectPath,
|
|
314
|
+
sessionId: 'push-fail-session',
|
|
315
|
+
runnerId: 'runner-1',
|
|
316
|
+
workstreams: [{ id: 'alpha', branchName: 'steroids/ws-alpha' }],
|
|
317
|
+
});
|
|
318
|
+
(0, globals_1.expect)(result.success).toBe(false);
|
|
319
|
+
(0, globals_1.expect)(result.errors.some((error) => error.includes('Push to main failed.'))).toBe(true);
|
|
320
|
+
});
|
|
321
|
+
});
|
|
322
|
+
//# sourceMappingURL=merge.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge.test.js","sourceRoot":"","sources":["../../src/parallel/merge.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Workstream scheduler for parallel section execution.
|
|
3
|
+
*
|
|
4
|
+
* Responsibilities:
|
|
5
|
+
* - Validate dependency graphs (including cycle detection)
|
|
6
|
+
* - Create deterministic topological ordering
|
|
7
|
+
* - Partition sections into connected components (undirected)
|
|
8
|
+
* - Order each workstream by topological sort
|
|
9
|
+
*/
|
|
10
|
+
export interface WorkstreamSection {
|
|
11
|
+
id: string;
|
|
12
|
+
name?: string;
|
|
13
|
+
position?: number;
|
|
14
|
+
}
|
|
15
|
+
export interface SectionDependency {
|
|
16
|
+
sectionId: string;
|
|
17
|
+
dependsOnSectionId: string;
|
|
18
|
+
}
|
|
19
|
+
export interface WorkstreamPartition {
|
|
20
|
+
workstreams: string[][];
|
|
21
|
+
}
|
|
22
|
+
export declare class CyclicDependencyError extends Error {
|
|
23
|
+
readonly cycle: string[];
|
|
24
|
+
constructor(cycle: string[]);
|
|
25
|
+
}
|
|
26
|
+
export interface GraphData {
|
|
27
|
+
sectionsById: Map<string, WorkstreamSection>;
|
|
28
|
+
orderMap: Map<string, number>;
|
|
29
|
+
dependencyMap: Map<string, Set<string>>;
|
|
30
|
+
reverseDependencyMap: Map<string, Set<string>>;
|
|
31
|
+
undirectedDependencyMap: Map<string, Set<string>>;
|
|
32
|
+
}
|
|
33
|
+
export declare function topologicalSortSections(sections: WorkstreamSection[], dependencies: SectionDependency[], sectionFilter?: string[]): string[];
|
|
34
|
+
export declare function partitionWorkstreams(sections: WorkstreamSection[], dependencies: SectionDependency[]): WorkstreamPartition;
|
|
35
|
+
export declare const createWorkstreams: typeof partitionWorkstreams;
|
|
36
|
+
export declare const scheduleWorkstreams: typeof partitionWorkstreams;
|
|
37
|
+
export declare const partitionIntoWorkstreams: typeof partitionWorkstreams;
|
|
38
|
+
export declare const partitionSectionsIntoWorkstreams: typeof partitionWorkstreams;
|
|
39
|
+
export declare const buildWorkstreams: typeof partitionWorkstreams;
|
|
40
|
+
export declare const topologicalSort: typeof topologicalSortSections;
|
|
41
|
+
export declare const topologicalSortSectionIds: typeof topologicalSortSections;
|
|
42
|
+
export declare const findConnectedComponents: (sections: WorkstreamSection[], dependencies: SectionDependency[]) => string[][];
|
|
43
|
+
//# sourceMappingURL=scheduler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/parallel/scheduler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,EAAE,EAAE,CAAC;CACzB;AAED,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,SAAgB,KAAK,EAAE,MAAM,EAAE,CAAC;gBAEpB,KAAK,EAAE,MAAM,EAAE;CAS5B;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC7C,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACxC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/C,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CACnD;AA2KD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,YAAY,EAAE,iBAAiB,EAAE,EACjC,aAAa,CAAC,EAAE,MAAM,EAAE,GACvB,MAAM,EAAE,CA8EV;AAiDD,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,YAAY,EAAE,iBAAiB,EAAE,GAChC,mBAAmB,CA6BrB;AAED,eAAO,MAAM,iBAAiB,6BAAuB,CAAC;AACtD,eAAO,MAAM,mBAAmB,6BAAuB,CAAC;AACxD,eAAO,MAAM,wBAAwB,6BAAuB,CAAC;AAC7D,eAAO,MAAM,gCAAgC,6BAAuB,CAAC;AACrE,eAAO,MAAM,gBAAgB,6BAAuB,CAAC;AACrD,eAAO,MAAM,eAAe,gCAA0B,CAAC;AACvD,eAAO,MAAM,yBAAyB,gCAA0B,CAAC;AACjE,eAAO,MAAM,uBAAuB,GAClC,UAAU,iBAAiB,EAAE,EAC7B,cAAc,iBAAiB,EAAE,KAChC,MAAM,EAAE,EAGV,CAAC"}
|