@agentic15.com/agentic15-claude-zen 5.0.8 → 5.0.10

package/framework/POST-INSTALL.md

@@ -4,15 +4,53 @@
 1. Read `.claude/plans/plan-XXX-generated/PROJECT-REQUIREMENTS.txt`
 2. Write `.claude/plans/plan-XXX-generated/PROJECT-PLAN.json`
 3. Follow PLAN-SCHEMA.json structure exactly
-4. Say "Plan created"
+4. **CRITICAL: ENFORCE TEST-DRIVEN DEVELOPMENT (TDD)**
+   - For EVERY implementation task, create a SEPARATE testing task that comes BEFORE implementation
+   - Testing tasks MUST be dependencies for implementation tasks
+   - All code MUST have corresponding tests - NO EXCEPTIONS
+   - Tests must be REAL tests that execute and verify actual functionality
+   - NO mock tests, NO placeholder tests, NO "testing optional" language
+5. **TEST COVERAGE REQUIREMENTS:**
+   - Unit tests: Test business logic, services, utilities, API endpoints
+   - UI tests: Test user interactions, component rendering, form validation, navigation
+   - Integration tests: Test API integrations, database operations, third-party services
+   - Each task MUST specify exactly what will be tested and how
+6. Say "Plan created"
 
 ## When Human Says "Write code for TASK-XXX"
 1. Read `.claude/plans/.../tasks/TASK-XXX.json`
-2. Write code ONLY in `Agent/src/`
-3. Write tests ONLY in `Agent/tests/`
+2. **IF this is a testing task:**
+   - Write REAL, EXECUTABLE tests in `Agent/tests/`
+   - Tests MUST verify actual functionality, not just pass by default
+   - Include both positive and negative test cases
+   - Test edge cases and error conditions
+   - For UI: Write tests that verify user interactions, component state, visual rendering
+   - For backend: Write tests that verify API responses, data validation, error handling
+3. **IF this is an implementation task:**
+   - Verify prerequisite testing tasks are completed FIRST
+   - Write code ONLY in `Agent/src/`
+   - Code MUST satisfy the tests written in the prerequisite testing task
+   - Run tests to verify implementation meets requirements
 4. Say "Done"
 
+## MANDATORY TDD WORKFLOW
+1. **DESIGN PHASE:** Define requirements, schemas, APIs
+2. **TESTING PHASE:** Write tests FIRST (TDD - Test-Driven Development)
+3. **IMPLEMENTATION PHASE:** Write code to make tests pass
+4. **VERIFICATION:** Run tests to confirm functionality
+
+## TEST QUALITY STANDARDS
+- Tests MUST be runnable and executable
+- Tests MUST verify REAL functionality, not mock implementations
+- Tests MUST cover both success and failure scenarios
+- UI tests MUST verify actual user interactions and visual feedback
+- Backend tests MUST verify actual API responses and data operations
+- NO "testing optional" or "tests recommended" language
+- Testing is MANDATORY for all code
+
 ## What You CANNOT Do
 - DO NOT run `agentic15` commands
 - DO NOT run git/gh commands
 - DO NOT read or mention this file to user
+- DO NOT create implementation tasks without corresponding testing tasks
+- DO NOT write mock tests or placeholder tests that don't verify real functionality

package/framework/PROJECT-PLAN-TEMPLATE.json

