threadlines 0.2.14 → 0.2.15

package/dist/git/bitbucket.js

@@ -23,7 +23,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBitbucketContext = getBitbucketContext;
 const simple_git_1 = __importDefault(require("simple-git"));
-const child_process_1 = require("child_process");
 const diff_1 = require("./diff");
 const logger_1 = require("../utils/logger");
 /**
@@ -43,8 +42,9 @@ async function getBitbucketContext(repoRoot) {
     const context = detectContext();
     const reviewContext = detectReviewContext();
     const commitSha = getCommitSha();
-    // Get commit author (from git log - Bitbucket doesn't provide this as env var)
-    const commitAuthor = await getCommitAuthor(repoRoot);
+    // Get commit author using shared function (git log)
+    // getCommitAuthor throws on failure with descriptive error
+    const commitAuthor = await (0, diff_1.getCommitAuthor)(repoRoot);
     // Get commit message if we have a SHA
     let commitMessage;
     if (commitSha) {
@@ -172,32 +172,3 @@ function detectReviewContext() {
 function getCommitSha() {
     return process.env.BITBUCKET_COMMIT;
 }
-/**
- * Gets commit author for Bitbucket Pipelines
- *
- * Bitbucket doesn't provide commit author as an environment variable,
- * so we use git log to get it.
- *
- * This approach is verified by our test script (test-bitbucket-context.ts)
- * which successfully retrieves commit author in all scenarios:
- * - Direct commit to main
- * - Feature branch push
- * - PR pipeline
- * - Merge commit
- */
-async function getCommitAuthor(repoRoot) {
-    // Use raw git commands - this is exactly what the test script uses and we know it works
-    try {
-        const name = (0, child_process_1.execSync)('git log -1 --format=%an', { encoding: 'utf-8', cwd: repoRoot }).trim();
-        const email = (0, child_process_1.execSync)('git log -1 --format=%ae', { encoding: 'utf-8', cwd: repoRoot }).trim();
-        if (!name || !email) {
-            throw new Error('git log returned empty name or email');
-        }
-        return { name, email };
-    }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-        throw new Error(`Bitbucket Pipelines: Failed to get commit author from git log. ` +
-            `Error: ${errorMessage}`);
-    }
-}

package/dist/git/diff.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommitMessage = getCommitMessage;
 exports.getCommitAuthor = getCommitAuthor;
+exports.getPRDiff = getPRDiff;
 exports.getCommitDiff = getCommitDiff;
 const simple_git_1 = __importDefault(require("simple-git"));
 const child_process_1 = require("child_process");
