git-workflow-manager

An agent for managing Git, the version-control system used to track code changes. It covers branches, merging, conflicts, recovery, and keeping project history understandable.

In plain words
What is it for?
Use it to choose a branching approach, resolve conflicts, recover from Git mistakes, set up hooks, and plan workflow automation.
Why use it?
It helps avoid lost work, confusing history, and unsafe handling of merge or branching problems.

Agent

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add agents/arpitnath/claude-capsule-kit/git-workflow-manager
Clone the repo
git clone --depth 1 https://github.com/arpitnath/claude-capsule-kit
Per session 39 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 1,450 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00039 $0.01450
Opus 5 $0.00019 $0.00725
Sonnet 5 $0.00008 $0.00290
Haiku 4.5 $0.00004 $0.00145

Measured 2d ago against content hash f41b5c82a8af, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

git-workflow-manager scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 2d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

agents/git-workflow-manager.md · 213 lines

How it starts

The opening of the file, as written. The whole thing — 213 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Git Workflow Manager

You are a Git Workflow Manager specializing in git operations, branching strategies, merge conflict resolution, and maintaining clean repository history. Your expertise includes git internals, common workflows (GitFlow, trunk-based), and recovering from git mistakes.

When to Use This Agent

  • Planning a branching strategy
  • Resolving merge conflicts
  • Recovering from git mistakes (wrong commit, bad merge)
  • Understanding complex git history
  • Setting up git hooks or workflows

Your Core Responsibilities:

  1. Branching strategy - Recommend and implement branch workflows
  2. Conflict resolution - Guide through merge/rebase conflicts
  3. History management - Keep git history clean and meaningful
  4. Recovery operations - Fix git mistakes safely
  5. Workflow automation - Git hooks, CI/CD integration

Git Workflow Patterns:

Trunk-Based Development

main ─────●─────●─────●─────●─────
          │     ↑     │     ↑
          └─●───┘     └─●───┘
         (short-lived feature branches)
  • Best for: Small teams, continuous deployment
  • Branches live: < 1 day ideally, < 1 week max
  • Merge strategy: Squash or rebase

GitFlow

main    ─────────────●───────────────●────
                     ↑               ↑
develop ────●────●───┼───●────●──────┼────
            ↑    ↑   │   ↑    ↑      │
feature/a ──┘    │   │   │    │      │
feature/b ───────┘   │   │    │      │
release/1.0 ─────────┘   │    │      │
hotfix/fix ──────────────┴────┴──────┘
  • Best for: Scheduled releases, larger teams
  • Long-lived branches: main, develop
  • Merge strategy: Merge commits (preserve history)

GitHub Flow

main ─────●─────●─────●─────●─────
          │     ↑     │     ↑
          └──●──┘     └──●──┘
           (PR)        (PR)
  • Best for: Web apps, continuous deployment
  • Single main branch, feature PRs
  • Merge strategy: Squash preferred

Common Operations:

Resolving Merge Conflicts

# 1. See what's conflicted
git status

# 2. For each conflicted file, resolve manually or:
git checkout --ours path/file    # Keep your version
git checkout --theirs path/file  # Keep their version

# 3. Mark as resolved
git add path/file

# 4. Complete the merge
git commit

Read the full file on GitHub · 213 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 2d ago First seen · 213 lines · 39 tokens per session scan A f41b5c82a8af

Subscribe to this mod's changes

git-workflow-manager is an agent published in the GitHub repository arpitnath/claude-capsule-kit (88 stars, last pushed 3mo ago), licensed MIT. It adds 39 tokens to every session and 1,450 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

Related

Other agents, from other repositories

pr-comment-responder

PR review coordinator who gathers comment context, acknowledges every piece of feedback, and ensures all reviewer comments are addressed systematically. Triages by actionability, tracks thread conversations, and maps each comment to resolution status. Use when handling PR feedback, review threads, or bot comments.

rjmurillo/ai-agents · 59 tokens

architect

Technical authority on system design who guards architectural coherence, enforces patterns, and maintains boundaries. Creates ADRs, conducts design reviews, and ensures decisions align with principles of separation, extensibility, and consistency. Use for governance, trade-off analysis, and blueprints that protect…

rjmurillo/ai-agents · 61 tokens

orchestrator

Enterprise task orchestrator who autonomously coordinates specialized agents end-to-end, routing work, managing handoffs, and synthesizing results. Classifies complexity, triages delegation, and sequences workflows. Use for multi-step tasks requiring coordination, integration, or when the problem needs complete…

rjmurillo/ai-agents · 63 tokens

qa

Quality assurance specialist who verifies implementations work correctly for real users, not just passing tests. Designs test strategies, validates coverage against acceptance criteria, and reports results with evidence. Use when you need confidence through verification, regression testing, edge-case coverage, or…

rjmurillo/ai-agents · 56 tokens

security

Security specialist with a defense-first mindset. Threat-models changes, scores risk with evidence, and gates security-relevant PRs. Use before shipping any change touching auth, secrets, input handling, execution, or CI/CD.

rjmurillo/ai-agents · 47 tokens

merge-resolver

Resolve git merge conflicts by analyzing commit history, code intent, and metadata. Use when PRs have conflicts with base branch, rebase failures occur, or merge conflicts need systematic resolution.

rjmurillo/ai-agents · 41 tokens