@mindfoldhq/trellis 0.1.9 → 0.2.1

package/dist/migrations/index.js

@@ -0,0 +1,124 @@
+/**
+ * Migration manifests for Trellis versions
+ *
+ * Each version's migrations are stored in separate JSON files under manifests/
+ * Format: manifests/{version}.json (e.g., manifests/0.1.9.json)
+ */
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const MANIFESTS_DIR = path.join(__dirname, "manifests");
+/**
+ * Cache for loaded manifests
+ */
+let manifestCache = null;
+/**
+ * Load all migration manifests from JSON files
+ */
+function loadManifests() {
+    if (manifestCache) {
+        return manifestCache;
+    }
+    const manifests = {};
+    // Check if manifests directory exists
+    if (!fs.existsSync(MANIFESTS_DIR)) {
+        manifestCache = manifests;
+        return manifests;
+    }
+    // Load all JSON files from manifests directory
+    const files = fs.readdirSync(MANIFESTS_DIR).filter((f) => f.endsWith(".json"));
+    for (const file of files) {
+        try {
+            const filePath = path.join(MANIFESTS_DIR, file);
+            const content = fs.readFileSync(filePath, "utf-8");
+            const manifest = JSON.parse(content);
+            // Use version from manifest as key
+            if (manifest.version) {
+                manifests[manifest.version] = manifest;
+            }
+        }
+        catch {
+            // Skip invalid manifest files
+            console.warn(`Warning: Failed to load migration manifest ${file}`);
+        }
+    }
+    manifestCache = manifests;
+    return manifests;
+}
+/**
+ * Compare two semver versions
+ * Returns: -1 if a < b, 0 if a == b, 1 if a > b
+ */
+function compareVersions(a, b) {
+    const parseVersion = (v) => v.split(".").map((n) => parseInt(n, 10) || 0);
+    const aParts = parseVersion(a);
+    const bParts = parseVersion(b);
+    const maxLen = Math.max(aParts.length, bParts.length);
+    for (let i = 0; i < maxLen; i++) {
+        const aVal = aParts[i] ?? 0;
+        const bVal = bParts[i] ?? 0;
+        if (aVal < bVal)
+            return -1;
+        if (aVal > bVal)
+            return 1;
+    }
+    return 0;
+}
+/**
+ * Get all migrations needed to upgrade from one version to another
+ *
+ * @param fromVersion - Current installed version
+ * @param toVersion - Target version to upgrade to
+ * @returns Array of migration items to apply, in version order
+ */
+export function getMigrationsForVersion(fromVersion, toVersion) {
+    const manifests = loadManifests();
+    // Get all versions that have migrations
+    const versions = Object.keys(manifests).sort(compareVersions);
+    // Filter to versions > fromVersion and <= toVersion
+    const applicableVersions = versions.filter((v) => {
+        const afterFrom = compareVersions(v, fromVersion) > 0;
+        const atOrBeforeTo = compareVersions(v, toVersion) <= 0;
+        return afterFrom && atOrBeforeTo;
+    });
+    // Collect all migrations from applicable versions
+    const allMigrations = [];
+    for (const version of applicableVersions) {
+        const manifest = manifests[version];
+        if (manifest) {
+            allMigrations.push(...manifest.migrations);
+        }
+    }
+    return allMigrations;
+}
+/**
+ * Check if there are any pending migrations between versions
+ */
+export function hasPendingMigrations(fromVersion, toVersion) {
+    return getMigrationsForVersion(fromVersion, toVersion).length > 0;
+}
+/**
+ * Get human-readable summary of pending migrations
+ */
+export function getMigrationSummary(fromVersion, toVersion) {
+    const migrations = getMigrationsForVersion(fromVersion, toVersion);
+    return {
+        renames: migrations.filter((m) => m.type === "rename").length,
+        deletes: migrations.filter((m) => m.type === "delete").length,
+    };
+}
+/**
+ * Get all registered migration versions
+ */
+export function getAllMigrationVersions() {
+    const manifests = loadManifests();
+    return Object.keys(manifests).sort(compareVersions);
+}
+/**
+ * Clear the manifest cache (useful for testing)
+ */
+export function clearManifestCache() {
+    manifestCache = null;
+}
+//# sourceMappingURL=index.js.map

