@mindfoldhq/trellis 0.2.9 → 0.2.10

package/dist/migrations/manifests/0.3.0.json

@@ -0,0 +1,175 @@
+{
+  "version": "0.3.0",
+  "description": "Command path namespace migration for brand recognition",
+  "migrations": [
+    {
+      "type": "rename",
+      "from": ".claude/commands/start.md",
+      "to": ".claude/commands/trellis/start.md",
+      "description": "Move Claude start command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/finish-work.md",
+      "to": ".claude/commands/trellis/finish-work.md",
+      "description": "Move Claude finish-work command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/before-frontend-dev.md",
+      "to": ".claude/commands/trellis/before-frontend-dev.md",
+      "description": "Move Claude before-frontend-dev command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/before-backend-dev.md",
+      "to": ".claude/commands/trellis/before-backend-dev.md",
+      "description": "Move Claude before-backend-dev command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/check-frontend.md",
+      "to": ".claude/commands/trellis/check-frontend.md",
+      "description": "Move Claude check-frontend command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/check-backend.md",
+      "to": ".claude/commands/trellis/check-backend.md",
+      "description": "Move Claude check-backend command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/check-cross-layer.md",
+      "to": ".claude/commands/trellis/check-cross-layer.md",
+      "description": "Move Claude check-cross-layer command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/record-session.md",
+      "to": ".claude/commands/trellis/record-session.md",
+      "description": "Move Claude record-session command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/update-spec.md",
+      "to": ".claude/commands/trellis/update-spec.md",
+      "description": "Move Claude update-spec command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/onboard.md",
+      "to": ".claude/commands/trellis/onboard.md",
+      "description": "Move Claude onboard command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/break-loop.md",
+      "to": ".claude/commands/trellis/break-loop.md",
+      "description": "Move Claude break-loop command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/integrate-skill.md",
+      "to": ".claude/commands/trellis/integrate-skill.md",
+      "description": "Move Claude integrate-skill command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/create-command.md",
+      "to": ".claude/commands/trellis/create-command.md",
+      "description": "Move Claude create-command command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/parallel.md",
+      "to": ".claude/commands/trellis/parallel.md",
+      "description": "Move Claude parallel command to trellis/ subdirectory"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/start.md",
+      "to": ".cursor/commands/trellis-start.md",
+      "description": "Rename Cursor start command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/finish-work.md",
+      "to": ".cursor/commands/trellis-finish-work.md",
+      "description": "Rename Cursor finish-work command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/before-frontend-dev.md",
+      "to": ".cursor/commands/trellis-before-frontend-dev.md",
+      "description": "Rename Cursor before-frontend-dev command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/before-backend-dev.md",
+      "to": ".cursor/commands/trellis-before-backend-dev.md",
+      "description": "Rename Cursor before-backend-dev command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/check-frontend.md",
+      "to": ".cursor/commands/trellis-check-frontend.md",
+      "description": "Rename Cursor check-frontend command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/check-backend.md",
+      "to": ".cursor/commands/trellis-check-backend.md",
+      "description": "Rename Cursor check-backend command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/check-cross-layer.md",
+      "to": ".cursor/commands/trellis-check-cross-layer.md",
+      "description": "Rename Cursor check-cross-layer command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/record-session.md",
+      "to": ".cursor/commands/trellis-record-session.md",
+      "description": "Rename Cursor record-session command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/update-spec.md",
+      "to": ".cursor/commands/trellis-update-spec.md",
+      "description": "Rename Cursor update-spec command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/onboard.md",
+      "to": ".cursor/commands/trellis-onboard.md",
+      "description": "Rename Cursor onboard command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/break-loop.md",
+      "to": ".cursor/commands/trellis-break-loop.md",
+      "description": "Rename Cursor break-loop command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/integrate-skill.md",
+      "to": ".cursor/commands/trellis-integrate-skill.md",
+      "description": "Rename Cursor integrate-skill command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/create-command.md",
+      "to": ".cursor/commands/trellis-create-command.md",
+      "description": "Rename Cursor create-command command with trellis- prefix"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/parallel.md",
+      "to": ".cursor/commands/trellis-parallel.md",
+      "description": "Rename Cursor parallel command with trellis- prefix"
+    }
+  ],
+  "notes": "Claude Code uses subdirectory namespacing (.claude/commands/trellis/), Cursor uses filename prefix (.cursor/commands/trellis-*) since Cursor doesn't support nested command directories"
+}

