@blxzer/cursor-trellis 0.4.1 → 0.4.3

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

@@ -1,421 +0,0 @@
-"""Trellis: reversible Cursor++ WPeLc8 subagent model map (BYOK). See README.md."""
-from __future__ import annotations
-
-import argparse
-import json
-import os
-import sys
-from pathlib import Path
-
-from trellis_task_models_config import (
-    KNOWN_SUBAGENT_TYPES,
-    SUBAGENT_TYPE_HELP,
-    extract_raw_slots,
-    load_providers_catalog,
-    load_task_models_document,
-    resolve_slots_to_slugs,
-)
-
-MARKER = "/*TRELLIS_B2_WPeLc8*/"
-INJECT_NEEDLE = "});return!UbAQWn||"
-
-
-def _repo_root(start: Path) -> Path:
-    cur = start.resolve()
-    for _ in range(12):
-        if (cur / ".cstl").is_dir():
-            return cur
-        if cur.parent == cur:
-            break
-        cur = cur.parent
-    return start.resolve()
-
-
-def _merge_slot_maps(*layers: dict[str, list[str]]) -> dict[str, list[str]]:
-    merged: dict[str, list[str]] = {}
-    for layer in layers:
-        for k, v in layer.items():
-            merged[k] = list(v)
-    return merged
-
-
-def _ccursor_home(config: dict) -> Path:
-    for key in ("ccursorHome", "ccursor_home"):
-        if isinstance(config.get(key), str) and config[key].strip():
-            return Path(config[key].strip()).expanduser()
-    env = os.environ.get("TRELLIS_CCURSOR_HOME", "").strip()
-    if env:
-        return Path(env).expanduser()
-    return Path.home() / ".ccursor"
-
-
-def _load_config(bundle_dir: Path) -> dict:
-    cfg_path = bundle_dir / "config.local.json"
-    if not cfg_path.is_file():
-        return {}
-    try:
-        data = json.loads(cfg_path.read_text(encoding="utf-8"))
-        return data if isinstance(data, dict) else {}
-    except (OSError, json.JSONDecodeError):
-        return {}
-
-
-def resolve_providers_json(config: dict) -> Path:
-    for key in ("providersJson", "providers_json"):
-        if isinstance(config.get(key), str) and config[key].strip():
-            return Path(config[key].strip()).expanduser()
-    env = os.environ.get("TRELLIS_CCURSOR_PROVIDERS", "").strip()
-    if env:
-        return Path(env).expanduser()
-    return _ccursor_home(config) / "providers.json"
-
-
-def _first_existing(*paths: Path) -> Path | None:
-    for p in paths:
-        if p.is_file():
-            return p
-    return None
-
-
-def resolve_user_models_path(config: dict) -> Path:
-    ccursor = _ccursor_home(config)
-    if isinstance(config.get("userModelsJson"), str) and config["userModelsJson"].strip():
-        return Path(config["userModelsJson"].strip()).expanduser()
-    found = _first_existing(
-        ccursor / "trellis-task-models.json5",
-        ccursor / "trellis-task-models.json",
-    )
-    return found or (ccursor / "trellis-task-models.json5")
-
-
-def resolve_project_models_path(bundle_dir: Path, config: dict) -> Path | None:
-    root = _repo_root(bundle_dir)
-    if isinstance(config.get("projectModelsJson"), str) and config["projectModelsJson"].strip():
-        p = Path(config["projectModelsJson"].strip()).expanduser()
-        return p if p.is_file() else None
-    return _first_existing(
-        root / ".cstl" / "local" / "subagent-models.json5",
-        root / ".cstl" / "local" / "subagent-models.json",
-    )
-
-
-def resolve_model_layers(bundle_dir: Path, config: dict, providers_path: Path) -> tuple[dict[str, str], list[str]]:
-    user_path = resolve_user_models_path(config)
-    project_path = resolve_project_models_path(bundle_dir, config)
-    user_slots = extract_raw_slots(load_task_models_document(user_path))
-    project_slots = (
-        extract_raw_slots(load_task_models_document(project_path))
-        if project_path
-        else {}
-    )
-    merged = _merge_slot_maps(user_slots, project_slots)
-    return resolve_slots_to_slugs(merged, providers_path)
-
-
-def configured_slot_map(bundle_dir: Path, config: dict) -> dict[str, list[str]]:
-    """Non-secret role → [primary, fallback, …] from JSON5 only (no providers.json read)."""
-    user_path = resolve_user_models_path(config)
-    project_path = resolve_project_models_path(bundle_dir, config)
-    user_slots = extract_raw_slots(load_task_models_document(user_path))
-    project_slots = (
-        extract_raw_slots(load_task_models_document(project_path))
-        if project_path
-        else {}
-    )
-    return _merge_slot_maps(user_slots, project_slots)
-
-
-def _extension_candidates(config: dict) -> list[Path]:
-    for key in ("extensionJs", "extension_js"):
-        if isinstance(config.get(key), str) and config[key].strip():
-            return [Path(config[key].strip()).expanduser()]
-    env = os.environ.get("TRELLIS_CURSOR2PLUS_EXTENSION", "").strip()
-    if env:
-        return [Path(env).expanduser()]
-    if sys.platform == "win32":
-        local = os.environ.get("LOCALAPPDATA", "")
-        return [
-            Path(local) / "Programs" / "cursor" / "resources" / "app" / "extensions" / "cursor2plus" / "dist" / "extension.js",
-            Path(r"D:\cursor\resources\app\extensions\cursor2plus\dist\extension.js"),
-        ]
-    if sys.platform == "darwin":
-        return [
-            Path("/Applications/Cursor.app/Contents/Resources/app/extensions/cursor2plus/dist/extension.js"),
-        ]
-    return [
-        Path.home() / ".local" / "share" / "cursor" / "resources" / "app" / "extensions" / "cursor2plus" / "dist" / "extension.js",
-    ]
-
-
-def resolve_extension_js(bundle_dir: Path, config: dict) -> Path:
-    for c in _extension_candidates(config):
-        if c.is_file():
-            return c
-    raise SystemExit(
-        "extension.js not found. Set extensionJs in config.local.json or run --bootstrap"
-    )
-
-
-def try_resolve_extension_js(bundle_dir: Path, config: dict) -> Path | None:
-    for c in _extension_candidates(config):
-        if c.is_file():
-            return c
-    return None
-
-
-def build_inject_block(model_map: dict[str, str]) -> str:
-    if not model_map:
-        raise SystemExit(
-            "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 (
-        f"{MARKER}{{const __T={{{pairs}}};const __m=__T[fQ4YPip];"
-        "if(__m&&(!UbAQWn||UbAQWn[Vyazt1(gvQ2P56[0x24a3])][Vyazt1(gvQ2P56[0x204e])]"
-        "===Vyazt1(gvQ2P56[0x2cda])))return __m;}"
-    )
-
-
-def find_wpelc8_body(source: str) -> tuple[int, int]:
-    start = source.find("function WPeLc8(")
-    if start < 0:
-        raise SystemExit("WPeLc8 not found — Cursor++/extension version mismatch?")
-    end = source.find("async function*o4ZNpa", start)
-    if end < 0:
-        raise SystemExit("WPeLc8 end anchor not found")
-    return start, end
-
-
-def probe_wpelc8_compat(source: str) -> dict[str, str]:
-    """Non-exiting WPeLc8 / inject-anchor probe for --check-compat and smoke."""
-    start = source.find("function WPeLc8(")
-    if start < 0:
-        return {"wpelc8": "not_locatable", "inject_anchor": "unknown", "end_anchor": "unknown"}
-    end = source.find("async function*o4ZNpa", start)
-    if end < 0:
-        return {"wpelc8": "locatable", "inject_anchor": "unknown", "end_anchor": "missing"}
-    fn = source[start:end]
-    anchor = "present" if INJECT_NEEDLE in fn else "missing"
-    return {"wpelc8": "locatable", "inject_anchor": anchor, "end_anchor": "present"}
-
-
-def apply_patch(source: str, inject: str) -> str:
-    start, end = find_wpelc8_body(source)
-    fn = source[start:end]
-    if MARKER in fn:
-        fn = remove_patch_from_fn(fn)
-    if INJECT_NEEDLE not in fn:
-        raise SystemExit(f"inject anchor missing: {INJECT_NEEDLE!r}")
-    fn_new = fn.replace(INJECT_NEEDLE, f"}});{inject}return!UbAQWn||", 1)
-    return source[:start] + fn_new + source[end:]
-
-
-def remove_patch_from_fn(fn: str) -> str:
-    import re
-
-    return re.sub(
-        re.escape(MARKER) + r"\{const __T=\{[^}]+\};const __m=__T\[fQ4YPip\];"
-        r"if\(__m&&\(!UbAQWn\|\|UbAQWn\[Vyazt1\(gvQ2P56\[0x24a3\]\)\]\[Vyazt1\(gvQ2P56\[0x204e\]\)\]"
-        r"===Vyazt1\(gvQ2P56\[0x2cda\]\)\)\)return __m;\}",
-        "",
-        fn,
-        count=1,
-    )
-
-
-def remove_patch(source: str) -> str:
-    if MARKER not in source:
-        raise SystemExit("marker not found — not patched?")
-    start, end = find_wpelc8_body(source)
-    fn = remove_patch_from_fn(source[start:end])
-    return source[:start] + fn + source[end:]
-
-
-def cmd_explain() -> None:
-    print("trellis-task-models.json5 — Agent 协助填写；用户只选模型名")
-    print("每项: { primary, fallback } — 首选不可用则自动备选 (WARN)")
-    print()
-    for key in KNOWN_SUBAGENT_TYPES:
-        print(f"  {key}")
-        print(f"    → {SUBAGENT_TYPE_HELP.get(key, '')}")
-    print()
-    print("Skill: cstl-cursor2plus-setup (init 后与大模型交互完成配置)")
-
-
-def cmd_list_models(providers_path: Path) -> None:
-    by_slug, _ = load_providers_catalog(providers_path)
-    if not by_slug:
-        raise SystemExit(f"no models in {providers_path}")
-    print(f"# {providers_path}")
-    print("# 给用户选 primary/fallback 时引用 apiModel 或 displayName")
-    print()
-    rows = sorted(by_slug.values(), key=lambda r: (str(r.get("provider")), str(r.get("displayName"))))
-    for r in rows:
-        print(
-            f"  {r.get('displayName')!r:28} apiModel={r.get('apiModel')!r:32} "
-            f"slug={r.get('slug')}  provider={r.get('provider')}"
-        )
-
-
-def cmd_bootstrap(bundle_dir: Path) -> None:
-    config = _load_config(bundle_dir)
-    cfg_out = bundle_dir / "config.local.json"
-    if not cfg_out.is_file():
-        config = {}
-    try:
-        resolve_extension_js(bundle_dir, config)
-        print("extension.js auto-detected", file=sys.stderr)
-    except SystemExit:
-        path = input("Paste full path to cursor2plus/dist/extension.js: ").strip()
-        if path:
-            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 cstl-cursor2plus-setup", file=sys.stderr)
-
-
-def cmd_check_compat(bundle_dir: Path, config: dict) -> int:
-    extension = try_resolve_extension_js(bundle_dir, config)
-    result: dict[str, object] = {
-        "extension": str(extension) if extension else None,
-        "patch_marker_present": False,
-        "wpelc8": "unknown",
-        "inject_anchor": "unknown",
-        "end_anchor": "unknown",
-    }
-    if extension is None:
-        result["status"] = "unknown"
-        result["hint"] = (
-            "extension.js not found — set extensionJs in config.local.json or run --bootstrap; "
-            "manual verification required"
-        )
-        print(json.dumps(result, indent=2, sort_keys=True))
-        return 2
-
-    source = extension.read_text(encoding="utf-8", errors="ignore")
-    result["patch_marker_present"] = MARKER in source
-    probe = probe_wpelc8_compat(source)
-    result.update(probe)
-
-    wpelc8 = probe["wpelc8"]
-    anchor = probe["inject_anchor"]
-    end_anchor = probe.get("end_anchor", "unknown")
-
-    if wpelc8 == "not_locatable" or anchor == "missing":
-        result["status"] = "fail"
-        result["hint"] = (
-            "WPeLc8 or inject anchor not found after Cursor/Cursor++ upgrade — "
-            "re-run patch with --apply --approve or revert to inherit-parent"
-        )
-    elif wpelc8 == "unknown" or anchor == "unknown" or end_anchor == "unknown":
-        result["status"] = "unknown"
-        result["hint"] = "Locator uncertain — manually verify extension.js after any upgrade"
-    else:
-        result["status"] = "ok"
-        result["hint"] = "WPeLc8 and inject anchor locatable"
-
-    print(json.dumps(result, indent=2, sort_keys=True))
-    return 0 if result["status"] == "ok" else (1 if result["status"] == "fail" else 2)
-
-
-def main() -> None:
-    ap = argparse.ArgumentParser(
-        description="Trellis Cursor++ WPeLc8 model map (Method 2.5)",
-        epilog=(
-            "Read-only: --print-map, --check-compat. "
-            "Write: --apply --approve (or --revert). "
-            "Never runs in CI by default."
-        ),
-    )
-    ap.add_argument("--revert", action="store_true", help="Remove Trellis patch from extension.js")
-    ap.add_argument("--apply", action="store_true", help="Apply patch to extension.js")
-    ap.add_argument(
-        "--approve",
-        action="store_true",
-        help="Explicit operator approval (required for --apply writes)",
-    )
-    ap.add_argument(
-        "--dry-run",
-        action="store_true",
-        help="With --apply: validate patch without writing extension.js",
-    )
-    ap.add_argument("--bootstrap", action="store_true", help="Create config.local.json with extension path")
-    ap.add_argument("--explain", action="store_true", help="Explain trellis-task-models.json5 keys")
-    ap.add_argument("--list-models", action="store_true", help="List models from providers.json catalog")
-    ap.add_argument("--print-map", action="store_true", help="Dry-run: print resolved slug map (no file writes)")
-    ap.add_argument(
-        "--check-compat",
-        action="store_true",
-        help="Check WPeLc8 locatability in current extension.js (no file writes)",
-    )
-    args = ap.parse_args()
-
-    bundle_dir = Path(__file__).resolve().parent
-    if args.explain:
-        cmd_explain()
-        return
-    if args.bootstrap:
-        cmd_bootstrap(bundle_dir)
-        return
-
-    config = _load_config(bundle_dir)
-
-    if args.check_compat:
-        raise SystemExit(cmd_check_compat(bundle_dir, config))
-
-    providers_path = resolve_providers_json(config)
-
-    if args.list_models:
-        cmd_list_models(providers_path)
-        return
-
-    needs_map = args.print_map or args.apply or args.revert
-    model_map: dict[str, str] = {}
-    notes: list[str] = []
-    if needs_map and not args.revert:
-        model_map, notes = resolve_model_layers(bundle_dir, config, providers_path)
-        if notes:
-            print("resolve:", file=sys.stderr)
-            for line in notes:
-                print(line, file=sys.stderr)
-        if any("ERROR" in line for line in notes):
-            raise SystemExit(1)
-
-    if args.print_map:
-        print(json.dumps(model_map, indent=2, sort_keys=True))
-        return
-
-    if args.revert:
-        extension = resolve_extension_js(bundle_dir, config)
-        source = extension.read_text(encoding="utf-8", errors="ignore")
-        new = remove_patch(source)
-        extension.write_text(new, encoding="utf-8", newline="\n")
-        print("wrote", extension)
-        return
-
-    if args.apply:
-        if not args.approve and not args.dry_run:
-            print(
-                "refused: --apply writes extension.js and requires explicit --approve "
-                "(use --dry-run to validate without writing)",
-                file=sys.stderr,
-            )
-            raise SystemExit(1)
-        extension = resolve_extension_js(bundle_dir, config)
-        source = extension.read_text(encoding="utf-8", errors="ignore")
-        inject = build_inject_block(model_map)
-        new = apply_patch(source, inject)
-        if args.dry_run:
-            print("ok patch delta", len(new) - len(source))
-            return
-        extension.write_text(new, encoding="utf-8", newline="\n")
-        print("wrote", extension)
-        return
-
-    ap.print_help()
-    raise SystemExit(2)
-
-
-if __name__ == "__main__":
-    main()

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

