flower-trellis 0.6.9 → 0.6.10-beta.1

package/enhancements/0.6/overrides/conflicts.json

@@ -310,6 +310,7 @@
         "workflow-state-stale-task-status",
         "workflow-state-untracked-helper",
         "workflow-state-breadcrumb-subject",
+        "workflow-state-conditional-heartbeat",
         "workflow-state-main-subject-routing"
       ],
       "assertion": {
@@ -320,15 +321,20 @@
           "# BEGIN skill-garden patch workflow-state-stale-task-status v0.6",
           "# BEGIN skill-garden patch workflow-state-untracked-helper v0.6",
           "# BEGIN skill-garden patch workflow-state-breadcrumb-subject v0.6",
+          "# BEGIN skill-garden patch workflow-state-conditional-heartbeat v0.6",
           "# BEGIN skill-garden patch workflow-state-main-subject-routing v0.6",
           "emit_worktree_local_trellis_missing",
           "DEFAULT_PROMPT_INJECTION_SKIP_KEYWORD = \"no-trellis\"",
+          "DEFAULT_WORKFLOW_STATE_HEARTBEAT_TURNS = 5",
+          "WORKFLOW_STATE_REFRESH_ARG = \"--trellis-session-start-refresh\"",
+          "root / \".trellis\" / \".runtime\" / \"workflow-state\"",
+          "<workflow-state-heartbeat>",
           "\"ZCODE_PROJECT_DIR\": \"zcode\"",
           "Normalize `codex.dispatch_mode` from .trellis/config.yaml to \"auto\" or \"inline\"."
         ]
       },
       "owner": "workflow-state",
