@logickernel/agileflow 0.15.1 → 0.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logickernel/agileflow",
-  "version": "0.15.1",
+  "version": "0.16.1",
   "description": "Automatic semantic versioning and changelog generation based on conventional commits",
   "main": "src/index.js",
   "bin": {

package/src/git-push.js

@@ -14,8 +14,9 @@ const os = require('os');
  * @param {boolean} quiet - If true, suppress success message
  * @returns {Promise<void>}
  */
-async function pushTag(tagName, message, quiet = false) {
+async function pushTag(tagName, message, quiet = false, remote = 'origin') {
   const safeTag = String(tagName).replace(/"/g, '\\"');
+  const safeRemote = String(remote).replace(/"/g, '\\"');
   
   // Write message to a temp file to avoid shell escaping issues with special characters
   const tempFile = path.join(os.tmpdir(), `agileflow-tag-${crypto.randomBytes(8).toString('hex')}.txt`);
@@ -25,8 +26,8 @@ async function pushTag(tagName, message, quiet = false) {
     // Create annotated tag using -F to read message from file
     execSync(`git tag -a "${safeTag}" -F "${tempFile}"`, { stdio: 'pipe' });
     
-    // Push to origin
-    execSync(`git push origin "${safeTag}"`, { stdio: 'pipe' });
+    // Push to remote
+    execSync(`git push "${safeRemote}" "${safeTag}"`, { stdio: 'pipe' });
     
     if (!quiet) {
       console.log(`Tag ${tagName} created and pushed successfully.`);

package/src/github-push.js

@@ -130,7 +130,7 @@ function makeRequest({ method, path, accessToken, body }) {
  * @param {boolean} quiet - If true, suppress success message
  * @returns {Promise<void>}
  */
-async function pushTag(tagName, message, quiet = false) {
+async function pushTag(tagName, message, quiet = false, remote = 'origin') {
   const accessToken = process.env.AGILEFLOW_TOKEN;
   const repository = process.env.GITHUB_REPOSITORY;
   const commitSha = process.env.GITHUB_SHA;

package/src/gitlab-push.js

@@ -96,7 +96,7 @@ function createTagViaAPI(tagName, message, projectPath, serverHost, accessToken,
  * @param {string} message - The tag message
  * @returns {Promise<void>}
  */
-async function pushTag(tagName, message, quiet = false) {
+async function pushTag(tagName, message, quiet = false, remote = 'origin') {
   const accessToken = process.env.AGILEFLOW_TOKEN;
   const serverHost = process.env.CI_SERVER_HOST;
   const projectPath = process.env.CI_PROJECT_PATH;

package/src/index.js

@@ -12,7 +12,7 @@ Usage:
 
 Commands:
   <none>   Prints the current version, next version, commits, and changelog
-  push     Push a semantic version tag to the remote repository
+  push [remote]  Push a semantic version tag to the remote repository (default: origin)
   gitlab   Create a semantic version tag via GitLab API (for GitLab CI)
   github   Create a semantic version tag via GitHub API (for GitHub Actions)
 
@@ -93,7 +93,7 @@ function displayVersionInfo(info, quiet) {
  * @param {string} pushType - 'push', 'gitlab', or 'github'
  * @param {{quiet: boolean}} options
  */
-async function handlePushCommand(pushType, options) {
+async function handlePushCommand(pushType, options, remote = 'origin') {
   const info = await processVersionInfo();
   
   // Display version info
@@ -125,7 +125,7 @@ async function handlePushCommand(pushType, options) {
     console.log(`\nCreating tag ${info.newVersion}...`);
   }
   
-  await pushModule.pushTag(info.newVersion, tagMessage, options.quiet);
+  await pushModule.pushTag(info.newVersion, tagMessage, options.quiet, remote);
 }
 
 async function main() {
@@ -156,7 +156,8 @@ async function main() {
 
   // Handle push commands
   if (cmd === 'push' || cmd === 'gitlab' || cmd === 'github') {
-    await handlePushCommand(cmd, options);
+    const remote = rest.find(arg => !arg.startsWith('-')) || 'origin';
+    await handlePushCommand(cmd, options, remote);
     return;
   }
 

package/src/utils.js

@@ -98,7 +98,9 @@ function fetchTags() {
   try {
     const remotes = runWithOutput('git remote').trim();
     if (!remotes) return false;
-    runWithOutput('git fetch --tags --prune --prune-tags');
+    // --force allows updating local tags that conflict with remote tags.
+    // Avoid --prune-tags which can fail in shallow CI clones.
+    runWithOutput('git fetch --tags --force');
     return true;
   } catch {
     return false;
@@ -112,16 +114,35 @@ function fetchTags() {
  */
 function buildTagMap() {
   try {
-    const output = runWithOutput('git tag --format=%(refname:short)|%(*objectname)|%(objectname)').trim();
+    // %(objecttype) distinguishes lightweight (commit) from annotated (tag) refs.
+    // %(*objectname) is the peeled commit SHA for annotated tags, but may be empty
+    // in shallow clones where git has not computed the peeled ref.
+    const output = runWithOutput('git tag --format=%(refname:short)|%(objecttype)|%(*objectname)|%(objectname)').trim();
     if (!output) return new Map();
     const map = new Map();
     for (const line of output.split('\n')) {
-      const [name, deref, obj] = line.split('|');
-      // Annotated tags dereference to the commit via %(*objectname);
-      // lightweight tags point directly via %(objectname).
-      const sha = (deref || obj || '').trim();
+      const [name, type, deref, obj] = line.split('|');
       const tagName = (name || '').trim();
-      if (!sha || !tagName) continue;
+      if (!tagName) continue;
+
+      let sha;
+      if (type === 'commit') {
+        // Lightweight tag: %(objectname) is the commit SHA directly.
+        sha = (obj || '').trim();
+      } else {
+        // Annotated tag: use peeled commit SHA if available.
+        sha = (deref || '').trim();
+        if (!sha) {
+          // Peeling unavailable (shallow clone) — dereference via rev-parse.
+          try {
+            sha = runWithOutput(`git rev-parse "${tagName}^{}"`).trim();
+          } catch {
+            continue;
+          }
+        }
+      }
+
+      if (!sha) continue;
       if (!map.has(sha)) map.set(sha, []);
       map.get(sha).push(tagName);
     }
@@ -158,28 +179,50 @@ function expandCommitInfo(commits) {
   if (!commits?.length) {
     return { latestVersion: null, commits: [] };
   }
-  
-  const taggedIndex = commits.findIndex(commit => 
-    commit.tags?.some(tag => SEMVER_PATTERN.test(tag))
-  );
-  
-  if (taggedIndex === -1) {
-    return { latestVersion: null, commits };
-  }
-  
-  const latestVersion = commits[taggedIndex].tags
-    .filter(tag => SEMVER_PATTERN.test(tag))
-    .sort((a, b) => {
+
+  // Find the commit tagged with the highest semver version in the history.
+  // Using highest-version (not first-found) handles the case where a lower version
+  // was accidentally tagged on a recent commit (e.g. a failed CI run).
+  let bestIndex = -1;
+  let bestVersion = null;
+
+  for (let i = 0; i < commits.length; i++) {
+    const semverTags = commits[i].tags?.filter(tag => SEMVER_PATTERN.test(tag));
+    if (!semverTags?.length) continue;
+
+    const highest = semverTags.sort((a, b) => {
       const pa = parseVersion(a);
       const pb = parseVersion(b);
       if (pb.major !== pa.major) return pb.major - pa.major;
       if (pb.minor !== pa.minor) return pb.minor - pa.minor;
       return pb.patch - pa.patch;
     })[0];
-  // Exclude the tagged commit itself - only return commits since the tag
+
+    if (!bestVersion) {
+      bestVersion = highest;
+      bestIndex = i;
+    } else {
+      const pBest = parseVersion(bestVersion);
+      const pCand = parseVersion(highest);
+      const isHigher =
+        pCand.major > pBest.major ||
+        (pCand.major === pBest.major && pCand.minor > pBest.minor) ||
+        (pCand.major === pBest.major && pCand.minor === pBest.minor && pCand.patch > pBest.patch);
+      if (isHigher) {
+        bestVersion = highest;
+        bestIndex = i;
+      }
+    }
+  }
+
+  if (bestIndex === -1) {
+    return { latestVersion: null, commits };
+  }
+
+  // Return only commits newer than the highest-version tag
   return {
-    latestVersion,
-    commits: commits.slice(0, taggedIndex),
+    latestVersion: bestVersion,
+    commits: commits.slice(0, bestIndex),
   };
 }
 
@@ -413,7 +456,12 @@ function getAllBranchCommits(branch) {
     try {
       resolvedSha = runWithOutput(`git rev-parse --verify -- origin/${branch}`).trim();
     } catch {
-      return [];
+      // Last resort: use HEAD (detached HEAD in CI where remote tracking isn't set up)
+      try {
+        resolvedSha = runWithOutput('git rev-parse HEAD').trim();
+      } catch {
+        return [];
+      }
     }
   }