package/dist/templates/claude/commands/{check-cross-layer.md → trellis/check-cross-layer.md}

@@ -12,7 +12,7 @@ Check if your changes considered all dimensions. Most bugs come from "didn't thi
 |----------|---------|--------|
 | [Pre-Implementation Checklist](.trellis/spec/guides/pre-implementation-checklist.md) | Questions before coding | **Before** writing code |
 | [Code Reuse Thinking Guide](.trellis/spec/guides/code-reuse-thinking-guide.md) | Pattern recognition | During implementation |
-| **`/check-cross-layer`** (this) | Verification check | **After** implementation |
+| **`/trellis:check-cross-layer`** (this) | Verification check | **After** implementation |
 
 ---
 

package/dist/templates/{cursor/commands → claude/commands/trellis}/create-command.md

@@ -1,16 +1,16 @@
 # Create New Slash Command
 
-Create a new slash command in both `.cursor/commands/` and `.claude/commands/` directories based on user requirements.
+Create a new slash command in both `.cursor/commands/` (with `trellis-` prefix) and `.claude/commands/trellis/` directories based on user requirements.
 
 ## Usage
 
 ```
-/create-command <command-name> <description>
+/trellis:create-command <command-name> <description>
 ```
 
 **Example**:
 ```
-/create-command review-pr Check PR code changes against project guidelines
+/trellis:create-command review-pr Check PR code changes against project guidelines
 ```
 
 ## Execution Steps
@@ -61,8 +61,8 @@ Template
 ### 4. Create Files
 
 Create in both directories:
-- `.cursor/commands/<command-name>.md`
-- `.claude/commands/<command-name>.md`
+- `.cursor/commands/trellis-<command-name>.md`
+- `.claude/commands/trellis/<command-name>.md`
 
 ### 5. Confirm Creation
 
@@ -71,11 +71,11 @@ Output result:
 [OK] Created Slash Command: /<command-name>
 
 File paths:
-- .cursor/commands/<command-name>.md
-- .claude/commands/<command-name>.md
+- .cursor/commands/trellis-<command-name>.md
+- .claude/commands/trellis/<command-name>.md
 
 Usage:
-/<command-name>
+/trellis:<command-name>
 
 Description:
 <description>
@@ -112,7 +112,7 @@ Description:
 
 ### Input
 ```
-/create-command review-pr Check PR code changes against project guidelines
+/trellis:create-command review-pr Check PR code changes against project guidelines
 ```
 
 ### Generated Command Content

package/dist/templates/claude/commands/{finish-work.md → trellis/finish-work.md}

@@ -106,19 +106,19 @@ git diff --name-only
 
 ```
 Development Flow:
-  Write code -> Test -> /finish-work -> git commit -> /record-session
+  Write code -> Test -> /trellis:finish-work -> git commit -> /trellis:record-session
                           |                              |
                    Ensure completeness              Record progress
                    
 Debug Flow:
-  Hit bug -> Fix -> /break-loop -> Knowledge capture
+  Hit bug -> Fix -> /trellis:break-loop -> Knowledge capture
                        |
                   Deep analysis
 ```
 
-- `/finish-work` - Check work completeness (this command)
-- `/record-session` - Record session and commits
-- `/break-loop` - Deep analysis after debugging
+- `/trellis:finish-work` - Check work completeness (this command)
+- `/trellis:record-session` - Record session and commits
+- `/trellis:break-loop` - Deep analysis after debugging
 
 ---
 

