bitwarden · trmartin4 · Jul 10, 2026 · Jul 10, 2026 · Jul 10, 2026 · Jul 10, 2026
@@ -66,19 +66,19 @@
     {
       "name": "bitwarden-tech-lead",
       "source": "./plugins/bitwarden-tech-lead",
-      "version": "2.3.2",
+      "version": "3.0.0",
       "description": "Tech lead agent for a Bitwarden product team. The team's primary technical resource — architects solutions in the team's domain, partners with the EM on scoping and backlog, partners with peer tech leads on cross-team architecture, and serves as the team's conduit for cross-team technical decisions."
     },
     {
       "name": "bitwarden-shepherd",
       "source": "./plugins/bitwarden-shepherd",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "description": "Champion-of-a-technical-strategy agent for Bitwarden. Shepherds a Technical Strategy Idea through Architecture's evaluation into the Software Initiative Funnel, then drives the resulting initiative across all five funnel phases to durable adoption."
     },
     {
       "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."
     },
     {

@@ -6,11 +6,11 @@ A curated collection of plugins for AI-assisted development at Bitwarden. Enable
 
 | Plugin                                                              | Version | Description                                                                                                                                                 |
 | ------------------------------------------------------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [bitwarden-tech-lead](plugins/bitwarden-tech-lead/)                 | 2.3.2   | Tech lead for technical planning, architecture coherence, and surfacing patterns to Technical Strategy Ideas                                                |
-| [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-tech-lead](plugins/bitwarden-tech-lead/)                 | 3.0.0   | Tech lead for technical planning, architecture coherence, and surfacing patterns to Technical Strategy Ideas                                                |
+| [bitwarden-shepherd](plugins/bitwarden-shepherd/)                   | 1.0.1   | 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                                         |

@@ -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",

@@ -5,6 +5,12 @@ 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-10
+
+### Added
+
+- **`architecting-solutions` skill**: moved in from `bitwarden-tech-lead`.
+
 ## [2.0.0] - 2026-06-19
 
 ### Added

@@ -9,7 +9,7 @@ These skills define delivery **process** — initiative phases, transition playb
 The plugin spans three concerns:
 
 - **Lifecycle** — how cross-cutting initiatives move through phases and how ownership transitions between teams.
-- **Technical design** — how teams draft Tech Breakdowns under Bitwarden's standard template and decompose them into tasks.
+- **Technical design** — how teams apply architectural judgment inside their scope, draft Tech Breakdowns under Bitwarden's standard template, and decompose them into tasks.
 - **Mechanics** — how individual changes get committed, reviewed, and merged.
 
 Any agent (tech-lead, software-engineer, shepherds, others) can compose these skills as needed.
@@ -27,6 +27,7 @@ Any agent (tech-lead, software-engineer, shepherds, others) can compose these sk
 
 | Skill                       | Triggers                                                                                                                              | Purpose                                                                                                                                                                                 |
 | --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `architecting-solutions`    | "plan the solution", "assess blast radius", "evaluate trade-offs", "should Architecture weigh in"                                     | Architectural judgment framework: security mindset, blast radius, Bitwarden-specific constraints, and the signals that warrant pulling in the Architecture group.                       |
 | `starting-breakdown`        | "start a tech breakdown", "create a new breakdown for X", "set up the breakdown file"                                                 | Set up a new Tech Breakdown file in `bitwarden/tech-breakdowns`: gather context from the user, copy the template, fill the Status block.                                                |
 | `developing-breakdown-spec` | "understand the work", "resolve open questions", "write the breakdown spec", "Spec Alternatives"                                      | Resolve open design questions one at a time with concrete options, then capture what's being built into the Specification section.                                                      |
 | `developing-breakdown-plan` | "develop the plan", "draft the implementation plan", "map per-layer impact", "scan for in-flight work", "identify cross-team impacts" | Develop the Plan section after the Spec is filled: technical architecture, per-layer impact, in-flight collision scan, cross-team impact mapping, and self-review. Supports resumption. |
@@ -47,6 +48,13 @@ Each skill owns the **workflow** (what steps to follow, what format to use). The
 
 The lifecycle skills follow the same principle: they describe the funnel and transition mechanics. The canonical references — [Software Initiative Funnel](https://bitwarden.atlassian.net/wiki/spaces/EN/pages/584515614) and [Work Transition Playbook](https://bitwarden.atlassian.net/wiki/spaces/EN/pages/2521038855) — live in Confluence and are fetched on demand.
 
+## Related Plugins
+
+Several skills in this plugin reference tools or skills provided by sibling plugins. Install these alongside `bitwarden-delivery-tools` for full functionality:
+
+- **`bitwarden-atlassian-tools`** — provides the Jira/Confluence MCP tools used by `architecting-solutions`, `navigating-the-initiative-funnel`, and the breakdown skills.
+- **`bitwarden-security-engineer`** — provides `Skill(threat-modeling)`, referenced from `architecting-solutions` for deep security analysis.
+
 ## Installation
 
 ```bash

@@ -1,14 +1,16 @@
 ---
 name: architecting-solutions
-description: Framework for architecting solutions inside a team's domain while staying coherent with Bitwarden's holistic architecture. Covers security mindset, blast radius assessment, architectural judgment, Bitwarden-specific constraints, working with the architecture group, and working with initiative shepherds. Use when planning a solution, reviewing architecture within a team's scope, assessing blast radius, evaluating trade-offs, or deciding whether a choice needs architecture-group input.
+description: Framework for architecting solutions at the team level while staying coherent with Bitwarden's holistic architecture. Covers security mindset, blast radius assessment, architectural judgment, Bitwarden-specific constraints, and working with the architecture group. Use when planning a solution, reviewing architecture within a team's scope, assessing blast radius, evaluating trade-offs, or deciding whether a choice needs architecture-group input.
 allowed-tools: Skill, mcp__plugin_bitwarden-atlassian-tools_bitwarden-atlassian__get_issue, mcp__plugin_bitwarden-atlassian-tools_bitwarden-atlassian__get_issue_comments, mcp__plugin_bitwarden-atlassian-tools_bitwarden-atlassian__get_issue_remote_links, mcp__plugin_bitwarden-atlassian-tools_bitwarden-atlassian__search_issues, mcp__plugin_bitwarden-atlassian-tools_bitwarden-atlassian__get_confluence_page, mcp__plugin_bitwarden-atlassian-tools_bitwarden-atlassian__get_confluence_page_comments, mcp__plugin_bitwarden-atlassian-tools_bitwarden-atlassian__search_confluence, mcp__plugin_bitwarden-atlassian-tools_bitwarden-atlassian__search_confluence_cql
 ---
 
+This skill applies architectural judgment during team-level delivery work: scoping tickets, drafting breakdowns, evaluating trade-offs, and choosing between approaches.
+
 ## Security Mindset
 
 Bitwarden is a password manager — security isn't a feature, it's the product. Every design decision is a security decision.
 
-- **Threat model early.** Before approving an approach, ask: what can an attacker reach from here? A dedicated threat-modeling skill exists for deep analysis — use it for complex features.
+- **Threat model early.** Before approving an approach, ask: what can an attacker reach from here? `Skill(threat-modeling)` in `bitwarden-security-engineer` exists for deep analysis — use it for complex features.
 - **Classify data touch points.** Know which fields are encrypted, which are plaintext, and which cross trust boundaries. Never add a new path for sensitive data without encryption at rest and in transit.
 - **Audit trail by default.** Sensitive operations must be observable after the fact. If it can't be audited, it shouldn't ship.
 - **Fail closed.** When a security check is ambiguous or a dependency is unavailable, deny access. Never default to permissive.
@@ -44,35 +46,13 @@ Bitwarden is a password manager — security isn't a feature, it's the product.
 
 Teams have autonomy over decisions inside their domain. Architecture doesn't gate-keep team-level work. What Architecture does is maintain the holistic view — the portfolio of cross-cutting initiatives, the patterns that span teams, the decisions that will be expensive to change later. The job at the team level is to recognize when a choice has implications that benefit from that wider view, and pull Architecture in before — not after — the team ships.
 
-Watch for the five signals that warrant Architecture involvement (from the [Architecture / Engineering Operating Model](https://bitwarden.atlassian.net/wiki/spaces/EN/pages/1286963201)):
+Watch for signals that warrant Architecture involvement (from the [Architecture / Engineering Operating Model](https://bitwarden.atlassian.net/wiki/spaces/EN/pages/1286963201)):
 
-- **Interface or contract definition.** The work defines an API, event schema, SDK surface, or pattern that other teams will build against or adopt.
-- **Structural decisions costly to change later.** Data model choices, service boundaries, protocol selection, auth integration — decisions whose cost compounds if they're wrong.
-- **Overlap with an existing initiative.** Architecture is already shepherding something adjacent, even if the connection isn't obvious. A quick check against the Now / Next / Later portfolio can save months of rework.
+- **Structural decisions costly to change later.** Data model choices, service boundaries, protocol selection — decisions whose cost compounds if they're wrong.
 - **New precedent.** Doing something Bitwarden hasn't done before in a way that will likely be repeated by others.
 - **External-facing output.** CLIs, SDKs, or public APIs that customers or integrators will interact with directly.
 
-If none of those apply, decide inside the team and move. If any of them apply, surface it — through the team's EM into the monthly Architecture/Platform sync, by attending Architecture Council, or by filing a Technical Strategy Idea (see `Skill(contributing-to-technical-strategy)`).
-
-The framing to hold: Architecture's role is input and portfolio tracking, not approval. Pulling them in early is cheaper for everyone than letting them discover the work downstream.
-
-## Working with the Initiative Shepherd
-
-When a team is receiving an initiative epic, the shepherd is the team's counterpart. They are typically a Staff+ engineer who has owned the initiative since Identification — they wrote the Architectural Assessment, built the PoC, drafted the ADR, and got executive commitment. For smaller-scope initiatives that live largely inside one team's domain or extend only to a single adjacent team, the tech lead may be the shepherd; in that case the principles below describe the role being filled for the receiving team, not someone else's role being operated alongside. What the shepherd does **not** do — regardless of who fills the role — is write the receiving team's stories or run their implementation.
-
-The clean division during Scoping & Commitment and Implementation (from the [Software Initiative Funnel](https://bitwarden.atlassian.net/wiki/spaces/EN/pages/584515614)):
-
-- **The shepherd owns:** the initiative vision, the ADR, the epic definition, cross-team consistency, leadership reporting, and the decision to pause/pivot the whole effort.
-- **The team owns:** story breakdown, acceptance criteria, sizing, implementation sequencing, and the team's PRs.
-
-Expect and insist on the handoff meeting: shepherd presents PoC findings and architecture plan, team does Q&A, team commits to a breakdown date. After that, the team does the breakdown — not the shepherd. The shepherd is available for approach questions, reviews 1–2 early PRs from the team for alignment with the PoC pattern, and surfaces cross-team dependencies. Everything else belongs to the team.
-
-Two failure modes to avoid:
-
-- **The shepherd writes the team's stories.** Stories the team didn't write are stories the team won't own. Insist on a handoff meeting and a team breakdown session.
-- **The team drifts from the PoC pattern without flagging it.** Drift across teams is exactly what the shepherd is there to prevent. If deviation emerges, tell the shepherd before merging, not after.
-
-`Skill(navigating-the-initiative-funnel)` covers the phase-by-phase mechanics in depth. This section is the working principle.
+If any of these apply, surface it to the human and recommend pulling Architecture in early. Architecture's role is input and portfolio tracking, not approval — pulling them in early is cheaper for everyone than letting them discover the work downstream.
 
 ## Red Flags to Surface
 
@@ -82,4 +62,3 @@ Two failure modes to avoid:
 - Missing test coverage for new code paths
 - Security shortcuts in the name of velocity
 - Refactors bundled with feature work without explicit scope approval
-- Work that should have been a Technical Strategy Idea slipping in as team-level scope because surfacing it feels like overhead
@@ -1,6 +1,6 @@
 {
   "name": "bitwarden-shepherd",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Champion-of-a-technical-strategy agent for Bitwarden. Shepherds a Technical Strategy Idea through Architecture's evaluation into the Software Initiative Funnel, then drives the resulting initiative across all five funnel phases (Identification, Research, Proof of Concept, Scoping & Commitment, Implementation) to durable adoption. Produces the Architectural Assessment, PoC, ADR, High-Level Architecture Plan, and child epics; coordinates cross-team consistency; reports to leadership; and curates the upstream TSI backlog from the Peer-Reviewer side.",
   "author": {
     "name": "Bitwarden",

@@ -5,6 +5,12 @@ All notable changes to the `bitwarden-shepherd` plugin will be documented in thi
 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).
 
+## [1.0.1] - 2026-07-10
+
+### Changed
+
+- Updated all `architecting-solutions` cross-plugin references from `bitwarden-tech-lead` to `bitwarden-delivery-tools` following the skill's move in `bitwarden-tech-lead` 3.0.0 / `bitwarden-delivery-tools` 2.1.0.
+
 ## [1.0.0] - 2026-05-13
 
 ### Added