@lumy-pack/line-lore 0.0.8 → 0.0.9

package/dist/cli.mjs

@@ -809,7 +809,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = "0.0.8";
+    VERSION = "0.0.9";
   }
 });
 
@@ -2181,8 +2181,108 @@ async function executeBlame(file, lineRange, options) {
   const result = await gitExec(args, options);
   return parsePorcelainOutput(result.stdout);
 }
-async function analyzeBlameResults(results, filePath, options) {
-  const uniqueShas = [...new Set(map6(results, (r) => r.commitHash))];
+async function executeDualBlame(file, lineRange, options) {
+  if (options?.mode === "change") {
+    const results = await executeBlame(file, lineRange, options);
+    return { blame: results, changeBlame: [] };
+  }
+  const [originResult, changeResult] = await Promise.allSettled([
+    executeBlame(file, lineRange, options),
+    executeBlame(file, lineRange, { ...options, mode: "change" })
+  ]);
+  const blame = originResult.status === "fulfilled" ? originResult.value : [];
+  const changeBlame = changeResult.status === "fulfilled" ? changeResult.value : [];
+  if (originResult.status === "rejected") {
+    throw originResult.reason;
+  }
+  return { blame, changeBlame };
+}
+async function verifyRename(originalFile, currentFile, options) {
+  try {
+    const result = await gitExec(
+      [
+        "log",
+        "--diff-filter=R",
+        "--find-renames",
+        "--format=%H",
+        "--",
+        originalFile,
+        currentFile
+      ],
+      options
+    );
+    return result.stdout.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+function crossValidateBlame(originResults, changeResults) {
+  const changeMap = /* @__PURE__ */ new Map();
+  for (const r of changeResults) {
+    changeMap.set(r.finalLine, r);
+  }
+  const validated = [];
+  const crossValidatedFlags = [];
+  const changeFallbackFlags = [];
+  const renameChecks = [];
+  for (let i = 0; i < originResults.length; i++) {
+    const origin = originResults[i];
+    const change = changeMap.get(origin.finalLine);
+    if (!change) {
+      validated.push(origin);
+      crossValidatedFlags.push(false);
+      changeFallbackFlags.push(false);
+      continue;
+    }
+    if (origin.commitHash === change.commitHash) {
+      validated.push(origin);
+      crossValidatedFlags.push(true);
+      changeFallbackFlags.push(false);
+      continue;
+    }
+    if (origin.originalFile) {
+      renameChecks.push({
+        originalFile: origin.originalFile,
+        lineIndex: i
+      });
+    }
+    validated.push(change);
+    crossValidatedFlags.push(true);
+    changeFallbackFlags.push(true);
+  }
+  return { validated, renameChecks, crossValidatedFlags, changeFallbackFlags };
+}
+async function analyzeBlameResults(results, filePath, options, changeResults) {
+  let effectiveResults = results;
+  let crossValidatedFlags;
+  let changeFallbackFlagsResult;
+  if (changeResults && changeResults.length > 0) {
+    const { validated, renameChecks, crossValidatedFlags: cvFlags, changeFallbackFlags } = crossValidateBlame(results, changeResults);
+    if (renameChecks.length > 0) {
+      const pendingChecks = /* @__PURE__ */ new Map();
+      for (const check of renameChecks) {
+        const cacheKey = `${check.originalFile}:${filePath}`;
+        if (!pendingChecks.has(cacheKey)) {
+          pendingChecks.set(cacheKey, verifyRename(check.originalFile, filePath, options));
+        }
+      }
+      const renameResults = /* @__PURE__ */ new Map();
+      for (const [key, promise] of pendingChecks) {
+        renameResults.set(key, await promise);
+      }
+      for (const check of renameChecks) {
+        const cacheKey = `${check.originalFile}:${filePath}`;
+        if (renameResults.get(cacheKey)) {
+          validated[check.lineIndex] = results[check.lineIndex];
+          changeFallbackFlags[check.lineIndex] = false;
+        }
+      }
+    }
+    effectiveResults = validated;
+    crossValidatedFlags = cvFlags;
+    changeFallbackFlagsResult = changeFallbackFlags;
+  }
+  const uniqueShas = [...new Set(map6(effectiveResults, (r) => r.commitHash))];
   const cosmeticMap = /* @__PURE__ */ new Map();
   const zeroSha = "0".repeat(40);
   const tasks = [];
@@ -2191,7 +2291,7 @@ async function analyzeBlameResults(results, filePath, options) {
     tasks.push(
       (async () => {
         try {
-          const blameResult = results.find((r) => r.commitHash === sha);
+          const blameResult = effectiveResults.find((r) => r.commitHash === sha);
           if (!blameResult) return;
           const file = blameResult.originalFile ?? filePath;
           const diff = await getCosmeticDiff(sha, file, options);
@@ -2203,12 +2303,14 @@ async function analyzeBlameResults(results, filePath, options) {
     );
   });
   await Promise.all(tasks);
-  return map6(results, (blame) => {
+  return map6(effectiveResults, (blame, i) => {
     const cosmetic = cosmeticMap.get(blame.commitHash);
     return {
       blame,
       isCosmetic: cosmetic?.isCosmetic ?? false,
-      cosmeticReason: cosmetic?.reason
+      cosmeticReason: cosmetic?.reason,
+      crossValidated: crossValidatedFlags?.[i],
+      usedChangeFallback: changeFallbackFlagsResult?.[i]
     };
   });
 }
@@ -2385,10 +2487,12 @@ async function runBlameAndAuth(adapter, options, execOptions) {
   const lineRange = parseLineRange(
     options.endLine ? `${options.line},${options.endLine}` : `${options.line}`
   );
-  const blameChain = executeBlame(options.file, lineRange, {
+  const blameChain = executeDualBlame(options.file, lineRange, {
     ...execOptions,
     mode: options.mode
-  }).then((results) => analyzeBlameResults(results, options.file, execOptions));
+  }).then(
+    ({ blame, changeBlame }) => analyzeBlameResults(blame, options.file, execOptions, changeBlame.length > 0 ? changeBlame : void 0)
+  );
   const [authResult, blameResult] = await Promise.allSettled([
     adapter ? adapter.checkAuth() : Promise.resolve({ authenticated: false }),
     blameChain
@@ -2426,7 +2530,7 @@ async function processEntry(entry, featureFlags, adapter, options, execOptions,
   const commitNode = {
     type: entry.isCosmetic ? "cosmetic_commit" : "original_commit",
     sha: entry.blame.commitHash,
-    trackingMethod: traceMode === "change" ? "blame" : "blame-CMw",
+    trackingMethod: traceMode === "change" || entry.usedChangeFallback ? "blame" : "blame-CMw",
     confidence: "exact",
     note: entry.cosmeticReason ? `Cosmetic change: ${entry.cosmeticReason}` : void 0
   };

package/dist/core/blame/blame.d.ts

@@ -1,3 +1,11 @@
-import type { BlameExecOptions, BlameResult, BlameStageResult, GitExecOptions, LineRange } from '../../types/index.js';
+import type { BlameExecOptions, BlameResult, BlameStageResult, DualBlameResult, GitExecOptions, LineRange } from '../../types/index.js';
 export declare function executeBlame(file: string, lineRange: LineRange, options?: BlameExecOptions): Promise<BlameResult[]>;
-export declare function analyzeBlameResults(results: BlameResult[], filePath: string, options?: GitExecOptions): Promise<BlameStageResult[]>;
+/**
+ * Run dual blame for origin mode: origin blame (-C -C -M) and change blame (-w)
+ * in parallel. For change mode, only runs the single blame.
+ *
+ * Assumes both blames on the same -L range produce results in the same
+ * finalLine order (guaranteed by git blame line-ordered output).
+ */
+export declare function executeDualBlame(file: string, lineRange: LineRange, options?: BlameExecOptions): Promise<DualBlameResult>;
+export declare function analyzeBlameResults(results: BlameResult[], filePath: string, options?: GitExecOptions, changeResults?: BlameResult[]): Promise<BlameStageResult[]>;

package/dist/core/blame/index.d.ts

@@ -1,4 +1,4 @@
-export { analyzeBlameResults, executeBlame } from './blame.js';
+export { analyzeBlameResults, executeBlame, executeDualBlame } from './blame.js';
 export { getCosmeticDiff, isCosmeticDiff } from './detection/index.js';
 export type { CosmeticCheckResult } from './detection/index.js';
 export { parsePorcelainOutput } from './parsing/index.js';

package/dist/index.cjs

@@ -2170,8 +2170,108 @@ async function executeBlame(file, lineRange, options) {
   const result = await gitExec(args, options);
   return parsePorcelainOutput(result.stdout);
 }
-async function analyzeBlameResults(results, filePath, options) {
-  const uniqueShas = [...new Set((0, import_common_utils7.map)(results, (r) => r.commitHash))];
+async function executeDualBlame(file, lineRange, options) {
+  if (options?.mode === "change") {
+    const results = await executeBlame(file, lineRange, options);
+    return { blame: results, changeBlame: [] };
+  }
+  const [originResult, changeResult] = await Promise.allSettled([
+    executeBlame(file, lineRange, options),
+    executeBlame(file, lineRange, { ...options, mode: "change" })
+  ]);
+  const blame = originResult.status === "fulfilled" ? originResult.value : [];
+  const changeBlame = changeResult.status === "fulfilled" ? changeResult.value : [];
+  if (originResult.status === "rejected") {
+    throw originResult.reason;
+  }
+  return { blame, changeBlame };
+}
+async function verifyRename(originalFile, currentFile, options) {
+  try {
+    const result = await gitExec(
+      [
+        "log",
+        "--diff-filter=R",
+        "--find-renames",
+        "--format=%H",
+        "--",
+        originalFile,
+        currentFile
+      ],
+      options
+    );
+    return result.stdout.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+function crossValidateBlame(originResults, changeResults) {
+  const changeMap = /* @__PURE__ */ new Map();
+  for (const r of changeResults) {
+    changeMap.set(r.finalLine, r);
+  }
+  const validated = [];
+  const crossValidatedFlags = [];
+  const changeFallbackFlags = [];
+  const renameChecks = [];
+  for (let i = 0; i < originResults.length; i++) {
+    const origin = originResults[i];
+    const change = changeMap.get(origin.finalLine);
+    if (!change) {
+      validated.push(origin);
+      crossValidatedFlags.push(false);
+      changeFallbackFlags.push(false);
+      continue;
+    }
+    if (origin.commitHash === change.commitHash) {
+      validated.push(origin);
+      crossValidatedFlags.push(true);
+      changeFallbackFlags.push(false);
+      continue;
+    }
+    if (origin.originalFile) {
+      renameChecks.push({
+        originalFile: origin.originalFile,
+        lineIndex: i
+      });
+    }
+    validated.push(change);
+    crossValidatedFlags.push(true);
+    changeFallbackFlags.push(true);
+  }
+  return { validated, renameChecks, crossValidatedFlags, changeFallbackFlags };
+}
+async function analyzeBlameResults(results, filePath, options, changeResults) {
+  let effectiveResults = results;
+  let crossValidatedFlags;
+  let changeFallbackFlagsResult;
+  if (changeResults && changeResults.length > 0) {
+    const { validated, renameChecks, crossValidatedFlags: cvFlags, changeFallbackFlags } = crossValidateBlame(results, changeResults);
+    if (renameChecks.length > 0) {
+      const pendingChecks = /* @__PURE__ */ new Map();
+      for (const check of renameChecks) {
+        const cacheKey = `${check.originalFile}:${filePath}`;
+        if (!pendingChecks.has(cacheKey)) {
+          pendingChecks.set(cacheKey, verifyRename(check.originalFile, filePath, options));
+        }
+      }
+      const renameResults = /* @__PURE__ */ new Map();
+      for (const [key, promise] of pendingChecks) {
+        renameResults.set(key, await promise);
+      }
+      for (const check of renameChecks) {
+        const cacheKey = `${check.originalFile}:${filePath}`;
+        if (renameResults.get(cacheKey)) {
+          validated[check.lineIndex] = results[check.lineIndex];
+          changeFallbackFlags[check.lineIndex] = false;
+        }
+      }
+    }
+    effectiveResults = validated;
+    crossValidatedFlags = cvFlags;
+    changeFallbackFlagsResult = changeFallbackFlags;
+  }
+  const uniqueShas = [...new Set((0, import_common_utils7.map)(effectiveResults, (r) => r.commitHash))];
   const cosmeticMap = /* @__PURE__ */ new Map();
   const zeroSha = "0".repeat(40);
   const tasks = [];
@@ -2180,7 +2280,7 @@ async function analyzeBlameResults(results, filePath, options) {
     tasks.push(
       (async () => {
         try {
-          const blameResult = results.find((r) => r.commitHash === sha);
+          const blameResult = effectiveResults.find((r) => r.commitHash === sha);
           if (!blameResult) return;
           const file = blameResult.originalFile ?? filePath;
           const diff = await getCosmeticDiff(sha, file, options);
@@ -2192,12 +2292,14 @@ async function analyzeBlameResults(results, filePath, options) {
     );
   });
   await Promise.all(tasks);
-  return (0, import_common_utils7.map)(results, (blame) => {
+  return (0, import_common_utils7.map)(effectiveResults, (blame, i) => {
     const cosmetic = cosmeticMap.get(blame.commitHash);
     return {
       blame,
       isCosmetic: cosmetic?.isCosmetic ?? false,
-      cosmeticReason: cosmetic?.reason
+      cosmeticReason: cosmetic?.reason,
+      crossValidated: crossValidatedFlags?.[i],
+      usedChangeFallback: changeFallbackFlagsResult?.[i]
     };
   });
 }
@@ -2378,10 +2480,12 @@ async function runBlameAndAuth(adapter, options, execOptions) {
   const lineRange = parseLineRange(
     options.endLine ? `${options.line},${options.endLine}` : `${options.line}`
   );
-  const blameChain = executeBlame(options.file, lineRange, {
+  const blameChain = executeDualBlame(options.file, lineRange, {
     ...execOptions,
     mode: options.mode
-  }).then((results) => analyzeBlameResults(results, options.file, execOptions));
+  }).then(
+    ({ blame, changeBlame }) => analyzeBlameResults(blame, options.file, execOptions, changeBlame.length > 0 ? changeBlame : void 0)
+  );
   const [authResult, blameResult] = await Promise.allSettled([
     adapter ? adapter.checkAuth() : Promise.resolve({ authenticated: false }),
     blameChain
@@ -2419,7 +2523,7 @@ async function processEntry(entry, featureFlags, adapter, options, execOptions,
   const commitNode = {
     type: entry.isCosmetic ? "cosmetic_commit" : "original_commit",
     sha: entry.blame.commitHash,
-    trackingMethod: traceMode === "change" ? "blame" : "blame-CMw",
+    trackingMethod: traceMode === "change" || entry.usedChangeFallback ? "blame" : "blame-CMw",
     confidence: "exact",
     note: entry.cosmeticReason ? `Cosmetic change: ${entry.cosmeticReason}` : void 0
   };

package/dist/index.mjs

@@ -2145,8 +2145,108 @@ async function executeBlame(file, lineRange, options) {
   const result = await gitExec(args, options);
   return parsePorcelainOutput(result.stdout);
 }
-async function analyzeBlameResults(results, filePath, options) {
-  const uniqueShas = [...new Set(map6(results, (r) => r.commitHash))];
+async function executeDualBlame(file, lineRange, options) {
+  if (options?.mode === "change") {
+    const results = await executeBlame(file, lineRange, options);
+    return { blame: results, changeBlame: [] };
+  }
+  const [originResult, changeResult] = await Promise.allSettled([
+    executeBlame(file, lineRange, options),
+    executeBlame(file, lineRange, { ...options, mode: "change" })
+  ]);
+  const blame = originResult.status === "fulfilled" ? originResult.value : [];
+  const changeBlame = changeResult.status === "fulfilled" ? changeResult.value : [];
+  if (originResult.status === "rejected") {
+    throw originResult.reason;
+  }
+  return { blame, changeBlame };
+}
+async function verifyRename(originalFile, currentFile, options) {
+  try {
+    const result = await gitExec(
+      [
+        "log",
+        "--diff-filter=R",
+        "--find-renames",
+        "--format=%H",
+        "--",
+        originalFile,
+        currentFile
+      ],
+      options
+    );
+    return result.stdout.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+function crossValidateBlame(originResults, changeResults) {
+  const changeMap = /* @__PURE__ */ new Map();
+  for (const r of changeResults) {
+    changeMap.set(r.finalLine, r);
+  }
+  const validated = [];
+  const crossValidatedFlags = [];
+  const changeFallbackFlags = [];
+  const renameChecks = [];
+  for (let i = 0; i < originResults.length; i++) {
+    const origin = originResults[i];
+    const change = changeMap.get(origin.finalLine);
+    if (!change) {
+      validated.push(origin);
+      crossValidatedFlags.push(false);
+      changeFallbackFlags.push(false);
+      continue;
+    }
+    if (origin.commitHash === change.commitHash) {
+      validated.push(origin);
+      crossValidatedFlags.push(true);
+      changeFallbackFlags.push(false);
+      continue;
+    }
+    if (origin.originalFile) {
+      renameChecks.push({
+        originalFile: origin.originalFile,
+        lineIndex: i
+      });
+    }
+    validated.push(change);
+    crossValidatedFlags.push(true);
+    changeFallbackFlags.push(true);
+  }
+  return { validated, renameChecks, crossValidatedFlags, changeFallbackFlags };
+}
+async function analyzeBlameResults(results, filePath, options, changeResults) {
+  let effectiveResults = results;
+  let crossValidatedFlags;
+  let changeFallbackFlagsResult;
+  if (changeResults && changeResults.length > 0) {
+    const { validated, renameChecks, crossValidatedFlags: cvFlags, changeFallbackFlags } = crossValidateBlame(results, changeResults);
+    if (renameChecks.length > 0) {
+      const pendingChecks = /* @__PURE__ */ new Map();
+      for (const check of renameChecks) {
+        const cacheKey = `${check.originalFile}:${filePath}`;
+        if (!pendingChecks.has(cacheKey)) {
+          pendingChecks.set(cacheKey, verifyRename(check.originalFile, filePath, options));
+        }
+      }
+      const renameResults = /* @__PURE__ */ new Map();
+      for (const [key, promise] of pendingChecks) {
+        renameResults.set(key, await promise);
+      }
+      for (const check of renameChecks) {
+        const cacheKey = `${check.originalFile}:${filePath}`;
+        if (renameResults.get(cacheKey)) {
+          validated[check.lineIndex] = results[check.lineIndex];
+          changeFallbackFlags[check.lineIndex] = false;
+        }
+      }
+    }
+    effectiveResults = validated;
+    crossValidatedFlags = cvFlags;
+    changeFallbackFlagsResult = changeFallbackFlags;
+  }
+  const uniqueShas = [...new Set(map6(effectiveResults, (r) => r.commitHash))];
   const cosmeticMap = /* @__PURE__ */ new Map();
   const zeroSha = "0".repeat(40);
   const tasks = [];
@@ -2155,7 +2255,7 @@ async function analyzeBlameResults(results, filePath, options) {
     tasks.push(
       (async () => {
         try {
-          const blameResult = results.find((r) => r.commitHash === sha);
+          const blameResult = effectiveResults.find((r) => r.commitHash === sha);
           if (!blameResult) return;
           const file = blameResult.originalFile ?? filePath;
           const diff = await getCosmeticDiff(sha, file, options);
@@ -2167,12 +2267,14 @@ async function analyzeBlameResults(results, filePath, options) {
     );
   });
   await Promise.all(tasks);
-  return map6(results, (blame) => {
+  return map6(effectiveResults, (blame, i) => {
     const cosmetic = cosmeticMap.get(blame.commitHash);
     return {
       blame,
       isCosmetic: cosmetic?.isCosmetic ?? false,
-      cosmeticReason: cosmetic?.reason
+      cosmeticReason: cosmetic?.reason,
+      crossValidated: crossValidatedFlags?.[i],
+      usedChangeFallback: changeFallbackFlagsResult?.[i]
     };
   });
 }
@@ -2353,10 +2455,12 @@ async function runBlameAndAuth(adapter, options, execOptions) {
   const lineRange = parseLineRange(
     options.endLine ? `${options.line},${options.endLine}` : `${options.line}`
   );
-  const blameChain = executeBlame(options.file, lineRange, {
+  const blameChain = executeDualBlame(options.file, lineRange, {
     ...execOptions,
     mode: options.mode
-  }).then((results) => analyzeBlameResults(results, options.file, execOptions));
+  }).then(
+    ({ blame, changeBlame }) => analyzeBlameResults(blame, options.file, execOptions, changeBlame.length > 0 ? changeBlame : void 0)
+  );
   const [authResult, blameResult] = await Promise.allSettled([
     adapter ? adapter.checkAuth() : Promise.resolve({ authenticated: false }),
     blameChain
@@ -2394,7 +2498,7 @@ async function processEntry(entry, featureFlags, adapter, options, execOptions,
   const commitNode = {
     type: entry.isCosmetic ? "cosmetic_commit" : "original_commit",
     sha: entry.blame.commitHash,
-    trackingMethod: traceMode === "change" ? "blame" : "blame-CMw",
+    trackingMethod: traceMode === "change" || entry.usedChangeFallback ? "blame" : "blame-CMw",
     confidence: "exact",
     note: entry.cosmeticReason ? `Cosmetic change: ${entry.cosmeticReason}` : void 0
   };

package/dist/types/blame.d.ts

@@ -19,6 +19,16 @@ export interface BlameResult {
     /** Original line number before any moves/renames */
     originalLine?: number;
 }
+/**
+ * Result of running dual blame (origin + change) in parallel.
+ * Used by origin mode to cross-validate blame results.
+ */
+export interface DualBlameResult {
+    /** Primary blame results for the requested mode */
+    blame: BlameResult[];
+    /** Change-mode blame for cross-validation (populated only in origin mode) */
+    changeBlame: BlameResult[];
+}
 /**
  * Basic commit information from git log.
  */

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 export type { SymbolKind, SymbolInfo, ContentHash, ChangeType, ComparisonResult, AstTraceResult, } from './ast.js';
-export type { BlameResult, CommitInfo } from './blame.js';
+export type { BlameResult, CommitInfo, DualBlameResult } from './blame.js';
 export type { CacheEntry, CachedPRInfo } from './cache.js';
 export type { GitExecResult, GitExecOptions, BlameExecOptions, RemoteInfo, HealthReport, CloneStatus, } from './git.js';
 export type { GraphOptions, GraphResult } from './graph.js';

package/dist/types/stage.d.ts

@@ -6,6 +6,10 @@ export interface BlameStageResult {
     blame: BlameResult;
     isCosmetic: boolean;
     cosmeticReason?: CosmeticReason;
+    /** Whether this result was cross-validated against change blame (origin mode only) */
+    crossValidated?: boolean;
+    /** Whether the change blame result was used instead of origin (false positive filtered) */
+    usedChangeFallback?: boolean;
 }
 export interface AstDiffStageResult {
     originalSha: string;

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.8";
+export declare const VERSION = "0.0.9";

package/package.json

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