package/dist/templates/{cursor/commands → claude/commands/trellis}/integrate-skill.md

@@ -5,13 +5,13 @@ Adapt and integrate a Claude global skill into your project's development guidel
 ## Usage
 
 ```
-/integrate-skill <skill-name>
+/trellis:integrate-skill <skill-name>
 ```
 
 **Examples**:
 ```
-/integrate-skill frontend-design
-/integrate-skill mcp-builder
+/trellis:integrate-skill frontend-design
+/trellis:integrate-skill mcp-builder
 ```
 
 ## Core Principle
@@ -169,7 +169,7 @@ yarn add <package>
 If this skill is frequently used, create a shortcut command:
 
 ```bash
-/create-command use-<skill-name> Use <skill-name> skill following project guidelines
+/trellis:create-command use-<skill-name> Use <skill-name> skill following project guidelines
 ```
 
 ## Common Skill Integration Reference

package/dist/templates/claude/commands/{onboard.md → trellis/onboard.md}

@@ -41,7 +41,7 @@ Every AI session starts with a blank slate. Unlike human engineers who accumulat
 
 **The Problem**: Without memory, AI asks the same questions repeatedly, makes the same mistakes, and can't build on previous work.
 
-**The Solution**: The `.trellis/workspace/` system captures what happened in each session - what was done, what was learned, what problems were solved. The `/start` command reads this history at session start, giving AI "artificial memory."
+**The Solution**: The `.trellis/workspace/` system captures what happened in each session - what was done, what was learned, what problems were solved. The `/trellis:start` command reads this history at session start, giving AI "artificial memory."
 
 ### Challenge 2: AI Has Generic Knowledge, Not Project-Specific Knowledge
 
@@ -57,7 +57,7 @@ Even after injecting guidelines, AI has limited context window. As conversation
 
 **The Problem**: AI starts following guidelines, but as the session progresses and context fills up, it "forgets" the rules and reverts to generic patterns.
 
-**The Solution**: The `/check-*` commands re-verify code against guidelines AFTER writing, catching drift that occurred during development. The `/finish-work` command does a final holistic review.
+**The Solution**: The `/check-*` commands re-verify code against guidelines AFTER writing, catching drift that occurred during development. The `/trellis:finish-work` command does a final holistic review.
 
 ---
 
@@ -106,7 +106,7 @@ Even after injecting guidelines, AI has limited context window. As conversation
 
 ## COMMAND DEEP DIVE
 
-### /start - Restore AI Memory
+### /trellis:start - Restore AI Memory
 
 **WHY IT EXISTS**:
 When a human engineer joins a project, they spend days/weeks learning: What is this project? What's been built? What's in progress? What's the current state?
@@ -121,12 +121,12 @@ AI needs the same onboarding - but compressed into seconds at session start.
 5. Understands current project state before making any changes
 
 **WHY THIS MATTERS**:
-- Without /start: AI is blind. It might work on wrong branch, conflict with others' work, or redo already-completed work.
-- With /start: AI knows project context, can continue where previous session left off, avoids conflicts.
+- Without /trellis:start: AI is blind. It might work on wrong branch, conflict with others' work, or redo already-completed work.
+- With /trellis:start: AI knows project context, can continue where previous session left off, avoids conflicts.
 
 ---
 
-### /before-frontend-dev and /before-backend-dev - Inject Specialized Knowledge
+### /trellis:before-frontend-dev and /trellis:before-backend-dev - Inject Specialized Knowledge
 
 **WHY IT EXISTS**:
 AI models have "pre-trained knowledge" - general patterns from millions of codebases. But YOUR project has specific conventions that differ from generic patterns.
@@ -145,7 +145,7 @@ AI models have "pre-trained knowledge" - general patterns from millions of codeb
 
 ---
 
