Skip to content

Commit e83e5df

Browse files
Merge branch 'main' into renovate/coverlet.collector-10.x
2 parents febc0e5 + 3724ecf commit e83e5df

164 files changed

Lines changed: 6411 additions & 1130 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.claude/CONTRIBUTING.md

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
# Contributing Claude Context to This Repo
2+
3+
Every time you catch Claude making the same mistake twice, explain the same convention in chat, or hand a teammate a mental map they didn't have — that's knowledge worth encoding. This guide covers what belongs in this repo's `.claude/`, where to put it, and how to land it alongside the code it describes.
4+
5+
## When to contribute here vs. elsewhere
6+
7+
Ask: **is this knowledge specific to this codebase, or generic enough to work across repos?**
8+
9+
- **Specific to this codebase** → contribute here, in `.claude/`.
10+
Example: "how we add a new cipher type," "how our feature-flag system works."
11+
- **Generic, reusable across repos**[`bitwarden/ai-plugins`](https://github.com/bitwarden/ai-plugins) — persona plugins (e.g., a code-review agent), tool integrations, or shared utilities.
12+
13+
When unsure, keep it here. Promoting up to `ai-plugins` later is easier than pulling it back — see its [CONTRIBUTING.md](https://github.com/bitwarden/ai-plugins/blob/main/CONTRIBUTING.md) when you're ready.
14+
15+
## Choose scope, then shape
16+
17+
### 1. Scope — where does it apply?
18+
19+
This is a monorepo. Claude loads every `CLAUDE.md` and `CLAUDE.local.md` by [walking up from the working directory](https://code.claude.com/docs/en/memory#how-claude-md-files-load) — looking in each ancestor directly, not in a nested `.claude/` subdirectory. Files below the working directory (including nested `.claude/skills/`) are loaded lazily when Claude reads into that subtree. Use that hierarchy:
20+
21+
- **Applies everywhere in this repo** → root `CLAUDE.md` or `.claude/skills/`
22+
- **Applies only within one app, library, utility, or subtree** → nested `CLAUDE.md` or `.claude/skills/` in that directory
23+
24+
Push rules as deep as they'll go — keeping app-specific rules local saves context for everyone else's sessions, not just yours.
25+
26+
For rules that should apply only to certain file types (e.g., all `*Controller.cs` files), use [`.claude/rules/<name>.md` with a `paths:` frontmatter glob](https://code.claude.com/docs/en/memory#organize-rules-with-claude/rules/) instead of a nested `CLAUDE.md`.
27+
28+
### 2. Shape — how should Claude use it?
29+
30+
| You want to… | Use |
31+
| ------------------------------------------------------- | ------------------------------------------------------------------------------------------------ |
32+
| State a rule Claude must always follow in its scope | `CLAUDE.md` |
33+
| State a rule that applies only to certain file globs | `.claude/rules/<name>.md` with `paths:` frontmatter |
34+
| Teach a procedure Claude invokes on demand | `.claude/skills/<name>/SKILL.md` |
35+
| Give Claude a specialized subagent with its own context | `.claude/agents/<name>.md` (YAML frontmatter; `name` + `description` required) |
36+
| Add a user-invocable slash command | `.claude/commands/<name>.md` |
37+
| Trigger a shell script on a Claude Code event | _We have them, but no strict project enforcement yet — register yours in `settings.local.json`._ |
38+
39+
Rule of thumb: **if Claude only needs it sometimes, it's a skill.** Once a `CLAUDE.md` loads, it stays in context for the rest of the session — keep each one lean, especially the root.
40+
41+
## Security conventions
42+
43+
Skills and agents that touch vault data, authentication, or cryptography must use Bitwarden's [Core Vocabulary](https://contributing.bitwarden.com/architecture/security/definitions) (Vault Data, Protected Data, Secure Channel, etc.) and re-state the zero-knowledge invariant inline. **Subagents run in a fresh context** and do not inherit this repo's `CLAUDE.md` — include the relevant definitions directly in the agent's system prompt.
44+
45+
## What good contributions look like
46+
47+
- **Grounded in the code.** Real files, real patterns, real commands.
48+
If it could apply to any repo, it belongs in `ai-plugins`.
49+
- **Describes the "what" and "why," not the "who."**
50+
Avoid team-persona framing. Describe the domain and its constraints; the team is an implementation detail.
51+
- **Short and specific.**
52+
2,000 words of general advice isn't a skill.
53+
- **Active voice, direct language.**
54+
"Invoke this skill when..." — not "This skill may be invoked when..."
55+
- **Reviewed like code.**
56+
Teams of domain experts own `.claude/` in their areas — they're the ones shaping how Claude behaves for everyone who works there, so treat changes with the same seriousness as source.
57+
58+
## Anti-patterns
59+
60+
- **Team-persona agents** ("Team ABC engineer").
61+
If a team's process is unique enough to warrant a persona, that's an SDLC signal to address, not a persona to encode.
62+
- **Root-level rules that only matter in one subtree.**
63+
If it applies to `util/Seeder` only, put it in `util/Seeder/CLAUDE.md`.
64+
- **Duplicating `ai-plugins` content.**
65+
Check existing plugin skills before writing a new one.
66+
- **Generic advice disguised as repo-local knowledge.**
67+
"Write good tests" isn't repo-specific.
68+
"Our integration tests must hit a real database because…" is.
69+
70+
## Building a contribution
71+
72+
The Claude Code ecosystem moves fast — last session's habits may already be out of date. Here's the workflow we follow.
73+
74+
### 1. Start with the canonical docs
75+
76+
A quick refresh before you begin goes a long way — the rules shift more often than you'd think:
77+
78+
- [How Claude Code Works](https://code.claude.com/docs/en/how-claude-code-works) — the mental model.
79+
- [Best Practices for Claude Code](https://code.claude.com/docs/en/best-practices) — what Anthropic recommends.
80+
- [Extend Claude Code](https://code.claude.com/docs/en/features-overview) — what you can build (skills, agents, commands, hooks).
81+
- [The Complete Guide to Building Skills for Claude](https://resources.anthropic.com/hubfs/The-Complete-Guide-to-Building-Skill-for-Claude.pdf) - a must read for skill building
82+
83+
### 2. Survey the landscape
84+
85+
A quick skim of both goes a long way:
86+
87+
- This repo's [`.claude/`](.) tree.
88+
- [`bitwarden/ai-plugins`](https://github.com/bitwarden/ai-plugins).
89+
90+
Try to match the voice you see. "Invoke when the user asks to X" — not "This skill may be invoked when X." Direct, active, specific. Your contribution should read like the neighbors.
91+
92+
### 3. Build iteratively
93+
94+
When you're authoring a skill, start with `/skill-creator:skill-creator`. It runs an iterative loop — draft → test against evals → review outputs → refine — with benchmark stats and a side-by-side reviewer. You end up with a skill that's been exercised against concrete inputs before you open the PR.
95+
96+
For agents, commands, hooks, and `CLAUDE.md` entries, start from an existing one in the repo and adapt it. No need to invent a new structure when a neighbor already solves the shape problem.
97+
98+
### 4. Validate before you push
99+
100+
- Run a local Bitwarden Claude Code review with `/bitwarden-code-review:code-review-local` — it writes findings to files so you can fix them before pushing, without posting anything to GitHub.
101+
- When you raise the PR, apply the `ai-review` label. Our reusable GitHub workflow watches for it and runs a Claude Code review automatically; without the label, the review doesn't fire.

.github/workflows/_move_edd_db_scripts.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
permissions:
88
pull-requests: write
99
contents: write
10+
id-token: write
11+
actions: read
1012

1113
jobs:
1214
setup:
@@ -55,13 +57,6 @@ jobs:
5557
tenant_id: ${{ secrets.AZURE_TENANT_ID }}
5658
client_id: ${{ secrets.AZURE_CLIENT_ID }}
5759

58-
- name: Retrieve Slack secrets
59-
id: retrieve-slack
60-
uses: bitwarden/gh-actions/get-keyvault-secrets@main
61-
with:
62-
keyvault: "bitwarden-ci"
63-
secrets: "devops-alerts-slack-webhook-url"
64-
6560
- name: Retrieve secrets
6661
id: retrieve-secret
6762
uses: bitwarden/gh-actions/get-keyvault-secrets@main
@@ -190,12 +185,3 @@ jobs:
190185
$(echo -e "$MOVED_FILES")
191186
")
192187
echo "pr_url=${PR_URL}" >> "$GITHUB_OUTPUT"
193-
194-
- name: Notify Slack about creation of PR
195-
if: ${{ steps.commit.outputs.pr_needed == 'true' }}
196-
uses: act10ns/slack@44541246747a30eb3102d87f7a4cc5471b0ffb7d # v2.1.0
197-
env:
198-
SLACK_WEBHOOK_URL: ${{ steps.retrieve-slack.outputs.devops-alerts-slack-webhook-url }}
199-
with:
200-
message: "Created PR for moving EDD database scripts: ${{ steps.create-pr.outputs.pr_url }}"
201-
status: ${{ job.status }}

.github/workflows/build.yml

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -594,50 +594,3 @@ jobs:
594594
permissions:
595595
contents: read
596596
id-token: write
597-
598-
check-failures:
599-
name: Check for failures
600-
if: always()
601-
runs-on: ubuntu-22.04
602-
needs:
603-
- lint
604-
- build-artifacts
605-
- upload
606-
- build-mssqlmigratorutility
607-
- bitwarden-lite-build
608-
- trigger-k8s-deploy
609-
permissions:
610-
id-token: write
611-
steps:
612-
- name: Check if any job failed
613-
if: |
614-
github.event_name != 'pull_request'
615-
&& (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc')
616-
&& contains(needs.*.result, 'failure')
617-
run: exit 1
618-
619-
- name: Log in to Azure
620-
uses: bitwarden/gh-actions/azure-login@main
621-
with:
622-
subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
623-
tenant_id: ${{ secrets.AZURE_TENANT_ID }}
624-
client_id: ${{ secrets.AZURE_CLIENT_ID }}
625-
626-
- name: Retrieve secrets
627-
id: retrieve-secrets
628-
uses: bitwarden/gh-actions/get-keyvault-secrets@main
629-
if: failure()
630-
with:
631-
keyvault: "bitwarden-ci"
632-
secrets: "devops-alerts-slack-webhook-url"
633-
634-
- name: Log out from Azure
635-
uses: bitwarden/gh-actions/azure-logout@main
636-
637-
- name: Notify Slack on failure
638-
uses: act10ns/slack@44541246747a30eb3102d87f7a4cc5471b0ffb7d # v2.1.0
639-
if: failure()
640-
env:
641-
SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}
642-
with:
643-
status: ${{ job.status }}

.github/workflows/repository-management.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,5 +241,9 @@ jobs:
241241
move_edd_db_scripts:
242242
name: Move EDD database scripts
243243
needs: cut_branch
244-
permissions: {}
244+
permissions:
245+
pull-requests: write
246+
contents: write
247+
id-token: write
248+
actions: read
245249
uses: ./.github/workflows/_move_edd_db_scripts.yml

bitwarden_license/src/Scim/Controllers/v2/UsersController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ public async Task<IActionResult> Put(Guid organizationId, Guid id, [FromBody] Sc
106106
new RevokeOrganizationUsersRequest(
107107
organizationId,
108108
[id],
109-
new SystemUser(EventSystemUser.SCIM)));
109+
new SystemUser(EventSystemUser.SCIM),
110+
RevocationReason.Manual));
110111

111112
var errors = results.Select(x => x.Result.Match(
112113
y => $"{y.Message} for user {x.Id}",

bitwarden_license/src/Scim/Groups/PatchGroupCommand.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,22 @@ public class PatchGroupCommand : IPatchGroupCommand
2222
private readonly IUpdateGroupCommand _updateGroupCommand;
2323
private readonly ILogger<PatchGroupCommand> _logger;
2424
private readonly IOrganizationRepository _organizationRepository;
25+
private readonly TimeProvider _timeProvider;
2526

2627
public PatchGroupCommand(
2728
IGroupRepository groupRepository,
2829
IGroupService groupService,
2930
IUpdateGroupCommand updateGroupCommand,
3031
ILogger<PatchGroupCommand> logger,
31-
IOrganizationRepository organizationRepository)
32+
IOrganizationRepository organizationRepository,
33+
TimeProvider timeProvider)
3234
{
3335
_groupRepository = groupRepository;
3436
_groupService = groupService;
3537
_updateGroupCommand = updateGroupCommand;
3638
_logger = logger;
3739
_organizationRepository = organizationRepository;
40+
_timeProvider = timeProvider;
3841
}
3942

4043
public async Task PatchGroupAsync(Group group, ScimPatchModel model)
@@ -53,7 +56,7 @@ private async Task HandleOperationAsync(Group group, ScimPatchModel.OperationMod
5356
case PatchOps.Replace when operation.Path?.ToLowerInvariant() == PatchPaths.Members:
5457
{
5558
var ids = GetOperationValueIds(operation.Value);
56-
await _groupRepository.UpdateUsersAsync(group.Id, ids);
59+
await _groupRepository.UpdateUsersAsync(group.Id, ids, _timeProvider.GetUtcNow().UtcDateTime);
5760
break;
5861
}
5962

@@ -122,7 +125,7 @@ private async Task HandleOperationAsync(Group group, ScimPatchModel.OperationMod
122125
{
123126
orgUserIds.Remove(v);
124127
}
125-
await _groupRepository.UpdateUsersAsync(group.Id, orgUserIds);
128+
await _groupRepository.UpdateUsersAsync(group.Id, orgUserIds, _timeProvider.GetUtcNow().UtcDateTime);
126129
break;
127130
}
128131

@@ -146,7 +149,7 @@ private async Task AddMembersAsync(Group group, HashSet<Guid> usersToAdd)
146149
return;
147150
}
148151

149-
await _groupRepository.AddGroupUsersByIdAsync(group.Id, usersToAdd);
152+
await _groupRepository.AddGroupUsersByIdAsync(group.Id, usersToAdd, _timeProvider.GetUtcNow().UtcDateTime);
150153
}
151154

152155
private static HashSet<Guid> GetOperationValueIds(JsonElement objArray)

bitwarden_license/src/Scim/Groups/PostGroupCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ private async Task UpdateGroupMembersAsync(Group group, ScimGroupRequestModel mo
6262
return;
6363
}
6464

65-
await _groupRepository.UpdateUsersAsync(group.Id, memberIds);
65+
await _groupRepository.UpdateUsersAsync(group.Id, memberIds, group.RevisionDate);
6666
}
6767
}

bitwarden_license/src/Scim/Groups/PutGroupCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ private async Task UpdateGroupMembersAsync(Group group, ScimGroupRequestModel mo
5252
}
5353
}
5454

55-
await _groupRepository.UpdateUsersAsync(group.Id, memberIds);
55+
await _groupRepository.UpdateUsersAsync(group.Id, memberIds, group.RevisionDate);
5656
}
5757
}

bitwarden_license/src/Scim/Users/PatchUserCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private async Task<bool> HandleActiveOperationAsync(Core.Entities.OrganizationUs
107107
}
108108
else if (!active && orgUser.Status != OrganizationUserStatusType.Revoked)
109109
{
110-
await _revokeOrganizationUserCommand.RevokeUserAsync(orgUser, EventSystemUser.SCIM);
110+
await _revokeOrganizationUserCommand.RevokeUserAsync(orgUser, EventSystemUser.SCIM, RevocationReason.Manual);
111111
return true;
112112
}
113113
return false;

0 commit comments

Comments
 (0)