@agentic15.com/agentic15-claude-zen 4.2.1 → 4.2.2

package/README.md

@@ -128,9 +128,14 @@ npx agentic15 commit
 
 **On GitHub:**
 1. Review and merge the PR
-2. Continue to next task:
 
+**Back in Your Terminal:**
 ```bash
+# Sync with main branch after PR merge
+npx agentic15 sync
+# This will: switch to main, pull changes, delete feature branch
+
+# Continue to next task
 npx agentic15 task next
 ```
 
@@ -147,6 +152,7 @@ npx agentic15 task next
 | `npx agentic15 task start TASK-XXX` | Start specific task |
 | `npx agentic15 task status` | View current progress |
 | `npx agentic15 commit` | Commit, push, and create PR |
+| `npx agentic15 sync` | Sync with main branch after PR merge |
 | `npx agentic15 visual-test <url>` | Capture UI screenshots and console errors |
 | `npx agentic15 upgrade` | Update framework files |
 | `npx agentic15 auth` | Configure GitHub authentication |
@@ -163,7 +169,7 @@ The framework automates:
 ### Standard Workflow
 
 ```
-plan → task → code → commit → PR → merge → next task
+plan → task → code → commit → PR → merge → sync → next task
 ```
 
 ---

package/bin/agentic15.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { Command } from 'commander';
 import { AuthCommand } from '../src/cli/AuthCommand.js';
@@ -8,6 +8,7 @@ import { StatusCommand } from '../src/cli/StatusCommand.js';
 import { PlanCommand } from '../src/cli/PlanCommand.js';
 import { UpgradeCommand } from '../src/cli/UpgradeCommand.js';
 import { VisualTestCommand } from '../src/cli/VisualTestCommand.js';
+import { SyncCommand } from '../src/cli/SyncCommand.js';
 
 const program = new Command();
 
@@ -62,4 +63,10 @@ program
   .argument('<url>', 'URL to test (e.g., http://localhost:3000)')
   .action((url) => VisualTestCommand.execute(url));
 
+// Sync with remote main branch
+program
+  .command('sync')
+  .description('Switch to main branch, pull latest changes, and cleanup feature branch')
+  .action(() => SyncCommand.execute());
+
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentic15.com/agentic15-claude-zen",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Structured AI-assisted development framework for Claude Code with enforced quality standards",
   "main": "src/index.js",
   "bin": {

package/src/cli/SyncCommand.js

@@ -0,0 +1,137 @@
+import { execSync } from 'child_process';
+import { readFileSync, existsSync } from 'fs';
+import { join } from 'path';
+
+export class SyncCommand {
+  static execute() {
+    console.log('\n🔄 Syncing with remote main branch...\n');
+
+    // Step 1: Get current branch
+    const currentBranch = this.getCurrentBranch();
+    console.log(`📍 Current branch: ${currentBranch}\n`);
+
+    // Step 2: Check if on feature branch
+    const isFeatureBranch = currentBranch.startsWith('feature/');
+
+    if (!isFeatureBranch && currentBranch !== 'main') {
+      console.log(`⚠️  You're on branch '${currentBranch}', not a feature branch`);
+      console.log(`   This command syncs feature branches with main\n`);
+      process.exit(1);
+    }
+
+    // Step 3: Check for uncommitted changes
+    if (this.hasUncommittedChanges()) {
+      console.log('❌ You have uncommitted changes');
+      console.log('   Commit or stash them first\n');
+      process.exit(1);
+    }
+
+    // Step 4: Get main branch name
+    const mainBranch = this.getMainBranch();
+    console.log(`🎯 Main branch: ${mainBranch}\n`);
+
+    // Step 5: Switch to main
+    console.log(`📦 Switching to ${mainBranch}...\n`);
+    this.switchToMain(mainBranch);
+
+    // Step 6: Pull latest changes
+    console.log('⬇️  Pulling latest changes...\n');
+    this.pullMain(mainBranch);
+
+    // Step 7: Delete feature branch if we were on one
+    if (isFeatureBranch) {
+      console.log(`🗑️  Cleaning up feature branch: ${currentBranch}...\n`);
+      this.deleteFeatureBranch(currentBranch);
+    }
+
+    // Step 8: Display summary
+    this.displaySummary(mainBranch, currentBranch, isFeatureBranch);
+  }
+
+  static getCurrentBranch() {
+    try {
+      return execSync('git branch --show-current', { encoding: 'utf-8' }).trim();
+    } catch (error) {
+      console.log(`\n❌ Failed to get current branch: ${error.message}\n`);
+      process.exit(1);
+    }
+  }
+
+  static getMainBranch() {
+    try {
+      // Try to detect main branch from remote
+      const remotes = execSync('git branch -r', { encoding: 'utf-8' });
+
+      if (remotes.includes('origin/main')) {
+        return 'main';
+      } else if (remotes.includes('origin/master')) {
+        return 'master';
+      }
+
+      // Default to main
+      return 'main';
+    } catch (error) {
+      return 'main';
+    }
+  }
+
+  static hasUncommittedChanges() {
+    try {
+      const status = execSync('git status --porcelain', { encoding: 'utf-8' });
+      return status.trim().length > 0;
+    } catch (error) {
+      return false;
+    }
+  }
+
+  static switchToMain(mainBranch) {
+    try {
+      execSync(`git checkout ${mainBranch}`, { stdio: 'inherit' });
+    } catch (error) {
+      console.log(`\n❌ Failed to switch to ${mainBranch}: ${error.message}\n`);
+      process.exit(1);
+    }
+  }
+
+  static pullMain(mainBranch) {
+    try {
+      execSync(`git pull origin ${mainBranch}`, { stdio: 'inherit' });
+    } catch (error) {
+      console.log(`\n❌ Failed to pull from ${mainBranch}: ${error.message}\n`);
+      process.exit(1);
+    }
+  }
+
+  static deleteFeatureBranch(branchName) {
+    try {
+      // Delete local branch
+      execSync(`git branch -d ${branchName}`, { stdio: 'inherit' });
+      console.log(`   ✓ Deleted local branch: ${branchName}`);
+    } catch (error) {
+      // Branch might have unmerged commits, try force delete
+      try {
+        console.log(`   ⚠️  Branch has unmerged commits, force deleting...`);
+        execSync(`git branch -D ${branchName}`, { stdio: 'inherit' });
+        console.log(`   ✓ Force deleted local branch: ${branchName}`);
+      } catch (forceError) {
+        console.log(`   ⚠️  Could not delete branch: ${forceError.message}`);
+      }
+    }
+  }
+
+  static displaySummary(mainBranch, previousBranch, wasFeatureBranch) {
+    console.log('\n' + '='.repeat(60));
+    console.log('✅ Sync complete!');
+    console.log('='.repeat(60));
+    console.log(`\n📍 Current branch: ${mainBranch}`);
+    console.log(`📥 Latest changes pulled from origin/${mainBranch}`);
+
+    if (wasFeatureBranch) {
+      console.log(`🗑️  Deleted feature branch: ${previousBranch}`);
+    }
+
+    console.log('\n💡 Next steps:');
+    console.log('   1. Start a new task: npx agentic15 task start TASK-XXX');
+    console.log('   2. Check status: npx agentic15 status\n');
+  }
+}