@eldrforge/kodrdriv 1.2.29 → 1.2.124

package/dist/commands/publish.js

@@ -3,10 +3,10 @@ import { execute as execute$2 } from './commit.js';
 import { hasStagedChanges } from '../content/diff.js';
 import { execute as execute$1 } from './release.js';
 import { getDryRunLogger, getLogger } from '../logging.js';
-import { run, localBranchExists, runSecure, runWithDryRunSupport, safeJsonParse, validatePackageJson, validateGitRef, safeSyncBranchWithRemote, isBranchInSyncWithRemote } from '@eldrforge/git-tools';
+import { run, localBranchExists, remoteBranchExists, runSecure, runWithDryRunSupport, safeJsonParse, validatePackageJson, validateGitRef, safeSyncBranchWithRemote, isBranchInSyncWithRemote } from '@eldrforge/git-tools';
 import * as GitHub from '@eldrforge/github-tools';
-import { create } from '../util/storage.js';
-import { calculateBranchDependentVersion, calculateTargetVersion, checkIfTagExists, confirmVersionInteractively, getOutputPath } from '../util/general.js';
+import { createStorage, calculateTargetVersion } from '@eldrforge/shared';
+import { calculateBranchDependentVersion, checkIfTagExists, confirmVersionInteractively, getOutputPath } from '../util/general.js';
 import { DEFAULT_OUTPUT_DIRECTORY, KODRDRIV_DEFAULTS } from '../constants.js';
 import fs from 'fs/promises';
 import { runGitWithLock } from '../util/gitMutex.js';
@@ -129,9 +129,7 @@ const runPrechecks = async (runConfig, targetBranch)=>{
     var _runConfig_publish, _runConfig_publish1;
     const isDryRun = runConfig.dryRun || false;
     const logger = getDryRunLogger(isDryRun);
-    const storage = create({
-        log: logger.info
-    });
+    const storage = createStorage();
     logger.info('PRECHECK_STARTING: Executing publish prechecks | Phase: validation | Target: ' + (targetBranch || 'default'));
     // Check if we're in a git repository
     try {
@@ -413,9 +411,7 @@ const execute = async (runConfig)=>{
     var _runConfig_publish, _runConfig_publish1, _runConfig_publish2, _runConfig_publish3;
     const isDryRun = runConfig.dryRun || false;
     const logger = getDryRunLogger(isDryRun);
-    const storage = create({
-        log: logger.info
-    });
+    const storage = createStorage();
     // Get current branch for branch-dependent targeting
     let currentBranch;
     if (isDryRun) {
@@ -438,7 +434,7 @@ const execute = async (runConfig)=>{
                 // Use explicit fetch+merge instead of pull to avoid git config conflicts
                 await runGitWithLock(process.cwd(), async ()=>{
                     await run(`git fetch origin ${currentBranch}`);
-                    await run(`git merge origin/${currentBranch} --no-ff --no-edit`);
+                    await run(`git merge origin/${currentBranch} --no-edit`);
                 }, `sync ${currentBranch}`);
                 logger.info(`CURRENT_BRANCH_SYNCED: Successfully synchronized current branch with remote | Branch: ${currentBranch} | Remote: origin/${currentBranch} | Status: in-sync`);
             } else {
@@ -494,27 +490,46 @@ const execute = async (runConfig)=>{
     } else {
         const targetBranchExists = await localBranchExists(targetBranch);
         if (!targetBranchExists) {
-            logger.info(`TARGET_BRANCH_CREATING: Target branch does not exist, creating from current branch | Branch: ${targetBranch} | Source: HEAD | Remote: origin`);
-            try {
-                // Wrap git branch and push operations with lock
-                await runGitWithLock(process.cwd(), async ()=>{
-                    // Create the target branch from the current HEAD
-                    await runSecure('git', [
-                        'branch',
-                        targetBranch,
-                        'HEAD'
-                    ]);
-                    logger.info(`TARGET_BRANCH_CREATED: Successfully created target branch locally | Branch: ${targetBranch} | Source: HEAD`);
-                    // Push the new branch to origin
-                    await runSecure('git', [
-                        'push',
-                        'origin',
-                        targetBranch
-                    ]);
-                    logger.info(`TARGET_BRANCH_PUSHED: Successfully pushed new target branch to remote | Branch: ${targetBranch} | Remote: origin/${targetBranch}`);
-                }, `create and push target branch ${targetBranch}`);
-            } catch (error) {
-                throw new Error(`Failed to create target branch '${targetBranch}': ${error.message}`);
+            // Check if it exists on remote
+            const remoteExists = await remoteBranchExists(targetBranch);
+            if (remoteExists) {
+                logger.info(`TARGET_BRANCH_TRACKING: Target branch exists on remote but not locally, tracking origin/${targetBranch} | Branch: ${targetBranch}`);
+                try {
+                    await runGitWithLock(process.cwd(), async ()=>{
+                        // Create local branch tracking remote
+                        await runSecure('git', [
+                            'branch',
+                            targetBranch,
+                            `origin/${targetBranch}`
+                        ]);
+                        logger.info(`TARGET_BRANCH_CREATED: Successfully created local tracking branch | Branch: ${targetBranch} | Source: origin/${targetBranch}`);
+                    }, `track target branch ${targetBranch}`);
+                } catch (error) {
+                    throw new Error(`Failed to track target branch '${targetBranch}': ${error.message}`);
+                }
+            } else {
+                logger.info(`TARGET_BRANCH_CREATING: Target branch does not exist locally or on remote, creating from current branch | Branch: ${targetBranch} | Source: HEAD | Remote: origin`);
+                try {
+                    // Wrap git branch and push operations with lock
+                    await runGitWithLock(process.cwd(), async ()=>{
+                        // Create the target branch from the current HEAD
+                        await runSecure('git', [
+                            'branch',
+                            targetBranch,
+                            'HEAD'
+                        ]);
+                        logger.info(`TARGET_BRANCH_CREATED: Successfully created target branch locally | Branch: ${targetBranch} | Source: HEAD`);
+                        // Push the new branch to origin
+                        await runSecure('git', [
+                            'push',
+                            'origin',
+                            targetBranch
+                        ]);
+                        logger.info(`TARGET_BRANCH_PUSHED: Successfully pushed new target branch to remote | Branch: ${targetBranch} | Remote: origin/${targetBranch}`);
+                    }, `create and push target branch ${targetBranch}`);
+                } catch (error) {
+                    throw new Error(`Failed to create target branch '${targetBranch}': ${error.message}`);
+                }
             }
         } else {
             logger.info(`TARGET_BRANCH_EXISTS: Target branch already exists locally | Branch: ${targetBranch} | Status: ready`);
@@ -1026,7 +1041,7 @@ const execute = async (runConfig)=>{
                 if (remoteExists) {
                     await runGitWithLock(process.cwd(), async ()=>{
                         await run(`git fetch origin ${targetBranch}`);
-                        await run(`git merge origin/${targetBranch} --no-ff --no-edit`);
+                        await run(`git merge origin/${targetBranch} --no-edit`);
                     }, `sync ${targetBranch}`);
                     logger.info(`PUBLISH_TARGET_SYNCED: Successfully synced target with remote | Branch: ${targetBranch} | Remote: origin | Status: in-sync`);
                 } else {