@aisdlc/core 2.2.2 → 2.2.3

package/dist/index.cjs

@@ -9824,10 +9824,39 @@ function computeReworkRatios(totalTime, totalTokens, totalCost, reworkTime, rewo
     costPercent: totalCost > 0 ? Math.round(reworkCost / totalCost * 1e4) / 100 : 0
   };
 }
-function aggregateReleaseKpis(releaseBranch, baseBranch = "main", options = {}) {
+function resolveReleaseBaseBranch(release, explicitBase, options = {}) {
   const cwd = options.cwd || process.cwd();
+  if (explicitBase && explicitBase !== release) {
+    return explicitBase;
+  }
+  if (release !== "main" && release !== "master") {
+    return "main";
+  }
+  try {
+    const lastTag = child_process.execFileSync("git", ["describe", "--tags", "--abbrev=0", `${release}^`], {
+      cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    if (lastTag) return lastTag;
+  } catch {
+  }
+  try {
+    const rootSha = child_process.execFileSync("git", ["rev-list", "--max-parents=0", release], {
+      cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim().split("\n")[0];
+    if (rootSha) return rootSha;
+  } catch {
+  }
+  return release;
+}
+function aggregateReleaseKpis(releaseBranch, baseBranch, options = {}) {
+  const cwd = options.cwd || process.cwd();
+  const effectiveBase = resolveReleaseBaseBranch(releaseBranch, baseBranch, { cwd });
   const resolvedRelease = resolveGitRef(cwd, releaseBranch);
-  const resolvedBase = resolveGitRef(cwd, baseBranch);
+  const resolvedBase = resolveGitRef(cwd, effectiveBase);
   const records = extractCommitKpisFromRange(resolvedBase, resolvedRelease, options);
   const statsMap = {};
   const bugList = [];
@@ -12400,33 +12429,42 @@ function resolveActiveBranch(rootDir) {
     return "HEAD";
   }
 }
-function resolveDefaultBranchBase(rootDir) {
+function resolveRootCommit(rootDir, targetRef) {
   try {
-    const count = parseInt(
-      child_process.execFileSync("git", ["rev-list", "--count", "HEAD"], {
-        cwd: rootDir,
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim(),
-      10
-    );
-    if (count <= 20) {
-      return child_process.execFileSync("git", ["rev-list", "--max-parents=0", "HEAD"], {
+    return child_process.execFileSync("git", ["rev-list", "--max-parents=0", targetRef], {
+      cwd: rootDir,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim().split("\n")[0] || targetRef;
+  } catch {
+    return targetRef;
+  }
+}
+function resolveDefaultBranchBase(rootDir, targetRef = "HEAD") {
+  try {
+    const rawCount = child_process.execFileSync("git", ["rev-list", "--count", "--first-parent", targetRef], {
+      cwd: rootDir,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    const firstParentCount = parseInt(rawCount, 10);
+    if (firstParentCount > 20) {
+      const candidateRef = `${targetRef}~20`;
+      child_process.execFileSync("git", ["rev-parse", "--verify", "--quiet", candidateRef], {
         cwd: rootDir,
-        encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"]
-      }).trim().split("\n")[0];
+      });
+      return candidateRef;
     }
-    return "HEAD~20";
   } catch {
-    return "HEAD~1";
   }
+  return resolveRootCommit(rootDir, targetRef);
 }
 function resolveActivePrKpi(rootDir, activeBranch) {
   try {
     const isDefaultBranch = activeBranch === "main" || activeBranch === "master";
     if (isDefaultBranch) {
-      const base = resolveDefaultBranchBase(rootDir);
+      const base = resolveDefaultBranchBase(rootDir, "HEAD");
       return aggregatePrKpis(base, "HEAD", { cwd: rootDir });
     }
     const prKpi = aggregatePrKpis("main", "HEAD", { cwd: rootDir });
@@ -12481,7 +12519,7 @@ function resolveCandidateBranches(rootDir, activeBranch, history) {
 function fetchBranchKpi(rootDir, branch) {
   try {
     const isDefault = branch === "main" || branch === "master";
-    const base = isDefault ? resolveDefaultBranchBase(rootDir) : "main";
+    const base = isDefault ? resolveDefaultBranchBase(rootDir, branch) : "main";
     const kpi = aggregatePrKpis(base, branch, { cwd: rootDir });
     return kpi && kpi.totalCommits > 0 ? kpi : null;
   } catch {
@@ -16102,9 +16140,11 @@ exports.resolveAgentTargets = resolveAgentTargets;
 exports.resolveBranchHierarchy = resolveBranchHierarchy;
 exports.resolveCiEnvironment = resolveCiEnvironment;
 exports.resolveCytoscapePath = resolveCytoscapePath;
+exports.resolveDefaultBranchBase = resolveDefaultBranchBase;
 exports.resolveFeatureFilePath = resolveFeatureFilePath;
 exports.resolveGitRef = resolveGitRef;
 exports.resolveLicenseFromFile = resolveLicenseFromFile;
+exports.resolveReleaseBaseBranch = resolveReleaseBaseBranch;
 exports.resolveSastCwe = resolveSastCwe;
 exports.resolveSastOwasp = resolveSastOwasp;
 exports.resolveSchemaForArtifact = resolveSchemaForArtifact;