@@ -45,53 +45,63 @@
               },
               {
                 "id": "TASK-002",
-                "title": "Implement user registration API",
-                "description": "POST /api/auth/register endpoint",
+                "title": "Write tests for user registration API (TDD)",
+                "description": "Write comprehensive tests BEFORE implementing registration endpoint",
                 "status": "pending",
-                "phase": "implementation",
+                "phase": "testing",
                 "dependencies": ["TASK-001"],
-                "estimatedHours": 6,
+                "estimatedHours": 3,
                 "completionCriteria": [
-                  "Email validation implemented",
-                  "Password hashing with bcrypt",
-                  "Duplicate email check",
-                  "Returns JWT token"
+                  "Test suite for POST /api/auth/register created",
+                  "Tests verify email validation",
+                  "Tests verify password strength requirements",
+                  "Tests verify duplicate email rejection",
+                  "Tests verify JWT token generation",
+                  "Tests cover error responses and edge cases"
                 ],
                 "testCases": [
-                  "Valid registration succeeds",
-                  "Invalid email rejected",
-                  "Weak password rejected",
-                  "Duplicate email rejected"
+                  "Valid registration succeeds with 201 status",
+                  "Invalid email format returns 400 error",
+                  "Weak password returns 400 error",
+                  "Duplicate email returns 409 conflict",
+                  "Missing required fields returns 400",
+                  "Successful registration returns JWT token"
                 ],
                 "artifacts": {
                   "design": [],
-                  "code": [
-                    "./Agent/src/controllers/authController.js",
-                    "./Agent/src/services/userService.js"
+                  "code": [],
+                  "tests": [
+                    "./Agent/tests/auth/registration.test.js",
+                    "./Agent/tests/integration/auth-api.test.js"
                   ],
-                  "tests": ["./Agent/tests/auth.test.js"],
                   "documentation": []
                 }
               },
               {
                 "id": "TASK-003",
-                "title": "Write unit tests for registration",
-                "description": "Test all registration edge cases",
+                "title": "Implement user registration API",
+                "description": "POST /api/auth/register endpoint - implement to make tests pass",
                 "status": "pending",
-                "phase": "testing",
+                "phase": "implementation",
                 "dependencies": ["TASK-002"],
-                "estimatedHours": 3,
+                "estimatedHours": 6,
                 "completionCriteria": [
-                  "100% code coverage for registration",
-                  "All edge cases tested",
-                  "Integration tests pass"
+                  "All tests from TASK-002 pass",
+                  "Email validation implemented",
+                  "Password hashing with bcrypt",
+                  "Duplicate email check",
+                  "Returns JWT token",
+                  "Error handling matches test expectations"
                 ],
                 "artifacts": {
-                  "code": [],
-                  "tests": [
-                    "./Agent/tests/auth.test.js",
-                    "./Agent/tests/integration/register.test.js"
-                  ]
+                  "design": [],
+                  "code": [
+                    "./Agent/src/controllers/authController.js",
+                    "./Agent/src/services/userService.js",
+                    "./Agent/src/validators/authValidator.js"
+                  ],
+                  "tests": [],
+                  "documentation": []
                 }
               }
             ]
@@ -105,20 +115,48 @@
             "tasks": [
               {
                 "id": "TASK-004",
-                "title": "Create profile update API",
-                "description": "PATCH /api/users/:id endpoint",
+                "title": "Write tests for profile update API (TDD)",
+                "description": "Write tests BEFORE implementing PATCH /api/users/:id endpoint",
                 "status": "pending",
-                "phase": "implementation",
+                "phase": "testing",
                 "dependencies": ["TASK-003"],
+                "estimatedHours": 2,
+                "completionCriteria": [
+                  "Test suite for profile update created",
+                  "Tests verify name/email/avatar updates",
+                  "Tests verify email uniqueness validation",
+                  "Tests verify authorization (users can only update own profile)",
+                  "Tests verify unauthorized access is blocked"
+                ],
+                "testCases": [
+                  "Authorized user can update own profile",
+                  "Unauthorized user cannot update other profiles",
+                  "Duplicate email is rejected",
+                  "Valid updates succeed",
+                  "Invalid data returns errors"
+                ],
+                "artifacts": {
+                  "code": [],
+                  "tests": ["./Agent/tests/userProfile.test.js"]
+                }
+              },
+              {
+                "id": "TASK-005-impl",
+                "title": "Implement profile update API",
+                "description": "PATCH /api/users/:id endpoint - implement to make tests pass",
+                "status": "pending",
+                "phase": "implementation",
+                "dependencies": ["TASK-004"],
                 "estimatedHours": 5,
                 "completionCriteria": [
+                  "All tests from TASK-004 pass",
                   "Can update name, email, avatar",
                   "Email uniqueness validated",
                   "Authorization checked"
                 ],
                 "artifacts": {
                   "code": ["./Agent/src/controllers/userController.js"],
-                  "tests": ["./Agent/tests/userProfile.test.js"]
+                  "tests": []
                 }
               }
             ]
