flower-trellis 0.4.6 → 0.4.8

package/enhancements/0.6/overrides/hooks/shared/inject-workflow-state.py

@@ -0,0 +1,443 @@
+#!/usr/bin/env python3
+"""Trellis per-turn breadcrumb hook (UserPromptSubmit / BeforeAgent equivalent).
+
+Runs on every user prompt. Resolves the active task through Trellis'
+session-aware active task resolver and emits a short <workflow-state>
+block reminding the main AI what task is active and its expected flow.
+
+The emitted ``hookEventName`` field is platform-aware: most hosts expect
+``UserPromptSubmit`` (Claude Code naming, also accepted by Cursor / Qoder /
+CodeBuddy / Droid / Codex / Copilot wiring), but Gemini CLI 0.40.x renamed
+its per-turn event to ``BeforeAgent`` and its schema validator rejects the
+legacy name. ``_detect_platform`` picks the right value at runtime.
+Breadcrumb text is pulled exclusively from workflow.md
+[workflow-state:STATUS] tag blocks — workflow.md is the single source of
+truth. There are no fallback dicts in this script: when workflow.md is
+missing or a tag is absent, the breadcrumb degrades to a generic
+"Refer to workflow.md for current step." line so users see (and fix)
+the broken state instead of the hook silently masking it.
+
+Shared across all hook-capable platforms (Claude, Cursor, Codex, Qoder,
+CodeBuddy, Droid, Gemini, Copilot, Kiro). Kiro wires this via the CLI
+custom agent's ``hooks.userPromptSubmit`` and the IDE ``.kiro.hook``
+``promptSubmit`` event; its output branch emits a plain-text breadcrumb
+(Kiro adds hook stdout directly to the conversation context). Written to
+each platform's hooks directory via writeSharedHooks() at init time.
+
+Silent exit 0 cases (no output):
+  - No .trellis/ directory found (not a Trellis project)
+  - task.json malformed or missing status
+"""
+from __future__ import annotations
+
+import json
+import os
+import re
+import sys
+import queue
+import threading
+from pathlib import Path
+
+# Force UTF-8 on stdin/stdout/stderr on Windows. Default codepage there is
+# cp936 / cp1252 / etc. — non-ASCII content (Chinese task names, prd snippets)
+# both in stdin (hook payload from host CLI) and stdout (our emitted blocks)
+# raises UnicodeDecodeError / UnicodeEncodeError. Equivalent to `python -X utf8`
+# but applied per-stream so we don't depend on host CLI's command wiring.
+if sys.platform.startswith("win"):
+    import io as _io
+    for _stream_name in ("stdin", "stdout", "stderr"):
+        _stream = getattr(sys, _stream_name, None)
+        if _stream is None:
+            continue
+        if hasattr(_stream, "reconfigure"):
+            try:
+                _stream.reconfigure(encoding="utf-8", errors="replace")  # type: ignore[union-attr]
+            except Exception:
+                pass
+        elif hasattr(_stream, "detach"):
+            try:
+                setattr(sys, _stream_name, _io.TextIOWrapper(_stream.detach(), encoding="utf-8", errors="replace"))
+            except Exception:
+                pass
+from typing import Optional
+
+
+# Bootstrap notice for Codex while the session has no active task. Codex does not
+# get the full SessionStart overview; this short reminder points the main session
+# at the start skill once and leaves the per-turn state block compact.
+CODEX_NO_TASK_BOOTSTRAP_NOTICE = """<trellis-bootstrap>
+If you have not already loaded Trellis context this session, read the `trellis-start` skill once.
+</trellis-bootstrap>"""
+
+
+def _codex_has_trellis_session_start(root: Path) -> bool:
+    """判断 Codex 主 SessionStart hook 是否已注册并可执行。
+
+    `trellis-start` bootstrap 是没有 SessionStart hook 时的兜底。flower-managed
+    Codex 项目会补 `.codex/hooks/session-start.py`,因此已注册时不应每轮重复提示。
+    读取失败时保守返回 False,继续保留兜底提示。
+    """
+    session_start = root / ".codex" / "hooks" / "session-start.py"
+    if not session_start.is_file():
+        return False
+
+    hooks_path = root / ".codex" / "hooks.json"
+    try:
+        config = json.loads(hooks_path.read_text(encoding="utf-8"))
+    except (json.JSONDecodeError, OSError):
+        return False
+    hooks_config = config.get("hooks")
+    if not isinstance(hooks_config, dict):
+        return False
+    groups = hooks_config.get("SessionStart")
+    if not isinstance(groups, list):
+        return False
+    for group in groups:
+        hooks = group.get("hooks") if isinstance(group, dict) else None
+        if not isinstance(hooks, list):
+            continue
+        for hook in hooks:
+            if not isinstance(hook, dict):
+                continue
+            command = hook.get("command")
+            if isinstance(command, str) and ".codex/hooks/session-start.py" in command:
+                return True
+    return False
+
+
+# ---------------------------------------------------------------------------
+# CWD-robust Trellis root discovery (fixes hook-path-robustness for this hook)
+# ---------------------------------------------------------------------------
+
+def find_trellis_root(start: Path) -> Optional[Path]:
+    """Walk up from start to find directory containing .trellis/.
+
+    Handles CWD drift: subdirectory launches, monorepo packages, etc.
+    Returns None if no .trellis/ found (silent no-op).
+    """
+    cur = start.resolve()
+    while cur != cur.parent:
+        if (cur / ".trellis").is_dir():
+            return cur
+        cur = cur.parent
+    return None
+
+
+# ---------------------------------------------------------------------------
+# Active task discovery
+# ---------------------------------------------------------------------------
+
+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",
+        "TRAE_PROJECT_DIR": "trae",
+    }
+    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 ".codex" in script_parts:
+        return "codex"
+    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"
+    if ".trae" in script_parts:
+        return "trae"
+    return None
+
+
+def _resolve_active_task(root: Path, input_data: dict):
+    scripts_dir = root / ".trellis" / "scripts"
+    if str(scripts_dir) not in sys.path:
+        sys.path.insert(0, str(scripts_dir))
+    from common.active_task import resolve_active_task  # type: ignore[import-not-found]
+
+    return resolve_active_task(root, input_data, platform=_detect_platform(input_data))
+
+
+def get_active_task(root: Path, input_data: dict) -> Optional[tuple[str, str, str]]:
+    """Return (task_id, status, source) from the current active task."""
+    active = _resolve_active_task(root, input_data)
+    if not active.task_path:
+        return None
+
+    task_dir = Path(active.task_path)
+    if not task_dir.is_absolute():
+        task_dir = root / task_dir
+    if active.stale:
+        return task_dir.name, f"stale_{active.source_type}", active.source
+
+    task_json = task_dir / "task.json"
+    if not task_json.is_file():
+        return None
+    try:
+        data = json.loads(task_json.read_text(encoding="utf-8"))
+    except (json.JSONDecodeError, OSError):
+        return None
+
+    task_id = data.get("id") or task_dir.name
+    status = data.get("status", "")
+    if not isinstance(status, str) or not status:
+        return None
+    return task_id, status, active.source
+
+
+# ---------------------------------------------------------------------------
+# Breadcrumb loading: parse workflow.md, fall back to hardcoded defaults
+# ---------------------------------------------------------------------------
+
+# Supports STATUS values with letters, digits, underscores, hyphens
+# (so "in-review" / "blocked-by-team" work alongside "in_progress").
+_TAG_RE = re.compile(
+    r"\[workflow-state:([A-Za-z0-9_-]+)\]\s*\n(.*?)\n\s*\[/workflow-state:\1\]",
+    re.DOTALL,
+)
+
+def load_breadcrumbs(root: Path) -> dict[str, str]:
+    """Parse workflow.md for [workflow-state:STATUS] blocks.
+
+    Returns {status: body_text}. workflow.md is the single source of
+    truth — there are no fallback dicts in this script. Missing tags
+    (or a missing/unreadable workflow.md) fall back to a generic line
+    in build_breadcrumb so users see the broken state and fix
+    workflow.md, rather than the hook silently masking the issue.
+    """
+    workflow = root / ".trellis" / "workflow.md"
+    if not workflow.is_file():
+        return {}
+    try:
+        content = workflow.read_text(encoding="utf-8")
+    except OSError:
+        return {}
+
+    result: dict[str, str] = {}
+    for match in _TAG_RE.finditer(content):
+        status = match.group(1)
+        body = match.group(2).strip()
+        if body:
+            result[status] = body
+    return result
+
+
+def _read_trellis_config(root: Path) -> dict:
+    """Load .trellis/config.yaml via the bundled trellis_config helper.
+
+    The helper lives in .trellis/scripts/common; the hook lives outside the
+    scripts tree, so we extend sys.path before importing.
+    """
+    scripts_dir = root / ".trellis" / "scripts"
+    if str(scripts_dir) not in sys.path:
+        sys.path.insert(0, str(scripts_dir))
+    try:
+        from common.trellis_config import read_trellis_config  # type: ignore[import-not-found]
+    except Exception:
+        return {}
+    try:
+        return read_trellis_config(root)
+    except Exception:
+        return {}
+
+
+def _codex_mode_banner(config: dict) -> str:
+    """Emit a `<codex-mode>` banner for the additionalContext payload.
+
+    Reads `codex.dispatch_mode` from .trellis/config.yaml; defaults to
+    `inline` when missing or invalid because Codex sub-agents run with
+    `fork_turns="none"` isolation and can't inherit the parent session's
+    task context. The banner makes the active mode explicit to Codex AI
+    per turn, complementing the workflow-state body which is per-status.
+    Mode tells AI which dispatch protocol to follow; workflow-state tells
+    AI what step it's at.
+    """
+    mode = "inline"
+    if isinstance(config, dict):
+        codex_cfg = config.get("codex")
+        if isinstance(codex_cfg, dict):
+            cfg_mode = codex_cfg.get("dispatch_mode")
+            if cfg_mode in ("inline", "sub-agent"):
+                mode = cfg_mode
+    if mode == "sub-agent":
+        meaning = (
+            "sub-agent: implement/check work defaults to Trellis sub-agents; "
+            "the main session still coordinates, clarifies, updates specs, commits, and finishes."
+        )
+    else:
+        meaning = (
+            "inline: the main session implements/checks directly; "
+            "do not dispatch implement/check sub-agents."
+        )
+    return f"<codex-mode>{meaning}</codex-mode>"
+
+
+def resolve_breadcrumb_key(
+    status: str, platform: str | None, config: dict
+) -> str:
+    """Pick the breadcrumb tag key based on Codex dispatch_mode.
+
+    Codex defaults to ``inline`` because sub-agents run with ``fork_turns="none"``
+    isolation and can't inherit the parent session's task context. Users can
+    opt into ``codex.dispatch_mode: sub-agent`` in ``.trellis/config.yaml``
+    to use the parallel ``<status>-inline`` tag → ``<status>`` flip. Invalid
+    or missing values fall back to inline.
+
+    Non-codex platforms return the plain status unchanged.
+    """
+    if platform == "codex":
+        mode = "inline"
+        if isinstance(config, dict):
+            codex_cfg = config.get("codex")
+            if isinstance(codex_cfg, dict):
+                cfg_mode = codex_cfg.get("dispatch_mode")
+                if cfg_mode in ("inline", "sub-agent"):
+                    mode = cfg_mode
+        return f"{status}-inline" if mode == "inline" else status
+    return status
+
+
+def build_breadcrumb(
+    task_id: Optional[str],
+    status: str,
+    templates: dict[str, str],
+    source: str | None = None,
+    breadcrumb_key: str | None = None,
+) -> str:
+    """Build the <workflow-state>...</workflow-state> block.
+
+    - Known status (tag present in workflow.md) → detailed template body
+    - Unknown status (no tag, or workflow.md missing) → generic
+      "Refer to workflow.md for current step." line
+    - `no_task` pseudo-status (task_id is None) → header omits task info
+    """
+    lookup_key = breadcrumb_key or status
+    body = templates.get(lookup_key)
+    if body is None and lookup_key != status:
+        body = templates.get(status)
+    if body is None:
+        body = "Refer to workflow.md for current step."
+    header = f"Status: {status}" if task_id is None else f"Task: {task_id} ({status})"
+    return f"<workflow-state>\n{header}\n{body}\n</workflow-state>"
+
+
+# ---------------------------------------------------------------------------
+# Entry
+# ---------------------------------------------------------------------------
+
+def _load_hook_input() -> dict:
+    """Read hook JSON without trusting host runners to close stdin.
+
+    Kiro IDE `runCommand` and similar hook runners can leave stdin open while
+    sending no payload. A plain `json.load(sys.stdin)` then blocks forever.
+    Normal hook runners write the complete JSON payload and close stdin, so the
+    short daemon read preserves that path while failing closed to `{}` for
+    non-piping hosts.
+    """
+    result_queue: "queue.Queue[str | BaseException]" = queue.Queue(maxsize=1)
+
+    def _read() -> None:
+        try:
+            result_queue.put(sys.stdin.read())
+        except BaseException as exc:
+            result_queue.put(exc)
+
+    reader = threading.Thread(target=_read, daemon=True)
+    reader.start()
+    try:
+        raw = result_queue.get(timeout=0.2)
+    except queue.Empty:
+        return {}
+
+    if isinstance(raw, BaseException):
+        return {}
+    try:
+        data = json.loads(raw) if raw.strip() else {}
+    except (json.JSONDecodeError, ValueError):
+        return {}
+    return data if isinstance(data, dict) else {}
+
+
+def main() -> int:
+    if os.environ.get("TRELLIS_HOOKS") == "0" or os.environ.get("TRELLIS_DISABLE_HOOKS") == "1":
+        return 0
+
+    data = _load_hook_input()
+
+    cwd_str = data.get("cwd") or os.getcwd()
+    cwd = Path(cwd_str)
+
+    root = find_trellis_root(cwd)
+    if root is None:
+        return 0  # not a Trellis project
+
+    templates = load_breadcrumbs(root)
+    platform = _detect_platform(data)
+    config = _read_trellis_config(root)
+    task = get_active_task(root, data)
+    if task is None:
+        # No active task — still emit a breadcrumb nudging AI toward
+        # trellis-brainstorm + task.py create when user describes real work.
+        no_task_key = resolve_breadcrumb_key("no_task", platform, config)
+        breadcrumb = build_breadcrumb(
+            None, "no_task", templates, breadcrumb_key=no_task_key
+        )
+    else:
+        task_id, status, source = task
+        status_key = resolve_breadcrumb_key(status, platform, config)
+        source_for_breadcrumb = None if platform == "codex" else source
+        breadcrumb = build_breadcrumb(
+            task_id, status, templates, source_for_breadcrumb, breadcrumb_key=status_key
+        )
+    if platform == "codex":
+        parts: list[str] = []
+        if task is None and not _codex_has_trellis_session_start(root):
+            parts.append(CODEX_NO_TASK_BOOTSTRAP_NOTICE)
+        parts.append(_codex_mode_banner(config))
+        parts.append(breadcrumb)
+        breadcrumb = "\n\n".join(parts)
+
+    # Kiro (CLI userPromptSubmit / IDE promptSubmit) adds a hook's stdout
+    # directly to the conversation context — no JSON envelope. Emit the bare
+    # breadcrumb text. Conditionally isolated: all other platforms keep the
+    # hookSpecificOutput JSON path below unchanged.
+    if platform == "kiro":
+        print(breadcrumb)
+        return 0
+
+    # Gemini CLI 0.40.x rejects "UserPromptSubmit" — its per-turn event is
+    # named "BeforeAgent". Other platforms (Claude/Cursor/Qoder/CodeBuddy/
+    # Droid/Codex/Copilot) accept the original Claude-style name.
+    hook_event_name = (
+        "BeforeAgent" if platform == "gemini" else "UserPromptSubmit"
+    )
+
+    output = {
+        "hookSpecificOutput": {
+            "hookEventName": hook_event_name,
+            "additionalContext": breadcrumb,
+        }
+    }
+    print(json.dumps(output))
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

