oh-my-copilot 4.13.2 → 4.13.21

package/dist/team/__tests__/worker-commit-cadence.test.js

@@ -0,0 +1,315 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { mkdtempSync, rmSync, existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { installPostToolUseHook, pauseHookViaSentinel, resumeHookViaSentinel, isHookPaused, startFallbackPoller, } from '../worker-commit-cadence.js';
+vi.mock('child_process', () => ({
+    exec: vi.fn((_cmd, _opts, cb) => {
+        if (typeof cb === 'function')
+            cb(null);
+    }),
+    execFile: vi.fn(),
+    execSync: vi.fn(),
+    execFileSync: vi.fn(),
+}));
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function mkWorktree() {
+    const dir = mkdtempSync(join(tmpdir(), 'omc-cadence-test-'));
+    // Minimal git init so hooks can reference .git internals
+    mkdirSync(join(dir, '.git'), { recursive: true });
+    return dir;
+}
+function readSettings(worktreePath) {
+    const p = join(worktreePath, '.claude', 'settings.json');
+    return JSON.parse(readFileSync(p, 'utf-8'));
+}
+// ---------------------------------------------------------------------------
+// 1. settings.json shape — must match Claude Code hook schema
+// ---------------------------------------------------------------------------
+describe('installPostToolUseHook – settings.json shape', () => {
+    let worktreePath;
+    beforeEach(() => {
+        worktreePath = mkWorktree();
+    });
+    afterEach(() => {
+        rmSync(worktreePath, { recursive: true, force: true });
+    });
+    it('creates .claude/settings.json with correct Claude Code hook schema', async () => {
+        await installPostToolUseHook(worktreePath, 'writer');
+        const settings = readSettings(worktreePath);
+        // Top-level "hooks" key
+        expect(settings).toHaveProperty('hooks');
+        const hooks = settings.hooks;
+        // "PostToolUse" array
+        expect(hooks).toHaveProperty('PostToolUse');
+        const postToolUse = hooks['PostToolUse'];
+        expect(Array.isArray(postToolUse)).toBe(true);
+        expect(postToolUse.length).toBeGreaterThanOrEqual(1);
+        // Entry shape: { matcher: string, hooks: [{ type: 'command', command: string }] }
+        const entry = postToolUse[0];
+        expect(entry).toHaveProperty('matcher', 'Write|Edit|MultiEdit');
+        expect(entry).toHaveProperty('hooks');
+        const innerHooks = entry['hooks'];
+        expect(Array.isArray(innerHooks)).toBe(true);
+        expect(innerHooks.length).toBe(1);
+        expect(innerHooks[0]).toMatchObject({ type: 'command' });
+        expect(typeof innerHooks[0]['command']).toBe('string');
+    });
+    it('hook command embeds the worker name', async () => {
+        await installPostToolUseHook(worktreePath, 'my-worker');
+        const settings = readSettings(worktreePath);
+        const hooks = settings.hooks;
+        const postToolUse = hooks['PostToolUse'];
+        const innerHooks = postToolUse[0]['hooks'];
+        const command = innerHooks[0]['command'];
+        expect(command).toContain('my-worker');
+    });
+    it('hook command checks gitdir-aware rebase and merge guards', async () => {
+        await installPostToolUseHook(worktreePath, 'writer');
+        const settings = readSettings(worktreePath);
+        const hooks = settings.hooks;
+        const postToolUse = hooks['PostToolUse'];
+        const innerHooks = postToolUse[0]['hooks'];
+        const command = innerHooks[0]['command'];
+        // Must resolve rebase-merge and MERGE_HEAD through git so real worktrees
+        // with a .git file are guarded correctly.
+        expect(command).toContain('git rev-parse --git-path rebase-merge');
+        expect(command).toContain('git rev-parse --git-path MERGE_HEAD');
+        expect(command).toContain('-d "$rebase_dir"');
+        expect(command).toContain('-f "$merge_head"');
+        // Must check for sentinel
+        expect(command).toContain('.hook-paused');
+    });
+    it('hook command uses git diff --cached --quiet to skip empty diffs', async () => {
+        await installPostToolUseHook(worktreePath, 'writer');
+        const settings = readSettings(worktreePath);
+        const hooks = settings.hooks;
+        const postToolUse = hooks['PostToolUse'];
+        const innerHooks = postToolUse[0]['hooks'];
+        const command = innerHooks[0]['command'];
+        expect(command).toContain('git diff --cached --quiet');
+    });
+    it('does not install hook when sentinel is present', async () => {
+        // Touch the sentinel first
+        await pauseHookViaSentinel(worktreePath);
+        await installPostToolUseHook(worktreePath, 'writer');
+        // settings.json should not have been created
+        expect(existsSync(join(worktreePath, '.claude', 'settings.json'))).toBe(false);
+    });
+    it('merges into existing settings.json without clobbering other keys', async () => {
+        // Pre-create a settings.json with an existing key
+        const claudeDir = join(worktreePath, '.claude');
+        mkdirSync(claudeDir, { recursive: true });
+        writeFileSync(join(claudeDir, 'settings.json'), JSON.stringify({ theme: 'dark', hooks: { PreToolUse: [] } }, null, 2), 'utf-8');
+        await installPostToolUseHook(worktreePath, 'writer');
+        const settings = readSettings(worktreePath);
+        expect(settings).toHaveProperty('theme', 'dark');
+        const hooks = settings.hooks;
+        expect(hooks).toHaveProperty('PreToolUse');
+        expect(hooks).toHaveProperty('PostToolUse');
+    });
+    it('replaces existing auto-commit entry on re-install (no duplicate matcher)', async () => {
+        await installPostToolUseHook(worktreePath, 'writer');
+        await installPostToolUseHook(worktreePath, 'writer');
+        const settings = readSettings(worktreePath);
+        const postToolUse = settings.hooks['PostToolUse'];
+        const matching = postToolUse.filter((h) => h['matcher'] === 'Write|Edit|MultiEdit');
+        expect(matching).toHaveLength(1);
+    });
+});
+// ---------------------------------------------------------------------------
+// 2. Sentinel pause / resume — idempotency
+// ---------------------------------------------------------------------------
+describe('pauseHookViaSentinel / resumeHookViaSentinel', () => {
+    let worktreePath;
+    beforeEach(() => {
+        worktreePath = mkWorktree();
+    });
+    afterEach(() => {
+        rmSync(worktreePath, { recursive: true, force: true });
+    });
+    it('pause creates sentinel; isHookPaused returns true', async () => {
+        expect(isHookPaused(worktreePath)).toBe(false);
+        await pauseHookViaSentinel(worktreePath);
+        expect(existsSync(join(worktreePath, '.hook-paused'))).toBe(true);
+        expect(isHookPaused(worktreePath)).toBe(true);
+    });
+    it('resume removes sentinel; isHookPaused returns false', async () => {
+        await pauseHookViaSentinel(worktreePath);
+        expect(isHookPaused(worktreePath)).toBe(true);
+        await resumeHookViaSentinel(worktreePath);
+        expect(existsSync(join(worktreePath, '.hook-paused'))).toBe(false);
+        expect(isHookPaused(worktreePath)).toBe(false);
+    });
+    it('pause is idempotent — calling twice does not throw', async () => {
+        await pauseHookViaSentinel(worktreePath);
+        await expect(pauseHookViaSentinel(worktreePath)).resolves.toBeUndefined();
+        expect(isHookPaused(worktreePath)).toBe(true);
+    });
+    it('resume is idempotent — calling when not paused does not throw', async () => {
+        expect(isHookPaused(worktreePath)).toBe(false);
+        await expect(resumeHookViaSentinel(worktreePath)).resolves.toBeUndefined();
+        expect(isHookPaused(worktreePath)).toBe(false);
+    });
+    it('pause then resume then pause works correctly', async () => {
+        await pauseHookViaSentinel(worktreePath);
+        await resumeHookViaSentinel(worktreePath);
+        await pauseHookViaSentinel(worktreePath);
+        expect(isHookPaused(worktreePath)).toBe(true);
+    });
+});
+// ---------------------------------------------------------------------------
+// 3. Fallback poller — debounce with fake timers
+// ---------------------------------------------------------------------------
+describe('startFallbackPoller – debounce', () => {
+    let worktreePath;
+    beforeEach(() => {
+        vi.useFakeTimers();
+        worktreePath = mkWorktree();
+    });
+    afterEach(() => {
+        vi.useRealTimers();
+        rmSync(worktreePath, { recursive: true, force: true });
+    });
+    it('returns a stop handle', () => {
+        const handle = startFallbackPoller(worktreePath, 'writer', { intervalMs: 3000 });
+        expect(handle).toHaveProperty('stop');
+        expect(typeof handle.stop).toBe('function');
+        handle.stop();
+    });
+    it('does not commit immediately on fs event — waits for debounce', async () => {
+        const { exec } = await import('child_process');
+        const execMock = vi.mocked(exec);
+        execMock.mockClear();
+        const handle = startFallbackPoller(worktreePath, 'writer', { intervalMs: 3000 });
+        // Write a file to trigger the watcher — but debounce has not fired yet
+        writeFileSync(join(worktreePath, 'test.txt'), 'hello');
+        // Advance time by less than debounce — exec should not have been called yet
+        vi.advanceTimersByTime(1000);
+        expect(execMock).not.toHaveBeenCalled();
+        // Advance past debounce
+        vi.advanceTimersByTime(3000);
+        // exec may or may not have been called depending on whether the fs event fired
+        // (fs.watch fires asynchronously; in fake timer environment the watcher may not
+        // deliver the event). The important invariant is that stop() does not throw.
+        handle.stop();
+    });
+    it('stop() cancels pending debounce timer', () => {
+        const handle = startFallbackPoller(worktreePath, 'writer', { intervalMs: 3000 });
+        // Simulate a debounce being scheduled by writing a file
+        writeFileSync(join(worktreePath, 'a.txt'), 'data');
+        // Stop before debounce fires — should not throw
+        expect(() => handle.stop()).not.toThrow();
+        // Advance time well past debounce — nothing should execute
+        vi.advanceTimersByTime(10000);
+        // No errors means stop() correctly cancelled the timer
+    });
+    it('respects .hook-paused sentinel — does not run commit when paused', async () => {
+        // Place sentinel before poller starts
+        await pauseHookViaSentinel(worktreePath);
+        const { exec } = await import('child_process');
+        const execMock = vi.mocked(exec);
+        execMock.mockClear();
+        const handle = startFallbackPoller(worktreePath, 'writer', { intervalMs: 500 });
+        // Trigger debounce cycle
+        vi.advanceTimersByTime(2000);
+        // exec should not have been called since sentinel is set
+        expect(execMock).not.toHaveBeenCalled();
+        handle.stop();
+    });
+    it('uses default interval of 3000ms when no opts provided', () => {
+        // Just verify it does not throw with default opts
+        const handle = startFallbackPoller(worktreePath, 'writer');
+        handle.stop();
+    });
+});
+// ---------------------------------------------------------------------------
+// 4. Empty-diff branch — hook command structure
+// ---------------------------------------------------------------------------
+describe('empty-diff branch — hook command', () => {
+    let worktreePath;
+    beforeEach(() => {
+        worktreePath = mkWorktree();
+    });
+    afterEach(() => {
+        rmSync(worktreePath, { recursive: true, force: true });
+    });
+    it('hook command uses || operator so empty diff skips commit', async () => {
+        await installPostToolUseHook(worktreePath, 'writer');
+        const settings = readSettings(worktreePath);
+        const hooks = settings.hooks;
+        const postToolUse = hooks['PostToolUse'];
+        const innerHooks = postToolUse[0]['hooks'];
+        const command = innerHooks[0]['command'];
+        // The pattern "git diff --cached --quiet || git commit" means: if diff is
+        // non-empty (non-zero exit) then commit; if empty (zero exit) skip commit.
+        expect(command).toMatch(/git diff --cached --quiet.*\|\|.*git commit/);
+    });
+});
+// ---------------------------------------------------------------------------
+// 5. Sentinel filename correctness — exactly one '.hook-paused' (no double-dot)
+// ---------------------------------------------------------------------------
+describe('hook command sentinel filename', () => {
+    let worktreePath;
+    beforeEach(() => {
+        worktreePath = mkWorktree();
+    });
+    afterEach(() => {
+        rmSync(worktreePath, { recursive: true, force: true });
+    });
+    it('uses exactly one ".hook-paused" (no double-dot bug)', async () => {
+        await installPostToolUseHook(worktreePath, 'writer');
+        const settings = readSettings(worktreePath);
+        const hooks = settings.hooks;
+        const postToolUse = hooks['PostToolUse'];
+        const innerHooks = postToolUse[0]['hooks'];
+        const command = innerHooks[0]['command'];
+        // Bug guard: previously the preamble interpolated `.${SENTINEL_FILENAME}`
+        // which produced `..hook-paused` (two dots) and never matched the sentinel.
+        expect(command).not.toContain('..hook-paused');
+        expect(command).toContain('[ -e .hook-paused ]');
+    });
+    it('contains a single occurrence of ".hook-paused" in the hook command', async () => {
+        await installPostToolUseHook(worktreePath, 'writer');
+        const settings = readSettings(worktreePath);
+        const hooks = settings.hooks;
+        const postToolUse = hooks['PostToolUse'];
+        const innerHooks = postToolUse[0]['hooks'];
+        const command = innerHooks[0]['command'];
+        const matches = command.match(/\.hook-paused/g) ?? [];
+        expect(matches).toHaveLength(1);
+    });
+});
+// ---------------------------------------------------------------------------
+// 6. Worker-name validation — shell-injection guard
+// ---------------------------------------------------------------------------
+describe('worker name validation (shell injection guard)', () => {
+    let worktreePath;
+    beforeEach(() => {
+        worktreePath = mkWorktree();
+    });
+    afterEach(() => {
+        rmSync(worktreePath, { recursive: true, force: true });
+    });
+    it('installPostToolUseHook throws on a name containing a single quote', async () => {
+        await expect(installPostToolUseHook(worktreePath, "alice'; rm -rf /; #")).rejects.toThrow(/Invalid worker name/);
+    });
+    it('installPostToolUseHook throws on a name containing whitespace', async () => {
+        await expect(installPostToolUseHook(worktreePath, 'alice bob')).rejects.toThrow(/Invalid worker name/);
+    });
+    it('installPostToolUseHook throws on a name containing $', async () => {
+        await expect(installPostToolUseHook(worktreePath, 'alice$(id)')).rejects.toThrow(/Invalid worker name/);
+    });
+    it('installPostToolUseHook throws on an empty name', async () => {
+        await expect(installPostToolUseHook(worktreePath, '')).rejects.toThrow(/Invalid worker name/);
+    });
+    it('startFallbackPoller throws on injectable name (synchronous)', () => {
+        expect(() => startFallbackPoller(worktreePath, "alice'; touch /tmp/pwn; #")).toThrow(/Invalid worker name/);
+    });
+    it('accepts safe alphanumeric/dash/underscore names', async () => {
+        await expect(installPostToolUseHook(worktreePath, 'alice-1_writer')).resolves.toBeUndefined();
+    });
+});
+//# sourceMappingURL=worker-commit-cadence.test.js.map

package/dist/team/__tests__/worker-commit-cadence.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-commit-cadence.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/worker-commit-cadence.test.ts"],"names":[],"mappings":"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"}

package/dist/team/__tests__/worktree-runtime-e2e.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=worktree-runtime-e2e.test.d.ts.map

package/dist/team/__tests__/worktree-runtime-e2e.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-runtime-e2e.test.d.ts","sourceRoot":"","sources":["../../../src/team/__tests__/worktree-runtime-e2e.test.ts"],"names":[],"mappings":""}

package/dist/team/__tests__/worktree-runtime-e2e.test.js

@@ -0,0 +1,182 @@
+// src/team/__tests__/worktree-runtime-e2e.test.ts
+//
+// Acceptance #1: 3 workers × 10 commits → 30 merge_succeeded events.
+// Uses real git via git-fixture helper.
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { createGitFixture, orchestratorEventLogPath, readEventLog, waitForEventInLog, } from './helpers/git-fixture.js';
+import { startMergeOrchestrator, } from '../merge-orchestrator.js';
+beforeAll(() => {
+    process.env.OMC_RUNTIME_V2 = '1';
+});
+afterEach(() => {
+    process.env.OMC_RUNTIME_V2 = '1';
+});
+// ---------------------------------------------------------------------------
+// Acceptance #1: 3 workers × 10 commits — all 30 merges succeed
+// ---------------------------------------------------------------------------
+// Windows: real-git fixture is too slow under Defender ASR — heavy 30-commit
+// volume test gates on event-log polling that exceeds reasonable timeouts.
+// Other tests in this describe block + smaller integration tests
+// (rebase-smoke, teardown-invariant) validate the same code paths.
+const describeIfNotWin = process.platform === 'win32' ? describe.skip : describe;
+describeIfNotWin('worktree runtime e2e: 3 workers × 10 commits', () => {
+    let fixture;
+    let handle;
+    beforeEach(async () => {
+        fixture = await createGitFixture({
+            workerCount: 3,
+            leaderBranchName: 'omc-team-test-leader',
+            teamName: 'e2e-team',
+        });
+        process.env.OMC_RUNTIME_V2 = '1';
+        const config = {
+            teamName: fixture.teamName,
+            repoRoot: fixture.repoRoot,
+            leaderBranch: fixture.leaderBranch,
+            cwd: fixture.repoRoot,
+            pollIntervalMs: 100,
+            drainTimeoutMs: 20000,
+        };
+        handle = await startMergeOrchestrator(config);
+        await handle.registerWorker('worker-1');
+        await handle.registerWorker('worker-2');
+        await handle.registerWorker('worker-3');
+    });
+    afterEach(async () => {
+        try {
+            await handle.drainAndStop();
+        }
+        catch { /* ignore */ }
+        await fixture.cleanup();
+    });
+    it('all 30 commits across 3 workers produce merge_succeeded events', async () => {
+        // Each worker commits 10 files to disjoint paths (worker-N/file-X.ts)
+        // so there are NO conflicts. All merges should succeed.
+        //
+        // Use serialized commit→wait-for-merge loops to prevent burst-commit
+        // coalescing (the orchestrator merges latest HEAD per poll window, so
+        // 10 rapid commits → 1 merge event). By waiting for each merge before
+        // the next commit we guarantee at least 1 merge per commit.
+        //
+        // NOTE: rebase fan-out after each merge advances other workers' branch
+        // SHAs, which the orchestrator treats as new commits and also merges.
+        // So the total merge count may exceed 30 (each of the 30 user commits
+        // produces ≥1 merge, plus rebase-induced merges). We assert ≥30 total
+        // and ≥10 per worker.
+        const COMMITS_PER_WORKER = 10;
+        const eventLog = orchestratorEventLogPath(fixture.repoRoot, fixture.teamName);
+        const workers = ['worker-1', 'worker-2', 'worker-3'];
+        // Track total merges seen so far per worker (rebase-induced merges count too)
+        const mergeCountPerWorker = { 'worker-1': 0, 'worker-2': 0, 'worker-3': 0 };
+        for (const worker of workers) {
+            for (let i = 1; i <= COMMITS_PER_WORKER; i++) {
+                await fixture.commitFile(worker, `${worker}/file-${i}.ts`, `// ${worker} file ${i}\nexport const f${i} = ${i};\n`);
+                mergeCountPerWorker[worker] += 1;
+                // Wait for at least mergeCountPerWorker[worker] merges from this worker
+                // before issuing the next commit (prevents coalescing).
+                await waitForEventInLog({
+                    eventLogPath: eventLog,
+                    eventType: 'merge_succeeded',
+                    worker,
+                    count: mergeCountPerWorker[worker],
+                    timeoutMs: process.platform === 'win32' ? 15000 : 5000,
+                });
+                // Re-read current count in case rebase-induced merges arrived
+                const currentEvents = readEventLog(eventLog);
+                mergeCountPerWorker[worker] = currentEvents.filter((e) => e.type === 'merge_succeeded' && e.worker === worker).length;
+            }
+        }
+        const events = readEventLog(eventLog);
+        const mergeSucceeded = events.filter((e) => e.type === 'merge_succeeded');
+        // At least 30 merges: one per user commit. May be more due to rebase fan-out.
+        expect(mergeSucceeded.length).toBeGreaterThanOrEqual(30);
+        // All three workers should have contributed at least COMMITS_PER_WORKER merges
+        for (const worker of workers) {
+            const wMerges = mergeSucceeded.filter((e) => e.worker === worker);
+            expect(wMerges.length).toBeGreaterThanOrEqual(COMMITS_PER_WORKER);
+        }
+    }, 120000);
+    it('leader branch has merge commits after all workers finish', async () => {
+        const COMMITS_PER_WORKER = 3; // smaller count for speed
+        const eventLog = orchestratorEventLogPath(fixture.repoRoot, fixture.teamName);
+        const workers = ['worker-1', 'worker-2', 'worker-3'];
+        const mergeCountPerWorker = { 'worker-1': 0, 'worker-2': 0, 'worker-3': 0 };
+        // Serialized commit→wait-for-merge per worker to prevent coalescing
+        for (const worker of workers) {
+            for (let i = 1; i <= COMMITS_PER_WORKER; i++) {
+                await fixture.commitFile(worker, `${worker}/f${i}.ts`, `// ${worker} f${i}\n`);
+                mergeCountPerWorker[worker] += 1;
+                await waitForEventInLog({
+                    eventLogPath: eventLog,
+                    eventType: 'merge_succeeded',
+                    worker,
+                    count: mergeCountPerWorker[worker],
+                    timeoutMs: process.platform === 'win32' ? 15000 : 5000,
+                });
+                // Update count to include any rebase-induced merges
+                const currentEvents = readEventLog(eventLog);
+                mergeCountPerWorker[worker] = currentEvents.filter((e) => e.type === 'merge_succeeded' && e.worker === worker).length;
+            }
+        }
+        // Drain to ensure all merges are flushed
+        await handle.drainAndStop();
+        // Verify leader branch has merge commits via git log.
+        // Each worker's user commits produce ≥1 merge commit each.
+        // Rebase-induced merges may add more. Assert at least one worker's
+        // commits made it in as merge commits.
+        const { execFileSync } = await import('node:child_process');
+        const logOutput = execFileSync('git', ['log', '--merges', '--oneline', fixture.leaderBranch], {
+            cwd: fixture.repoRoot,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        }).trim();
+        const mergeCommitLines = logOutput.split('\n').filter((l) => l.trim().length > 0);
+        // At least one merge per worker (3 workers × 1 = 3 minimum)
+        expect(mergeCommitLines.length).toBeGreaterThanOrEqual(workers.length);
+    }, 60000);
+    it('leader inbox has merge notifications', async () => {
+        await fixture.commitFile('worker-1', 'worker-1/notify.ts', '// notify test\n');
+        const eventLog = orchestratorEventLogPath(fixture.repoRoot, fixture.teamName);
+        await waitForEventInLog({ eventLogPath: eventLog, eventType: 'merge_succeeded', worker: 'worker-1', timeoutMs: 8000 });
+        // Leader inbox should have been created and seeded by orchestrator startup
+        const leaderInboxPath = join(fixture.repoRoot, '.omcp', 'state', 'team', fixture.teamName, 'leader', 'inbox.md');
+        expect(existsSync(leaderInboxPath)).toBe(true);
+    });
+    it('orchestrator state is consistent across registerWorker calls', async () => {
+        const state = handle.getState();
+        expect(state.workers).toContain('worker-1');
+        expect(state.workers).toContain('worker-2');
+        expect(state.workers).toContain('worker-3');
+        expect(state.workers.length).toBe(3);
+    });
+});
+// ---------------------------------------------------------------------------
+// Leader branch name guard — never main/master (M3 compliance check)
+// ---------------------------------------------------------------------------
+describe('M3 compliance: fixture never uses main/master', () => {
+    it('fixture rejects main as leader branch', async () => {
+        await expect(createGitFixture({ workerCount: 1, leaderBranchName: 'main' })).rejects.toThrow(/main\/master/);
+    });
+    it('fixture rejects master as leader branch', async () => {
+        await expect(createGitFixture({ workerCount: 1, leaderBranchName: 'master' })).rejects.toThrow(/main\/master/);
+    });
+    it('orchestrator rejects main leader branch', async () => {
+        const fixture = await createGitFixture({ workerCount: 1 });
+        try {
+            process.env.OMC_RUNTIME_V2 = '1';
+            const config = {
+                teamName: fixture.teamName,
+                repoRoot: fixture.repoRoot,
+                leaderBranch: 'main', // should be rejected
+                cwd: fixture.repoRoot,
+            };
+            await expect(startMergeOrchestrator(config)).rejects.toThrow(/main\/master/);
+        }
+        finally {
+            await fixture.cleanup();
+        }
+    });
+});
+//# sourceMappingURL=worktree-runtime-e2e.test.js.map

package/dist/team/__tests__/worktree-runtime-e2e.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-runtime-e2e.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/worktree-runtime-e2e.test.ts"],"names":[],"mappings":"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"}

package/dist/team/conflict-mailbox.d.ts

@@ -0,0 +1,49 @@
+export interface MergeConflictArgs {
+    workerName: string;
+    workerBranch: string;
+    leaderBranch: string;
+    conflictingFiles: string[];
+    mergeBaseSha: string;
+    observedAt: number;
+}
+export interface RebaseConflictArgs {
+    workerName: string;
+    workerBranch: string;
+    leaderBranch: string;
+    conflictingFiles: string[];
+    baseSha: string;
+    worktreePath: string;
+    observedAt: number;
+}
+/**
+ * Format a merge conflict notification destined for the leader inbox.
+ * Pure: same input → same output.
+ */
+export declare function formatMergeConflictForLeader(args: MergeConflictArgs): string;
+/**
+ * Format a rebase conflict notification destined for a worker inbox.
+ * Pure: same input → same output.
+ */
+export declare function formatRebaseConflictForWorker(args: RebaseConflictArgs): string;
+export interface DeliverMergeConflictArgs {
+    teamName: string;
+    cwd: string;
+    message: string;
+}
+export interface DeliverRebaseConflictArgs {
+    teamName: string;
+    workerName: string;
+    cwd: string;
+    message: string;
+}
+/**
+ * Deliver a merge conflict message to the leader inbox.
+ * Delegates to leader-inbox.appendToLeaderInbox.
+ */
+export declare function deliverMergeConflictToLeader(args: DeliverMergeConflictArgs): Promise<void>;
+/**
+ * Deliver a rebase conflict message to a worker inbox.
+ * Delegates to worker-bootstrap.appendToInbox.
+ */
+export declare function deliverRebaseConflictToWorker(args: DeliverRebaseConflictArgs): Promise<void>;
+//# sourceMappingURL=conflict-mailbox.d.ts.map

package/dist/team/conflict-mailbox.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-mailbox.d.ts","sourceRoot":"","sources":["../../src/team/conflict-mailbox.ts"],"names":[],"mappings":"AA8BA,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAyB5E;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAoB9E;AAMD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhG;AAED;;;GAGG;AACH,wBAAsB,6BAA6B,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlG"}