@humanbased/crosscheck 0.14.0

package/dist/reviewers/conflict-resolve.js

@@ -0,0 +1,219 @@
+import { execSync } from 'child_process';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import { execa } from 'execa';
+import { applyEdit } from './fix.js';
+// Exported so tests can verify the prompt's side-preference guidance stays in
+// sync with the merge direction in runner.ts (origin/<base> is merged into HEAD,
+// so HEAD is the PR side and the `>>>>>>>` side is the base branch).
+export 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}
+
+Context: the PR's branch is checked out as HEAD, and the base branch was merged into it. That means the \`<<<<<<< HEAD\` side is the PR author's intended changes and the \`>>>>>>>\` side is the base branch. Default to preserving the PR author's intent.
+
+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 PR author's changes (the \`<<<<<<< HEAD\` side) over the base branch (the \`>>>>>>>\` side), unless the PR side clearly breaks existing logic on the base
+- 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 [];
+    }
+}
+// Extract every conflict region in a file with a few context lines on each side.
+// Slicing from the file prefix instead would hide conflicts that appear past the
+// budget, so the resolver couldn't produce a matching <old> block.
+const CONTEXT_LINES = 6;
+const PER_FILE_MAX = 12_000;
+export function extractConflictWindows(content) {
+    const lines = content.split('\n');
+    const starts = [];
+    for (let i = 0; i < lines.length; i++) {
+        if (lines[i].startsWith('<<<<<<<'))
+            starts.push(i);
+    }
+    if (starts.length === 0)
+        return '';
+    const ranges = [];
+    for (const start of starts) {
+        let end = start;
+        for (let i = start; i < lines.length; i++) {
+            if (lines[i].startsWith('>>>>>>>')) {
+                end = i;
+                break;
+            }
+            end = i;
+        }
+        const from = Math.max(0, start - CONTEXT_LINES);
+        const to = Math.min(lines.length - 1, end + CONTEXT_LINES);
+        const prev = ranges[ranges.length - 1];
+        if (prev && from <= prev[1] + 1) {
+            prev[1] = Math.max(prev[1], to);
+        }
+        else {
+            ranges.push([from, to]);
+        }
+    }
+    const chunks = [];
+    let total = 0;
+    for (const [from, to] of ranges) {
+        const block = lines.slice(from, to + 1).join('\n');
+        const header = `... lines ${from + 1}-${to + 1} ...`;
+        const piece = `${header}\n${block}`;
+        if (total + piece.length > PER_FILE_MAX) {
+            chunks.push('... (remaining conflict regions truncated)');
+            break;
+        }
+        chunks.push(piece);
+        total += piece.length;
+    }
+    return chunks.join('\n\n');
+}
+function buildConflictedFilesBlock(tmpDir, filePaths) {
+    return filePaths.map(f => {
+        try {
+            const content = readFileSync(join(tmpDir, f), 'utf8');
+            const windowed = extractConflictWindows(content);
+            // No textual conflict markers (binary / modify-delete) — surface the file by name only.
+            if (!windowed) {
+                return `### ${f}\n(no textual conflict markers — likely a non-text conflict; skip)`;
+            }
+            return `### ${f}\n\`\`\`\n${windowed}\n\`\`\``;
+        }
+        catch {
+            return `### ${f}\n(could not read file)`;
+        }
+    }).join('\n\n');
+}
+export async function runConflictResolveStep(tmpDir, prTitle, instructions, model = 'default') {
+    const conflictedFiles = findConflictedFiles(tmpDir);
+    if (conflictedFiles.length === 0)
+        return { appliedCount: 0, resolvedPaths: [] };
+    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 modelArgs = model !== 'default' ? ['--model', model] : [];
+        const { stdout } = await execa('claude', ['--print', '--output-format', 'json', ...modelArgs], {
+            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, resolvedPaths: [], tokensUsed };
+    const fileEdits = new Map();
+    const fileCache = new Map();
+    for (const { filePath, oldText, newText } of parseResolverEdits(output, conflictedFiles)) {
+        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;
+            }
+        }
+        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');
+    let appliedCount = 0;
+    const resolvedPaths = [];
+    for (const [filePath, content] of fileEdits) {
+        const absPath = join(tmpDir, filePath);
+        try {
+            mkdirSync(dirname(absPath), { recursive: true });
+            writeFileSync(absPath, content);
+            appliedCount++;
+            resolvedPaths.push(filePath);
+        }
+        catch { /* skip unwritable paths */ }
+    }
+    return { appliedCount, resolvedPaths, tokensUsed };
+}
+// Parses <edit path="…"><old>…</old><new>…</new></edit> blocks from resolver output.
+// Filters out anything that escapes tmpDir (`..`, absolute paths) or targets a file
+// that wasn't in the original unmerged set — the resolver must only touch the files
+// it was asked about, otherwise a buggy or prompt-injected response could land
+// arbitrary content (including unresolved markers) in unrelated tracked files.
+export function parseResolverEdits(output, conflictedFiles) {
+    const conflictedSet = new Set(conflictedFiles);
+    const edits = [];
+    const editRegex = /<edit path="([^"]+)">([\s\S]*?)<\/edit>/g;
+    let match;
+    while ((match = editRegex.exec(output)) !== null) {
+        const [, filePath, body] = match;
+        if (filePath.includes('..') || filePath.startsWith('/'))
+            continue;
+        if (!conflictedSet.has(filePath))
+            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$/, '');
+        if (oldText === '')
+            continue;
+        edits.push({ filePath, oldText, newText });
+    }
+    return edits;
+}
+//# 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/dist/reviewers/fix.d.ts

