opencastle 0.33.6 → 0.33.7

package/dist/cli/convoy/engine.test.js

@@ -71,6 +71,7 @@ function makeEngine(opts) {
     return createConvoyEngine({
         logsDir: join(tmpDir, 'logs'), // prevents test data in production logs
         _ensureBranch: vi.fn().mockResolvedValue(undefined),
+        _convoyWorktreeDir: null,
         ...opts,
     });
 }
@@ -2760,10 +2761,9 @@ describe('symlink security scan', () => {
         expect(result.status).toBe('done');
     });
 });
-// ── Security: ensureBranch fallback (issue #3) ────────────────────────────────
-describe('ensureBranch fallback when _ensureBranch not provided', () => {
-    it('calls the injected _ensureBranch when branch is set in spec', async () => {
-        const branchFn = vi.fn().mockResolvedValue(undefined);
+// ── Security: convoy-level worktree when branch is set ───────────────────────
+describe('convoy-level worktree when branch is set', () => {
+    it('runs successfully when _convoyWorktreeDir is null and branch is set', async () => {
         const adapter = makeAdapter();
         const spec = makeSpec({ branch: 'feature-x' });
         const engine = createConvoyEngine({
@@ -2773,13 +2773,12 @@ describe('ensureBranch fallback when _ensureBranch not provided', () => {
             dbPath,
             _worktreeManager: makeWorktreeManager(),
             _mergeQueue: makeMergeQueue(),
-            _ensureBranch: branchFn,
+            _convoyWorktreeDir: null,
         });
-        await engine.run();
-        expect(branchFn).toHaveBeenCalledWith('feature-x', expect.any(String));
+        const result = await engine.run();
+        expect(result.status).toBe('done');
     });
-    it('does not call ensureBranch when spec has no branch', async () => {
-        const branchFn = vi.fn().mockResolvedValue(undefined);
+    it('does not attempt worktree creation when spec has no branch', async () => {
         const adapter = makeAdapter();
         const spec = makeSpec({ branch: undefined });
         const engine = makeEngine({
@@ -2789,10 +2788,9 @@ describe('ensureBranch fallback when _ensureBranch not provided', () => {
             dbPath,
             _worktreeManager: makeWorktreeManager(),
             _mergeQueue: makeMergeQueue(),
-            _ensureBranch: branchFn,
         });
-        await engine.run();
-        expect(branchFn).not.toHaveBeenCalled();
+        const result = await engine.run();
+        expect(result.status).toBe('done');
     });
 });
 // ── Security: secret scan in markdown dual-write (issue #4) ──────────────────