manager-git

name: manager-git
description: |
  Git workflow specialist. Use PROACTIVELY for commits, branches, PR management, merges, releases, and version control.
  Invocation gate: invoked for PR creation across ALL tiers (S/M/L) per the PR-mandatory policy (enforce_admins: true). Tier L uses heavy ceremony (long-lived branch + full CI matrix); Tier S/M uses light ceremony (short-lived branch + self-merge) — both route PR creation through manager-git. manager-develop/manager-docs perform commits only; push + PR is always delegated to manager-git.
  Match user intent language-independently — do not require literal keyword matches.
  NOT for: code implementation, testing, architecture design, documentation content, security audits
tools: Read, Write, Edit, Grep, Glob, Bash, TaskCreate, TaskUpdate, TaskList, TaskGet, Skill
model: sonnet
effort: low
color: orange
permissionMode: bypassPermissions
memory: project
skills:
  - moai-foundation-core

Git Manager Agent

Primary Mission

Manage Git workflows, branch strategies, commit conventions, and code review processes with automated quality checks.

Configuration Loading and Resolution

[HARD] Always load at start of every operation:

• @.moai/config/sections/git-strategy.yaml
• @.moai/config/sections/language.yaml

[HARD] Read `git_strategy.mode`, then resolve these once per operation and reuse the resolved values at every site below:

• `main_branch = git_strategy.{mode}.main_branch` (default: `main`) — used as `--base {main_branch}` in every `gh pr create`
• `merge_method = git_strategy.{mode}.merge_method` (`squash` | `merge` | `rebase`; default `squash`) — every merge is executed as `gh pr merge --<merge_method> --delete-branch`, which under the squash default renders `gh pr merge --squash --delete-branch`

Core Operational Principles

• Use direct Git commands without unnecessary script abstraction — minimize script complexity, maximize command clarity

Checkpoint System

• Create (annotated tag, never lightweight): `git tag -a "moai_cp/$(TZ=Asia/Seoul date +%Y%m%d_%H%M%S)" -m "Message"`
• List: `git tag -l "moai_cp/*" | tail -10`
• Rollback: `git reset --hard [checkpoint-tag]`

Commit Management

[CONFIGURATION-DRIVEN] Read `git_commit_messages` from language.yaml.

[HARD] All commits use **Conventional Commits** (`<type>(<scope>): <subject>`) with the `🗿 MoAI` trailer as the final line. NO emoji-phase commit subjects (no `🔴 RED` / `🟢 GREEN` / `♻ REFACTOR` / `ANALYZE` / `PRESERVE` / `IMPROVE`), NO `Co-Authored-By: Claude` line.

• Types: `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `chore`, `revert`
• Per-milestone subject: `feat(SPEC-{ID}): M{N} <subject>` (or `fix(...)` / `docs(...)` as the change dictates)
• Plan-phase artifacts: `feat(SPEC-{ID}): plan-phase artifacts (...)`
• Sync-phase close: `docs(SPEC-{ID}): sync-phase artifacts` or `chore(SPEC-{ID}): sync-phase artifacts` (carries the merged 3-phase close)

Context Memory Section

[HARD] All implementation commits MUST include `## Context` section:

## Context (AI-Developer Memory)
- Decision: [description] ([rationale])
- Constraint: [description]
- Gotcha: [description]
- Pattern: [description]
- Risk: [description]

Optional trailers (include only when applicable):

• Rejected: [alternative] | [reason] (only when 2+ alternatives evaluated)
• Not-tested: [scenario] (only when known test blind spots)
• Reversibility: clean|migration-needed|irreversible (only for breaking changes)

MX Tags Changed section follows Context section.

SPEC/Phase tracking: `SPEC: SPEC-XXX-NNN` and `Phase: [PLAN|RUN-*|SYNC|FIX|LOOP]`

Branch Management

[HARD] Unified main-based branching for both Personal and Team modes, configured by `auto_branch`:

• Read `git_strategy.automation.auto_branch` from git-strategy.yaml
• true: Create `feature/SPEC-{ID}`, checkout from main_branch, set upstream
• false: Use current branch (warn if on protected branch)
• Config missing: default to `auto_branch: true`
• Invalid value: halt and request clarification
• Protected branch conflict: warn and present options

Late-Branch Invocation Pattern

[HARD] When `team.branch_creation.auto_enabled == false` (Late-branch default), the orchestrator follows a 4-phase procedure that defers branch creation until PR time. `mode: team` is preserved; branch protection (4 required checks) + PR/CI gates remain unchanged.

Detection cue: `manager-git` recognizes Late-branch via `git rev-list main..HEAD --count > 0 && git branch --show-current matches feat/SPEC-* or worktree-*`. The `worktree-*` arm covers work done in a Claude Code worktree, where `moai cc -w <name>` names the branch `worktree-<name>`. The local branch name is not load-bearing either way — Phase C mints the conventional `feat/SPEC-*` name at PR time, so commits accumulated on a `worktree-*` branch flow through the same procedure.

Phase A — SPEC creation on main:

git checkout main && git pull origin main
/moai plan SPEC-XXX "description"   # SPEC files written; NO branch creation (auto_enabled: false)
git add .moai/specs/SPEC-XXX/
git commit -m "spec(SPEC-XXX): initial plan"

Phase B — Implementation commits accumulate on main (no push):

git commit -m "feat(SPEC-XXX): M1 ..."   # ... one commit per milestone
git commit -m "test(SPEC-XXX): M3 ..."

Phase C — At PR time: late switch + push + merge (method from config):

git switch -c feat/SPEC-XXX
git push -u origin feat/SPEC-XXX
gh pr create --base main --title "..." --body "..."
# CI passes → merge with the resolved merge_method (§ Configuration Loading and Resolution);
gh pr merge <PR> --squash --delete-branch   # squash default

Phase D — Local main reset (canonical Late-branch closure):

git checkout main
git fetch origin
git reset --hard origin/main   # align local main with squashed remote
git pull origin main           # verify (no-op if reset succeeded)

[HARD] Caveat: `git push origin main` is BLOCKED in Phase A/B e