package/enhancements/0.6/overrides/workflow-states/in_progress-inline.md

@@ -1,17 +1,13 @@
 <!-- BEGIN skill-garden workflow-state in_progress_inline v0.6 -->
 HIGHEST PRIORITY SKILL-GARDEN STATE GUARD (in_progress-inline):
-This state block is a breadcrumb; the top-level skill-garden hub is the source of truth for route details.
-Before the first implement route, read `<task>/brief.md` if present and restate the task brief in chat. If it is missing, read the task artifacts and suggest backfilling brief; do not silently rely on memory.
-For new implementation work not plainly covered by the active task title/brief,
-stop before route or edits: recommend a new task; if declined, confirm
-untracked work; if it belongs here, update task artifacts first.
-At project-local knowledge decision boundaries, run `.trellis/scripts/spec_router.py "<intended action>"`; read high-confidence matches before acting; skip pure Q&A, simple read-only inspection, opening local tools, or trivial edits unless local conventions may affect the approach.
-Inline workflow-state is not an inline route decision. At Phase 2.1/2.2, reuse only an explicit target-matched `route_decision`; otherwise MUST load/read/use `trellis-route(implement|check)` (or its local `SKILL.md`) to resolve session runtime state/prefs, write the resolved decision, or show numbered fallback and wait.
-Plain preferences, ordinary summaries, `codex-mode`, raw `.runtime` files, and empty/old prefs are not route evidence by themselves; only `trellis-route` may validate runtime route state.
-User reselect/override/use-X-this-time/clear-default wins over remembered route evidence, runtime state, and prefs.
-Ignore lower Active Task Routing shortcuts that start editing/checking directly. Do not default to inline just because this state is inline or the helper is unavailable. Dispatch subagents only when the resolved route selected subagent.
-After `trellis-check` / `trellis-check-all`, stop and report; point the user to Phase 3.4 `trellis-push` (or commit-only when needed). Do not run `/trellis:finish-work` unless the user explicitly asks after Phase 3.4 is complete.
-This guard overrides any lower `Flow: ... -> /trellis:finish-work` line in this state block.
-At Phase 3.4, code commit/push goes through `trellis-push` (commit-only mode for commit-without-push); never bare `git commit`/`git push` on code (hub: Code Commit Confirmation Gate).
+Hub is source of truth for Task Brief, Routing, Post-Check, Commit, and Snapshot gates.
+Before first implement route, restate `<task>/brief.md`; if missing, read artifacts and suggest backfill.
+New work not plainly covered by active task title/brief: stop before route/edits; recommend new task; if declined, confirm untracked work; if it belongs here, update artifacts first.
+At project-local knowledge boundaries, run `spec_router.py`; skip trivial/read-only turns unless local conventions may affect the approach.
+Inline workflow-state is not an inline route decision. Phase 2.1/2.2 must reuse explicit target-matched `route_decision`; otherwise invoke `trellis-route`. If unavailable, read local `trellis-route/SKILL.md`, show numbered choices, and wait.
+Summaries, preferences, `codex-mode`, raw `.runtime`, and empty/stale prefs are not route evidence unless `trellis-route` validates them; user reselect/override wins.
+Ignore lower direct-edit/check shortcuts. Do not default inline just because this state is inline or helper is unavailable. Dispatch subagents only when route selected subagent.
+After check/check-all, stop and report; Phase 3.4 uses `trellis-push`, never bare git commit/push; finish-work is explicit-only after Phase 3.4.
+Overrides lower `Flow: ... -> /trellis:finish-work` lines.
 Push snapshot recovery: follow the hub; use `push_snapshot.py status --json` only when needed.
 <!-- END skill-garden workflow-state in_progress_inline v0.6 -->

