Skip to content

Commit 5f4c787

Browse files
committed
Fix 11 CodeRabbit review issues: docs consistency, MD040, missing content
- Move system prompt changelog entry from Added to Changed section - Add Worktrees section to CLAUDE.md matching system prompt guidance - Add language tags to 5 fenced code blocks (MD040) across SKILL.md and manual-worktree-commands.md - Soften absolute merge conflict claim in parallel-workflow-patterns.md - Add EnterWorktree to SKILL.md allowed-tools - Add worktree to README.md skills list (21→22 entries) - Fix stale skill counts: 21→22 in features/index.md, getting-started/index.md, plugins/skill-engine.md (description + table); 34→35 in reference/architecture.md
1 parent 62ce886 commit 5f4c787

File tree

9 files changed

+42
-13
lines changed

9 files changed

+42
-13
lines changed

.devcontainer/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
#### Skills
1111
- **worktree** — New skill for git worktree creation, management, and cleanup. Covers `EnterWorktree` tool, `--worktree` CLI flag, `.worktreeinclude` setup, worktree naming conventions, cleanup lifecycle, and CodeForge integration (Project Manager auto-detection, agent isolation). Includes two reference files: manual worktree commands and parallel workflow patterns.
1212

13+
### Changed
14+
1315
#### System Prompt
1416
- **`<git_worktrees>` section** — Updated to document Claude Code native worktree convention (`<repo>/.claude/worktrees/`) as the recommended approach alongside the legacy `.worktrees/` convention. Added `EnterWorktree` tool guidance, `.worktreeinclude` file documentation, and path convention comparison table.
1517

16-
### Changed
17-
1818
#### Configuration
1919
- Moved `.claude` directory from `/workspaces/.claude` to `~/.claude` (home directory)
2020
- Added Docker named volume for persistence across rebuilds (per-instance isolation via `${devcontainerId}`)

.devcontainer/CLAUDE.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,34 @@ CodeForge devcontainer for AI-assisted development with Claude Code.
3333

3434
Config files deploy via `file-manifest.json` on every container start. Most deploy to `~/.claude/`; ccstatusline config deploys to `~/.config/ccstatusline/`. Each entry supports `overwrite`: `"if-changed"` (default, sha256), `"always"`, or `"never"`. Supported variables: `${CLAUDE_CONFIG_DIR}`, `${WORKSPACE_ROOT}`, `${HOME}`.
3535

36+
## Worktrees
37+
38+
Git worktrees allow checking out multiple branches simultaneously, each in its own directory.
39+
40+
**Native (recommended for Claude Code sessions):**
41+
- **In-session:** `EnterWorktree` tool — creates worktree at `<repo>/.claude/worktrees/<name>/`, branch `worktree-<name>`, auto-cleaned if no changes
42+
- **New session:** `claude --worktree <name>` — starts Claude in its own worktree; combine with `--tmux` for background work
43+
44+
**Manual (legacy convention):**
45+
```bash
46+
mkdir -p /workspaces/projects/.worktrees
47+
git worktree add /workspaces/projects/.worktrees/<branch-name> -b <branch>
48+
```
49+
50+
**Environment files:** Place a `.worktreeinclude` file at the project root listing `.gitignore`-excluded files to copy into new worktrees (e.g., `.env`). Uses `.gitignore` pattern syntax; only files matching both `.worktreeinclude` and `.gitignore` are copied.
51+
52+
**Management:**
53+
54+
| Command | Purpose |
55+
|---------|---------|
56+
| `git worktree list` | Show all active worktrees |
57+
| `git worktree remove <path>` | Remove a worktree (destructive — confirm first) |
58+
| `git worktree prune` | Clean up stale references (destructive — confirm first) |
59+
60+
**Path conventions:**
61+
- **Native:** `<repo>/.claude/worktrees/<name>/` — used by `--worktree` flag and `EnterWorktree`
62+
- **Legacy:** `.worktrees/` as sibling to the main repo — used for manual `git worktree add` and Project Manager integration
63+
3664
## Commands
3765

3866
| Command | Purpose |

.devcontainer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ Agent definitions in `plugins/devs-marketplace/plugins/agent-system/agents/` pro
348348

349349
Skills in `plugins/devs-marketplace/plugins/skill-engine/skills/` provide domain-specific coding references:
350350

351-
`api-design` · `ast-grep-patterns` · `claude-agent-sdk` · `claude-code-headless` · `debugging` · `dependency-management` · `docker` · `docker-py` · `documentation-patterns` · `fastapi` · `git-forensics` · `migration-patterns` · `performance-profiling` · `pydantic-ai` · `refactoring-patterns` · `security-checklist` · `skill-building` · `sqlite` · `svelte5` · `team` · `testing`
351+
`api-design` · `ast-grep-patterns` · `claude-agent-sdk` · `claude-code-headless` · `debugging` · `dependency-management` · `docker` · `docker-py` · `documentation-patterns` · `fastapi` · `git-forensics` · `migration-patterns` · `performance-profiling` · `pydantic-ai` · `refactoring-patterns` · `security-checklist` · `skill-building` · `sqlite` · `svelte5` · `team` · `testing` · `worktree`
352352

353353
### Spec Skills (8) — `spec-workflow` plugin
354354

