@mindfoldhq/trellis 0.5.0-beta.14 → 0.5.0-beta.16

package/dist/templates/shared-hooks/index.js

@@ -13,6 +13,56 @@ const __dirname = dirname(__filename);
 function readTemplate(relativePath) {
     return readFileSync(join(__dirname, relativePath), "utf-8");
 }
+/**
+ * Which shared hooks each platform actually invokes. Single source of truth
+ * for shared-hook distribution — both `writeSharedHooks` (runtime install)
+ * and `collectSharedHooks` (`trellis update` diff) read from this table.
+ *
+ * Routing rules encoded here:
+ * - `session-start.py` — shipped by every platform with a SessionStart
+ *   hook event *except* codex + copilot, which bundle a platform-specific
+ *   session-start.py under their own template dirs.
+ * - `inject-workflow-state.py` — every platform with a UserPromptSubmit
+ *   (or equivalent) event. Kiro + codex self-included; platforms without
+ *   per-turn main-session hooks are excluded.
+ * - `inject-subagent-context.py` — class-1 (push-based) platforms only.
+ *   Class-2 (pull-based) platforms (codex, copilot, gemini, qoder) can't
+ *   have hooks mutate sub-agent prompts — their sub-agents load context
+ *   via a prelude instead.
+ * - Kiro supports only `agentSpawn` (no SessionStart / UserPromptSubmit
+ *   event), so it takes just `inject-subagent-context.py`.
+ * - Claude Code `statusLine` is intentionally not installed by default.
+ *   Users can add their own statusLine command in `.claude/settings.json`
+ *   without Trellis owning a generated hook file.
+ */
+export const SHARED_HOOKS_BY_PLATFORM = {
+    claude: [
+        "session-start.py",
+        "inject-workflow-state.py",
+        "inject-subagent-context.py",
+    ],
+    cursor: [
+        "session-start.py",
+        "inject-shell-session-context.py",
+        "inject-workflow-state.py",
+        "inject-subagent-context.py",
+    ],
+    codex: ["inject-workflow-state.py"],
+    gemini: ["session-start.py", "inject-workflow-state.py"],
+    qoder: ["session-start.py", "inject-workflow-state.py"],
+    copilot: ["inject-workflow-state.py"],
+    codebuddy: [
+        "session-start.py",
+        "inject-workflow-state.py",
+        "inject-subagent-context.py",
+    ],
+    droid: [
+        "session-start.py",
+        "inject-workflow-state.py",
+        "inject-subagent-context.py",
+    ],
+    kiro: ["inject-subagent-context.py"],
+};
 /**
  * Get all shared hook scripts. Content is platform-independent and can be
  * written directly without placeholder resolution.
@@ -27,4 +77,13 @@ export function getSharedHookScripts() {
     }
     return scripts;
 }
+/**
+ * Get the shared hook scripts that a given platform actually registers.
+ * Drives both `writeSharedHooks` and `collectSharedHooks` so distribution
+ * never drifts from the per-platform capability declared above.
+ */
+export function getSharedHookScriptsForPlatform(platform) {
+    const allowed = new Set(SHARED_HOOKS_BY_PLATFORM[platform]);
+    return getSharedHookScripts().filter((h) => allowed.has(h.name));
+}
 //# sourceMappingURL=index.js.map

package/dist/templates/shared-hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/templates/shared-hooks/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,SAAS,YAAY,CAAC,YAAoB;IACxC,OAAO,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC;AASD;;;GAGG;AACH,MAAM,UAAU,oBAAoB;IAClC,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC;SACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAChC,IAAI,EAAE,CAAC;IAEV,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/templates/shared-hooks/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,SAAS,YAAY,CAAC,YAAoB;IACxC,OAAO,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC;AA0BD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAGjC;IACF,MAAM,EAAE;QACN,kBAAkB;QAClB,0BAA0B;QAC1B,4BAA4B;KAC7B;IACD,MAAM,EAAE;QACN,kBAAkB;QAClB,iCAAiC;QACjC,0BAA0B;QAC1B,4BAA4B;KAC7B;IACD,KAAK,EAAE,CAAC,0BAA0B,CAAC;IACnC,MAAM,EAAE,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;IACxD,KAAK,EAAE,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;IACvD,OAAO,EAAE,CAAC,0BAA0B,CAAC;IACrC,SAAS,EAAE;QACT,kBAAkB;QAClB,0BAA0B;QAC1B,4BAA4B;KAC7B;IACD,KAAK,EAAE;QACL,kBAAkB;QAClB,0BAA0B;QAC1B,4BAA4B;KAC7B;IACD,IAAI,EAAE,CAAC,4BAA4B,CAAC;CACrC,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,oBAAoB;IAClC,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC;SACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAChC,IAAI,EAAE,CAAC;IAEV,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,+BAA+B,CAC7C,QAA4B;IAE5B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpE,OAAO,oBAAoB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AACnE,CAAC"}

