n2b 0.5.1 → 2.0.0

data/bin/branch-audit.sh

@@ -0,0 +1,397 @@
+#!/bin/bash
+
+# Branch Audit Script - Safely analyze all branches for unmerged code
+# Author: Augment Agent
+# Purpose: Find valuable code in branches without touching main
+
+set -e  # Exit on any error
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Configuration
+MAIN_BRANCH="main"
+REPORT_FILE="branch_audit_report_$(date +%Y-%m-%d_%H-%M-%S).md"
+TEMP_DIR="temp_branch_audit_$$"
+WORKTREE_DIR="worktree_audit_$$"
+
+# Arrays to store results
+declare -a MERGEABLE_BRANCHES=()
+declare -a CONFLICTED_BRANCHES=()
+declare -a EMPTY_BRANCHES=()
+declare -a ERROR_BRANCHES=()
+
+# Cleanup function
+cleanup() {
+    echo -e "${YELLOW}🧹 Cleaning up temporary files...${NC}"
+    if [ -d "$TEMP_DIR" ]; then
+        rm -rf "$TEMP_DIR"
+    fi
+    if [ -d "$WORKTREE_DIR" ]; then
+        git worktree remove "$WORKTREE_DIR" 2>/dev/null || true
+        rm -rf "$WORKTREE_DIR" 2>/dev/null || true
+    fi
+}
+
+# Set up cleanup trap
+trap cleanup EXIT
+
+# Function to log with timestamp
+log() {
+    echo -e "${BLUE}[$(date '+%H:%M:%S')]${NC} $1"
+}
+
+# Function to check if branch exists
+branch_exists() {
+    git show-ref --verify --quiet "refs/heads/$1" 2>/dev/null
+}
+
+# Function to check if remote branch exists
+remote_branch_exists() {
+    git show-ref --verify --quiet "refs/remotes/$1" 2>/dev/null
+}
+
+# Function to get unique commits in branch vs main
+get_unique_commits() {
+    local branch="$1"
+    git log --oneline "${MAIN_BRANCH}..${branch}" 2>/dev/null || echo ""
+}
+
+# Function to get file changes summary
+get_file_changes() {
+    local branch="$1"
+    git diff --name-status "${MAIN_BRANCH}...${branch}" 2>/dev/null || echo ""
+}
+
+# Function to check if fast-forward merge is possible
+can_fast_forward() {
+    local branch="$1"
+    local merge_base=$(git merge-base "$MAIN_BRANCH" "$branch" 2>/dev/null || echo "")
+    local main_commit=$(git rev-parse "$MAIN_BRANCH" 2>/dev/null || echo "")
+    
+    if [ -z "$merge_base" ] || [ -z "$main_commit" ]; then
+        return 1
+    fi
+    
+    # If merge base equals main commit, then it's a fast-forward
+    [ "$merge_base" = "$main_commit" ]
+}
+
+# Function to analyze a single branch
+analyze_branch() {
+    local branch="$1"
+    local branch_type="$2"  # "local" or "remote"
+    
+    log "Analyzing ${branch_type} branch: $branch"
+    
+    # Skip main branch and its variants
+    if [[ "$branch" =~ ^(main|master|origin/main|origin/master)$ ]]; then
+        log "Skipping main branch: $branch"
+        return
+    fi
+    
+    # For remote branches, create local tracking branch if needed
+    local local_branch="$branch"
+    if [ "$branch_type" = "remote" ]; then
+        local_branch="${branch#origin/}"
+        if ! branch_exists "$local_branch"; then
+            log "Creating local tracking branch for $branch"
+            git branch "$local_branch" "$branch" 2>/dev/null || {
+                ERROR_BRANCHES+=("$branch (failed to create local branch)")
+                return
+            }
+        fi
+    fi
+    
+    # Get unique commits
+    local unique_commits=$(get_unique_commits "$local_branch")
+    local commit_count=0
+    if [ -n "$unique_commits" ] && [ "$unique_commits" != "" ]; then
+        commit_count=$(echo "$unique_commits" | wc -l | tr -d ' ')
+    fi
+    
+    if [ "$commit_count" -eq 0 ]; then
+        log "Branch $branch has no unique commits"
+        EMPTY_BRANCHES+=("$branch")
+        return
+    fi
+    
+    # Check if fast-forward is possible
+    if can_fast_forward "$local_branch"; then
+        log "✅ Branch $branch can be fast-forward merged ($commit_count commits)"
+        MERGEABLE_BRANCHES+=("$branch|$commit_count|$unique_commits")
+    else
+        log "⚠️  Branch $branch has conflicts or diverged ($commit_count commits)"
+        CONFLICTED_BRANCHES+=("$branch|$commit_count|$unique_commits")
+    fi
+}
+
+# Main execution starts here
+main() {
+    echo -e "${GREEN}🔍 Starting Branch Audit Analysis${NC}"
+    echo -e "${BLUE}Repository: $(pwd)${NC}"
+    echo -e "${BLUE}Main branch: $MAIN_BRANCH${NC}"
+    echo -e "${BLUE}Report file: $REPORT_FILE${NC}"
+    echo ""
+    
+    # Verify we're in a git repository
+    if ! git rev-parse --git-dir > /dev/null 2>&1; then
+        echo -e "${RED}❌ Error: Not in a git repository${NC}"
+        exit 1
+    fi
+    
+    # Verify main branch exists
+    if ! git show-ref --verify --quiet "refs/heads/$MAIN_BRANCH"; then
+        echo -e "${RED}❌ Error: Main branch '$MAIN_BRANCH' not found${NC}"
+        exit 1
+    fi
+    
+    # Fetch latest from remote
+    log "Fetching latest changes from remote..."
+    git fetch --all --prune
+    
+    # Create temporary directory
+    mkdir -p "$TEMP_DIR"
+    
+    # Get current branch to restore later
+    CURRENT_BRANCH=$(git branch --show-current)
+    
+    # Ensure we're on main branch for analysis
+    log "Switching to main branch for analysis..."
+    git checkout "$MAIN_BRANCH" >/dev/null 2>&1
+    
+    # Get all local branches
+    log "Analyzing local branches..."
+    while IFS= read -r branch; do
+        branch=$(echo "$branch" | sed 's/^[* ] //' | xargs)
+        analyze_branch "$branch" "local"
+    done < <(git branch | grep -v "^\*.*$MAIN_BRANCH$")
+    
+    # Get all remote branches
+    log "Analyzing remote branches..."
+    while IFS= read -r branch; do
+        branch=$(echo "$branch" | sed 's|^  remotes/||' | xargs)
+        # Skip if we already have this as a local branch
+        local_name="${branch#origin/}"
+        if ! branch_exists "$local_name"; then
+            analyze_branch "$branch" "remote"
+        fi
+    done < <(git branch -r | grep -v "HEAD\|$MAIN_BRANCH$")
+    
+    # Restore original branch
+    if [ -n "$CURRENT_BRANCH" ] && [ "$CURRENT_BRANCH" != "$MAIN_BRANCH" ]; then
+        log "Restoring original branch: $CURRENT_BRANCH"
+        git checkout "$CURRENT_BRANCH" >/dev/null 2>&1
+    fi
+    
+    # Generate report
+    generate_report
+    
+    echo ""
+    echo -e "${GREEN}✅ Branch audit completed!${NC}"
+    echo -e "${BLUE}📄 Report saved to: $REPORT_FILE${NC}"
+}
+
+# Function to generate detailed report
+generate_report() {
+    log "Generating detailed report..."
+
+    cat > "$REPORT_FILE" << EOF
+# Branch Audit Report
+**Generated:** $(date)
+**Repository:** $(pwd)
+**Main Branch:** $MAIN_BRANCH
+
+## 📊 Executive Summary
+
+- **Mergeable Branches (Fast-Forward):** ${#MERGEABLE_BRANCHES[@]}
+- **Conflicted Branches (Manual Review):** ${#CONFLICTED_BRANCHES[@]}
+- **Empty Branches (No Changes):** ${#EMPTY_BRANCHES[@]}
+- **Error Branches:** ${#ERROR_BRANCHES[@]}
+- **Total Analyzed:** $((${#MERGEABLE_BRANCHES[@]} + ${#CONFLICTED_BRANCHES[@]} + ${#EMPTY_BRANCHES[@]} + ${#ERROR_BRANCHES[@]}))
+
+---
+
+EOF
+
+    # Mergeable branches section
+    if [ ${#MERGEABLE_BRANCHES[@]} -gt 0 ]; then
+        cat >> "$REPORT_FILE" << EOF
+## ✅ Mergeable Branches (Fast-Forward Possible)
+
+These branches can be safely merged into main without conflicts:
+
+EOF
+        for branch_info in "${MERGEABLE_BRANCHES[@]}"; do
+            IFS='|' read -r branch commit_count commits <<< "$branch_info"
+            cat >> "$REPORT_FILE" << EOF
+### 🌿 \`$branch\`
+- **Unique Commits:** $commit_count
+- **File Changes:** $(get_file_changes "$branch" | wc -l) files
+- **Recent Commits:**
+\`\`\`
+$commits
+\`\`\`
+- **Files Modified:**
+\`\`\`
+$(get_file_changes "$branch" | head -10)
+$([ $(get_file_changes "$branch" | wc -l) -gt 10 ] && echo "... and $(($(get_file_changes "$branch" | wc -l) - 10)) more files")
+\`\`\`
+
+**Recommendation:** ✅ Safe to merge with \`git merge $branch\`
+
+---
+
+EOF
+        done
+    fi
+
+    # Conflicted branches section
+    if [ ${#CONFLICTED_BRANCHES[@]} -gt 0 ]; then
+        cat >> "$REPORT_FILE" << EOF
+## ⚠️ Conflicted Branches (Manual Review Required)
+
+These branches have diverged from main and may have conflicts:
+
+EOF
+        for branch_info in "${CONFLICTED_BRANCHES[@]}"; do
+            IFS='|' read -r branch commit_count commits <<< "$branch_info"
+            cat >> "$REPORT_FILE" << EOF
+### 🔀 \`$branch\`
+- **Unique Commits:** $commit_count
+- **File Changes:** $(get_file_changes "$branch" | wc -l) files
+- **Recent Commits:**
+\`\`\`
+$commits
+\`\`\`
+- **Files Modified:**
+\`\`\`
+$(get_file_changes "$branch" | head -10)
+$([ $(get_file_changes "$branch" | wc -l) -gt 10 ] && echo "... and $(($(get_file_changes "$branch" | wc -l) - 10)) more files")
+\`\`\`
+
+**Recommendation:** ⚠️ Manual review required - check for conflicts before merging
+
+---
+
+EOF
+        done
+    fi
+
+    # Empty branches section
+    if [ ${#EMPTY_BRANCHES[@]} -gt 0 ]; then
+        cat >> "$REPORT_FILE" << EOF
+## 🗑️ Empty Branches (Safe to Delete)
+
+These branches have no unique commits compared to main:
+
+EOF
+        for branch in "${EMPTY_BRANCHES[@]}"; do
+            cat >> "$REPORT_FILE" << EOF
+- \`$branch\` - No unique changes
+EOF
+        done
+        cat >> "$REPORT_FILE" << EOF
+
+**Cleanup Commands:**
+\`\`\`bash
+# Delete local empty branches
+EOF
+        for branch in "${EMPTY_BRANCHES[@]}"; do
+            if [[ ! "$branch" =~ ^origin/ ]]; then
+                echo "git branch -d $branch" >> "$REPORT_FILE"
+            fi
+        done
+        cat >> "$REPORT_FILE" << EOF
+
+# Delete remote empty branches (be careful!)
+EOF
+        for branch in "${EMPTY_BRANCHES[@]}"; do
+            if [[ "$branch" =~ ^origin/ ]]; then
+                remote_branch="${branch#origin/}"
+                echo "git push origin --delete $remote_branch" >> "$REPORT_FILE"
+            fi
+        done
+        cat >> "$REPORT_FILE" << EOF
+\`\`\`
+
+---
+
+EOF
+    fi
+
+    # Error branches section
+    if [ ${#ERROR_BRANCHES[@]} -gt 0 ]; then
+        cat >> "$REPORT_FILE" << EOF
+## ❌ Error Branches
+
+These branches encountered errors during analysis:
+
+EOF
+        for branch in "${ERROR_BRANCHES[@]}"; do
+            cat >> "$REPORT_FILE" << EOF
+- \`$branch\`
+EOF
+        done
+        cat >> "$REPORT_FILE" << EOF
+
+**Recommendation:** Manual investigation required
+
+---
+
+EOF
+    fi
+
+    # Summary and recommendations
+    cat >> "$REPORT_FILE" << EOF
+## 🎯 Recommended Actions
+
+### Immediate Actions (Safe)
+1. **Merge fast-forward branches:** ${#MERGEABLE_BRANCHES[@]} branches ready
+2. **Delete empty branches:** ${#EMPTY_BRANCHES[@]} branches can be removed
+3. **Review conflicted branches:** ${#CONFLICTED_BRANCHES[@]} branches need manual review
+
+### Cleanup Script
+\`\`\`bash
+# Run this script to clean up empty branches
+EOF
+
+    # Generate cleanup commands for empty branches
+    for branch in "${EMPTY_BRANCHES[@]}"; do
+        if [[ ! "$branch" =~ ^origin/ ]]; then
+            echo "git branch -d $branch" >> "$REPORT_FILE"
+        fi
+    done
+
+    cat >> "$REPORT_FILE" << EOF
+\`\`\`
+
+### Merge Script for Fast-Forward Branches
+\`\`\`bash
+# Run these commands to merge ready branches
+EOF
+
+    # Generate merge commands for mergeable branches
+    for branch_info in "${MERGEABLE_BRANCHES[@]}"; do
+        IFS='|' read -r branch commit_count commits <<< "$branch_info"
+        if [[ ! "$branch" =~ ^origin/ ]]; then
+            echo "git merge $branch  # $commit_count commits" >> "$REPORT_FILE"
+        fi
+    done
+
+    cat >> "$REPORT_FILE" << EOF
+\`\`\`
+
+---
+*Report generated by branch-audit.sh on $(date)*
+EOF
+
+    log "Report generated: $REPORT_FILE"
+}
+
+# Run main function
+main "$@"

data/bin/n2b-diff

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'n2b'
+
+N2B::MergeCLI.run(ARGV)

data/bin/n2b-test-github

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+require_relative '../lib/n2b/github_client'
+
+config_file = File.expand_path('~/.n2b/config.yml')
+unless File.exist?(config_file)
+  puts "❌ Config file not found: #{config_file}"
+  puts "Please run 'n2b --advanced-config' to set up GitHub integration first."
+  exit 1
+end
+
+config = YAML.load_file(config_file)
+
+begin
+  client = N2B::GitHubClient.new(config)
+rescue => e
+  puts "❌ #{e.message}"
+  exit 1
+end
+
+client.test_connection

data/bin/n2b-test-jira

@@ -124,11 +124,11 @@ class JiraConnectionTester
     puts "3️⃣ Testing required permissions..."
 
     begin
-      # Test 1: Project access (Browse Projects permission)
+      # Test 1: Project access (read:project:jira scope)
       response = make_api_request('GET', '/project')
 
       if response.is_a?(Array) && response.length > 0
-        puts "   ✅ Browse Projects: Can access #{response.length} projects"
+        puts "   ✅ Project Access (read:project:jira): Can access #{response.length} projects"
         response.first(3).each do |project|
           puts "     - #{project['key']}: #{project['name']}"
         end
@@ -141,30 +141,30 @@ class JiraConnectionTester
         begin
           issues_response = make_api_request('GET', "/search?jql=project=#{test_project['key']}&maxResults=1")
           if issues_response['issues'] && issues_response['issues'].length > 0
-            puts "   ✅ Browse Issues: Can access issues in #{test_project['key']}"
+            puts "   ✅ Issue Access (read:issue:jira): Can access issues in #{test_project['key']}"
 
             # Test 3: Comment access (if we found an issue)
             test_issue = issues_response['issues'].first
             begin
               comments_response = make_api_request('GET', "/issue/#{test_issue['key']}/comment")
-              puts "   ✅ View Comments: Can access comments on #{test_issue['key']}"
+              puts "   ✅ Comment Access (read:comment:jira): Can access comments on #{test_issue['key']}"
             rescue => e
-              puts "   ❌ View Comments: Cannot access comments (#{e.message})"
+              puts "   ❌ Comment Access (read:comment:jira): Cannot access comments (#{e.message})"
             end
 
             # Test 4: Add comment permission (we won't actually add, just check the endpoint)
-            puts "   ℹ️  Add Comments: Will be tested when actually posting comments"
+            puts "   ℹ️  Comment Creation (write:comment:jira): Will be tested when actually posting comments"
           else
             puts "   ⚠️  No issues found in #{test_project['key']} to test comment permissions"
           end
         rescue => e
-          puts "   ❌ Browse Issues: Cannot search issues (#{e.message})"
+          puts "   ❌ Issue Access (read:issue:jira): Cannot search issues (#{e.message})"
         end
 
         puts
       else
-        puts "   ❌ Browse Projects: No projects accessible"
-        puts "   Your API token needs 'Browse Projects' permission"
+        puts "   ❌ Project Access: No projects accessible"
+        puts "   Your API token needs 'read:project:jira' scope"
         puts
       end
     rescue => e
@@ -173,11 +173,14 @@ class JiraConnectionTester
       puts
     end
 
-    puts "   📋 Required Jira Permissions for N2B:"
-    puts "   • Browse Projects - to access project list"
-    puts "   • Browse Issues - to read ticket details"
-    puts "   • View Comments - to read ticket comments"
-    puts "   • Add Comments - to post analysis results"
+    puts "   📋 Required Jira API Scopes for N2B:"
+    puts "   • read:project:jira - to access project list"
+    puts "   • read:issue:jira - to read ticket details"
+    puts "   • read:comment:jira - to read ticket comments"
+    puts "   • write:comment:jira - to post analysis results"
+    puts
+    puts "   📝 Legacy Permission Names (older Jira versions):"
+    puts "   • Browse Projects, Browse Issues, View Comments, Add Comments"
     puts
   end