-### /check-frontend and /check-backend - Combat Context Drift
+### /trellis:check-frontend and /trellis:check-backend - Combat Context Drift
 
 **WHY IT EXISTS**:
 AI context window has limited capacity. As conversation progresses, guidelines injected at session start become less influential. This causes "context drift."
@@ -162,7 +162,7 @@ AI context window has limited capacity. As conversation progresses, guidelines i
 
 ---
 
-### /check-cross-layer - Multi-Dimension Verification
+### /trellis:check-cross-layer - Multi-Dimension Verification
 
 **WHY IT EXISTS**:
 Most bugs don't come from lack of technical skill - they come from "didn't think of it":
@@ -180,7 +180,7 @@ Most bugs don't come from lack of technical skill - they come from "didn't think
 
 ---
 
-### /finish-work - Holistic Pre-Commit Review
+### /trellis:finish-work - Holistic Pre-Commit Review
 
 **WHY IT EXISTS**:
 The `/check-*` commands focus on code quality within a single layer. But real changes often have cross-cutting concerns.
@@ -193,10 +193,10 @@ The `/check-*` commands focus on code quality within a single layer. But real ch
 
 ---
 
-### /record-session - Persist Memory for Future
+### /trellis:record-session - Persist Memory for Future
 
 **WHY IT EXISTS**:
-All the context AI built during this session will be lost when session ends. The next session's `/start` needs this information.
+All the context AI built during this session will be lost when session ends. The next session's `/trellis:start` needs this information.
 
 **WHAT IT ACTUALLY DOES**:
 1. Records session summary to `workspace/{developer}/journal-N.md`
@@ -209,47 +209,47 @@ All the context AI built during this session will be lost when session ends. The
 
 ### Example 1: Bug Fix Session
 
-**[1/8] /start** - AI needs project context before touching code
+**[1/8] /trellis:start** - AI needs project context before touching code
 **[2/8] ./.trellis/scripts/task.sh create "Fix bug" --slug fix-bug** - Track work for future reference
-**[3/8] /before-frontend-dev** - Inject project-specific frontend knowledge
+**[3/8] /trellis:before-frontend-dev** - Inject project-specific frontend knowledge
 **[4/8] Investigate and fix the bug** - Actual development work
-**[5/8] /check-frontend** - Re-verify code against guidelines
-**[6/8] /finish-work** - Holistic cross-layer review
+**[5/8] /trellis:check-frontend** - Re-verify code against guidelines
+**[6/8] /trellis:finish-work** - Holistic cross-layer review
 **[7/8] Human tests and commits** - Human validates before code enters repo
-**[8/8] /record-session** - Persist memory for future sessions
+**[8/8] /trellis:record-session** - Persist memory for future sessions
 
 ### Example 2: Planning Session (No Code)
 
-**[1/4] /start** - Context needed even for non-coding work
+**[1/4] /trellis:start** - Context needed even for non-coding work
 **[2/4] ./.trellis/scripts/task.sh create "Planning task" --slug planning-task** - Planning is valuable work
 **[3/4] Review docs, create subtask list** - Actual planning work
-**[4/4] /record-session (with --summary)** - Planning decisions must be recorded
+**[4/4] /trellis:record-session (with --summary)** - Planning decisions must be recorded
 
 ### Example 3: Code Review Fixes
 
-**[1/6] /start** - Resume context from previous session
-**[2/6] /before-backend-dev** - Re-inject guidelines before fixes
+**[1/6] /trellis:start** - Resume context from previous session
+**[2/6] /trellis:before-backend-dev** - Re-inject guidelines before fixes
 **[3/6] Fix each CR issue** - Address feedback with guidelines in context