@@ -1,94 +0,0 @@
-#!/usr/bin/env python3
-"""Cursor++ local bundle smoke check — whitelist metadata only, no secret reads."""
-from __future__ import annotations
-
-import json
-import os
-import sys
-from pathlib import Path
-
-from patch_wpelc8 import (
-    MARKER,
-    _load_config,
-    configured_slot_map,
-    probe_wpelc8_compat,
-    try_resolve_extension_js,
-)
-
-CAVEATS = [
-    "Cursor++ is third-party; reverse-engineering is version-bound",
-    "Never reads BYOK provider catalog file contents",
-    "Patch is operator-only; not part of CI or default Trellis workflow",
-    "Re-verify after any Cursor or Cursor++ upgrade",
-]
-
-
-def detect_env() -> tuple[str, str | None]:
-    env_flag = os.environ.get("TRELLIS_CURSOR_BYOK", "").strip()
-    if env_flag == "1":
-        return "byok", "TRELLIS_CURSOR_BYOK=1"
-    if env_flag == "0":
-        return "native", "TRELLIS_CURSOR_BYOK=0"
-
-    routes = Path.home() / ".ccursor" / "routes.json"
-    if routes.is_file():
-        try:
-            data = json.loads(routes.read_text(encoding="utf-8"))
-            byok = data.get("byokMode")
-            if byok in (1, "1", True):
-                return "byok", "routes.json:byokMode"
-            if byok in (0, "0", False):
-                return "native", "routes.json:byokMode"
-        except (OSError, json.JSONDecodeError, TypeError):
-            pass
-    return "unknown", None
-
-
-def detect_patch_status(bundle_dir: Path, config: dict) -> tuple[str, dict[str, object]]:
-    extension = try_resolve_extension_js(bundle_dir, config)
-    meta: dict[str, object] = {"extension": str(extension) if extension else None}
-    if extension is None:
-        return "not-applied", meta
-
-    source = extension.read_text(encoding="utf-8", errors="ignore")
-    marker_present = MARKER in source
-    meta["patch_marker_present"] = marker_present
-    probe = probe_wpelc8_compat(source)
-    meta.update(probe)
-
-    if not marker_present:
-        return "not-applied", meta
-
-    if probe["wpelc8"] == "not_locatable" or probe["inject_anchor"] == "missing":
-        return "stale", meta
-    if probe["wpelc8"] == "unknown" or probe["inject_anchor"] == "unknown":
-        return "stale", meta
-    return "applied", meta
-
-
-def main() -> int:
-    bundle_dir = Path(__file__).resolve().parent
-    config = _load_config(bundle_dir)
-    env, env_source = detect_env()
-    patch_status, patch_meta = detect_patch_status(bundle_dir, config)
-    slots = configured_slot_map(bundle_dir, config)
-
-    report = {
-        "env": env,
-        "env_source": env_source,
-        "patch_status": patch_status,
-        "patch_meta": patch_meta,
-        "current_map": {
-            "configured_roles": {
-                role: {"candidates": names} for role, names in sorted(slots.items())
-            },
-            "note": "Role names from user JSON5 config only; slugs not resolved (no provider catalog read)",
-        },
-        "caveats": CAVEATS,
-    }
-    print(json.dumps(report, indent=2, sort_keys=True))
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

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

