squash-commits

squash-commits is a skill for Claude Code, Codex from pipecat-ai/pipecat. It costs 0 tokens per session (636 once invoked), scanned A, original, BSD-2-Clause.

A Git workflow for reorganising the commits on a branch into a small set of logical commits without changing the files. A commit is a saved group of code changes, and the workflow first creates a backup branch for recovery.

In plain words
What is it for?
Use it to inspect branch changes, group related work into meaningful commits, remove merge-from-main commits, and prepare a branch for review.
Why use it?
It turns a messy development history into a clearer review history while preserving the actual content. It also stops when uncommitted changes could make the reorganisation unsafe.

Skill for Claude CodeCodex

Part of the pipecat-dev plugin — 11 skills shipped together

About the project

Pipecat is an open-source Python framework for building real-time conversational agents that work with voice, video, images, and other media. It is for creating voice assistants, companions, business agents, and multi-agent systems from modular conversation pipelines.

pipecat-ai/pipecat · 15,229 stars · on GitHub

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/pipecat-ai/pipecat/squash-commits
Any agent
npx skills add pipecat-ai/pipecat --skill squash-commits
Clone the repo
git clone --depth 1 https://github.com/pipecat-ai/pipecat

Made for: Claude Code, Codex.

Or install pipecat-dev, the plugin that ships this one along with the rest of its 11 skills.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for squash-commits

README.md
[![agentmods](https://agentmods.dev/badge/skills/pipecat-ai/pipecat/squash-commits.svg)](https://agentmods.dev/skills/pipecat-ai/pipecat/squash-commits)
Your own site
<a href="https://agentmods.dev/skills/pipecat-ai/pipecat/squash-commits"><img src="https://agentmods.dev/badge/skills/pipecat-ai/pipecat/squash-commits.svg" alt="Measured on agentmods" height="20"></a>
Per session 0 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 636 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00000 $0.00636
Opus 5 $0.00000 $0.00318
Sonnet 5 $0.00000 $0.00127
Haiku 4.5 $0.00000 $0.00064

Measured 5d ago against content hash 0c2d6c67bd91, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

squash-commits scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 5d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.claude/skills/squash-commits/SKILL.md · 92 lines

How it starts

The opening of the file, as written. The whole thing — 92 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Reorganize the commits on the current branch into a small number of logical commits. Do NOT change any file content — only the commit structure changes.

Instructions

1. Safety check

git status --short

If there are uncommitted changes, stop and tell the user to commit or stash them first.

2. Inspect the branch

git log main..HEAD --oneline
git diff main..HEAD --name-only

List every file changed vs main and every commit on the branch (excluding merge commits from main).

3. Create a backup branch

git branch backup/<current-branch-name>

Tell the user the backup exists so they can recover if needed.

4. Soft-reset to main and unstage everything

git reset --soft main
git restore --staged .

All branch changes are now in the working tree, unstaged. No content has changed.

5. Plan the logical groups

Read the changed files and the original commit messages to understand what the work covers. Group related files into logical commits. Typical groups:

  • Core feature or fix (new source files + modified core files)
  • Secondary features or fixes (each as its own commit if distinct)
  • Refactoring or renames
  • Tests
  • Changelogs / docs

Use the changelog files (if any) as a strong hint — each changelog entry often maps to one commit.

Present the proposed grouping to the user and ask for confirmation before committing.

6. Commit in logical groups

For each group, stage only the relevant files and commit with a clear message following the project's conventions:

git add <file1> <file2> ...
git commit -m "..."

Use conventional commit prefixes if the project uses them (feat:, fix:, refactor:, test:, chore:).

7. Verify

git log main..HEAD --oneline
git diff main..HEAD --name-only
git status --short

Confirm:

  • Commit count is small and each message is meaningful
  • The set of changed files vs main is identical to before
  • Working tree is clean

8. Remind about force-push

Read the full file on GitHub · 92 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 5d ago First seen · 92 lines · 0 tokens per session scan A 0c2d6c67bd91

Subscribe to this mod's changes

squash-commits is a skill published in the GitHub repository pipecat-ai/pipecat (15,229 stars, last pushed today), licensed BSD-2-Clause. It costs nothing until one of its globs matches a file; then it loads 636 tokens. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

Related

Other skills, from other repositories