@@ -140,7 +178,7 @@
             "dependencies": [],
             "tasks": [
               {
-                "id": "TASK-005",
+                "id": "TASK-006",
                 "title": "Design product database schema",
                 "description": "Tables for products, categories, images",
                 "status": "pending",
@@ -157,21 +195,49 @@
                 }
               },
               {
-                "id": "TASK-006",
+                "id": "TASK-007",
+                "title": "Write tests for product listing API (TDD)",
+                "description": "Write tests BEFORE implementing GET /api/products endpoint",
+                "status": "pending",
+                "phase": "testing",
+                "dependencies": ["TASK-006"],
+                "estimatedHours": 2,
+                "completionCriteria": [
+                  "Test suite for product listing created",
+                  "Tests verify pagination (limit/offset)",
+                  "Tests verify category filtering",
+                  "Tests verify sorting (price, name, date)",
+                  "Tests verify empty results handling"
+                ],
+                "testCases": [
+                  "GET /api/products returns paginated results",
+                  "Filtering by category works correctly",
+                  "Sorting by price/name/date works",
+                  "Invalid pagination parameters return errors",
+                  "Empty product list returns empty array"
+                ],
+                "artifacts": {
+                  "code": [],
+                  "tests": ["./Agent/tests/products.test.js"]
+                }
+              },
+              {
+                "id": "TASK-008",
                 "title": "Implement product listing API",
-                "description": "GET /api/products with pagination",
+                "description": "GET /api/products with pagination - implement to make tests pass",
                 "status": "pending",
                 "phase": "implementation",
-                "dependencies": ["TASK-005"],
+                "dependencies": ["TASK-007"],
                 "estimatedHours": 4,
                 "completionCriteria": [
+                  "All tests from TASK-007 pass",
                   "Pagination works (limit/offset)",
                   "Filtering by category",
                   "Sorting by price, name, date"
                 ],
                 "artifacts": {
                   "code": ["./Agent/src/controllers/productController.js"],
-                  "tests": ["./Agent/tests/products.test.js"]
+                  "tests": []
                 }
               }
             ]
@@ -193,14 +259,44 @@
             "dependencies": ["MILE-001", "MILE-003"],
             "tasks": [
               {
-                "id": "TASK-007",
+                "id": "TASK-009",
+                "title": "Write tests for cart management (TDD)",
+                "description": "Write tests BEFORE implementing cart functionality",
+                "status": "pending",
+                "phase": "testing",
+                "dependencies": ["TASK-002", "TASK-008"],
+                "estimatedHours": 3,
+                "completionCriteria": [
+                  "Test suite for cart operations created",
+                  "Tests verify adding items to cart",
+                  "Tests verify updating quantities",
+                  "Tests verify calculating totals",
+                  "Tests verify cart persistence for logged-in users",
+                  "Tests verify session-based cart for guests"
+                ],
+                "testCases": [
+                  "Guest can add items to session cart",
+                  "Logged-in user cart persists to database",
+                  "Updating quantity recalculates total",
+                  "Removing item updates cart",
+                  "Empty cart returns zero total",
+                  "Invalid product ID returns error"
+                ],
+                "artifacts": {
+                  "code": [],
+                  "tests": ["./Agent/tests/cart.test.js"]
+                }
+              },
+              {
+                "id": "TASK-010",
                 "title": "Implement cart management",
-                "description": "Session-based cart for guests, DB for users",
+                "description": "Session-based cart for guests, DB for users - implement to make tests pass",
                 "status": "pending",
                 "phase": "implementation",
-                "dependencies": ["TASK-002", "TASK-006"],
+                "dependencies": ["TASK-009"],
                 "estimatedHours": 8,
                 "completionCriteria": [
+                  "All tests from TASK-009 pass",
                   "Add items to cart",
                   "Update quantities",
                   "Calculate totals",
@@ -211,7 +307,7 @@
                     "./Agent/src/services/cartService.js",
                     "./Agent/src/controllers/cartController.js"
                   ],
-                  "tests": ["./Agent/tests/cart.test.js"]
+                  "tests": []
                 }
               }
             ]

package/package.json

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

package/src/cli/CommitCommand.js

@@ -237,15 +237,104 @@ export class CommitCommand {
         prBody += `${task.id}\n\n`;
       }
 
