@eldrforge/kodrdriv 1.2.20 → 1.2.21

package/dist/commands/tree.js

@@ -2,7 +2,7 @@
 import path__default from 'path';
 import fs__default from 'fs/promises';
 import { exec } from 'child_process';
-import { safeJsonParse, validatePackageJson, getGloballyLinkedPackages, getGitStatusSummary, getLinkedDependencies, getLinkCompatibilityProblems, runSecure } from '@eldrforge/git-tools';
+import { safeJsonParse, validatePackageJson, getGloballyLinkedPackages, getGitStatusSummary, getLinkedDependencies, getLinkCompatibilityProblems, runSecure, run } from '@eldrforge/git-tools';
 import util from 'util';
 import { getLogger } from '../logging.js';
 import { create } from '../util/storage.js';
@@ -305,19 +305,48 @@ const validateScripts = async (packages, scripts)=>{
         missingScripts
     };
 };
-// Extract published version from package.json after successful publish
+// Extract published version from git tags after successful publish
+// After kodrdriv publish, the release version is captured in the git tag,
+// while package.json contains the next dev version
 const extractPublishedVersion = async (packageDir, packageLogger)=>{
     const storage = create({
         log: packageLogger.info
     });
     const packageJsonPath = path__default.join(packageDir, 'package.json');
     try {
+        // Get package name from package.json
         const packageJsonContent = await storage.readFile(packageJsonPath, 'utf-8');
         const parsed = safeJsonParse(packageJsonContent, packageJsonPath);
         const packageJson = validatePackageJson(parsed, packageJsonPath);
+        // Get the most recently created tag (by creation date, not version number)
+        // This ensures we get the tag that was just created by the publish, not an older tag with a higher version
+        const { stdout: tagOutput } = await run('git tag --sort=-creatordate', {
+            cwd: packageDir
+        });
+        const tags = tagOutput.trim().split('\n').filter(Boolean);
+        if (tags.length === 0) {
+            packageLogger.warn('No git tags found after publish');
+            return null;
+        }
+        // Get the most recently created tag (first in the list)
+        const latestTag = tags[0];
+        // Extract version from tag, handling various formats:
+        // - v1.2.3 -> 1.2.3
+        // - working/v1.2.3 -> 1.2.3
+        // - main/v1.2.3 -> 1.2.3
+        let version = latestTag;
+        // If tag contains a slash (branch prefix), extract everything after it
+        if (version.includes('/')) {
+            version = version.split('/').pop() || version;
+        }
+        // Remove 'v' prefix if present
+        if (version.startsWith('v')) {
+            version = version.substring(1);
+        }
+        packageLogger.verbose(`Extracted published version from tag: ${latestTag} -> ${version}`);
         return {
             packageName: packageJson.name,
-            version: packageJson.version,
+            version: version,
             publishTime: new Date()
         };
     } catch (error) {