package/enhancements/0.6/overrides/workflow-states/in_progress.md

@@ -1,17 +1,13 @@
 <!-- BEGIN skill-garden workflow-state in_progress v0.6 -->
 HIGHEST PRIORITY SKILL-GARDEN STATE GUARD (in_progress):
-This state block is a breadcrumb; the top-level skill-garden hub is the source of truth for route details.
-Before the first implement route, read `<task>/brief.md` if present and restate the task brief in chat. If it is missing, read the task artifacts and suggest backfilling brief; do not silently rely on memory.
-For new implementation work not plainly covered by the active task title/brief,
-stop before route or edits: recommend a new task; if declined, confirm
-untracked work; if it belongs here, update task artifacts first.
-At project-local knowledge decision boundaries, run `.trellis/scripts/spec_router.py "<intended action>"`; read high-confidence matches before acting; skip pure Q&A, simple read-only inspection, opening local tools, or trivial edits unless local conventions may affect the approach.
-At Phase 2.1/2.2, reuse only an explicit target-matched `route_decision`; otherwise MUST load/read/use `trellis-route(implement|check)` (or its local `SKILL.md`) to resolve session runtime state/prefs, write the resolved decision, or show numbered fallback and wait.
-Plain preferences, ordinary summaries, `codex-mode`, raw `.runtime` files, and empty/old prefs are not route evidence by themselves; only `trellis-route` may validate runtime route state.
-User reselect/override/use-X-this-time/clear-default wins over remembered route evidence, runtime state, and prefs.
-Ignore lower Active Task Routing shortcuts that dispatch implement/check directly. Do not spawn `trellis-implement` or `trellis-check*` unless the resolved route selected subagent. If route cannot be resolved, do not default to inline.
-After `trellis-check` / `trellis-check-all`, stop and report; point the user to Phase 3.4 `trellis-push` (or commit-only when needed). Do not run `/trellis:finish-work` unless the user explicitly asks after Phase 3.4 is complete.
-This guard overrides any lower `Flow: ... -> /trellis:finish-work` line in this state block.
-At Phase 3.4, code commit/push goes through `trellis-push` (commit-only mode for commit-without-push); never bare `git commit`/`git push` on code (hub: Code Commit Confirmation Gate).
+Hub is source of truth for Task Brief, Routing, Post-Check, Commit, and Snapshot gates.
+Before first implement route, restate `<task>/brief.md`; if missing, read artifacts and suggest backfill.
+New work not plainly covered by active task title/brief: stop before route/edits; recommend new task; if declined, confirm untracked work; if it belongs here, update artifacts first.
+At project-local knowledge boundaries, run `spec_router.py`; skip trivial/read-only turns unless local conventions may affect the approach.
+Phase 2.1/2.2: reuse only explicit target-matched `route_decision`; otherwise invoke `trellis-route`. If skill invocation is unavailable, read local `trellis-route/SKILL.md`, show numbered choices, and wait.
+Summaries, preferences, `codex-mode`, raw `.runtime`, and empty/stale prefs are not route evidence unless `trellis-route` validates them; user reselect/override wins.
+Ignore lower direct-dispatch shortcuts. Do not spawn `trellis-implement` or `trellis-check*` unless route selected subagent. If route cannot be resolved, do not default inline.
+After check/check-all, stop and report; Phase 3.4 uses `trellis-push`, never bare git commit/push; finish-work is explicit-only after Phase 3.4.
+Overrides lower `Flow: ... -> /trellis:finish-work` lines.
 Push snapshot recovery: follow the hub; use `push_snapshot.py status --json` only when needed.
 <!-- END skill-garden workflow-state in_progress v0.6 -->