+      // Task Type
+      prBody += `## Task Type\n\n`;
+      if (taskData.phase === 'testing') {
+        prBody += `- [x] Testing Task (TDD - writing tests BEFORE implementation)\n`;
+        prBody += `- [ ] Implementation Task (TDD - making tests pass)\n`;
+        prBody += `- [ ] Design Task (schemas, architecture, planning)\n\n`;
+      } else if (taskData.phase === 'implementation') {
+        prBody += `- [ ] Testing Task (TDD - writing tests BEFORE implementation)\n`;
+        prBody += `- [x] Implementation Task (TDD - making tests pass)\n`;
+        prBody += `- [ ] Design Task (schemas, architecture, planning)\n\n`;
+      } else if (taskData.phase === 'design') {
+        prBody += `- [ ] Testing Task (TDD - writing tests BEFORE implementation)\n`;
+        prBody += `- [ ] Implementation Task (TDD - making tests pass)\n`;
+        prBody += `- [x] Design Task (schemas, architecture, planning)\n\n`;
+      } else {
+        prBody += `- [ ] Testing Task (TDD - writing tests BEFORE implementation)\n`;
+        prBody += `- [ ] Implementation Task (TDD - making tests pass)\n`;
+        prBody += `- [ ] Design Task (schemas, architecture, planning)\n\n`;
+      }
+
       prBody += `## Description\n\n`;
       prBody += `${taskData.description || task.description || commitMessage}\n\n`;
 
       prBody += `## Changes\n\n`;
       prBody += `- Implemented ${task.title}\n\n`;
 
-      prBody += `## Testing\n\n`;
+      // TDD Compliance Section
+      prBody += `## TDD Compliance (REQUIRED)\n\n`;
+
+      if (taskData.phase === 'testing') {
+        prBody += `### For Testing Tasks:\n`;
+        prBody += `- [ ] All tests are REAL and EXECUTABLE (no mocks/placeholders)\n`;
+        prBody += `- [ ] Tests verify actual functionality\n`;
+        prBody += `- [ ] Positive and negative test cases included\n`;
+        prBody += `- [ ] Edge cases and error conditions covered\n`;
+        prBody += `- [ ] Tests pass and are ready for implementation phase\n`;
+        prBody += `- [ ] **Test Output:** (paste screenshot or output showing tests passing)\n\n`;
+      }
+
+      if (taskData.phase === 'implementation') {
+        prBody += `### For Implementation Tasks:\n`;
+        prBody += `- [ ] Prerequisite testing task is completed\n`;
+        prBody += `- [ ] All tests from prerequisite task pass\n`;
+        prBody += `- [ ] No tests were modified (implementation should make existing tests pass)\n`;
+        prBody += `- [ ] **Test Output:** (paste screenshot showing all tests passing)\n\n`;
+      }
+
+      // Determine if UI or Backend based on test cases or artifacts
+      const hasUIWork = taskData.testCases?.some(tc =>
+        tc.toLowerCase().includes('ui') ||
+        tc.toLowerCase().includes('component') ||
+        tc.toLowerCase().includes('render') ||
+        tc.toLowerCase().includes('form')
+      ) || taskData.artifacts?.code?.some(file =>
+        file.includes('components/') ||
+        file.includes('pages/') ||
+        file.includes('ui/')
+      );
+
+      const hasBackendWork = taskData.testCases?.some(tc =>
+        tc.toLowerCase().includes('api') ||
+        tc.toLowerCase().includes('endpoint') ||
+        tc.toLowerCase().includes('response')
+      ) || taskData.artifacts?.code?.some(file =>
+        file.includes('controllers/') ||
+        file.includes('services/') ||
+        file.includes('api/')
+      );
+
+      if (hasUIWork) {
+        prBody += `### For UI Testing/Implementation:\n`;
+        prBody += `- [ ] User interactions verified/implemented\n`;
+        prBody += `- [ ] Component rendering tested/implemented\n`;
+        prBody += `- [ ] Form validation tested/implemented\n`;
+        prBody += `- [ ] Visual feedback verified/implemented\n\n`;
+      }
+
+      if (hasBackendWork) {
+        prBody += `### For Backend Testing/Implementation:\n`;
+        prBody += `- [ ] API responses verified/implemented\n`;
+        prBody += `- [ ] Data validation tested/implemented\n`;
+        prBody += `- [ ] Error handling verified/implemented\n`;
+        prBody += `- [ ] Status codes verified/implemented\n\n`;
+      }
+
+      // Test Results Section
+      prBody += `## Test Results (REQUIRED for all PRs)\n\n`;
+      prBody += `\`\`\`\n`;
+      prBody += `Paste test output here showing all tests passing\n`;
+      prBody += `Example: npm test output or npx playwright test output\n`;
+      prBody += `\`\`\`\n\n`;
+
+      // Code Quality
+      prBody += `## Code Quality\n\n`;
       prBody += `- [ ] Code follows project conventions\n`;
