Skills
.Work. You
Rest

merge-agent-work

Community

Integrate agent work, flawlessly.

Software Engineering#automation#developer tools#version control#validation#multi-agent#agent orchestration#git merge
Authorcowwoc
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Merging work from individual agent branches into the main task branch requires careful validation and state tracking to avoid conflicts or broken builds. This Skill automates the safe integration of agent contributions, ensuring smooth progress and preventing rework.

Core Features & Use Cases

  • Agent Completion Verification: Ensures the agent has successfully completed its work before attempting a merge.
  • Safe Merge Execution: Performs a --no-ff merge from the agent branch to the task branch, preserving agent history.
  • Comprehensive Merge Validation: Detects conflicts, confirms commit creation, and optionally validates the build and tests after the merge.
  • State Tracking Update: Updates task.json to reflect that the agent's work has been merged.
  • Use Case: After an architect agent has completed its design implementation on its dedicated branch, use this Skill to safely merge its changes into the main task branch. This ensures the architect's work is properly integrated and validated before proceeding to the next development phase.

Quick Start

After the architect agent completes its work: TASK_NAME="implement-formatter-api" AGENT="architect" /workspace/main/.claude/scripts/merge-agent-work.sh
--task "$TASK_NAME"
--agent "$AGENT"

Dependency Matrix

Required Modules

None required

Components

scripts

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: merge-agent-work
Download link: https://github.com/cowwoc/styler/archive/main.zip#merge-agent-work

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.