@lumy-pack/line-lore 0.0.6 → 0.0.7

package/dist/index.mjs

@@ -387,6 +387,35 @@ async function findMergeCommit(commitSha, options) {
     timeout: remaining
   });
 }
+async function verifyMergeIntroducesCommit(targetSha, mergeResult, options) {
+  if (mergeResult.parentShas.length < 2) return true;
+  const firstParent = mergeResult.parentShas[0];
+  const branchParents = mergeResult.parentShas.slice(1);
+  const onMainline = await isAncestor(targetSha, firstParent, options);
+  if (onMainline === null) return false;
+  if (onMainline) return false;
+  for (const branchParent of branchParents) {
+    const onBranch = await isAncestor(targetSha, branchParent, options);
+    if (onBranch === null) return false;
+    if (onBranch) return true;
+  }
+  return false;
+}
+async function isAncestor(commitA, commitB, options) {
+  try {
+    const result = await gitExec(
+      ["merge-base", "--is-ancestor", commitA, commitB],
+      {
+        cwd: options?.cwd,
+        timeout: options?.timeout ?? 5e3,
+        allowExitCodes: [1]
+      }
+    );
+    return result.exitCode === 0;
+  } catch {
+    return null;
+  }
+}
 async function findMergeCommitWithArgs(commitSha, ref, extraArgs, options) {
   try {
     const result = await gitExec(
@@ -404,7 +433,25 @@ async function findMergeCommitWithArgs(commitSha, ref, extraArgs, options) {
     );
     const lines = filter4(result.stdout.trim().split("\n"), isTruthy4);
     if (lines.length === 0) return null;
-    return parseMergeLogLine(lines[0]);
+    const candidateCount = Math.min(lines.length, MAX_CANDIDATES);
+    let verifiedCount = 0;
+    for (let i = 0; i < candidateCount; i++) {
+      const candidate = parseMergeLogLine(lines[i]);
+      if (!candidate) continue;
+      verifiedCount++;
+      const verified = await verifyMergeIntroducesCommit(
+        commitSha,
+        candidate,
+        options
+      );
+      if (verified) return candidate;
+    }
+    if (verifiedCount > 0 && options?.warnings) {
+      options.warnings.push(
+        `ancestry: all ${verifiedCount} merge candidate(s) failed verification for ${commitSha.slice(0, 8)}`
+      );
+    }
+    return null;
   } catch {
     return null;
   }
@@ -426,24 +473,39 @@ function parseMergeLogLine(line) {
   const subject = parts.slice(subjectStart).join(" ");
   return { mergeCommitSha, parentShas, subject };
 }
-function extractPRFromMergeMessage(subject) {
+async function getCommitSubject(sha, options) {
+  try {
+    const result = await gitExec(["log", "-1", "--format=%s", sha], {
+      cwd: options?.cwd,
+      timeout: options?.timeout ?? 5e3
+    });
+    const subject = result.stdout.trim();
+    return subject || null;
+  } catch {
+    return null;
+  }
+}
+function extractPRFromMergeMessage(subject, platform) {
   const ghMatch = /Merge pull request #(\d+)/.exec(subject);
   if (ghMatch) return parseInt(ghMatch[1], 10);
   const squashMatch = /\(#(\d+)\)\s*$/.exec(subject);
   if (squashMatch) return parseInt(squashMatch[1], 10);
-  const glMatch = /!(\d+)\s*$/.exec(subject);
-  if (glMatch) return parseInt(glMatch[1], 10);
+  if (!platform || platform === "gitlab" || platform === "gitlab-self-hosted") {
+    const glMatch = /See merge request\s+\S*!(\d+)\s*$/.exec(subject);
+    if (glMatch) return parseInt(glMatch[1], 10);
+  }
   const adoMatch = /Merged PR (\d+):/.exec(subject);
   if (adoMatch) return parseInt(adoMatch[1], 10);
   return null;
 }
-var DEFAULT_ANCESTRY_TIMEOUT;
+var DEFAULT_ANCESTRY_TIMEOUT, MAX_CANDIDATES;
 var init_ancestry = __esm({
   "src/core/ancestry/ancestry.ts"() {
     "use strict";
     init_esm_shims();
     init_executor();
     DEFAULT_ANCESTRY_TIMEOUT = 3e4;
+    MAX_CANDIDATES = 10;
   }
 });
 
@@ -574,7 +636,8 @@ function toCachedPR(pr) {
     url: pr.url,
     mergeCommit: pr.mergeCommit,
     baseBranch: pr.baseBranch,
-    mergedAt: pr.mergedAt ? new Date(pr.mergedAt).getTime() : void 0
+    mergedAt: pr.mergedAt ? new Date(pr.mergedAt).getTime() : void 0,
+    resolvedVia: pr.resolvedVia
   };
 }
 function fromCachedPR(cached) {
@@ -589,7 +652,9 @@ function fromCachedPR(cached) {
     url: cached.url,
     mergeCommit: cached.mergeCommit,
     baseBranch: cached.baseBranch,
-    mergedAt
+    mergedAt,
+    // Preserve original resolvedVia; fallback to url heuristic for legacy cache entries
+    resolvedVia: cached.resolvedVia ?? (cached.url ? "api" : "message")
   };
 }
 async function lookupPR(commitSha, adapter, options, _recursionDepth = 0) {
@@ -600,15 +665,30 @@ async function lookupPR(commitSha, adapter, options, _recursionDepth = 0) {
   const cached = await cache.get(commitSha);
   if (cached) return fromCachedPR(cached);
   if (options?.cacheOnly) return null;
+  const prSelectOptions = options?.preferredBase ? { preferredBase: options.preferredBase } : void 0;
+  if (adapter) {
+    const directPR = await adapter.getPRForCommit(commitSha, prSelectOptions);
+    if (directPR?.mergedAt) {
+      const result = { ...directPR, resolvedVia: "api" };
+      await cache.set(commitSha, toCachedPR(result));
+      return result;
+    }
+  }
   let mergeBasedPR = null;
   const mergeResult = await findMergeCommit(commitSha, options);
   if (mergeResult) {
-    const prNumber = extractPRFromMergeMessage(mergeResult.subject);
+    const prNumber = extractPRFromMergeMessage(
+      mergeResult.subject,
+      options?.platform
+    );
     if (prNumber) {
       if (adapter) {
-        const prInfo = await adapter.getPRForCommit(mergeResult.mergeCommitSha);
+        const prInfo = await adapter.getPRForCommit(
+          mergeResult.mergeCommitSha,
+          prSelectOptions
+        );
         if (prInfo?.mergedAt) {
-          mergeBasedPR = prInfo;
+          mergeBasedPR = { ...prInfo, resolvedVia: "ancestry" };
         }
       }
       if (!mergeBasedPR) {
@@ -618,7 +698,8 @@ async function lookupPR(commitSha, adapter, options, _recursionDepth = 0) {
           author: "",
           url: "",
           mergeCommit: mergeResult.mergeCommitSha,
-          baseBranch: ""
+          baseBranch: "",
+          resolvedVia: "ancestry"
         };
       }
       if (!options?.deep || mergeBasedPR.mergedAt) {
@@ -631,11 +712,24 @@ async function lookupPR(commitSha, adapter, options, _recursionDepth = 0) {
     await cache.set(commitSha, toCachedPR(mergeBasedPR));
     return mergeBasedPR;
   }
-  if (adapter) {
-    const prInfo = await adapter.getPRForCommit(commitSha);
-    if (prInfo?.mergedAt) {
-      await cache.set(commitSha, toCachedPR(prInfo));
-      return prInfo;
+  const commitSubject = await getCommitSubject(commitSha, options);
+  if (commitSubject) {
+    const directPrNumber = extractPRFromMergeMessage(
+      commitSubject,
+      options?.platform
+    );
+    if (directPrNumber) {
+      const subjectPR = {
+        number: directPrNumber,
+        title: commitSubject,
+        author: "",
+        url: "",
+        mergeCommit: commitSha,
+        baseBranch: "",
+        resolvedVia: "message"
+      };
+      await cache.set(commitSha, toCachedPR(subjectPR));
+      return subjectPR;
     }
   }
   if (!options?.skipPatchIdScan && _recursionDepth < MAX_RECURSION_DEPTH) {
@@ -696,6 +790,7 @@ init_errors();
 // src/core/core.ts
 init_esm_shims();
 import { createHash as createHash2 } from "crypto";
+import { dirname, isAbsolute, relative } from "path";
 import { map as map8 } from "@winglet/common-utils";
 
 // src/ast/index.ts
@@ -979,7 +1074,7 @@ async function checkGitHealth(options) {
   const cloneStatus = await checkCloneStatus({ cwd: options?.cwd });
   if (cloneStatus.partialClone) {
     hints.push(
-      "Partial clone detected. Patch-ID scan (Strategy 4) will be skipped to avoid blob downloads."
+      "Partial clone detected. Patch-ID scan (Strategy 5) will be skipped to avoid blob downloads."
     );
   }
   if (cloneStatus.shallow) {
@@ -1095,7 +1190,7 @@ var GitHubAdapter = class {
       return { authenticated: false, hostname: this.hostname };
     }
   }
-  async getPRForCommit(sha) {
+  async getPRForCommit(sha, options) {
     if (this.scheduler.isRateLimited()) return null;
     try {
       const result = await shellExec(
@@ -1112,18 +1207,20 @@ var GitHubAdapter = class {
       );
       const prs = JSON.parse(result.stdout);
       if (!isArray(prs) || prs.length === 0) return null;
-      const defaultBranch = await this.detectDefaultBranch();
-      const defaultBranchPR = prs.find(
-        (pr) => pr.base === defaultBranch
-      );
-      const data = defaultBranchPR ?? prs[0];
+      let data = prs[0];
+      if (options?.preferredBase) {
+        const preferred = prs.find(
+          (pr) => pr.base === options.preferredBase
+        );
+        if (preferred) data = preferred;
+      }
       return {
         number: data.number,
         title: data.title ?? "",
         author: data.user ?? "",
         url: data.html_url ?? "",
         mergeCommit: data.merge_commit_sha ?? sha,
-        baseBranch: data.base ?? defaultBranch,
+        baseBranch: data.base ?? "",
         mergedAt: data.merged_at
       };
     } catch {
@@ -1305,7 +1402,7 @@ var GitLabAdapter = class {
       return { authenticated: false, hostname: this.hostname };
     }
   }
-  async getPRForCommit(sha) {
+  async getPRForCommit(sha, options) {
     if (this.scheduler.isRateLimited()) return null;
     try {
       const result = await shellExec(
@@ -1329,18 +1426,20 @@ var GitLabAdapter = class {
         return aTime - bTime;
       });
       if (mergedMRs.length === 0) return null;
-      const defaultBranch = await this.detectDefaultBranch();
-      const defaultBranchMR = mergedMRs.find(
-        (mr2) => mr2.target_branch === defaultBranch
-      );
-      const mr = defaultBranchMR ?? mergedMRs[0];
+      let mr = mergedMRs[0];
+      if (options?.preferredBase) {
+        const preferred = mergedMRs.find(
+          (m) => m.target_branch === options.preferredBase
+        );
+        if (preferred) mr = preferred;
+      }
       return {
         number: mr.iid,
         title: mr.title ?? "",
         author: mr.author?.username ?? "",
         url: mr.web_url ?? "",
         mergeCommit: mr.merge_commit_sha ?? sha,
-        baseBranch: mr.target_branch ?? defaultBranch,
+        baseBranch: mr.target_branch ?? "",
         mergedAt: mr.merged_at
       };
     } catch {
@@ -2148,6 +2247,28 @@ async function traverse(adapter, type, number, depth, maxDepth, nodes, edges, vi
 
 // src/core/core.ts
 init_pr_lookup2();
+function resolvedViaToTrackingMethod(resolvedVia) {
+  switch (resolvedVia) {
+    case "api":
+      return "api";
+    case "ancestry":
+      return "ancestry-path";
+    case "message":
+      return "message-parse";
+    case "patch-id":
+      return "patch-id";
+  }
+}
+function resolvedViaToConfidence(resolvedVia) {
+  switch (resolvedVia) {
+    case "api":
+    case "ancestry":
+      return "exact";
+    case "message":
+    case "patch-id":
+      return "heuristic";
+  }
+}
 function computeFeatureFlags(operatingLevel, options) {
   return {
     astDiff: isAstAvailable() && !options.noAst,
@@ -2165,6 +2286,22 @@ async function resolveRepoIdentity(cwd) {
     return { host: "_local", owner: "_", repo: "_unknown" };
   }
 }
+async function resolveFileContext(file, cwd) {
+  if (cwd || !isAbsolute(file)) return { file, cwd };
+  const fileDir = dirname(file);
+  try {
+    const result = await gitExec(["rev-parse", "--show-toplevel"], {
+      cwd: fileDir
+    });
+    const repoRoot = result.stdout.trim();
+    return {
+      file: relative(repoRoot, file),
+      cwd: repoRoot
+    };
+  } catch {
+    return { file, cwd };
+  }
+}
 async function detectPlatform2(options) {
   const warnings = [];
   let adapter = null;
@@ -2211,7 +2348,7 @@ async function runBlameAndAuth(adapter, options, execOptions) {
   }
   return { analyzed: blameResult.value, operatingLevel, warnings };
 }
-async function processEntry(entry, featureFlags, adapter, options, execOptions, repoId, skipPatchIdScan) {
+async function processEntry(entry, featureFlags, adapter, options, execOptions, repoId, skipPatchIdScan, preferredBase) {
   const nodes = [];
   const commitNode = {
     type: entry.isCosmetic ? "cosmetic_commit" : "original_commit",
@@ -2245,14 +2382,16 @@ async function processEntry(entry, featureFlags, adapter, options, execOptions,
       cacheOnly: options.cacheOnly,
       deep: featureFlags.deepTrace,
       repoId,
-      skipPatchIdScan
+      skipPatchIdScan,
+      preferredBase,
+      platform: adapter?.platform
     });
     if (prInfo) {
       nodes.push({
         type: "pull_request",
         sha: prInfo.mergeCommit,
-        trackingMethod: prInfo.url ? "api" : "message-parse",
-        confidence: prInfo.url ? "exact" : "heuristic",
+        trackingMethod: resolvedViaToTrackingMethod(prInfo.resolvedVia),
+        confidence: resolvedViaToConfidence(prInfo.resolvedVia),
         prNumber: prInfo.number,
         prUrl: prInfo.url || void 0,
         prTitle: prInfo.title || void 0,
@@ -2262,7 +2401,7 @@ async function processEntry(entry, featureFlags, adapter, options, execOptions,
   }
   return nodes;
 }
-async function buildTraceNodes(analyzed, featureFlags, adapter, options, execOptions, repoId, skipPatchIdScan) {
+async function buildTraceNodes(analyzed, featureFlags, adapter, options, execOptions, repoId, skipPatchIdScan, preferredBase) {
   const results = await Promise.allSettled(
     map8(
       analyzed,
@@ -2273,7 +2412,8 @@ async function buildTraceNodes(analyzed, featureFlags, adapter, options, execOpt
         options,
         execOptions,
         repoId,
-        skipPatchIdScan
+        skipPatchIdScan,
+        preferredBase
       )
     )
   );
@@ -2281,13 +2421,15 @@ async function buildTraceNodes(analyzed, featureFlags, adapter, options, execOpt
 }
 var legacyCacheCleaned = false;
 async function trace(options) {
-  const execOptions = { cwd: options.cwd };
+  const { file, cwd } = await resolveFileContext(options.file, options.cwd);
+  const warnings = [];
+  const execOptions = { cwd, warnings };
   if (!legacyCacheCleaned) {
     legacyCacheCleaned = true;
     cleanupLegacyCache().catch(() => {
     });
   }
-  const platform = await detectPlatform2(options);
+  const platform = await detectPlatform2({ ...options, cwd });
   let repoId;
   if (platform.remote) {
     repoId = {
@@ -2296,15 +2438,15 @@ async function trace(options) {
       repo: platform.remote.repo
     };
   } else {
-    repoId = await resolveRepoIdentity(options.cwd);
+    repoId = await resolveRepoIdentity(cwd);
   }
   const blameAuth = await runBlameAndAuth(
     platform.adapter,
-    options,
+    { ...options, file, cwd },
     execOptions
   );
   const operatingLevel = blameAuth.operatingLevel || platform.operatingLevel;
-  const warnings = [...platform.warnings, ...blameAuth.warnings];
+  warnings.push(...platform.warnings, ...blameAuth.warnings);
   if (options.cacheOnly && options.noCache) {
     warnings.push(
       "Both cacheOnly and noCache are set. cacheOnly takes precedence \u2014 cache reads are enabled."
@@ -2313,13 +2455,13 @@ async function trace(options) {
   const featureFlags = computeFeatureFlags(operatingLevel, options);
   let cloneStatus = { partialClone: false, shallow: false };
   try {
-    const result = await checkCloneStatus({ cwd: options.cwd });
+    const result = await checkCloneStatus({ cwd });
     if (result) cloneStatus = result;
   } catch {
   }
   if (cloneStatus.partialClone) {
     warnings.push(
-      "Partial clone detected. Patch-ID scan (Strategy 4) will be skipped to avoid blob downloads."
+      "Partial clone detected. Patch-ID scan (Strategy 5) will be skipped to avoid blob downloads."
     );
   }
   if (cloneStatus.shallow) {
@@ -2327,14 +2469,27 @@ async function trace(options) {
       "Shallow repository detected. Ancestry-path results may be incomplete."
     );
   }
+  let preferredBase;
+  try {
+    const branchResult = await gitExec(
+      ["rev-parse", "--abbrev-ref", "HEAD"],
+      execOptions
+    );
+    const branch = branchResult.stdout.trim();
+    if (branch && branch !== "HEAD") {
+      preferredBase = branch;
+    }
+  } catch {
+  }
   const nodes = await buildTraceNodes(
     blameAuth.analyzed,
     featureFlags,
     platform.adapter,
-    options,
+    { ...options, file, cwd },
     execOptions,
     repoId,
-    cloneStatus.partialClone || void 0
+    cloneStatus.partialClone || void 0,
+    preferredBase
   );
   return { nodes, operatingLevel, featureFlags, warnings };
 }

package/dist/platform/github/github-adapter.d.ts

@@ -14,7 +14,9 @@ export declare class GitHubAdapter implements PlatformAdapter {
         cwd?: string;
     });
     checkAuth(): Promise<AuthStatus>;
-    getPRForCommit(sha: string): Promise<PRInfo | null>;
+    getPRForCommit(sha: string, options?: {
+        preferredBase?: string;
+    }): Promise<PRInfo | null>;
     private detectDefaultBranch;
     getPRCommits(prNumber: number): Promise<string[]>;
     getLinkedIssues(prNumber: number): Promise<IssueInfo[]>;

package/dist/platform/gitlab/gitlab-adapter.d.ts

@@ -14,7 +14,9 @@ export declare class GitLabAdapter implements PlatformAdapter {
         cwd?: string;
     });
     checkAuth(): Promise<AuthStatus>;
-    getPRForCommit(sha: string): Promise<PRInfo | null>;
+    getPRForCommit(sha: string, options?: {
+        preferredBase?: string;
+    }): Promise<PRInfo | null>;
     private detectDefaultBranch;
     getPRCommits(prNumber: number): Promise<string[]>;
     getLinkedIssues(prNumber: number): Promise<IssueInfo[]>;

package/dist/types/cache.d.ts

@@ -13,4 +13,6 @@ export interface CachedPRInfo {
     baseBranch: string;
     /** Unix timestamp in milliseconds, NOT ISO 8601 string */
     mergedAt?: number;
+    /** Which strategy resolved this PR — absent in legacy cache entries */
+    resolvedVia?: string;
 }

package/dist/types/git.d.ts

@@ -8,6 +8,8 @@ export interface GitExecOptions {
     cwd?: string;
     timeout?: number;
     allowExitCodes?: number[];
+    /** Mutable array for collecting diagnostic warnings throughout the pipeline */
+    warnings?: string[];
 }
 export interface RemoteInfo {
     owner: string;

package/dist/types/platform.d.ts

@@ -36,7 +36,9 @@ export interface RateLimitInfo {
 export interface PlatformAdapter {
     readonly platform: PlatformType;
     checkAuth(): Promise<AuthStatus>;
-    getPRForCommit(sha: string): Promise<PRInfo | null>;
+    getPRForCommit(sha: string, options?: {
+        preferredBase?: string;
+    }): Promise<PRInfo | null>;
     getPRCommits(prNumber: number): Promise<string[]>;
     getLinkedIssues(prNumber: number): Promise<IssueInfo[]>;
     getLinkedPRs(issueNumber: number): Promise<PRInfo[]>;

package/dist/version.d.ts

@@ -2,4 +2,4 @@
  * Current package version from package.json
  * Automatically synchronized during build process
  */
-export declare const VERSION = "0.0.6";
+export declare const VERSION = "0.0.7";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumy-pack/line-lore",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "CLI tool for tracing code lines to their originating Pull Requests via git blame",
   "keywords": [
     "cli",