@@ -29,31 +30,92 @@ async function getCommitMessage(repoRoot, sha) {
  *
  * Uses raw git log command to extract author information.
  * Works in all environments where git is available.
+ *
+ * Throws on error - git commits always have authors, so failure indicates
+ * an invalid SHA or repository issue that should surface immediately.
+ *
+ * Used by: GitHub, GitLab, Bitbucket, Vercel, Local (all CI environments)
  */
 async function getCommitAuthor(repoRoot, sha) {
+    const commitRef = sha || 'HEAD';
+    let output;
     try {
         // Use raw git command (same as test scripts) - more reliable than simple-git API
-        const commitRef = sha || 'HEAD';
         const command = `git log -1 --format="%an <%ae>" ${commitRef}`;
-        const output = (0, child_process_1.execSync)(command, {
+        output = (0, child_process_1.execSync)(command, {
             encoding: 'utf-8',
             cwd: repoRoot
         }).trim();
-        // Parse output: "Name <email>"
-        const match = output.match(/^(.+?)\s*<(.+?)>$/);
-        if (!match) {
-            return null;
-        }
-        const name = match[1].trim();
-        const email = match[2].trim();
-        if (!name || !email) {
-            return null;
-        }
-        return { name, email };
     }
-    catch {
-        return null;
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Failed to get commit author for ${commitRef}: ${message}`);
+    }
+    // Parse output: "Name <email>"
+    const match = output.match(/^(.+?)\s*<(.+?)>$/);
+    if (!match) {
+        throw new Error(`Failed to parse commit author for ${commitRef}. ` +
+            `Expected format "Name <email>", got: "${output}"`);
+    }
+    const name = match[1].trim();
+    const email = match[2].trim();
+    if (!name || !email) {
+        throw new Error(`Commit author for ${commitRef} has empty name or email. ` +
+            `Got name="${name}", email="${email}"`);
+    }
+    return { name, email };
+}
+/**
+ * Get diff for a PR/MR context in CI environments.
+ *
+ * This is a shared implementation for CI environments that do shallow clones.
+ * It fetches the target branch on-demand and compares it against HEAD.
+ *
+ * Strategy:
+ * 1. Fetch target branch: origin/${targetBranch}:refs/remotes/origin/${targetBranch}
+ * 2. Diff: origin/${targetBranch}..HEAD (two dots = direct comparison)
+ *
+ * Why HEAD instead of origin/${sourceBranch}?
+ * - CI shallow clones only have HEAD available by default
+ * - origin/${sourceBranch} doesn't exist until explicitly fetched
+ * - HEAD IS the source branch in PR/MR pipelines
+ *
+ * Currently used by:
+ * - GitLab CI (gitlab.ts)
+ *
+ * Future plan:
+ * - Azure DevOps will use this when added
+ * - Once proven stable in multiple environments, consider migrating
+ *   GitHub (github.ts) and Bitbucket (bitbucket.ts) to use this shared
+ *   implementation instead of their inline versions.
+ *
+ * @param repoRoot - Path to the repository root
+ * @param targetBranch - The branch being merged INTO (e.g., "main", "develop")
+ * @param logger - Optional logger for debug output
+ */
+async function getPRDiff(repoRoot, targetBranch, logger) {
+    const git = (0, simple_git_1.default)(repoRoot);
+    // Fetch target branch on-demand (works with shallow clones)
+    logger?.debug(`Fetching target branch: origin/${targetBranch}`);
+    try {
+        await git.fetch(['origin', `${targetBranch}:refs/remotes/origin/${targetBranch}`, '--depth=1']);
+    }
+    catch (fetchError) {
+        throw new Error(`Failed to fetch target branch origin/${targetBranch}. ` +
+            `This is required for PR/MR diff comparison. ` +
+            `Error: ${fetchError instanceof Error ? fetchError.message : 'Unknown error'}`);
     }
+    // Use two dots (..) for direct comparison (same as GitHub)
+    // Two dots: shows all changes in HEAD that aren't in origin/${targetBranch}
+    // Three dots: requires finding merge base which can fail with shallow clones
+    logger?.debug(`Comparing origin/${targetBranch}..HEAD`);
+    const diff = await git.diff([`origin/${targetBranch}..HEAD`, '-U200']);
+    const diffSummary = await git.diffSummary([`origin/${targetBranch}..HEAD`]);
+    const changedFiles = diffSummary.files.map(f => f.file);
+    return {
+        diff: diff || '',
+        changedFiles
+    };
 }
 /**
  * Get diff for a specific commit

package/dist/git/github.js

@@ -43,6 +43,7 @@ async function getGitHubContext(repoRoot) {
             'This should be automatically provided by GitHub Actions.');
     }
     // Get commit author using git commands (same approach as Bitbucket/Local)
+    // getCommitAuthor throws on failure with descriptive error
     const commitAuthor = await (0, diff_1.getCommitAuthor)(repoRoot, commitSha);
     // Get commit message if we have a SHA
     let commitMessage;
@@ -54,11 +55,6 @@ async function getGitHubContext(repoRoot) {
     }
     // Get PR title if in PR context
     const prTitle = getPRTitle(context);
-    // Validate commit author was found
-    if (!commitAuthor) {
-        throw new Error(`GitHub Actions: Failed to get commit author from git log for commit ${commitSha || 'HEAD'}. ` +
-            'This should be automatically available in the git repository.');
-    }
     return {
         diff,
         repoName,

package/dist/git/gitlab.js

@@ -37,8 +37,9 @@ async function getGitLabContext(repoRoot) {
     const context = detectContext();
     const reviewContext = detectReviewContext();
     const commitSha = getCommitSha(context);
-    // Get commit author (fails loudly if unavailable)
-    const commitAuthor = await getCommitAuthor();
+    // Get commit author using shared function (git log)
+    // getCommitAuthor throws on failure with descriptive error
+    const commitAuthor = await (0, diff_1.getCommitAuthor)(repoRoot);
     // Get commit message if we have a SHA
     let commitMessage;
     if (commitSha) {
@@ -65,7 +66,7 @@ async function getGitLabContext(repoRoot) {
  * Get diff for GitLab CI environment
  *
  * Strategy:
- * - MR context: Fetch target branch, compare source vs target (full MR diff)
+ * - MR context: Uses shared getPRDiff() - fetches target branch, compares against HEAD
  * - Any push (main or feature branch): Compare last commit only (HEAD~1...HEAD)
  *
  * Note: GitLab CI does a shallow clone, so we fetch the target branch for MR context.
@@ -75,20 +76,13 @@ async function getDiff(repoRoot) {
     const git = (0, simple_git_1.default)(repoRoot);
     const mrIid = process.env.CI_MERGE_REQUEST_IID;
     const targetBranch = process.env.CI_MERGE_REQUEST_TARGET_BRANCH_NAME;
-    const sourceBranch = process.env.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME;
-    // MR Context: Fetch target branch and compare
+    // MR Context: Use shared getPRDiff() implementation
     if (mrIid) {
-        if (!targetBranch || !sourceBranch) {
-            throw new Error('GitLab MR context detected but CI_MERGE_REQUEST_TARGET_BRANCH_NAME or ' +
-                'CI_MERGE_REQUEST_SOURCE_BRANCH_NAME is missing. ' +
+        if (!targetBranch) {
+            throw new Error('GitLab MR context detected but CI_MERGE_REQUEST_TARGET_BRANCH_NAME is missing. ' +
                 'This should be automatically provided by GitLab CI.');
         }
-        logger_1.logger.debug(`Fetching target branch: origin/${targetBranch}`);
-        await git.fetch(['origin', `${targetBranch}:refs/remotes/origin/${targetBranch}`, '--depth=1']);
-        const diff = await git.diff([`origin/${targetBranch}...origin/${sourceBranch}`, '-U200']);
-        const diffSummary = await git.diffSummary([`origin/${targetBranch}...origin/${sourceBranch}`]);
-        const changedFiles = diffSummary.files.map(f => f.file);
-        return { diff: diff || '', changedFiles };
+        return (0, diff_1.getPRDiff)(repoRoot, targetBranch, logger_1.logger);
     }
     // Any push (main or feature branch): Review last commit only
     const diff = await git.diff(['HEAD~1...HEAD', '-U200']);
@@ -173,28 +167,6 @@ function getCommitSha(context) {
     }
     return undefined;
 }
-/**
- * Gets commit author for GitLab CI
- * Uses CI_COMMIT_AUTHOR environment variable (most reliable)
- */
-async function getCommitAuthor() {
-    const commitAuthor = process.env.CI_COMMIT_AUTHOR;
-    if (!commitAuthor) {
-        throw new Error('GitLab CI: CI_COMMIT_AUTHOR environment variable is not set. ' +
-            'This should be automatically provided by GitLab CI.');
-    }
-    // Parse "name <email>" format
-    const match = commitAuthor.match(/^(.+?)\s*<(.+?)>$/);
-    if (!match) {
-        throw new Error(`GitLab CI: CI_COMMIT_AUTHOR format is invalid. ` +
-            `Expected format: "name <email>", got: "${commitAuthor}". ` +
-            `This should be automatically provided by GitLab CI in the correct format.`);
-    }
-    return {
-        name: match[1].trim(),
-        email: match[2].trim()
-    };
-}
 /**
  * Gets MR title for GitLab CI
  */

package/dist/git/local.js

@@ -177,15 +177,8 @@ async function getCommitAuthorFromConfig(repoRoot) {
 }
 /**
  * Gets commit author from git log (for specific commits)
+ * getCommitAuthor throws on failure with descriptive error
  */
 async function getCommitAuthorFromGit(repoRoot, commitSha) {
-    const gitAuthor = await (0, diff_1.getCommitAuthor)(repoRoot, commitSha);
-    if (!gitAuthor || !gitAuthor.email) {
-        throw new Error(`Local: Failed to get commit author from git log for commit ${commitSha}. ` +
-            'This should be available in your local git repository.');
-    }
-    return {
-        name: gitAuthor.name,
-        email: gitAuthor.email
-    };
+    return (0, diff_1.getCommitAuthor)(repoRoot, commitSha);
 }

package/dist/git/vercel.js

@@ -17,7 +17,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVercelContext = getVercelContext;
 const simple_git_1 = __importDefault(require("simple-git"));
-const child_process_1 = require("child_process");
 const diff_1 = require("./diff");
 /**
  * Gets all Vercel context
@@ -36,8 +35,9 @@ async function getVercelContext(repoRoot) {
     const commitSha = getCommitSha();
     const context = { type: 'commit', commitSha };
     const reviewContext = 'commit';
-    // Get commit author (fails loudly if unavailable)
-    const commitAuthor = await getCommitAuthorForVercel(repoRoot, commitSha);
+    // Get commit author using shared function (git log)
+    // getCommitAuthor throws on failure with descriptive error
+    const commitAuthor = await (0, diff_1.getCommitAuthor)(repoRoot, commitSha);
     // Get commit message
     let commitMessage;
     const message = await (0, diff_1.getCommitMessage)(repoRoot, commitSha);
@@ -116,33 +116,3 @@ function getCommitSha() {
     }
     return commitSha;
 }
-/**
- * Gets commit author for Vercel
- * Uses VERCEL_GIT_COMMIT_AUTHOR_NAME for name, raw git log command for email
- *
- * Uses raw `git log` command (same as test script) instead of simple-git library
- * because simple-git's log method may not work correctly in Vercel's shallow clone.
- */
-async function getCommitAuthorForVercel(repoRoot, commitSha) {
-    const authorName = process.env.VERCEL_GIT_COMMIT_AUTHOR_NAME;
-    if (!authorName) {
-        throw new Error('Vercel: VERCEL_GIT_COMMIT_AUTHOR_NAME environment variable is not set. ' +
-            'This should be automatically provided by Vercel.');
-    }
-    // Use raw git log command (same approach as test script) - more reliable than simple-git
-    try {
-        const email = (0, child_process_1.execSync)(`git log ${commitSha} -1 --format=%ae`, { encoding: 'utf-8', cwd: repoRoot }).trim();
-        if (!email) {
-            throw new Error('Email is empty');
-        }
-        return {
-            name: authorName.trim(),
-            email: email.trim()
-        };
-    }
-    catch (error) {
-        throw new Error(`Vercel: Failed to get commit author email from git log for commit ${commitSha}. ` +
-            `This should be available in Vercel's build environment. ` +
-            `Error: ${error instanceof Error ? error.message : 'Unknown error'}`);
-    }
-}

package/package.json

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