chore: bump version to 2.21.0

Author: Laurent Guitton

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.21.0] - 2026-06-17
+
 ### Added
 
 - **Monorepo Scope** — pick a single sub-workspace and scope the commit graph, commit search, and repo stats to its file tree. A scope picker in the repo sidebar lists auto-detected packages across six workspace formats (`pnpm-workspace.yaml`, `package.json` `workspaces` for npm/yarn, `Cargo.toml [workspace]`, `nx.json`, `turbo.json`, `go.work`) — all parsed natively in Rust with no new dependencies, base paths validated through `safe_repo_path()`, and a documented precedence (pnpm > Cargo > go.work > nx > turbo > npm/yarn) when manifests coexist; malformed manifests degrade to empty rather than erroring. The active scope is persisted per repo as an additive optional `scope` field in `.gitwand-workspace.json`, restored on open and validated against a new `path_exists` command (falls back to the whole repo with a one-time notice if the path was deleted). When a scope is active, `git_log` filters history to the sub-tree via a pathspec and the graph header shows the active-scope chip plus an "N commits hidden" badge — the hidden count is `unscopedTotal − scopedTotal` (both from a new lightweight `git_rev_count` command) so it stays stable across pagination; clicking either clears the scope. A "Custom folder…" entry in the picker scopes to any directory ad-hoc. Backed by a `useWorkspaceScope` composable, `backend.ts` wrappers for every new/changed command, dev-server routes for `dev:web` parity, `scope.*` i18n keys in all 5 locales, and real-temp-repo Rust tests (one per detection format + precedence) plus composable unit tests.
@@ -1053,6 +1055,7 @@ Design-system foundations — the app header and every overlay now ride on a sha
 [2.11.0]: https://github.com/devlint/GitWand/compare/v2.10.0...v2.11.0
 [2.10.0]: https://github.com/devlint/GitWand/compare/v2.9.0...v2.10.0
 [2.9.0]: https://github.com/devlint/GitWand/compare/v2.8.2...v2.9.0
+[2.21.0]: https://github.com/devlint/GitWand/compare/v2.20.1...v2.21.0
 [2.20.1]: https://github.com/devlint/GitWand/compare/v2.20.0...v2.20.1
 [2.8.2]: https://github.com/devlint/GitWand/compare/v2.8.0...v2.8.2
 [2.8.0]: https://github.com/devlint/GitWand/compare/v2.7.0...v2.8.0

README.md

@@ -21,7 +21,7 @@
 <p align="center">
   <img alt="License" src="https://img.shields.io/badge/license-MIT-8B5CF6">
   <img alt="TypeScript" src="https://img.shields.io/badge/TypeScript-100%25-3178C6">
-  <img alt="Version" src="https://img.shields.io/badge/version-2.20.1-22c55e">
+  <img alt="Version" src="https://img.shields.io/badge/version-2.21.0-22c55e">
 </p>
 
 ---

ROADMAP.md

@@ -6,19 +6,6 @@
 
 ## What's Next
 
-### v2.21.0 — Monorepo Scope
-
-_Inspired by GitSquid. Makes GitWand ergonomic on large monorepos (pnpm, Cargo, Nx…)._
-
-- **Workspace scope picker**: select a sub-workspace — the graph, commit search, and stats all scope to its file tree
-- **Auto-detection**: reads `pnpm-workspace.yaml`, `Cargo.toml [workspace]`, `nx.json`, `turbo.json`, `go.work`
-- **Scope persisted per repo** in `.gitwand-workspace.json`
-- **Ad-hoc scope without config**: a "Custom folder…" entry in the picker opens the native folder picker → scope to any directory
-
-**Follow-up (separate PR):** an in-app repo **folder-browser** panel (recursive working-tree tree) with a right-click **"Scope here"** — the gesture the roadmap originally envisioned. Deferred because the only existing tree (`FolderDiffTree`) is a *diff* tree (changed folders between two refs), the wrong substrate for general scoping, and is currently unmounted. Ad-hoc scoping already ships via the native picker above, so this is a UX nicety, not a capability gap.
-
----
-
 ### v2.22.0 — Safety Bundle: pre-commit secrets scanner
 
 _Inspired by GitSquid. A "safety" feature with zero network dependency — everything local._
@@ -77,6 +64,12 @@ _Inspired by t1gu1's feedback: "How can I code with AI in GitWand?" — GitWand
 
 ---
 
+### Later (unscheduled)
+
+- **In-app folder-browser + right-click "Scope here"** — follow-up to v2.21.0 Monorepo Scope: a recursive working-tree folder panel where right-clicking a folder scopes to it. Ad-hoc scoping already ships via the picker's "Custom folder…"; this in-tree gesture is deferred (the existing `FolderDiffTree` is a *diff* tree — the wrong substrate — and is unmounted).
+
+---
+
 ## Vision
 
 GitWand is a native Git client that **understands** code, resolves trivial conflicts on its own, and makes visible what the terminal hides.
