Run any Skill in Manus with one click

consolidating-commits

Stars295

Forks53

UpdatedJuly 9, 2026 at 18:38

Regroup the commits since the previous bump (or a given base) into logical commits — one per concern, bump kept last — via scripts/fleet/consolidate-commits.mts. "Consolidate commits" never means squash-to-one; that is squashing-history.

Installation

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

Run Skill in Manus

Source

SocketDev

SocketDev/socket-cli

View GitHub Repository View Creator Repositories

Download

Run Skill in Manus

Related occupationsSOC

Based on SOC occupation classification

Software DevelopersComputer and Mathematical Occupations·SOC 15-1252

SKILL.md

readonly

More from this repository

same repository

driving-cursor-bugbot

SocketDev/socket-cli

Drives the Cursor Bugbot review-and-fix loop on a PR. Inventories open Bugbot threads, classifies each (real bug / false positive / already fixed), fixes the real ones, replies on the inline thread (never as a detached PR comment), updates the PR title/body if scope shifted, and pushes. Use when reviewing a PR you just authored, after `gh pr create`, or after a new Bugbot pass on an existing PR.

2026-07-09295

reviewing-code

SocketDev/socket-cli

Reviews the current branch against a base ref using multiple AI backends. Runs a Workflow that streams the diff through discovery, discovery-secondary, remediation, and adversarial-verify stages, routing each stage to the available agents (codex, claude, opencode, kimi, …) and gracefully skipping any backend that isn't installed. Writes a markdown findings report under docs/. Use when preparing or updating a PR, before merging a feature branch, or when wanting an independent second opinion from a different agent.

2026-07-09295

setup-repo

SocketDev/socket-cli

Full repo onboarding wizard. Orchestrates all setup concerns for a new engineer or a fresh clone — API token, OS keychain, shell rc bridge, native messaging host, security tools, and repo-specific initialization. Invoke with /setup-repo.

2026-07-09295

cascading-fleet

SocketDev/socket-cli

Propagate a wheelhouse template change to every fleet repo. Packages the canonical fleet-repo list, the FLEET_SYNC=1 sentinel pattern, the worktree-per-repo loop, push-direct + PR-fallback, and worktree-cleanup that survives mid-loop crashes. Use when a wheelhouse template SHA needs to land in every fleet repo, or when batching multiple template SHAs into one cascade wave. Tool-version pin propagation is the wheelhouse pipeline's job (scripts/repo/pipeline.mts), not this skill's.

2026-07-09295

managing-worktrees

SocketDev/socket-cli

Manages git worktrees per the fleet's parallel-Claude-sessions rule. Creates new task-worktrees, fans out one worktree per open PR for parallel review, and prunes spent worktrees that have nothing left to land — clean trees whose branch was deleted upstream OR is fully merged into the remote default branch. Use when starting a task that needs an isolated working tree, when reviewing every open PR locally without disturbing the primary checkout, or when cleaning up after merges.

2026-07-09295

regenerating-patches

SocketDev/socket-cli

Regenerates plugin-cache patches in scripts/fleet/plugin-patches/ against the pinned upstream plugin source when they go stale after a plugin SHA bump. Use when install-claude-plugins.mts warns that a patch no longer applies, or after bumping a plugin's source.sha in marketplace.json.

2026-07-09295

name	consolidating-commits
description	Regroup the commits since the previous bump (or a given base) into logical commits — one per concern, bump kept last — via scripts/fleet/consolidate-commits.mts. "Consolidate commits" never means squash-to-one; that is squashing-history.
model	haiku

Consolidating commits

When the user says "consolidate commits" they mean: regroup the work since a base ref into LOGICAL commits (one per concern, the auto-lander's grouping), with a trailing chore: bump version to X.Y.Z commit preserved last. They do NOT mean squashing to a single commit (squashing-history owns that).

Run

# Preview the grouping (always start here).
node scripts/fleet/consolidate-commits.mts --dry-run

# Rewrite: defaults the base to the previous bump commit (else latest tag).
node scripts/fleet/consolidate-commits.mts

# Explicit base.
node scripts/fleet/consolidate-commits.mts --base v6.0.9

The script refuses a dirty worktree (land dirty files first: node scripts/fleet/land-work.mts --commit), verifies the final tree is byte-identical to the original tip, and hard-restores the original history on any failure. It never pushes: a rewritten branch needs a separately authorized lease force-push.

Contract

Grouping engine is shared with the auto-lander (land-work.mts groupPaths/commitMessage) — one source of truth for what "logical" means.
Bump-last invariant: a chore: bump version to … tip is peeled before grouping and cherry-picked back as the final commit.
Nothing is ever lost: byte-identical tree or full restore, no third state.