package/dist/templates/shared-hooks/inject-shell-session-context.py

@@ -0,0 +1,180 @@
+#!/usr/bin/env python3
+"""Cursor beforeShellExecution hook: bridge conversation identity to task.py.
+
+Cursor's shell command environment does not inherit SessionStart data. This
+hook writes a short-lived runtime ticket before Cursor runs a shell command
+that calls `task.py start/current/finish`. The task script then consumes the
+ticket only when it has no native session environment.
+"""
+from __future__ import annotations
+
+import hashlib
+import json
+import os
+import shlex
+import sys
+import time
+from pathlib import Path
+from typing import Any
+
+
+DIR_WORKFLOW = ".trellis"
+DIR_RUNTIME = ".runtime"
+DIR_CURSOR_SHELL = "cursor-shell"
+SESSION_SUBCOMMANDS = {"start", "current", "finish"}
+TICKET_TTL_SECONDS = 30
+CONTEXT_IDENTITY_KEYS = (
+    "session_id",
+    "sessionId",
+    "sessionID",
+    "conversation_id",
+    "conversationId",
+    "conversationID",
+    "transcript_path",
+    "transcriptPath",
+    "transcript",
+)
+
+
+def _string_value(value: Any) -> str | None:
+    if isinstance(value, str):
+        stripped = value.strip()
+        return stripped or None
+    return None
+
+
+def _find_trellis_root(start: Path) -> Path | None:
+    current = start.resolve()
+    while True:
+        if (current / DIR_WORKFLOW).is_dir():
+            return current
+        if current == current.parent:
+            return None
+        current = current.parent
+
+
+def _runtime_ticket_dir(root: Path) -> Path:
+    return root / DIR_WORKFLOW / DIR_RUNTIME / DIR_CURSOR_SHELL
+
+
+def _load_active_task_resolver(root: Path):
+    scripts_dir = root / DIR_WORKFLOW / "scripts"
+    if str(scripts_dir) not in sys.path:
+        sys.path.insert(0, str(scripts_dir))
+    from common.active_task import resolve_context_key  # type: ignore[import-not-found]
+
+    return resolve_context_key
+
+
+def _extract_task_subcommands(command: str) -> list[dict[str, str]]:
+    try:
+        tokens = shlex.split(command, posix=os.name != "nt")
+    except ValueError:
+        return []
+
+    subcommands: list[dict[str, str]] = []
+    for index, token in enumerate(tokens[:-1]):
+        if Path(token.strip("\"'")).name != "task.py":
+            continue
+        name = tokens[index + 1]
+        if name not in SESSION_SUBCOMMANDS:
+            continue
+        item = {"name": name}
+        if name == "start" and index + 2 < len(tokens):
+            item["task_ref"] = tokens[index + 2]
+        subcommands.append(item)
+    return subcommands
+
+
+def _cleanup_expired_tickets(ticket_dir: Path, now: float) -> None:
+    if not ticket_dir.is_dir():
+        return
+    for ticket_path in ticket_dir.glob("*.json"):
+        try:
+            data = json.loads(ticket_path.read_text(encoding="utf-8"))
+        except (json.JSONDecodeError, OSError):
+            continue
+        expires_at = data.get("expires_at_epoch")
+        if isinstance(expires_at, (int, float)) and expires_at < now:
+            try:
+                ticket_path.unlink()
+            except OSError:
+                pass
+
+
+def _has_context_identity(hook_input: dict[str, Any]) -> bool:
+    return any(_string_value(hook_input.get(key)) for key in CONTEXT_IDENTITY_KEYS)
+
+
+def _write_ticket(
+    root: Path,
+    hook_input: dict[str, Any],
+    context_key: str,
+    subcommands: list[dict[str, str]],
+) -> None:
+    now = time.time()
+    ticket_dir = _runtime_ticket_dir(root)
+    ticket_dir.mkdir(parents=True, exist_ok=True)
+    _cleanup_expired_tickets(ticket_dir, now)
+
+    command = _string_value(hook_input.get("command")) or ""
+    digest = hashlib.sha256(
+        f"{context_key}\0{command}\0{now}".encode("utf-8"),
+    ).hexdigest()[:16]
+    ticket_path = ticket_dir / f"{int(now * 1000)}-{digest}.json"
+
+    payload = {
+        "platform": "cursor",
+        "context_key": context_key,
+        "conversation_id": _string_value(hook_input.get("conversation_id")),
+        "session_id": _string_value(hook_input.get("session_id")),
+        "generation_id": _string_value(hook_input.get("generation_id")),
+        "cwd": _string_value(hook_input.get("cwd")),
+        "command": command,
+        "subcommands": subcommands,
+        "created_at_epoch": now,
+        "expires_at_epoch": now + TICKET_TTL_SECONDS,
+    }
+    ticket_path.write_text(
+        json.dumps(payload, indent=2, ensure_ascii=False) + "\n",
+        encoding="utf-8",
+    )
+
+
+def main() -> int:
+    try:
+        hook_input = json.loads(sys.stdin.read())
+    except (json.JSONDecodeError, ValueError):
+        hook_input = {}
+    if not isinstance(hook_input, dict):
+        hook_input = {}
+
+    command = _string_value(hook_input.get("command")) or ""
+    subcommands = _extract_task_subcommands(command)
+    if not subcommands:
+        return 0
+
+    cwd = Path(_string_value(hook_input.get("cwd")) or os.getcwd())
+    root = _find_trellis_root(cwd)
+    if root is None:
+        return 0
+
+    if not _has_context_identity(hook_input):
+        return 0
+
+    resolve_context_key = _load_active_task_resolver(root)
+    context_key = resolve_context_key(hook_input, platform="cursor")
+    if not context_key:
+        return 0
+
+    try:
+        _write_ticket(root, hook_input, context_key, subcommands)
+    except OSError:
+        return 0
+
+    print(json.dumps({"permission": "allow"}, ensure_ascii=False))
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

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

