@eldrforge/commands-publish 0.1.3 → 0.1.4

package/dist/index.js

@@ -1,11 +1,11 @@
-import { getDryRunLogger, findDevelopmentBranch, KODRDRIV_DEFAULTS, DEFAULT_TO_COMMIT_ALIAS, Log, DEFAULT_MAX_DIFF_BYTES, Diff, DEFAULT_EXCLUDED_PATTERNS, DEFAULT_OUTPUT_DIRECTORY, toAIConfig, createStorageAdapter, createLoggerAdapter, getOutputPath, getTimestampedResponseFilename, getTimestampedRequestFilename, filterContent, getTimestampedReleaseNotesFilename, improveContentWithLLM, validateReleaseSummary, runGitWithLock, calculateBranchDependentVersion, checkIfTagExists, confirmVersionInteractively, getLogger } from '@eldrforge/core';
-import { getCurrentBranch, run, localBranchExists, getDefaultFromRef, safeJsonParse, remoteBranchExists, runSecure, runWithDryRunSupport, validatePackageJson, validateGitRef, safeSyncBranchWithRemote, isBranchInSyncWithRemote } from '@eldrforge/git-tools';
+import { getDryRunLogger, findDevelopmentBranch, KODRDRIV_DEFAULTS, incrementPatchVersion, incrementMajorVersion, incrementMinorVersion, DEFAULT_TO_COMMIT_ALIAS, Log, DEFAULT_MAX_DIFF_BYTES, Diff, DEFAULT_EXCLUDED_PATTERNS, DEFAULT_OUTPUT_DIRECTORY, toAIConfig, createStorageAdapter, createLoggerAdapter, getOutputPath, getTimestampedResponseFilename, getTimestampedRequestFilename, filterContent, getTimestampedReleaseNotesFilename, improveContentWithLLM, validateReleaseSummary, runGitWithLock, calculateBranchDependentVersion, checkIfTagExists, confirmVersionInteractively, getLogger } from '@eldrforge/core';
+import { getCurrentBranch, run, localBranchExists, safeJsonParse, validatePackageJson, getDefaultFromRef, remoteBranchExists, runSecure, runWithDryRunSupport, validateGitRef, safeSyncBranchWithRemote, isBranchInSyncWithRemote } from '@eldrforge/git-tools';
+import { createStorage, calculateTargetVersion } from '@eldrforge/shared';
 import path from 'path';
 import * as Commit from '@eldrforge/commands-git';
 import { Formatter } from '@riotprompt/riotprompt';
 import 'dotenv/config';
 import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice, STANDARD_CHOICES, getLLMFeedbackInEditor, editContentInEditor, createCompletionWithRetry, createReleasePrompt, runAgenticPublish, formatAgenticPublishResult } from '@eldrforge/ai-service';
-import { createStorage, calculateTargetVersion } from '@eldrforge/shared';
 import * as GitHub from '@eldrforge/github-tools';
 import fs from 'fs/promises';
 
@@ -163,7 +163,7 @@ import fs from 'fs/promises';
                 const gitStatus = await run('git status --porcelain');
                 if (gitStatus.stdout.trim()) {
                     await run('git add -A');
-                    await run('git commit -m "chore: update package-lock.json after merge"');
+                    await run('git commit -m "chore: update dependencies after merge"');
                 }
                 // Stay on working branch for development (removed checkout development)
                 mergedDevelopmentIntoWorking = true;
