1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
# Implementation Plan: Architectural Assessment Action Items
*February 2026 — 4 PRs covering 16 action items from `docs/ARCHITECTURAL_ASSESSMENT.md`*
## PR 1: P0 — Safety Fixes (`fix/p0-safety`) — MERGED (#315)
### 1.1 Thread panic handling
Replace `handle.join().unwrap()` with proper error handling:
- `src/cli/commands/grep.rs:150`
- `src/cli/commands/forall.rs:1011`
```rust
// Before:
handle.join().unwrap();
// After:
handle.join().map_err(|_| anyhow::anyhow!("Worker thread panicked"))?;
```
### 1.2 Mutex poison risk
Replace all `.lock().unwrap()` with `.expect("mutex poisoned")` in production code (16 sites):
- `src/cli/commands/forall.rs:1002, 1015`
- `src/cli/commands/grep.rs:141, 153`
- `src/git/cache.rs:46, 67, 79, 85`
- `src/telemetry/metrics.rs:32, 46, 53, 66-68, 79-81`
- `src/cli/commands/sync.rs:411-412`
- `src/cli/commands/pull.rs:125, 137-138`
### 1.3 Bitbucket mock race condition
Add `Once` guard to `setup_bitbucket_mock()` in `tests/common/mock_platform.rs:623-631`.
---
## PR 2: P1 — Quality Fixes (`fix/p1-quality`) — MERGED (#316)
### 2.1 Fix broken branch JSON output
Add JSON output for create, delete, and move-commits operations in `src/cli/commands/branch.rs`.
### 2.2 Add git lock detection
Add `wait_for_git_lock(repo_path)` to `src/git/mod.rs` with retry logic and `GitError::RepositoryLocked` variant.
### 2.3 Fix GHE auto-merge
Pass `--hostname` to `gh` CLI in `src/platform/github.rs` `enable_auto_merge()` when on GHE.
### 2.4 Add tests for untested modules
- `src/git/cherry_pick.rs` — inline tests
- `src/git/gc.rs` — inline tests
- `src/core/griptree.rs` — extend existing tests
---
## PR 3: P2 — Maintainability Refactor (`refactor/p2-maintainability`) — IN PROGRESS
### Phase 1: Foundation
- [x] New `src/cli/context.rs`: `WorkspaceContext` struct (workspace_root, manifest, quiet, verbose, json)
- [ ] ~~Extend `src/cli/output.rs`: Add `blank_line()`, `summary()`, `raw()`, `json()` methods~~ — Scoped out: commands handle output directly; wrappers add indirection without value
### Phase 2: load_gripspace decomposition
- [x] Split `load_gripspace()` into `load_from_griptree()`, `load_from_workspace()`, `resolve_gripspace_includes()`
### Phase 3: Repo iteration helper
- [x] New `src/cli/repo_iter.rs`: `RepoVisitResult`, `RepoOpSummary`, `for_each_repo()`, `for_each_repo_path()`
- [ ] Wire into commands — Deferred: most commands accumulate custom state that doesn't fit the simple Success/Skipped/Error enum
### Phase 4-6: Migrate all commands to WorkspaceContext
- [x] 28/30 commands in main.rs use `load_workspace_context()` (Init, Completions, Bench don't need workspace)
- [ ] ~~Migrate command signatures to accept `&WorkspaceContext`~~ — Scoped out: would touch every command file + every test; ctx field extraction in dispatch works fine
### Phase 7: Dispatch refactor
- [x] Consistent `load_workspace_context()` pattern with CLI flag extraction
- [ ] ~~Compact `dispatch_workspace_command()` function~~ — Scoped out: 612-line match for 30 commands is standard; only one dispatch site
### Phase 8: Break up large functions
- [ ] ~~sync.rs / release.rs decomposition~~ — Scoped out: already have helpers (`sync_single_repo`, `execute_post_sync_hooks`, etc.)
---
## PR 4: P3 — Extensibility (`refactor/p3-extensibility`)
### 4.1 GitBackend trait
Abstract git operations behind `GitBackend` trait in `src/git/backend.rs`.
### 4.2 OutputSink trait
Extract trait from `Output` struct for testability and quiet mode support.
### 4.3 Platform capability matrix
Document in `docs/PLATFORM_CAPABILITIES.md`.
### 4.4 Trim tokio features
Replace `features = ["full"]` with specific features in `Cargo.toml`.
### 4.5 Multi-repo rollback semantics
Record pre-sync HEADs, add `gr sync --rollback` flag.
---
## Execution Order
1. ~~PR 1 (P0) — Safety fixes~~ — MERGED (#315, Feb 13 2026)
2. ~~PR 2 (P1) — Quality fixes~~ — MERGED (#316, Feb 13 2026)
3. PR 3 (P2) — Maintainability refactor — IN PROGRESS
4. PR 4 (P3) — Extensibility (depends on P2)