How do I install the Cistern Github skill?

Run npx skillmds@latest add michieldean/cistern-github in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.

What does the Cistern Github skill do?

GitHub CLI operations for Cistern delivery cataractae. Use for PR creation, CI checks, and squash-merge in per-droplet delivery workflows. It is listed under Coding & Dev Tools on SkillMD.

Is Cistern Github safe to use?

This skill has not completed SkillMD's automated safety review yet. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.

Which AI agents work with Cistern Github?

This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.

Is Cistern Github free to use?

Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.

Who published Cistern Github?

michieldean (@michieldean) published this skill. Their other Agent Skills are listed on their SkillMD profile.

Cistern Github by michieldean — Agent Skill

Name: Cistern Github
Author: michieldean

File contents

Cistern GitHub Operations

Tools

Use gh CLI for all GitHub operations. Prefer CLI over GitHub MCP servers for lower context usage.

PR Lifecycle

# Create a PR for the current droplet branch
gh pr create \
  --title "$PR_TITLE" \
  --body "Closes droplet $DROPLET_ID." \
  --base main --head $BRANCH

# If PR already exists
gh pr view $BRANCH --json url --jq '.url'

# Check CI status
gh pr checks $PR_URL

# Squash-merge when all checks pass
gh pr merge $PR_URL --squash --delete-branch

# Confirm merge
gh pr view $PR_URL --json state --jq '.state'   # must be "MERGED"

Conflict Resolution

Conflicts MUST be resolved automatically. Never stop and ask the user.

Cistern agents resolve conflicts by keeping both sets of changes. The canonical protocol is in cataractae/delivery/INSTRUCTIONS.md — follow it exactly.

Summary:

git diff --name-only --diff-filter=U — identify conflicted files
For each file: keep what HEAD added AND keep what this branch adds
go build ./... — verify the merge compiles
git add $(git diff --name-only --diff-filter=U) — stage resolved files
git rebase --continue
go build ./... && go test ./... — verify after full rebase
git push --force-with-lease origin $BRANCH

Most conflicts are additive: HEAD added X, this branch adds Y — keep both. Never discard branch additions.

Cistern Delivery Model

Cistern uses per-droplet branches (feat/<droplet-id>), not stacked PRs. Each droplet is independent. There is no stacked-PR workflow.

Frequently asked questions

Cistern Github