s9n-devops-agent 1.6.0 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s9n-devops-agent",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "CS_DevOpsAgent - Intelligent Git Automation System with multi-agent support and session management",
   "type": "module",
   "main": "src/cs-devops-agent-worker.js",

package/src/cs-devops-agent-worker.js

@@ -1789,10 +1789,153 @@ console.log();
           
           if (isWorktree) {
             console.log("\n" + "=".repeat(60));
-            console.log("WORKTREE CLEANUP");
+            console.log("SESSION CLEANUP OPTIONS");
             console.log("=".repeat(60));
             console.log("\nThis session is running in a worktree:");
             console.log(`  ${currentDir}`);
+            
+            // Get current branch
+            const currentBranchName = await currentBranch();
+            
+            // Get the main repo root
+            const repoRoot = path.resolve(currentDir, '../../../');
+            
+            // Read session lock file to get merge configuration
+            let mergeConfig = null;
+            let shouldMerge = false;
+            let targetBranch = 'main';
+            
+            try {
+              const lockFile = path.join(repoRoot, 'local_deploy', 'session-locks', `${sessionId}.lock`);
+              if (fs.existsSync(lockFile)) {
+                const sessionData = JSON.parse(fs.readFileSync(lockFile, 'utf8'));
+                mergeConfig = sessionData.mergeConfig;
+              }
+            } catch (err) {
+              console.log(`\x1b[2mCould not read session config: ${err.message}\x1b[0m`);
+            }
+            
+            // Check if auto-merge is configured
+            if (mergeConfig && mergeConfig.autoMerge && mergeConfig.targetBranch) {
+              // Auto-merge is configured
+              shouldMerge = true;
+              targetBranch = mergeConfig.targetBranch;
+              console.log("\n" + "─".repeat(60));
+              console.log("AUTO-MERGE CONFIGURED");
+              console.log("─".repeat(60));
+              console.log(`\nAuto-merging \x1b[1m${currentBranchName}\x1b[0m → \x1b[1m${targetBranch}\x1b[0m`);
+              console.log(`\x1b[2m(Configured during session start)\x1b[0m`);
+            } else {
+              // No auto-merge configured, ask the user
+              console.log("\n" + "─".repeat(60));
+              console.log("MERGE TO TARGET BRANCH");
+              console.log("─".repeat(60));
+              console.log(`\nMerge \x1b[1m${currentBranchName}\x1b[0m → target branch before cleanup?`);
+              console.log("  y/yes - Merge to target branch");
+              console.log("  n/no  - Skip merge");
+              
+              rl.prompt();
+              const mergeAnswer = await new Promise(resolve => {
+                rl.once('line', resolve);
+              });
+              
+              shouldMerge = mergeAnswer.toLowerCase() === 'y' || mergeAnswer.toLowerCase() === 'yes';
+              
+              if (shouldMerge) {
+                // Ask for target branch
+                console.log(`\nTarget branch [${targetBranch}]: `);
+                rl.prompt();
+                const targetAnswer = await new Promise(resolve => {
+                  rl.once('line', resolve);
+                });
+                
+                if (targetAnswer.trim()) {
+                  targetBranch = targetAnswer.trim();
+                }
+              }
+            }
+            
+            let mergeCompleted = false;
+            if (shouldMerge) {
+              try {
+                console.log(`\n\x1b[34mMerging ${currentBranchName} into ${targetBranch}...\x1b[0m`);
+                
+                // Check if target branch exists locally
+                let branchExists = false;
+                try {
+                  execSync(`git rev-parse --verify ${targetBranch}`, { cwd: repoRoot, stdio: 'pipe' });
+                  branchExists = true;
+                } catch (err) {
+                  // Branch doesn't exist locally
+                }
+                
+                if (!branchExists) {
+                  // Check if branch exists on remote
+                  try {
+                    const remoteCheck = execSync(`git ls-remote --heads origin ${targetBranch}`, { 
+                      cwd: repoRoot, 
+                      encoding: 'utf8' 
+                    }).trim();
+                    
+                    if (remoteCheck) {
+                      // Branch exists on remote, fetch it
+                      console.log(`\x1b[2mTarget branch doesn't exist locally, fetching from remote...\x1b[0m`);
+                      execSync(`git fetch origin ${targetBranch}:${targetBranch}`, { cwd: repoRoot, stdio: 'pipe' });
+                    } else {
+                      // Branch doesn't exist on remote either, create it
+                      console.log(`\x1b[33mTarget branch '${targetBranch}' doesn't exist. Creating it...\x1b[0m`);
+                      execSync(`git checkout -b ${targetBranch}`, { cwd: repoRoot, stdio: 'pipe' });
+                      execSync(`git push -u origin ${targetBranch}`, { cwd: repoRoot, stdio: 'pipe' });
+                      console.log(`\x1b[32m✓\x1b[0m Created new branch ${targetBranch}`);
+                    }
+                  } catch (err) {
+                    console.error(`\x1b[31m✗ Error checking/creating remote branch: ${err.message}\x1b[0m`);
+                    throw err;
+                  }
+                }
+                
+                // Switch to target branch
+                execSync(`git checkout ${targetBranch}`, { cwd: repoRoot, stdio: 'pipe' });
+                
+                // Pull latest (if branch already existed)
+                if (branchExists) {
+                  try {
+                    execSync(`git pull origin ${targetBranch}`, { cwd: repoRoot, stdio: 'pipe' });
+                  } catch (err) {
+                    console.log(`\x1b[2mCould not pull latest changes (may be new branch)\x1b[0m`);
+                  }
+                }
+                
+                // Merge the session branch
+                execSync(`git merge --no-ff ${currentBranchName} -m "Merge session ${sessionId}: session work"`, { 
+                  cwd: repoRoot, 
+                  stdio: 'pipe' 
+                });
+                
+                // Push merged changes
+                execSync(`git push origin ${targetBranch}`, { cwd: repoRoot, stdio: 'pipe' });
+                
+                console.log(`\x1b[32m✓\x1b[0m Successfully merged to ${targetBranch}`);
+                
+                // Delete remote branch after successful merge
+                try {
+                  execSync(`git push origin --delete ${currentBranchName}`, { cwd: repoRoot, stdio: 'pipe' });
+                  console.log(`\x1b[32m✓\x1b[0m Deleted remote branch ${currentBranchName}`);
+                } catch (err) {
+                  console.log(`\x1b[2mCould not delete remote branch\x1b[0m`);
+                }
+                
+                mergeCompleted = true;
+              } catch (err) {
+                console.error(`\x1b[31m✗ Merge failed: ${err.message}\x1b[0m`);
+                console.log(`\x1b[33mYou may need to resolve conflicts manually\x1b[0m`);
+              }
+            }
+            
+            // Now ask about worktree removal
+            console.log("\n" + "─".repeat(60));
+            console.log("WORKTREE CLEANUP");
+            console.log("─".repeat(60));
             console.log("\nWould you like to remove this worktree now?");
             console.log("  y/yes - Remove worktree and close session");
             console.log("  n/no  - Keep worktree for later use");

package/start-devops-session.sh

@@ -41,7 +41,7 @@ show_copyright() {
     echo "======================================================================"
     echo
     echo "  CS_DevOpsAgent - Intelligent Git Automation System"
-    echo "  Version 1.6.0 | Build 20251009.12"
+    echo "  Version 1.6.2 | Build 20251009.14"
     echo "  "
     echo "  Copyright (c) 2024 SecondBrain Labs"
     echo "  Author: Sachin Dev Duggal"