@@ -1,4 +0,0 @@
-{
-  "_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.",
-  "cstl-implement": "qwen3.6-plus"
-}

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

@@ -1,10 +0,0 @@
-{
-  "_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.",
-  "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

@@ -1,45 +0,0 @@
-// Trellis + Cursor++ BYOK — Task 子代理模型路由（由 Agent 在 init 时协助填写）
-// 复制到: Windows %USERPROFILE%\.ccursor\trellis-task-models.json5
-//         Linux/macOS ~/.ccursor/trellis-task-models.json5
-//
-// 用户：只说明「每个场景想用哪个模型」（Cursor++ 里显示的名字即可）
-// Agent：运行 list-models → 写入本文件（保留注释）→ patch_wpelc8.py
-//
-// primary / fallback：providers.json 变更时，首选解析失败会自动用备选（WARN，不中断）
-// Explore 子代理不在此文件 — 用 Cursor++ 面板单独选
-
-{
-  "models": {
-    // Trellis 调研（Task cstl-research）
-    "cstl-research": {
-      "primary": "glm-5.1",
-      "fallback": "qwen3.7-max"
-    },
-
-    // Trellis 实现；Parent generate-child-prompt --mode subagent 默认派发此类型
-    "cstl-implement": {
-      "primary": "qwen3.6-plus",
-      "fallback": "kimi-k2.7-code"
-    },
-
-    // Trellis 验收（Task cstl-check）
-    "cstl-check": {
-      "primary": "qwen3.7-max",
-      "fallback": "glm-5.1"
-    },
-
-    // Cursor 内置 Task（可按需删掉不用的项）
-    "generalPurpose": {
-      "primary": "gpt-5.5",
-      "fallback": "glm-5.1"
-    },
-    "shell": {
-      "primary": "grok-composer-2.5-fast",
-      "fallback": "gpt-5.5"
-    },
-    "best-of-n-runner": {
-      "primary": "kimi-k2.7-code",
-      "fallback": "qwen3.6-plus"
-    }
-  }
-}