@@ -108,6 +101,7 @@ Positioning: neither "yet another Git GUI" nor an IDE. A first-class Git navigat
 
 | Version | Highlights |
 |---------|-----------|
+| **v2.21.0** | Monorepo Scope — pick a sub-workspace and scope the commit graph, search & stats to its file tree. Auto-detects 6 workspace formats (pnpm, npm/yarn, Cargo `[workspace]`, `nx.json`, `turbo.json`, `go.work`), parsed natively in Rust with a documented precedence; scope persisted per repo (additive `scope` field in `.gitwand-workspace.json`, validated on load); `git_log` pathspec filtering + a new `git_rev_count` driving a stable "N commits hidden" badge; sidebar `ScopePicker` (auto-detected packages + "Custom folder…" ad-hoc), active-scope chip & badge in the graph header. Picker shows only on detected monorepos; full dev:web parity via a mock `detect-monorepo` route |
 | **v2.20.0** | Scratch worktree + extended Conflict Predictor — "Resolve in scratch worktree" from the merge preview opens a temporary isolated `gitwand-scratch-<timestamp>` worktree as a repo tab (resolve away from the active checkout, bring changes back in one click or discard, auto-cleanup, origin-anchored lifecycle); Conflict Predictor extended to rebase (per-commit replay against `onto`) and cherry-pick — side-effect-free `preview_rebase` / `preview_cherry_pick` Tauri commands, MCP `gitwand_preview_merge` `operation` param, new `gitwand preview` CLI command, operation selector + risk badge (low/medium/high) + hunk-by-hunk preview in the panel |
 | **v2.19.0** | GitHub OAuth & Azure DevOps + cross-fork PRs — "Sign in with GitHub" via OAuth device flow (tokens in the OS keychain, tokenless REST path, no `gh` CLI required), Azure DevOps as a first-class forge (`AzureProvider`, Entra ID device flow + auto token refresh, PR list/detail/diff/create/merge/checkout, comments, branch-policy CI checks, reviewer votes), cross-fork pull requests (target-repo selector defaulting to upstream, fork PRs surfaced in the list), and a backend performance pass (async Tauri commands, disk-persisted SWR PR cache, libgit2 `git_status` fast-path) |
 | **v2.18.0** | Inline CI Check Annotations — check-run annotations overlaid in the PR diff across the three forges (GitHub check-runs API, GitLab `artifacts:reports:codequality`, Bitbucket Reports API), gutter icons ❌/⚠/ℹ with hover tooltip, clickable "N annotations" badge in the CI tab, per-file ⚠ count in the diff sidebar, forge-agnostic `CIAnnotation` type + `ForgeProvider.getCheckAnnotations()`, lazy one-shot fetch per PR; Copilot CLI as a fourth AI provider (text-only sandbox) |

apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitwand/desktop",
-  "version": "2.20.1",
+  "version": "2.21.0",
   "private": true,
   "description": "GitWand Desktop — lightweight Git client with smart conflict resolution (Tauri + Vue 3)",
   "type": "module",

apps/desktop/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gitwand-desktop"
-version = "2.20.1"
+version = "2.21.0"
 description = "GitWand Desktop — standalone merge conflict resolution"
 authors = ["Laurent Guitton <lb.guitton@gmail.com>"]
 license = "MIT"

apps/desktop/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/crates/tauri-config-schema/schema.json",
   "productName": "GitWand",
-  "version": "2.20.1",
+  "version": "2.21.0",
   "identifier": "com.gitwand.desktop",
   "build": {
     "frontendDist": "../dist",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitwand",
-  "version": "2.20.1",
+  "version": "2.21.0",
   "private": true,
   "description": "Git's magic wand — automatic conflict resolution and smart merge tools",
   "author": "Laurent Guitton <lb.guitton@gmail.com>",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitwand/cli",
-  "version": "2.20.1",
+  "version": "2.21.0",
   "description": "GitWand CLI — resolve Git conflicts from your terminal or CI pipeline",
   "type": "module",
   "main": "dist/index.js",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitwand/core",
-  "version": "2.20.1",
+  "version": "2.21.0",
   "description": "GitWand core — automatic Git conflict resolution engine (powers @gitwand/cli, @gitwand/mcp, and the GitWand desktop app)",
   "type": "module",
   "main": "dist/index.js",

packages/mcp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitwand/mcp",
-  "version": "2.20.1",
+  "version": "2.21.0",
   "mcpName": "io.github.devlint/gitwand",
   "description": "GitWand MCP server — smart Git conflict resolution for AI agents (Claude, Cursor, Windsurf, Claude Code)",
   "type": "module",