@blxzer/cursor-trellis 0.2.9 → 0.3.2

package/dist/templates/trellis/config.yaml

@@ -24,7 +24,7 @@ max_journal_lines: 2000
 # - false: scripts do not touch git. Files (journal-*.md, task archive moves)
 #   are still written to disk; you decide whether to git add / commit.
 #
-# Use `false` if your project's .gitignore intentionally excludes `.trellis/`
+# Use `false` if your project's .gitignore intentionally excludes `.cstl/`
 # and you want session data kept local-only, or if you prefer to review
 # staged changes manually before each commit.
 #
@@ -55,7 +55,7 @@ max_journal_lines: 2000
 #-------------------------------------------------------------------------------
 
 # Declare packages for monorepo projects.
-# Trellis auto-detects workspaces during `trellis init`, but you can also
+# Trellis auto-detects workspaces during `cstl init`, but you can also
 # configure them manually here.
 #
 # packages:
@@ -88,7 +88,7 @@ max_journal_lines: 2000
 #-------------------------------------------------------------------------------
 # Cursor subagent dispatch (documentation only — not Cursor product settings)
 #-------------------------------------------------------------------------------
-# See .trellis/spec/guides/cursor-subagent-policy.md
+# See .cstl/spec/guides/cursor-subagent-policy.md
 #
 # cursor:
 #   subagent_dispatch:
@@ -98,26 +98,6 @@ max_journal_lines: 2000
 #     mode: separate_writable_agent_session
 #     reuse_policy: true
 
-#-------------------------------------------------------------------------------
-# Channel worker OOM guard
-#-------------------------------------------------------------------------------
-# Default safeguards for `trellis channel spawn` workers. The guard runs
-# at spawn time (cleans expired idle workers, then enforces the live-worker
-# budget) and inside each supervisor (self-terminates a worker that stays
-# continuously idle past `idle_timeout`).
-#
-# Precedence: CLI flag > env var (TRELLIS_CHANNEL_WORKER_IDLE_TIMEOUT /
-# TRELLIS_CHANNEL_MAX_LIVE_WORKERS) > this config > built-in default.
-#
-# `idle_timeout: 0` disables idle cleanup (workers can sit idle forever
-# unless explicitly killed or given `--timeout`).
-# `max_live_workers: 0` disables the spawn-time budget check.
-#
-channel:
-  worker_guard:
-    idle_timeout: 5m
-    max_live_workers: 6
-
 #-------------------------------------------------------------------------------
 # Codex (dispatch behavior)
 #-------------------------------------------------------------------------------
@@ -125,8 +105,8 @@ channel:
 # main Codex agent edit code directly because Codex sub-agents run with
 # `fork_turns="none"` isolation and can't inherit the parent session's
 # task context. Set to "sub-agent" to opt into the legacy dispatch model
-# (main agent spawns trellis-implement / trellis-check / trellis-research
+# (main agent spawns cstl-implement / cstl-check / cstl-research
 # sub-agents).
 #
 # codex:
-#   dispatch_mode: inline  # or "sub-agent" to dispatch trellis-* sub-agents
+#   dispatch_mode: inline  # or "sub-agent" to dispatch cstl-* sub-agents

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

@@ -2,7 +2,7 @@
  * Trellis workflow templates
  *
  * These are GENERIC templates for user projects.
- * Do NOT use Trellis project's own .trellis/ directory (which may be customized).
+ * Do NOT use Trellis project's own .cstl/ directory (which may be customized).
  *
  * Directory structure:
  *   trellis/
@@ -80,7 +80,7 @@ export declare const workflowMdTemplate: string;
 export declare const configYamlTemplate: string;
 export declare const gitignoreTemplate: string;
 /**
- * Optional task artifact templates (under `.trellis/tasks/templates/`).
+ * Optional task artifact templates (under `.cstl/tasks/templates/`).
  * Not applied by `task.py create`; copy into a new task directory when starting
  * release-readiness or release-execution work.
  */

package/dist/templates/trellis/index.js

@@ -2,7 +2,7 @@
  * Trellis workflow templates
  *
  * These are GENERIC templates for user projects.
