From bab569b6312d2eca0ab04d16ae619f1ec74cbdd9 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 9 Jul 2026 13:01:15 +0900 Subject: [PATCH 1/4] chore: bump version of delivery tools --- .claude-plugin/marketplace.json | 2 +- README.md | 2 +- plugins/bitwarden-delivery-tools/.claude-plugin/plugin.json | 2 +- plugins/bitwarden-delivery-tools/CHANGELOG.md | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json index 8f63488e..81e62175 100644 --- a/.claude-plugin/marketplace.json +++ b/.claude-plugin/marketplace.json @@ -78,7 +78,7 @@ { "name": "bitwarden-delivery-tools", "source": "./plugins/bitwarden-delivery-tools", - "version": "2.0.0", + "version": "2.1.0", "description": "Delivery lifecycle skills for Bitwarden initiatives — initiative funnel navigation, work transitions, tech breakdowns and task decomposition, commits, pull requests, preflight checks, and change labeling." }, { diff --git a/README.md b/README.md index 27ab17a0..bb2f9a21 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ A curated collection of plugins for AI-assisted development at Bitwarden. Enable | [bitwarden-shepherd](plugins/bitwarden-shepherd/) | 1.0.0 | Champion of a technical strategy — shepherds a TSI through evaluation into the funnel, then through to adoption | | [bitwarden-atlassian-tools](plugins/bitwarden-atlassian-tools/) | 2.2.8 | Read-only Atlassian access via MCP server with deep Jira issue research skill | | [bitwarden-code-review](plugins/bitwarden-code-review/) | 1.13.1 | Autonomous code review agent following Bitwarden engineering standards with GitHub integration | -| [bitwarden-delivery-tools](plugins/bitwarden-delivery-tools/) | 2.0.0 | Delivery lifecycle skills: initiative funnel navigation, work transitions, tech breakdowns and task decomposition, commits, PRs, preflight, labeling | +| [bitwarden-delivery-tools](plugins/bitwarden-delivery-tools/) | 2.1.0 | Delivery lifecycle skills: initiative funnel navigation, work transitions, tech breakdowns and task decomposition, commits, PRs, preflight, labeling | | [bitwarden-designer](plugins/bitwarden-designer/) | 0.1.0 | Product designer persona: Code of Conduct and 30/60/90 critique, critique facilitation; dispatches into bitwarden-design-tools | | [bitwarden-design-tools](plugins/bitwarden-design-tools/) | 0.1.0 | Design toolkit: content style guide, Figma Dev Mode MCP, Bitwarden brand application, handoff prep, Design System governance, Product and Design Jira | | [bitwarden-devops-engineer](plugins/bitwarden-devops-engineer/) | 0.1.4 | DevOps engineering assistant: workflow compliance linting, action security auditing, and org-wide CI/CD remediation | diff --git a/plugins/bitwarden-delivery-tools/.claude-plugin/plugin.json b/plugins/bitwarden-delivery-tools/.claude-plugin/plugin.json index 06aa914e..d0f3f64e 100644 --- a/plugins/bitwarden-delivery-tools/.claude-plugin/plugin.json +++ b/plugins/bitwarden-delivery-tools/.claude-plugin/plugin.json @@ -1,6 +1,6 @@ { "name": "bitwarden-delivery-tools", - "version": "2.0.0", + "version": "2.1.0", "description": "Delivery lifecycle skills for Bitwarden initiatives — initiative funnel navigation, work transitions, tech breakdowns and task decomposition, commits, pull requests, preflight checks, and change labeling.", "author": { "name": "Bitwarden", diff --git a/plugins/bitwarden-delivery-tools/CHANGELOG.md b/plugins/bitwarden-delivery-tools/CHANGELOG.md index d081fc2a..4b227288 100644 --- a/plugins/bitwarden-delivery-tools/CHANGELOG.md +++ b/plugins/bitwarden-delivery-tools/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to the `bitwarden-delivery-tools` plugin will be documented The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.1.0] - 2026-07-09 + +### Changed + ## [2.0.0] - 2026-06-19 ### Added From b4f274af3febf8d3876a133fa66de601dc8eca76 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 9 Jul 2026 13:02:04 +0900 Subject: [PATCH 2/4] feat(llm): add commit structuring section --- plugins/bitwarden-delivery-tools/CHANGELOG.md | 2 ++ .../skills/committing-changes/SKILL.md | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/plugins/bitwarden-delivery-tools/CHANGELOG.md b/plugins/bitwarden-delivery-tools/CHANGELOG.md index 4b227288..46547f9b 100644 --- a/plugins/bitwarden-delivery-tools/CHANGELOG.md +++ b/plugins/bitwarden-delivery-tools/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- `committing-changes`: added a "Structure Commits by Intent" section instructing that changes be structured by intent, breaking a multi-intent working directory into a set of commits. + ## [2.0.0] - 2026-06-19 ### Added diff --git a/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md b/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md index c327f6bd..760df2ef 100644 --- a/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md +++ b/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md @@ -47,6 +47,12 @@ Update error handling in login flow --- +## Structure Commits by Intent + +Changes should be structured by intent. If there is more than one intent in the working directory / staged, break down the changes into a set of commits — one intent per commit (a refactor, a new helper, a feature, a bugfix, a test addition, a rename), each independently reviewable. + +--- + ## Pre-Commit Quality Gate Before staging, run the `perform-preflight` skill for the full quality gate checklist (tests, lint, security, architecture). Consult the repo's CLAUDE.md for platform-specific build and lint commands. From 1260a6b61d0b5b3558d5d1080dbebd4f976c99a9 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 9 Jul 2026 13:02:40 +0900 Subject: [PATCH 3/4] feat(llm): add commit trailers section --- .../skills/committing-changes/SKILL.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md b/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md index 760df2ef..7a7234b3 100644 --- a/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md +++ b/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md @@ -11,6 +11,8 @@ description: Git commit conventions and workflow for Bitwarden repositories. Use [PM-XXXXX] : + + ``` ### Rules @@ -25,6 +27,9 @@ description: Git commit conventions and workflow for Bitwarden repositories. Use Users reported confusion about when biometric prompts appear. This adds a configurable timeout setting to the security preferences. + +Jira-Ticket: PM-12345 +GitHub-Issue: #6789 ``` Ambiguous cases — choosing between similar types: From e30ceaa693db9d2630857ad7331830562efbb26c Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 9 Jul 2026 13:03:25 +0900 Subject: [PATCH 4/4] feat(llm): add follow-up fixes section --- plugins/bitwarden-delivery-tools/CHANGELOG.md | 1 + .../skills/committing-changes/SKILL.md | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/plugins/bitwarden-delivery-tools/CHANGELOG.md b/plugins/bitwarden-delivery-tools/CHANGELOG.md index 46547f9b..2060de48 100644 --- a/plugins/bitwarden-delivery-tools/CHANGELOG.md +++ b/plugins/bitwarden-delivery-tools/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - `committing-changes`: added a "Structure Commits by Intent" section instructing that changes be structured by intent, breaking a multi-intent working directory into a set of commits. +- `committing-changes`: added a "Follow-up Fixes on an Open PR" section recommending a rebase to replace the originating intent commit instead of stacking a separate fix commit. ## [2.0.0] - 2026-06-19 diff --git a/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md b/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md index 7a7234b3..a44b27f1 100644 --- a/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md +++ b/plugins/bitwarden-delivery-tools/skills/committing-changes/SKILL.md @@ -58,6 +58,12 @@ Changes should be structured by intent. If there is more than one intent in the --- +## Follow-up Fixes on an Open PR + +When committing a follow-up fix on a PR that is not yet merged, consider doing a rebase so that the single intent commit that introduced this change gets replaced, rather than stacking a separate "fix" commit on top. This keeps history structured by intent (see above): the branch reads as one clean commit per intent instead of a change plus a trail of corrections. + +--- + ## Pre-Commit Quality Gate Before staging, run the `perform-preflight` skill for the full quality gate checklist (tests, lint, security, architecture). Consult the repo's CLAUDE.md for platform-specific build and lint commands.