emasoft/amia-git-worktree-operations
skills/amia-git-worktree-operations/SKILL.md
Use when processing parallel PRs. Trigger with git worktree or parallel development requests. Loaded by ai-maestro-integrator-agent-main-agent.
development
Updated Apr 28, 2026
$ install --global
skillsauthnpx skillsauth add emasoft/ai-maestro-integrator-agent amia-git-worktree-operationsInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 28, 2026, 5:00 AM121.1s114 files scanned
SKILL.md
- name:
- amia-git-worktree-operations
- description:
- Use when processing parallel PRs. Trigger with git worktree or parallel development requests. Loaded by ai-maestro-integrator-agent-main-agent.
- license:
- Apache-2.0
- compatibility:
- Requires AI Maestro installed.
- agent:
- amia-main
- tags:
- git, worktree, parallel-development, pr-workflow, isolation
- version:
- 1.0.0
- author:
- Emasoft
- requires:
- git >= 2.15, python >= 3.9
- context:
- fork
- user-invocable:
- false
Git Worktree Operations Skill
Overview
Manage git worktrees for parallel PR processing with isolated branch directories sharing a single repository database.
Prerequisites
- Git 2.15+ installed (
git --version) - Python 3.9+ for running scripts
- Sufficient disk space for multiple worktree directories
Instructions
- Verify no other git operations are running
- Fetch and create worktree:
python scripts/amia_create_worktree.py --pr <number> --base-path /tmp/worktrees - Work ONLY within the worktree directory (absolute isolation)
- Commit and push:
python scripts/amia_worktree_commit_push.py --worktree-path <path> --message "<msg>" - Remove worktree:
python scripts/amia_cleanup_worktree.py --worktree-path <path>
Checklist
Copy this checklist and track your progress:
- [ ] Verify git version 2.15+ and no concurrent git ops
- [ ] Create worktree at designated path
- [ ] All file operations strictly inside worktree only
- [ ] Verify isolation:
python scripts/amia_verify_worktree_isolation.py --worktree-path <path> - [ ] Commit and push changes
- [ ] Verify no uncommitted files remain
- [ ] Cleanup worktree after PR completion
Output
| Output Type | Description | |-------------|-------------| | Worktree Directory | Checked-out PR branch at specified path | | Worktree List | JSON listing active worktrees with paths and branches | | Verification Report | Isolation check status and any boundary violations | | Commit/Push Confirmation | Success/failure with commit hash or remote status | | Cleanup Report | Removal confirmation with warnings if uncommitted changes exist |
Output discipline: All scripts support
--output-file <path>.
Reference Documents
See references/ directory for all reference documents.
Error Handling
Script failures return non-zero exit codes. Check stderr for details. See the detailed guide in Resources for common error scenarios.
Examples
Process Three PRs in Parallel
# Create worktrees
python scripts/amia_create_worktree.py --pr 101 --base-path /tmp/worktrees
python scripts/amia_create_worktree.py --pr 102 --base-path /tmp/worktrees
python scripts/amia_create_worktree.py --pr 103 --base-path /tmp/worktrees
# Assign each to a subagent, work in isolation, then cleanup
python scripts/amia_cleanup_worktree.py --worktree-path /tmp/worktrees/pr-101
Resources
See references/ directory — 107 reference documents. Full guide: detailed-guide:
- When to Use Worktrees
- When NOT to Use Worktrees
- Critical Constraints
- Decision Tree
- Script Usage Examples
- Error Handling
- Problem: "fatal: branch is already checked out"
- Problem: "worktree is dirty, cannot remove"
- Problem: Files appearing in main repo after worktree work
- Problem: "fatal: unable to create new worktree"
- Problem: Git operations hanging or failing
- Safety Warning: Destructive Operations
- Before Any Destructive Operation
- Safe Worktree Removal Checklist
- Emergency Recovery
- Quick Reference Card
Related Skills
emasoft/amia-tdd-enforcement
development
VerifiedTrustedCommunity
Use when enforcing TDD via RED-GREEN-REFACTOR. No production code without a failing test first. Trigger with /enforce-tdd. Loaded by ai-maestro-integrator-agent-main-agent.
SKILL.mdUpdated Apr 4, 2026
emasoft/amia-session-memory
data-ai
VerifiedTrustedCommunity
Use when resuming sessions. Trigger with session resumption. Loaded by ai-maestro-integrator-agent-main-agent.
SKILL.mdUpdated Apr 4, 2026
emasoft/amia-release-management
devops
VerifiedTrustedCommunity
Software release management and coordination. Use when creating releases, bumping versions, or rolling back deployments. Trigger with release tasks or /amia-create-release. Loaded by ai-maestro-integrator-agent-main-agent.
SKILL.mdUpdated Apr 4, 2026
emasoft/amia-quality-gates
testing
VerifiedTrustedCommunity
Use when enforcing quality gates. Trigger with /amia-enforce-gates. Loaded by ai-maestro-integrator-agent-main-agent.
SKILL.mdUpdated Apr 4, 2026