Add git cherry-pick orchestrator agent

[ZacheryGlass]

Add specialized agent for orchestrating complex git cherry-pick operations across repositories with submodules. Implements a two-part workflow:

1. Analysis & Planning - identify commit ranges and affected submodules
2. Execution - systematically cherry-pick changes in correct order

This agent ensures data integrity and proper handling of submodule pointers during cherry-pick operations.

[claude]

Claude finished @ZacheryGlass's task —— View job

---

Code Review Complete

Todo List:

• Read the agent specification file
• Review for code quality and best practices
• Check for potential bugs or issues
• Evaluate performance considerations
• Assess security concerns
• Analyze test coverage requirements
• Provide comprehensive feedback

---

Review Feedback

Overall Assessment

This is a well-structured agent specification for handling complex git cherry-pick operations with submodules. The agent follows a methodical two-part workflow (Analysis & Planning, then Execution) which is appropriate for the complexity of cherry-picking across repositories with submodules.

Strengths

• Clear workflow separation: The two-part approach prevents hasty execution that could corrupt repositories
• Comprehensive safety measures: Includes verification steps, conflict resolution guidance, and error recovery
• Good documentation: Each step is well-explained with specific git commands
• Proper submodule handling: Uses --ancestry-path and --reverse flags correctly for submodule operations

Code Quality & Best Practices

✅ Good practices identified:

• Follows a bottom-up approach (submodules first, then main repo) which is correct
• Uses temporary branches for submodule operations to avoid state corruption
• Includes workspace preparation and verification steps
• Proper use of git flags (--ancestry-path, --reverse, --init --recursive)

⚠️ Areas for improvement:

1. Missing error validation (agents/git-cherry-pick-orchestrator.md:64):

   git checkout -b temp-cherry-pick-branch $(git rev-parse HEAD)

   Should validate that the branch creation succeeded before proceeding.

2. Incomplete conflict resolution guidance (agents/git-cherry-pick-orchestrator.md:74-76):
   The conflict resolution for submodule pointers could be more detailed. Consider adding validation steps to ensure the correct submodule commit is being added.

3. No rollback strategy (agents/git-cherry-pick-orchestrator.md:96):
   While git cherry-pick --abort is mentioned, there's no guidance for cleaning up temporary submodule branches if the operation fails partway through.

Potential Bugs or Issues

1. Submodule branch cleanup: The agent creates temporary branches in submodules but doesn't specify cleanup procedures if the operation succeeds or fails.

2. Missing dependency validation: No verification that submodules are properly initialized before attempting operations.

3. Concurrent operation risk: No protection against running multiple cherry-pick operations simultaneously on the same repository.

Performance Considerations

✅ Performance-conscious design:

• Uses targeted git commands (git diff --name-only with specific ranges)
• Avoids unnecessary repository traversals
• Fetches only when needed

⚠️ Potential optimizations:

• Could batch cherry-pick operations when no conflicts are expected
• Multiple submodule operations could potentially be parallelized (though this adds complexity)

Security Concerns

✅ Security-conscious practices:

• No direct execution of user-provided commands
• Validates repository state before major operations
• Uses safe git commands without shell injection risks

⚠️ Minor security considerations:

• Should validate that commit hashes are well-formed before using them in git commands
• Could benefit from additional validation that the user has write permissions to the target branch

Test Coverage

❌ Missing test considerations:

• No guidance on how to validate the agent's functionality
• Missing integration test scenarios for complex submodule structures
• No examples of expected failure modes and their handling
• Consider adding test scenarios for:
  • Cherry-picking with merge conflicts
  • Operations on detached HEAD states
  • Invalid commit ranges
  • Submodules with no changes in the commit range

Recommendations

1. Add validation steps for branch creation and git command success
2. Expand conflict resolution guidance with specific examples
3. Include cleanup procedures for temporary branches
4. Add test scenarios to validate agent behavior
5. Consider adding progress indicators for long-running operations
6. Add dependency checks to ensure git and submodules are properly configured

Minor Issues

• Line 117: Consider being more specific about what constitutes "methodical" behavior
• Consider adding version compatibility notes for git features used
• The examples section could benefit from more diverse use cases

This agent specification demonstrates solid understanding of git submodule operations and provides a robust framework for complex cherry-pick scenarios. The structured approach and safety-first mentality are commendable.