threadlines 0.2.24 → 0.2.25

package/dist/git/diff.js

@@ -11,6 +11,7 @@ exports.getPRDiff = getPRDiff;
 exports.getCommitDiff = getCommitDiff;
 const simple_git_1 = __importDefault(require("simple-git"));
 const child_process_1 = require("child_process");
+const logger_1 = require("../utils/logger");
 // =============================================================================
 // CORE GIT OPERATIONS
 // These functions use raw git commands and work reliably across all CI environments.
@@ -146,13 +147,17 @@ async function getCommitAuthor(repoRoot, sha) {
  *
  * This is a shared implementation for CI environments that do shallow clones.
  * Uses three-dots logic (merge base) to show only the developer's changes,
- * avoiding drift from main moving forward.
+ * with graceful fallback to two dots for shallow clones.
  *
  * Strategy:
  * 1. Fetch target branch: origin/${targetBranch}:refs/remotes/origin/${targetBranch}
- * 2. Find merge base (common ancestor) using git merge-base (plumbing command)
- * 3. Fetch merge base commit (always fetch, assume not available)
- * 4. Diff: ${mergeBase}..HEAD (shows only developer's changes, not changes from main)
+ * 2. Try three dots: git diff origin/${targetBranch}...HEAD (merge base comparison)
+ *    - Shows only developer's changes (avoids drift from main moving forward)
+ *    - Works when we have enough history (full clones or GitHub's merge commits)
+ * 3. Fallback to two dots: git diff origin/${targetBranch}..HEAD (direct comparison)
+ *    - Used when shallow clone prevents merge base calculation
+ *    - May include drift from main, but provides working diff instead of crashing
+ *    - Warning is logged to inform user of potential drift
  *
  * Why three dots (merge base) instead of two dots (direct comparison)?
  * - Two dots: Shows all differences between target branch tip and HEAD
@@ -186,43 +191,34 @@ async function getPRDiff(repoRoot, targetBranch, logger) {
             `This is required for PR/MR diff comparison. ` +
             `Error: ${fetchError instanceof Error ? fetchError.message : 'Unknown error'}`);
     }
-    // Find merge base (common ancestor) using plumbing command
-    // Three dots logic: compare against merge base to show only developer's changes
-    // This avoids drift from main moving forward (two dots would include those changes)
-    let mergeBase;
+    // Try three dots (merge base) first - shows only developer's changes
+    // Falls back to two dots (direct comparison) if shallow clone prevents merge base calculation
+    let diff;
+    let changedFiles;
     try {
-        mergeBase = (0, child_process_1.execSync)(`git merge-base origin/${targetBranch} HEAD`, {
-            encoding: 'utf-8',
-            cwd: repoRoot
-        }).trim();
-        if (!mergeBase || mergeBase.length !== 40) {
-            throw new Error(`Invalid merge base SHA: "${mergeBase}"`);
-        }
+        // Step 1: Try the "Perfect" Diff (Three Dots)
+        // This isolates developer changes by comparing against merge base
+        // Works when we have enough history (full clones or GitHub's merge commits)
+        logger?.debug(`Attempting three-dots diff (merge base): origin/${targetBranch}...HEAD`);
+        diff = await git.diff([`origin/${targetBranch}...HEAD`, '-U200']);
+        const diffSummary = await git.diffSummary([`origin/${targetBranch}...HEAD`]);
+        changedFiles = diffSummary.files.map(f => f.file);
     }
     catch (error) {
+        // Step 2: Fallback to "Risky" Diff (Two Dots)
+        // If three dots fails, it means we're in a shallow clone without enough history
+        // We accept the "two dot" risk (may include drift from main) rather than crashing
         const errorMessage = error instanceof Error ? error.message : String(error);
-        throw new Error(`Failed to find merge base between origin/${targetBranch} and HEAD. ` +
-            `This is required to show only the developer's changes (avoids drift from main). ` +
-            `Error: ${errorMessage}`);
-    }
-    // Always fetch merge base (assume it's not available, fetch is fast/no-op if it is)
-    // This ensures we have the merge base available for diff comparison
-    logger?.debug(`Fetching merge base: ${mergeBase}`);
-    try {
-        await git.fetch(['origin', mergeBase, '--depth=1']);
-    }
-    catch (fetchError) {
-        throw new Error(`Failed to fetch merge base ${mergeBase} from origin. ` +
-            `This is required for PR/MR diff comparison in shallow clones. ` +
-            `Ensure 'origin' remote is configured and accessible. ` +
-            `Error: ${fetchError instanceof Error ? fetchError.message : 'Unknown error'}`);
+        logger_1.logger.warn(`Shallow clone detected: Cannot calculate merge base. ` +
+            `Diff may include unrelated changes from ${targetBranch} that occurred after branching. ` +
+            `Using direct comparison (two dots) as fallback.`);
+        logger?.debug(`Fallback error: ${errorMessage}`);
+        // Use two dots (direct comparison) - shows all differences between tips
+        logger?.debug(`Using two-dots diff (direct comparison): origin/${targetBranch}..HEAD`);
+        diff = await git.diff([`origin/${targetBranch}..HEAD`, '-U200']);
+        const diffSummary = await git.diffSummary([`origin/${targetBranch}..HEAD`]);
+        changedFiles = diffSummary.files.map(f => f.file);
     }
-    // Use merge base for diff (three dots logic: shows only developer's changes)
-    // git diff is plumbing command, ignores shallow boundaries
-    logger?.debug(`Comparing ${mergeBase}..HEAD (merge base vs PR branch)`);
-    const diff = await git.diff([`${mergeBase}..HEAD`, '-U200']);
-    const diffSummary = await git.diffSummary([`${mergeBase}..HEAD`]);
-    const changedFiles = diffSummary.files.map(f => f.file);
     return {
         diff: diff || '',
         changedFiles

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "threadlines",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "description": "Threadlines CLI - AI-powered linter based on your natural language documentation",
   "main": "dist/index.js",
   "bin": {