@blxzer/cursor-trellis 0.2.8 → 0.3.0

package/dist/templates/common/skills/brainstorm.md

@@ -1,165 +1,189 @@
-# Trellis Brainstorm
-
-## Non-Negotiable Interview Contract
-
-Interview me relentlessly about every aspect of this plan until we reach a shared understanding. Walk down each branch of the design tree, resolving dependencies between decisions one-by-one. For each question, provide your recommended answer.
-
-Ask the questions one at a time.
-
-## Non-Negotiable Evidence Rule
-
-If a question can be answered by exploring the codebase, explore the codebase instead.
-
-This is mandatory. Before asking the user a question, first check whether the answer is already available in code, tests, configs, docs, existing specs, or task history.
-
-Do not ask the user to confirm facts that the repository can answer. Ask only for product intent, preference, scope, risk tolerance, or decisions that remain ambiguous after inspection.
-
----
-
-Use this skill during Phase 1 planning to turn the user's request into clear requirements and planning artifacts.
-
-**Agent-capable platforms:** Do **not** use legacy Claude-only grill subagents as a hard gate. Complete **PRD Grill** (below) and **`trellis-micro-grill`** for blocking open questions before treating planning as ready for `design.md` / `implement.md` / `start-execution --check`.
-
-## Preconditions
-
-Use this skill only after task-creation consent has been given and the user is ready to enter Trellis planning.
-
-If no task exists yet, create one:
-
-```bash
-TASK_DIR=$(python ./.trellis/scripts/task.py create "<short task title>" --slug <slug>)
-```
-
-Use a concise title from the user's request. Use a slug without a date prefix. `task.py create` adds the `MM-DD-` directory prefix automatically.
-
-`task.py create` creates the default `prd.md`. Update that file with the current understanding before asking follow-up questions.
-
-## Two-phase planning overview
-
-| Phase | Name | User questions |
-| --- | --- | --- |
-| **A** | Discovery Before Questions + PRD draft | None until repo evidence is exhausted |
-| **B** | PRD Grill pass + Micro-grill unresolved | Only blocking business / risk / preference |
-
-External facts during Discovery or Research: load `smart-search-cli`; on CLI/doctor failure use Cursor WebSearch/WebFetch and persist under `{TASK}/research/` with `source: cursor-web-fallback`.
-
----
-
-## Phase A — Discovery Before Questions
-
-Run **before** any user interview questions.
-
-Inspect and record in `prd.md` (sections: **Confirmed facts**, initial **Out of scope**, draft **Goal**):
-
-1. **Code & tests** — relevant modules, fixtures, configs, error paths.
-2. **Specs** — `.trellis/spec/` indexes and layer guides for touched packages.
-3. **History** — archived tasks, active task research, developer journal when useful.
-4. **Platform** — project platform hooks, agents, and skills (see `.trellis/spec/guides/cursor-subagent-policy.md` when using Cursor); shared `.agents/skills/` when behavior spans platforms.
-5. **Parent/Child** — if multiple independent deliverables, note child split early in `prd.md`.
-
-Use retrieval per `.trellis/spec/guides/retrieval-daily-guide.md` (rg for literals, codegraph for structure, fast-context for semantic sweep).
-
-Dispatch **`trellis-research`** (writable Agent) when a topic needs a dedicated `{TASK}/research/<topic>.md` file; do **not** use a subagent for PRD Grill itself.
-
-## Phase A — PRD draft
-
-After Discovery, flesh out `prd.md`:
-
-- goal and user value
-- confirmed facts (not restated as unverified requirements)
-- requirements
-- draft acceptance criteria
-- out of scope
-- open questions (tag **blocking** vs **nice-to-have**)
-
-For complex tasks, start `design.md` / `implement.md` skeletons only when boundaries are already clear from Discovery; otherwise wait until Phase B.
-
-## Phase B — PRD Grill pass
-
-Treat `prd.md` (+ existing `design.md` fragments) as the **only document surface**. Run this checklist; fix the PRD in place (no new subagent):
-
-| # | Check |
-| --- | --- |
-| 1 | **Goal & user value** — single clear statement |
-| 2 | **Confirmed facts vs assumptions** — repo facts not listed as assumptions |
-| 3 | **Testable acceptance criteria** |
-| 4 | **Out of scope** explicit |
-| 5 | **Dependencies & sequencing** |
-| 6 | **Parent/Child & deliverables** when applicable |
-| 7 | **Research & external facts** — smart-search or documented fallback |
-| 8 | **Execution gate & artifacts** — `design.md` / `implement.md` / `verify.md` expectations |
-| 9 | **Durable Learning** — Phase 3.3 will need `update-spec` \| `no-update` \| `unsure` |
-| 10 | **Platform** — Cursor-first; PRD Grill in-session (no legacy grill-me / grill-with-docs subagent gate) |
-| 11 | **Risk & rollback** for complex tasks |
-| 12 | **Open questions** — only **blocking** strategic/preference items remain |
-
-## Phase B — Micro-grill unresolved
-
-For each **blocking** open question after the checklist, embed the **`trellis-micro-grill` contract**:
-
-- exactly **one** question per message
-- **Simplified Chinese** for user-facing text
-- recommended answer + trade-off
-- **update `prd.md` after every answer** before the next question
-
-Stop micro-grill when no blocking open questions remain.
-
-Do not ask process questions ("should I search?"). Do not re-ask facts Discovery already confirmed.
-
-## Question Rules (Phase B only)
-
-Each question must include:
-
-- the decision needed
-- why the answer matters
-- your recommended answer
-- the trade-off if the user chooses differently
-
-## Artifact Rules
-
-`prd.md` records requirements and acceptance:
-
-- goal and user value
-- confirmed facts
-- requirements
-- acceptance criteria
-- out of scope
-- open questions that still block planning
-
-`design.md` records technical design for complex tasks:
-
-- architecture and boundaries
-- data flow and contracts
-- compatibility and migration notes
-- important trade-offs
-- operational or rollback considerations
-
-`implement.md` records execution planning for complex tasks:
-
-- ordered implementation checklist
-- validation commands
-- risky files or rollback points
-- **Development Strategy Contract** (`execution_mode`, `isolation`, …): before finalizing, run `python3 ./.trellis/scripts/task.py suggest-execution-strategy <task-dir>` (or `--json`); reconcile suggestion with scope, then paste the approved YAML block into `implement.md`
-- follow-up checks before `task.py start-execution --check`
-
-Lightweight tasks may have only `prd.md`. Complex tasks must have `prd.md`, `design.md`, and `implement.md` before `task.py start-execution --check`.
-
-`implement.md` is not a replacement for `implement.jsonl`. Use JSONL files only for manifest-style spec and research references when the task needs them.
-
-## Completion criteria — PRD Grill done
-
-Planning is ready for execution gate when **all** hold:
-
-- PRD Grill checklist (12 items) satisfied or explicitly N/A with rationale in `prd.md`
-- **No blocking** open questions in `prd.md`
-- Acceptance criteria are testable; out of scope is explicit
-- Complex tasks: `design.md` and `implement.md` present
-- User reviewed artifacts or explicitly approved proceeding
-
-Then proceed to Phase 1.2 Research (if needed), Phase 1.4 `task.py start-execution --check`, and implementation only after user approval.
-
-Do not start implementation until the user approves or asks for implementation.
-
-## Legacy planning flow (summary)
-
+# Trellis Brainstorm
+
+## Non-Negotiable Interview Contract
+
+Interview me relentlessly about every aspect of this plan until we reach a shared understanding. Walk down each branch of the design tree, resolving dependencies between decisions one-by-one. For each question, provide your recommended answer.
+
+Ask the questions one at a time.
+
+## Non-Negotiable Evidence Rule
+
+If a question can be answered by exploring the codebase, explore the codebase instead.
+
+This is mandatory. Before asking the user a question, first check whether the answer is already available in code, tests, configs, docs, existing specs, or task history.
+
+Do not ask the user to confirm facts that the repository can answer. Ask only for product intent, preference, scope, risk tolerance, or decisions that remain ambiguous after inspection.
+
+## Thinking Principles
+
+These two principles shape *how* you grill, not just *what* you ask. Apply them throughout Phase A and B.
+
+### First Principles
+
+Reason from irreducible facts and user value, not from analogy to existing solutions or "how it's always been done".
+
+- When you encounter a requirement phrased as "we need X like Y has", separate the **root need** (the user value behind X) from the **inherited assumption** (Y's specific shape).
+- For every "because that's the convention" justification, ask: what problem did that convention solve, and does that problem actually exist here?
+- Trace each requirement back to a user-facing outcome. If no outcome survives, the requirement is inherited, not fundamental — flag it as a candidate for Out of Scope.
+
+### Occam's Razor
+
+Among competing designs that satisfy the acceptance criteria, prefer the one with the fewest additional assumptions.
+
+- Default recommendation = the **minimal sufficient** design. Complexity must be justified by evidence (a contract, an edge case, a verified constraint), not added speculatively "for later".
+- Actively strip scope that exists only to satisfy an assumption you cannot verify from repo evidence.
+- When two paths are equally sufficient, the simpler one wins; the burden of proof is on the more complex path.
+
+---
+
+Use this skill during Phase 1 planning to turn the user's request into clear requirements and planning artifacts.
+
+**Agent-capable platforms:** Do **not** use legacy Claude-only grill subagents as a hard gate. Complete **PRD Grill** (below) and **`cstl-micro-grill`** for blocking open questions before treating planning as ready for `design.md` / `implement.md` / `start-execution --check`.
+
+## Preconditions
+
+Use this skill only after task-creation consent has been given and the user is ready to enter Trellis planning.
+
+If no task exists yet, create one:
+
+```bash
+TASK_DIR=$(python ./.trellis/scripts/task.py create "<short task title>" --slug <slug>)
+```
+
+Use a concise title from the user's request. Use a slug without a date prefix. `task.py create` adds the `MM-DD-` directory prefix automatically.
+
+`task.py create` creates the default `prd.md`. Update that file with the current understanding before asking follow-up questions.
+
+## Two-phase planning overview
+
+| Phase | Name | User questions |
+| --- | --- | --- |
+| **A** | Discovery Before Questions + PRD draft | None until repo evidence is exhausted |
+| **B** | PRD Grill pass + Micro-grill unresolved | Only blocking business / risk / preference |
+
+External facts during Discovery or Research: load `smart-search-cli`; on CLI/doctor failure use Cursor WebSearch/WebFetch and persist under `{TASK}/research/` with `source: cursor-web-fallback`.
+
+---
+
+## Phase A — Discovery Before Questions
+
+Run **before** any user interview questions.
+
+Inspect and record in `prd.md` (sections: **Confirmed facts**, initial **Out of scope**, draft **Goal**):
+
+1. **Code & tests** — relevant modules, fixtures, configs, error paths.
+2. **Specs** — `.trellis/spec/` indexes and layer guides for touched packages.
+3. **History** — archived tasks, active task research, developer journal when useful.
+4. **Platform** — project platform hooks, agents, and skills (see `.trellis/spec/guides/cursor-subagent-policy.md` when using Cursor); shared `.agents/skills/` when behavior spans platforms.
+5. **Parent/Child** — if multiple independent deliverables, note child split early in `prd.md`.
+
+Use retrieval per `.trellis/spec/guides/retrieval-daily-guide.md` (rg for literals, codegraph for structure, fast-context for semantic sweep).
+
+Dispatch **`cstl-research`** (writable Agent) when a topic needs a dedicated `{TASK}/research/<topic>.md` file; do **not** use a subagent for PRD Grill itself.
+
+## Phase A — PRD draft
+
+After Discovery, flesh out `prd.md`:
+
+- goal and user value
+- confirmed facts (not restated as unverified requirements)
+- requirements
+- draft acceptance criteria
+- out of scope
+- open questions (tag **blocking** vs **nice-to-have**)
+
+For complex tasks, start `design.md` / `implement.md` skeletons only when boundaries are already clear from Discovery; otherwise wait until Phase B.
+
+## Phase B — PRD Grill pass
+
+Treat `prd.md` (+ existing `design.md` fragments) as the **only document surface**. Run this checklist; fix the PRD in place (no new subagent):
+
+| # | Check |
+| --- | --- |
+| 1 | **Goal & user value** — single clear statement |
+| 2 | **Confirmed facts vs assumptions** — repo facts not listed as assumptions |
+| 3 | **Testable acceptance criteria** |
+| 4 | **Out of scope** explicit |
+| 5 | **Dependencies & sequencing** |
+| 6 | **Parent/Child & deliverables** when applicable |
+| 7 | **Research & external facts** — smart-search or documented fallback |
+| 8 | **Execution gate & artifacts** — `design.md` / `implement.md` / `verify.md` expectations |
+| 9 | **Durable Learning** — Phase 3.3 will need `update-spec` \| `no-update` \| `unsure` |
+| 10 | **Platform** — Cursor-first; PRD Grill in-session (no legacy grill-me / grill-with-docs subagent gate) |
+| 11 | **Risk & rollback** for complex tasks |
+| 12 | **Open questions** — only **blocking** strategic/preference items remain |
+| 13 | **Root vs inherited assumptions** — every requirement traces to a user-facing root need; inherited assumptions (convention, analogy, "we've always done it") are flagged or removed (First Principles) |
+| 14 | **Minimal sufficient design** — no scope, layer, or mechanism exists to satisfy an unverified assumption; the simplest design that meets acceptance wins (Occam's Razor) |
+
+## Phase B — Micro-grill unresolved
+
+For each **blocking** open question after the checklist, embed the **`cstl-micro-grill` contract**:
+
+- exactly **one** question per message
+- **Simplified Chinese** for user-facing text
+- recommended answer + trade-off
+- **update `prd.md` after every answer** before the next question
+
+Stop micro-grill when no blocking open questions remain.
+
+Do not ask process questions ("should I search?"). Do not re-ask facts Discovery already confirmed.
+
+## Question Rules (Phase B only)
+
+Each question must include:
+
+- the decision needed
+- why the answer matters
+- your recommended answer
+- the trade-off if the user chooses differently
+
+Your recommended answer defaults to Occam's Razor: the **minimal sufficient** option that still satisfies the acceptance criteria. Only recommend a more complex option when you can cite evidence (a contract, a verified edge case, a repo constraint) that the simpler option violates.
+
+## Artifact Rules
+
+`prd.md` records requirements and acceptance:
+
+- goal and user value
+- confirmed facts
+- requirements
+- acceptance criteria
+- out of scope
+- open questions that still block planning
+
+`design.md` records technical design for complex tasks:
+
+- architecture and boundaries
+- data flow and contracts
+- compatibility and migration notes
+- important trade-offs
+- operational or rollback considerations
+
+`implement.md` records execution planning for complex tasks:
+
+- ordered implementation checklist
+- validation commands
+- risky files or rollback points
+- **Development Strategy Contract** (`execution_mode`, `isolation`, …): before finalizing, run `python3 ./.trellis/scripts/task.py suggest-execution-strategy <task-dir>` (or `--json`); reconcile suggestion with scope, then paste the approved YAML block into `implement.md`
+- follow-up checks before `task.py start-execution --check`
+
+Lightweight tasks may have only `prd.md`. Complex tasks must have `prd.md`, `design.md`, and `implement.md` before `task.py start-execution --check`.
+
+`implement.md` is not a replacement for `implement.jsonl`. Use JSONL files only for manifest-style spec and research references when the task needs them.
+
+## Completion criteria — PRD Grill done
+
+Planning is ready for execution gate when **all** hold:
+
+- PRD Grill checklist (14 items) satisfied or explicitly N/A with rationale in `prd.md`
+- **No blocking** open questions in `prd.md`
+- Acceptance criteria are testable; out of scope is explicit
+- Complex tasks: `design.md` and `implement.md` present
+- User reviewed artifacts or explicitly approved proceeding
+
+Then proceed to Phase 1.2 Research (if needed), Phase 1.4 `task.py start-execution --check`, and implementation only after user approval.
+
+Do not start implementation until the user approves or asks for implementation.
+
+## Legacy planning flow (summary)
+
 The former single "Planning Flow" is now Phase A + B above. Steps 4–6 map to Phase B micro-grill and artifact updates.

package/dist/templates/common/skills/check.md

@@ -61,7 +61,7 @@ Run the project's lint, type-check, and test commands. Fix any failures before p
 
 ### Spec Sync
 
-- [ ] Does `.trellis/spec/` need updates? (route through semi-automatic flow: proposal → confirm → `trellis-update-spec`)
+- [ ] Does `.trellis/spec/` need updates? (route through semi-automatic flow: proposal → confirm → `cstl-update-spec`)
 
 > "If I fixed a bug or discovered something non-obvious, should I document it so future me won't hit the same issue?" → If YES, update the relevant spec doc.
 

package/dist/templates/cursor/agents/{trellis-check.md → cstl-check.md}

@@ -1,5 +1,5 @@
 ---
-name: trellis-check
+name: cstl-check
 description: Trellis quality check agent. Use this exact agent for Trellis task verification, check.jsonl context injection, and self-fixing code review. Do not use generic/default/generalPurpose agents for Trellis checks.
 tools: Read, Write, Edit, Bash, Glob, Grep, mcp__exa__web_search_exa, mcp__exa__get_code_context_exa
 ---
@@ -11,7 +11,7 @@ tools: Read, Write, Edit, Bash, Glob, Grep, mcp__exa__web_search_exa, mcp__exa__
 
 ## Context source
 
-- **Layer 2 prompt = PRIMARY (guaranteed)** — always generate via CLI before `Task(trellis-check)`.
+- **Layer 2 prompt = PRIMARY (guaranteed)** — always generate via CLI before `Task(cstl-check)`.
 - **Hook `additional_context` = best-effort only** — Cursor #158452: not guaranteed to reach the model; optimization / fallback only.
 
 # Check Agent
@@ -25,15 +25,15 @@ You are the Check Agent in the Trellis workflow.
 
 ## Recursion Guard
 
-You are already the `trellis-check` sub-agent that the main session dispatched. Do the review and fixes directly.
+You are already the `cstl-check` sub-agent that the main session dispatched. Do the review and fixes directly.
 
-- Do NOT spawn another `trellis-check` or `trellis-implement` sub-agent.
-- If SessionStart context, workflow-state breadcrumbs, or workflow.md say to dispatch `trellis-implement` / `trellis-check`, treat that as a main-session instruction that is already satisfied by your current role.
+- Do NOT spawn another `cstl-check` or `cstl-implement` sub-agent.
+- If SessionStart context, workflow-state breadcrumbs, or workflow.md say to dispatch `cstl-implement` / `cstl-check`, treat that as a main-session instruction that is already satisfied by your current role.
 - Only the main session may dispatch Trellis implement/check agents. If more implementation work is needed, report that recommendation instead of spawning.
 
 ## Trellis Context Loading Protocol
 
-Look for the `<!-- trellis-hook-injected -->` marker in your input above.
+Look for the `<!-- cstl-hook-injected -->` marker in your input above.
 
 - **If the marker is present**: task artifacts, spec, and research files have already been auto-loaded for you above. Proceed with the check work directly.
 - **If the marker is absent**: hook injection didn't fire (Windows + Claude Code, `--continue` resume, fork distribution, hooks disabled, etc.). Find the selected task path from your dispatch prompt's first line `Selected task: <path>`, then Read `<task-path>/check.jsonl`, each listed file, `<task-path>/prd.md`, `<task-path>/design.md` if present, and `<task-path>/implement.md` if present before doing the work.
@@ -41,8 +41,8 @@ Look for the `<!-- trellis-hook-injected -->` marker in your input above.
 ## Dispatch contract (Parent / inline)
 
 - Only the **main session or Parent** dispatches this agent; Child workers must not re-spawn Trellis sub-agents.
-- **Inline** (`in_progress-inline`): main session uses the `trellis-check` **skill** instead of spawning this agent unless a dedicated review pass is needed.
-- Align with the `trellis-check` skill: `get_context.py --mode packages`, spec indexes, cross-layer checks; you may fix issues and record gates — do not redefine Parent `task-map` or gate semantics.
+- **Inline** (`in_progress-inline`): main session uses the `cstl-check` **skill** instead of spawning this agent unless a dedicated review pass is needed.
+- Align with the `cstl-check` skill: `get_context.py --mode packages`, spec indexes, cross-layer checks; you may fix issues and record gates — do not redefine Parent `task-map` or gate semantics.
 
 ## Context
 

package/dist/templates/cursor/agents/{trellis-implement.md → cstl-implement.md}

@@ -1,5 +1,5 @@
 ---
-name: trellis-implement
+name: cstl-implement
 description: Trellis implementation agent. Use this exact agent for Trellis task implementation, implement.jsonl context injection, and hook-injection tests. Do not use generic/default/generalPurpose agents for Trellis implementation. No git commit allowed.
 tools: Read, Write, Edit, Bash, Glob, Grep, mcp__exa__web_search_exa, mcp__exa__get_code_context_exa
 ---
@@ -11,7 +11,7 @@ tools: Read, Write, Edit, Bash, Glob, Grep, mcp__exa__web_search_exa, mcp__exa__
 
 ## Context source
 
-- **Layer 2 prompt = PRIMARY (guaranteed)** — always generate via CLI before `Task(trellis-implement)`.
+- **Layer 2 prompt = PRIMARY (guaranteed)** — always generate via CLI before `Task(cstl-implement)`.
 - **Hook `additional_context` = best-effort only** — Cursor #158452: not guaranteed to reach the model; optimization / fallback only.
 
 # Implement Agent
@@ -21,19 +21,19 @@ You are the Implement Agent in the Trellis workflow.
 ## Model policy
 
 - **Default:** no `model:` → **inherit** parent session.
-- **Per dispatch / Child worker:** main session asks user → one-shot `model:` overlay on this file → `Task` → restore. Child session uses the same overlay pattern on `trellis-implement`. See `.trellis/spec/guides/cursor-subagent-policy.md`.
+- **Per dispatch / Child worker:** main session asks user → one-shot `model:` overlay on this file → `Task` → restore. Child session uses the same overlay pattern on `cstl-implement`. See `.trellis/spec/guides/cursor-subagent-policy.md`.
 
 ## Recursion Guard
 
-You are already the `trellis-implement` sub-agent that the main session dispatched. Do the implementation work directly.
+You are already the `cstl-implement` sub-agent that the main session dispatched. Do the implementation work directly.
 
-- Do NOT spawn another `trellis-implement` or `trellis-check` sub-agent.
-- If SessionStart context, workflow-state breadcrumbs, or workflow.md say to dispatch `trellis-implement` / `trellis-check`, treat that as a main-session instruction that is already satisfied by your current role.
+- Do NOT spawn another `cstl-implement` or `cstl-check` sub-agent.
+- If SessionStart context, workflow-state breadcrumbs, or workflow.md say to dispatch `cstl-implement` / `cstl-check`, treat that as a main-session instruction that is already satisfied by your current role.
 - Only the main session may dispatch Trellis implement/check agents. If more parallel work is needed, report that recommendation instead of spawning.
 
 ## Trellis Context Loading Protocol
 
-Look for the `<!-- trellis-hook-injected -->` marker in your input above.
+Look for the `<!-- cstl-hook-injected -->` marker in your input above.
 
 - **If the marker is present**: prd / spec / research files have already been auto-loaded for you above. Proceed with the implementation work directly.
 - **If the marker is absent**: hook injection didn't fire (Windows + Claude Code, `--continue` resume, fork distribution, hooks disabled, `/multitask` parallel dispatch, etc.). Find the selected task path from your dispatch prompt's first line `Selected task: <path>`, then Read `<task-path>/implement.jsonl`, each listed file, `<task-path>/prd.md`, `<task-path>/design.md` if present, and `<task-path>/implement.md` if present before doing the work.
@@ -41,7 +41,7 @@ Look for the `<!-- trellis-hook-injected -->` marker in your input above.
 ## Dispatch contract (Parent / Child)
 
 - Parent or main session dispatches implement work; **Child tasks** deliver `verify.md` + `handoff.md` and must not change shared gate contracts.
-- Do not spawn nested `trellis-implement` / `trellis-check`; recommend a Parent review when check is needed.
+- Do not spawn nested `cstl-implement` / `cstl-check`; recommend a Parent review when check is needed.
 
 ## Context
 

package/dist/templates/cursor/agents/{trellis-research.md → cstl-research.md}

@@ -1,5 +1,5 @@
 ---
-name: trellis-research
+name: cstl-research
 description: Trellis research agent. Use this exact agent for Trellis task research and research/ persistence. Do not use generic/default/generalPurpose agents for Trellis research.
 tools: Read, Write, Glob, Grep, Bash, WebSearch, WebFetch, mcp__exa__web_search_exa, mcp__exa__get_code_context_exa, Skill, mcp__chrome-devtools__*
 ---
@@ -11,7 +11,7 @@ tools: Read, Write, Glob, Grep, Bash, WebSearch, WebFetch, mcp__exa__web_search_
 
 ## Context source
 
-- **Layer 2 prompt = PRIMARY (guaranteed)** — always generate via CLI before `Task(trellis-research)`.
+- **Layer 2 prompt = PRIMARY (guaranteed)** — always generate via CLI before `Task(cstl-research)`.
 - **Hook `additional_context` = best-effort only** — Cursor #158452: not guaranteed to reach the model; optimization / fallback only.
 
 # Research Agent

package/dist/templates/cursor/commands/cursor2plus-setup.md

@@ -1,6 +1,6 @@
 # Trellis Cursor++ Subagent Model Setup
 
-Configure per-subagent-type model routing for Cursor++ BYOK. Run this after `trellis init` (when Cursor++ is selected), when providers change, or whenever you want to re-map which model each Trellis Task subagent uses.
+Configure per-subagent-type model routing for Cursor++ BYOK. Run this after `cstl init` (when Cursor++ is selected), when providers change, or whenever you want to re-map which model each Trellis Task subagent uses.
 
 Native Cursor API (no Cursor++): stop — this does not apply; agent frontmatter `model:` works natively.
 
@@ -24,7 +24,7 @@ python ./.trellis/local/cursor2plus/patch_wpelc8.py --explain
 `--list-models` shows the model catalog (apiModel / displayName / slug / provider) from `providers.json`.
 `--explain` lists the subagent types you can route:
 
-- `trellis-research`, `trellis-implement`, `trellis-check` (core Trellis roles)
+- `cstl-research`, `cstl-implement`, `cstl-check` (core Trellis roles)
 - `generalPurpose`, `shell`, `best-of-n-runner` (built-in Cursor Task types, optional)
 
 ## Step 3: Ask the user which model per role
@@ -42,9 +42,9 @@ Write `~/.ccursor/trellis-task-models.json5` (or `~/.ccursor/` on Unix) using th
 {
   "models": {
     // <role comment>
-    "trellis-research": { "primary": "<model>", "fallback": "<model>" },
-    "trellis-implement": { "primary": "<model>", "fallback": "<model>" },
-    "trellis-check": { "primary": "<model>", "fallback": "<model>" }
+    "cstl-research": { "primary": "<model>", "fallback": "<model>" },
+    "cstl-implement": { "primary": "<model>", "fallback": "<model>" },
+    "cstl-check": { "primary": "<model>", "fallback": "<model>" }
   }
 }
 ```

package/dist/templates/cursor/fixtures/expected-rules.d.ts

@@ -3,7 +3,7 @@
  * Update alongside rule content changes in templates/cursor/rules/.
  */
 export interface ExpectedRule {
-    /** Filename including .mdc extension, e.g. "trellis-triage.mdc" */
+    /** Filename including .mdc extension, e.g. "cstl-triage.mdc" */
     filename: string;
     /** Substrings that must appear in rule body (case-sensitive) */
     requiredSections: string[];

package/dist/templates/cursor/fixtures/expected-rules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expected-rules.d.ts","sourceRoot":"","sources":["../../../../src/templates/cursor/fixtures/expected-rules.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,YAAY;IAC3B,mEAAmE;IACnE,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,qDAAqD;IACrD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,aAAa,EAAE,YAAY,EAoBvC,CAAC"}
+{"version":3,"file":"expected-rules.d.ts","sourceRoot":"","sources":["../../../../src/templates/cursor/fixtures/expected-rules.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,YAAY;IAC3B,gEAAgE;IAChE,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,qDAAqD;IACrD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,aAAa,EAAE,YAAY,EAoBvC,CAAC"}

package/dist/templates/cursor/fixtures/expected-rules.js

@@ -4,7 +4,7 @@
  */
 export const expectedRules = [
     {
-        filename: "trellis-triage.mdc",
+        filename: "cstl-triage.mdc",
         requiredSections: [
             "Decision tree",
             "Classification mark",
@@ -13,7 +13,7 @@ export const expectedRules = [
         minBytes: 500,
     },
     {
-        filename: "trellis-subagent-dispatch.mdc",
+        filename: "cstl-subagent-dispatch.mdc",
         requiredSections: ["Layer 2", "generate_dispatch_prompt", "CLI"],
         minBytes: 400,
     },

package/dist/templates/cursor/fixtures/expected-rules.js.map

@@ -1 +1 @@
-{"version":3,"file":"expected-rules.js","sourceRoot":"","sources":["../../../../src/templates/cursor/fixtures/expected-rules.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,MAAM,CAAC,MAAM,aAAa,GAAmB;IAC3C;QACE,QAAQ,EAAE,oBAAoB;QAC9B,gBAAgB,EAAE;YAChB,eAAe;YACf,qBAAqB;YACrB,cAAc;SACf;QACD,QAAQ,EAAE,GAAG;KACd;IACD;QACE,QAAQ,EAAE,+BAA+B;QACzC,gBAAgB,EAAE,CAAC,SAAS,EAAE,0BAA0B,EAAE,KAAK,CAAC;QAChE,QAAQ,EAAE,GAAG;KACd;IACD;QACE,QAAQ,EAAE,uBAAuB;QACjC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC;QACjE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC"}
+{"version":3,"file":"expected-rules.js","sourceRoot":"","sources":["../../../../src/templates/cursor/fixtures/expected-rules.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,MAAM,CAAC,MAAM,aAAa,GAAmB;IAC3C;QACE,QAAQ,EAAE,iBAAiB;QAC3B,gBAAgB,EAAE;YAChB,eAAe;YACf,qBAAqB;YACrB,cAAc;SACf;QACD,QAAQ,EAAE,GAAG;KACd;IACD;QACE,QAAQ,EAAE,4BAA4B;QACtC,gBAAgB,EAAE,CAAC,SAAS,EAAE,0BAA0B,EAAE,KAAK,CAAC;QAChE,QAAQ,EAAE,GAAG;KACd;IACD;QACE,QAAQ,EAAE,uBAAuB;QACjC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC;QACjE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC"}

package/dist/templates/cursor/rules/{trellis-subagent-dispatch.mdc → cstl-subagent-dispatch.mdc}

@@ -9,7 +9,7 @@ alwaysApply: true
 
 ## Rule
 
-Before calling `Task(subagent_type="trellis-research|trellis-implement|trellis-check", ...)` you MUST:
+Before calling `Task(subagent_type="cstl-research|cstl-implement|cstl-check", ...)` you MUST:
 
 1. Generate a complete dispatch prompt via CLI:
 
@@ -31,4 +31,4 @@ If `--task` is omitted, the script resolves the currently selected task. If `--r
 
 ## Exception
 
-This rule does NOT apply to `generalPurpose`, `explore`, `shell`, or other non-Trellis subagent types. Only `trellis-research`, `trellis-implement`, `trellis-check` require CLI-generated prompts.
+This rule does NOT apply to `generalPurpose`, `explore`, `shell`, or other non-Trellis subagent types. Only `cstl-research`, `cstl-implement`, `cstl-check` require CLI-generated prompts.

package/dist/templates/cursor/rules/{trellis-triage.mdc → cstl-triage.mdc}

@@ -10,7 +10,7 @@ You MUST classify every work-capable user request BEFORE acting. This is not a s
 ## Decision tree (first match wins)
 
 1. **No durable project change** (explanation, status, read-only lookup, one-liner Q&A) → `No Task`
-2. **Underspecified small request, no task yet** (needs clarification before work exists) → `Micro-Grill` (load `trellis-micro-grill`)
+2. **Underspecified small request, no task yet** (needs clarification before work exists) → `Micro-Grill` (load `cstl-micro-grill`)
 3. **Low-risk durable work, single file, local validation, no contract change** → `Lite Task`
 4. **Durable code/template/runtime/workflow change, cross-file behavior, or framework semantics** → `Full Task`
 5. **Multiple independent deliverables, staged/parallel execution, or integration authority** → `Parent Task`

package/dist/templates/markdown/agents.md

@@ -10,19 +10,19 @@ This project is managed by Trellis. The working knowledge you need lives under `
 - `.trellis/workspace/` — per-developer journals and session traces
 - `.trellis/tasks/` — active and archived tasks (PRDs, research, jsonl context)
 
-If a Trellis command is available on Cursor (e.g. `/trellis:finish-work`, `/trellis:continue`), prefer it over manual steps.
+If a Trellis command is available on Cursor (e.g. `cstl-finish-work`, `cstl-continue`), prefer it over manual steps.
 
 ## Command surface (what is user-invocable vs internal)
 
 Only a handful of Trellis entry points are meant for **manual `/` invocation**. Everything else is an **internal auto-triggered skill** — the agent loads it via the skill matcher or workflow routing, not by being called directly. Do **not** manually invoke internal skills through the slash palette.
 
-- **User-invocable (manual)**: `/trellis-continue`, `/trellis-finish-work` (and `/trellis-start` when needed).
-- **Internal auto-triggered (do NOT call manually)**: `trellis-brainstorm`, `trellis-before-dev`, `trellis-check`, `trellis-break-loop`, `trellis-update-spec`, `trellis-micro-grill`, `trellis-meta`, `trellis-spec-bootstrap`, `trellis-skill-creator`, `smart-search-cli`. These activate on their own when the workflow/skill matcher decides they fit.
+- **User-invocable (manual)**: `cstl-continue`, `cstl-finish-work` (and `cstl-start` when needed).
+- **Internal auto-triggered (do NOT call manually)**: `cstl-brainstorm`, `cstl-before-dev`, `cstl-check`, `cstl-break-loop`, `cstl-update-spec`, `cstl-micro-grill`, `cstl-meta`, `cstl-spec-bootstrap`, `cstl-skill-creator`, `smart-search-cli`. These activate on their own when the workflow/skill matcher decides they fit.
 
 ## Web research routing (smart-search first)
 
 For **any external / current / web fact**, run **`python ./.trellis/scripts/run_smart_search.py "<question>" --intent deep-research --json`** first. That script is the **only** Trellis web-research evidence entrypoint (it shells out to the `smart-search` CLI). Do not guess paths under package source trees or sibling repos. Platform built-in web tools (Cursor `WebSearch` / `WebFetch`, or native web tools elsewhere) are **downgrade-only fallbacks**, used solely when smart-search is unavailable (`doctor` not ok, status `not_configured` / `failed`, or search timeout). Do not reach for built-in web search while smart-search is healthy. On Cursor, `smart-search-cli` is an **internal workflow skill name** only (not shipped under `.cursor/skills/`); follow `.trellis/spec/guides/retrieval-daily-guide.md` and `.cursor/rules/retrieval-routing.mdc` for the executable contract.
 
-Managed by Trellis. Edits outside this block are preserved; edits inside may be overwritten by a future `trellis update`.
+Managed by Trellis. Edits outside this block are preserved; edits inside may be overwritten by a future `cstl update`.
 
 <!-- TRELLIS:END -->