-**[4/6] /check-backend** - Verify fixes didn't introduce new issues
-**[5/6] /finish-work** - Document lessons from CR
-**[6/6] Human commits, then /record-session** - Preserve CR lessons
+**[4/6] /trellis:check-backend** - Verify fixes didn't introduce new issues
+**[5/6] /trellis:finish-work** - Document lessons from CR
+**[6/6] Human commits, then /trellis:record-session** - Preserve CR lessons
 
 ### Example 4: Large Refactoring
 
-**[1/5] /start** - Clear baseline before major changes
+**[1/5] /trellis:start** - Clear baseline before major changes
 **[2/5] Plan phases** - Break into verifiable chunks
 **[3/5] Execute phase by phase with /check-* after each** - Incremental verification
-**[4/5] /finish-work** - Check if new patterns should be documented
+**[4/5] /trellis:finish-work** - Check if new patterns should be documented
 **[5/5] Record with multiple commit hashes** - Link all commits to one feature
 
 ### Example 5: Debug Session
 
-**[1/6] /start** - See if this bug was investigated before
-**[2/6] /before-backend-dev** - Guidelines might document known gotchas
+**[1/6] /trellis:start** - See if this bug was investigated before
+**[2/6] /trellis:before-backend-dev** - Guidelines might document known gotchas
 **[3/6] Investigation** - Actual debugging work
-**[4/6] /check-backend** - Verify debug changes don't break other things
-**[5/6] /finish-work** - Debug findings might need documentation
-**[6/6] Human commits, then /record-session** - Debug knowledge is valuable
+**[4/6] /trellis:check-backend** - Verify debug changes don't break other things
+**[5/6] /trellis:finish-work** - Debug findings might need documentation
+**[6/6] Human commits, then /trellis:record-session** - Debug knowledge is valuable
 
 ---
 
@@ -258,7 +258,7 @@ All the context AI built during this session will be lost when session ends. The
 1. **AI NEVER commits** - Human tests and approves. AI prepares, human validates.
 2. **Guidelines before code** - /before-*-dev commands inject project knowledge.
 3. **Check after code** - /check-* commands catch context drift.
-4. **Record everything** - /record-session persists memory.
+4. **Record everything** - /trellis:record-session persists memory.
 
 ---
 
@@ -351,7 +351,7 @@ After covering all three parts, summarize:
 - Part 3: Guidelines status (empty templates need filling / already customized)
 
 **Next steps** (tell user):
-1. Run `/record-session` to record this onboard session
+1. Run `/trellis:record-session` to record this onboard session
 2. [If guidelines empty] Start filling in `.trellis/spec/` guidelines
 3. [If guidelines ready] Start your first development task
 

package/dist/templates/claude/commands/{parallel.md → trellis/parallel.md}

@@ -84,7 +84,7 @@ Plan Agent will:
 After plan.sh completes, start the worktree agent:
 
 ```bash
-./.trellis/scripts/multi-agent/start.sh "$TASK_DIR"
+./.trellis/scripts/multi-agent/trellis:start.sh "$TASK_DIR"
 ```
 
 ### Option B: Manual Configuration (For simple/clear features) `[AI]`
@@ -137,7 +137,7 @@ EOF
 
 ```bash
 ./.trellis/scripts/task.sh validate "$TASK_DIR"
-./.trellis/scripts/multi-agent/start.sh "$TASK_DIR"
+./.trellis/scripts/multi-agent/trellis:start.sh "$TASK_DIR"
 ```
 
 ---
@@ -154,10 +154,10 @@ The following slash commands are for users (not AI):
 
 | Command | Description |
 |---------|-------------|
-| `/parallel` | Start Multi-Agent Pipeline (this command) |
-| `/start` | Start normal development mode (single process) |
-| `/record-session` | Record session progress |
-| `/finish-work` | Pre-completion checklist |
+| `/trellis:parallel` | Start Multi-Agent Pipeline (this command) |
+| `/trellis:start` | Start normal development mode (single process) |
+| `/trellis:record-session` | Record session progress |
+| `/trellis:finish-work` | Pre-completion checklist |
 
 ---
 

