@motivation-labs/crosscheck 0.13.0-beta.13 → 0.13.0-beta.18

package/dist/reviewers/conflict-resolve.js

@@ -0,0 +1,142 @@
+import { execSync } from 'child_process';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import { execa } from 'execa';
+import { applyEdit } from './fix.js';
+const PROMPT_TEMPLATE = `This pull request has merge conflicts. Resolve all conflict markers in the files listed below.
+
+PR title: {PR_TITLE}
+
+Conflicted files:
+{CONFLICTED_FILES}
+
+{EXTRA_INSTRUCTIONS}
+
+Rules for resolving each conflict:
+- Keep ALL meaningful changes from both sides if they are not directly contradictory
+- When both sides modify the same line, prefer the incoming branch changes (the >>>>>>> side) unless they clearly break existing logic
+- Remove ALL conflict markers: <<<<<<<, =======, >>>>>>>
+
+For each file, output ONLY the resolved conflict regions using this format:
+
+<edit path="relative/path/to/file.ext">
+<old>
+exact conflict region including all markers (copy verbatim from the file)
+</old>
+<new>
+resolved content with no conflict markers
+</new>
+</edit>
+
+Rules for <edit> blocks:
+- <old> must match the file content EXACTLY, including conflict markers and surrounding lines
+- <new> must not contain ANY conflict markers
+- Include 2–3 context lines around the conflict region to make the match unambiguous
+- One block per conflict region; multiple blocks per file are fine
+- Output ONLY <edit> blocks. No other text.`;
+// Returns file paths that have unmerged conflict markers (git status: UU/AA/DD).
+export function findConflictedFiles(tmpDir) {
+    try {
+        const out = execSync('git diff --name-only --diff-filter=U', { cwd: tmpDir, encoding: 'utf8' });
+        return out.trim().split('\n').filter(Boolean);
+    }
+    catch {
+        return [];
+    }
+}
+function buildConflictedFilesBlock(tmpDir, filePaths) {
+    return filePaths.map(f => {
+        try {
+            const content = readFileSync(join(tmpDir, f), 'utf8').slice(0, 4000);
+            return `### ${f}\n\`\`\`\n${content}\n\`\`\``;
+        }
+        catch {
+            return `### ${f}\n(could not read file)`;
+        }
+    }).join('\n\n');
+}
+export async function runConflictResolveStep(tmpDir, prTitle, instructions) {
+    const conflictedFiles = findConflictedFiles(tmpDir);
+    if (conflictedFiles.length === 0)
+        return { appliedCount: 0 };
+    const filesBlock = buildConflictedFilesBlock(tmpDir, conflictedFiles);
+    const prompt = PROMPT_TEMPLATE
+        .replace('{PR_TITLE}', prTitle)
+        .replace('{CONFLICTED_FILES}', filesBlock)
+        .replace('{EXTRA_INSTRUCTIONS}', instructions ? `Additional instructions: ${instructions}` : '');
+    let output = '';
+    let tokensUsed;
+    try {
+        const { stdout } = await execa('claude', ['--print', '--output-format', 'json'], {
+            input: prompt,
+            timeout: 180_000,
+            env: { ...process.env },
+        });
+        const raw = stdout.trim();
+        try {
+            const parsed = JSON.parse(raw);
+            output = typeof parsed.result === 'string' ? parsed.result : raw;
+            const inTok = parsed.usage?.input_tokens;
+            const outTok = parsed.usage?.output_tokens;
+            tokensUsed = typeof inTok === 'number' && typeof outTok === 'number' ? inTok + outTok : undefined;
+        }
+        catch {
+            output = raw;
+        }
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        if (/not logged in|auth|credential/i.test(msg)) {
+            throw new Error('claude auth failure during conflict-resolve step — run: claude auth login');
+        }
+        throw err;
+    }
+    if (!output || output === 'NO_CHANGES')
+        return { appliedCount: 0, tokensUsed };
+    let appliedCount = 0;
+    const editRegex = /<edit path="([^"]+)">([\s\S]*?)<\/edit>/g;
+    const fileEdits = new Map();
+    const fileCache = new Map();
+    let match;
+    while ((match = editRegex.exec(output)) !== null) {
+        const [, filePath, body] = match;
+        if (filePath.includes('..') || filePath.startsWith('/'))
+            continue;
+        const oldMatch = body.match(/<old>([\s\S]*?)<\/old>/);
+        const newMatch = body.match(/<new>([\s\S]*?)<\/new>/);
+        if (!oldMatch || !newMatch)
+            continue;
+        const oldText = oldMatch[1].replace(/^\n/, '').replace(/\n$/, '');
+        const newText = newMatch[1].replace(/^\n/, '').replace(/\n$/, '');
+        const absPath = join(tmpDir, filePath);
+        let current = fileEdits.get(filePath) ?? fileCache.get(filePath);
+        if (current === undefined) {
+            try {
+                current = readFileSync(absPath, 'utf8');
+                fileCache.set(filePath, current);
+            }
+            catch {
+                continue;
+            }
+        }
+        if (oldText === '')
+            continue;
+        const updated = applyEdit(current, oldText, newText);
+        if (updated === null)
+            continue;
+        fileEdits.set(filePath, updated);
+    }
+    const { writeFileSync, mkdirSync } = await import('fs');
+    const { dirname } = await import('path');
+    for (const [filePath, content] of fileEdits) {
+        const absPath = join(tmpDir, filePath);
+        try {
+            mkdirSync(dirname(absPath), { recursive: true });
+            writeFileSync(absPath, content);
+            appliedCount++;
+        }
+        catch { /* skip unwritable paths */ }
+    }
+    return { appliedCount, tokensUsed };
+}
+//# sourceMappingURL=conflict-resolve.js.map

package/dist/reviewers/conflict-resolve.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@motivation-labs/crosscheck",
-  "version": "0.13.0-beta.13",
+  "version": "0.13.0-beta.18",
   "description": "Cross-vendor AI code review orchestrator — Claude Code ↔ Codex",
   "bin": {
     "crosscheck": "dist/cli.js",