.devcontainer/plugins/devs-marketplace/plugins/skill-engine/skills/worktree/SKILL.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: >-
1010
or parallel development patterns. DO NOT USE for routine git branching
1111
or single-branch workflows.
1212
version: 0.1.0
13-
allowed-tools: Bash, Read, Grep, Glob
13+
allowed-tools: Bash, Read, Grep, Glob, EnterWorktree
1414
---
1515

1616
# Git Worktrees
@@ -36,7 +36,7 @@ Use worktrees when:
3636

3737
The fastest way to create a worktree during a Claude Code session. Call `EnterWorktree` with a descriptive name:
3838

39-
```
39+
```text
4040
EnterWorktree: feature-auth-oauth2
4141
```
4242

@@ -129,7 +129,7 @@ git worktree list
129129

130130
Output shows each worktree's path, HEAD commit, and branch:
131131

132-
```
132+
```text
133133
/workspaces/projects/CodeForge d2ba55e [main]
134134
/workspaces/projects/.worktrees/feature-a abc1234 [feature-a]
135135
```

.devcontainer/plugins/devs-marketplace/plugins/skill-engine/skills/worktree/references/manual-worktree-commands.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ git worktree list --porcelain
7272
```
7373

7474
**Default output:**
75-
```
75+
```text
7676
/workspaces/projects/CodeForge d2ba55e [main]
7777
/workspaces/projects/.worktrees/feature-a abc1234 [feature-a]
7878
/workspaces/projects/.worktrees/bugfix-b def5678 [bugfix-b] locked
7979
```
8080

8181
**Porcelain output:**
82-
```
82+
```text
8383
worktree /workspaces/projects/CodeForge
8484
HEAD d2ba55eabc1234def5678901234567890abcdef
8585
branch refs/heads/main
@@ -168,7 +168,7 @@ git worktree unlock <path>
168168

169169
The main repository has a `.git` **directory**. Each worktree has a `.git` **file** (not directory) containing a pointer:
170170

171-
```
171+
```text
172172
gitdir: /workspaces/projects/CodeForge/.git/worktrees/feature-a
173173
```
174174

.devcontainer/plugins/devs-marketplace/plugins/skill-engine/skills/worktree/references/parallel-workflow-patterns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Agents with `isolation: worktree` in their frontmatter (refactorer, test-writer,
7171
**Workflow:**
7272
1. Each agent/session works on independent files
7373
2. Changes stay isolated until explicitly merged
74-
3. No merge conflicts during parallel work
74+
3. Reduced conflict risk when file ownership is respected
7575
4. After each session completes, review changes via PR
7676

7777
**When to use:** Large tasks that decompose into independent workstreams. Effective for feature builds, migrations, or test suites where each agent owns a different set of files.

docs/src/content/docs/getting-started/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you already have Docker and VS Code installed, you can go from zero to a runn
4242
Plugins are the backbone of CodeForge. They hook into Claude Code's lifecycle to enhance, guard, and automate your workflow. Highlights include:
4343

4444
- **Agent System** — 17 specialized agents for architecture, debugging, testing, security, and more
45-
- **Skill Engine**21 domain-specific knowledge packs covering frameworks, patterns, and workflows
45+
- **Skill Engine**22 domain-specific knowledge packs covering frameworks, patterns, and workflows
4646
- **Spec Workflow** — specification-driven development with 8 lifecycle skills
4747
- **Session Context** — automatic git state injection, TODO harvesting, and commit reminders
4848
- **Auto Code Quality** — formatting, linting, and advisory test runs on every change

docs/src/content/docs/plugins/skill-engine.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Skill Engine
3-
description: The skill engine plugin provides 21 domain-specific knowledge packs with automatic suggestion based on conversation context.
3+
description: The skill engine plugin provides 22 domain-specific knowledge packs with automatic suggestion based on conversation context.
44
sidebar:
55
order: 3
66
---
@@ -78,6 +78,7 @@ Skills for working with Claude Code itself and extending CodeForge.
7878
| **git-forensics** | Git history analysis, blame, bisect, pickaxe search, reflog recovery |
7979
| **ast-grep-patterns** | AST-grep pattern writing for syntax-aware code search |
8080
| **team** | Multi-agent team coordination, task decomposition, parallel workstreams |
81+
| **worktree** | Git worktree lifecycle, EnterWorktree tool, `.worktreeinclude` setup, parallel workflows |
8182

8283
:::note[Cross-Plugin Skills]
8384
The `specification-writing` skill and the spec lifecycle skills (`spec-new`, `spec-build`, etc.) live in the [Spec Workflow](./spec-workflow/) plugin, not the skill engine. However, the skill-suggester registers keywords for them so they are auto-suggested alongside skill-engine skills.

docs/src/content/docs/reference/architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Skills are Markdown knowledge files loaded on demand during a session:
111111
4. The skill content is injected into the conversation context
112112
5. Claude uses the skill knowledge for the current task
113113

114-
CodeForge ships 34 skills across the skill-engine, spec-workflow, ticket-workflow, and agent-system plugins.
114+
CodeForge ships 35 skills across the skill-engine, spec-workflow, ticket-workflow, and agent-system plugins.
115115

116116
## Directory Structure
117117

0 commit comments

Comments
 (0)