package/enhancements/0.6/overrides/workflow-states/no_task.md

@@ -3,7 +3,7 @@ HIGHEST PRIORITY SKILL-GARDEN STATE GUARD (no_task):
 Creating or resuming a task is not implementation permission.
 After PRD is ready and the task is started, the next implementation action is Phase 2.1 `trellis-route(implement)` unless a valid current-task implement route decision already exists.
 If no active task exists, use `push_snapshot.py status --json` once per session; if it returns candidates, relay them and suggest rebinding before resuming.
-At project-local knowledge decision boundaries, run `.trellis/scripts/spec_router.py "<intended action>"`; read high-confidence matches before acting; skip pure Q&A, simple read-only inspection, opening local tools, or trivial edits unless local conventions may affect the approach.
-Do NOT call the harness built-in plan mode (`EnterPlanMode` / `ExitPlanMode`) for Trellis planning. It is not a substitute for Trellis task-creation consent, Trellis planning, or the route gate. For complex work, classify the turn, ask for task-creation consent, then use `trellis-brainstorm`.
-If the turn is a meta edit to Trellis itself and Trellis tracking would be overkill, say so and ask to skip Trellis; never silently swap built-in plan mode in for the consent gate.
+At project-local knowledge boundaries, run `spec_router.py`; skip trivial/read-only turns unless local conventions may affect the approach.
+Do NOT call the harness built-in plan mode (`EnterPlanMode` / `ExitPlanMode`) for Trellis planning. It is not a substitute for Trellis task-creation consent, Trellis planning, or the route gate. For new, complex, or unclear work, classify the turn, ask for task-creation consent, then use `trellis-brainstorm`; `task.py create` and the default `prd.md` are not sufficient planning.
+For lightweight Trellis meta edits, ask/confirm skipping Trellis tracking before edits.
 <!-- END skill-garden workflow-state no_task v0.6 -->

