@eldrforge/kodrdriv 1.2.13 → 1.2.16

package/dist/commands/publish.js

@@ -446,7 +446,7 @@ const execute = async (runConfig)=>{
     if (pr) {
         logger.info(`Found existing pull request for branch: ${pr.html_url}`);
     } else {
-        var _runConfig_publish4, _runConfig_publish5, _runConfig_publish6, _runConfig_publish7, _runConfig_publish8;
+        var _runConfig_publish4, _runConfig_publish5, _runConfig_publish6, _runConfig_publish7, _runConfig_publish8, _runConfig_publish9, _runConfig_publish10, _runConfig_publish11;
         logger.info('No open pull request found, starting new release publishing process...');
         // STEP 1: Prepare for release (update dependencies and run prepublish checks) with NO version bump yet
         logger.verbose('Preparing for release: switching from workspace to remote dependencies.');
@@ -587,7 +587,7 @@ const execute = async (runConfig)=>{
             logger.info('Would determine target version and update package.json');
             newVersion = '1.0.0'; // Mock version for dry run
         } else {
-            var _runConfig_publish9;
+            var _runConfig_publish12;
             const packageJsonContents = await storage.readFile('package.json', 'utf-8');
             const parsed = safeJsonParse(packageJsonContents, 'package.json');
             const packageJson = validatePackageJson(parsed, 'package.json');
@@ -604,9 +604,9 @@ const execute = async (runConfig)=>{
                 // Update targetBranch for the rest of the function
                 targetBranch = finalTargetBranch;
             } else {
-                var _runConfig_publish10;
+                var _runConfig_publish13;
                 // Use existing logic for backward compatibility
-                const targetVersionInput = ((_runConfig_publish10 = runConfig.publish) === null || _runConfig_publish10 === void 0 ? void 0 : _runConfig_publish10.targetVersion) || 'patch';
+                const targetVersionInput = ((_runConfig_publish13 = runConfig.publish) === null || _runConfig_publish13 === void 0 ? void 0 : _runConfig_publish13.targetVersion) || 'patch';
                 proposedVersion = calculateTargetVersion(currentVersion, targetVersionInput);
             }
             const targetTagName = `v${proposedVersion}`;
@@ -614,9 +614,9 @@ const execute = async (runConfig)=>{
             if (tagExists) {
                 throw new Error(`Tag ${targetTagName} already exists. Please choose a different version or delete the existing tag.`);
             }
-            if ((_runConfig_publish9 = runConfig.publish) === null || _runConfig_publish9 === void 0 ? void 0 : _runConfig_publish9.interactive) {
-                var _runConfig_publish11;
-                newVersion = await confirmVersionInteractively(currentVersion, proposedVersion, (_runConfig_publish11 = runConfig.publish) === null || _runConfig_publish11 === void 0 ? void 0 : _runConfig_publish11.targetVersion);
+            if ((_runConfig_publish12 = runConfig.publish) === null || _runConfig_publish12 === void 0 ? void 0 : _runConfig_publish12.interactive) {
+                var _runConfig_publish14;
+                newVersion = await confirmVersionInteractively(currentVersion, proposedVersion, (_runConfig_publish14 = runConfig.publish) === null || _runConfig_publish14 === void 0 ? void 0 : _runConfig_publish14.targetVersion);
                 const confirmedTagName = `v${newVersion}`;
                 const confirmedTagExists = await checkIfTagExists(confirmedTagName);
                 if (confirmedTagExists) {
@@ -644,33 +644,33 @@ const execute = async (runConfig)=>{
             }
         }
         logger.info('Generating release notes...');
+        // Use the existing currentBranch variable for tag detection
+        logger.debug(`Current branch for release notes: ${currentBranch}`);
         // Create a modified config for release notes generation that includes the publish --from, --interactive, and --from-main options
         const releaseConfig = {
             ...runConfig
         };
-        if (((_runConfig_publish6 = runConfig.publish) === null || _runConfig_publish6 === void 0 ? void 0 : _runConfig_publish6.from) || ((_runConfig_publish7 = runConfig.publish) === null || _runConfig_publish7 === void 0 ? void 0 : _runConfig_publish7.interactive) || ((_runConfig_publish8 = runConfig.publish) === null || _runConfig_publish8 === void 0 ? void 0 : _runConfig_publish8.fromMain)) {
-            // Pass the publish options to the release config
-            releaseConfig.release = {
-                ...runConfig.release,
-                ...runConfig.publish.from && {
-                    from: runConfig.publish.from
-                },
-                ...runConfig.publish.interactive && {
-                    interactive: runConfig.publish.interactive
-                },
-                ...runConfig.publish.fromMain && {
-                    fromMain: runConfig.publish.fromMain
-                }
-            };
-            if (runConfig.publish.from) {
-                logger.verbose(`Using custom 'from' reference for release notes: ${runConfig.publish.from}`);
-            }
-            if (runConfig.publish.interactive) {
-                logger.verbose('Interactive mode enabled for release notes generation');
-            }
-            if (runConfig.publish.fromMain) {
-                logger.verbose('Forcing comparison against main branch for release notes');
+        releaseConfig.release = {
+            ...runConfig.release,
+            currentBranch: currentBranch,
+            ...((_runConfig_publish6 = runConfig.publish) === null || _runConfig_publish6 === void 0 ? void 0 : _runConfig_publish6.from) && {
+                from: runConfig.publish.from
+            },
+            ...((_runConfig_publish7 = runConfig.publish) === null || _runConfig_publish7 === void 0 ? void 0 : _runConfig_publish7.interactive) && {
+                interactive: runConfig.publish.interactive
+            },
+            ...((_runConfig_publish8 = runConfig.publish) === null || _runConfig_publish8 === void 0 ? void 0 : _runConfig_publish8.fromMain) && {
+                fromMain: runConfig.publish.fromMain
             }
+        };
+        if ((_runConfig_publish9 = runConfig.publish) === null || _runConfig_publish9 === void 0 ? void 0 : _runConfig_publish9.from) {
+            logger.verbose(`Using custom 'from' reference for release notes: ${runConfig.publish.from}`);
+        }
+        if ((_runConfig_publish10 = runConfig.publish) === null || _runConfig_publish10 === void 0 ? void 0 : _runConfig_publish10.interactive) {
+            logger.verbose('Interactive mode enabled for release notes generation');
+        }
+        if ((_runConfig_publish11 = runConfig.publish) === null || _runConfig_publish11 === void 0 ? void 0 : _runConfig_publish11.fromMain) {
+            logger.verbose('Forcing comparison against main branch for release notes');
         }
         const releaseSummary = await execute$2(releaseConfig);
         if (isDryRun) {
@@ -707,12 +707,12 @@ const execute = async (runConfig)=>{
     }
     logger.info(`Waiting for PR #${pr.number} checks to complete...`);
     if (!isDryRun) {
-        var _runConfig_publish12, _runConfig_publish13, _runConfig_publish14;
+        var _runConfig_publish15, _runConfig_publish16, _runConfig_publish17;
         // Configure timeout and user confirmation behavior
-        const timeout = ((_runConfig_publish12 = runConfig.publish) === null || _runConfig_publish12 === void 0 ? void 0 : _runConfig_publish12.checksTimeout) || KODRDRIV_DEFAULTS.publish.checksTimeout;
-        const senditMode = ((_runConfig_publish13 = runConfig.publish) === null || _runConfig_publish13 === void 0 ? void 0 : _runConfig_publish13.sendit) || false;
+        const timeout = ((_runConfig_publish15 = runConfig.publish) === null || _runConfig_publish15 === void 0 ? void 0 : _runConfig_publish15.checksTimeout) || KODRDRIV_DEFAULTS.publish.checksTimeout;
+        const senditMode = ((_runConfig_publish16 = runConfig.publish) === null || _runConfig_publish16 === void 0 ? void 0 : _runConfig_publish16.sendit) || false;
         // sendit flag overrides skipUserConfirmation - if sendit is true, skip confirmation
-        const skipUserConfirmation = senditMode || ((_runConfig_publish14 = runConfig.publish) === null || _runConfig_publish14 === void 0 ? void 0 : _runConfig_publish14.skipUserConfirmation) || false;
+        const skipUserConfirmation = senditMode || ((_runConfig_publish17 = runConfig.publish) === null || _runConfig_publish17 === void 0 ? void 0 : _runConfig_publish17.skipUserConfirmation) || false;
         await waitForPullRequestChecks(pr.number, {
             timeout,
             skipUserConfirmation
@@ -913,9 +913,9 @@ const execute = async (runConfig)=>{
     }
     logger.info('Creating GitHub release...');
     if (isDryRun) {
-        var _runConfig_publish15;
+        var _runConfig_publish18;
         logger.info('Would read package.json version and create GitHub release with retry logic');
-        const milestonesEnabled = !((_runConfig_publish15 = runConfig.publish) === null || _runConfig_publish15 === void 0 ? void 0 : _runConfig_publish15.noMilestones);
+        const milestonesEnabled = !((_runConfig_publish18 = runConfig.publish) === null || _runConfig_publish18 === void 0 ? void 0 : _runConfig_publish18.noMilestones);
         if (milestonesEnabled) {
             logger.info('Would close milestone for released version');
         } else {
@@ -931,11 +931,11 @@ const execute = async (runConfig)=>{
         let retries = 3;
         while(retries > 0){
             try {
-                var _runConfig_publish16;
+                var _runConfig_publish19;
                 await createRelease(tagName, releaseTitle, releaseNotesContent);
                 logger.info(`GitHub release created successfully for tag: ${tagName}`);
                 // Close milestone for this version if enabled
-                const milestonesEnabled = !((_runConfig_publish16 = runConfig.publish) === null || _runConfig_publish16 === void 0 ? void 0 : _runConfig_publish16.noMilestones);
+                const milestonesEnabled = !((_runConfig_publish19 = runConfig.publish) === null || _runConfig_publish19 === void 0 ? void 0 : _runConfig_publish19.noMilestones);
                 if (milestonesEnabled) {
                     logger.info('🏁 Closing milestone for released version...');
                     const version = tagName.replace(/^v/, ''); // Remove 'v' prefix if present
@@ -968,12 +968,12 @@ const execute = async (runConfig)=>{
         if (isDryRun) {
             logger.info('Would monitor GitHub Actions workflows triggered by release');
         } else {
-            var _runConfig_publish17, _runConfig_publish18, _runConfig_publish19, _runConfig_publish20;
-            const workflowTimeout = ((_runConfig_publish17 = runConfig.publish) === null || _runConfig_publish17 === void 0 ? void 0 : _runConfig_publish17.releaseWorkflowsTimeout) || KODRDRIV_DEFAULTS.publish.releaseWorkflowsTimeout;
-            const senditMode = ((_runConfig_publish18 = runConfig.publish) === null || _runConfig_publish18 === void 0 ? void 0 : _runConfig_publish18.sendit) || false;
-            const skipUserConfirmation = senditMode || ((_runConfig_publish19 = runConfig.publish) === null || _runConfig_publish19 === void 0 ? void 0 : _runConfig_publish19.skipUserConfirmation) || false;
+            var _runConfig_publish20, _runConfig_publish21, _runConfig_publish22, _runConfig_publish23;
+            const workflowTimeout = ((_runConfig_publish20 = runConfig.publish) === null || _runConfig_publish20 === void 0 ? void 0 : _runConfig_publish20.releaseWorkflowsTimeout) || KODRDRIV_DEFAULTS.publish.releaseWorkflowsTimeout;
+            const senditMode = ((_runConfig_publish21 = runConfig.publish) === null || _runConfig_publish21 === void 0 ? void 0 : _runConfig_publish21.sendit) || false;
+            const skipUserConfirmation = senditMode || ((_runConfig_publish22 = runConfig.publish) === null || _runConfig_publish22 === void 0 ? void 0 : _runConfig_publish22.skipUserConfirmation) || false;
             // Get workflow names - either from config or auto-detect
-            let workflowNames = (_runConfig_publish20 = runConfig.publish) === null || _runConfig_publish20 === void 0 ? void 0 : _runConfig_publish20.releaseWorkflowNames;
+            let workflowNames = (_runConfig_publish23 = runConfig.publish) === null || _runConfig_publish23 === void 0 ? void 0 : _runConfig_publish23.releaseWorkflowNames;
             if (!workflowNames || workflowNames.length === 0) {
                 logger.info('No specific workflow names configured, auto-detecting workflows triggered by release events...');
                 try {
@@ -997,64 +997,12 @@ const execute = async (runConfig)=>{
     } else {
         logger.verbose('Skipping waiting for release workflows (disabled in config).');
     }
-    // Switch back to source branch and sync with target
     logger.info('');
-    logger.info('🔄 Syncing source branch with target after publish...');
-    await runWithDryRunSupport(`git checkout ${currentBranch}`, isDryRun);
-    if (!isDryRun) {
-        // Merge target into source (should be fast-forward since PR just merged)
-        logger.info(`Merging ${targetBranch} into ${currentBranch}...`);
-        try {
-            await run(`git merge ${targetBranch} --ff-only`);
-            logger.info(`✅ Merged ${targetBranch} into ${currentBranch}`);
-        } catch (error) {
-            // If ff-only fails, something is wrong - source diverged somehow
-            logger.error(`❌ Failed to fast-forward merge ${targetBranch} into ${currentBranch}`);
-            logger.error('   This suggests the source branch has commits not in target.');
-            logger.error('   This should not happen after a successful PR merge.');
-            logger.warn('⚠️  Attempting regular merge...');
-            await run(`git merge ${targetBranch} --no-edit`);
-        }
-        // Determine version bump based on branch configuration
-        let versionCommand = 'prepatch'; // Default
-        let versionTag = 'dev'; // Default
-        if (branchDependentVersioning && runConfig.branches) {
-            const sourceBranchConfig = runConfig.branches[currentBranch];
-            if (sourceBranchConfig === null || sourceBranchConfig === void 0 ? void 0 : sourceBranchConfig.version) {
-                // Use configured version strategy for source branch
-                if (sourceBranchConfig.version.increment) {
-                    versionCommand = `pre${sourceBranchConfig.version.increment}`;
-                }
-                if (sourceBranchConfig.version.tag) {
-                    versionTag = sourceBranchConfig.version.tag;
-                }
-            }
-        }
-        // Bump to next development version
-        logger.info(`Bumping to next development version...`);
-        try {
-            const { stdout: newVersion } = await run(`npm version ${versionCommand} --preid=${versionTag}`);
-            logger.info(`✅ Version bumped to: ${newVersion.trim()}`);
-        } catch (versionError) {
-            logger.warn(`⚠️  Failed to bump version: ${versionError.message}`);
-            logger.warn('   You may need to manually bump the version for next development cycle.');
-        }
-        // Push updated source branch
-        logger.info(`Pushing updated ${currentBranch} branch...`);
-        try {
-            await run(`git push origin ${currentBranch}`);
-            logger.info(`✅ Pushed ${currentBranch} to origin`);
-        } catch (pushError) {
-            logger.warn(`⚠️  Failed to push ${currentBranch}: ${pushError.message}`);
-            logger.warn(`   Please push manually: git push origin ${currentBranch}`);
-        }
-    } else {
-        logger.info(`Would merge ${targetBranch} into ${currentBranch} with --ff-only`);
-        logger.info(`Would bump version to next development version`);
-        logger.info(`Would push ${currentBranch} to origin`);
-    }
+    logger.info(`✅ Publish complete!`);
     logger.info('');
-    logger.info(`✅ Publish complete - on ${currentBranch} with next development version`);
+    logger.info(`💡 Next steps:`);
+    logger.info(`   - Run 'kodrdriv development' to return to working branch and bump version`);
+    logger.info(`   - Or manually switch to your working branch to continue development`);
 };
 
 export { execute };