s9n-devops-agent 1.5.8 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s9n-devops-agent",
-  "version": "1.5.8",
+  "version": "1.6.0",
   "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/session-coordinator.js

@@ -1681,8 +1681,103 @@ The DevOps agent is monitoring this worktree for changes.
         console.log(`${CONFIG.colors.dim}Could not check git status${CONFIG.colors.reset}`);
       }
       
+      // Ask about merging to target branch before cleanup
+      let rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+      
+      console.log(`\n${CONFIG.colors.yellow}Worktree Cleanup Options${CONFIG.colors.reset}`);
+      
+      // Get target branch from merge config or default to 'main'
+      let targetBranch = session.mergeConfig?.targetBranch || 'main';
+      
+      const mergeFirst = await new Promise(resolve => {
+        rl.question(`\nMerge ${CONFIG.colors.bright}${session.branchName}${CONFIG.colors.reset} → ${CONFIG.colors.bright}${targetBranch}${CONFIG.colors.reset} before cleanup? (y/N): `, resolve);
+      });
+      rl.close();
+      
+      if (mergeFirst.toLowerCase() === 'y') {
+        rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+        
+        const confirmTarget = await new Promise(resolve => {
+          rl.question(`Target branch [${targetBranch}]: `, resolve);
+        });
+        rl.close();
+        
+        if (confirmTarget.trim()) {
+          targetBranch = confirmTarget.trim();
+        }
+        
+        try {
+          console.log(`\n${CONFIG.colors.blue}Merging ${session.branchName} into ${targetBranch}...${CONFIG.colors.reset}`);
+          
+          // Check if target branch exists locally
+          let branchExists = false;
+          try {
+            execSync(`git rev-parse --verify ${targetBranch}`, { cwd: this.repoRoot, stdio: 'pipe' });
+            branchExists = true;
+          } catch (err) {
+            // Branch doesn't exist locally
+          }
+          
+          if (!branchExists) {
+            // Check if branch exists on remote
+            try {
+              execSync(`git ls-remote --heads origin ${targetBranch}`, { cwd: this.repoRoot, stdio: 'pipe' });
+              // Branch exists on remote, fetch it
+              console.log(`${CONFIG.colors.dim}Target branch doesn't exist locally, fetching from remote...${CONFIG.colors.reset}`);
+              execSync(`git fetch origin ${targetBranch}:${targetBranch}`, { cwd: this.repoRoot, stdio: 'pipe' });
+            } catch (err) {
+              // Branch doesn't exist on remote either, create it
+              console.log(`${CONFIG.colors.yellow}Target branch '${targetBranch}' doesn't exist. Creating it...${CONFIG.colors.reset}`);
+              execSync(`git checkout -b ${targetBranch}`, { cwd: this.repoRoot, stdio: 'pipe' });
+              execSync(`git push -u origin ${targetBranch}`, { cwd: this.repoRoot, stdio: 'pipe' });
+              console.log(`${CONFIG.colors.green}✓${CONFIG.colors.reset} Created new branch ${targetBranch}`);
+            }
+          }
+          
+          // Switch to target branch in main repo
+          execSync(`git checkout ${targetBranch}`, { cwd: this.repoRoot, stdio: 'pipe' });
+          
+          // Pull latest (if branch already existed)
+          if (branchExists) {
+            try {
+              execSync(`git pull origin ${targetBranch}`, { cwd: this.repoRoot, stdio: 'pipe' });
+            } catch (err) {
+              console.log(`${CONFIG.colors.dim}Could not pull latest changes (may be new branch)${CONFIG.colors.reset}`);
+            }
+          }
+          
+          // Merge the session branch
+          execSync(`git merge --no-ff ${session.branchName} -m "Merge session ${sessionId}: ${session.task}"`, { 
+            cwd: this.repoRoot, 
+            stdio: 'pipe' 
+          });
+          
+          // Push merged changes
+          execSync(`git push origin ${targetBranch}`, { cwd: this.repoRoot, stdio: 'pipe' });
+          
+          console.log(`${CONFIG.colors.green}✓${CONFIG.colors.reset} Successfully merged to ${targetBranch}`);
+          
+          // Delete remote branch after successful merge
+          try {
+            execSync(`git push origin --delete ${session.branchName}`, { cwd: this.repoRoot, stdio: 'pipe' });
+            console.log(`${CONFIG.colors.green}✓${CONFIG.colors.reset} Deleted remote branch ${session.branchName}`);
+          } catch (err) {
+            console.log(`${CONFIG.colors.dim}Could not delete remote branch${CONFIG.colors.reset}`);
+          }
+        } catch (err) {
+          console.error(`${CONFIG.colors.red}✗ Merge failed: ${err.message}${CONFIG.colors.reset}`);
+          console.log(`${CONFIG.colors.yellow}You may need to resolve conflicts manually${CONFIG.colors.reset}`);
+        }
+      }
+      
       // Ask about removing worktree
-      const rl = readline.createInterface({
+      rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout
       });
@@ -1698,6 +1793,14 @@ The DevOps agent is monitoring this worktree for changes.
           execSync(`git worktree remove "${session.worktreePath}" --force`, { stdio: 'pipe' });
           console.log(`${CONFIG.colors.green}✓${CONFIG.colors.reset} Worktree removed`);
           
+          // Delete local branch
+          try {
+            execSync(`git branch -D ${session.branchName}`, { cwd: this.repoRoot, stdio: 'pipe' });
+            console.log(`${CONFIG.colors.green}✓${CONFIG.colors.reset} Deleted local branch ${session.branchName}`);
+          } catch (err) {
+            console.log(`${CONFIG.colors.dim}Could not delete local branch${CONFIG.colors.reset}`);
+          }
+          
           // Prune worktree list
           execSync('git worktree prune', { stdio: 'pipe' });
         } catch (err) {

package/start-devops-session.sh

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