-      "reason": "局部 Patch 必须同时保留 Flower subject 分支与 0.6.14 的 no-trellis、ZCode 和 Codex auto 能力。"
+      "reason": "局部 Patch 必须同时保留 Flower subject/条件心跳分支与 0.6.14 的 no-trellis、ZCode 和 Codex auto 能力。"
     },
     {
       "id": "paths-required-clear-result",

package/enhancements/0.6/overrides/patches/hooks/inject-workflow-state/shared-runtime/conditional-heartbeat-content.py

@@ -0,0 +1,226 @@
+import hashlib
+import time
+
+
+CONDITIONAL_WORKFLOW_STATE_PLATFORMS = {"codex", "claude"}
+DEFAULT_WORKFLOW_STATE_HEARTBEAT_TURNS = 5
+WORKFLOW_STATE_TRACKER_VERSION = 1
+WORKFLOW_STATE_REFRESH_ARG = "--trellis-session-start-refresh"
+
+
+def _resolve_heartbeat_turns(config: dict) -> int:
+    """Return the configured unchanged-turn heartbeat interval."""
+    raw = DEFAULT_WORKFLOW_STATE_HEARTBEAT_TURNS
+    if isinstance(config, dict):
+        section = config.get("prompt_injection")
+        if isinstance(section, dict):
+            raw = section.get("heartbeat_turns", raw)
+    if isinstance(raw, bool):
+        return DEFAULT_WORKFLOW_STATE_HEARTBEAT_TURNS
+    if isinstance(raw, int):
+        return raw if raw >= 0 else DEFAULT_WORKFLOW_STATE_HEARTBEAT_TURNS
+    if isinstance(raw, str) and re.fullmatch(r"[+-]?\d+", raw.strip()):
+        value = int(raw.strip())
+        return value if value >= 0 else DEFAULT_WORKFLOW_STATE_HEARTBEAT_TURNS
+    return DEFAULT_WORKFLOW_STATE_HEARTBEAT_TURNS
+
+
+def _resolve_workflow_state_context_key(
+    root: Path, input_data: dict, platform: str
+) -> str | None:
+    """Resolve the host session identity through Trellis' shared helper."""
+    scripts_dir = root / ".trellis" / "scripts"
+    if str(scripts_dir) not in sys.path:
+        sys.path.insert(0, str(scripts_dir))
+    try:
+        from common.active_task import resolve_context_key  # type: ignore[import-not-found]
+
+        context_key = resolve_context_key(input_data, platform)
+    except Exception:
+        return None
+    return context_key if isinstance(context_key, str) and context_key else None
+
+
+def _workflow_state_tracker_path(
+    root: Path, platform: str, context_key: str
+) -> Path:
+    """Return the opaque per-platform, per-session tracker path."""
+    identity = hashlib.sha256(f"{platform}:{context_key}".encode("utf-8")).hexdigest()
+    return root / ".trellis" / ".runtime" / "workflow-state" / f"{identity}.json"
+
+
+def _read_workflow_state_tracker(path: Path, platform: str) -> dict | None:
+    """Read and strictly validate a workflow-state tracker."""
+    try:
+        value = json.loads(path.read_text(encoding="utf-8"))
+    except (FileNotFoundError, json.JSONDecodeError, OSError):
+        return None
+    if not isinstance(value, dict):
+        return None
+    expected_keys = {
+        "version",
+        "platform",
+        "fingerprint",
+        "unchangedTurns",
+        "heartbeatTurns",
+        "updatedAt",
+    }
+    if set(value) != expected_keys:
+        return None
+    if value.get("version") != WORKFLOW_STATE_TRACKER_VERSION:
+        return None
+    if value.get("platform") != platform:
+        return None
+    fingerprint = value.get("fingerprint")
+    if not isinstance(fingerprint, str) or re.fullmatch(r"[0-9a-f]{64}", fingerprint) is None:
+        return None
+    unchanged_turns = value.get("unchangedTurns")
+    heartbeat_turns = value.get("heartbeatTurns")
+    if isinstance(unchanged_turns, bool) or not isinstance(unchanged_turns, int):
+        return None
+    if isinstance(heartbeat_turns, bool) or not isinstance(heartbeat_turns, int):
+        return None
+    if unchanged_turns < 0 or heartbeat_turns < 0:
+        return None
+    if heartbeat_turns == 0 and unchanged_turns != 0:
+        return None
+    if heartbeat_turns > 0 and unchanged_turns >= heartbeat_turns:
+        return None
+    updated_at = value.get("updatedAt")
+    if not isinstance(updated_at, str) or not updated_at:
+        return None
+    try:
+        time.strptime(updated_at, "%Y-%m-%dT%H:%M:%SZ")
+    except ValueError:
+        return None
+    return value
+
+
+def _workflow_state_record(
+    platform: str,
+    fingerprint: str,
+    unchanged_turns: int,
+    heartbeat_turns: int,
+) -> dict:
+    """Build the versioned tracker payload."""
+    return {
+        "version": WORKFLOW_STATE_TRACKER_VERSION,
+        "platform": platform,
+        "fingerprint": fingerprint,
+        "unchangedTurns": unchanged_turns,
+        "heartbeatTurns": heartbeat_turns,
+        "updatedAt": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
+    }
+
+
+def _write_workflow_state_tracker(path: Path, value: dict) -> bool:
+    """Atomically replace a workflow-state tracker after flushing it."""
+    temporary = path.with_name(
+        f".{path.name}.{os.getpid()}.{threading.get_ident()}.{time.time_ns()}.tmp"
+    )
+    try:
+        path.parent.mkdir(parents=True, exist_ok=True)
+        with temporary.open("x", encoding="utf-8") as handle:
+            handle.write(json.dumps(value, indent=2, ensure_ascii=False) + "\n")
+            handle.flush()
+            os.fsync(handle.fileno())
+        os.replace(temporary, path)
+        return True
+    except OSError:
+        try:
+            temporary.unlink()
+        except OSError:
+            pass
+        return False
+
+
+def _workflow_state_body(
+    templates: dict[str, str], status: str, breadcrumb_key: str
+) -> str:
+    """Return the exact selected workflow-state body or the standard fallback."""
+    body = templates.get(breadcrumb_key)
+    if body is None and breadcrumb_key != status:
+        body = templates.get(status)
+    return body if body is not None else "Refer to workflow.md for current step."
+
+
+def _workflow_state_action(
+    templates: dict[str, str], status: str, breadcrumb_key: str
+) -> str:
+    """Extract the first visible action line from the selected state body."""
+    body = _workflow_state_body(templates, status, breadcrumb_key)
+    visible = re.sub(r"<!--.*?-->", "", body, flags=re.DOTALL)
+    for raw_line in visible.splitlines():
+        line = raw_line.strip()
+        if line:
+            return line
+    return "Refer to workflow.md for current step."
+
+
+def _build_workflow_state_heartbeat(
+    subject: str,
+    action: str,
+    heartbeat_turns: int,
+    subject_summary: str | None = None,
+) -> str:
+    """Build an actionable reminder without repeating the full state body."""
+    lines = ["<workflow-state-heartbeat>", subject]
+    if subject_summary:
+        lines.append(f"Summary: {subject_summary}")
+    lines.extend(
+        [
+            f"Action: {action}",
+            (
+                f"State unchanged for {heartbeat_turns} user turns. "
+                "Continue following the latest full <workflow-state> block."
+            ),
+            "</workflow-state-heartbeat>",
+        ]
+    )
+    return "\n".join(lines)
+
+
+def _conditional_workflow_state_context(
+    root: Path,
+    input_data: dict,
+    platform: str | None,
+    config: dict,
+    full_context: str,
+    heartbeat: str,
+    force_refresh: bool,
+) -> str | None:
+    """Choose a full state, heartbeat, or silent output for the current event."""
+    if platform not in CONDITIONAL_WORKFLOW_STATE_PLATFORMS:
+        return full_context
+
+    context_key = _resolve_workflow_state_context_key(root, input_data, platform)
+    if context_key is None:
+        return full_context
+
+    heartbeat_turns = _resolve_heartbeat_turns(config)
+    fingerprint = hashlib.sha256(full_context.encode("utf-8")).hexdigest()
+    tracker_path = _workflow_state_tracker_path(root, platform, context_key)
+    tracker = _read_workflow_state_tracker(tracker_path, platform)
+
+    if force_refresh or tracker is None or tracker["fingerprint"] != fingerprint:
+        baseline = _workflow_state_record(platform, fingerprint, 0, heartbeat_turns)
+        _write_workflow_state_tracker(tracker_path, baseline)
+        return full_context
+
+    if tracker["heartbeatTurns"] != heartbeat_turns:
+        baseline = _workflow_state_record(platform, fingerprint, 0, heartbeat_turns)
+        if not _write_workflow_state_tracker(tracker_path, baseline):
+            return full_context
+        return None
+
+    unchanged_turns = 0 if heartbeat_turns == 0 else tracker["unchangedTurns"] + 1
+    output = None
+    if heartbeat_turns > 0 and unchanged_turns >= heartbeat_turns:
+        unchanged_turns = 0
+        output = heartbeat
+    next_record = _workflow_state_record(
+        platform, fingerprint, unchanged_turns, heartbeat_turns
+    )
+    if not _write_workflow_state_tracker(tracker_path, next_record):
+        return full_context
+    return output

package/enhancements/0.6/overrides/patches/hooks/inject-workflow-state/shared-runtime/conditional-heartbeat-selector.py

@@ -0,0 +1,3 @@
+# ---------------------------------------------------------------------------
+# Entry
+# ---------------------------------------------------------------------------

package/enhancements/0.6/overrides/patches/hooks/inject-workflow-state/shared-runtime/main-content.py

@@ -3,6 +3,7 @@ def main() -> int:
         return 0
 
     data = _load_hook_input()
+    force_refresh = WORKFLOW_STATE_REFRESH_ARG in sys.argv[1:]
 
     cwd_str = data.get("cwd") or os.getcwd()
     cwd = Path(cwd_str)
@@ -13,40 +14,61 @@ def main() -> int:
         return 0
 
     config = _read_trellis_config(root)
-    if prompt_has_skip_keyword(data.get("prompt", ""), _resolve_skip_keyword(config)):
+    if not force_refresh and prompt_has_skip_keyword(
+        data.get("prompt", ""), _resolve_skip_keyword(config)
+    ):
         return 0  # user opted out of the per-turn breadcrumb for this turn
 
     templates = load_breadcrumbs(root)
     platform = _detect_platform(data)
+    if force_refresh:
+        script_parts = set(Path(sys.argv[0]).parts)
+        if ".codex" in script_parts:
+            platform = "codex"
+        elif ".claude" in script_parts:
+            platform = "claude"
     task = get_active_task(root, data)
+    subject_summary = None
     if task is None:
         untracked = _get_untracked_work(root, data)
         if untracked is None:
             # No active task or untracked work — still emit a breadcrumb nudging
             # the AI toward intent routing when the user describes real work.
-            no_task_key = resolve_breadcrumb_key("no_task", platform, config)
+            status = "no_task"
+            breadcrumb_key = resolve_breadcrumb_key(status, platform, config)
+            subject = "Status: no_task"
             breadcrumb = build_breadcrumb(
-                None, "no_task", templates, breadcrumb_key=no_task_key
+                None, status, templates, breadcrumb_key=breadcrumb_key
             )
         else:
-            work_id, stage, summary = untracked
-            untracked_status = "untracked" if stage == "implement" else f"untracked_{stage}"
-            untracked_key = resolve_breadcrumb_key(untracked_status, platform, config)
+            work_id, stage, subject_summary = untracked
+            status = "untracked" if stage == "implement" else f"untracked_{stage}"
+            breadcrumb_key = resolve_breadcrumb_key(status, platform, config)
+            subject = f"Untracked work: {work_id} ({stage})"
             breadcrumb = build_breadcrumb(
                 None,
-                untracked_status,
+                status,
                 templates,
-                breadcrumb_key=untracked_key,
-                subject_label=f"Untracked work: {work_id} ({stage})",
-                subject_summary=summary,
+                breadcrumb_key=breadcrumb_key,
+                subject_label=subject,
+                subject_summary=subject_summary,
             )
     else:
         task_id, status, source = task
-        status_key = resolve_breadcrumb_key(status, platform, config)
+        breadcrumb_key = resolve_breadcrumb_key(status, platform, config)
+        subject = f"Task: {task_id} ({status})"
         source_for_breadcrumb = None if platform == "codex" else source
         breadcrumb = build_breadcrumb(
-            task_id, status, templates, source_for_breadcrumb, breadcrumb_key=status_key
+            task_id, status, templates, source_for_breadcrumb, breadcrumb_key=breadcrumb_key
         )
+
+    action = _workflow_state_action(templates, status, breadcrumb_key)
+    heartbeat = _build_workflow_state_heartbeat(
+        subject,
+        action,
+        _resolve_heartbeat_turns(config),
+        subject_summary=subject_summary,
+    )
     if platform == "codex":
         parts: list[str] = []
         if task is None and not _codex_has_trellis_session_start(root):
@@ -55,6 +77,18 @@ def main() -> int:
         parts.append(breadcrumb)
         breadcrumb = "\n\n".join(parts)
 
+    breadcrumb = _conditional_workflow_state_context(
+        root,
+        data,
+        platform,
+        config,
+        breadcrumb,
+        heartbeat,
+        force_refresh,
+    )
+    if breadcrumb is None:
+        return 0
+
     # 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

package/enhancements/0.6/overrides/patches/hooks/inject-workflow-state/shared-runtime/patch.json

@@ -100,6 +100,26 @@
       "selector": { "type": "literal", "source": "breadcrumb-selector.py" },
       "content": { "source": "breadcrumb-content.py" }
     },