package/dist/migrations/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/migrations/index.ts"],"names":[],"mappings":"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"}

package/dist/migrations/manifests/0.1.9.json

@@ -0,0 +1,30 @@
+{
+  "version": "0.1.9",
+  "description": "Rename deprecated command files",
+  "migrations": [
+    {
+      "type": "rename",
+      "from": ".claude/commands/onboard-developer.md",
+      "to": ".claude/commands/onboard.md",
+      "description": "Shortened onboard-developer to onboard"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/onboard-developer.md",
+      "to": ".cursor/commands/onboard.md",
+      "description": "Shortened onboard-developer to onboard"
+    },
+    {
+      "type": "rename",
+      "from": ".claude/commands/record-agent-flow.md",
+      "to": ".claude/commands/record-session.md",
+      "description": "Renamed record-agent-flow to record-session"
+    },
+    {
+      "type": "rename",
+      "from": ".cursor/commands/record-agent-flow.md",
+      "to": ".cursor/commands/record-session.md",
+      "description": "Renamed record-agent-flow to record-session"
+    }
+  ]
+}

package/dist/migrations/manifests/0.2.0.json

@@ -0,0 +1,43 @@
+{
+  "version": "0.2.0",
+  "description": "Comprehensive naming redesign for clarity",
+  "migrations": [
+    {
+      "type": "rename-dir",
+      "from": ".trellis/agent-traces",
+      "to": ".trellis/workspace",
+      "description": "Rename agent-traces to workspace (developer work records)"
+    },
+    {
+      "type": "rename-dir",
+      "from": ".trellis/structure",
+      "to": ".trellis/spec",
+      "description": "Rename structure to spec (development guidelines)"
+    },
+    {
+      "type": "rename-dir",
+      "from": ".trellis/backlog",
+      "to": ".trellis/tasks",
+      "description": "Rename backlog to tasks (unified task tracking)"
+    },
+    {
+      "type": "rename",
+      "from": ".trellis/scripts/feature.sh",
+      "to": ".trellis/scripts/task.sh",
+      "description": "Rename feature.sh to task.sh"
+    },
+    {
+      "type": "rename",
+      "from": ".trellis/scripts/common/backlog.sh",
+      "to": ".trellis/scripts/common/task-queue.sh",
+      "description": "Rename backlog.sh to task-queue.sh"
+    },
+    {
+      "type": "rename",
+      "from": ".trellis/scripts/common/feature-utils.sh",
+      "to": ".trellis/scripts/common/task-utils.sh",
+      "description": "Rename feature-utils.sh to task-utils.sh"
+    }
+  ],
+  "notes": "Complex migrations (features→tasks, traces→journal) require running scripts/migrate-features-to-tasks.sh"
+}

package/dist/templates/claude/agents/check.md

@@ -12,7 +12,7 @@ You are the Check Agent in the Trellis workflow.
 ## Context
 
 Before checking, read:
-- `.trellis/structure/` - Development guidelines
+- `.trellis/spec/` - Development guidelines
 - Pre-commit checklist for quality standards
 
 ## Core Responsibilities
@@ -41,7 +41,7 @@ git diff              # View specific changes
 
 ### Step 2: Check Against Specs
 
-Read relevant specs in `.trellis/structure/` to check code:
+Read relevant specs in `.trellis/spec/` to check code:
 
 - Does it follow directory structure conventions
 - Does it follow naming conventions
@@ -70,7 +70,7 @@ If failed, fix issues and re-run.
 **CRITICAL**: You are in a loop controlled by the Ralph Loop system.
 The loop will NOT stop until you output ALL required completion markers.
 