package/enhancements/0.6/overrides/workflow-states/planning-inline.md

@@ -1,9 +1,11 @@
 <!-- BEGIN skill-garden workflow-state planning_inline v0.6 -->
 HIGHEST PRIORITY SKILL-GARDEN STATE GUARD (planning-inline):
 Planning is not implementation permission.
+`trellis-brainstorm` is the default next action while requirements are still unclear.
+A created task or existing `prd.md` is not enough to start implementation.
 Complete prd.md + required context first.
 If the active workflow later routes to sub-agent execution, required context includes real curated entries in both `implement.jsonl` and `check.jsonl`; the seed `_example` row alone is not ready.
 Before `task.py start`, use `trellis-task-brief` to refresh `brief.md` from the latest task artifacts and display it in chat for review.
-At project-local knowledge decision boundaries, run `.trellis/scripts/spec_router.py "<intended action>"`; read high-confidence matches before acting; skip pure Q&A, simple read-only inspection, opening local tools, or trivial edits unless local conventions may affect the approach.
+At project-local knowledge boundaries, run `spec_router.py`; skip trivial/read-only turns unless local conventions may affect the approach.
 After status becomes in_progress, next action = `trellis-route(implement)`, not direct edits.
 <!-- END skill-garden workflow-state planning_inline v0.6 -->

package/enhancements/0.6/overrides/workflow-states/planning.md

@@ -1,9 +1,11 @@
 <!-- BEGIN skill-garden workflow-state planning v0.6 -->
 HIGHEST PRIORITY SKILL-GARDEN STATE GUARD (planning):
 Planning is not implementation permission.
+`trellis-brainstorm` is the default next action while requirements are still unclear.
+A created task or existing `prd.md` is not enough to start implementation.
 Complete prd.md + required context first.
 For sub-agent-dispatch platforms, required context includes real curated entries in both `implement.jsonl` and `check.jsonl`; the seed `_example` row alone is not ready.
 Before `task.py start`, use `trellis-task-brief` to refresh `brief.md` from the latest task artifacts and display it in chat for review.
-At project-local knowledge decision boundaries, run `.trellis/scripts/spec_router.py "<intended action>"`; read high-confidence matches before acting; skip pure Q&A, simple read-only inspection, opening local tools, or trivial edits unless local conventions may affect the approach.
+At project-local knowledge boundaries, run `spec_router.py`; skip trivial/read-only turns unless local conventions may affect the approach.
 After status becomes in_progress, next action = `trellis-route(implement)`, not direct edits.
 <!-- END skill-garden workflow-state planning v0.6 -->

package/enhancements/0.6/overrides/workflow.md

@@ -10,6 +10,14 @@
 
 **Mechanical rule**: use this hub as the source of truth. Do not add separate top-level skill-garden override sections or multiple skill-garden sentinels inside the same `workflow-state:*` block.
 
+#### Brainstorm Gate
+
+`trellis-brainstorm` is the required Phase 1.1 gate for new, complex, or unclear work.
+
+`task.py create` only creates the planning workspace. A default `prd.md` does not mean requirements are ready.
+
+Before `task.py start`, unclear scope, unresolved decisions, or non-testable acceptance criteria must return to `trellis-brainstorm`.
+
 #### Project Knowledge Discovery
 
 Before choosing an approach for non-trivial project work, run project knowledge
@@ -26,12 +34,10 @@ Build the query from the current user request plus relevant immediate context:
 the intended action, commands about to run, files or systems involved, package/layer,
 and domain words matching the trigger list above.
 
-Read high-confidence matches before acting. For medium-confidence matches, read only
-when the path, heading, index description, or reason clearly fits the intended change.
-If nothing matches, continue normally.
-
-Do not run discovery for pure Q&A, simple read-only inspection, opening local tools,
-or trivial edits unless the request mentions project conventions or local SOPs may
+Read high-confidence matches before acting; read medium-confidence matches only when
+the path, heading, index description, or reason clearly fits the intended change.
+If nothing matches, continue normally. Skip pure Q&A, simple read-only inspection,
+opening local tools, or trivial edits unless project conventions or local SOPs may
 change the approach.
 
 #### Task Brief Handoff
@@ -68,7 +74,7 @@ At each route boundary:
 2. Otherwise you MUST invoke `trellis-route(target=implement|check)` before deciding; if the platform cannot invoke skills directly, read the local `trellis-route/SKILL.md` copy and follow its numbered fallback choices in normal chat and wait. `trellis-route` owns session runtime recovery, `.route-prefs.tmp`, fallback choices, runtime-state writes, and dispatch mapping.
 3. If the route helper cannot ask through `AskUserQuestion` / `request_user_input`, ask the same numbered choices from `trellis-route` in normal chat and wait.
 
-Plain user preference, ordinary summaries (compact/SessionStart or otherwise), replacement history, historical bare numeric replies, `codex-mode`, empty/old prefs, and raw `.trellis/.runtime/sessions/*` `route_decisions` content that has not been validated by `trellis-route` are not route evidence by themselves; numbered fallback validity is governed by `trellis-route`.
+Plain preferences, summaries (including compact/SessionStart), replacement history, historical bare numeric replies, `codex-mode`, empty/stale prefs, and raw runtime files are not route evidence unless validated by `trellis-route`; numbered fallback validity is governed by `trellis-route`.
 
 User reselect/override/use-X-this-time/clear-default wins over remembered route evidence, runtime state, and personal prefs.
 

package/enhancements/MANIFEST.json

@@ -1,7 +1,7 @@
 {
-  "syncedAt": "2026-07-07T12:53:36.169Z",
+  "syncedAt": "2026-07-08T00:31:59.624Z",
   "syncedFrom": "vendor/skill-garden",
-  "sourceCommit": "363dd9b54506b6cc67415e2bf76a856b743b7534",
+  "sourceCommit": "c52e2dd6a16dff1317379a804d69b189c9527c81",
   "common": {
     "codexSkills": [
       "craft-rpa",
@@ -50,6 +50,7 @@
       "overrides": [],
       "workflowStates": [],
       "skillOverrides": [],
+      "hookOverrides": [],
       "scripts": []
     },
     "0.5": {
@@ -89,6 +90,7 @@
       ],
       "workflowStates": [],
       "skillOverrides": [],
+      "hookOverrides": [],
       "scripts": []
     },
     "0.6": {
@@ -136,6 +138,9 @@
       "skillOverrides": [
         "trellis-finish-work.md"
       ],
+      "hookOverrides": [
+        "shared/inject-workflow-state.py"
+      ],
       "scripts": [
         "auto_loop.py",
         "push_snapshot.py",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flower-trellis",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "一键安装/升级 Trellis 并自动融合 skill-garden 强化包(默认 Claude + agents)",
   "type": "module",
   "bin": {
@@ -58,9 +58,9 @@
     "commit-and-tag-version": "^12.7.3"
   },
   "flowerReleaseNotes": {
-    "version": "0.4.6",
+    "version": "0.4.8",
     "source": "CHANGELOG.md",
-    "body": "### ✨ 新功能 Features\n\n* **update:** 注入跨版本更新摘要并联动 push 确认 ([bbdb23c](https://github.com/SilentFlower/flower-trellis/commit/bbdb23c33eac9948235c65f6be6f18764f90a88d))",
+    "body": "### ✨ 新功能 Features\n\n* **flower:** 支持从 skill-garden 分发 hook override,并在 Codex 已有 `SessionStart` 时去掉重复的 `trellis-start` 提示。\n\n\n### 🐛 修复 Bug Fixes\n\n* **flower:** 修复项目版本追平提示不展示 release notes 的问题。",
     "truncated": false
   }
 }

package/src/assets/flower_update_hook.py

@@ -80,6 +80,15 @@ def _json_bool(value: object) -> str:
     return json.dumps(bool(value), ensure_ascii=False)
 
 
+def _has_release_notes(data: dict) -> bool:
+    """判断 self-check 是否提供了可展示的 release notes。"""
+    notes = data.get("releaseNotes")
+    if not isinstance(notes, dict):
+        return False
+    versions = notes.get("versions")
+    return isinstance(versions, list) and bool(versions)
+
+
 def _release_notes_lines(data: dict) -> list[str]:
     """把 self-check 的 releaseNotes 摘要格式化为短字段。"""
     notes = data.get("releaseNotes")
@@ -109,8 +118,6 @@ def _release_notes_lines(data: dict) -> list[str]:
         range_text = f"{note_range.get('from')} -> {note_range.get('to')}"
         if note_range.get("channel"):
             range_text += f" ({note_range.get('channel')})"
-        if note_range.get("reason"):
-            range_text += f" reason={note_range.get('reason')}"
         lines.append(f"release_notes_range: {range_text}")
     if safe_versions:
         lines.append(
@@ -119,11 +126,24 @@ def _release_notes_lines(data: dict) -> list[str]:
         )
     elif notes.get("unavailable"):
         lines.append("release_notes_unavailable: true")
-    lines.append(f"release_notes_truncated: {_json_bool(notes.get('truncated'))}")
-    lines.append(f"release_notes_more_versions: {_json_bool(notes.get('moreVersions'))}")
+    if notes.get("truncated"):
+        lines.append(f"release_notes_truncated: {_json_bool(notes.get('truncated'))}")
+    if notes.get("moreVersions"):
+        lines.append(f"release_notes_more_versions: {_json_bool(notes.get('moreVersions'))}")
     return lines
 
 
+def _ai_instruction(data: dict, command: str | None) -> str | None:
+    """生成面向 AI 的单条动作指令,避免重复字段互相打架。"""
+    ai = data.get("ai") or {}
+    instruction = ai.get("instruction")
+    if ai.get("mode") == "ask" and command:
+        if _has_release_notes(data):
+            return "先展示 release_notes 摘要和 recommended_command,再询问用户确认;确认前禁止执行 recommended_command。"
+        return "先展示 recommended_command,再询问用户确认;确认前禁止执行 recommended_command。"
+    return instruction if isinstance(instruction, str) and instruction else None
+
+
 def _format_context(data: dict) -> str:
     """把 self-check JSON 转成给 AI 读取的短上下文块。"""
     current = data.get("current") or {}
@@ -132,22 +152,22 @@ def _format_context(data: dict) -> str:
     ai = data.get("ai") or {}
     safety = data.get("safety") or {}
     out_of_sync_reasons = project.get("outOfSyncReasons") or []
+    current_trellis = current.get("bundledTrellisVersion")
+    project_trellis = project.get("trellisVersion")
     lines = [
         "<flower-update>",
         "priority: blocking_confirmation_required",
         "instruction_scope: first_assistant_reply",
         f"status: {data.get('status')}",
-        f"policy: {data.get('policy')}",
         f"current_flower: {current.get('flowerVersion')}",
         f"project_flower: {project.get('flowerVersion')}",
-        f"bundled_trellis: {current.get('bundledTrellisVersion')}",
-        f"project_trellis: {project.get('trellisVersion')}",
     ]
-    if "outOfSync" in project:
-        lines.append(f"project_out_of_sync: {project.get('outOfSync')}")
+    if current_trellis and project_trellis and current_trellis != project_trellis:
+        lines.append(f"bundled_trellis: {current_trellis}")
+        lines.append(f"project_trellis: {project_trellis}")
     if out_of_sync_reasons:
         lines.append(f"project_out_of_sync_reasons: {', '.join(out_of_sync_reasons)}")
-    if remote.get("tags"):
+    if data.get("status") == "update_available" and remote.get("tags"):
         lines.append(f"remote: {json.dumps(remote.get('tags'), ensure_ascii=False)}")
     if remote.get("errorCode"):
         lines.append(f"remote_error_code: {remote.get('errorCode')}")
@@ -157,14 +177,9 @@ def _format_context(data: dict) -> str:
         lines.append(f"recommended_command: {command}")
     if safety.get("reasons"):
         lines.append(f"safety_reasons: {', '.join(safety.get('reasons') or [])}")
-    if ai.get("mode"):
-        lines.append(f"ai_mode: {ai.get('mode')}")
-    if ai.get("mode") == "ask":
-        lines.append(
-            "ai_required_action: 必须先向用户展示 release_notes 摘要和 recommended_command,再提出明确确认问题;用户确认前禁止执行 recommended_command。"
-        )
-    if ai.get("instruction"):
-        lines.append(f"ai_instruction: {ai.get('instruction')}")
+    instruction = _ai_instruction(data, command)
+    if instruction:
+        lines.append(f"ai_instruction: {instruction}")
     lines.append("</flower-update>")
     return "\n".join(lines)
 
@@ -173,10 +188,8 @@ def _system_message(data: dict) -> str:
     """生成 Codex / Claude Code 更容易注意到的短系统提示。"""
     ai = data.get("ai") or {}
     command = (data.get("commands") or {}).get("recommended") or ai.get("command")
-    notes = data.get("releaseNotes") or {}
-    has_notes = isinstance(notes, dict) and bool(notes.get("versions"))
     if ai.get("mode") == "ask" and command:
-        if has_notes:
+        if _has_release_notes(data):
             return "flower-trellis 发现可执行更新;必须先展示更新摘要并询问用户是否执行 recommended_command,确认前禁止运行。"
         return "flower-trellis 发现可执行更新;必须先询问用户是否执行 recommended_command,确认前禁止运行。"
     if command:

package/src/lib/apply-enhancements.js

@@ -4,6 +4,7 @@ import { copySkills } from "./copy-skills.js";
 import { copyScriptAssets } from "./copy-scripts.js";
 import { injectWorkflow } from "./workflow-inject.js";
 import { injectSkillOverrides } from "./skill-override-inject.js";
+import { injectHookOverrides } from "./hook-override-inject.js";
 import { applyCodexTweaks } from "./codex-tweaks.js";
 import { applyClaudeTweaks } from "./claude-tweaks.js";
 import { copyFlowerAssets } from "./flower-assets.js";
@@ -33,7 +34,7 @@ function pruneEmptyDirs(target) {
  * 叠加强化包 —— init / update 共享。
  *
  * 流程:校验是 Trellis 项目 → 选变体 → 铺 skill → 升级清理(删过期)
- * → 注入 workflow → 注入 skill override。
+ * → 注入 workflow → 注入 skill override → 注入 hook override。
  *
  * 升级清理:用 flower manifest 记录上次全装铺过的精确路径,本次全装时删除
  * 「上次有、这次变体不含」的过期项(覆盖 0.5/old → 0.6 升级)。仅全装(无 --skills)
@@ -145,6 +146,21 @@ export function applyEnhancements(target, opts = {}) {
     }
   }
 
+  if (skills.length === 0) {
+    const r = injectHookOverrides(target, variantDir);
+    if (r.skipped) {
+      console.log(`  · hook override 注入跳过(${r.reason})`);
+    } else if (r.changed === 0 && r.unchanged === 0) {
+      console.log(`  · hook override 注入跳过(目标缺少可覆盖的 hook)`);
+    } else if (r.changed === 0) {
+      const note = r.backupNotes.length ? r.backupNotes.join("") : "";
+      console.log(`  ✓ hook override 已是最新(${r.unchanged} 个入口)${note}`);
+    } else {
+      const note = r.backupNotes.length ? r.backupNotes.join("") : "";
+      console.log(`  ✓ hook override 已注入 ${r.changed} 个入口${note}`);
+    }
+  }
+
   // codex 平台后处理:旧 multi_agent_v2 兼容清理 + 合并 SessionStart hook + 强制 sub-agent 调度
   const codex = applyCodexTweaks(target);
   if (codex.applied) {

package/src/lib/hook-override-inject.js

@@ -0,0 +1,94 @@
+import fs from "node:fs";
+import path from "node:path";
+import { listFiles } from "./fs-utils.js";
+import { preserveFirstBackup } from "./backup.js";
+
+const SHARED_HOOK_TARGETS = {
+  "inject-workflow-state.py": [
+    ".codex/hooks/inject-workflow-state.py",
+    ".claude/hooks/inject-workflow-state.py",
+  ],
+};
+
+function toDisplayPath(value) {
+  return value.split(path.sep).join("/");
+}
+
+/** 对单个目标 hook 文件应用 shared hook override。 */
+function applyHookOverride(target, sourceFile, targetRel) {
+  const targetFile = path.join(target, ...targetRel.split("/"));
+  if (!fs.existsSync(targetFile)) {
+    return { status: "missing", target: targetRel };
+  }
+
+  const current = fs.readFileSync(targetFile, "utf8");
+  const next = fs.readFileSync(sourceFile, "utf8");
+  if (current === next) {
+    return { status: "unchanged", target: targetRel };
+  }
+
+  const { backupNote } = preserveFirstBackup(target, targetFile);
+  fs.writeFileSync(targetFile, next);
+  return { status: "changed", target: targetRel, backupNote };
+}
+
+/**
+ * 注入 skill-garden 的 shared hook override。
+ *
+ * override 源放在 `overrides/hooks/shared/<file>`,只覆盖目标项目已有的平台 hook 文件,
+ * 不创建未启用的平台目录。hook override 是对 Trellis 原生 hook 的覆盖,不写入
+ * `.flower-manifest.json` 的 paths,避免升级清理误删上游 hook。
+ *
+ * @param {string} target 目标项目根
+ * @param {string} variantDir 该变体在 enhancements/ 下的目录
+ * @returns {{skipped?:boolean,reason?:string,changed:number,unchanged:number,missing:number,unmapped:number,targets:string[],backupNotes:string[]}}
+ */
+export function injectHookOverrides(target, variantDir) {
+  const srcDir = path.join(variantDir, "overrides", "hooks", "shared");
+  const files = listFiles(srcDir);
+  if (files.length === 0) {
+    return {
+      skipped: true,
+      reason: "该变体无 hook override",
+      changed: 0,
+      unchanged: 0,
+      missing: 0,
+      unmapped: 0,
+      targets: [],
+      backupNotes: [],
+    };
+  }
+
+  let changed = 0;
+  let unchanged = 0;
+  let missing = 0;
+  let unmapped = 0;
+  const targets = [];
+  const backupNotes = new Set();
+
+  for (const file of files) {
+    const targetRels = SHARED_HOOK_TARGETS[file];
+    if (!targetRels) {
+      unmapped++;
+      continue;
+    }
+    const sourceFile = path.join(srcDir, file);
+    for (const targetRel of targetRels) {
+      const result = applyHookOverride(target, sourceFile, targetRel);
+      if (result.status === "changed") changed++;
+      else if (result.status === "unchanged") unchanged++;
+      else missing++;
+      if (result.status !== "missing") targets.push(toDisplayPath(result.target));
+      if (result.backupNote) backupNotes.add(result.backupNote);
+    }
+  }
+
+  return {
+    changed,
+    unchanged,
+    missing,
+    unmapped,
+    targets,
+    backupNotes: [...backupNotes],
+  };
+}

package/src/lib/self-check.js

@@ -55,12 +55,22 @@ function cachedReleaseNotes(updateCheck, range) {
   if (
     cachedRange.from !== range.from ||
     cachedRange.to !== range.to ||
-    cachedRange.channel !== range.channel ||
-    cachedRange.reason !== range.reason
+    cachedRange.channel !== range.channel
   ) {
     return null;
   }
-  return Array.isArray(cached.versions) && cached.versions.length ? cached : null;
+  if (!Array.isArray(cached.versions) || !cached.versions.length) return null;
+  // 同一版本范围的内容相同;reason 只是触发路径,不能让项目追平场景丢失摘要。
+  return {
+    ...cached,
+    range: {
+      ...cachedRange,
+      from: range.from,
+      to: range.to,
+      channel: range.channel,
+      reason: range.reason,
+    },
+  };
 }
 
 /**

package/src/lib/skill-override-inject.js

@@ -31,7 +31,8 @@ function stripSkillOverride(value, name) {
 }
 
 /**
- * 把 override 块插入到 frontmatter 后、正文前;无 frontmatter 时插到文件顶部。
+ * 把 override 块插入到 frontmatter 后、正文前;无 frontmatter 时优先插到首个 H1 后,
+ * 都没有才插到文件顶部。
  *
  * @param {string} value 已清理旧块的目标文本
  * @param {string} block override 块
@@ -44,6 +45,13 @@ function injectAfterFrontmatter(value, block) {
     const after = value.slice(m[0].length).replace(/^\n+/, "");
     return value.slice(0, m[0].length) + "\n" + b + "\n\n" + after;
   }
+  // 无 frontmatter 的 command 文件首行标题常被平台当作命令描述来源;
+  // override 放到标题后,避免把高优先级 override 标题暴露成命令名。
+  const h1 = /^# [^\n]*\n/.exec(value);
+  if (h1) {
+    const after = value.slice(h1[0].length).replace(/^\n+/, "");
+    return value.slice(0, h1[0].length) + "\n" + b + "\n\n" + after;
+  }
   return b + "\n\n" + value.replace(/^\n+/, "");
 }