@@ -255,9 +255,9 @@ import fs from 'fs/promises';
                             // Check if npm install created changes
                             const gitStatus = await run('git status --porcelain');
                             if (gitStatus.stdout.trim()) {
-                                logger.info('DEV_POST_MERGE_COMMIT: Committing changes from npm install | Files: package-lock.json | Purpose: Finalize merge');
+                                logger.info('DEV_POST_MERGE_COMMIT: Committing changes from npm install | Purpose: Finalize merge');
                                 await run('git add -A');
-                                await run('git commit -m "chore: update package-lock.json after merge"');
+                                await run('git commit -m "chore: update dependencies after merge"');
                             }
                         } catch (mergeError) {
                             if (mergeError.message && mergeError.message.includes('CONFLICT')) {
@@ -299,10 +299,10 @@ import fs from 'fs/promises';
                     // Check if npm install created any changes (e.g., package-lock.json)
                     const gitStatus = await run('git status --porcelain');
                     if (gitStatus.stdout.trim()) {
-                        logger.info('DEV_POST_MERGE_COMMIT: Committing changes from npm install | Files: package-lock.json | Purpose: Finalize merge');
+                        logger.info('DEV_POST_MERGE_COMMIT: Committing changes from npm install | Purpose: Finalize merge');
                         await run('git add -A');
                         await run(`git commit -m "chore: update package-lock.json after merge"`);
-                        logger.info('DEV_CHANGES_COMMITTED: Changes committed successfully | Files: package-lock.json | Status: committed');
+                        logger.info('DEV_CHANGES_COMMITTED: Changes committed successfully | Status: committed');
                     }
                 } catch (error) {
                     if (error.message && error.message.includes('CONFLICT')) {
@@ -325,7 +325,7 @@ import fs from 'fs/promises';
         } else {
             logger.info('DEV_DEV_MERGE_DRY_RUN: Would merge development if exists | Mode: dry-run | Source: development | Target: working');
             logger.info('DEV_INSTALL_DRY_RUN: Would run npm install after merge | Mode: dry-run | Command: npm install');
-            logger.info('DEV_COMMIT_DRY_RUN: Would commit npm install changes | Mode: dry-run | Files: package-lock.json');
+            logger.info('DEV_COMMIT_DRY_RUN: Would commit npm install changes | Mode: dry-run');
         }
         // Step 4.5: Create retroactive tags if requested (one-time operation)
         if ((_runConfig_development1 = runConfig.development) === null || _runConfig_development1 === void 0 ? void 0 : _runConfig_development1.createRetroactiveTags) {
@@ -399,30 +399,59 @@ import fs from 'fs/promises';
         } else if (isDryRun) {
             logger.info('Tagging disabled (--no-tag-working-branch)');
         }
-        // Step 6: Run npm version to bump version with increment level
-        let versionCommand;
+        // Step 6: Bump version manually to avoid npm version's automatic git add
+        // Note: npm version --no-git-tag-version still runs "git add package.json package-lock.json"
+        // which fails when package-lock.json is gitignored
         if ([
             'patch',
             'minor',
             'major'
         ].includes(incrementLevel)) {
-            versionCommand = `pre${incrementLevel}`;
-            logger.info(`DEV_VERSION_BUMPING: Bumping version with prerelease tag | Level: ${incrementLevel} | Tag: ${prereleaseTag} | Command: npm version`);
+            logger.info(`DEV_VERSION_BUMPING: Bumping version with prerelease tag | Level: ${incrementLevel} | Tag: ${prereleaseTag}`);
         } else {
-            // Explicit version like "3.5.0"
-            const cleanVersion = incrementLevel.replace(/^v/, '');
-            versionCommand = `${cleanVersion}-${prereleaseTag}.0`;
-            logger.info(`DEV_VERSION_EXPLICIT: Setting explicit version | Version: ${versionCommand} | Type: explicit`);
+            logger.info(`DEV_VERSION_EXPLICIT: Setting explicit version | Version: ${incrementLevel}-${prereleaseTag}.0 | Type: explicit`);
         }
         if (!isDryRun) {
             try {
-                const versionResult = [
+                const storage = createStorage();
+                const pkgJsonContents = await storage.readFile('package.json', 'utf-8');
+                const pkgJson = safeJsonParse(pkgJsonContents, 'package.json');
+                const validatedPkgJson = validatePackageJson(pkgJson, 'package.json');
+                const currentVersion = validatedPkgJson.version;
+                let newVersion;
+                if ([
                     'patch',
                     'minor',
                     'major'
-                ].includes(incrementLevel) ? await run(`npm version ${versionCommand} --preid=${prereleaseTag}`) : await run(`npm version ${versionCommand}`);
-                const newVersion = versionResult.stdout.trim();
+                ].includes(incrementLevel)) {
+                    // First increment the base version, then add prerelease tag
+                    let baseVersion;
+                    switch(incrementLevel){
+                        case 'patch':
+                            baseVersion = incrementPatchVersion(currentVersion);
+                            break;
+                        case 'minor':
+                            baseVersion = incrementMinorVersion(currentVersion);
+                            break;
+                        case 'major':
+                            baseVersion = incrementMajorVersion(currentVersion);
+                            break;
+                        default:
+                            baseVersion = incrementPatchVersion(currentVersion);
+                    }
+                    newVersion = `${baseVersion}-${prereleaseTag}.0`;
+                } else {
+                    // Explicit version like "3.5.0"
+                    const cleanVersion = incrementLevel.replace(/^v/, '');
+                    newVersion = `${cleanVersion}-${prereleaseTag}.0`;
+                }
+                // Update package.json with new version
+                validatedPkgJson.version = newVersion;
+                await storage.writeFile('package.json', JSON.stringify(validatedPkgJson, null, 2) + '\n', 'utf-8');
                 logger.info(`DEV_VERSION_BUMPED: Version bumped successfully | New Version: ${newVersion} | Status: completed`);
+                // Manually commit the version bump (package-lock.json is ignored)
+                await run('git add package.json');
+                await run(`git commit -m "chore: bump to ${newVersion}"`);
                 // Return appropriate message based on what actions were taken
                 if (mergedDevelopmentIntoWorking) {
                     return 'Merged development into working and ready for development';
@@ -445,9 +474,9 @@ import fs from 'fs/promises';
                 'minor',
                 'major'
             ].includes(incrementLevel)) {
-                logger.info(`Would run: npm version ${versionCommand} --preid=${prereleaseTag}`);
+                logger.info(`Would bump version with prerelease tag: ${incrementLevel} --preid=${prereleaseTag}`);
             } else {
-                logger.info(`Would run: npm version ${versionCommand}`);
+                logger.info(`Would set explicit version: ${incrementLevel}-${prereleaseTag}.0`);
             }
             // Return appropriate message based on what actions were taken
             if (mergedDevelopmentIntoWorking) {
@@ -1185,15 +1214,15 @@ const isReleaseNecessaryComparedToTarget = async (targetBranch, isDryRun)=>{
             reason: 'No detectable changes via diff; proceeding conservatively'
         };
     }
-    // If any files changed other than package.json or package-lock.json, a release is necessary
-    const nonVersionFiles = changedFiles.filter((f)=>f !== 'package.json' && f !== 'package-lock.json');
+    // If any files changed other than package.json (package-lock.json is gitignored), a release is necessary
+    const nonVersionFiles = changedFiles.filter((f)=>f !== 'package.json');
     if (nonVersionFiles.length > 0) {
         return {
             necessary: true,
             reason: `Changed files beyond version bump: ${nonVersionFiles.join(', ')}`
         };
     }
-    // Only package.json and/or package-lock.json changed. Verify package.json change is only the version field
+    // Only package.json changed. Verify package.json change is only the version field
     try {
         // Read package.json content from both branches
         const { stdout: basePkgStdout } = await runSecure('git', [
@@ -1455,10 +1484,9 @@ const execute = async (runConfig)=>{
         logger.info('PREPUBLISH_SCRIPT_RUNNING: Executing prepublishOnly script | Script: prepublishOnly | Purpose: Run pre-flight checks (clean, lint, build, test)');
         await runWithDryRunSupport('npm run prepublishOnly', isDryRun, {}, true); // Use inherited stdio
         // STEP 2: Commit dependency updates if any (still no version bump)
-        logger.verbose('DEPS_STAGING: Staging dependency updates for commit | Files: package.json + package-lock.json | Command: git add | Note: Version bump not yet applied');
-        // Check if package-lock.json exists before trying to stage it
-        const packageLockExists = await storage.exists('package-lock.json');
-        const filesToStage = packageLockExists ? 'package.json package-lock.json' : 'package.json';
+        logger.verbose('DEPS_STAGING: Staging dependency updates for commit | Files: package.json | Command: git add | Note: Version bump not yet applied, package-lock.json ignored');
+        // Skip package-lock.json as it's in .gitignore to avoid private registry refs
+        const filesToStage = 'package.json';
         // Wrap git operations with repository lock to prevent .git/index.lock conflicts
         await runGitWithLock(process.cwd(), async ()=>{
             await runWithDryRunSupport(`git add ${filesToStage}`, isDryRun);
@@ -1522,10 +1550,9 @@ const execute = async (runConfig)=>{
                                     const { stdout: conflictedFiles } = await run('git diff --name-only --diff-filter=U');
                                     const conflicts = conflictedFiles.trim().split('\n').filter(Boolean);
                                     logger.verbose(`MERGE_CONFLICTS_LIST: Conflicted files detected | Files: ${conflicts.join(', ')} | Count: ${conflicts.length}`);
-                                    // Check if conflicts are only in package.json and package-lock.json
+                                    // Check if conflicts are only in package.json (package-lock.json is gitignored)
                                     const versionFiles = [
-                                        'package.json',
-                                        'package-lock.json'
+                                        'package.json'
                                     ];
                                     const nonVersionConflicts = conflicts.filter((f)=>!versionFiles.includes(f));
                                     if (nonVersionConflicts.length > 0) {
@@ -1568,9 +1595,8 @@ const execute = async (runConfig)=>{
                                 const { stdout: mergeChangesStatus } = await run('git status --porcelain');
                                 if (mergeChangesStatus.trim()) {
                                     logger.verbose('POST_MERGE_CHANGES_DETECTED: Changes detected after npm install | Action: Staging for commit | Command: git add');
-                                    // Check if package-lock.json exists before trying to stage it
-                                    const packageLockExistsPostMerge = await storage.exists('package-lock.json');
-                                    const filesToStagePostMerge = packageLockExistsPostMerge ? 'package.json package-lock.json' : 'package.json';
+                                    // Skip package-lock.json as it's in .gitignore to avoid private registry refs
+                                    const filesToStagePostMerge = 'package.json';
                                     await run(`git add ${filesToStagePostMerge}`);
                                     if (await Diff.hasStagedChanges()) {
                                         logger.verbose('POST_MERGE_COMMIT: Committing post-merge changes | Files: ' + filesToStagePostMerge + ' | Purpose: Finalize merge');
@@ -1721,9 +1747,8 @@ const execute = async (runConfig)=>{
         }
         // STEP 5: Commit version bump as a separate commit
         logger.verbose('Staging version bump for commit');
-        // Check if package-lock.json exists before trying to stage it
-        const packageLockExistsVersionBump = await storage.exists('package-lock.json');
-        const filesToStageVersionBump = packageLockExistsVersionBump ? 'package.json package-lock.json' : 'package.json';
+        // Skip package-lock.json as it's in .gitignore to avoid private registry refs
+        const filesToStageVersionBump = 'package.json';
         // Wrap git operations with lock
         await runGitWithLock(process.cwd(), async ()=>{
             await runWithDryRunSupport(`git add ${filesToStageVersionBump}`, isDryRun);
@@ -2191,15 +2216,13 @@ const execute = async (runConfig)=>{
                 logger.info(`PUBLISH_MERGE_SUCCESS: Merged target into source | Target: ${targetBranch} | Source: ${currentBranch} | Status: merged`);
             }
         }
-        // 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.incrementLevel) {
-                    versionCommand = `pre${sourceBranchConfig.version.incrementLevel}`;
+                    `pre${sourceBranchConfig.version.incrementLevel}`;
                 }
                 if (sourceBranchConfig.version.tag) {
                     versionTag = sourceBranchConfig.version.tag;
@@ -2207,10 +2230,28 @@ const execute = async (runConfig)=>{
             }
         }
         // Bump to next development version
-        logger.info(`PUBLISH_DEV_VERSION_BUMPING: Bumping to next development version | Command: ${versionCommand} | Tag: ${versionTag} | Purpose: Prepare for next cycle`);
+        // Note: We manually update package.json instead of using npm version to avoid
+        // npm's automatic "git add package.json package-lock.json" which fails when
+        // package-lock.json is gitignored
+        logger.info(`PUBLISH_DEV_VERSION_BUMPING: Bumping to next development version | Tag: ${versionTag} | Purpose: Prepare for next cycle`);
         try {
-            const { stdout: newVersion } = await run(`npm version ${versionCommand} --preid=${versionTag}`);
-            logger.info(`PUBLISH_DEV_VERSION_BUMPED: Version bumped successfully | New Version: ${newVersion.trim()} | Type: development | Status: completed`);
+            // Read current package.json
+            const pkgJsonContents = await storage.readFile('package.json', 'utf-8');
+            const pkgJson = safeJsonParse(pkgJsonContents, 'package.json');
+            const validatedPkgJson = validatePackageJson(pkgJson, 'package.json');
+            const currentVer = validatedPkgJson.version;
+            // Import incrementPrereleaseVersion from core
+            const { incrementPrereleaseVersion } = await import('@eldrforge/core');
+            const newVersion = incrementPrereleaseVersion(currentVer, versionTag);
+            // Update package.json with new version
+            validatedPkgJson.version = newVersion;
+            await storage.writeFile('package.json', JSON.stringify(validatedPkgJson, null, 2) + '\n', 'utf-8');
+            logger.info(`PUBLISH_DEV_VERSION_BUMPED: Version bumped successfully | New Version: ${newVersion} | Type: development | Status: completed`);
+            // Manually commit the version bump (package-lock.json is ignored)
+            await runGitWithLock(process.cwd(), async ()=>{
+                await run('git add package.json');
+                await run(`git commit -m "chore: bump to ${newVersion}"`);
+            }, 'commit dev version bump');
         } catch (versionError) {
             logger.warn(`PUBLISH_DEV_VERSION_BUMP_FAILED: Failed to bump version | Error: ${versionError.message} | Impact: Version not updated`);
             logger.warn('PUBLISH_MANUAL_VERSION_BUMP: Manual version bump may be needed | Action: Bump manually for next cycle | Command: npm version');