@@ -0,0 +1,7 @@
+import type { Config } from '../config/schema.js';
+export declare function applyEdit(fileContent: string, oldText: string, newText: string): string | null;
+export declare function runFixStep(tmpDir: string, baseRef: string, prTitle: string, reviewComment: string, instructions: string, config: Config, model?: string): Promise<{
+    appliedCount: number;
+    tokensUsed?: number;
+}>;
+//# sourceMappingURL=fix.d.ts.map

package/dist/reviewers/fix.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fix.d.ts","sourceRoot":"","sources":["../../src/reviewers/fix.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AA4DjD,wBAAgB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO9F;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,SAAY,GAChB,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkIxD"}

package/dist/reviewers/fix.js

@@ -0,0 +1,197 @@
+import { execSync } from 'child_process';
+import { mkdirSync, readFileSync, writeFileSync } from 'fs';
+import { dirname, join } from 'path';
+import { execa } from 'execa';
+// Minimum ratio of new lines to original lines before we reject a full-file write.
+// Guards against Claude silently truncating large files.
+const MIN_SIZE_RATIO = 0.6;
+const PROMPT_TEMPLATE = `You opened a pull request that received the following code review.
+
+PR title: {PR_TITLE}
+
+Code review comment:
+---
+{REVIEW_COMMENT}
+---
+
+Diff of your changes (base..head):
+---
+{DIFF}
+---
+
+{EXTRA_INSTRUCTIONS}
+
+Please address the issues raised in the review. Rules:
+- Only fix what the review explicitly calls out
+- Do not refactor unrelated code, rename variables, or add tests unless asked
+- If a comment requires deeper understanding of business logic, skip it
+- If the review has no actionable code changes, output exactly: NO_CHANGES
+
+For each file you need to change, output ONLY the edited sections using this format:
+
+<edit path="relative/path/to/file.ext">
+<old>
+exact lines from the file that need to be replaced (copy verbatim — must match exactly)
+</old>
+<new>
+replacement lines
+</new>
+</edit>
+
+Rules for <edit> blocks:
+- <old> must match the file content EXACTLY (whitespace, indentation, line endings)
+- Include enough surrounding context lines (2–3) so the match is unambiguous
+- One <edit> block per contiguous change; multiple blocks per file are fine
+- Never output the entire file — only the sections that change
+- If a file needs a new section appended, use an <old> that matches the last few lines before the insertion point
+- To create a brand-new file, leave <old> empty and put the complete file content in <new>
+
+Output ONLY <edit> blocks or NO_CHANGES. No other text.`;
+function isSafePath(filePath) {
+    return !filePath.includes('..') && !filePath.startsWith('/');
+}
+// Apply a single edit: find <old> in fileContent and replace with <new>.
+// Returns null if the old text is not found or appears more than once (ambiguous).
+export function applyEdit(fileContent, oldText, newText) {
+    const idx = fileContent.indexOf(oldText);
+    if (idx === -1)
+        return null;
+    // Reject ambiguous matches — if the snippet appears more than once, indexOf and
+    // lastIndexOf disagree, so we can't know which occurrence Claude intended to edit.
+    if (fileContent.lastIndexOf(oldText) !== idx)
+        return null;
+    return fileContent.slice(0, idx) + newText + fileContent.slice(idx + oldText.length);
+}
+export async function runFixStep(tmpDir, baseRef, prTitle, reviewComment, instructions, config, model = 'default') {
+    let diff = '';
+    try {
+        diff = execSync(`git diff origin/${baseRef}...HEAD`, { cwd: tmpDir, encoding: 'utf8' });
+    }
+    catch {
+        try {
+            diff = execSync('git diff HEAD~1', { cwd: tmpDir, encoding: 'utf8' });
+        }
+        catch { /* proceed with empty diff */ }
+    }
+    const prompt = PROMPT_TEMPLATE
+        .replace('{PR_TITLE}', prTitle)
+        .replace('{REVIEW_COMMENT}', reviewComment.slice(0, 8000))
+        .replace('{DIFF}', diff.slice(0, 16000))
+        .replace('{EXTRA_INSTRUCTIONS}', instructions ? `Additional instructions: ${instructions}` : '');
+    let output = '';
+    let tokensUsed;
+    try {
+        const modelArgs = model !== 'default' ? ['--model', model] : [];
+        const { stdout } = await execa('claude', ['--print', '--output-format', 'json', ...modelArgs], {
+            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 fix step — run: claude auth login');
+        }
+        throw err;
+    }
+    if (!output || output === 'NO_CHANGES')
+        return { appliedCount: 0, tokensUsed };
+    let appliedCount = 0;
+    // Primary: apply <edit path="..."><old>...</old><new>...</new></edit> blocks.
+    // This format only outputs changed sections — structurally prevents truncation.
+    const editRegex = /<edit path="([^"]+)">([\s\S]*?)<\/edit>/g;
+    const fileEdits = new Map(); // files with ≥1 successful edit
+    const fileCache = new Map(); // raw disk reads; never written directly
+    let match;
+    while ((match = editRegex.exec(output)) !== null) {
+        const [, filePath, body] = match;
+        if (!isSafePath(filePath))
+            continue;
+        const oldMatch = body.match(/<old>([\s\S]*?)<\/old>/);
+        const newMatch = body.match(/<new>([\s\S]*?)<\/new>/);
+        if (!oldMatch || !newMatch)
+            continue;
+        // Strip exactly one leading/trailing newline added by the XML-style tags
+        const oldText = oldMatch[1].replace(/^\n/, '').replace(/\n$/, '');
+        const newText = newMatch[1].replace(/^\n/, '').replace(/\n$/, '');
+        const absPath = join(tmpDir, filePath);
+        // fileCache holds disk reads; fileEdits holds files that have at least one
+        // successful edit applied. Keeping them separate prevents a failed <old> match
+        // from adding the unchanged file to fileEdits and inflating appliedCount.
+        let current = fileEdits.get(filePath) ?? fileCache.get(filePath);
+        const alreadyKnown = current !== undefined;
+        if (!alreadyKnown) {
+            try {
+                current = readFileSync(absPath, 'utf8');
+                fileCache.set(filePath, current);
+            }
+            catch {
+                // File doesn't exist on disk — allow new-file creation only when <old> is empty.
+                // Any non-empty <old> is meaningless against a non-existent file.
+                if (oldText !== '')
+                    continue;
+                fileEdits.set(filePath, newText);
+                continue;
+            }
+        }
+        // Guard: empty <old> on an existing file is ambiguous — indexOf('') = 0 would
+        // silently prepend <new> at the top of the file instead of anchoring to content.
+        if (oldText === '')
+            continue;
+        const updated = applyEdit(current, oldText, newText);
+        if (updated === null)
+            continue; // <old> not found — skip this edit safely
+        fileEdits.set(filePath, updated);
+    }
+    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 */ }
+    }
+    // Fallback: <file path="...">complete content</file> blocks, with size guard.
+    // These are only accepted when the new content is >= MIN_SIZE_RATIO of the original,
+    // preventing silent truncation of large files.
+    if (appliedCount === 0) {
+        const fileRegex = /<file path="([^"]+)">([\s\S]*?)<\/file>/g;
+        while ((match = fileRegex.exec(output)) !== null) {
+            const [, filePath, rawContent] = match;
+            if (!isSafePath(filePath))
+                continue;
+            const absPath = join(tmpDir, filePath);
+            const newContent = rawContent.replace(/^\n/, '');
+            try {
+                let originalLineCount = 0;
+                try {
+                    originalLineCount = readFileSync(absPath, 'utf8').split('\n').length;
+                }
+                catch { /* new file — no size guard needed */ }
+                if (originalLineCount > 0) {
+                    const newLineCount = newContent.split('\n').length;
+                    if (newLineCount < originalLineCount * MIN_SIZE_RATIO)
+                        continue; // reject — likely truncated
+                }
+                writeFileSync(absPath, newContent);
+                appliedCount++;
+            }
+            catch { /* skip unwritable paths */ }
+        }
+    }
+    return { appliedCount, tokensUsed };
+}
+//# sourceMappingURL=fix.js.map

package/dist/reviewers/fix.js.map

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