-Completion markers are generated from `check.jsonl` in the feature directory.
+Completion markers are generated from `check.jsonl` in the task directory.
 Each entry's `reason` field becomes a marker: `{REASON}_FINISH`
 
 For example, if check.jsonl contains:

package/dist/templates/claude/agents/debug.md

@@ -12,7 +12,7 @@ You are the Debug Agent in the Trellis workflow.
 ## Context
 
 Before debugging, read:
-- `.trellis/structure/` - Development guidelines
+- `.trellis/spec/` - Development guidelines
 - Error messages or issue descriptions provided
 
 ## Core Responsibilities

package/dist/templates/claude/agents/dispatch.md

@@ -11,13 +11,13 @@ You are the Dispatch Agent in the Multi-Agent Pipeline (pure dispatcher).
 
 ## Working Directory Convention
 
-Current Feature is specified by `.trellis/.current-feature` file, content is the relative path to feature directory.
+Current Task is specified by `.trellis/.current-task` file, content is the relative path to task directory.
 
-Feature directory path format: `.trellis/agent-traces/{developer}/features/{day}-{name}/`
+Task directory path format: `.trellis/workspace/{developer}/tasks/{MM}-{DD}-{name}/`
 
 This directory contains all context files for the current task:
 
-- `feature.json` - Task configuration
+- `task.json` - Task configuration
 - `prd.md` - Requirements document
 - `info.md` - Technical design (optional)
 - `implement.jsonl` - Implement context
@@ -35,19 +35,19 @@ This directory contains all context files for the current task:
 
 ## Startup Flow
 
-### Step 1: Determine Current Feature Directory
+### Step 1: Determine Current Task Directory
 
-Read `.trellis/.current-feature` to get current feature directory path:
+Read `.trellis/.current-task` to get current task directory path:
 
 ```bash
-FEATURE_DIR=$(cat .trellis/.current-feature)
-# e.g.: .trellis/agent-traces/taosu/features/12-my-feature
+TASK_DIR=$(cat .trellis/.current-task)
+# e.g.: .trellis/workspace/taosu/tasks/12-my-feature
 ```
 
 ### Step 2: Read Feature Configuration
 
 ```bash
-cat ${FEATURE_DIR}/feature.json
+cat ${TASK_DIR}/task.json
 ```
 
 Get the `next_action` array, which defines the list of phases to execute.
@@ -70,7 +70,7 @@ Execute each step in `phase` order.
 ```
 Task(
   subagent_type: "implement",
-  prompt: "Implement the feature described in prd.md in the feature directory",
+  prompt: "Implement the feature described in prd.md in the task directory",
   model: "opus",
   run_in_background: true
 )
@@ -108,7 +108,7 @@ Hook will auto-inject:
 ```
 Task(
   subagent_type: "debug",
-  prompt: "Fix the issues described in the feature context",
+  prompt: "Fix the issues described in the task context",
   model: "opus",
   run_in_background: true
 )
