Skip to content

feat!: fold push skill into git-and-github, wait for bots before pushing (12.0.0) - #109

Merged
lklimek merged 5 commits into
mainfrom
feat/merge-push-into-git-and-github
Nov 6, 2026
Merged

lklimek merged 5 commits into
mainfrom
feat/merge-push-into-git-and-github

Conversation

@lklimek

@lklimek lklimek commented Nov 6, 2026 •

Copy link
Copy Markdown
Owner

TL;DR

One skill now covers committing, pushing, and opening PRs: the separate push skill is gone and its steps live in git-and-github. Pushes also wait for the repository's bots to finish their work on the PR, work always starts with a search for related issues and PRs, and every push first merges the PR's base branch, resolving conflicts and reporting them without waiting for approval.

User story

As a maintainer, I want the agent to avoid interrupting review bots, to notice existing related work before starting, and to keep my PR up to date with its base, so I don't get stale reviews, duplicate PRs, or surprise conflicts.

Scenario

Actual behavior

Commit/push/PR steps lived in a separate push skill. The agent could push while a review bot was still reviewing, which restarted or invalidated that review. Before starting, it only searched open PRs for related fixes.

Expected behavior

A bare "push", or asking to "commit and push", "create a PR", or "ship this", loads git-and-github, which runs the whole workflow: commit, push, and create the PR or refresh its title and description. Before each push the agent waits until any bot working on the PR has finished, whatever bots that repository uses, and merges the base branch, resolving conflicts itself and reporting how instead of stopping for approval. Before starting work it searches open and closed issues and PRs for the same or similar topics.

Detailed discussion

  • skills/push removed; its workflow is git-and-github § Commit, Push, PR Workflow, and its trigger phrases moved into the git-and-github description.
  • § Before Every Push: new vendor-neutral Wait for bots rule (GitHub App, [bot], or project-named accounts; pending review request, owned in-progress check/status excluding ordinary CI, work-in-progress comment, or commits still landing; ~30 min cap, then report). The existing ancestry gate is now headed Always merge the PR's base.
  • § Before Starting Work step 3: search open and closed issues and PRs (bounded --limit); § Issues references it instead of restating it.
  • merge-base: no approval gate on conflict resolutions — it commits the merge and reports the resolution table plus the behavioral change report.
  • check-pr-comments follow-up PR row now points at the new section; SETUP.md skill table and tests/test_pr_body_template.py updated.
  • Breaking: /claudius:push no longer exists → major bump to 12.0.0.

Testing

python3 -m pytest tests (1698 passed); claude plugin validate . (pre-existing warnings only); plugin-dev skill-reviewer and plugin-validator findings addressed.

🤖 Co-authored by Claudius the Magnificent AI Agent

🤖 Generated with Claude Code

…ated work (12.0.0)

- Remove the `push` skill; its commit-push-PR workflow lives in
  git-and-github § Commit, Push, PR Workflow, which takes over its
  trigger phrases.
- Before Every Push: never push while a repo's bots (review apps,
  agents) are still working on the PR; always merge the PR's base.
- Before Starting Work: always search open and closed issues and PRs
  for related or similar work.

BREAKING CHANGE: the `push` skill (`/claudius:push`) is removed; use
git-and-github.

<sub>🤖 Co-authored by [Claudius the Magnificent](https://github.com/lklimek/claudius) AI Agent</sub>

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…git-and-github

# Conflicts:
#	.claude-plugin/plugin.json
…ment check, push-once scope

<sub>🤖 Co-authored by [Claudius the Magnificent](https://github.com/lklimek/claudius) AI Agent</sub>

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… approval

<sub>🤖 Co-authored by [Claudius the Magnificent](https://github.com/lklimek/claudius) AI Agent</sub>

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
<sub>🤖 Co-authored by [Claudius the Magnificent](https://github.com/lklimek/claudius) AI Agent</sub>

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@lklimek
lklimek marked this pull request as ready for review November 6, 2026 13:14
@lklimek
lklimek merged commit 7212928 into main Nov 6, 2026
2 checks passed
@lklimek
lklimek deleted the feat/merge-push-into-git-and-github branch November 6, 2026 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants