maestro-merge

Merge session worktree branches into main and synchronize run artifacts.

76|5|Updated Jul 7, 2026

Search Tags:#git #worktree #merge #artifacts #registry #session

Ready to run

npx skills add https://github.com/catlog22/pi-maestro-flow --skill maestro-merge

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: maestro-merge
Source: https://github.com/catlog22/pi-maestro-flow/tree/main/.pi/skills/maestro-merge
Command: npx skills add https://github.com/catlog22/pi-maestro-flow --skill maestro-merge

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you merge a completed session worktree back into main without breaking the shared run state, stale registry entries, or artifact history.

Core Features & Use Cases

Two-step merge workflow: Performs git merge first, then syncs Run artifacts only after the merge succeeds.
Safety gates and validation: Checks registry health, rebase status, schema version alignment, and conflict conditions before proceeding.
Artifact reconciliation: Updates session run artifacts, reconciles the artifact registry, and cleans up worktree state.
Use case: Use it when a feature session is finished and you need to safely fold the branch back into main while preserving operational records.

Quick Start

Merge session worktree branch back to main for session 12345 and review the merge preview or complete the merge as appropriate.

Frequently Asked Questions about maestro-merge

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I merge a git worktree branch back into main without losing artifacts?▼

To merge a git worktree branch safely, perform the git merge first and synchronize run artifacts only after the merge succeeds. This prevents broken shared run state and preserves artifact history.

What is a session worktree merge and when do I need it?▼

A session worktree merge folds a completed feature branch back into main while cleaning up registry entries. You need it when session-based development requires preserving operational records during branch integration.

How do I validate a git worktree before merging it to main?▼

Validate a git worktree before merging by running gate checks for registry health, rebase status, schema version alignment, and conflict conditions. These strict checks ensure worktree cleanup readiness before proceeding.

Best way to reconcile artifact registry after a git merge?▼

The best way to reconcile an artifact registry after a successful git merge is to update session run artifacts and clean up worktree state. This post-merge reconciliation ensures operational records remain accurate.

Why does my worktree merge leave stale registry entries?▼

A worktree merge leaves stale registry entries when post-merge artifact reconciliation is skipped. Applying strict gate checks for registry health and worktree cleanup before completion prevents this issue.