@@ -146,10 +146,10 @@ This action creates a Pull Request from the feature branch. Run it via Bash:
 ```
 
 This will:
-1. Stage and commit all changes (excluding agent-traces)
+1. Stage and commit all changes (excluding workspace)
 2. Push to origin
 3. Create a Draft PR using `gh pr create`
-4. Update feature.json with status="review", pr_url, and current_phase
+4. Update task.json with status="review", pr_url, and current_phase
 
 **Note**: This is the only action that performs git commit, as it's the final step after all implementation and checks are complete.
 

package/dist/templates/claude/agents/implement.md

@@ -13,13 +13,13 @@ You are the Implement Agent in the Trellis workflow.
 
 Before implementing, read:
 - `.trellis/workflow.md` - Project workflow
-- `.trellis/structure/` - Development guidelines
+- `.trellis/spec/` - Development guidelines
 - Feature `prd.md` - Requirements document
 - Feature `info.md` - Technical design (if exists)
 
 ## Core Responsibilities
 
-1. **Understand specs** - Read relevant spec files in `.trellis/structure/`
+1. **Understand specs** - Read relevant spec files in `.trellis/spec/`
 2. **Understand requirements** - Read prd.md and info.md
 3. **Implement features** - Write code following specs and design
 4. **Self-check** - Ensure code quality
@@ -41,13 +41,13 @@ Before implementing, read:
 
 Read relevant specs based on task type:
 
-- Backend: `.trellis/structure/backend/`
-- Frontend: `.trellis/structure/frontend/`
-- Shared: `.trellis/structure/shared/`
+- Backend: `.trellis/spec/backend/`
+- Frontend: `.trellis/spec/frontend/`
+- Shared: `.trellis/spec/shared/`
 
 ### 2. Understand Requirements
 
-Read the feature's prd.md and info.md:
+Read the task's prd.md and info.md:
 
 - What are the core requirements
 - Key points of technical design

package/dist/templates/claude/agents/plan.md

@@ -1,7 +1,7 @@
 ---
 name: plan
 description: |
-  Multi-Agent Pipeline planner. Analyzes requirements and produces a fully configured feature directory ready for dispatch.
+  Multi-Agent Pipeline planner. Analyzes requirements and produces a fully configured task directory ready for dispatch.
 tools: Read, Bash, Glob, Grep, Task
 model: opus
 ---
@@ -9,7 +9,7 @@ model: opus
 
 You are the Plan Agent in the Multi-Agent Pipeline.
 
-**Your job**: Evaluate requirements and, if valid, transform them into a fully configured feature directory.
+**Your job**: Evaluate requirements and, if valid, transform them into a fully configured task directory.
 
 **You have the power to reject** - If a requirement is unclear, incomplete, unreasonable, or potentially harmful, you MUST refuse to proceed and clean up.
 
@@ -52,15 +52,15 @@ PLAN_REQUIREMENT = <the requirement from environment>
 
 ### If Rejecting:
 
-1. **Update feature.json status to "rejected"**:
+1. **Update task.json status to "rejected"**:
    ```bash
-   jq '.status = "rejected"' "$PLAN_FEATURE_DIR/feature.json" > "$PLAN_FEATURE_DIR/feature.json.tmp" \
-     && mv "$PLAN_FEATURE_DIR/feature.json.tmp" "$PLAN_FEATURE_DIR/feature.json"
+   jq '.status = "rejected"' "$PLAN_TASK_DIR/task.json" > "$PLAN_TASK_DIR/task.json.tmp" \
+     && mv "$PLAN_TASK_DIR/task.json.tmp" "$PLAN_TASK_DIR/task.json"
    ```
 
 2. **Write rejection reason to a file** (so user can see it):
    ```bash
-   cat > "$PLAN_FEATURE_DIR/REJECTED.md" << 'EOF'
+   cat > "$PLAN_TASK_DIR/REJECTED.md" << 'EOF'
    # Plan Rejected
    
    ## Reason
@@ -76,7 +76,7 @@ PLAN_REQUIREMENT = <the requirement from environment>
    ## To Retry
    
    1. Delete this directory:
-      rm -rf $PLAN_FEATURE_DIR
+      rm -rf $PLAN_TASK_DIR
    
    2. Run with revised requirement:
       ./.trellis/scripts/multi-agent/plan.sh --name "<name>" --type "<type>" --requirement "<revised requirement>"
@@ -90,13 +90,13 @@ PLAN_REQUIREMENT = <the requirement from environment>
    Reason: <category>
    Details: <brief explanation>
    
-   See: $PLAN_FEATURE_DIR/REJECTED.md
+   See: $PLAN_TASK_DIR/REJECTED.md
    ```
 
 4. **Exit immediately** - Do not proceed to Step 1.
 
-**The feature directory is kept** with:
-- `feature.json` (status: "rejected")
+**The task directory is kept** with:
+- `task.json` (status: "rejected")
 - `REJECTED.md` (full explanation)
 - `.plan-log` (execution log)
 
@@ -117,28 +117,28 @@ Continue to Step 1. The requirement is:
 You receive input via environment variables (set by plan.sh):
 
 ```bash
