Skip to content

Commit 3b59a9e

Browse files
lugassawanlugassawan
authored
[docs] Sync dogfooded agent files with current CLI/MCP surface (#408)
mcpToolEntries and the 7 project-tier agentfile generators had fallen behind rimba's real command/MCP surface: 5 of 14 registered MCP tools were undocumented, the --json command lists were missing 7 of 12 supported commands, and command-reference tables were missing 5 shipped commands (doctor, rename, restore, duplicate, trust). Fix the generators, add tests locking in the corrected sets, and regenerate the 7 committed dogfooded files via `rimba init --agents`. Global-tier generators are left as-is (follow-up).
1 parent 3bd0b91 commit 3b59a9e

9 files changed

Lines changed: 215 additions & 33 deletions

File tree

‎.claude/skills/rimba/SKILL.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,27 @@ curl -sSfL https://raw.githubusercontent.com/lugassawan/rimba/main/scripts/insta
2020
|-------------------|-----|
2121
| Start a new task | `rimba add <task>` |
2222
| Start a task in a monorepo service | `rimba add service/task` (auto-detects service from repo dirs) |
23+
| Rename a task | `rimba rename <task> [new-task]` |
24+
| Duplicate a worktree | `rimba duplicate <task>` |
2325
| See all worktrees | `rimba list` or `rimba list --json` |
2426
| Filter by service (monorepo) | `rimba list --service <svc>` |
2527
| Check worktree health | `rimba status` |
28+
| Diagnose stale worktree locks | `rimba doctor` |
2629
| Navigate to a worktree | `cd $(rimba open <task>)` |
2730
| Update from source branch | `rimba sync <task>` or `rimba sync --all` |
2831
| Finish a feature | `rimba merge <task>` (auto-removes worktree) |
2932
| Clean up merged work | `rimba clean --merged` |
3033
| Pause a task | `rimba archive <task>` (keeps branch) |
34+
| Resume a paused task | `rimba restore <task>` |
3135
| Run across worktrees | `rimba exec "<cmd>"` |
3236
| Check for conflicts | `rimba conflict-check` |
3337
| Check dependencies | `rimba deps status` |
38+
| Approve committed shell commands | `rimba trust` |
3439
| Use MCP server | `rimba mcp` (stdio transport for AI agents) |
3540

3641
## JSON Output
3742

38-
Commands supporting `--json`: `list`, `status`, `exec`, `conflict-check`, `deps status`.
43+
Commands supporting `--json`: `list`, `status`, `exec`, `conflict-check`, `deps status`, `add`, `merge`, `remove`, `rename`, `sync`, `clean`, `log`.
3944

4045
**Envelope:** `{"version": "<semver>", "command": "<name>", "data": <payload>}`
4146
**Error:** `{"version": "<semver>", "command": "<name>", "error": "<msg>", "code": "<CODE>"}`
@@ -83,3 +88,8 @@ when no MCP connection is available.
8388
| `mcp__rimba__clean` | `rimba clean --merged` |
8489
| `mcp__rimba__exec` | `rimba exec <cmd>` |
8590
| `mcp__rimba__conflict-check` | `rimba conflict-check` |
91+
| `mcp__rimba__rename` | `rimba rename <task> [new-task]` |
92+
| `mcp__rimba__merge-plan` | `rimba merge-plan` |
93+
| `mcp__rimba__log` | `rimba log` |
94+
| `mcp__rimba__archive` | `rimba archive <task>` |
95+
| `mcp__rimba__restore` | `rimba restore <task>` |

‎.clinerules/rimba.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ If not found, **ask the user** before installing. Never install automatically.
1616
4. `rimba merge <task>` — merge into main and auto-clean up
1717
5. `rimba clean --merged` — remove merged worktrees
1818
6. `rimba sync [task]` — rebase onto main
19-
7. `rimba mcp` — start MCP server for AI tool integration
19+
7. `rimba rename <task> [new-task]` — rename a worktree
20+
8. `rimba duplicate <task>` — duplicate an existing worktree
21+
9. `rimba archive <task>` / `rimba restore <task>` — archive and restore worktrees
22+
10. `rimba doctor` — diagnose stale git index.lock files
23+
11. `rimba trust` — approve committed shell commands
24+
12. `rimba mcp` — start MCP server for AI tool integration
2025

2126
## MCP Tools
2227

@@ -35,3 +40,8 @@ when no MCP connection is available.
3540
| `mcp__rimba__clean` | `rimba clean --merged` |
3641
| `mcp__rimba__exec` | `rimba exec <cmd>` |
3742
| `mcp__rimba__conflict-check` | `rimba conflict-check` |
43+
| `mcp__rimba__rename` | `rimba rename <task> [new-task]` |
44+
| `mcp__rimba__merge-plan` | `rimba merge-plan` |
45+
| `mcp__rimba__log` | `rimba log` |
46+
| `mcp__rimba__archive` | `rimba archive <task>` |
47+
| `mcp__rimba__restore` | `rimba restore <task>` |

‎.cursor/rules/rimba.mdc‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@ See AGENTS.md at the repo root for full documentation.
1818
4. `rimba open <task>` — print path or run shortcut (--ide, --agent)
1919
5. `rimba sync [task]` — rebase worktree(s) onto main
2020
6. `rimba merge <task>` — merge into main and auto-clean up
21-
7. `rimba remove <task>` — delete worktree + branch
22-
8. `rimba archive <task>` — remove worktree, keep branch
23-
9. `rimba exec <cmd>` — run across all worktrees
24-
10. `rimba clean --merged` — remove merged worktrees
25-
11. `rimba mcp` — start MCP server for AI tool integration
21+
7. `rimba rename <task> [new-task]` — rename a worktree's task, branch, and directory
22+
8. `rimba duplicate <task>` — create a new worktree from an existing one
23+
9. `rimba remove <task>` — delete worktree + branch
24+
10. `rimba archive <task>` — remove worktree, keep branch
25+
11. `rimba restore <task>` — recreate a worktree from an archived branch
26+
12. `rimba doctor` — diagnose stale git index.lock files
27+
13. `rimba trust` — approve committed shell commands
28+
14. `rimba exec <cmd>` — run across all worktrees
29+
15. `rimba clean --merged` — remove merged worktrees
30+
16. `rimba mcp` — start MCP server for AI tool integration
2631

2732
## Workflow Recipes
2833

@@ -33,7 +38,7 @@ See AGENTS.md at the repo root for full documentation.
3338

3439
## JSON Output
3540

36-
Use `--json` with: list, status, exec, conflict-check, deps status.
41+
Use `--json` with: list, status, exec, conflict-check, deps status, add, merge, remove, rename, sync, clean, log.
3742
Envelope: `{"version", "command", "data"}` or `{"version", "command", "error", "code"}`.
3843

3944
## Best Practices
@@ -59,3 +64,8 @@ when no MCP connection is available.
5964
| `mcp__rimba__clean` | `rimba clean --merged` |
6065
| `mcp__rimba__exec` | `rimba exec <cmd>` |
6166
| `mcp__rimba__conflict-check` | `rimba conflict-check` |
67+
| `mcp__rimba__rename` | `rimba rename <task> [new-task]` |
68+
| `mcp__rimba__merge-plan` | `rimba merge-plan` |
69+
| `mcp__rimba__log` | `rimba log` |
70+
| `mcp__rimba__archive` | `rimba archive <task>` |
71+
| `mcp__rimba__restore` | `rimba restore <task>` |

‎.github/copilot-instructions.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,21 @@ See AGENTS.md at the repo root for full rimba documentation.
99

1010
- `rimba add <task>` — create worktree (`rimba add service/task` for monorepos)
1111
- `rimba add pr:<num>` — create worktree from a GitHub PR
12+
- `rimba rename <task> [new-task]` — rename a worktree's task, branch, and directory
13+
- `rimba duplicate <task>` — create a new worktree from an existing one
1214
- `rimba list` (`--full` adds PR/CI columns) / `rimba status` (`--detail` adds disk/velocity) — inspect worktrees (`--service <svc>` to filter)
15+
- `rimba doctor` — diagnose stale git index.lock files
1316
- `rimba merge <task>` — merge into main and auto-clean up
1417
- `rimba clean --merged` — remove merged worktrees
18+
- `rimba archive <task>` / `rimba restore <task>` — remove worktree keeping branch / recreate from an archived branch
1519
- `rimba exec <cmd>` — run command across all worktrees
20+
- `rimba trust` — approve committed shell commands
1621
- `rimba mcp` — start MCP server for AI tool integration
1722

1823
### Config Shape (`.rimba/settings.toml`)
1924

2025
```toml
21-
copy_files = [".env", ".env.local", ".envrc", ".tool-versions"]
26+
copy_files = [".env", ".claude"] # auto-detected on init from gitignored local files
2227
post_create = []
2328
```
2429

@@ -45,5 +50,10 @@ when no MCP connection is available.
4550
| `mcp__rimba__clean` | `rimba clean --merged` |
4651
| `mcp__rimba__exec` | `rimba exec <cmd>` |
4752
| `mcp__rimba__conflict-check` | `rimba conflict-check` |
53+
| `mcp__rimba__rename` | `rimba rename <task> [new-task]` |
54+
| `mcp__rimba__merge-plan` | `rimba merge-plan` |
55+
| `mcp__rimba__log` | `rimba log` |
56+
| `mcp__rimba__archive` | `rimba archive <task>` |
57+
| `mcp__rimba__restore` | `rimba restore <task>` |
4858

4959
<!-- END RIMBA -->

‎.windsurf/rules/rimba.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ If not found, **ask the user** before installing. Never install automatically.
1616
4. `rimba merge <task>` — merge into main and auto-clean up
1717
5. `rimba clean --merged` — remove merged worktrees
1818
6. `rimba sync [task]` — rebase onto main
19-
7. `rimba mcp` — start MCP server for AI tool integration
19+
7. `rimba rename <task> [new-task]` — rename a worktree
20+
8. `rimba duplicate <task>` — duplicate an existing worktree
21+
9. `rimba archive <task>` / `rimba restore <task>` — archive and restore worktrees
22+
10. `rimba doctor` — diagnose stale git index.lock files
23+
11. `rimba trust` — approve committed shell commands
24+
12. `rimba mcp` — start MCP server for AI tool integration
2025

2126
## MCP Tools
2227

@@ -35,3 +40,8 @@ when no MCP connection is available.
3540
| `mcp__rimba__clean` | `rimba clean --merged` |
3641
| `mcp__rimba__exec` | `rimba exec <cmd>` |
3742
| `mcp__rimba__conflict-check` | `rimba conflict-check` |
43+
| `mcp__rimba__rename` | `rimba rename <task> [new-task]` |
44+
| `mcp__rimba__merge-plan` | `rimba merge-plan` |
45+
| `mcp__rimba__log` | `rimba log` |
46+
| `mcp__rimba__archive` | `rimba archive <task>` |
47+
| `mcp__rimba__restore` | `rimba restore <task>` |

‎AGENTS.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ curl -sSfL https://raw.githubusercontent.com/lugassawan/rimba/main/scripts/insta
2020

2121
| Concern | Commands |
2222
|---------|----------|
23-
| Create & navigate | `rimba add <task>` (or `rimba add service/task` for monorepos), `rimba add pr:<num>` (from a GitHub PR), `rimba open <task>` |
24-
| Inspect | `rimba list` (`--full` adds PR/CI columns), `rimba status` (`--detail` adds disk/velocity), `rimba log` |
23+
| Create & navigate | `rimba add <task>` (or `rimba add service/task` for monorepos), `rimba add pr:<num>` (from a GitHub PR), `rimba open <task>`, `rimba rename <task> [new-task]`, `rimba duplicate <task>` |
24+
| Inspect | `rimba list` (`--full` adds PR/CI columns), `rimba status` (`--detail` adds disk/velocity), `rimba log`, `rimba doctor` |
2525
| Sync & merge | `rimba sync [task]`, `rimba merge <task>` |
26-
| Clean up | `rimba clean --merged`, `rimba archive <task>`, `rimba remove <task>` |
26+
| Clean up | `rimba clean --merged`, `rimba archive <task>`, `rimba restore <task>`, `rimba remove <task>` |
2727
| Cross-cutting | `rimba exec <cmd>`, `rimba conflict-check`, `rimba deps status` |
28+
| Security | `rimba trust` (approve committed shell commands) |
2829
| AI integration | `rimba mcp` (MCP server for AI coding agents) |
2930

3031
## Workflow Recipes
@@ -64,7 +65,7 @@ MCP tools also accept `service/task` format in the `task` parameter.
6465

6566
## JSON Output
6667

67-
Commands that support `--json`: list, status, exec, conflict-check, deps status.
68+
Commands that support `--json`: list, status, exec, conflict-check, deps status, add, merge, remove, rename, sync, clean, log.
6869

6970
Envelope: `{"version": "...", "command": "...", "data": ...}`
7071
Error: `{"version": "...", "command": "...", "error": "...", "code": "..."}`
@@ -93,5 +94,10 @@ when no MCP connection is available.
9394
| `mcp__rimba__clean` | `rimba clean --merged` |
9495
| `mcp__rimba__exec` | `rimba exec <cmd>` |
9596
| `mcp__rimba__conflict-check` | `rimba conflict-check` |
97+
| `mcp__rimba__rename` | `rimba rename <task> [new-task]` |
98+
| `mcp__rimba__merge-plan` | `rimba merge-plan` |
99+
| `mcp__rimba__log` | `rimba log` |
100+
| `mcp__rimba__archive` | `rimba archive <task>` |
101+
| `mcp__rimba__restore` | `rimba restore <task>` |
96102

97103
<!-- END RIMBA -->

‎GEMINI.md‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ If not found, **ask the user** before installing. Never install automatically.
1515

1616
| Concern | Commands |
1717
|---------|----------|
18-
| Create & navigate | `rimba add <task>`, `rimba add pr:<num>` (from a GitHub PR), `rimba open <task>` |
19-
| Inspect | `rimba list` (`--full` adds PR/CI columns), `rimba status` (`--detail` adds disk/velocity) |
18+
| Create & navigate | `rimba add <task>`, `rimba add pr:<num>` (from a GitHub PR), `rimba open <task>`, `rimba rename <task> [new-task]`, `rimba duplicate <task>` |
19+
| Inspect | `rimba list` (`--full` adds PR/CI columns), `rimba status` (`--detail` adds disk/velocity), `rimba doctor` |
2020
| Sync & merge | `rimba sync [task]`, `rimba merge <task>` |
21-
| Clean up | `rimba clean --merged`, `rimba archive <task>`, `rimba remove <task>` |
21+
| Clean up | `rimba clean --merged`, `rimba archive <task>`, `rimba restore <task>`, `rimba remove <task>` |
2222
| Cross-cutting | `rimba exec <cmd>`, `rimba conflict-check` |
23+
| Security | `rimba trust` (approve committed shell commands) |
2324
| AI integration | `rimba mcp` (MCP server for AI coding agents) |
2425

2526
## MCP Tools
@@ -39,5 +40,10 @@ when no MCP connection is available.
3940
| `mcp__rimba__clean` | `rimba clean --merged` |
4041
| `mcp__rimba__exec` | `rimba exec <cmd>` |
4142
| `mcp__rimba__conflict-check` | `rimba conflict-check` |
43+
| `mcp__rimba__rename` | `rimba rename <task> [new-task]` |
44+
| `mcp__rimba__merge-plan` | `rimba merge-plan` |
45+
| `mcp__rimba__log` | `rimba log` |
46+
| `mcp__rimba__archive` | `rimba archive <task>` |
47+
| `mcp__rimba__restore` | `rimba restore <task>` |
4248

4349
<!-- END RIMBA -->

0 commit comments

Comments
 (0)