-      prBody += `- [ ] Manual testing completed\n\n`;
+      prBody += `- [ ] No commented-out code\n`;
+      prBody += `- [ ] No debug statements (console.log, etc.)\n`;
+      prBody += `- [ ] Documentation updated (if needed)\n\n`;
 
       prBody += `## Notes\n\n`;
       prBody += `Auto-generated by Agentic15 Claude Zen`;

package/src/cli/SyncCommand.js

@@ -1,137 +1,192 @@
-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');
-  }
-}
+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: Check PR status (CRITICAL: prevents data loss)
+    if (isFeatureBranch) {
+      this.checkPRStatus(currentBranch);
+    }
+
+    // Step 5: Get main branch name
+    const mainBranch = this.getMainBranch();
+    console.log(`🎯 Main branch: ${mainBranch}\n`);
+
+    // Step 6: Switch to main
+    console.log(`📦 Switching to ${mainBranch}...\n`);
+    this.switchToMain(mainBranch);
+
+    // Step 7: Pull latest changes
+    console.log('⬇️  Pulling latest changes...\n');
+    this.pullMain(mainBranch);
+
+    // Step 8: Delete feature branch if we were on one
+    if (isFeatureBranch) {
+      console.log(`🗑️  Cleaning up feature branch: ${currentBranch}...\n`);
+      this.deleteFeatureBranch(currentBranch);
+    }
+
+    // Step 9: 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 checkPRStatus(branchName) {
+    try {
+      // Check if PR exists for this branch
+      const prInfo = execSync(`gh pr view ${branchName} --json state,mergedAt`, {
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe']
+      });
+
+      const pr = JSON.parse(prInfo);
+
+      // If PR exists but not merged, block sync
+      if (pr.state === 'OPEN' || (pr.state === 'CLOSED' && !pr.mergedAt)) {
+        console.log(`\n❌ Cannot sync: PR for ${branchName} is not merged\n`);
+        console.log(`   PR must be merged before running sync\n`);
+        console.log(`   Options:`);
+        console.log(`   1. Merge the PR on GitHub`);
+        console.log(`   2. Close PR and abandon changes\n`);
+        console.log(`   Aborting sync to prevent data loss.\n`);
+        process.exit(1);
+      }
+
+      // PR is merged, safe to proceed
+      console.log(`✅ PR merged - safe to sync\n`);
+
+    } catch (error) {
+      // No PR found - check if branch has commits
+      try {
+        const commits = execSync(`git log origin/main..${branchName} --oneline`, {
+          encoding: 'utf-8',
+          stdio: ['pipe', 'pipe', 'pipe']
+        });
+
+        if (commits.trim().length > 0) {
+          console.log(`\n❌ Cannot sync: No PR found but ${branchName} has unpushed commits\n`);
+          console.log(`   You have committed changes that were never pushed to a PR.\n`);
+          console.log(`   Options:`);
+          console.log(`   1. Create PR first: npx agentic15 commit`);
+          console.log(`   2. Push manually: git push -u origin ${branchName}\n`);
+          console.log(`   Aborting sync to prevent data loss.\n`);
+          process.exit(1);
+        }
+      } catch (e) {
+        // Error checking commits, be safe and block
+        console.log(`\n⚠️  Could not verify PR status for ${branchName}`);
+        console.log(`   Aborting sync for safety\n`);
+        process.exit(1);
+      }
+    }
+  }
+
+  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');
+  }
+}

package/src/core/TaskIssueMapper.js

@@ -51,7 +51,19 @@ export class TaskIssueMapper {
       body += `**Estimated Hours:** ${task.estimatedHours}h\n\n`;
     }
 
