@motivation-labs/crosscheck 0.13.0-beta.7 → 0.13.1-beta.6

package/crosscheck.config.example.yml

@@ -101,9 +101,14 @@ routing:
   #   - my-org-bot       # a dedicated bot account
 
   # Author-based routing fallback — maps GitHub login → vendor origin.
-  # Used when no body pattern matches. Lets you skip the attribution footer requirement.
+  # Used when no body / commit / branch pattern matches. Lets you skip the attribution
+  # footer requirement when an author consistently uses a single agent.
   #   beingzy: claude    → PRs from beingzy treated as Claude-authored → Codex reviews them
   #   my-bot: codex      → PRs from my-bot treated as Codex-authored → Claude reviews them
+  # NOTE: in `mode: cross-vendor` with BOTH vendors enabled, this map is bypassed —
+  # if the same author commits via both agents, a static route is structurally wrong.
+  # In that case, rely on attribution detection (body / commits / branch) and
+  # `fallback_reviewer` below for PRs with no attribution markers.
   # author_routes:
   #   beingzy: claude
 

package/dist/__tests__/board.test.js

@@ -1,5 +1,5 @@
-import { describe, it, expect } from 'vitest';
-import { fmtTokens } from '../lib/board.js';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { PRBoard, fmtTokens } from '../lib/board.js';
 describe('fmtTokens', () => {
     it('returns empty string for undefined', () => {
         expect(fmtTokens(undefined)).toBe('');
@@ -33,4 +33,117 @@ describe('fmtTokens', () => {
         expect(fmtTokens(2_000_000)).toBe('(2M)');
     });
 });
+// ── PRBoard rendering + retention ───────────────────────────────────────────
+const baseConfig = {
+    mode: 'crosscheck',
+    quality: { tier: 'balanced' },
+    vendors: { claude: { enabled: true }, codex: { enabled: false } },
+    display: {
+        theme: {
+            bar_fill: 'blue',
+            bar_empty: 'dim',
+            cr_approve: 'green',
+            cr_needs_work: 'yellow',
+            cr_block: 'red',
+            fix_fill: 'cyan',
+        },
+    },
+};
+const stripAnsi = (s) => s.replace(/\x1B\[[0-9;]*m/g, '');
+const reviewStep = {
+    type: 'review',
+    name: 'review',
+    reviewer: 'auto',
+    max_rounds: 1,
+};
+describe('PRBoard — TTY workspace retention', () => {
+    let board;
+    let originalIsTTY;
+    let originalWrite;
+    beforeEach(() => {
+        originalIsTTY = process.stdout.isTTY;
+        Object.defineProperty(process.stdout, 'isTTY', { value: true, configurable: true });
+        originalWrite = process.stdout.write.bind(process.stdout);
+        process.stdout.write = (() => true);
+        board = new PRBoard();
+        board.setConfig(baseConfig, [reviewStep]);
+    });
+    afterEach(() => {
+        board.stop();
+        process.stdout.write = originalWrite;
+        Object.defineProperty(process.stdout, 'isTTY', { value: originalIsTTY, configurable: true });
+    });
+    // Tests reach into private state because the relevant invariants live
+    // on the slots map and there is no public read API.
+    const slots = () => board.slots;
+    const invokeRender = () => board.render();
+    const invokeFolded = (key) => board.renderPRSlotFolded(slots().get(key));
+    it('keeps completed slot in the workspace (no auto-clear)', () => {
+        board.addPR('k1', 1, 'a/b', 'main');
+        board.completePR('k1', { elapsedMs: 1000, url: 'https://github.com/a/b/pull/1' });
+        expect(slots().size).toBe(1);
+        expect(slots().has('k1')).toBe(true);
+    });
+    it('evicts oldest completed slots when total exceeds workspace cap', () => {
+        for (let i = 0; i < 30; i++) {
+            board.addPR(`k${i}`, i, 'a/b', `branch-${i}`);
+            board.completePR(`k${i}`, { elapsedMs: 1000, url: `https://github.com/a/b/pull/${i}` });
+        }
+        invokeRender();
+        expect(slots().size).toBe(25);
+        // The 5 oldest should be evicted (0..4); 5..29 retained.
+        for (let i = 0; i < 5; i++)
+            expect(slots().has(`k${i}`)).toBe(false);
+        for (let i = 5; i < 30; i++)
+            expect(slots().has(`k${i}`)).toBe(true);
+    });
+    it('never evicts active slots even at overflow', () => {
+        for (let i = 0; i < 24; i++) {
+            board.addPR(`done-${i}`, i, 'a/b', `branch-${i}`);
+            board.completePR(`done-${i}`, { elapsedMs: 1000, url: `url-${i}` });
+        }
+        for (let i = 0; i < 5; i++) {
+            board.addPR(`active-${i}`, 100 + i, 'a/b', `active-${i}`);
+        }
+        expect(slots().size).toBe(29);
+        invokeRender();
+        expect(slots().size).toBe(25);
+        for (let i = 0; i < 5; i++) {
+            expect(slots().has(`active-${i}`)).toBe(true);
+        }
+    });
+    it('renders a folded line with verdict, fix count, recheck and url', () => {
+        board.addPR('k1', 142, 'acme/api', 'chore/deps');
+        board.updatePR('k1', { verdict: 'APPROVE', commentCount: 0, fixCount: 3, recheckVerdict: 'APPROVE' });
+        board.completePR('k1', { elapsedMs: 45_000, url: 'https://github.com/acme/api/pull/142' });
+        const folded = stripAnsi(invokeFolded('k1'));
+        expect(folded).toContain('#142');
+        expect(folded).toContain('acme/api');
+        expect(folded).toContain('chore/deps');
+        expect(folded).toContain('CR: APPROVE');
+        expect(folded).toContain('fix 3');
+        expect(folded).toContain('recheck APPROVE');
+        expect(folded).toMatch(/\(\d+s\)/);
+        expect(folded).toContain('https://github.com/acme/api/pull/142');
+    });
+    it('renders the PR URL in the expanded completed slot (not just folded)', () => {
+        board.addPR('k1', 142, 'acme/api', 'chore/deps');
+        board.updatePR('k1', { verdict: 'APPROVE', commentCount: 0 });
+        board.completePR('k1', { elapsedMs: 45_000, url: 'https://github.com/acme/api/pull/142' });
+        const output = stripAnsi(invokeRender());
+        // With a single completed PR (below FOLD_THRESHOLD), the slot stays expanded
+        // via renderPRSlot. The URL must still surface so operators can click through.
+        expect(output).toContain('https://github.com/acme/api/pull/142');
+    });
+    it('orders sections top-to-bottom: config → stats → PR workspace', () => {
+        board.addPR('k1', 1, 'acme/api', 'feat/x');
+        const output = stripAnsi(invokeRender());
+        const idxBrand = output.indexOf('crosscheck');
+        const idxStats = output.indexOf('PRs:');
+        const idxPR = output.indexOf('#1');
+        expect(idxBrand).toBeGreaterThanOrEqual(0);
+        expect(idxStats).toBeGreaterThan(idxBrand);
+        expect(idxPR).toBeGreaterThan(idxStats);
+    });
+});
 //# sourceMappingURL=board.test.js.map

package/dist/__tests__/board.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"board.test.js","sourceRoot":"","sources":["../../src/__tests__/board.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACpC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACtC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"board.test.js","sourceRoot":"","sources":["../../src/__tests__/board.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/conflict-resolve.test.d.ts

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

package/dist/__tests__/conflict-resolve.test.d.ts.map

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

package/dist/__tests__/conflict-resolve.test.js

@@ -0,0 +1,123 @@
+import { describe, it, expect } from 'vitest';
+import { extractConflictWindows, parseResolverEdits, PROMPT_TEMPLATE } from '../reviewers/conflict-resolve.js';
+describe('extractConflictWindows', () => {
+    it('returns empty string when no markers are present', () => {
+        expect(extractConflictWindows('line a\nline b\nline c\n')).toBe('');
+    });
+    it('extracts a single conflict region with surrounding context', () => {
+        const content = [
+            'top context 1',
+            'top context 2',
+            '<<<<<<< HEAD',
+            'ours',
+            '=======',
+            'theirs',
+            '>>>>>>> branch',
+            'bottom context 1',
+            'bottom context 2',
+        ].join('\n');
+        const out = extractConflictWindows(content);
+        expect(out).toContain('<<<<<<< HEAD');
+        expect(out).toContain('=======');
+        expect(out).toContain('>>>>>>> branch');
+        expect(out).toContain('top context 1');
+        expect(out).toContain('bottom context 1');
+    });
+    it('surfaces conflicts that appear past the previous 4KB prefix cap', () => {
+        const filler = Array.from({ length: 200 }, (_, i) => `noise line ${i}`).join('\n');
+        const conflict = '<<<<<<< HEAD\nours\n=======\ntheirs\n>>>>>>> branch';
+        const content = `${filler}\n${conflict}\n${filler}`;
+        expect(content.length).toBeGreaterThan(4000);
+        const out = extractConflictWindows(content);
+        expect(out).toContain('<<<<<<< HEAD');
+        expect(out).toContain('>>>>>>> branch');
+    });
+    it('merges overlapping conflict windows instead of duplicating context', () => {
+        const lines = [];
+        for (let i = 0; i < 3; i++)
+            lines.push(`ctx ${i}`);
+        lines.push('<<<<<<< HEAD', 'a', '=======', 'b', '>>>>>>> branch');
+        lines.push('mid 1', 'mid 2');
+        lines.push('<<<<<<< HEAD', 'c', '=======', 'd', '>>>>>>> branch');
+        for (let i = 0; i < 3; i++)
+            lines.push(`tail ${i}`);
+        const out = extractConflictWindows(lines.join('\n'));
+        const startCount = (out.match(/<<<<<<< HEAD/g) ?? []).length;
+        expect(startCount).toBe(2);
+        // mid section between adjacent conflicts should appear exactly once (merged window)
+        expect((out.match(/mid 1/g) ?? []).length).toBe(1);
+    });
+});
+// Used by runner.ts to detect remaining conflict markers in resolved files.
+// Kept in sync with the regex literal there; this test guards the contract.
+const MARKER_RE = /^(<<<<<<<|=======|>>>>>>>)( |$)/m;
+describe('conflict marker regex (runner.ts)', () => {
+    it('matches all three marker variants on their own line', () => {
+        expect(MARKER_RE.test('foo\n<<<<<<< HEAD\nbar')).toBe(true);
+        expect(MARKER_RE.test('foo\n=======\nbar')).toBe(true);
+        expect(MARKER_RE.test('foo\n>>>>>>> branch\nbar')).toBe(true);
+    });
+    it('matches a marker line with no trailing label (end of line)', () => {
+        expect(MARKER_RE.test('foo\n<<<<<<<\nbar')).toBe(true);
+        expect(MARKER_RE.test('foo\n=======\nbar')).toBe(true);
+    });
+    it('does not match a Markdown setext-style separator inside docs', () => {
+        // "=======" is a legitimate H1 setext underline in Markdown; only flag when
+        // the resolver actually leaves a marker behind in the resolved file.
+        // The regex DOES match a bare "=======" line — the false-positive defense is
+        // that runner.ts scopes the check to originally-conflicted files, not the
+        // whole worktree. Verify the marker line itself still matches so the scope
+        // restriction is doing the real work.
+        expect(MARKER_RE.test('Heading\n=======\n')).toBe(true);
+    });
+    it('does not match conflict markers appearing mid-line (e.g. in URLs or strings)', () => {
+        expect(MARKER_RE.test('see https://example.com/<<<<<<<-pin')).toBe(false);
+        expect(MARKER_RE.test('const s = "=======middle"')).toBe(false);
+    });
+});
+describe('PROMPT_TEMPLATE side preference', () => {
+    // The runner does `git merge origin/<base>` while the PR's branch is checked
+    // out as HEAD, so the `<<<<<<< HEAD` side is the PR author's changes and the
+    // `>>>>>>>` side is the base branch. The prompt must default to preserving
+    // the PR author's intent — preferring `>>>>>>>` would silently discard the
+    // PR's conflicting changes in favor of base.
+    it('prefers the PR author\'s side (<<<<<<< HEAD) over the base branch (>>>>>>>)', () => {
+        expect(PROMPT_TEMPLATE).toMatch(/prefer the PR author's changes \(the `?<<<<<<< HEAD/i);
+        // Guard against regression — must not advise preferring the >>>>>>> side
+        expect(PROMPT_TEMPLATE).not.toMatch(/prefer the incoming branch changes \(the >>>>>>>/i);
+        expect(PROMPT_TEMPLATE).not.toMatch(/prefer the >>>>>>> side/i);
+    });
+    it('explains which side is which so the resolver does not invert the convention', () => {
+        expect(PROMPT_TEMPLATE).toMatch(/<<<<<<< HEAD.*PR/s);
+        expect(PROMPT_TEMPLATE).toMatch(/>>>>>>>.*base/s);
+    });
+});
+describe('parseResolverEdits', () => {
+    const wrap = (path, oldText, newText) => `<edit path="${path}">\n<old>\n${oldText}\n</old>\n<new>\n${newText}\n</new>\n</edit>`;
+    it('parses a well-formed edit block', () => {
+        const out = wrap('src/a.ts', 'old line', 'new line');
+        const edits = parseResolverEdits(out, ['src/a.ts']);
+        expect(edits).toEqual([{ filePath: 'src/a.ts', oldText: 'old line', newText: 'new line' }]);
+    });
+    it('drops edits whose path is not in the conflicted set', () => {
+        // Defense against a buggy or prompt-injected resolver emitting <edit> blocks
+        // for tracked files that were never in U state. Those would otherwise be
+        // written + staged and could carry unresolved markers into the commit.
+        const out = wrap('src/legit.ts', 'a', 'b') + wrap('src/sneaky.ts', 'c', 'd');
+        const edits = parseResolverEdits(out, ['src/legit.ts']);
+        expect(edits.map(e => e.filePath)).toEqual(['src/legit.ts']);
+    });
+    it('drops path-escape attempts', () => {
+        const out = wrap('../etc/passwd', 'a', 'b') + wrap('/etc/passwd', 'c', 'd');
+        expect(parseResolverEdits(out, ['../etc/passwd', '/etc/passwd'])).toEqual([]);
+    });
+    it('drops edits with an empty <old> block', () => {
+        const out = wrap('src/a.ts', '', 'new');
+        expect(parseResolverEdits(out, ['src/a.ts'])).toEqual([]);
+    });
+    it('skips edits missing <old> or <new> tags', () => {
+        const broken = '<edit path="src/a.ts"><old>only old</old></edit>';
+        expect(parseResolverEdits(broken, ['src/a.ts'])).toEqual([]);
+    });
+});
+//# sourceMappingURL=conflict-resolve.test.js.map

package/dist/__tests__/conflict-resolve.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-resolve.test.js","sourceRoot":"","sources":["../../src/__tests__/conflict-resolve.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAE9G,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACrE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,OAAO,GAAG;YACd,eAAe;YACf,eAAe;YACf,cAAc;YACd,MAAM;YACN,SAAS;YACT,QAAQ;YACR,gBAAgB;YAChB,kBAAkB;YAClB,kBAAkB;SACnB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACZ,MAAM,GAAG,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAA;QAC3C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;QACrC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QAChC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;QACvC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;QACtC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClF,MAAM,QAAQ,GAAG,qDAAqD,CAAA;QACtE,MAAM,OAAO,GAAG,GAAG,MAAM,KAAK,QAAQ,KAAK,MAAM,EAAE,CAAA;QACnD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAE5C,MAAM,GAAG,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAA;QAC3C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;QACrC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAClD,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAA;QACjE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC5B,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAA;QACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QACnD,MAAM,GAAG,GAAG,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACpD,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAA;QAC5D,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC1B,oFAAoF;QACpF,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,4EAA4E;AAC5E,4EAA4E;AAC5E,MAAM,SAAS,GAAG,kCAAkC,CAAA;AAEpD,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3D,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC/D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,4EAA4E;QAC5E,qEAAqE;QACrE,6EAA6E;QAC7E,0EAA0E;QAC1E,2EAA2E;QAC3E,sCAAsC;QACtC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8EAA8E,EAAE,GAAG,EAAE;QACtF,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACzE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACjE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,6EAA6E;IAC7E,6EAA6E;IAC7E,2EAA2E;IAC3E,2EAA2E;IAC3E,6CAA6C;IAC7C,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACrF,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,sDAAsD,CAAC,CAAA;QACvF,yEAAyE;QACzE,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,mDAAmD,CAAC,CAAA;QACxF,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAA;IACjE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACrF,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACpD,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,OAAe,EAAE,EAAE,CAC9D,eAAe,IAAI,cAAc,OAAO,oBAAoB,OAAO,mBAAmB,CAAA;IAExF,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;QACpD,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;QACnD,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,CAAA;IAC7F,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,6EAA6E;QAC7E,yEAAyE;QACzE,uEAAuE;QACvE,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QAC5E,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,CAAC,CAAA;QACvD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QAC3E,MAAM,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC/E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;QACvC,MAAM,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC3D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,kDAAkD,CAAA;QACjE,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/__tests__/detector.test.d.ts

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

package/dist/__tests__/detector.test.d.ts.map

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

package/dist/__tests__/detector.test.js

@@ -0,0 +1,108 @@
+import { describe, it, expect, vi } from 'vitest';
+import { detectOriginFromBody, detectOriginFromBranch, detectOriginFull, assignReviewer } from '../github/detector.js';
+import { ConfigSchema } from '../config/schema.js';
+function buildConfig(overrides = {}) {
+    return ConfigSchema.parse({
+        mode: 'cross-vendor',
+        vendors: { claude: { enabled: true }, codex: { enabled: true } },
+        ...overrides,
+    });
+}
+vi.mock('../github/client.js', () => ({
+    getPRCommits: vi.fn(async () => []),
+}));
+describe('detectOriginFromBody', () => {
+    it('detects claude origin from PR body footer', () => {
+        expect(detectOriginFromBody('Generated with [Claude Code]', buildConfig())).toBe('claude');
+    });
+    it('detects codex origin from PR body footer', () => {
+        expect(detectOriginFromBody('Generated with [OpenAI Codex]', buildConfig())).toBe('codex');
+    });
+    it('returns null when no pattern matches', () => {
+        expect(detectOriginFromBody('just a normal PR body', buildConfig())).toBeNull();
+    });
+});
+describe('detectOriginFromBranch', () => {
+    it('detects claude origin from claude/ branch prefix', () => {
+        expect(detectOriginFromBranch('claude/feat-foo', buildConfig())).toBe('claude');
+    });
+    it('detects codex origin from codex/ branch prefix', () => {
+        expect(detectOriginFromBranch('codex/feat-foo', buildConfig())).toBe('codex');
+    });
+    it('returns null when no prefix matches', () => {
+        expect(detectOriginFromBranch('feature/foo', buildConfig())).toBeNull();
+    });
+});
+describe('detectOriginFull — author_routes behavior', () => {
+    it('cross-vendor mode with both vendors enabled: bypasses author_routes', async () => {
+        const cfg = buildConfig({
+            mode: 'cross-vendor',
+            vendors: { claude: { enabled: true }, codex: { enabled: true } },
+            routing: { author_routes: { beingzy: 'claude' } },
+        });
+        const result = await detectOriginFull('', 'feature/foo', 'owner', 'repo', 1, cfg, 'token', 'beingzy');
+        expect(result.origin).toBe('human');
+        expect(result.method).toBe('author_routes_bypassed');
+    });
+    it('single-vendor mode: applies author_routes normally', async () => {
+        const cfg = buildConfig({
+            mode: 'single-vendor',
+            vendors: { claude: { enabled: true }, codex: { enabled: false } },
+            routing: { author_routes: { beingzy: 'claude' } },
+        });
+        const result = await detectOriginFull('', 'feature/foo', 'owner', 'repo', 1, cfg, 'token', 'beingzy');
+        expect(result.origin).toBe('claude');
+        expect(result.method).toBe('author_routes');
+    });
+    it('cross-vendor with only one vendor enabled: applies author_routes normally', async () => {
+        const cfg = buildConfig({
+            mode: 'cross-vendor',
+            vendors: { claude: { enabled: true }, codex: { enabled: false } },
+            routing: { author_routes: { beingzy: 'claude' } },
+        });
+        const result = await detectOriginFull('', 'feature/foo', 'owner', 'repo', 1, cfg, 'token', 'beingzy');
+        expect(result.origin).toBe('claude');
+        expect(result.method).toBe('author_routes');
+    });
+    it('cross-vendor with both enabled: attribution signals still win over author_routes', async () => {
+        const cfg = buildConfig({
+            mode: 'cross-vendor',
+            vendors: { claude: { enabled: true }, codex: { enabled: true } },
+            routing: { author_routes: { beingzy: 'claude' } },
+        });
+        const result = await detectOriginFull('', 'codex/feat', 'owner', 'repo', 1, cfg, 'token', 'beingzy');
+        expect(result.origin).toBe('codex');
+        expect(result.method).toBe('branch');
+    });
+    it('cross-vendor without author_routes: falls through to human', async () => {
+        const cfg = buildConfig({
+            mode: 'cross-vendor',
+            vendors: { claude: { enabled: true }, codex: { enabled: true } },
+            routing: { author_routes: {} },
+        });
+        const result = await detectOriginFull('', 'feature/foo', 'owner', 'repo', 1, cfg, 'token', 'beingzy');
+        expect(result.origin).toBe('human');
+        expect(result.method).toBe('none');
+    });
+});
+describe('assignReviewer', () => {
+    it('cross-vendor: claude origin → codex reviewer', async () => {
+        expect(await assignReviewer('claude', buildConfig())).toBe('codex');
+    });
+    it('cross-vendor: codex origin → claude reviewer', async () => {
+        expect(await assignReviewer('codex', buildConfig())).toBe('claude');
+    });
+    it('cross-vendor: explicit fallback_reviewer is honored for human origin', async () => {
+        const cfg = buildConfig({
+            routing: { fallback_reviewer: 'claude' },
+        });
+        expect(await assignReviewer('human', cfg)).toBe('claude');
+    });
+    it('cross-vendor: fallback_reviewer=null skips human-origin PRs', async () => {
+        const cfg = buildConfig({
+            routing: { fallback_reviewer: null },
+        });
+        expect(await assignReviewer('human', cfg)).toBeNull();
+    });
+});
+//# sourceMappingURL=detector.test.js.map

package/dist/__tests__/detector.test.js.map

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

package/dist/__tests__/onboard-preservation.test.js

@@ -3,7 +3,7 @@ import { mkdtempSync, rmSync, writeFileSync, readFileSync, existsSync } from 'fs
 import { join } from 'path';
 import { tmpdir } from 'os';
 import yaml from 'js-yaml';
-import { applyOnboardConfig, detectCurrentPreset } from '../commands/onboard.js';
+import { applyOnboardConfig, detectCurrentPreset, detectConflictResolveEnabled } from '../commands/onboard.js';
 import { mkdirSync } from 'fs';
 const BASE_DECISIONS = {
     deployment: 'personal',
@@ -14,6 +14,7 @@ const BASE_DECISIONS = {
     authorVendor: 'claude',
     qualityTier: 'balanced',
     pipelinePreset: 'review-only',
+    conflictResolve: false,
     tunnelBackend: 'localhost.run',
     smeeChannel: '',
     cloneProtocol: 'ssh',
@@ -437,4 +438,69 @@ describe('applyOnboardConfig — max_rounds in workflow.yml', () => {
         expect(raw.steps.find(s => s.type === 'recheck')?.instructions).toBe('custom recheck');
     });
 });
+describe('applyOnboardConfig — conflict-resolve', () => {
+    it('conflictResolve: true prepends conflict-resolve step as first step', () => {
+        const dir = join(workflowDir, 'cr-enabled');
+        applyOnboardConfig(configPath, { ...BASE_DECISIONS, pipelinePreset: 'review-fix', conflictResolve: true }, dir);
+        const raw = yaml.load(readFileSync(join(dir, 'workflow.yml'), 'utf8'));
+        expect(raw.steps[0].type).toBe('conflict-resolve');
+        expect(raw.steps).toHaveLength(3); // conflict-resolve + review + fix
+    });
+    it('conflictResolve: false does not add conflict-resolve step', () => {
+        const dir = join(workflowDir, 'cr-disabled');
+        applyOnboardConfig(configPath, { ...BASE_DECISIONS, pipelinePreset: 'review-fix', conflictResolve: false }, dir);
+        const raw = yaml.load(readFileSync(join(dir, 'workflow.yml'), 'utf8'));
+        expect(raw.steps.some(s => s.type === 'conflict-resolve')).toBe(false);
+        expect(raw.steps).toHaveLength(2);
+    });
+    it('enabling conflict-resolve on re-run regenerates workflow', () => {
+        const dir = join(workflowDir, 'cr-enable-rerun');
+        applyOnboardConfig(configPath, { ...BASE_DECISIONS, pipelinePreset: 'review-fix', conflictResolve: false }, dir);
+        applyOnboardConfig(configPath, { ...BASE_DECISIONS, pipelinePreset: 'review-fix', conflictResolve: true }, dir);
+        const raw = yaml.load(readFileSync(join(dir, 'workflow.yml'), 'utf8'));
+        expect(raw.steps[0].type).toBe('conflict-resolve');
+    });
+    it('disabling conflict-resolve on re-run regenerates workflow', () => {
+        const dir = join(workflowDir, 'cr-disable-rerun');
+        applyOnboardConfig(configPath, { ...BASE_DECISIONS, pipelinePreset: 'review-fix', conflictResolve: true }, dir);
+        applyOnboardConfig(configPath, { ...BASE_DECISIONS, pipelinePreset: 'review-fix', conflictResolve: false }, dir);
+        const raw = yaml.load(readFileSync(join(dir, 'workflow.yml'), 'utf8'));
+        expect(raw.steps.some(s => s.type === 'conflict-resolve')).toBe(false);
+    });
+    it('conflict-resolve has max_rounds: 3 and reviewer: origin', () => {
+        const dir = join(workflowDir, 'cr-config');
+        applyOnboardConfig(configPath, { ...BASE_DECISIONS, pipelinePreset: 'review-only', conflictResolve: true }, dir);
+        const raw = yaml.load(readFileSync(join(dir, 'workflow.yml'), 'utf8'));
+        const crStep = raw.steps.find(s => s.type === 'conflict-resolve');
+        expect(crStep?.max_rounds).toBe(3);
+        expect(crStep?.reviewer).toBe('origin');
+    });
+});
+describe('detectConflictResolveEnabled', () => {
+    function seedWorkflow(content) {
+        mkdirSync(workflowDir, { recursive: true });
+        writeFileSync(join(workflowDir, 'workflow.yml'), content);
+    }
+    it('returns false when no workflow file exists', () => {
+        expect(detectConflictResolveEnabled(workflowDir)).toBe(false);
+    });
+    it('returns false when workflow has no conflict-resolve step', () => {
+        seedWorkflow(yaml.dump({ on: ['opened'], steps: [{ name: 'review', type: 'review' }] }));
+        expect(detectConflictResolveEnabled(workflowDir)).toBe(false);
+    });
+    it('returns true when workflow has a conflict-resolve step', () => {
+        seedWorkflow(yaml.dump({
+            on: ['opened'],
+            steps: [
+                { name: 'conflict-resolve', type: 'conflict-resolve' },
+                { name: 'review', type: 'review' },
+            ],
+        }));
+        expect(detectConflictResolveEnabled(workflowDir)).toBe(true);
+    });
+    it('returns false for malformed workflow', () => {
+        seedWorkflow('not: valid: yaml: at all: [');
+        expect(detectConflictResolveEnabled(workflowDir)).toBe(false);
+    });
+});
 //# sourceMappingURL=onboard-preservation.test.js.map