Ready to supercharge your AI agents?

Install any skill in seconds. Free to start, no credit card required.

Get Started Free →

Maestro Merge · catlog22 | DecimalAI

agent toolingby catlog22

Maestro Merge

catlog22/maestro-merge

Source catlog22/maestro-flow ↗License Not recorded

Merge session worktree branch back to main

SkillScore70Maintained

On-demandOn-demand: invoked explicitly — never occupies your agent's context until called.

Coding pack

Last verified 8/27/2026

What it changes

Passed 13 of 19 test cases with the skill, and 5 of 19 without it.

Without skill26%

With skill70%

Checks it passed that the model alone missed

Emit error code E003.
Return error code E002.
Emit warning code W001.

and 11 more in the full report

11 fixed5 passed either way6 still failing1 broke

Pass-rate lift: +43 pp
Tokens: -10%
Agent turns: 0%
Response time: -59%

Model gemini-3.6-flashMeasured 8/27/2026v416 of 23 cases passed with skill · 19 comparable

Tokens, turns and time describe resource use, not a dollar price.

Use this skill

Save it into your project's skills folder. Claude Code picks it up in its next session.

curl -fsSL --create-dirs -o .claude/skills/catlog22-maestro-merge/SKILL.md https://app.decimal.ai/s/catlog22-maestro-merge/SKILL.md

Want it pinned and updatable? pip install "decimalai>=0.15", then decimalai skills add catlog22-maestro-merge, and start Claude Code with claude --plugin-dir "$(git rev-parse --show-toplevel)/.agents"

1 · One-time — install the CLI (docs ↗)

pip install "decimalai>=0.15"

2 · Get the skill — writes .agents/skills/catlog22-maestro-merge/ and pins it in .decimal/skills.lock

decimalai skills add catlog22-maestro-merge

No CLI? Get the same file — curl · raw file

curl -fsSL --create-dirs -o .claude/skills/catlog22-maestro-merge/SKILL.md https://app.decimal.ai/s/catlog22-maestro-merge/SKILL.md

Raw file: /s/catlog22-maestro-merge/SKILL.md ↗ · machine-readable summary at /s/catlog22-maestro-merge.json ↗

Safety checks: 3 of 3 passed

Code scan CleanIntent PassedContent Clean

See it in action

One of 11 test cases the skill fixed. Same model, same prompt, with and without the skill.

1 of 11

Prompt

If a user executes session merge with `--continue` when no active unresolved git merge state exists, what error code is returned?

What was checked, without and with the skill
Checked	Without skill	With skill
Emit error code E003.	Missed	Passed

case-10 · gemini-3.6-flash · 8/27/2026 · answers are capped and redacted

What's inside

The instructions your model reads when the skill loads.

SKILL.md92 linessingle file

<required_reading> @~~/.maestro/workflows/run-mode.md @~~/.maestro/workflows/codex-run-mode.md </required_reading>

Terminology: this command uses 'session' throughout. The underlying workflow file (merge.md) may use 'milestone' as a legacy alias for 'session'. Treat them as equivalent: --session maps to workflow's -m, state.json.sessions[] maps to state.json.milestones[].

Flags (--session, --force, --dry-run, --no-cleanup, --continue), merge sequence, artifact sync detail, and conflict handling are defined in workflow merge.md.

--dry-run short-circuit: execute GATE 1 health check only, display merge preview (files that would change, artifact sync plan), then EXIT before rebase/merge. GATE 2 and GATE 3 are not reached.

Gates (MANDATORY, BLOCKING)

GATE 1: Pre-merge → Git Merge

REQUIRED: Registry health check completed (stale entries cleaned or flagged).
REQUIRED: Pre-merge rebase successful (worktree has latest main).
REQUIRED: worktree state.json schema version matches main state.json version. If mismatch → W004 (suggest running maestro-update in worktree first).
BLOCKED if rebase has conflicts: resolve in worktree first (W003).

Note on --force: skips user confirmation for incomplete phase artifacts (W002). Does NOT skip conflict resolution or rebase. Specifically: GATE 1 and GATE 2 are unaffected by --force; GATE 3's artifact completeness check uses --force to bypass the W002 confirmation.

GATE 2: Git Merge → Artifact Sync

REQUIRED: Git merge completed without conflicts (or conflicts resolved via --continue).
BLOCKED if: merge has unresolved conflicts — do NOT sync artifacts until git merge succeeds (prevents partial state corruption).

GATE 3: Artifact Sync → Completion

REQUIRED: All Run artifacts synced to main sessions/{session_id}/runs/.
REQUIRED: Artifact registry reconciled (worktree entries merged into main).

Track record

Benchmark

13 / 19

test cases passed, vs 5 / 19 without

Adoption

Users: 0
Times used: 0

Safety and source details

SkillSafety

✓ 3 of 3 passed

Code scan15 of 15 checks clean

0 critical · 0 warning · 0 info — scanner v5 — 8/26/2026

View 15 scanner checks

live_secretremote_code_executionreverse_shelldata_exfiltrationssrf_metadataagent_snoopinganti_refusaldestructive_commandsobfuscated_unicodeunicode_homoglyphopaque_blobsuspicious_urltool_overreachtrigger_abuseprompt_injection_phrasing

IntentSafe

LLM judge · does the skill do what it claims

ContentClean

LLM judge · policy & harmful-content review

Source

Imported

catlog22 / maestro-flow

.codex/skills/maestro-merge/SKILL.md

View on GitHub ↗

Imported 10/17/2026Version v4

More skills from the same source and nearby in the registry, with their headline benchmark lift.