opencastle 0.33.6 → 0.33.7

package/dist/cli/convoy/engine.d.ts

@@ -16,6 +16,11 @@ export interface ConvoyEngineOptions {
     _mergeQueue?: MergeQueue;
     /** Override for test injection. Pass `ensureBranch` for real behavior, or a mock. */
     _ensureBranch?: (branchName: string, basePath: string) => Promise<void>;
+    /** Pass `null` to skip convoy-level worktree creation (test mode).
+     *  Pass a string path to inject a specific worktree directory.
+     *  Omit (undefined) for real worktree creation.
+     *  Also skipped when `_ensureBranch` is provided (backward-compat for tests). */
+    _convoyWorktreeDir?: string | null;
     /** Injectable for test injection of the review pipeline. */
     _reviewRunner?: (task: TaskRecord, level: ReviewLevel, reviewerModel: string) => Promise<ReviewResult>;
 }

package/dist/cli/convoy/engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../src/cli/convoy/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../src/cli/convoy/engine.ts"],"names":[],"mappings":"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"}

package/dist/cli/convoy/engine.js

@@ -2612,11 +2612,36 @@ export function createConvoyEngine(options) {
         const convoyId = `convoy-${startTime}`;
         const specHash = createHash('sha256').update(specYaml).digest('hex');
         const baseBranch = spec.branch ?? (await getCurrentBranch());
-        // Ensure target branch exists before acquiring any locks.
-        // Uses _ensureBranch injection so callers/tests can override.
+        // Create convoy-level worktree for branch isolation.
+        // Skipped when _convoyWorktreeDir is null or _ensureBranch is injected (test mode).
+        let effectiveBasePath = basePath;
+        let convoyWorktreeDir;
         if (spec.branch !== undefined) {
-            const branchFn = options._ensureBranch ?? ensureBranch;
-            await branchFn(spec.branch, basePath);
+            const skipWorktree = options._convoyWorktreeDir === null || options._ensureBranch !== undefined;
+            if (!skipWorktree) {
+                if (typeof options._convoyWorktreeDir === 'string') {
+                    effectiveBasePath = options._convoyWorktreeDir;
+                    convoyWorktreeDir = options._convoyWorktreeDir;
+                }
+                else {
+                    const worktreeId = `convoy-root-${Date.now()}`;
+                    convoyWorktreeDir = join(basePath, '.opencastle', 'worktrees', worktreeId);
+                    mkdirSync(dirname(convoyWorktreeDir), { recursive: true });
+                    let branchExists = false;
+                    try {
+                        await execFile('git', ['rev-parse', '--verify', spec.branch], { cwd: basePath });
+                        branchExists = true;
+                    }
+                    catch { /* branch doesn't exist */ }
+                    if (branchExists) {
+                        await execFile('git', ['worktree', 'add', convoyWorktreeDir, spec.branch], { cwd: basePath });
+                    }
+                    else {
+                        await execFile('git', ['worktree', 'add', '-b', spec.branch, convoyWorktreeDir], { cwd: basePath });
+                    }
+                    effectiveBasePath = convoyWorktreeDir;
+                }
+            }
         }
         mkdirSync(dirname(dbPath), { recursive: true });
         const lockDb = new DatabaseSync(dbPath);
@@ -2648,10 +2673,10 @@ export function createConvoyEngine(options) {
         const store = createConvoyStore(dbPath);
         const ndjsonPath = options.logsDir
             ? join(options.logsDir, 'convoys', `${convoyId}.ndjson`)
-            : ndjsonPathForConvoy(convoyId, basePath);
+            : ndjsonPathForConvoy(convoyId, effectiveBasePath);
         const events = createEventEmitter(store, { ndjsonPath });
-        const wtManager = options._worktreeManager ?? createWorktreeManager(basePath);
-        const mergeQueue = options._mergeQueue ?? createMergeQueue(basePath);
+        const wtManager = options._worktreeManager ?? createWorktreeManager(effectiveBasePath);
+        const mergeQueue = options._mergeQueue ?? createMergeQueue(effectiveBasePath);
         let result;
         try {
             store.insertConvoy({
@@ -2699,13 +2724,19 @@ export function createConvoyEngine(options) {
             }
             store.updateConvoyStatus(convoyId, 'running', { started_at: new Date().toISOString() });
             events.emit('convoy_started', { name: spec.name }, { convoy_id: convoyId });
-            result = await runConvoy(convoyId, spec, adapter, store, events, wtManager, mergeQueue, basePath, baseBranch, verbose, startTime, ndjsonPath, options._reviewRunner);
+            result = await runConvoy(convoyId, spec, adapter, store, events, wtManager, mergeQueue, effectiveBasePath, baseBranch, verbose, startTime, ndjsonPath, options._reviewRunner);
         }
         finally {
             events.close();
             store.close();
             lock.release();
             lockDb.close();
+            if (convoyWorktreeDir) {
+                try {
+                    await execFile('git', ['worktree', 'remove', convoyWorktreeDir, '--force'], { cwd: basePath });
+                }
+                catch { /* ignore cleanup errors */ }
+            }
         }
         return result;
     }
@@ -2739,12 +2770,9 @@ export function createConvoyEngine(options) {
         }
         lock.startHeartbeat();
         const store = createConvoyStore(dbPath);
-        const ndjsonPath = options.logsDir
-            ? join(options.logsDir, 'convoys', `${convoyId}.ndjson`)
-            : ndjsonPathForConvoy(convoyId, basePath);
-        const events = createEventEmitter(store, { ndjsonPath });
-        const wtManager = options._worktreeManager ?? createWorktreeManager(basePath);
-        const mergeQueue = options._mergeQueue ?? createMergeQueue(basePath);
+        let effectiveBasePath = basePath;
+        let convoyWorktreeDir;
+        let events;
         let result;
         try {
             const convoy = store.getConvoy(convoyId);
@@ -2752,6 +2780,41 @@ export function createConvoyEngine(options) {
                 throw new Error(`Convoy "${convoyId}" not found in store`);
             }
             const baseBranch = convoy.branch ?? spec.branch ?? (await getCurrentBranch());
+            const convoyBranch = convoy.branch ?? spec.branch;
+            // Create convoy-level worktree for branch isolation.
+            if (convoyBranch !== undefined) {
+                const skipWorktree = options._convoyWorktreeDir === null || options._ensureBranch !== undefined;
+                if (!skipWorktree) {
+                    if (typeof options._convoyWorktreeDir === 'string') {
+                        effectiveBasePath = options._convoyWorktreeDir;
+                        convoyWorktreeDir = options._convoyWorktreeDir;
+                    }
+                    else {
+                        const worktreeId = `convoy-root-${Date.now()}`;
+                        convoyWorktreeDir = join(basePath, '.opencastle', 'worktrees', worktreeId);
+                        mkdirSync(dirname(convoyWorktreeDir), { recursive: true });
+                        let branchExists = false;
+                        try {
+                            await execFile('git', ['rev-parse', '--verify', convoyBranch], { cwd: basePath });
+                            branchExists = true;
+                        }
+                        catch { /* branch doesn't exist */ }
+                        if (branchExists) {
+                            await execFile('git', ['worktree', 'add', convoyWorktreeDir, convoyBranch], { cwd: basePath });
+                        }
+                        else {
+                            await execFile('git', ['worktree', 'add', '-b', convoyBranch, convoyWorktreeDir], { cwd: basePath });
+                        }
+                        effectiveBasePath = convoyWorktreeDir;
+                    }
+                }
+            }
+            const ndjsonPath = options.logsDir
+                ? join(options.logsDir, 'convoys', `${convoyId}.ndjson`)
+                : ndjsonPathForConvoy(convoyId, effectiveBasePath);
+            events = createEventEmitter(store, { ndjsonPath });
+            const wtManager = options._worktreeManager ?? createWorktreeManager(effectiveBasePath);
+            const mergeQueue = options._mergeQueue ?? createMergeQueue(effectiveBasePath);
             // Reset interrupted tasks and mark their workers as killed
             const allTasks = store.getTasksByConvoy(convoyId);
             for (const task of allTasks) {
@@ -2779,13 +2842,19 @@ export function createConvoyEngine(options) {
             // NDJSON recovery: truncate partial lines, replay missing events
             recoverNdjson(store, convoyId, ndjsonPath);
             events.emit('convoy_resumed', { original_created_at: convoy.created_at }, { convoy_id: convoyId });
-            result = await runConvoy(convoyId, spec, adapter, store, events, wtManager, mergeQueue, basePath, baseBranch, verbose, startTime, ndjsonPath, options._reviewRunner);
+            result = await runConvoy(convoyId, spec, adapter, store, events, wtManager, mergeQueue, effectiveBasePath, baseBranch, verbose, startTime, ndjsonPath, options._reviewRunner);
         }
         finally {
-            events.close();
+            events?.close();
             store.close();
             lock.release();
             lockDb.close();
+            if (convoyWorktreeDir) {
+                try {
+                    await execFile('git', ['worktree', 'remove', convoyWorktreeDir, '--force'], { cwd: basePath });
+                }
+                catch { /* ignore cleanup errors */ }
+            }
         }
         return result;
     }