@@ -12,7 +12,7 @@ Core Design Philosophy:
 
 Trigger: PreToolUse (before Task tool call)
 
-Context Source: .trellis/.current-task points to task directory
+Context Source: Trellis active task resolver points to task directory
 - implement.jsonl - Implement agent dedicated context
 - check.jsonl     - Check agent dedicated context
 - prd.md          - Requirements document
@@ -29,6 +29,7 @@ import json
 import os
 import sys
 from pathlib import Path
+from typing import Any
 
 # IMPORTANT: Force stdout to use UTF-8 on Windows
 # This fixes UnicodeEncodeError when outputting non-ASCII characters
@@ -46,7 +47,6 @@ if sys.platform.startswith("win"):
 
 DIR_WORKFLOW = ".trellis"
 DIR_SPEC = "spec"
-FILE_CURRENT_TASK = ".current-task"
 FILE_TASK_JSON = "task.json"
 
 # =============================================================================
@@ -78,32 +78,57 @@ def find_repo_root(start_path: str) -> str | None:
     return None
 
 
-def get_current_task(repo_root: str) -> str | None:
-    """
-    Read current task directory path from .trellis/.current-task
+def _detect_platform(input_data: dict) -> str | None:
+    if isinstance(input_data.get("cursor_version"), str):
+        return "cursor"
+    env_map = {
+        "CLAUDE_PROJECT_DIR": "claude",
+        "CURSOR_PROJECT_DIR": "cursor",
+        "CODEBUDDY_PROJECT_DIR": "codebuddy",
+        "FACTORY_PROJECT_DIR": "droid",
+        "GEMINI_PROJECT_DIR": "gemini",
+        "QODER_PROJECT_DIR": "qoder",
+        "KIRO_PROJECT_DIR": "kiro",
+        "COPILOT_PROJECT_DIR": "copilot",
+    }
+    for env_name, platform in env_map.items():
+        if os.environ.get(env_name):
+            return platform
+    script_parts = set(Path(sys.argv[0]).parts)
+    if ".claude" in script_parts:
+        return "claude"
+    if ".cursor" in script_parts:
+        return "cursor"
+    if ".gemini" in script_parts:
+        return "gemini"
+    if ".qoder" in script_parts:
+        return "qoder"
+    if ".codebuddy" in script_parts:
+        return "codebuddy"
+    if ".factory" in script_parts:
+        return "droid"
+    if ".kiro" in script_parts:
+        return "kiro"
+    return None
 
-    Returns:
-        Task directory relative path (relative to repo_root)
-        None if not set
-    """
-    current_task_file = os.path.join(repo_root, DIR_WORKFLOW, FILE_CURRENT_TASK)
-    if not os.path.exists(current_task_file):
-        return None
 
+def get_current_task(repo_root: str, input_data: dict) -> str | None:
+    """Resolve current task directory through the unified active task resolver."""
+    scripts_dir = Path(repo_root) / DIR_WORKFLOW / "scripts"
+    if str(scripts_dir) not in sys.path:
+        sys.path.insert(0, str(scripts_dir))
     try:
