@grunnverk/commands-publish 1.5.7-dev.20260131223731.750cd33 → 1.5.7-dev.20260131224204.ba5749e

package/dist/index.js

@@ -4,13 +4,13 @@ import { createStorage, calculateTargetVersion, incrementPatchVersion as increme
 import { scanForPackageJsonFiles } from '@grunnverk/tree-core';
 import * as GitHub from '@grunnverk/github-tools';
 import { getOctokit } from '@grunnverk/github-tools';
-import fs, { readFile } from 'fs/promises';
+import fs, { readFile, access } from 'fs/promises';
 import * as path from 'path';
 import path__default from 'path';
 import * as Commit from '@grunnverk/commands-git';
 import { Formatter } from '@kjerneverk/riotprompt';
 import 'dotenv/config';
-import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice, STANDARD_CHOICES, getLLMFeedbackInEditor, editContentInEditor, createCompletionWithRetry, createReleasePrompt, runAgenticPublish, formatAgenticPublishResult } from '@grunnverk/ai-service';
+import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice, STANDARD_CHOICES, getLLMFeedbackInEditor, editContentInEditor, createCompletionWithRetry, createReleasePrompt } from '@grunnverk/ai-service';
 
 /**
  * Create retroactive working branch tags for past releases
@@ -537,6 +537,80 @@ import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice,
     'examples/',
     'test-*/'
 ];