-PLAN_FEATURE_NAME    # Feature name (e.g., "user-auth")
+PLAN_TASK_NAME    # Task name (e.g., "user-auth")
 PLAN_DEV_TYPE        # Development type: backend | frontend | fullstack
 PLAN_REQUIREMENT     # Requirement description from user
-PLAN_FEATURE_DIR     # Pre-created feature directory path
+PLAN_TASK_DIR     # Pre-created task directory path
 ```
 
 Read them at startup:
 
 ```bash
-echo "Feature: $PLAN_FEATURE_NAME"
+echo "Task: $PLAN_TASK_NAME"
 echo "Type: $PLAN_DEV_TYPE"
 echo "Requirement: $PLAN_REQUIREMENT"
-echo "Directory: $PLAN_FEATURE_DIR"
+echo "Directory: $PLAN_TASK_DIR"
 ```
 
 ## Output (if accepted)
 
-A complete feature directory containing:
+A complete task directory containing:
 
 ```
-${PLAN_FEATURE_DIR}/
-├── feature.json      # Updated with branch, scope, dev_type
+${PLAN_TASK_DIR}/
+├── task.json      # Updated with branch, scope, dev_type
 ├── prd.md            # Requirements document
 ├── implement.jsonl   # Implement phase context
 ├── check.jsonl       # Check phase context
@@ -152,7 +152,7 @@ ${PLAN_FEATURE_DIR}/
 ### Step 1: Initialize Context Files
 
 ```bash
-./.trellis/scripts/feature.sh init-context "$PLAN_FEATURE_DIR" "$PLAN_DEV_TYPE"
+./.trellis/scripts/task.sh init-context "$PLAN_TASK_DIR" "$PLAN_DEV_TYPE"
 ```
 
 This creates base jsonl files with standard specs for the dev type.
@@ -170,7 +170,7 @@ Task: ${PLAN_REQUIREMENT}
 Dev Type: ${PLAN_DEV_TYPE}
 
 Instructions:
-1. Search .trellis/structure/ for relevant spec files
+1. Search .trellis/spec/ for relevant spec files
 2. Search the codebase for related modules and patterns
 3. Identify files that should be added to jsonl context
 
@@ -201,13 +201,13 @@ Parse research agent output and add entries to jsonl files:
 
 ```bash
 # For each entry in implement.jsonl section:
-./.trellis/scripts/feature.sh add-context "$PLAN_FEATURE_DIR" implement "<path>" "<reason>"
+./.trellis/scripts/task.sh add-context "$PLAN_TASK_DIR" implement "<path>" "<reason>"
 
 # For each entry in check.jsonl section:
-./.trellis/scripts/feature.sh add-context "$PLAN_FEATURE_DIR" check "<path>" "<reason>"
+./.trellis/scripts/task.sh add-context "$PLAN_TASK_DIR" check "<path>" "<reason>"
 
 # For each entry in debug.jsonl section:
-./.trellis/scripts/feature.sh add-context "$PLAN_FEATURE_DIR" debug "<path>" "<reason>"
+./.trellis/scripts/task.sh add-context "$PLAN_TASK_DIR" debug "<path>" "<reason>"
 ```
 
 ### Step 4: Write prd.md
@@ -215,8 +215,8 @@ Parse research agent output and add entries to jsonl files:
 Create the requirements document:
 
 ```bash
-cat > "$PLAN_FEATURE_DIR/prd.md" << 'EOF'
-# Feature: ${PLAN_FEATURE_NAME}
+cat > "$PLAN_TASK_DIR/prd.md" << 'EOF'
+# Task: ${PLAN_TASK_NAME}
 
 ## Overview
 [Brief description of what this feature does]
@@ -249,21 +249,21 @@ EOF
 
 ```bash
 # Set branch name
