@litmers/cursorflow-orchestrator 0.2.5 → 0.2.7
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/CHANGELOG.md +29 -20
- package/README.md +13 -8
- package/dist/cli/complete.js +22 -5
- package/dist/cli/complete.js.map +1 -1
- package/dist/cli/index.js +2 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/logs.js +61 -51
- package/dist/cli/logs.js.map +1 -1
- package/dist/cli/monitor.js +45 -56
- package/dist/cli/monitor.js.map +1 -1
- package/dist/cli/resume.js +2 -2
- package/dist/cli/resume.js.map +1 -1
- package/dist/core/git-lifecycle-manager.js +2 -2
- package/dist/core/git-lifecycle-manager.js.map +1 -1
- package/dist/core/git-pipeline-coordinator.js +25 -25
- package/dist/core/git-pipeline-coordinator.js.map +1 -1
- package/dist/core/orchestrator.d.ts +17 -0
- package/dist/core/orchestrator.js +186 -8
- package/dist/core/orchestrator.js.map +1 -1
- package/dist/core/runner/pipeline.js +3 -3
- package/dist/core/runner/pipeline.js.map +1 -1
- package/dist/hooks/data-accessor.js +2 -2
- package/dist/hooks/data-accessor.js.map +1 -1
- package/dist/services/logging/buffer.d.ts +2 -1
- package/dist/services/logging/buffer.js +63 -22
- package/dist/services/logging/buffer.js.map +1 -1
- package/dist/services/logging/formatter.d.ts +0 -4
- package/dist/services/logging/formatter.js +33 -201
- package/dist/services/logging/formatter.js.map +1 -1
- package/dist/services/logging/paths.d.ts +3 -0
- package/dist/services/logging/paths.js +3 -0
- package/dist/services/logging/paths.js.map +1 -1
- package/dist/types/config.d.ts +9 -1
- package/dist/types/flow.d.ts +6 -0
- package/dist/types/logging.d.ts +1 -1
- package/dist/utils/config.js +6 -2
- package/dist/utils/config.js.map +1 -1
- package/dist/utils/enhanced-logger.d.ts +37 -17
- package/dist/utils/enhanced-logger.js +267 -237
- package/dist/utils/enhanced-logger.js.map +1 -1
- package/dist/utils/events.d.ts +18 -15
- package/dist/utils/events.js +8 -5
- package/dist/utils/events.js.map +1 -1
- package/dist/utils/log-formatter.d.ts +26 -0
- package/dist/utils/log-formatter.js +274 -0
- package/dist/utils/log-formatter.js.map +1 -0
- package/dist/utils/logger.js +4 -17
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/repro-thinking-logs.js +4 -4
- package/dist/utils/repro-thinking-logs.js.map +1 -1
- package/package.json +2 -2
- package/scripts/monitor-lanes.sh +5 -5
- package/scripts/stream-logs.sh +1 -1
- package/scripts/test-log-parser.ts +42 -8
- package/src/cli/complete.ts +21 -6
- package/src/cli/index.ts +2 -0
- package/src/cli/logs.ts +60 -46
- package/src/cli/monitor.ts +47 -64
- package/src/cli/resume.ts +1 -1
- package/src/core/git-lifecycle-manager.ts +2 -2
- package/src/core/git-pipeline-coordinator.ts +25 -25
- package/src/core/orchestrator.ts +214 -7
- package/src/core/runner/pipeline.ts +3 -3
- package/src/hooks/data-accessor.ts +2 -2
- package/src/services/logging/buffer.ts +68 -20
- package/src/services/logging/formatter.ts +32 -199
- package/src/services/logging/paths.ts +3 -0
- package/src/types/config.ts +13 -1
- package/src/types/flow.ts +6 -0
- package/src/types/logging.ts +0 -2
- package/src/utils/config.ts +6 -2
- package/src/utils/enhanced-logger.ts +290 -239
- package/src/utils/events.ts +21 -18
- package/src/utils/log-formatter.ts +287 -0
- package/src/utils/logger.ts +3 -18
- package/src/utils/repro-thinking-logs.ts +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-lifecycle-manager.js","sourceRoot":"","sources":["../../src/core/git-lifecycle-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"git-lifecycle-manager.js","sourceRoot":"","sources":["../../src/core/git-lifecycle-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,13 +47,13 @@ class GitPipelineCoordinator {
|
|
|
47
47
|
const worktreeNeedsCreation = !fs.existsSync(worktreeDir);
|
|
48
48
|
const worktreeIsInvalid = !worktreeNeedsCreation && !git.isValidWorktree(worktreeDir);
|
|
49
49
|
if (worktreeIsInvalid) {
|
|
50
|
-
logger.warn(`⚠️ Directory exists but is not a valid worktree: ${worktreeDir}
|
|
51
|
-
logger.info(` Cleaning up invalid directory and recreating worktree
|
|
50
|
+
logger.warn(`⚠️ Directory exists but is not a valid worktree: ${worktreeDir}`);
|
|
51
|
+
logger.info(` Cleaning up invalid directory and recreating worktree...`);
|
|
52
52
|
try {
|
|
53
53
|
git.cleanupInvalidWorktreeDir(worktreeDir);
|
|
54
54
|
}
|
|
55
55
|
catch (e) {
|
|
56
|
-
logger.error(`Failed to cleanup invalid worktree directory: ${e.message}
|
|
56
|
+
logger.error(`Failed to cleanup invalid worktree directory: ${e.message}`);
|
|
57
57
|
throw new Error(`Cannot proceed: worktree directory is invalid and cleanup failed`);
|
|
58
58
|
}
|
|
59
59
|
}
|
|
@@ -77,7 +77,7 @@ class GitPipelineCoordinator {
|
|
|
77
77
|
retries--;
|
|
78
78
|
if (retries > 0) {
|
|
79
79
|
const delay = Math.floor(Math.random() * 1000) + 500;
|
|
80
|
-
logger.warn(`Worktree creation failed, retrying in ${delay}ms... (${retries} retries left)
|
|
80
|
+
logger.warn(`Worktree creation failed, retrying in ${delay}ms... (${retries} retries left)`);
|
|
81
81
|
await new Promise(resolve => setTimeout(resolve, delay));
|
|
82
82
|
}
|
|
83
83
|
}
|
|
@@ -87,12 +87,12 @@ class GitPipelineCoordinator {
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
else {
|
|
90
|
-
logger.info(`Reusing existing worktree: ${worktreeDir}
|
|
90
|
+
logger.info(`Reusing existing worktree: ${worktreeDir}`);
|
|
91
91
|
try {
|
|
92
92
|
git.runGit(['checkout', pipelineBranch], { cwd: worktreeDir });
|
|
93
93
|
}
|
|
94
94
|
catch (e) {
|
|
95
|
-
logger.warn(`Failed to checkout branch ${pipelineBranch} in existing worktree: ${e}
|
|
95
|
+
logger.warn(`Failed to checkout branch ${pipelineBranch} in existing worktree: ${e}`);
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
}
|
|
@@ -101,7 +101,7 @@ class GitPipelineCoordinator {
|
|
|
101
101
|
return;
|
|
102
102
|
const lanesRoot = path.dirname(runDir);
|
|
103
103
|
const lanesToMerge = new Set(deps.map(d => d.split(':')[0]));
|
|
104
|
-
logger.info(`🔄 Syncing with ${pipelineBranch} before merging dependencies
|
|
104
|
+
logger.info(`🔄 Syncing with ${pipelineBranch} before merging dependencies`);
|
|
105
105
|
git.runGit(['checkout', pipelineBranch], { cwd: worktreeDir });
|
|
106
106
|
for (const laneName of lanesToMerge) {
|
|
107
107
|
const depStatePath = (0, path_1.safeJoin)(lanesRoot, laneName, 'state.json');
|
|
@@ -111,13 +111,13 @@ class GitPipelineCoordinator {
|
|
|
111
111
|
const state = (0, state_1.loadState)(depStatePath);
|
|
112
112
|
if (!state?.pipelineBranch)
|
|
113
113
|
continue;
|
|
114
|
-
logger.info(`Merging branch from ${laneName}: ${state.pipelineBranch}
|
|
114
|
+
logger.info(`Merging branch from ${laneName}: ${state.pipelineBranch}`);
|
|
115
115
|
git.runGit(['fetch', 'origin', state.pipelineBranch], { cwd: worktreeDir, silent: true });
|
|
116
116
|
const remoteBranchRef = `origin/${state.pipelineBranch}`;
|
|
117
117
|
const conflictCheck = git.checkMergeConflict(remoteBranchRef, { cwd: worktreeDir });
|
|
118
118
|
if (conflictCheck.willConflict) {
|
|
119
|
-
logger.warn(`⚠️ Pre-check: Merge conflict detected with ${laneName}
|
|
120
|
-
logger.warn(` Conflicting files: ${conflictCheck.conflictingFiles.join(', ')}
|
|
119
|
+
logger.warn(`⚠️ Pre-check: Merge conflict detected with ${laneName}`);
|
|
120
|
+
logger.warn(` Conflicting files: ${conflictCheck.conflictingFiles.join(', ')}`);
|
|
121
121
|
events_1.events.emit('merge.conflict_detected', {
|
|
122
122
|
laneName,
|
|
123
123
|
targetBranch: state.pipelineBranch,
|
|
@@ -135,28 +135,28 @@ class GitPipelineCoordinator {
|
|
|
135
135
|
});
|
|
136
136
|
if (!mergeResult.success) {
|
|
137
137
|
if (mergeResult.conflict) {
|
|
138
|
-
logger.error(`Merge conflict with ${laneName}: ${mergeResult.conflictingFiles.join(', ')}
|
|
138
|
+
logger.error(`Merge conflict with ${laneName}: ${mergeResult.conflictingFiles.join(', ')}`);
|
|
139
139
|
throw new Error(`Merge conflict: ${mergeResult.conflictingFiles.join(', ')}`);
|
|
140
140
|
}
|
|
141
141
|
throw new Error(mergeResult.error || 'Merge failed');
|
|
142
142
|
}
|
|
143
|
-
logger.success(`✓ Merged ${laneName}
|
|
143
|
+
logger.success(`✓ Merged ${laneName}`);
|
|
144
144
|
}
|
|
145
145
|
catch (e) {
|
|
146
|
-
logger.error(`Failed to merge branch from ${laneName}: ${e}
|
|
146
|
+
logger.error(`Failed to merge branch from ${laneName}: ${e}`);
|
|
147
147
|
throw e;
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
150
|
}
|
|
151
151
|
mergeTaskIntoPipeline({ taskName, taskBranch, pipelineBranch, worktreeDir, }) {
|
|
152
|
-
logger.info(`Merging ${taskBranch} → ${pipelineBranch}
|
|
153
|
-
logger.info(`🔄 Switching to pipeline branch ${pipelineBranch} to integrate changes
|
|
152
|
+
logger.info(`Merging ${taskBranch} → ${pipelineBranch}`);
|
|
153
|
+
logger.info(`🔄 Switching to pipeline branch ${pipelineBranch} to integrate changes`);
|
|
154
154
|
git.runGit(['checkout', pipelineBranch], { cwd: worktreeDir });
|
|
155
155
|
const conflictCheck = git.checkMergeConflict(taskBranch, { cwd: worktreeDir });
|
|
156
156
|
if (conflictCheck.willConflict) {
|
|
157
|
-
logger.warn(`⚠️ Unexpected conflict detected when merging ${taskBranch}
|
|
158
|
-
logger.warn(` Conflicting files: ${conflictCheck.conflictingFiles.join(', ')}
|
|
159
|
-
logger.warn(` This may indicate concurrent modifications to ${pipelineBranch}
|
|
157
|
+
logger.warn(`⚠️ Unexpected conflict detected when merging ${taskBranch}`);
|
|
158
|
+
logger.warn(` Conflicting files: ${conflictCheck.conflictingFiles.join(', ')}`);
|
|
159
|
+
logger.warn(` This may indicate concurrent modifications to ${pipelineBranch}`);
|
|
160
160
|
events_1.events.emit('merge.conflict_detected', {
|
|
161
161
|
taskName,
|
|
162
162
|
taskBranch,
|
|
@@ -165,7 +165,7 @@ class GitPipelineCoordinator {
|
|
|
165
165
|
preCheck: true,
|
|
166
166
|
});
|
|
167
167
|
}
|
|
168
|
-
logger.info(`🔀 Merging task ${taskName} (${taskBranch}) into ${pipelineBranch}
|
|
168
|
+
logger.info(`🔀 Merging task ${taskName} (${taskBranch}) into ${pipelineBranch}`);
|
|
169
169
|
const mergeResult = git.safeMerge(taskBranch, {
|
|
170
170
|
cwd: worktreeDir,
|
|
171
171
|
noFf: true,
|
|
@@ -174,30 +174,30 @@ class GitPipelineCoordinator {
|
|
|
174
174
|
});
|
|
175
175
|
if (!mergeResult.success) {
|
|
176
176
|
if (mergeResult.conflict) {
|
|
177
|
-
logger.error(`❌ Merge conflict: ${mergeResult.conflictingFiles.join(', ')}
|
|
177
|
+
logger.error(`❌ Merge conflict: ${mergeResult.conflictingFiles.join(', ')}`);
|
|
178
178
|
throw new Error(`Merge conflict when integrating task ${taskName}: ${mergeResult.conflictingFiles.join(', ')}`);
|
|
179
179
|
}
|
|
180
180
|
throw new Error(mergeResult.error || 'Merge failed');
|
|
181
181
|
}
|
|
182
182
|
const stats = git.getLastOperationStats(worktreeDir);
|
|
183
183
|
if (stats) {
|
|
184
|
-
logger.info('Changed files:\n' + stats
|
|
184
|
+
logger.info('Changed files:\n' + stats);
|
|
185
185
|
}
|
|
186
186
|
}
|
|
187
187
|
finalizeFlowBranch({ flowBranch, pipelineBranch, worktreeDir, }) {
|
|
188
188
|
if (flowBranch === pipelineBranch)
|
|
189
189
|
return;
|
|
190
|
-
logger.info(`🌿 Creating final flow branch: ${flowBranch}
|
|
190
|
+
logger.info(`🌿 Creating final flow branch: ${flowBranch}`);
|
|
191
191
|
try {
|
|
192
192
|
git.runGit(['checkout', '-B', flowBranch, pipelineBranch], { cwd: worktreeDir });
|
|
193
193
|
git.push(flowBranch, { cwd: worktreeDir, setUpstream: true });
|
|
194
|
-
logger.info(`🗑️ Deleting local pipeline branch: ${pipelineBranch}
|
|
194
|
+
logger.info(`🗑️ Deleting local pipeline branch: ${pipelineBranch}`);
|
|
195
195
|
git.runGit(['checkout', flowBranch], { cwd: worktreeDir });
|
|
196
196
|
git.deleteBranch(pipelineBranch, { cwd: worktreeDir, force: true });
|
|
197
|
-
logger.success(`✓ Flow branch '${flowBranch}' created. Remote pipeline branch preserved for dependencies
|
|
197
|
+
logger.success(`✓ Flow branch '${flowBranch}' created. Remote pipeline branch preserved for dependencies.`);
|
|
198
198
|
}
|
|
199
199
|
catch (e) {
|
|
200
|
-
logger.error(`❌ Failed during final consolidation: ${e}
|
|
200
|
+
logger.error(`❌ Failed during final consolidation: ${e}`);
|
|
201
201
|
}
|
|
202
202
|
}
|
|
203
203
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-pipeline-coordinator.js","sourceRoot":"","sources":["../../src/core/git-pipeline-coordinator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,kDAAoC;AACpC,wDAA0C;AAC1C,4CAAyC;AACzC,wCAAyC;AACzC,0CAA2C;AAU3C,MAAa,sBAAsB;IACjC,KAAK,CAAC,cAAc,CAAC,OAA6B;QAChD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACtE,MAAM,qBAAqB,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC1D,MAAM,iBAAiB,GAAG,CAAC,qBAAqB,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAEtF,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,oDAAoD,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"git-pipeline-coordinator.js","sourceRoot":"","sources":["../../src/core/git-pipeline-coordinator.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,6 +69,19 @@ export declare function listLaneFiles(tasksDir: string): LaneInfo[];
|
|
|
69
69
|
* Monitor lane states
|
|
70
70
|
*/
|
|
71
71
|
export declare function printLaneStatus(lanes: LaneInfo[], laneRunDirs: Record<string, string>): void;
|
|
72
|
+
/**
|
|
73
|
+
* Finalize flow: merge all lane branches into integrated branch and cleanup
|
|
74
|
+
*/
|
|
75
|
+
export declare function finalizeFlow(params: {
|
|
76
|
+
tasksDir: string;
|
|
77
|
+
runId: string;
|
|
78
|
+
runRoot: string;
|
|
79
|
+
laneRunDirs: Record<string, string>;
|
|
80
|
+
laneWorktreeDirs: Record<string, string>;
|
|
81
|
+
pipelineBranch: string;
|
|
82
|
+
repoRoot: string;
|
|
83
|
+
noCleanup?: boolean;
|
|
84
|
+
}): Promise<void>;
|
|
72
85
|
/**
|
|
73
86
|
* Run orchestration with dependency management
|
|
74
87
|
*/
|
|
@@ -84,6 +97,10 @@ export declare function orchestrate(tasksDir: string, options?: {
|
|
|
84
97
|
skipPreflight?: boolean;
|
|
85
98
|
stallConfig?: Partial<StallDetectionConfig>;
|
|
86
99
|
browser?: boolean;
|
|
100
|
+
/** Auto-complete flow when all lanes succeed (merge branches, cleanup) */
|
|
101
|
+
autoComplete?: boolean;
|
|
102
|
+
/** Skip cleanup even if autoComplete is true */
|
|
103
|
+
noCleanup?: boolean;
|
|
87
104
|
}): Promise<{
|
|
88
105
|
lanes: LaneInfo[];
|
|
89
106
|
exitCodes: Record<string, number>;
|
|
@@ -46,6 +46,7 @@ exports.spawnLane = spawnLane;
|
|
|
46
46
|
exports.waitChild = waitChild;
|
|
47
47
|
exports.listLaneFiles = listLaneFiles;
|
|
48
48
|
exports.printLaneStatus = printLaneStatus;
|
|
49
|
+
exports.finalizeFlow = finalizeFlow;
|
|
49
50
|
exports.orchestrate = orchestrate;
|
|
50
51
|
const fs = __importStar(require("fs"));
|
|
51
52
|
const path = __importStar(require("path"));
|
|
@@ -61,7 +62,7 @@ const path_1 = require("../utils/path");
|
|
|
61
62
|
const paths_1 = require("../services/logging/paths");
|
|
62
63
|
const enhanced_logger_1 = require("../utils/enhanced-logger");
|
|
63
64
|
const log_constants_1 = require("../utils/log-constants");
|
|
64
|
-
const
|
|
65
|
+
const log_formatter_1 = require("../utils/log-formatter");
|
|
65
66
|
const auto_recovery_1 = require("./auto-recovery");
|
|
66
67
|
const intervention_1 = require("./intervention");
|
|
67
68
|
const stall_detection_1 = require("./stall-detection");
|
|
@@ -215,7 +216,6 @@ function spawnLane({ laneName, tasksFile, laneRunDir, executor, startIndex = 0,
|
|
|
215
216
|
// Build environment for child process
|
|
216
217
|
const childEnv = {
|
|
217
218
|
...process.env,
|
|
218
|
-
CURSORFLOW_LANE: 'true',
|
|
219
219
|
};
|
|
220
220
|
if (logConfig.enabled) {
|
|
221
221
|
// Helper to get dynamic lane label like [1-1-refactor]
|
|
@@ -229,7 +229,7 @@ function spawnLane({ laneName, tasksFile, laneRunDir, executor, startIndex = 0,
|
|
|
229
229
|
const onParsedMessage = (msg) => {
|
|
230
230
|
if (onActivity)
|
|
231
231
|
onActivity();
|
|
232
|
-
const formatted = (0,
|
|
232
|
+
const formatted = (0, log_formatter_1.formatMessageForConsole)(msg, {
|
|
233
233
|
laneLabel: getDynamicLabel(),
|
|
234
234
|
includeTimestamp: true
|
|
235
235
|
});
|
|
@@ -271,7 +271,7 @@ function spawnLane({ laneName, tasksFile, laneRunDir, executor, startIndex = 0,
|
|
|
271
271
|
continue;
|
|
272
272
|
// Detect task start/progress to update label
|
|
273
273
|
// Example: [1/1] hello-task
|
|
274
|
-
const cleanLine = (0,
|
|
274
|
+
const cleanLine = (0, enhanced_logger_1.stripAnsi)(trimmed);
|
|
275
275
|
const taskMatch = cleanLine.match(/^\s*\[(\d+)\/(\d+)\]\s+(.+)$/);
|
|
276
276
|
if (taskMatch) {
|
|
277
277
|
info.currentTaskIndex = parseInt(taskMatch[1]);
|
|
@@ -303,7 +303,7 @@ function spawnLane({ laneName, tasksFile, laneRunDir, executor, startIndex = 0,
|
|
|
303
303
|
}
|
|
304
304
|
else {
|
|
305
305
|
// Fallback to simple file logging
|
|
306
|
-
logPath = (0, paths_1.getLaneLogPath)(laneRunDir, '
|
|
306
|
+
logPath = (0, paths_1.getLaneLogPath)(laneRunDir, 'raw');
|
|
307
307
|
const logFd = fs.openSync(logPath, 'a');
|
|
308
308
|
child = (0, child_process_1.spawn)('node', args, {
|
|
309
309
|
stdio: ['ignore', logFd, logFd],
|
|
@@ -410,11 +410,11 @@ async function resolveAllDependencies(blockedLanes, allLanes, laneRunDirs, pipel
|
|
|
410
410
|
const state = (0, state_1.loadState)(statePath);
|
|
411
411
|
const worktreeDir = state?.worktreeDir || (0, path_1.safeJoin)(runRoot, 'resolution-worktree');
|
|
412
412
|
if (!fs.existsSync(worktreeDir)) {
|
|
413
|
-
logger.info(`🏗️ Creating resolution worktree at ${worktreeDir}
|
|
413
|
+
logger.info(`🏗️ Creating resolution worktree at ${worktreeDir}`);
|
|
414
414
|
git.createWorktree(worktreeDir, pipelineBranch, { baseBranch: git.getCurrentBranch() });
|
|
415
415
|
}
|
|
416
416
|
// 3. Resolve on pipeline branch
|
|
417
|
-
logger.info(`🔄 Resolving dependencies on branch ${pipelineBranch}
|
|
417
|
+
logger.info(`🔄 Resolving dependencies on branch ${pipelineBranch}`);
|
|
418
418
|
git.runGit(['checkout', pipelineBranch], { cwd: worktreeDir });
|
|
419
419
|
for (const cmd of uniqueCommands) {
|
|
420
420
|
logger.info(`Running: ${cmd}`);
|
|
@@ -452,7 +452,7 @@ async function resolveAllDependencies(blockedLanes, allLanes, laneRunDirs, pipel
|
|
|
452
452
|
if (task) {
|
|
453
453
|
const lanePipelineBranch = `${pipelineBranch}/${lane.name}`;
|
|
454
454
|
const taskBranch = `${lanePipelineBranch}--${String(currentIdx + 1).padStart(2, '0')}-${task.name}`;
|
|
455
|
-
logger.info(`Syncing lane ${lane.name} branch ${taskBranch}
|
|
455
|
+
logger.info(`Syncing lane ${lane.name} branch ${taskBranch}`);
|
|
456
456
|
try {
|
|
457
457
|
// If task branch doesn't exist yet, it will be created from pipelineBranch when the lane starts
|
|
458
458
|
if (git.branchExists(taskBranch, { cwd: worktreeDir })) {
|
|
@@ -473,6 +473,164 @@ async function resolveAllDependencies(blockedLanes, allLanes, laneRunDirs, pipel
|
|
|
473
473
|
}
|
|
474
474
|
git.runGit(['checkout', pipelineBranch], { cwd: worktreeDir });
|
|
475
475
|
}
|
|
476
|
+
/**
|
|
477
|
+
* Finalize flow: merge all lane branches into integrated branch and cleanup
|
|
478
|
+
*/
|
|
479
|
+
async function finalizeFlow(params) {
|
|
480
|
+
const { tasksDir, runId, runRoot, laneRunDirs, laneWorktreeDirs, pipelineBranch, repoRoot, noCleanup } = params;
|
|
481
|
+
// 1. Load FlowMeta
|
|
482
|
+
const metaPath = (0, path_1.safeJoin)(tasksDir, 'flow.meta.json');
|
|
483
|
+
let meta = null;
|
|
484
|
+
let flowName = path.basename(tasksDir).replace(/^\d+_/, '');
|
|
485
|
+
let baseBranch = 'main';
|
|
486
|
+
if (fs.existsSync(metaPath)) {
|
|
487
|
+
try {
|
|
488
|
+
meta = JSON.parse(fs.readFileSync(metaPath, 'utf8'));
|
|
489
|
+
flowName = meta.name || flowName;
|
|
490
|
+
baseBranch = meta.baseBranch || 'main';
|
|
491
|
+
// Update status to integrating
|
|
492
|
+
meta.status = 'integrating';
|
|
493
|
+
fs.writeFileSync(metaPath, JSON.stringify(meta, null, 2));
|
|
494
|
+
}
|
|
495
|
+
catch (e) {
|
|
496
|
+
logger.warn(`Failed to read flow.meta.json: ${e}`);
|
|
497
|
+
}
|
|
498
|
+
}
|
|
499
|
+
logger.section(`🏁 Finalizing Flow: ${flowName}`);
|
|
500
|
+
// 2. Collect lane branches
|
|
501
|
+
const laneBranches = [];
|
|
502
|
+
for (const [laneName, laneDir] of Object.entries(laneRunDirs)) {
|
|
503
|
+
const statePath = (0, path_1.safeJoin)(laneDir, 'state.json');
|
|
504
|
+
if (fs.existsSync(statePath)) {
|
|
505
|
+
try {
|
|
506
|
+
const state = JSON.parse(fs.readFileSync(statePath, 'utf8'));
|
|
507
|
+
if (state.pipelineBranch) {
|
|
508
|
+
laneBranches.push(state.pipelineBranch);
|
|
509
|
+
}
|
|
510
|
+
}
|
|
511
|
+
catch (e) {
|
|
512
|
+
logger.warn(`Failed to read lane state for ${laneName}: ${e}`);
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
}
|
|
516
|
+
if (laneBranches.length === 0) {
|
|
517
|
+
logger.warn('No lane branches found to integrate');
|
|
518
|
+
return;
|
|
519
|
+
}
|
|
520
|
+
// 3. Create integrated branch
|
|
521
|
+
const targetBranch = `feature/${flowName}-integrated`;
|
|
522
|
+
logger.info(`Target Branch: ${targetBranch}`);
|
|
523
|
+
logger.info(`Base Branch: ${baseBranch}`);
|
|
524
|
+
logger.info(`Lanes to merge: ${laneBranches.length}`);
|
|
525
|
+
// Ensure we are on a clean state
|
|
526
|
+
if (git.hasUncommittedChanges(repoRoot)) {
|
|
527
|
+
logger.warn('Main repository has uncommitted changes. Stashing...');
|
|
528
|
+
git.stash('auto-stash before flow completion', { cwd: repoRoot });
|
|
529
|
+
}
|
|
530
|
+
// Checkout base branch and create target branch
|
|
531
|
+
logger.info(`Creating target branch '${targetBranch}' from '${baseBranch}'...`);
|
|
532
|
+
git.runGit(['checkout', baseBranch], { cwd: repoRoot });
|
|
533
|
+
git.runGit(['checkout', '-B', targetBranch], { cwd: repoRoot });
|
|
534
|
+
// 4. Merge each lane branch
|
|
535
|
+
for (const branch of laneBranches) {
|
|
536
|
+
logger.info(`Merging ${branch}...`);
|
|
537
|
+
// Determine what ref to use for merge
|
|
538
|
+
let branchRef;
|
|
539
|
+
if (git.branchExists(branch, { cwd: repoRoot })) {
|
|
540
|
+
// Local branch exists, use it directly
|
|
541
|
+
branchRef = branch;
|
|
542
|
+
}
|
|
543
|
+
else {
|
|
544
|
+
// Local branch doesn't exist - fetch from remote with proper refspec
|
|
545
|
+
// Note: `git fetch origin <branch>` only updates FETCH_HEAD, not origin/<branch>
|
|
546
|
+
// We must use refspec to update the remote tracking ref
|
|
547
|
+
try {
|
|
548
|
+
git.runGit(['fetch', 'origin', `${branch}:refs/remotes/origin/${branch}`], { cwd: repoRoot });
|
|
549
|
+
branchRef = `origin/${branch}`;
|
|
550
|
+
}
|
|
551
|
+
catch (e) {
|
|
552
|
+
// Fallback: try fetching and use FETCH_HEAD directly
|
|
553
|
+
logger.warn(`Failed to fetch with refspec, trying FETCH_HEAD: ${e}`);
|
|
554
|
+
try {
|
|
555
|
+
git.runGit(['fetch', 'origin', branch], { cwd: repoRoot });
|
|
556
|
+
branchRef = 'FETCH_HEAD';
|
|
557
|
+
}
|
|
558
|
+
catch (e2) {
|
|
559
|
+
logger.warn(`Failed to fetch ${branch}: ${e2}`);
|
|
560
|
+
throw new Error(`Cannot fetch branch ${branch} from remote`);
|
|
561
|
+
}
|
|
562
|
+
}
|
|
563
|
+
}
|
|
564
|
+
const mergeResult = git.safeMerge(branchRef, {
|
|
565
|
+
cwd: repoRoot,
|
|
566
|
+
noFf: true,
|
|
567
|
+
message: `chore: merge lane ${branch} into flow integration`,
|
|
568
|
+
abortOnConflict: true,
|
|
569
|
+
});
|
|
570
|
+
if (!mergeResult.success) {
|
|
571
|
+
if (mergeResult.conflict) {
|
|
572
|
+
logger.error(`❌ Merge conflict with '${branch}': ${mergeResult.conflictingFiles.join(', ')}`);
|
|
573
|
+
// Update meta with error
|
|
574
|
+
if (meta) {
|
|
575
|
+
meta.status = 'failed';
|
|
576
|
+
meta.error = `Merge conflict: ${mergeResult.conflictingFiles.join(', ')}`;
|
|
577
|
+
fs.writeFileSync(metaPath, JSON.stringify(meta, null, 2));
|
|
578
|
+
}
|
|
579
|
+
throw new Error(`Merge conflict during integration: ${mergeResult.conflictingFiles.join(', ')}`);
|
|
580
|
+
}
|
|
581
|
+
throw new Error(`Merge failed for ${branch}: ${mergeResult.error}`);
|
|
582
|
+
}
|
|
583
|
+
logger.success(`✓ Merged ${branch}`);
|
|
584
|
+
}
|
|
585
|
+
// 5. Push final branch
|
|
586
|
+
logger.info(`Pushing '${targetBranch}' to remote...`);
|
|
587
|
+
git.push(targetBranch, { cwd: repoRoot, setUpstream: true });
|
|
588
|
+
logger.success(`✓ Pushed ${targetBranch}`);
|
|
589
|
+
// 6. Cleanup (if not disabled)
|
|
590
|
+
if (!noCleanup) {
|
|
591
|
+
logger.info('🧹 Cleaning up temporary resources...');
|
|
592
|
+
// Delete local and remote lane branches
|
|
593
|
+
for (const branch of laneBranches) {
|
|
594
|
+
try {
|
|
595
|
+
git.deleteBranch(branch, { cwd: repoRoot, force: true });
|
|
596
|
+
try {
|
|
597
|
+
git.deleteBranch(branch, { cwd: repoRoot, remote: true });
|
|
598
|
+
}
|
|
599
|
+
catch {
|
|
600
|
+
// Remote branch might not exist or no permission
|
|
601
|
+
}
|
|
602
|
+
}
|
|
603
|
+
catch (e) {
|
|
604
|
+
logger.warn(`Failed to delete branch ${branch}: ${e}`);
|
|
605
|
+
}
|
|
606
|
+
}
|
|
607
|
+
// Remove worktrees
|
|
608
|
+
for (const wtPath of Object.values(laneWorktreeDirs)) {
|
|
609
|
+
if (fs.existsSync(wtPath)) {
|
|
610
|
+
try {
|
|
611
|
+
git.removeWorktree(wtPath, { cwd: repoRoot, force: true });
|
|
612
|
+
if (fs.existsSync(wtPath)) {
|
|
613
|
+
fs.rmSync(wtPath, { recursive: true, force: true });
|
|
614
|
+
}
|
|
615
|
+
}
|
|
616
|
+
catch (e) {
|
|
617
|
+
logger.warn(`Failed to remove worktree ${wtPath}: ${e}`);
|
|
618
|
+
}
|
|
619
|
+
}
|
|
620
|
+
}
|
|
621
|
+
}
|
|
622
|
+
// 7. Update FlowMeta with completion info
|
|
623
|
+
if (meta) {
|
|
624
|
+
meta.status = 'completed';
|
|
625
|
+
meta.integratedBranch = targetBranch;
|
|
626
|
+
meta.integratedAt = new Date().toISOString();
|
|
627
|
+
delete meta.error;
|
|
628
|
+
fs.writeFileSync(metaPath, JSON.stringify(meta, null, 2));
|
|
629
|
+
}
|
|
630
|
+
logger.section(`🎉 Flow Completed!`);
|
|
631
|
+
logger.info(`Integrated branch: ${targetBranch}`);
|
|
632
|
+
logger.success(`All ${laneBranches.length} lanes merged successfully.`);
|
|
633
|
+
}
|
|
476
634
|
/**
|
|
477
635
|
* Run orchestration with dependency management
|
|
478
636
|
*/
|
|
@@ -910,6 +1068,26 @@ async function orchestrate(tasksDir, options = {}) {
|
|
|
910
1068
|
process.exit(2);
|
|
911
1069
|
}
|
|
912
1070
|
logger.success('All lanes completed successfully!');
|
|
1071
|
+
// Auto-complete flow: merge all lane branches and cleanup
|
|
1072
|
+
const autoComplete = options.autoComplete !== false && !options.noGit;
|
|
1073
|
+
if (autoComplete && completedLanes.size === lanes.length) {
|
|
1074
|
+
try {
|
|
1075
|
+
await finalizeFlow({
|
|
1076
|
+
tasksDir,
|
|
1077
|
+
runId,
|
|
1078
|
+
runRoot,
|
|
1079
|
+
laneRunDirs,
|
|
1080
|
+
laneWorktreeDirs,
|
|
1081
|
+
pipelineBranch,
|
|
1082
|
+
repoRoot,
|
|
1083
|
+
noCleanup: options.noCleanup,
|
|
1084
|
+
});
|
|
1085
|
+
}
|
|
1086
|
+
catch (error) {
|
|
1087
|
+
logger.error(`Flow auto-completion failed: ${error.message}`);
|
|
1088
|
+
logger.info('You can manually complete the flow with: cursorflow complete');
|
|
1089
|
+
}
|
|
1090
|
+
}
|
|
913
1091
|
events_1.events.emit('orchestration.completed', {
|
|
914
1092
|
runId,
|
|
915
1093
|
laneCount: lanes.length,
|