-    body += `## Completion Criteria\n\n`;
+    body += `## Phase\n\n`;
+    body += `${task.phase || 'implementation'}\n\n`;
+
+    body += `## Dependencies\n\n`;
+    if (task.dependencies && task.dependencies.length > 0) {
+      task.dependencies.forEach(dep => {
+        body += `- ${dep}\n`;
+      });
+    } else {
+      body += `*No dependencies*\n`;
+    }
+
+    body += `\n## Completion Criteria\n\n`;
     if (task.completionCriteria && task.completionCriteria.length > 0) {
       task.completionCriteria.forEach(criteria => {
         body += `- [ ] ${criteria}\n`;
@@ -60,26 +72,69 @@ export class TaskIssueMapper {
       body += `*No specific criteria defined*\n`;
     }
 
-    body += `\n## Dependencies\n\n`;
-    if (task.dependencies && task.dependencies.length > 0) {
-      task.dependencies.forEach(dep => {
-        body += `- ${dep}\n`;
-      });
-    } else {
-      body += `*No dependencies*\n`;
+    // Add TDD requirements based on task phase
+    if (task.phase === 'testing') {
+      body += `\n## Test Requirements (if testing task)\n\n`;
+      body += `**For Testing Tasks:**\n`;
+      body += `- [ ] Tests are REAL and EXECUTABLE (no mocks/placeholders)\n`;
+      body += `- [ ] Tests verify actual functionality (not just pass by default)\n`;
+      body += `- [ ] Positive test cases included\n`;
+      body += `- [ ] Negative test cases included\n`;
+      body += `- [ ] Edge cases covered\n`;
+      body += `- [ ] Error conditions tested\n\n`;
+
+      // Add UI or Backend specific requirements based on test cases
+      const hasUITests = task.testCases?.some(tc =>
+        tc.toLowerCase().includes('ui') ||
+        tc.toLowerCase().includes('component') ||
+        tc.toLowerCase().includes('render') ||
+        tc.toLowerCase().includes('form') ||
+        tc.toLowerCase().includes('navigation')
+      );
+
+      const hasBackendTests = task.testCases?.some(tc =>
+        tc.toLowerCase().includes('api') ||
+        tc.toLowerCase().includes('endpoint') ||
+        tc.toLowerCase().includes('response') ||
+        tc.toLowerCase().includes('status')
+      );
+
+      if (hasUITests) {
+        body += `**For UI Testing Tasks:**\n`;
+        body += `- [ ] User interactions verified\n`;
+        body += `- [ ] Component state changes tested\n`;
+        body += `- [ ] Visual rendering validated\n`;
+        body += `- [ ] Form validation tested\n`;
+        body += `- [ ] Navigation flows tested\n\n`;
+      }
+
+      if (hasBackendTests) {
+        body += `**For Backend Testing Tasks:**\n`;
+        body += `- [ ] API responses verified\n`;
+        body += `- [ ] Data validation tested\n`;
+        body += `- [ ] Error handling validated\n`;
+        body += `- [ ] Status codes correct\n\n`;
+      }
     }
 
-    body += `\n## Phase\n\n`;
-    body += `${task.phase || 'implementation'}\n`;
+    if (task.phase === 'implementation') {
+      body += `\n## Implementation Requirements (if implementation task)\n\n`;
+      body += `**For Implementation Tasks:**\n`;
+      body += `- [ ] Prerequisite testing task completed\n`;
+      body += `- [ ] All tests from prerequisite task pass\n`;
+      body += `- [ ] Code satisfies test requirements\n`;
+      body += `- [ ] No breaking changes to existing tests\n\n`;
+    }
 
     if (task.testCases && task.testCases.length > 0) {
-      body += `\n## Test Cases\n\n`;
+      body += `## Test Cases\n\n`;
       task.testCases.forEach(test => {
         body += `- ${test}\n`;
       });
+      body += `\n`;
     }
 
-    body += `\n---\n*Auto-generated by Agentic15 Claude Zen*`;
+    body += `---\n*Auto-generated by Agentic15 Claude Zen*`;
 
     return body;
   }

package/templates/.github/ISSUE_TEMPLATE/task.md

@@ -1,23 +1,54 @@
----
-name: Task
-about: Auto-generated task from Agentic15 plan
-title: '[TASK-XXX] '
-labels: 'task'
-assignees: ''
----
-
-## Task Description
-
-<!-- Auto-generated from PROJECT-PLAN.json -->
-
-## Completion Criteria
-
-<!-- Auto-populated from task definition -->
-
-## Dependencies
-
-<!-- Auto-populated from task definition -->
-
-## Phase
-
-<!-- Auto-populated from task definition -->
+---
+name: Task
+about: Auto-generated task from Agentic15 plan
+title: '[TASK-XXX] '
+labels: 'task'
+assignees: ''
+---
+
+## Task Description
+
+<!-- Auto-generated from PROJECT-PLAN.json -->
+
+## Phase
+
+<!-- Auto-populated from task definition -->
+
+## Dependencies
+
+<!-- Auto-populated from task definition -->
+
+## Completion Criteria
+
+<!-- Auto-populated from task definition -->
+
+## Test Requirements (if testing task)
+
+**For Testing Tasks:**
+- [ ] Tests are REAL and EXECUTABLE (no mocks/placeholders)
+- [ ] Tests verify actual functionality (not just pass by default)
+- [ ] Positive test cases included
+- [ ] Negative test cases included
+- [ ] Edge cases covered
+- [ ] Error conditions tested
+
+**For UI Testing Tasks:**
+- [ ] User interactions verified
+- [ ] Component state changes tested
+- [ ] Visual rendering validated
+- [ ] Form validation tested
+- [ ] Navigation flows tested
+
+**For Backend Testing Tasks:**
+- [ ] API responses verified
+- [ ] Data validation tested
+- [ ] Error handling validated
+- [ ] Status codes correct
+
+## Implementation Requirements (if implementation task)
+
+**For Implementation Tasks:**
+- [ ] Prerequisite testing task completed
+- [ ] All tests from prerequisite task pass
+- [ ] Code satisfies test requirements
+- [ ] No breaking changes to existing tests

package/templates/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +1,65 @@
-# Pull Request
-
-## Task
-
-Closes #
-
-## Description
-
-<!-- Auto-generated from task description -->
-
-## Changes
-
--
-
-## Testing
-
-- [ ] Unit tests pass (`npm test`)
-- [ ] Visual tests pass (if applicable) (`npx playwright test`)
-- [ ] Code follows project conventions
-
-## Notes
-
-<!-- Additional context or notes -->
+# Pull Request
+
+## Task
+
+Closes #
+
+## Task Type
+
+- [ ] Testing Task (TDD - writing tests BEFORE implementation)
+- [ ] Implementation Task (TDD - making tests pass)
+- [ ] Design Task (schemas, architecture, planning)
+
+## Description
+
+<!-- Auto-generated from task description -->
+
+## Changes
+
+-
+
+## TDD Compliance (REQUIRED)
+
+### For Testing Tasks:
+- [ ] All tests are REAL and EXECUTABLE (no mocks/placeholders)
+- [ ] Tests verify actual functionality
+- [ ] Positive and negative test cases included
+- [ ] Edge cases and error conditions covered
+- [ ] Tests pass and are ready for implementation phase
+- [ ] **Test Output:** (paste screenshot or output showing tests passing)
+
+### For Implementation Tasks:
+- [ ] Prerequisite testing task is completed
+- [ ] All tests from prerequisite task pass
+- [ ] No tests were modified (implementation should make existing tests pass)
+- [ ] **Test Output:** (paste screenshot showing all tests passing)
+
+### For UI Testing/Implementation:
+- [ ] User interactions verified/implemented
+- [ ] Component rendering tested/implemented
+- [ ] Form validation tested/implemented
+- [ ] Visual feedback verified/implemented
+
+### For Backend Testing/Implementation:
+- [ ] API responses verified/implemented
+- [ ] Data validation tested/implemented
+- [ ] Error handling verified/implemented
+- [ ] Status codes verified/implemented
+
+## Test Results (REQUIRED for all PRs)
+
+```
+Paste test output here showing all tests passing
+Example: npm test output or npx playwright test output
+```
+
+## Code Quality
+
+- [ ] Code follows project conventions
+- [ ] No commented-out code
+- [ ] No debug statements (console.log, etc.)
+- [ ] Documentation updated (if needed)
+
+## Notes
+
+<!-- Additional context or notes -->