-./.trellis/scripts/feature.sh set-branch "$PLAN_FEATURE_DIR" "feature/${PLAN_FEATURE_NAME}"
+./.trellis/scripts/task.sh set-branch "$PLAN_TASK_DIR" "feature/${PLAN_TASK_NAME}"
 
 # Set scope (from research agent suggestion)
-./.trellis/scripts/feature.sh set-scope "$PLAN_FEATURE_DIR" "<scope>"
+./.trellis/scripts/task.sh set-scope "$PLAN_TASK_DIR" "<scope>"
 
-# Update dev_type in feature.json
+# Update dev_type in task.json
 jq --arg type "$PLAN_DEV_TYPE" '.dev_type = $type' \
-  "$PLAN_FEATURE_DIR/feature.json" > "$PLAN_FEATURE_DIR/feature.json.tmp" \
-  && mv "$PLAN_FEATURE_DIR/feature.json.tmp" "$PLAN_FEATURE_DIR/feature.json"
+  "$PLAN_TASK_DIR/task.json" > "$PLAN_TASK_DIR/task.json.tmp" \
+  && mv "$PLAN_TASK_DIR/task.json.tmp" "$PLAN_TASK_DIR/task.json"
 ```
 
 ### Step 6: Validate Configuration
 
 ```bash
-./.trellis/scripts/feature.sh validate "$PLAN_FEATURE_DIR"
+./.trellis/scripts/task.sh validate "$PLAN_TASK_DIR"
 ```
 
 If validation fails, fix the invalid paths and re-validate.
@@ -274,15 +274,15 @@ Print a summary for the caller:
 
 ```bash
 echo "=== Plan Complete ==="
-echo "Feature Directory: $PLAN_FEATURE_DIR"
+echo "Task Directory: $PLAN_TASK_DIR"
 echo ""
 echo "Files created:"
-ls -la "$PLAN_FEATURE_DIR"
+ls -la "$PLAN_TASK_DIR"
 echo ""
 echo "Context summary:"
-./.trellis/scripts/feature.sh list-context "$PLAN_FEATURE_DIR"
+./.trellis/scripts/task.sh list-context "$PLAN_TASK_DIR"
 echo ""
-echo "Ready for: ./.trellis/scripts/multi-agent/start.sh $PLAN_FEATURE_DIR"
+echo "Ready for: ./.trellis/scripts/multi-agent/start.sh $PLAN_TASK_DIR"
 ```
 
 ---
@@ -328,15 +328,15 @@ If final validation fails:
 
 ```
 Input:
-  PLAN_FEATURE_NAME = "add-rate-limiting"
+  PLAN_TASK_NAME = "add-rate-limiting"
   PLAN_DEV_TYPE = "backend"
   PLAN_REQUIREMENT = "Add rate limiting to API endpoints using a sliding window algorithm. Limit to 100 requests per minute per IP. Return 429 status when exceeded."
 
 Result: ACCEPTED - Clear, specific, has defined behavior
 
 Output:
-  .trellis/agent-traces/xxx/features/17-add-rate-limiting/
-  ├── feature.json      # branch: feature/add-rate-limiting, scope: api
+  .trellis/workspace/xxx/tasks/17-add-rate-limiting/
+  ├── task.json      # branch: feature/add-rate-limiting, scope: api
   ├── prd.md            # Detailed requirements with acceptance criteria
   ├── implement.jsonl   # Backend specs + existing middleware patterns
   ├── check.jsonl       # Quality guidelines + API testing specs

package/dist/templates/claude/agents/research.md

@@ -94,7 +94,7 @@ Output structured results in report format.
 
 ### Related Spec Documents
 
-- `.trellis/structure/xxx.md` - {description}
+- `.trellis/spec/xxx.md` - {description}
 
 ### Not Found
 

package/dist/templates/claude/commands/before-backend-dev.md