package/dist/templates/claude/commands/{start.md → trellis/start.md}

@@ -75,7 +75,7 @@ When user describes a task, classify it:
 For questions or trivial fixes, work directly:
 
 1. Answer question or make the fix
-2. If code was changed, remind user to run `/finish-work`
+2. If code was changed, remind user to run `/trellis:finish-work`
 
 ---
 
@@ -222,7 +222,7 @@ Task(
 3. Remind user to:
    - Test the changes
    - Commit when ready
-   - Run `/record-session` to record this session
+   - Run `/trellis:record-session` to record this session
 
 ---
 
@@ -244,10 +244,10 @@ If yes, resume from the appropriate step (usually Step 7 or 8).
 
 | Command | When to Use |
 |---------|-------------|
-| `/start` | Begin a session (this command) |
-| `/parallel` | Complex tasks needing isolated worktree |
-| `/finish-work` | Before committing changes |
-| `/record-session` | After completing a task |
+| `/trellis:start` | Begin a session (this command) |
+| `/trellis:parallel` | Complex tasks needing isolated worktree |
+| `/trellis:finish-work` | Before committing changes |
+| `/trellis:record-session` | After completing a task |
 
 ### AI Scripts `[AI]`
 

package/dist/templates/claude/commands/{update-spec.md → trellis/update-spec.md}

@@ -191,15 +191,15 @@ Before finishing your spec update:
 
 ```
 Development Flow:
-  Learn something → /update-spec → Knowledge captured
+  Learn something → /trellis:update-spec → Knowledge captured
        ↑                                  ↓
-  /break-loop ←──────────────────── Future sessions benefit
+  /trellis:break-loop ←──────────────────── Future sessions benefit
   (deep bug analysis)
 ```
 
-- `/break-loop` - Analyzes bugs deeply, often reveals spec updates needed
-- `/update-spec` - Actually makes the updates (this command)
-- `/finish-work` - Reminds you to check if specs need updates
+- `/trellis:break-loop` - Analyzes bugs deeply, often reveals spec updates needed
+- `/trellis:update-spec` - Actually makes the updates (this command)
+- `/trellis:finish-work` - Reminds you to check if specs need updates
 
 ---
 

package/dist/templates/claude/hooks/inject-subagent-context.py

@@ -292,9 +292,7 @@ def get_implement_context(repo_root: str, task_dir: str) -> str:
     # 2. Requirements document
     prd_content = read_file_content(repo_root, f"{task_dir}/prd.md")
     if prd_content:
-        context_parts.append(
-            f"=== {task_dir}/prd.md (Requirements) ===\n{prd_content}"
-        )
+        context_parts.append(f"=== {task_dir}/prd.md (Requirements) ===\n{prd_content}")
 
     # 3. Technical design
     info_content = read_file_content(repo_root, f"{task_dir}/info.md")
@@ -325,10 +323,10 @@ def get_check_context(repo_root: str, task_dir: str) -> str:
     else:
         # Fallback: use hardcoded check files + spec.jsonl
         check_files = [
-            (".claude/commands/finish-work.md", "Finish work checklist"),
-            (".claude/commands/check-cross-layer.md", "Cross-layer check spec"),
-            (".claude/commands/check-backend.md", "Backend check spec"),
-            (".claude/commands/check-frontend.md", "Frontend check spec"),
+            (".claude/commands/trellis/finish-work.md", "Finish work checklist"),
+            (".claude/commands/trellis/check-cross-layer.md", "Cross-layer check spec"),
+            (".claude/commands/trellis/check-backend.md", "Backend check spec"),
+            (".claude/commands/trellis/check-frontend.md", "Frontend check spec"),
         ]
         for file_path, description in check_files:
             content = read_file_content(repo_root, file_path)
@@ -369,10 +367,12 @@ def get_finish_context(repo_root: str, task_dir: str) -> str:
             context_parts.append(f"=== {file_path} ===\n{content}")
     else:
         # Fallback: only finish-work.md (lightweight)
-        finish_work = read_file_content(repo_root, ".claude/commands/finish-work.md")
+        finish_work = read_file_content(
+            repo_root, ".claude/commands/trellis/finish-work.md"
+        )
         if finish_work:
             context_parts.append(
-                f"=== .claude/commands/finish-work.md (Finish checklist) ===\n{finish_work}"
+                f"=== .claude/commands/trellis/finish-work.md (Finish checklist) ===\n{finish_work}"
             )
 
     # 2. Requirements document (for verifying requirements are met)
@@ -408,9 +408,9 @@ def get_debug_context(repo_root: str, task_dir: str) -> str:
             context_parts.append(f"=== {file_path} (Dev spec) ===\n{content}")
 
         check_files = [
-            (".claude/commands/check-backend.md", "Backend check spec"),
-            (".claude/commands/check-frontend.md", "Frontend check spec"),
-            (".claude/commands/check-cross-layer.md", "Cross-layer check spec"),
+            (".claude/commands/trellis/check-backend.md", "Backend check spec"),
+            (".claude/commands/trellis/check-frontend.md", "Frontend check spec"),
+            (".claude/commands/trellis/check-cross-layer.md", "Cross-layer check spec"),
         ]
         for file_path, description in check_files:
             content = read_file_content(repo_root, file_path)
@@ -418,9 +418,7 @@ def get_debug_context(repo_root: str, task_dir: str) -> str:
                 context_parts.append(f"=== {file_path} ({description}) ===\n{content}")
 
     # 2. Codex review output (if exists)
-    codex_output = read_file_content(
-        repo_root, f"{task_dir}/codex-review-output.txt"
-    )
+    codex_output = read_file_content(repo_root, f"{task_dir}/codex-review-output.txt")
     if codex_output:
         context_parts.append(
             f"=== {task_dir}/codex-review-output.txt (Codex Review Results) ===\n{codex_output}"
@@ -600,9 +598,7 @@ def get_research_context(repo_root: str, task_dir: str | None) -> str:
 
     # 2. If task directory exists, try reading research.jsonl (optional)
     if task_dir:
-        research_entries = read_jsonl_entries(
-            repo_root, f"{task_dir}/research.jsonl"
-        )
+        research_entries = read_jsonl_entries(repo_root, f"{task_dir}/research.jsonl")
         if research_entries:
             context_parts.append(
                 "\n## Additional Search Context (from research.jsonl)\n"

package/dist/templates/claude/hooks/session-start.py

@@ -109,7 +109,9 @@ Read and follow all instructions below carefully.
 
     # 5. Session Instructions
     print("<instructions>")
-    start_md = read_file(claude_dir / "commands" / "start.md", "No start.md found")
+    start_md = read_file(
+        claude_dir / "commands" / "trellis" / "start.md", "No start.md found"
+    )
     print(start_md)
     print("</instructions>")
     print()

package/dist/templates/claude/index.d.ts

@@ -35,6 +35,8 @@ export interface HookTemplate {
 }
 /**
  * Get all command templates
+ * Commands are stored in commands/trellis/ subdirectory
+ * This creates commands like /trellis:start, /trellis:finish-work, etc.
  */
 export declare function getAllCommands(): CommandTemplate[];
 /**

package/dist/templates/claude/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/templates/claude/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAsBH,eAAO,MAAM,gBAAgB,QAAgC,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,eAAe,EAAE,CAalD;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,aAAa,EAAE,CAa9C;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,YAAY,EAAE,CAU5C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,YAAY,CAKlD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/templates/claude/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAsBH,eAAO,MAAM,gBAAgB,QAAgC,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,eAAe,EAAE,CAalD;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,aAAa,EAAE,CAa9C;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,YAAY,EAAE,CAU5C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,YAAY,CAKlD"}