-        with open(current_task_file, "r", encoding="utf-8") as f:
-            content = f.read().strip()
-            if not content:
-                return None
-            normalized = content.replace("\\", "/")
-            while normalized.startswith("./"):
-                normalized = normalized[2:]
-            if normalized.startswith("tasks/"):
-                normalized = f".trellis/{normalized}"
-            return normalized
+        from common.active_task import resolve_active_task  # type: ignore[import-not-found]
     except Exception:
         return None
 
+    active = resolve_active_task(
+        Path(repo_root),
+        input_data,
+        platform=_detect_platform(input_data),
+    )
+    return active.task_path
+
 
 def read_file_content(base_path: str, file_path: str) -> str | None:
     """Read file content, return None if file doesn't exist"""
@@ -517,13 +542,90 @@ Provide structured search results including:
 - External references (if any)"""
 
 
+def _string_value(value: Any) -> str:
+    if isinstance(value, str):
+        stripped = value.strip()
+        return stripped
+    return ""
+
+
+def _extract_subagent_name(value: Any) -> str:
+    """Extract a sub-agent name from common platform encodings.
+
+    Cursor's native Task args encode custom sub-agents as a protobuf oneof,
+    which can appear in hook JSON as either ``{"custom": {"name": "..."}}``
+    or ``{"type": {"case": "custom", "value": {"name": "..."}}}``.
+    """
+    direct = _string_value(value)
+    if direct:
+        return direct
+
+    if not isinstance(value, dict):
+        return ""
+
+    for key in ("name", "subagent_type_name", "subagentTypeName"):
+        direct = _string_value(value.get(key))
+        if direct:
+            return direct
+
+    custom = value.get("custom")
+    if isinstance(custom, dict):
+        custom_name = _string_value(custom.get("name"))
+        if custom_name:
+            return custom_name
+
+    oneof = value.get("type")
+    if isinstance(oneof, dict):
+        case_name = _string_value(oneof.get("case"))
+        if case_name == "custom":
+            nested_value = oneof.get("value")
+            if isinstance(nested_value, dict):
+                custom_name = _string_value(nested_value.get("name"))
+                if custom_name:
+                    return custom_name
+        if case_name:
+            return case_name
+
+    case_name = _string_value(value.get("case"))
+    if case_name == "custom":
+        nested_value = value.get("value")
+        if isinstance(nested_value, dict):
+            custom_name = _string_value(nested_value.get("name"))
+            if custom_name:
+                return custom_name
+    if case_name:
+        return case_name
+
+    for agent_name in AGENTS_ALL:
+        if agent_name in value:
+            return agent_name
+
+    return ""
+
+
+def _extract_subagent_type(tool_input: dict) -> str:
+    for key in (
+        "subagent_type",
+        "subagentType",
+        "subagent_type_name",
+        "subagentTypeName",
+        "agent_type",
+        "agentType",
+        "name",
+    ):
+        agent_name = _extract_subagent_name(tool_input.get(key))
+        if agent_name:
+            return agent_name
+    return ""
+
+
 def _parse_hook_input(input_data: dict) -> tuple[str, str, dict]:
     """Parse hook input across different platform formats.
 
     Returns (subagent_type, original_prompt, tool_input).
     Handles:
     - Claude Code / Qoder / CodeBuddy / Droid: tool_name=Task|Agent, tool_input.subagent_type
-    - Cursor: tool_name=Task, tool_input.subagent_type
+    - Cursor: tool_name=Task|Subagent, tool_input.subagent_type
     - Copilot CLI: toolName=task (camelCase key, lowercase value)
     - Gemini CLI: tool_name IS the agent name (BeforeTool matcher already filtered)
     - Kiro: agentSpawn hook, agent_name field at top level
@@ -532,9 +634,9 @@ def _parse_hook_input(input_data: dict) -> tuple[str, str, dict]:
 
     # Standard format: Task/Agent tool with subagent_type
     tool_name = input_data.get("tool_name", "") or input_data.get("toolName", "")
-    if tool_name.lower() in ("task", "agent"):
+    if tool_name.lower() in ("task", "agent", "subagent"):
         return (
-            tool_input.get("subagent_type", ""),
+            _extract_subagent_type(tool_input),
             tool_input.get("prompt", ""),
             tool_input,
         )
@@ -576,7 +678,7 @@ def main():
         sys.exit(0)
 
     # Get current task directory (research doesn't require it)
-    task_dir = get_current_task(repo_root)
+    task_dir = get_current_task(repo_root, input_data)
 
     # implement/check need task directory
     if subagent_type in AGENTS_REQUIRE_TASK: