standup
thedotmack/claude-mem
Coordinate multi-branch consolidation via read-only git standup chat.
What is standup?
Facilitates a structured conversation between git worktrees and PRs to plan a consolidated merge. Each branch joins a shared markdown chat as an agent, discusses overlaps and conflicts, and produces one concrete merge plan—without committing anything. Use this when you need to reconcile scattered work across multiple branches into a single target.
- Discovers active git worktrees and open PRs by recency or manual selection
- Runs facilitated rounds where each branch-agent introduces itself and its state
- Identifies overlaps, conflicts, and competing implementations across branches
- Produces a read-only consensus plan: target worktree, merge order, and conflict resolutions
- Translates the technical plan into plain language for human decision-making
How to install standup
npx skills add https://github.com/thedotmack/claude-mem --skill standup- Git with worktrees or branches to consolidate
- Node.js to run the standup CLI
- (Optional) GitHub CLI (`gh`) to include open PRs in the standup
How to use standup
- 1.Run `node standup.mjs worktrees --since <window>` or manually select branches/PRs to include
- 2.Confirm the roster of branches and PRs joining the standup
- 3.Let the facilitator run rounds: agents introduce themselves, then resolve conflicts round by round
- 4.Review the final summation and answer any human-decision questions
- 5.Pass the approved plan to `/do` to execute the actual merges
Use cases
- Consolidating work from multiple feature branches before a major merge
- Resolving conflicts and deciding merge order across scattered worktrees
- Planning how to integrate open PRs with local work without premature commits
- Coordinating team branches when multiple people work on overlapping code
- Reviewing what changed across branches before executing the actual merge
- Developers managing multiple worktrees or branches in parallel
- Teams coordinating scattered feature work before integration
- Anyone needing to understand and plan a complex multi-branch merge
standup FAQ
No. It is read-only—agents decide how the merge should go, but all real git work happens afterward via `/do` or manual commands.
Either by recency (e.g., `--since 4h` for branches active in the last 4 hours) or by hand, selecting specific worktrees and/or open PRs from a numbered list.
The facilitator will note that and skip to the close, producing a straightforward merge plan without resolution rounds.
Yes. The skill works with local worktrees and branches. If `gh` is not available, it skips PR discovery and continues with worktrees only.
The agents discuss and reach consensus in the chat. The facilitator surfaces open items and runs resolution rounds. You (the human) make final calls on any decisions only you can make, then approve the plan.
Full instructions (SKILL.md)
Source of truth, from thedotmack/claude-mem.
name: standup version: 1.0.0 description: Facilitate a read-only standup across git worktrees, branches, or PRs to compare changes and produce one consolidation plan. allowed-tools:
- Bash
- Read
- Edit
- Task
- AskUserQuestion
standup — facilitate a group chat between branch-agents
You're the facilitator. Each of the user's git worktrees (and any PRs they pick) joins a shared markdown chat as its own agent, and the agents reconcile their scattered work into ONE consolidated worktree. You convene the room, run the conversation in rounds, and carry the outcome back — the reconciling happens in the chat, between the agents.
The room is one shared file (default ~/.claude-mem/STANDUP.md): YAML front
matter holds the goal + prompt; the body is the transcript. Writes are
atomically locked, so agents speak at once. It is read-only — agents decide
how the merge should go; nobody commits or merges inside the room. Real git
work happens afterward via /do.
1. Fill the room
Two ways, mixable:
-
By recency (common) — worktrees active in a window:
node "${CLAUDE_SKILL_DIR}/standup.mjs" worktrees --since <1h|4h|24h|7d|all> --jsonActive = a commit or an uncommitted/staged/untracked edit in the window. If the user didn't name a window, offer 1h / 4h / 24h / 7d / all.
-
By hand — specific branches and/or open PRs:
node "${CLAUDE_SKILL_DIR}/standup.mjs" worktrees --json # local branches node "${CLAUDE_SKILL_DIR}/standup.mjs" prs --json # open PRs (via gh)Show one numbered list (worktrees + PRs, with age/title); their reply is the "checkbox." If
prserrors (nogh/ not GitHub), carry on worktrees-only.
Zero or one candidate isn't a standup — say so, offer to widen, stop. Otherwise echo the roster to confirm before you start.
2. Open the room
Set a goal + prompt that invite a conversation, not one-shot status reports:
node "${CLAUDE_SKILL_DIR}/standup.mjs" open --force --agent facilitator \
--goal "Collapse these branches/PRs into ONE consolidated worktree: what each changed, where they overlap, which becomes the target, and the merge order." \
--prompt "Facilitated rounds. Round 1: introduce your branch and its state. Then resolve the conflicts the facilitator surfaces, round by round, until the room lands on one concrete plan (target worktree + merge order + conflict resolutions). Read-only: decide, don't merge. Register AGREE when you back the plan."
3. Run it as rounds
You drive the turns — if agents watch-loop on their own the room can stall with nothing decided. Each agent speaks once per round (read → post → return); you read between rounds and bring back whoever's still needed.
Spawned agents don't inherit CLAUDE_SKILL_DIR, so resolve it once and paste the
real path into each brief:
echo "${CLAUDE_SKILL_DIR}"
Round 1 — intros (everyone, one Task message so they run together). Brief each:
You're
<branch>(a PR ispr-<number>) in a standup group chat. Read<skill-dir>/agent-brief.mdand play your part by it. The room is~/.claude-mem/STANDUP.md; speak withnode "<skill-dir>/standup.mjs" post …, catch up with… read. Get your bearings (cd "<path>",git log --oneline origin/main..HEAD,git status --short,git diff --stat origin/main...HEAD; a PR usesgh pr view/diff <number>), then post ONE turn: your branch, its real state, and how it should fold in. Read-only. Then return.
Reconcile. Once they've returned, read the room and list the open
items — overlaps, conflicts, competing implementations, undecided
target/order. None? Skip to the close.
Resolution rounds (cap ~4). Per open item, re-spawn only the agents it
implicates, with the specific question. Tell them to read --since <their-name>
first, then post their position and --agree if convinced. read again, update
the list. Repeat.
Close — you always write it. Stop when the list is empty, you hit the cap, or an agent errors (note "didn't report," don't block). Then write the SUMMATION yourself — don't wait for an agent to volunteer. Write it as plain prose a human can skim, not a field dump: which worktree is the target and why, the merge order in a sentence, and what's left for the human:
node "${CLAUDE_SKILL_DIR}/standup.mjs" summation --agent facilitator \
--text "Build on <worktree> — it's the only one with real code. Layer <branch>'s changes on top, then drop in the doc-only branches; skip <empty branch>. Your call before it's safe: <the one or two real decisions>. Done when it all sits in <target> and builds clean."
4. Brief the human in plain language
This is the payoff — don't hand them the raw SUMMATION, translate it. A human who didn't watch the room should understand the outcome without decoding paths, line counts, or commit hashes. Lead with the answer, then the few choices only they can make:
- What you found — one plain line per branch: who has real code, who's just docs, who's empty.
- The plan — target + merge order in a sentence or two.
- Their call — only the decisions a human must make (which implementation
wins, what to drop, anything risky), as concrete questions. Use
AskUserQuestionfor the clear-cut ones.
Keep git internals out unless they ask. Once they've settled the open calls, hand
the plan to /do to perform the merges — don't merge anything yourself
outside /do.
CLI
node "${CLAUDE_SKILL_DIR}/standup.mjs" <command> [--flags]
Defaults: agent = git branch, file = ~/.claude-mem/STANDUP.md. Every write is
atomically locked.
| command | what it does |
|---|---|
worktrees [--since 4h] [--json] | worktrees newest-first; --since N{m,h,d,w} keeps those active in the window |
prs [--since 4h] [--json] | open GitHub PRs (via gh) newest-first |
open --goal "…" --prompt "…" [--force] | create the room (--force rotates an old one aside) |
join [--message "…"] | add yourself + say Hello |
post --message "…" [--agree "…"] | append a turn |
agree --deliverable "…" | append an AGREE turn |
watch [--timeout SEC] [--interval SEC] | block until someone else posts, print it (exit 2 on timeout) |
read [--tail N] [--since AGENT] | print the chat (or only turns after AGENT's last) |
status | participants + AGREEs + consensus check |
summation --text "…" | write the SUMMATION, flip status: agreed |
Each spawned agent plays its turns by agent-brief.md (bundled here) — the
playbook for being one voice in the room.
Related skills
More from thedotmack/claude-mem and the wider catalog.

timeline-report
Generate narrative reports analyzing a project's complete development history from claude-mem's persistent timeline.

version-bump
Automated semantic versioning and release workflow for Claude Code plugins with multi-manifest sync and GitHub integration.

weekly-digests
Generate week-by-week narrative digests of a project's claude-mem timeline, with each chapter carrying forward context from the prior week.

what-the
Plain-English breakdown of technical concepts using who, what, where, why, and when.

wowerpoint
Turn any document into a kawaii NotebookLM slide-deck PDF with one command.

faster-whisper
Local speech-to-text 4-6x faster than Whisper with GPU acceleration, subtitles, diarization, and batch processing.