moai-adk 0.25.4__py3-none-any.whl → 0.32.8__py3-none-any.whl

moai_adk/templates/.claude/skills/moai-worktree/reference.md

@@ -0,0 +1,357 @@
+# MoAI Worktree Reference
+
+Purpose: External resources, documentation, and additional learning materials for moai-worktree skill.
+
+Version: 1.0.0
+Last Updated: 2025-11-29
+
+---
+
+## External Documentation
+
+### Git Worktree Official Documentation
+
+- Git Worktree Documentation: [https://git-scm.com/docs/git-worktree](https://git-scm.com/docs/git-worktree)
+ - Official Git worktree command reference
+ - Advanced worktree patterns and workflows
+ - Troubleshooting and best practices
+
+- Pro Git Book - Worktrees: [https://git-scm.com/book/en/v2/Git-Tools-Worktree](https://git-scm.com/book/en/v2/Git-Tools-Worktree)
+ - Comprehensive guide to Git worktrees
+ - Multiple workflow management strategies
+ - Worktree lifecycle management
+
+### Development Tools Documentation
+
+- VS Code Multi-Root Workspaces: [https://code.visualstudio.com/docs/editor/multi-root-workspaces](https://code.visualstudio.com/docs/editor/multi-root-workspaces)
+ - Setting up multi-root workspaces for worktree development
+ - Workspace configuration and task automation
+ - Extension management across worktrees
+
+- Click Framework: [https://click.palletsprojects.com/](https://click.palletsprojects.com/)
+ - Command-line interface framework used by moai-worktree
+ - Advanced CLI patterns and argument parsing
+ - Custom command development
+
+### Python Development Resources
+
+- Rich Library: [https://rich.readthedocs.io/](https://rich.readthedocs.io/)
+ - Terminal output formatting used by moai-worktree
+ - Tables, progress bars, and syntax highlighting
+ - Advanced terminal UI patterns
+
+- Pathlib Documentation: [https://docs.python.org/3/library/pathlib.html](https://docs.python.org/3/library/pathlib.html)
+ - Modern path manipulation for cross-platform compatibility
+ - File system operations and directory traversal
+ - Path validation and security considerations
+
+---
+
+## Related Skills and Integrations
+
+### MoAI-ADK Skills
+
+- moai-foundation-core: Foundation principles and delegation patterns
+ - Reference: [moai-foundation-core modules](moai-foundation-core/modules/)
+ - Integration: Worktree creation follows foundation delegation patterns
+
+- moai-workflow-project: Project management and configuration
+ - Reference: [moai-workflow-project modules](moai-workflow-project/modules/)
+ - Integration: Project setup with worktree support
+
+- moai-foundation-claude: Claude Code execution patterns
+ - Reference: [moai-foundation-claude modules](moai-foundation-claude/modules/)
+ - Integration: Command and agent execution patterns
+
+### Complementary Tools
+
+- Git Hooks: Custom Git hooks for worktree automation
+ - Pre-commit hooks for worktree validation
+ - Post-checkout hooks for environment setup
+ - Pre-push hooks for worktree synchronization
+
+- Docker: Containerized development environments
+ - Docker Compose for service orchestration in worktrees
+ - Volume mounts for persistent data across worktrees
+ - Environment isolation for different worktree configurations
+
+- Makefiles: Build automation across worktrees
+ - Parallel build processes for multiple worktrees
+ - Shared build targets and dependencies
+ - Cleanup and optimization automation
+
+---
+
+## Community Resources
+
+### Open Source Projects
+
+- Git Worktree Managers:
+ - [git-worktree](https://github.com/charmbracelet/git-worktree) - Go implementation
+ - [git-worktree.nvim](https://github.com/ThePrimeagen/git-worktree.nvim) - Neovim plugin
+ - [git-worktree.el](https://github.com/magit/git-worktree.el) - Emacs integration
+
+### Blog Posts and Articles
+
+- Parallel Development with Git Worktrees: [Medium Article](https://medium.com/@username/parallel-development-git-worktrees)
+- Git Worktree Best Practices: [Dev.to Article](https://dev.to/username/git-worktree-best-practices)
+- Advanced Worktree Workflows: [GitHub Gist](https://gist.github.com/username/worktree-patterns)
+
+### Video Tutorials
+
+- Git Worktree Tutorial: [YouTube Tutorial](https://www.youtube.com/watch?v=worktree-tutorial)
+- Parallel Development Setup: [Screencast](https://www.youtube.com/watch?v=parallel-dev-setup)
+- Worktree Automation: [Conference Talk](https://www.youtube.com/watch?v=worktree-automation)
+
+---
+
+## Performance and Optimization
+
+### Performance Monitoring Tools
+
+- htop: Process monitoring for worktree resource usage
+ - Monitor CPU and memory usage across worktrees
+ - Identify resource-intensive worktree operations
+ - Track disk usage and I/O patterns
+
+- ncdu: Disk usage analysis for worktree cleanup
+ - Analyze disk usage patterns across worktrees
+ - Identify large files and directories for optimization
+ - Generate cleanup recommendations
+
+- git-branchless: Faster Git operations for large repositories
+ - Optimize performance for worktree operations
+ - Reduce overhead for large codebase worktrees
+ - Improve sync performance across multiple worktrees
+
+### Optimization Techniques
+
+1. Shallow Worktrees: For fast prototyping and testing
+ ```bash
+ moai-worktree new SPEC-PROTO-001 "Prototype" --shallow --depth 1
+ ```
+
+2. Selective Synchronization: Sync only essential files
+ ```bash
+ moai-worktree sync SPEC-001 --include "src/" --exclude "node_modules/"
+ ```
+
+3. Background Operations: Non-blocking worktree operations
+ ```bash
+ moai-worktree sync --all --background
+ ```
+
+---
+
+## Security Considerations
+
+### Worktree Security Best Practices
+
+1. Isolation: Ensure worktrees don't share sensitive data
+ - Use separate environment files (`.env.local`) for each worktree
+ - Avoid sharing API keys or credentials between worktrees
+ - Regularly audit worktree configurations
+
+2. Access Control: Implement proper file permissions
+ - Set appropriate permissions on worktree directories (755)
+ - Restrict access to sensitive worktree data
+ - Use Git hooks to prevent accidental secrets commits
+
+3. Backup Strategy: Implement worktree backup and recovery
+ - Regular backups of worktree registry and configurations
+ - Version control for worktree templates and scripts
+ - Recovery procedures for corrupted worktrees
+
+### Security Tools
+
+- git-secrets: Detect sensitive data in worktrees
+ - Scan worktrees for accidental secrets or credentials
+ - Integrate with pre-commit hooks for worktree security
+ - Automatic remediation suggestions
+
+- truffleHog: Security scanning for worktree files
+ - Comprehensive security audit across worktrees
+ - API key and credential detection
+ - Custom pattern matching for project-specific secrets
+
+---
+
+## Integration Examples
+
+### CI/CD Integration
+
+#### GitHub Actions Workflow
+
+```yaml
+# .github/workflows/worktree-testing.yml
+name: Worktree Testing
+
+on:
+ push:
+ branches: [ "feature/SPEC-*" ]
+
+jobs:
+ test-worktree:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - name: Setup moai-worktree
+ run: |
+ pip install moai-adk
+ echo "Setting up worktree environment..."
+
+ - name: Test Worktree Operations
+ run: |
+ # Test worktree creation
+ moai-worktree new test-spec "Test Worktree"
+
+ # Test worktree synchronization
+ moai-worktree sync test-spec
+
+ # Test worktree cleanup
+ moai-worktree remove test-spec
+```
+
+#### Jenkins Pipeline
+
+```groovy
+// Jenkinsfile for worktree testing
+pipeline {
+ agent any
+
+ stages {
+ stage('Setup') {
+ steps {
+ sh '''
+ pip install moai-adk
+ moai-worktree config set worktree_root $WORKSPACE/worktrees
+ '''
+ }
+ }
+
+ stage('Test') {
+ parallel {
+ stage('Auth Worktree') {
+ steps {
+ sh '''
+ moai-worktree new SPEC-AUTH-001 "Authentication Worktree"
+ cd $(moai-worktree go SPEC-AUTH-001)
+ npm test
+ '''
+ }
+ }
+
+ stage('Payment Worktree') {
+ steps {
+ sh '''
+ moai-worktree new SPEC-PAY-001 "Payment Worktree"
+ cd $(moai-worktree go SPEC-PAY-001)
+ npm test
+ '''
+ }
+ }
+ }
+ }
+
+ stage('Cleanup') {
+ steps {
+ sh '''
+ moai-worktree clean --force
+ rm -rf $WORKSPACE/worktrees
+ '''
+ }
+ }
+ }
+}
+```
+
+---
+
+## Troubleshooting Resources
+
+### Common Error Patterns
+
+1. Permission Denied Errors:
+ - Check file permissions on worktree directories
+ - Verify user has write access to worktree root
+ - Ensure Git repository permissions are correct
+
+2. Disk Space Issues:
+ - Monitor disk usage with `df -h`
+ - Clean up large files with `ncdu`
+ - Implement automated cleanup schedules
+
+3. Network Connectivity:
+ - Verify Git remote repository accessibility
+ - Check network connectivity for external dependencies
+ - Use offline worktree operations when possible
+
+### Debugging Tools
+
+- git worktree prune: Clean up stale worktree references
+- git fsck: Repository integrity checking
+- strace: System call tracing for debugging
+- lsof: Open file tracking and process monitoring
+
+---
+
+## Version History
+
+### Current Version (1.0.0)
+- Initial release with core worktree management features
+- Integration with MoAI-ADK workflow commands
+- Comprehensive documentation and examples
+
+### Future Roadmap
+- v1.1.0: Team collaboration features
+ - Shared worktree registries
+ - Multi-developer coordination
+ - Conflict resolution algorithms
+
+- v1.2.0: Advanced automation features
+ - Worktree templates marketplace
+ - Custom automation scripts
+ - Performance optimization tools
+
+- v1.3.0: Cloud integration
+ - Cloud-based worktree storage
+ - Remote worktree synchronization
+ - Distributed development workflows
+
+---
+
+## Contributing
+
+### How to Contribute
+
+1. Report Issues: Submit bug reports and feature requests
+2. Submit Pull Requests: Contribute code and documentation improvements
+3. Share Examples: Add usage examples and integration patterns
+4. Document Workflows: Create tutorials and guides
+
+### Development Setup
+
+```bash
+# Clone the repository
+git clone https://github.com/your-org/moai-adk.git
+
+# Set up development environment
+cd moai-adk
+pip install -e .
+pip install -r requirements-dev.txt
+
+# Run tests
+pytest tests/test_worktree.py -v
+
+# Build documentation
+mkdocs build
+```
+
+---
+
+Version: 1.0.0
+Last Updated: 2025-11-29
+Reference: External resources and additional learning materials for moai-worktree

moai_adk/templates/.git-hooks/pre-commit

@@ -1,66 +1,128 @@
 #!/bin/bash
-# @CODE:DOC-TAG-004 | Component 1: Pre-commit hook for TAG validation
+################################################################################
+# Pre-commit Hook: Security & Workflow Protection
 #
-# This hook validates TAG annotations in staged files before commit.
-# It checks:
-# - TAG format (@DOC:DOMAIN-TYPE-NNN)
-# - Duplicate TAG detection
-# - Orphan TAG detection (warnings only)
+# Purpose: Prevent API keys, tokens, and sensitive data from being committed
+#
+# Phases:
+# 1. Security Secrets Detection (CRITICAL) - Blocks if secrets found
+# 2. Workflow Protection - Enforces Git branch rules
 #
 # Exit codes:
-#   0 - Validation passed
-#   1 - Validation failed (duplicates or format errors)
+# 0 - All checks passed
+# 1 - Secrets detected or workflow violation
+################################################################################
 
-set -e  # Exit on error
+set -e
 
 # Colors for output
 RED='\033[0;31m'
-GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
+GREEN='\033[0;32m'
 NC='\033[0m' # No Color
 
-# Get repository root
-REPO_ROOT=$(git rev-parse --show-toplevel)
+###############################################################################
+# PHASE 1: Security Secrets Detection (CRITICAL)
+###############################################################################
 
-# Check if Python module is available
-if ! python3 -c "import moai_adk.core.tags.pre_commit_validator" 2>/dev/null; then
-    echo -e "${YELLOW}Warning: moai_adk TAG validator not found.${NC}"
-    echo "Skipping TAG validation. Install moai_adk to enable validation."
-    exit 0
-fi
+echo "🔒 [Phase 1] Running Security Secrets Detection..."
+
+SECRETS_FOUND=false
+
+# Define secret patterns to detect
+declare -a PATTERNS=(
+    "AIzaSy[A-Za-z0-9_-]{35}"        # Google APIs
+    "sk-[A-Za-z0-9]{20,}"             # OpenAI
+    "sk_[A-Za-z0-9]{20,}"             # OpenAI variant
+    "sk-ant-[A-Za-z0-9]{20,}"        # Anthropic
+    "AKIA[0-9A-Z]{16}"                # AWS Access Keys
+    "api[_-]?key['\"]?\s*[:=]\s*['\"]?[A-Za-z0-9_-]{20,}['\"]?"
+    "bearer[_-]?token['\"]?\s*[:=]\s*['\"]?[A-Za-z0-9._-]{20,}['\"]?"
+    "aws_secret_access_key['\"]?\s*[:=]\s*['\"]?[A-Za-z0-9/+=]{40}['\"]?"
+    "access[_-]?token['\"]?\s*[:=]\s*['\"]?[A-Za-z0-9._-]{20,}['\"]?"
+)
 
 # Get staged files
 STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM)
 
-if [ -z "$STAGED_FILES" ]; then
-    echo -e "${GREEN}No staged files to validate.${NC}"
-    exit 0
-fi
+for FILE in $STAGED_FILES; do
+    # Skip binary files
+    if file "$FILE" 2>/dev/null | grep -q "binary"; then
+        continue
+    fi
+
+    # Skip certain directories
+    if [[ "$FILE" =~ node_modules|venv|\.venv|\.git|\.next|dist ]]; then
+        continue
+    fi
 
-echo "🔍 Validating TAG annotations in staged files..."
+    # Get the staged content
+    STAGED_CONTENT=$(git show :"$FILE" 2>/dev/null)
 
-# Run TAG validation
-# Pass staged files as arguments to validator
-python3 -m moai_adk.core.tags.pre_commit_validator \
-    --files $STAGED_FILES
+    # Check against each pattern
+    for PATTERN in "${PATTERNS[@]}"; do
+        if echo "$STAGED_CONTENT" | grep -qE "$PATTERN"; then
+            if [ "$SECRETS_FOUND" = false ]; then
+                echo ""
+                echo -e "${RED}❌ SECURITY ERROR: Secrets detected!${NC}"
+                SECRETS_FOUND=true
+            fi
 
-VALIDATION_RESULT=$?
+            echo -e "${RED}  File: $FILE${NC}"
+            LINE_NUMS=$(echo "$STAGED_CONTENT" | grep -n -E "$PATTERN" | cut -d: -f1 | head -3)
+            echo -e "${YELLOW}  Lines: $LINE_NUMS${NC}"
+        fi
+    done
+done
 
-# Check result
-if [ $VALIDATION_RESULT -eq 0 ]; then
-    echo -e "${GREEN}✓ TAG validation passed.${NC}"
-    exit 0
-else
-    echo -e "${RED}✗ TAG validation failed.${NC}"
+if [ "$SECRETS_FOUND" = true ]; then
     echo ""
-    echo "Commit blocked due to TAG validation errors."
+    echo -e "${RED}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+    echo -e "${RED}⛔ COMMIT BLOCKED: Secrets detected in staged files${NC}"
+    echo -e "${RED}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
     echo ""
-    echo "To fix:"
-    echo "  1. Fix duplicate TAGs or format errors shown above"
-    echo "  2. Stage your changes with 'git add'"
-    echo "  3. Try committing again"
+    echo "✅ FIX:"
+    echo "  1. Replace secret with: 'your_actual_key_here'"
+    echo "  2. Store real key in: .env (git-ignored)"
+    echo "  3. Stage fixed files: git add <file>"
+    echo "  4. Retry commit: git commit"
     echo ""
-    echo "To skip this validation (not recommended):"
-    echo "  git commit --no-verify"
     exit 1
 fi
+
+echo -e "${GREEN}✅ Security check passed${NC}"
+
+###############################################################################
+# PHASE 2: Workflow Protection (Branch Rules)
+###############################################################################
+
+echo "🔄 [Phase 2] Checking Workflow Rules..."
+
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+
+# Detect direct commits on develop branch
+if [ "$CURRENT_BRANCH" = "develop" ]; then
+    echo "⚠️  WARNING: You are attempting to commit directly to develop branch."
+    echo ""
+    echo "📋 Hybrid Personal-Pro Workflow Rules:"
+    echo "  - Personal Mode (1-2 people): feature/SPEC-XXX → main"
+    echo "  - Team Mode (3+ people): feature/SPEC-XXX → develop → main"
+    echo ""
+    echo "✓ Current: Personal Mode → Work on main branch"
+    echo ""
+    echo "💡 Recommended Actions:"
+    echo "  1. git reset HEAD (cancel commit)"
+    echo "  2. git checkout main"
+    echo "  3. git checkout -b feature/SPEC-XXX"
+    echo "  4. Continue your work"
+    echo ""
+    read -p "Continue anyway? (y/n): " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        exit 1
+    fi
+fi
+
+echo -e "${GREEN}✅ Workflow check passed${NC}"
+echo ""
+exit 0

moai_adk/templates/.git-hooks/pre-push

@@ -1,22 +1,103 @@
 #!/bin/bash
 
-# MoAI-ADK GitFlow Main Branch Control Hook
-# Purpose: Enforce GitFlow in team mode, advisory in personal mode
-# Enforces: Strict team workflow, flexible personal development
-#
-# This hook runs before any git push operation:
-# Team Mode:   Blocks direct main/master push (non-develop), requires confirmation for develop→main
-# Personal Mode: Advisory warnings, allows flexibility
-#
-# Exit codes:
-# 0 - Push allowed
-# 1 - Push blocked (team mode violation or user declined)
-
-# Check team mode from .moai/config/config.json
+################################################################################
+# Pre-push Hook: Security Detection + GitFlow Control
+################################################################################
+
+# Colors for output
+RED='\033[0;31m'
+YELLOW='\033[1;33m'
+GREEN='\033[0;32m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+###############################################################################
+# PHASE 1: Security Secrets Detection (CRITICAL - Must run first)
+###############################################################################
+
+echo "🔒 [Phase 1] Running Security Secrets Detection before push..."
+
+SECRETS_FOUND=false
+
+# Define secret patterns to detect
+declare -a PATTERNS=(
+    "AIzaSy[A-Za-z0-9_-]{35}"        # Google APIs
+    "sk-[A-Za-z0-9]{20,}"             # OpenAI
+    "sk_[A-Za-z0-9]{20,}"             # OpenAI variant
+    "sk-ant-[A-Za-z0-9]{20,}"        # Anthropic
+    "AKIA[0-9A-Z]{16}"                # AWS Access Keys
+    "api[_-]?key['\"]?\s*[:=]\s*['\"]?[A-Za-z0-9_-]{20,}['\"]?"
+    "bearer[_-]?token['\"]?\s*[:=]\s*['\"]?[A-Za-z0-9._-]{20,}['\"]?"
+    "aws_secret_access_key['\"]?\s*[:=]\s*['\"]?[A-Za-z0-9/+=]{40}['\"]?"
+    "access[_-]?token['\"]?\s*[:=]\s*['\"]?[A-Za-z0-9._-]{20,}['\"]?"
+)
+
+# Store all input lines for processing
+input_lines=()
+while read local_ref local_oid remote_ref remote_oid; do
+    input_lines+=("$local_ref $local_oid $remote_ref $remote_oid")
+
+    # Check commits being pushed for secrets
+    if [ "$local_oid" != "0000000000000000000000000000000000000000" ]; then
+        remote_base="$remote_oid"
+        if [ "$remote_oid" = "0000000000000000000000000000000000000000" ]; then
+            # New branch - check all commits on this branch
+            remote_base=$(git rev-parse origin/main 2>/dev/null || git rev-parse origin/develop 2>/dev/null || echo "HEAD")
+        fi
+
+        # Get commits being pushed
+        PUSHED_COMMITS=$(git rev-list $remote_base..$local_oid 2>/dev/null)
+
+        for COMMIT in $PUSHED_COMMITS; do
+            COMMIT_CONTENT=$(git show $COMMIT 2>/dev/null)
+
+            for PATTERN in "${PATTERNS[@]}"; do
+                if echo "$COMMIT_CONTENT" | grep -qE "$PATTERN"; then
+                    if [ "$SECRETS_FOUND" = false ]; then
+                        echo ""
+                        echo -e "${RED}❌ SECURITY ERROR: Secrets detected in commits!${NC}"
+                        SECRETS_FOUND=true
+                    fi
+
+                    echo -e "${RED}  Commit: ${COMMIT:0:7}${NC}"
+                    LINE_NUMS=$(echo "$COMMIT_CONTENT" | grep -n -E "$PATTERN" | cut -d: -f1 | head -3)
+                    echo -e "${YELLOW}  Lines: $LINE_NUMS${NC}"
+                fi
+            done
+        done
+    fi
+done
+
+if [ "$SECRETS_FOUND" = true ]; then
+    echo ""
+    echo -e "${RED}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+    echo -e "${RED}⛔ PUSH BLOCKED: Secrets detected in commits${NC}"
+    echo -e "${RED}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+    echo ""
+    echo "✅ FIX:"
+    echo "  1. Amend commit: git commit --amend"
+    echo "  2. Replace secret with: 'your_actual_key_here'"
+    echo "  3. Store real key in: .env (git-ignored)"
+    echo "  4. Force push: git push --force-with-lease"
+    echo ""
+    echo "⚠️  Never push real API keys to GitHub!"
+    echo ""
+    exit 1
+fi
+
+echo -e "${GREEN}✅ Security check passed${NC}"
+
+###############################################################################
+# PHASE 2: GitFlow Enforcement + Branch Rules
+###############################################################################
+
+echo "🔄 [Phase 2] Checking GitFlow Rules..."
+
+# Check team mode from .moai/config.json
 is_team_mode() {
-    if [ -f ".moai/config/config.json" ]; then
+    if [ -f ".moai/config.json" ]; then
         # Check if mode is "team"
-        grep -q '"mode".*:.*"team"' ".moai/config/config.json" 2>/dev/null
+        grep -q '"mode".*:.*"team"' ".moai/config.json" 2>/dev/null
         return $?
     fi
     return 1
@@ -32,10 +113,16 @@ NC='\033[0m' # No Color
 TEAM_MODE=false
 is_team_mode && TEAM_MODE=true
 
+# Store all input lines for processing
+input_lines=()
+while read local_ref local_oid remote_ref remote_oid; do
+    input_lines+=("$local_ref $local_oid $remote_ref $remote_oid")
+done
+
 # STRICT TAG VALIDATION - Check all refs for tags first
-for ref_line in $(cat); do
-    local_ref=$(echo "$ref_line" | awk '{print $1}')
-    remote_ref=$(echo "$ref_line" | awk '{print $3}')
+for line in "${input_lines[@]}"; do
+    local_ref=$(echo "$line" | awk '{print $1}')
+    remote_ref=$(echo "$line" | awk '{print $3}')
 
     # Check if this is a tag push (refs/tags/)
     if [[ "$remote_ref" == refs/tags/* ]]; then
@@ -144,9 +231,17 @@ for ref_line in $(cat); do
     fi
 done
 
-# Now read from stdin again for branch validation
-# Format: <local ref> <local oid> <remote ref> <remote oid>
-while read local_ref local_oid remote_ref remote_oid; do
+# Process branch validation for non-tag refs
+for line in "${input_lines[@]}"; do
+    local_ref=$(echo "$line" | awk '{print $1}')
+    local_oid=$(echo "$line" | awk '{print $2}')
+    remote_ref=$(echo "$line" | awk '{print $3}')
+    remote_oid=$(echo "$line" | awk '{print $4}')
+
+    # Skip tag refs - they were processed above
+    if [[ "$remote_ref" == refs/tags/* ]]; then
+        continue
+    fi
     # Extract the remote branch name from the reference
     # remote_ref format: refs/heads/main
     remote_branch=$(echo "$remote_ref" | sed 's|refs/heads/||')