+/**
+ * Checks if .gitignore contains required patterns to prevent publishing
+ * development artifacts and sensitive files.
+ */ async function checkGitignorePatterns$1(directory, checks) {
+    const logger = getLogger();
+    const gitignorePath = path.join(directory, '.gitignore');
+    // Required patterns that must be present in .gitignore
+    const requiredPatterns = [
+        'node_modules',
+        'dist',
+        'package-lock.json',
+        '.env',
+        'output/',
+        'coverage',
+        '.kodrdriv*'
+    ];
+    // Check if .gitignore exists
+    try {
+        await access(gitignorePath);
+    } catch  {
+        checks.gitignore.passed = false;
+        checks.gitignore.issues.push('.gitignore file not found');
+        checks.gitignore.issues.push(`Create .gitignore with patterns: ${requiredPatterns.join(', ')}`);
+        return;
+    }
+    // Read .gitignore content
+    let gitignoreContent;
+    try {
+        gitignoreContent = await readFile(gitignorePath, 'utf-8');
+    } catch (error) {
+        checks.gitignore.passed = false;
+        checks.gitignore.issues.push(`Failed to read .gitignore: ${error.message}`);
+        return;
+    }
+    // Parse .gitignore into lines, ignoring comments and empty lines
+    const gitignoreLines = gitignoreContent.split('\n').map((line)=>line.trim()).filter((line)=>line && !line.startsWith('#'));
+    // Check for missing patterns
+    const missingPatterns = [];
+    for (const pattern of requiredPatterns){
+        // Check if the pattern exists in any of the gitignore lines
+        const found = gitignoreLines.some((line)=>{
+            // Exact match
+            if (line === pattern) return true;
+            // Pattern with wildcard - check if the pattern or any matching line exists
+            if (pattern.includes('*')) {
+                const basePattern = pattern.replace('*', '');
+                // Accept exact wildcard pattern, base pattern, or any line starting with base
+                return line === pattern || line === basePattern || line.startsWith(basePattern);
+            }
+            // Pattern with trailing slash - check both with and without slash
+            if (pattern.endsWith('/')) {
+                const basePattern = pattern.slice(0, -1);
+                return line === basePattern || line === pattern || line.startsWith(pattern);
+            }
+            // Line with trailing slash - check if it matches the pattern (e.g., "node_modules/" matches "node_modules")
+            if (line.endsWith('/')) {
+                const lineBase = line.slice(0, -1);
+                return lineBase === pattern || line.startsWith(pattern + '/');
+            }
+            return false;
+        });
+        if (!found) {
+            missingPatterns.push(pattern);
+        }
+    }
+    // Report missing patterns (relaxed check - allow variations)
+    const criticalMissing = missingPatterns.filter((p)=>!p.includes('coverage') && p !== 'package-lock.json');
+    if (criticalMissing.length > 0) {
+        checks.gitignore.passed = false;
+        checks.gitignore.issues.push(`Missing required patterns: ${criticalMissing.join(', ')}`);
+        checks.gitignore.issues.push('These patterns prevent committing build artifacts and sensitive files');
+    }
+    logger.debug(`Gitignore check: ${checks.gitignore.passed ? 'passed' : 'failed'}`);
+}
 /**
  * Execute check-development command
  */ async function execute$2(config) {
@@ -564,6 +638,10 @@ import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice,
     const isTree = packageJsonFiles.length > 1;
     logger.info(`Detected ${isTree ? 'tree' : 'single package'} with ${packageJsonFiles.length} package(s)`);
     const checks = {
+        gitignore: {
+            passed: true,
+            issues: []
+        },
         branch: {
             passed: true,
             issues: []
@@ -600,6 +678,8 @@ import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice,
     const packagesToCheck = isTree ? packageJsonFiles : [
         path.join(directory, 'package.json')
     ];
+    // Check .gitignore patterns (required for publish to succeed)
+    await checkGitignorePatterns$1(directory, checks);
     // Build a set of all local package names for link status checking
     const localPackageNames = new Set();
     for (const pkgJsonPath of packagesToCheck){
@@ -683,7 +763,7 @@ import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice,
                     // Ignore - there might not be a merge to abort if it was a fast-forward
                     }
                 } catch (mergeError) {
-                    var _mergeError_message, _mergeError_stderr;
+                    var _mergeError_message, _mergeError_stderr, _mergeError_stdout;
                     // Abort any partial merge
                     try {
                         await run('git merge --abort', {
@@ -694,7 +774,7 @@ import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice,
                     // Ignore abort errors
                     }
                     // If merge failed, there are likely conflicts
-                    if (((_mergeError_message = mergeError.message) === null || _mergeError_message === void 0 ? void 0 : _mergeError_message.includes('CONFLICT')) || ((_mergeError_stderr = mergeError.stderr) === null || _mergeError_stderr === void 0 ? void 0 : _mergeError_stderr.includes('CONFLICT'))) {
+                    if (((_mergeError_message = mergeError.message) === null || _mergeError_message === void 0 ? void 0 : _mergeError_message.includes('CONFLICT')) || ((_mergeError_stderr = mergeError.stderr) === null || _mergeError_stderr === void 0 ? void 0 : _mergeError_stderr.includes('CONFLICT')) || ((_mergeError_stdout = mergeError.stdout) === null || _mergeError_stdout === void 0 ? void 0 : _mergeError_stdout.includes('CONFLICT'))) {
                         checks.mergeConflicts.passed = false;
                         checks.mergeConflicts.issues.push(`${pkgName}: Merge conflicts detected with ${targetBranch} branch`);
                     } else {
@@ -841,7 +921,7 @@ import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice,
     // Build summary - linkStatus and releaseWorkflow are not included in allPassed (recommendations)
     // mergeConflicts is ALWAYS checked (critical for preventing post-merge failures)
     // openPRs is only checked when validateRelease is true
-    const allPassed = checks.branch.passed && checks.remoteSync.passed && checks.mergeConflicts.passed && checks.devVersion.passed && (validateRelease ? checks.openPRs.passed : true);
+    const allPassed = checks.gitignore.passed && checks.branch.passed && checks.remoteSync.passed && checks.mergeConflicts.passed && checks.devVersion.passed && (validateRelease ? checks.openPRs.passed : true);
     const hasWarnings = checks.linkStatus.warnings.length > 0 || checks.mergeConflicts.warnings.length > 0 || checks.openPRs.warnings.length > 0 || checks.releaseWorkflow.warnings.length > 0;
     // Log results
     let summary = `\n${'='.repeat(60)}\n`;
@@ -852,6 +932,7 @@ import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice,
     if (allPassed) {
         summary += `✅ Status: READY FOR DEVELOPMENT\n\n`;
         summary += `All required checks passed:\n`;
+        summary += `  ✓ Gitignore patterns\n`;
         summary += `  ✓ Branch status\n`;
         summary += `  ✓ Remote sync\n`;
         summary += `  ✓ No merge conflicts with main\n`;
@@ -864,6 +945,11 @@ import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice,
         }
     } else {
         summary += `⚠️  Status: NOT READY\n\n`;
+        if (!checks.gitignore.passed) {
+            summary += `❌ Gitignore Issues:\n`;
+            checks.gitignore.issues.forEach((issue)=>summary += `   - ${issue}\n`);
+            summary += `\n`;
+        }
         if (!checks.branch.passed) {
             summary += `❌ Branch Issues:\n`;
             checks.branch.issues.forEach((issue)=>summary += `   - ${issue}\n`);
@@ -878,6 +964,13 @@ import { runAgenticRelease, requireTTY, generateReflectionReport, getUserChoice,
             summary += `❌ Merge Conflict Issues:\n`;
             checks.mergeConflicts.issues.forEach((issue)=>summary += `   - ${issue}\n`);
             summary += `\n`;
+            summary += `   To resolve merge conflicts:\n`;
+            summary += `   1. Fetch latest: git fetch origin main\n`;
+            summary += `   2. Merge main into your branch: git merge origin/main\n`;
+            summary += `   3. Resolve conflicts in your editor\n`;
+            summary += `   4. Commit the merge: git add . && git commit\n`;
+            summary += `   5. Run check-development again to verify\n`;
+            summary += `\n`;
         }
         if (!checks.devVersion.passed) {
             summary += `❌ Dev Version Issues:\n`;
@@ -1536,7 +1629,6 @@ const runPrechecks = async (runConfig, targetBranch)=>{
         if (targetBranchExists) {
             const syncStatus = await isBranchInSyncWithRemote(effectiveTargetBranch);
             if (!syncStatus.inSync) {
-                var _runConfig_publish2;
                 logger.error(`BRANCH_SYNC_FAILED: Target branch not synchronized with remote | Branch: ${effectiveTargetBranch} | Status: out-of-sync | Impact: Cannot proceed with publish`);
                 logger.error('');
                 if (syncStatus.error) {
@@ -1544,48 +1636,6 @@ const runPrechecks = async (runConfig, targetBranch)=>{
                 } else if (syncStatus.localSha && syncStatus.remoteSha) {
                     logger.error(`BRANCH_SYNC_DIVERGENCE: Local and remote commits differ | Local SHA: ${syncStatus.localSha.substring(0, 8)} | Remote SHA: ${syncStatus.remoteSha.substring(0, 8)}`);
                 }
-                // Check if agentic publish is enabled
-                if ((_runConfig_publish2 = runConfig.publish) === null || _runConfig_publish2 === void 0 ? void 0 : _runConfig_publish2.agenticPublish) {
-                    logger.info('');
-                    logger.info('AGENTIC_PUBLISH_STARTING: Attempting automatic diagnosis and fix | Mode: agentic | Feature: AI-powered recovery');
-                    try {
-                        var _syncStatus_localSha, _syncStatus_remoteSha, _runConfig_publish3;
-                        const currentBranch = await GitHub.getCurrentBranchName();
-                        const agenticResult = await runAgenticPublish({
-                            targetBranch: effectiveTargetBranch,
-                            sourceBranch: currentBranch,
-                            issue: 'branch_sync',
-                            issueDetails: syncStatus.error || `Local SHA: ${(_syncStatus_localSha = syncStatus.localSha) === null || _syncStatus_localSha === void 0 ? void 0 : _syncStatus_localSha.substring(0, 8)}, Remote SHA: ${(_syncStatus_remoteSha = syncStatus.remoteSha) === null || _syncStatus_remoteSha === void 0 ? void 0 : _syncStatus_remoteSha.substring(0, 8)}`,
-                            workingDirectory: process.cwd(),
-                            maxIterations: ((_runConfig_publish3 = runConfig.publish) === null || _runConfig_publish3 === void 0 ? void 0 : _runConfig_publish3.agenticPublishMaxIterations) || 10,
-                            storage,
-                            logger,
-                            dryRun: runConfig.dryRun
-                        });
-                        // Display the formatted result
-                        const formattedResult = formatAgenticPublishResult(agenticResult);
-                        logger.info(formattedResult);
-                        if (agenticResult.success) {
-                            logger.info('AGENTIC_PUBLISH_SUCCESS: Issue resolved automatically | Status: ready-to-retry | Action: Re-running prechecks');
-                            // Re-run the sync check to verify it was fixed
-                            const reSyncStatus = await isBranchInSyncWithRemote(effectiveTargetBranch);
-                            if (reSyncStatus.inSync) {
-                                logger.info(`BRANCH_SYNC_VERIFIED: Target branch is now synchronized with remote | Branch: ${effectiveTargetBranch} | Status: in-sync`);
-                                return; // Continue with publish
-                            } else {
-                                logger.warn('AGENTIC_PUBLISH_VERIFICATION_FAILED: Branch still not in sync after agentic fix | Status: needs-attention');
-                            }
-                        }
-                        if (agenticResult.requiresManualIntervention) {
-                            throw new Error(`Target branch '${effectiveTargetBranch}' requires manual intervention. Please see the steps above.`);
-                        } else {
-                            throw new Error(`Agentic publish could not resolve the issue automatically. Please see the analysis above.`);
-                        }
-                    } catch (agenticError) {
-                        logger.warn(`AGENTIC_PUBLISH_FAILED: Agentic recovery failed | Error: ${agenticError.message} | Fallback: Manual steps`);
-                    // Fall through to manual steps
-                    }
-                }
                 logger.error('');
                 logger.error('RESOLUTION_STEPS: Manual intervention required to sync branches:');
                 logger.error(`   Step 1: Switch to target branch | Command: git checkout ${effectiveTargetBranch}`);
@@ -1594,7 +1644,6 @@ const runPrechecks = async (runConfig, targetBranch)=>{
                 logger.error('   Step 4: Return to feature branch and retry publish');
                 logger.error('');
                 logger.error(`ALTERNATIVE_OPTION: Automatic sync available | Command: kodrdriv publish --sync-target | Branch: ${effectiveTargetBranch}`);
-                logger.error(`ALTERNATIVE_OPTION_AI: AI-powered recovery available | Command: kodrdriv publish --agentic-publish | Branch: ${effectiveTargetBranch}`);
                 throw new Error(`Target branch '${effectiveTargetBranch}' is not in sync with remote. Please sync the branch before running publish.`);
             } else {
                 logger.info(`BRANCH_SYNC_VERIFIED: Target branch is synchronized with remote | Branch: ${effectiveTargetBranch} | Status: in-sync`);
@@ -2753,8 +2802,12 @@ const execute = async (runConfig)=>{
             try {
                 // Verify that remote working branch is ancestor of main (safety check)
                 try {
-                    await run(`git fetch origin ${currentBranch}`);
-                    await run(`git merge-base --is-ancestor origin/${currentBranch} ${targetBranch}`);
+                    await run(`git fetch origin ${currentBranch}`, {
+                        suppressErrorLogging: true
+                    });
+                    await run(`git merge-base --is-ancestor origin/${currentBranch} ${targetBranch}`, {
+                        suppressErrorLogging: true
+                    });
                     logger.verbose(`✓ Safety check passed: origin/${currentBranch} is ancestor of ${targetBranch}`);
                 } catch  {
                     // Remote branch might not exist yet, or already in sync - both OK