+    {
+      "id": "workflow-state-conditional-heartbeat",
+      "operation": "insert",
+      "position": "before",
+      "targetPolicy": "each-existing",
+      "targets": [
+        { "kind": "file", "path": ".codex/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" },
+        { "kind": "file", "path": ".claude/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" },
+        { "kind": "file", "path": ".gemini/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" },
+        { "kind": "file", "path": ".qoder/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" },
+        { "kind": "file", "path": ".github/copilot/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" },
+        { "kind": "file", "path": ".codebuddy/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" },
+        { "kind": "file", "path": ".factory/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" },
+        { "kind": "file", "path": ".kiro/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" },
+        { "kind": "file", "path": ".trae/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" },
+        { "kind": "file", "path": ".zcode/hooks/inject-workflow-state.py", "missing": "skip", "markerStyle": "hash" }
+      ],
+      "selector": { "type": "literal", "source": "conditional-heartbeat-selector.py" },
+      "content": { "source": "conditional-heartbeat-content.py" }
+    },
     {
       "id": "workflow-state-main-subject-routing",
       "operation": "replace",

package/enhancements/MANIFEST.json

@@ -1,7 +1,7 @@
 {
-  "syncedAt": "2026-09-17T03:40:21.148Z",
+  "syncedAt": "2026-09-17T06:53:09.720Z",
   "syncedFrom": "vendor/skill-garden",
-  "sourceCommit": "94df742fdf6530a2bf8f72df68a5a9a30b929d7d",
+  "sourceCommit": "d08ae57c5479a0bef09bc545cf8959d8aedacb9f",
   "common": {
     "codexSkills": [
       "aliyun-ops",
@@ -179,6 +179,8 @@
         "hooks/inject-workflow-state/shared-runtime/breadcrumb-selector.py",
         "hooks/inject-workflow-state/shared-runtime/codex-session-start-content.py",
         "hooks/inject-workflow-state/shared-runtime/codex-session-start-selector.py",
+        "hooks/inject-workflow-state/shared-runtime/conditional-heartbeat-content.py",
+        "hooks/inject-workflow-state/shared-runtime/conditional-heartbeat-selector.py",
         "hooks/inject-workflow-state/shared-runtime/main-content.py",
         "hooks/inject-workflow-state/shared-runtime/main-selector.py",
         "hooks/inject-workflow-state/shared-runtime/patch.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flower-trellis",
-  "version": "0.6.9",
+  "version": "0.6.10-beta.1",
   "description": "一键安装/升级 Trellis 并自动融合 skill-garden 强化包(默认 Claude + agents)",
   "type": "module",
   "bin": {
@@ -70,9 +70,9 @@
     "commit-and-tag-version": "^12.7.3"
   },
   "flowerReleaseNotes": {
-    "version": "0.6.9",
+    "version": "0.6.10-beta.1",
     "source": "CHANGELOG.md",
-    "body": "### 🐛 修复 Bug Fixes\n\n* **ci:** 修复跨平台初始化、检出与迁移兼容 ([a06facc](https://github.com/SilentFlower/flower-trellis/commit/a06faccdcd7a6e8bd1829f4b41d35c252e814dd5))\n* **ci:** 补齐原生依赖构建并修正 Windows 迁移夹具 ([99ff392](https://github.com/SilentFlower/flower-trellis/commit/99ff392299612912c028686ff9b3c7204bf67aec))\n* **cli:** 修复 Windows 非交互完成后挂起 ([8c71a2b](https://github.com/SilentFlower/flower-trellis/commit/8c71a2b393288b1d7b5530c3d91510d72992fbc1))\n* **compat:** 修复 Windows/Linux Python 运行与跨平台回归 ([311c4ea](https://github.com/SilentFlower/flower-trellis/commit/311c4eac99c7fd9269f62d2b10a36fdda7618b40))\n* **hooks:** 修复跨平台 SessionStart 分段注入 ([5f6a0d4](https://github.com/SilentFlower/flower-trellis/commit/5f6a0d4325e6e8e4d39f230c7ac3a1de9fd0c9af))\n* **test:** 修复 SessionStart CI 对本地身份文件的依赖 ([28d8bcf](https://github.com/SilentFlower/flower-trellis/commit/28d8bcff8bdde2dbcb0b37468ec3937e9d17d543))\n* **update:** 修复共享超时状态与 PTY 受管提示 ([7c2c4dc](https://github.com/SilentFlower/flower-trellis/commit/7c2c4dc8a25c755cfd79864e80bd4a8305f362f5))\n\n\n### ⚡ 性能 Performance\n\n* **update:** 缩短升级等待并补充阶段耗时诊断 ([94788f4](https://github.com/SilentFlower/flower-trellis/commit/94788f4023b2af047e71b4689bc3716bed32fd21))\n\n\n### 📝 文档 Docs\n\n* **spec:** 要求跨平台脚本和指令通过 GitHub Actions 验收 ([87aa9b8](https://github.com/SilentFlower/flower-trellis/commit/87aa9b8936167d422f3752d4bb9f5cd958a41471))",
+    "body": "### ✨ 新功能 Features\n\n* **hooks:** 优化 workflow-state 条件注入 ([ecd9555](https://github.com/SilentFlower/flower-trellis/commit/ecd9555f9c8959a3f3c862f9cda8bf8e7153fbd5))",
     "truncated": false
   },
   "optionalDependencies": {

package/src/assets/flower_session_start.py

@@ -20,6 +20,7 @@ MAX_PART_CHARS = 8000
 WORKFLOW_BLOCK = re.compile(r"<trellis-workflow>\n(.*?)\n</trellis-workflow>\n*", re.DOTALL)
 ASTRA_MODEL = "gpt-6-astra"
 ASTRA_HINT_MAX_BYTES = 2048
+WORKFLOW_STATE_REFRESH_ARG = "--trellis-session-start-refresh"
 ASTRA_WORKFLOW_HINT = """<trellis-astra-workflow-hint model="gpt-6-astra" version="1">
 Applies only while the active model is gpt-6-astra; it does not apply after switching models. Perform checks internally, without a routine checklist report. Keep ordinary answers brief.
 When executing the current task:
@@ -119,6 +120,50 @@ def _run_native_hook(root: Path, hook: str, hook_input: dict) -> dict | None:
     return output
 
 
+def _run_workflow_state_refresh(root: Path, hook: str, hook_input: dict) -> str:
+    """在独立解释器中刷新当前完整 workflow-state 与会话基线。
+
+    @param root: 当前部署项目根目录。
+    @param hook: 已验证的原生平台 SessionStart hook 相对路径。
+    @param hook_input: 宿主传入并已规范化 cwd 的事件 JSON。
+    @return: workflow-state Hook 返回的完整 additionalContext。
+    """
+    workflow_hook = hook.replace("session-start.py", "inject-workflow-state.py")
+    environment = os.environ.copy()
+    environment["PYTHONIOENCODING"] = "utf-8"
+    result = subprocess.run(
+        [
+            sys.executable,
+            "-X",
+            "utf8",
+            str(root / workflow_hook),
+            WORKFLOW_STATE_REFRESH_ARG,
+        ],
+        cwd=root,
+        env=environment,
+        input=json.dumps(hook_input, ensure_ascii=False).encode("utf-8"),
+        capture_output=True,
+        check=False,
+    )
+    stderr = result.stderr.decode("utf-8", errors="replace")
+    if stderr:
+        sys.stderr.write(stderr)
+        sys.stderr.flush()
+    if result.returncode != 0:
+        raise ValueError(f"workflow-state hook 退出码 {result.returncode}")
+    stdout = result.stdout.decode("utf-8-sig")
+    if not stdout.strip():
+        raise ValueError("workflow-state hook 未返回刷新内容")
+    output = json.loads(stdout)
+    if not isinstance(output, dict):
+        raise ValueError("workflow-state hook 输出必须为 JSON 对象")
+    hook_output = output.get("hookSpecificOutput")
+    context = hook_output.get("additionalContext") if isinstance(hook_output, dict) else None
+    if not isinstance(context, str) or not context:
+        raise ValueError("workflow-state hook 缺少 additionalContext")
+    return context
+
+
 def render_part(root: Path, hook: str, part: str, hook_input: dict) -> dict | None:
     """生成指定分段，只有 state 执行原生主入口的副作用。
 
@@ -143,6 +188,15 @@ def render_part(root: Path, hook: str, part: str, hook_input: dict) -> dict | No
         if re.fullmatch(r"Trellis context injected \(\d+ chars\)", result.get("systemMessage", "")):
             # 原计数对应拆分前的全文；保留其他原生诊断，避免以后吞掉重要提示。
             result.pop("systemMessage")
+        try:
+            workflow_state = _run_workflow_state_refresh(root, hook, hook_input)
+            separator = "" if not context or context.endswith("\n") else "\n"
+            context = f"{context}{separator}{workflow_state}"
+        except Exception as error:
+            # 条件注入是可恢复优化；失败时保留原生状态，让下一次用户输入完整降级恢复。
+            message = f"workflow-state 基线未刷新：{error}"
+            result["systemMessage"] = "\n".join(filter(None, [result.get("systemMessage"), message]))
+            print(message, file=sys.stderr)
         if (hook == HOOKS[0] and hook_input.get("model") == ASTRA_MODEL
                 and hook_input.get("source") in ("startup", "clear", "compact")):
             try:

package/src/lib/patch-engine.js

@@ -1027,6 +1027,11 @@ function prepareFilePlan(files, targetRoot, targetSpec, operation) {
     targetSpec.path,
     `patch ${operation.id} target.path`,
   );
+  const plannedFile = files.get(targetSpec.path);
+  if (plannedFile) {
+    // 同一轮中前序操作可能刚创建该文件，后续操作应基于内存结果继续计算。
+    return { filePlan: plannedFile };
+  }
   const exists = fs.existsSync(targetFile);
   if (!exists) {
     if (targetSpec.missing === "skip") return { status: "missing-target" };
@@ -1037,22 +1042,19 @@ function prepareFilePlan(files, targetRoot, targetSpec, operation) {
   } else {
     assertExistingPathInside(targetRoot, targetFile, `patch ${operation.id} target`);
   }
-  let filePlan = files.get(targetSpec.path);
-  if (!filePlan) {
-    const original = exists ? fs.readFileSync(targetFile, "utf8") : null;
-    filePlan = {
-      target: targetSpec.path,
-      targetFile,
-      original,
-      originalExists: exists,
-      next: original ?? "",
-      operations: [],
-      patches: [],
-      bundles: [],
-      operationEntries: [],
-    };
-    files.set(targetSpec.path, filePlan);
-  }
+  const original = exists ? fs.readFileSync(targetFile, "utf8") : null;
+  const filePlan = {
+    target: targetSpec.path,
+    targetFile,
+    original,
+    originalExists: exists,
+    next: original ?? "",
+    operations: [],
+    patches: [],
+    bundles: [],
+    operationEntries: [],
+  };
+  files.set(targetSpec.path, filePlan);
   return { filePlan };
 }
 

package/src/lib/platform-patch-adapters.js

@@ -226,6 +226,29 @@ function parseYamlKeyContent(content) {
   return { desiredValue: parsed.value, commentSection };
 }
 
+function parseYamlCommentSectionContent(content) {
+  if (typeof content !== "string" || !content.trimStart().startsWith("{")) {
+    return { error: "yaml-comment-section content 必须是合法 JSON 对象" };
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return { error: "yaml-comment-section content 必须是合法 JSON 对象" };
+  }
+  if (
+    !isPlainObject(parsed) ||
+    typeof parsed.heading !== "string" ||
+    !parsed.heading ||
+    !Array.isArray(parsed.lines) ||
+    !parsed.lines.every((line) => typeof line === "string") ||
+    !["skip", "error"].includes(parsed.missing || "error")
+  ) {
+    return { error: "yaml-comment-section content 配置无效" };
+  }
+  return { section: parsed };
+}
+
 function replaceYamlCommentSection(lines, section) {
   if (!section) return { lines };
   const heading = `# ${section.heading}`;
@@ -254,7 +277,14 @@ function replaceYamlCommentSection(lines, section) {
       break;
     }
   }
-  if (end < 0) return { error: `YAML 注释段缺少结束分隔线:${section.heading}` };
+  if (end < 0) {
+    if (dividerCount === 0) {
+      return { error: `YAML 注释段缺少标题分隔线:${section.heading}` };
+    }
+    // 最后一段可能没有下一段分隔线；保留随后的用户顶层配置，否则替换到文件末尾。
+    end = lines.findIndex((line, index) => index > headingIndex && isTopLevelKey(line));
+    if (end < 0) end = lines.length;
+  }
   lines.splice(start, end - start, ...section.lines);
   return { lines };
 }
@@ -329,6 +359,21 @@ function applyYamlKey({ value, operation }) {
   return { value: desired, source: "structured" };
 }
 
+function applyYamlCommentSection({ value, operation }) {
+  if (operation.operation !== "replace") {
+    return { error: "yaml-comment-section 只支持 replace" };
+  }
+  const parsed = parseYamlCommentSectionContent(operation.content);
+  if (parsed.error) return parsed;
+  const normalized = value.replace(/\r\n/g, "\n");
+  const hadFinalNewline = normalized.endsWith("\n");
+  const lines = normalized ? normalized.replace(/\n$/, "").split("\n") : [];
+  const commentResult = replaceYamlCommentSection(lines, parsed.section);
+  if (commentResult.error) return { error: commentResult.error };
+  const desired = lines.join("\n") + (hadFinalNewline || lines.length > 0 ? "\n" : "");
+  return { value: desired, source: "structured" };
+}
+
 function parseTomlSectionHeader(line) {
   const value = line.trim();
   if (!value.startsWith("[")) return { header: null };
@@ -412,6 +457,7 @@ function applyTomlSection({ value, operation }) {
 export function flowerPatchAdapters(pythonCommand = "python3") {
   return {
     "json-hook-command": (context) => applyJsonHookCommand({ ...context, pythonCommand }),
+    "yaml-comment-section": applyYamlCommentSection,
     "yaml-key": applyYamlKey,
     "toml-section": applyTomlSection,
   };

package/src/patches/bundles/flower-platform-integration.json

@@ -6,6 +6,7 @@
   "patches": [
     "codex/session-start-hooks",
     "codex/dispatch-mode",
+    "workflow-state-config",
     "codex/remove-multi-agent-v2",
     "claude/startup-update-hook",
     "claude/session-start-hooks",

package/src/patches/platforms/workflow-state-config/comment-section.json.txt

@@ -0,0 +1,24 @@
+{
+  "heading": "Per-turn prompt injection",
+  "missing": "skip",
+  "lines": [
+    "#-------------------------------------------------------------------------------",
+    "# Per-turn prompt injection",
+    "#-------------------------------------------------------------------------------",
+    "# Escape hatch for the per-turn <workflow-state> breadcrumb. When a user",
+    "# prompt contains the skip keyword as a standalone word (case-insensitive,",
+    "# word-boundary match — \"no-trellisfoo\" does NOT count), the breadcrumb is",
+    "# skipped for that turn only. Does not affect SessionStart or sub-agent",
+    "# context injection.",
+    "#",
+    "# Codex and Claude suppress unchanged workflow-state bodies. A short heartbeat",
+    "# is emitted after the configured number of unchanged user prompts. The default",
+    "# is 5; 0 disables heartbeats; invalid or negative values fall back to 5.",
+    "# State changes and startup / clear / compact still emit the full state.",
+    "#",
+    "# prompt_injection:",
+    "#   skip_keyword: \"no-trellis\"   # \"\" disables the escape hatch entirely",
+    "#   heartbeat_turns: 5          # 0 disables unchanged-state heartbeats",
+    ""
+  ]
+}

package/src/patches/platforms/workflow-state-config/patch.json

@@ -0,0 +1,36 @@
+{
+  "schemaVersion": 2,
+  "id": "flower-workflow-state-config",
+  "purpose": "platform_config",
+  "operations": [
+    {
+      "id": "flower-workflow-state-config-codex",
+      "operation": "replace",
+      "targets": [
+        {
+          "kind": "yaml",
+          "path": ".trellis/config.yaml",
+          "missing": "skip",
+          "requires": [".codex"]
+        }
+      ],
+      "selector": { "type": "yaml-comment-section" },
+      "content": { "source": "comment-section.json.txt" }
+    },
+    {
+      "id": "flower-workflow-state-config-claude",
+      "operation": "replace",
+      "after": ["flower-workflow-state-config-codex"],
+      "targets": [
+        {
+          "kind": "yaml",
+          "path": ".trellis/config.yaml",
+          "missing": "skip",
+          "requires": [".claude"]
+        }
+      ],
+      "selector": { "type": "yaml-comment-section" },
+      "content": { "source": "comment-section.json.txt" }
+    }
+  ]
+}