- * Do NOT use Trellis project's own .trellis/ directory (which may be customized).
+ * Do NOT use Trellis project's own .cstl/ directory (which may be customized).
  *
  * Directory structure:
  *   trellis/
@@ -107,7 +107,7 @@ function readTaskTemplate(relativePath) {
     return readTemplate(join("tasks", "templates", relativePath));
 }
 /**
- * Optional task artifact templates (under `.trellis/tasks/templates/`).
+ * Optional task artifact templates (under `.cstl/tasks/templates/`).
  * Not applied by `task.py create`; copy into a new task directory when starting
  * release-readiness or release-execution work.
  */

package/dist/templates/trellis/local/README.md

@@ -1,8 +1,10 @@
 # Cursor++ Local Bundle
 
-> **Native Cursor users:** safe to ignore or delete this directory unless using **Cursor++ BYOK**.
+> **Native Cursor users:** safe to ignore or delete this directory unless using **Cursor++ BYOK** on **this repo**.
 
-**Who needs this:** Cursor IDE with [Cursor++](https://ccursor.cometix.dev) (BYOK proxy). Method 2.5 patches the `WPeLc8` resolver so Trellis Task subagents get per-role BYOK slugs instead of inheriting the parent model.
+**Coexistence:** Native and BYOK can run on the same machine across different projects. This bundle is **per-repo** (`cstl init --cursor --cursor2plus`); sibling repos may use `cstl init --cursor` only. Full guide: cursor-trellis `docs/cursor.md` — section *Native and BYOK coexistence (not either/or)*.
+
+**Who needs this:** Cursor IDE with [Cursor++](https://ccursor.cometix.dev) (BYOK proxy). Method 2.5 patches the Cursor++ task model resolver (historically located via `WPeLc8` in verified builds) so Trellis Task subagents get per-role BYOK slugs instead of inheriting the parent model. **After any Cursor or Cursor++ upgrade**, run `python patch_wpelc8.py --check-compat` before re-applying.
 
 ## Bundle files
 
@@ -18,7 +20,7 @@ User-wide model doc: `~/.ccursor/trellis-task-models.json5` (see `../trellis-tas
 
 ## Compatibility window
 
-- **Verified:** Cursor **3.7.27** / Cursor++ **v0.0.11** (see `.trellis/spec/guides/cursor-subagent-policy.md`, 2026-06-18)
+- **Verified:** Cursor **3.7.27** / Cursor++ **v0.0.11** (see `.cstl/spec/guides/cursor-subagent-policy.md`, 2026-06-18)
 - **Re-verify** after any Cursor or Cursor++ upgrade: `python patch_wpelc8.py --check-compat`
 - If `--check-compat` reports `fail` or `unknown`, treat the patch as stale until you re-apply or revert
 
@@ -28,15 +30,15 @@ User-wide model doc: `~/.ccursor/trellis-task-models.json5` (see `../trellis-tas
 2. **Operator approval** — review map and compat output; decide to proceed
 3. **Apply** — `python patch_wpelc8.py --apply --approve` (writes `extension.js`)
 4. **Reload Cursor** — Developer: Reload Window (once per apply/revert)
-5. **A ≠ B probe** — parent chat model must differ from a patched subagent map target; dispatch a `trellis-*` Task and confirm the subagent self-reports the **map target** slug/model, not the parent
+5. **A ≠ B probe** — parent chat model must differ from a patched subagent map target; dispatch a `cstl-*` Task and confirm the subagent self-reports the **map target** slug/model, not the parent
 6. **Revert if needed** — `python patch_wpelc8.py --revert` then Reload Window
 
-Agent-led setup: run skill **`trellis-cursor2plus-setup`** in Cursor Agent (lists models, writes JSON5, runs patch steps).
+Agent-led setup: run skill **`cstl-cursor2plus-setup`** in Cursor Agent (lists models, writes JSON5, runs patch steps).
 
 ## Revert recipe
 
 ```bash
-cd .trellis/local/cursor2plus
+cd .cstl/local/cursor2plus
 python patch_wpelc8.py --revert
 ```
 
@@ -47,10 +49,10 @@ Then **Developer: Reload Window**. Subagents return to **inherit parent** BYOK m
 Goal: prove the patch routes **subagent** model independently of the **parent** session model.
 
 1. Set parent chat to model **A** (any BYOK model in Cursor++).
-2. Ensure `trellis-task-models.json5` maps e.g. `trellis-implement` to model **B** (`primary`/`fallback` resolving to a different slug than A).
-3. `python patch_wpelc8.py --print-map` — note the slug for `trellis-implement` (= map target **B**).
+2. Ensure `trellis-task-models.json5` maps e.g. `cstl-implement` to model **B** (`primary`/`fallback` resolving to a different slug than A).
+3. `python patch_wpelc8.py --print-map` — note the slug for `cstl-implement` (= map target **B**).
 4. `python patch_wpelc8.py --apply --approve` → Reload Window.
-5. Dispatch a `trellis-implement` Task from a parent on model **A**.
+5. Dispatch a `cstl-implement` Task from a parent on model **A**.
 6. **Pass:** subagent self-report / trace shows **B** (map target), not **A**.
 7. **Fail:** subagent shows **A** → patch stale or not applied; run `--check-compat`, re-patch, or `--revert`.
 
@@ -73,11 +75,11 @@ python smoke.py                             # env + patch_status smoke
 
 | JSON key (under `models`) | Meaning |
 |---------------------------|---------|
-| `trellis-research` | Trellis research Task subagent |
-| `trellis-implement` | Trellis implement (+ Parent/Child default Task) |
-| `trellis-check` | Trellis check Task subagent |
+| `cstl-research` | Trellis research Task subagent |
+| `cstl-implement` | Trellis implement (+ Parent/Child default Task) |
+| `cstl-check` | Trellis check Task subagent |
 | `generalPurpose` / `shell` / `best-of-n-runner` | Cursor built-in Task types |
 
 Each role: `{ "primary": "<name>", "fallback": "<name>" }`. Names: **apiModel** or **displayName** from Cursor++ (`--list-models`). **Explore** is not in this file — use the Cursor++ panel.
 
-Policy: `.trellis/spec/guides/cursor-subagent-policy.md` (Method 2.5 / 2.6).
+Policy: `.cstl/spec/guides/cursor-subagent-policy.md` (Method 2.5 / 2.6).

package/dist/templates/trellis/local/patch_wpelc8.py

@@ -23,7 +23,7 @@ INJECT_NEEDLE = "});return!UbAQWn||"
 def _repo_root(start: Path) -> Path:
     cur = start.resolve()
     for _ in range(12):
-        if (cur / ".trellis").is_dir():
+        if (cur / ".cstl").is_dir():
             return cur
         if cur.parent == cur:
             break
@@ -94,8 +94,8 @@ def resolve_project_models_path(bundle_dir: Path, config: dict) -> Path | None:
         p = Path(config["projectModelsJson"].strip()).expanduser()
         return p if p.is_file() else None
     return _first_existing(
-        root / ".trellis" / "local" / "subagent-models.json5",
-        root / ".trellis" / "local" / "subagent-models.json",
+        root / ".cstl" / "local" / "subagent-models.json5",
+        root / ".cstl" / "local" / "subagent-models.json",
     )
 
 
@@ -166,8 +166,8 @@ def try_resolve_extension_js(bundle_dir: Path, config: dict) -> Path | None:
 def build_inject_block(model_map: dict[str, str]) -> str:
     if not model_map:
         raise SystemExit(
-            "model map empty — use skill trellis-cursor2plus-setup or write "
-            "~/.ccursor/trellis-task-models.json5 (see .trellis/local/trellis-task-models.json5.example)"
+            "model map empty — use skill cstl-cursor2plus-setup or write "
+            "~/.ccursor/trellis-task-models.json5 (see .cstl/local/trellis-task-models.json5.example)"
         )
     pairs = ",".join(f'"{k}":"{v}"' for k, v in sorted(model_map.items()))
     return (
@@ -240,7 +240,7 @@ def cmd_explain() -> None:
         print(f"  {key}")
         print(f"    → {SUBAGENT_TYPE_HELP.get(key, '')}")
     print()
-    print("Skill: trellis-cursor2plus-setup (init 后与大模型交互完成配置)")
+    print("Skill: cstl-cursor2plus-setup (init 后与大模型交互完成配置)")
 
 
 def cmd_list_models(providers_path: Path) -> None:
@@ -272,7 +272,7 @@ def cmd_bootstrap(bundle_dir: Path) -> None:
             config["extensionJs"] = path
     cfg_out.write_text(json.dumps(config, indent=2) + "\n", encoding="utf-8")
     print("wrote", cfg_out)
-    print("Next: in Cursor Agent, run skill trellis-cursor2plus-setup", file=sys.stderr)
+    print("Next: in Cursor Agent, run skill cstl-cursor2plus-setup", file=sys.stderr)
 
 
 def cmd_check_compat(bundle_dir: Path, config: dict) -> int:

package/dist/templates/trellis/local/subagent-models.json.example

@@ -1,4 +1,4 @@
 {
   "_comment": "Optional repo overrides (~/.ccursor/trellis-task-models.json is user-wide). Same value rules: apiModel, displayName, or model-xxxxx slug. Project wins on same key.",
-  "trellis-implement": "qwen3.6-plus"
+  "cstl-implement": "qwen3.6-plus"
 }

package/dist/templates/trellis/local/trellis-task-models.json.example

@@ -1,9 +1,9 @@
 {
   "_comment": "Copy to ~/.ccursor/trellis-task-models.json (Windows: %USERPROFILE%\\.ccursor\\). Values: use apiModel or displayName from Cursor++ — patch_wpelc8.py resolves to slug at patch time. Optional keys: omit types you do not use.",
   "_when_providers_change": "Run: python patch_wpelc8.py --list-models then fix this file and patch again.",
-  "trellis-research": "glm-5.1",
-  "trellis-implement": "qwen3.6-plus",
-  "trellis-check": "qwen3.7-max",
+  "cstl-research": "glm-5.1",
+  "cstl-implement": "qwen3.6-plus",
+  "cstl-check": "qwen3.7-max",
   "generalPurpose": "gpt-5.5",
   "shell": "grok-composer-2.5-fast",
   "best-of-n-runner": "kimi-k2.7-code"

package/dist/templates/trellis/local/trellis-task-models.json5.example

@@ -10,20 +10,20 @@
 
 {
   "models": {
-    // Trellis 调研（Task trellis-research）
-    "trellis-research": {
+    // Trellis 调研（Task cstl-research）
+    "cstl-research": {
       "primary": "glm-5.1",
       "fallback": "qwen3.7-max"
     },
 
     // Trellis 实现；Parent generate-child-prompt --mode subagent 默认派发此类型
-    "trellis-implement": {
+    "cstl-implement": {
       "primary": "qwen3.6-plus",
       "fallback": "kimi-k2.7-code"
     },
 
-    // Trellis 验收（Task trellis-check）
-    "trellis-check": {
+    // Trellis 验收（Task cstl-check）
+    "cstl-check": {
       "primary": "qwen3.7-max",
       "fallback": "glm-5.1"
     },

package/dist/templates/trellis/local/trellis_task_models_config.py

@@ -6,18 +6,18 @@ from pathlib import Path
 from typing import Any
 
 KNOWN_SUBAGENT_TYPES = (
-    "trellis-research",
-    "trellis-implement",
-    "trellis-check",
+    "cstl-research",
+    "cstl-implement",
+    "cstl-check",
     "generalPurpose",
     "shell",
     "best-of-n-runner",
 )
 
 SUBAGENT_TYPE_HELP: dict[str, str] = {
-    "trellis-research": "Trellis 调研 Task（trellis-research）",
-    "trellis-implement": "Trellis 实现 Task；Parent/Child 默认派发类型",
-    "trellis-check": "Trellis 验收 Task（trellis-check）",
+    "cstl-research": "Trellis 调研 Task（cstl-research）",
+    "cstl-implement": "Trellis 实现 Task；Parent/Child 默认派发类型",
+    "cstl-check": "Trellis 验收 Task（cstl-check）",
     "generalPurpose": "Cursor 内置 Task：generalPurpose",
     "shell": "Cursor 内置 Task：shell",
     "best-of-n-runner": "Cursor 内置 Task：best-of-n-runner",

package/dist/templates/trellis/scripts/add_session.py

@@ -12,11 +12,11 @@ Usage:
     <session content here>
     EOF
 
-Branch resolution order:
-    1. --branch CLI arg (explicit)
-    2. task.json branch field (from selected task)
-    3. git branch --show-current (auto-detect)
-    4. None (omitted gracefully)
+Branch resolution order:
+    1. --branch CLI arg (explicit)
+    2. task.json branch field (from selected task)
+    3. git branch --show-current (auto-detect)
+    4. None (omitted gracefully)
 """
 
 from __future__ import annotations
@@ -28,12 +28,12 @@ from datetime import datetime
 from pathlib import Path
 
 from common.paths import (
-    FILE_JOURNAL_PREFIX,
-    get_repo_root,
-    get_selected_task,
-    get_developer,
-    get_workspace_dir,
-)
+    FILE_JOURNAL_PREFIX,
+    get_repo_root,
+    get_selected_task,
+    get_developer,
+    get_workspace_dir,
+)
 from common.developer import ensure_developer
 from common.git import run_git
 from common.safe_commit import (
@@ -322,11 +322,11 @@ def _auto_commit_workspace(repo_root: Path) -> None:
     """Stage Trellis-owned workspace + task paths and commit.
 
     Path scope is restricted to specific products (journal files, index.md,
-    selected task dirs, the archive subtree). We never `git add` the whole
-    `.trellis/` tree, and if `.gitignore` blocks the specific paths we
+    selected task dirs, the archive subtree). We never `git add` the whole
+    `.cstl/` tree, and if `.gitignore` blocks the specific paths we
     warn + skip — never retry with ``-f``.
 
-    Honors ``session_auto_commit`` in ``.trellis/config.yaml``: when set to
+    Honors ``session_auto_commit`` in ``.cstl/config.yaml``: when set to
     ``false``, this function returns immediately without touching git
     (journal/index files are still written to disk by the caller).
     """
@@ -502,10 +502,10 @@ def main() -> int:
     elif args.stdin:
         extra_content = sys.stdin.read()
 
-    # Load selected task once — shared by package and branch resolution
-    repo_root = get_repo_root()
-    selected = get_selected_task(repo_root)
-    task_data = load_task(repo_root / selected) if selected else None
+    # Load selected task once — shared by package and branch resolution
+    repo_root = get_repo_root()
+    selected = get_selected_task(repo_root)
+    task_data = load_task(repo_root / selected) if selected else None
 
     package = args.package
     if package:
@@ -519,8 +519,8 @@ def main() -> int:
             print(f"Error: unknown package '{package}'. Available: {available}", file=sys.stderr)
             return 1
     else:
-        # Inferred: selected task's task.json.package → default_package → None
-        task_package = task_data.package if task_data else None
+        # Inferred: selected task's task.json.package → default_package → None
+        task_package = task_data.package if task_data else None
         package = resolve_package(task_package, repo_root)
 
     # Resolve branch: CLI → task.json → git auto-detect → None

package/dist/templates/trellis/scripts/common/active_task.py

@@ -2,7 +2,7 @@
 """Session-scoped selected task resolution.
 
 The user-facing concept is a live-session "selected task". Trellis stores that
-pointer per AI session/window under `.trellis/.runtime/sessions/`; without a
+pointer per AI session/window under `.cstl/.runtime/sessions/`; without a
 stable session key there is no selected task.
 """
 
@@ -19,7 +19,7 @@ from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any
 
-DIR_WORKFLOW = ".trellis"
+DIR_WORKFLOW = ".cstl"
 DIR_TASKS = "tasks"
 DIR_RUNTIME = ".runtime"
 DIR_SESSIONS = "sessions"