@@ -1,12 +1,12 @@
 Read the backend development guidelines before starting your development task.
 
 Execute these steps:
-1. Read `.trellis/structure/backend/index.md` to understand available guidelines
+1. Read `.trellis/spec/backend/index.md` to understand available guidelines
 2. Based on your task, read the relevant guideline files:
-   - Database work → `.trellis/structure/backend/database-guidelines.md`
-   - Error handling → `.trellis/structure/backend/error-handling.md`
-   - Logging → `.trellis/structure/backend/logging-guidelines.md`
-   - Type questions → `.trellis/structure/backend/type-safety.md`
+   - Database work → `.trellis/spec/backend/database-guidelines.md`
+   - Error handling → `.trellis/spec/backend/error-handling.md`
+   - Logging → `.trellis/spec/backend/logging-guidelines.md`
+   - Type questions → `.trellis/spec/backend/type-safety.md`
 3. Understand the coding standards and patterns you need to follow
 4. Then proceed with your development plan
 

package/dist/templates/claude/commands/before-frontend-dev.md

@@ -1,12 +1,12 @@
 Read the frontend development guidelines before starting your development task.
 
 Execute these steps:
-1. Read `.trellis/structure/frontend/index.md` to understand available guidelines
+1. Read `.trellis/spec/frontend/index.md` to understand available guidelines
 2. Based on your task, read the relevant guideline files:
-   - Component work → `.trellis/structure/frontend/component-guidelines.md`
-   - Hook work → `.trellis/structure/frontend/hook-guidelines.md`
-   - State management → `.trellis/structure/frontend/state-management.md`
-   - Type questions → `.trellis/structure/frontend/type-safety.md`
+   - Component work → `.trellis/spec/frontend/component-guidelines.md`
+   - Hook work → `.trellis/spec/frontend/hook-guidelines.md`
+   - State management → `.trellis/spec/frontend/state-management.md`
+   - Type questions → `.trellis/spec/frontend/type-safety.md`
 3. Understand the coding standards and patterns you need to follow
 4. Then proceed with your development plan
 

package/dist/templates/claude/commands/break-loop.md

@@ -55,8 +55,8 @@ What broader problems does this bug reveal?
 
 Solidify insights into the system:
 
-- [ ] Update `.trellis/structure/guides/` thinking guides
-- [ ] Update `.trellis/structure/backend/` or `frontend/` docs
+- [ ] Update `.trellis/spec/guides/` thinking guides
+- [ ] Update `.trellis/spec/backend/` or `frontend/` docs
 - [ ] Create issue record (if applicable)
 - [ ] Create feature ticket for root fix
 - [ ] Update check commands if needed

package/dist/templates/claude/commands/check-backend.md

@@ -2,12 +2,12 @@ Check if the code you just wrote follows the backend development guidelines.
 
 Execute these steps:
 1. Run `git status` to see modified files
-2. Read `.trellis/structure/backend/index.md` to understand which guidelines apply
+2. Read `.trellis/spec/backend/index.md` to understand which guidelines apply
 3. Based on what you changed, read the relevant guideline files:
-   - Database changes → `.trellis/structure/backend/database-guidelines.md`
-   - Error handling → `.trellis/structure/backend/error-handling.md`
-   - Logging changes → `.trellis/structure/backend/logging-guidelines.md`
-   - Type changes → `.trellis/structure/backend/type-safety.md`
-   - Any changes → `.trellis/structure/backend/quality-guidelines.md`
+   - Database changes → `.trellis/spec/backend/database-guidelines.md`
+   - Error handling → `.trellis/spec/backend/error-handling.md`
+   - Logging changes → `.trellis/spec/backend/logging-guidelines.md`
+   - Type changes → `.trellis/spec/backend/type-safety.md`
+   - Any changes → `.trellis/spec/backend/quality-guidelines.md`
 4. Review your code against the guidelines
 5. Report any violations and fix them if found