flower-trellis 0.6.0-beta.2 → 0.6.0-beta.4

package/README.md

@@ -86,7 +86,7 @@ flower-trellis -v
 | `update` | 升级 Trellis,并按新版本重新叠加强化包 |
 | `self-check` | 输出启动更新检查 JSON,供 Codex / Claude Code hook 和 AI 自动化读取 |
 | `self-update` | 受控升级 flower-trellis 并对目标项目执行完整 `flower-trellis update` 重叠加 |
-| `update-check` | 管理 `.trellis/.flower-manifest.json` 内的启动更新检查策略 |
+| `update-check` | 管理 `.flower/settings.json` 内的启动更新策略和提示节流 |
 | `telemetry` | 查询、启用或停用用户级匿名安装遥测 |
 | `plugin` | 管理 Flower Plugin、Marketplace 来源、GitLab 授权和作者校验 |
 | `uninstall` | 移除 Trellis 本体并清理强化包残留(支持 `-y` / `--dry-run`) |
@@ -204,16 +204,17 @@ flower-trellis plugin add flower/flower-plugin-author --platform codex --json
 flower-trellis self-check --json --target .
 ```
 
-发现可更新或项目已铺版本不一致时,向 AI 注入 `<flower-update>` 上下文。无更新、离线、关闭检查、npx 临时运行时默认不打扰。
+发现可更新或项目已铺版本不一致时,向 AI 注入 `<flower-update>` 上下文。无更新、离线、关闭检查、npx 临时运行时默认不打扰;同一更新提示会按本机提示节流状态降噪。
 
 检查分两层:
 
-- **本地一致性检查**:每次启动都会比对当前安装的 `flower-trellis` / 捆绑 Trellis 版本与项目 `.trellis/.flower-manifest.json` / `.trellis/.version`;不受 `intervalHours` 限制。
+- **本地一致性检查**:每次启动都会比对当前安装的 `flower-trellis` / 捆绑 Trellis 版本与项目 `.flower/plugin-lock.json` / `.trellis/.flower-manifest.json` / `.trellis/.version`;不受 `intervalHours` 限制。
 - **远程版本探测**:访问 npm registry 读取 `flower-trellis` dist-tags;受 `intervalHours` 节流,带超时,失败静默。
+- **提示节流**:同一更新提示默认 24 小时内只注入一次;用户选择稍后时默认 7 天不再提示,选择跳过时同一版本不再提示。
 
-策略保存在 `.trellis/.flower-manifest.json` 的 `updateCheck`;运行缓存保存在 gitignored 的 `.trellis/.flower-update-check.tmp`,避免 `lastCheckedAt` 等字段反复污染 git。
+策略保存在 `.flower/settings.json` 的 `updateCheck`;运行缓存保存在 gitignored 的 `.flower/update-check.tmp`,避免 `lastCheckedAt` / `lastPromptedAt` 等字段反复污染 git。旧 `.trellis/.flower-manifest.json` 和 `.trellis/.flower-update-check.tmp` 只作为兼容 fallback 读取。
 
-manifest 中只保留用户策略:
+settings 中只保留用户策略:
 
 ```json
 {
@@ -231,8 +232,14 @@ tmp 中保存本地运行缓存:
 {
     "lastCheckedAt": "2026-07-07T00:00:00.000Z",
     "lastRemote": { "latest": "0.4.2", "beta": null },
+    "lastReleaseNotes": null,
     "lastStatus": "update_available",
-    "lastErrorCode": null
+    "lastErrorCode": null,
+    "lastPromptedAt": "2026-07-07T00:05:00.000Z",
+    "lastPromptedKey": "update:latest:0.4.2",
+    "promptSuppressedUntil": null,
+    "promptSuppressedKey": null,
+    "promptSuppressionReason": null
 }
 ```
 
@@ -254,6 +261,10 @@ flower-trellis update-check get --target .
 flower-trellis update-check set --policy auto --interval-hours 12 --target .
 flower-trellis update-check disable --target .  # 只设置 enabled=false,不改 policy
 flower-trellis update-check enable --target .   # 只设置 enabled=true,沿用原 policy
+flower-trellis update-check snooze --target .   # 延后当前提示,默认 7 天
+flower-trellis update-check snooze --days 3 --target .
+flower-trellis update-check skip --target .     # 跳过当前提示 key
+flower-trellis update-check reset --target .    # 清空提示节流状态
 ```
 
 执行更新:

package/enhancements/0.6/.agents/skills/trellis-check-all/references/document-drift-auto-remediation.md

@@ -11,8 +11,8 @@
 | 字段 | 规则 |
 | --- | --- |
 | ID | 首次记录时依次分配 `DOC-001`、`DOC-002` |
-| 类型 | `task-status`、`brief-stale`、`implementation-note`、`check-record`、`mechanical-link` |
-| 文件 | 需要修改的任务或规范文档路径 |
+| 类型 | `task-status`、`brief-stale`、`implementation-note`、`check-record`、`mechanical-link`、`fact-status` |
+| 文件 | 需要修改的任务、规范、项目文档或本地上下文摘要路径 |
 | 漂移 | 当前文档与实际 diff / 任务状态不一致的事实 |
 | 证据 | `file:line`、命令输出或实际 diff 摘要 |
 | 修复 | 精确说明要写入、更新或删除的内容 |
@@ -26,10 +26,12 @@
 
 满足以下全部条件才可自动修复：
 
-- 目标是任务执行文档、brief、check 记录、实现进度记录、机械链接或明显过期的本地上下文摘要；
+- 目标是任务执行文档、brief、check 记录、实现进度记录、机械链接、明显过期的本地上下文摘要，或项目文档中仅记录已验证事实状态的片段；
 - 修复内容可由实际 diff、任务状态、命令输出或已存在任务材料唯一推出；
 - 不新增需求、不改变验收标准、不改变设计取舍、不替用户选择产品语义；
 - 不修改源码、配置、测试、迁移、生产数据或外部系统；
+- 可自动修复性由具体片段语义决定，不由文档类别决定；同一文档中只有可由证据唯一推出的事实状态片段可改；
+- 事实状态修复只允许同步状态、URL、版本号、配置键、命令结果、验证结论或时间点，不改操作步骤、责任边界、安全提示、协议字段或对外承诺；
 - 改动小且可通过重读文件或简单静态检查验证；
 - 用户没有明确要求本轮绝对只读。
 
@@ -39,6 +41,7 @@
 - `implement.md` 中机械状态仍写“待完成”，但对应步骤已经落地且无语义争议；
 - `check.jsonl` 或任务记录中的文件路径、命令名、链接因重命名出现机械漂移；
 - 文档写的检查深度、route 或状态与 runner / task.py 的确定性状态不一致。
+- 任意 Markdown / HTML / 运行手册 / 接入说明仍写“待发布 / 待回读 / 旧版本 / 旧地址”，但已读取的发布记录、环境回读、测试输出或实际 diff 唯一证明目标状态已经变化。
 
 ---
 
@@ -51,6 +54,7 @@
 - 实现与规划冲突，无法判断是代码错还是文档错；
 - 需要新增测试、改代码、改配置、改迁移或调用外部系统；
 - 证据来自推测、聊天摘要或未读取的文件；
+- 文档修复需要改写用户可见操作路径、接口协议、权限/安全边界、上线承诺、责任归属或验收口径；
 - 修改会扩大任务范围或影响发布、权限、数据安全、生产行为。
 
 ---

package/enhancements/0.6/.agents/skills/trellis-worktree/SKILL.md

@@ -0,0 +1,56 @@
+---
+name: trellis-worktree
+description: "Prepare and diagnose Trellis usage inside linked Git worktrees. Use when the user mentions worktree, linked worktree, worktree development, missing .trellis in a worktree, or asks to make .claude/.codex/.agents/Trellis files work from a worktree."
+---
+
+# Trellis Worktree
+
+Use this skill before normal Trellis routing when the user's current request is about using Trellis from a linked Git worktree.
+
+The problem is usually not task or untracked routing itself: linked worktrees often do not contain the untracked `.trellis`, `.agents`, `.codex`, or `.claude` directories that AI tools need before any Trellis hook or skill can run.
+
+## Workflow
+
+1. Identify the target worktree. Use the user's explicit path if present; otherwise use the current working directory.
+2. Locate a source worktree in the same Git worktree set that contains `.trellis/scripts/worktree_setup.py`.
+3. Run read-only diagnosis first:
+
+```bash
+python3 <source-worktree>/.trellis/scripts/worktree_setup.py status --target <target-worktree> --json
+```
+
+4. If status is `needs-prepare`, run:
+
+```bash
+python3 <source-worktree>/.trellis/scripts/worktree_setup.py prepare --target <target-worktree> --json
+```
+
+5. If status is `blocked` or `error`, stop and report the reason and conflict paths. Do not overwrite or delete user files.
+6. After `ready` or `prepared`, return to the user's original Trellis intent and follow the normal workflow state.
+
+## Source Worktree Discovery
+
+If `<source-worktree>` is not obvious, inspect Git worktrees:
+
+```bash
+git -C <target-worktree> worktree list --porcelain
+```
+
+Choose a listed worktree that contains `.trellis/scripts/worktree_setup.py`. If none exists, report that this project has not been updated with `trellis-worktree` support yet.
+
+## Safety Rules
+
+- The helper only projects source paths that already exist.
+- MVP projection paths are `.trellis`, `.agents`, `.codex`, and `.claude`.
+- Projection uses symlinks and records `<target-worktree>/.trellis-worktree.json`.
+- Existing non-managed `.codex`, `.claude`, `.agents`, or `.trellis` paths are conflicts.
+- Do not hand-copy platform directories. Copying creates drift between worktrees.
+- Do not treat successful setup as task approval, check approval, or push approval.
+
+## Expected Results
+
+- `ready`: target worktree already has valid Trellis entry points.
+- `needs-prepare`: target worktree is safe to prepare; run `prepare`.
+- `prepared`: symlinks and manifest were created or repaired.
+- `blocked`: user-owned paths would be overwritten; stop and report `conflicts`.
+- `error`: Git or source-root resolution failed; stop and report `reason`.

package/enhancements/0.6/.claude/skills/trellis-check-all/references/document-drift-auto-remediation.md

@@ -11,8 +11,8 @@
 | 字段 | 规则 |
 | --- | --- |
 | ID | 首次记录时依次分配 `DOC-001`、`DOC-002` |
-| 类型 | `task-status`、`brief-stale`、`implementation-note`、`check-record`、`mechanical-link` |
-| 文件 | 需要修改的任务或规范文档路径 |
+| 类型 | `task-status`、`brief-stale`、`implementation-note`、`check-record`、`mechanical-link`、`fact-status` |
+| 文件 | 需要修改的任务、规范、项目文档或本地上下文摘要路径 |
 | 漂移 | 当前文档与实际 diff / 任务状态不一致的事实 |
 | 证据 | `file:line`、命令输出或实际 diff 摘要 |
 | 修复 | 精确说明要写入、更新或删除的内容 |
@@ -26,10 +26,12 @@
 
 满足以下全部条件才可自动修复：
 
-- 目标是任务执行文档、brief、check 记录、实现进度记录、机械链接或明显过期的本地上下文摘要；
+- 目标是任务执行文档、brief、check 记录、实现进度记录、机械链接、明显过期的本地上下文摘要，或项目文档中仅记录已验证事实状态的片段；
 - 修复内容可由实际 diff、任务状态、命令输出或已存在任务材料唯一推出；
 - 不新增需求、不改变验收标准、不改变设计取舍、不替用户选择产品语义；
 - 不修改源码、配置、测试、迁移、生产数据或外部系统；
+- 可自动修复性由具体片段语义决定，不由文档类别决定；同一文档中只有可由证据唯一推出的事实状态片段可改；
+- 事实状态修复只允许同步状态、URL、版本号、配置键、命令结果、验证结论或时间点，不改操作步骤、责任边界、安全提示、协议字段或对外承诺；
 - 改动小且可通过重读文件或简单静态检查验证；
 - 用户没有明确要求本轮绝对只读。
 
@@ -39,6 +41,7 @@
 - `implement.md` 中机械状态仍写“待完成”，但对应步骤已经落地且无语义争议；
 - `check.jsonl` 或任务记录中的文件路径、命令名、链接因重命名出现机械漂移；
 - 文档写的检查深度、route 或状态与 runner / task.py 的确定性状态不一致。
+- 任意 Markdown / HTML / 运行手册 / 接入说明仍写“待发布 / 待回读 / 旧版本 / 旧地址”，但已读取的发布记录、环境回读、测试输出或实际 diff 唯一证明目标状态已经变化。
 
 ---
 
@@ -51,6 +54,7 @@
 - 实现与规划冲突，无法判断是代码错还是文档错；
 - 需要新增测试、改代码、改配置、改迁移或调用外部系统；
 - 证据来自推测、聊天摘要或未读取的文件；
+- 文档修复需要改写用户可见操作路径、接口协议、权限/安全边界、上线承诺、责任归属或验收口径；
 - 修改会扩大任务范围或影响发布、权限、数据安全、生产行为。
 
 ---

package/enhancements/0.6/.claude/skills/trellis-worktree/SKILL.md

@@ -0,0 +1,56 @@
+---
+name: trellis-worktree
+description: "Prepare and diagnose Trellis usage inside linked Git worktrees. Use when the user mentions worktree, linked worktree, worktree development, missing .trellis in a worktree, or asks to make .claude/.codex/.agents/Trellis files work from a worktree."
+---
+
+# Trellis Worktree
+
+Use this skill before normal Trellis routing when the user's current request is about using Trellis from a linked Git worktree.
+
+The problem is usually not task or untracked routing itself: linked worktrees often do not contain the untracked `.trellis`, `.agents`, `.codex`, or `.claude` directories that AI tools need before any Trellis hook or skill can run.
+
+## Workflow
+
+1. Identify the target worktree. Use the user's explicit path if present; otherwise use the current working directory.
+2. Locate a source worktree in the same Git worktree set that contains `.trellis/scripts/worktree_setup.py`.
+3. Run read-only diagnosis first:
+
+```bash
+python3 <source-worktree>/.trellis/scripts/worktree_setup.py status --target <target-worktree> --json
+```
+
+4. If status is `needs-prepare`, run:
+
+```bash
+python3 <source-worktree>/.trellis/scripts/worktree_setup.py prepare --target <target-worktree> --json
+```
+
+5. If status is `blocked` or `error`, stop and report the reason and conflict paths. Do not overwrite or delete user files.
+6. After `ready` or `prepared`, return to the user's original Trellis intent and follow the normal workflow state.
+
+## Source Worktree Discovery
+
+If `<source-worktree>` is not obvious, inspect Git worktrees:
+
+```bash
+git -C <target-worktree> worktree list --porcelain
+```
+
+Choose a listed worktree that contains `.trellis/scripts/worktree_setup.py`. If none exists, report that this project has not been updated with `trellis-worktree` support yet.
+
+## Safety Rules
+
+- The helper only projects source paths that already exist.
+- MVP projection paths are `.trellis`, `.agents`, `.codex`, and `.claude`.
+- Projection uses symlinks and records `<target-worktree>/.trellis-worktree.json`.
+- Existing non-managed `.codex`, `.claude`, `.agents`, or `.trellis` paths are conflicts.
+- Do not hand-copy platform directories. Copying creates drift between worktrees.
+- Do not treat successful setup as task approval, check approval, or push approval.
+
+## Expected Results
+
+- `ready`: target worktree already has valid Trellis entry points.
+- `needs-prepare`: target worktree is safe to prepare; run `prepare`.
+- `prepared`: symlinks and manifest were created or repaired.
+- `blocked`: user-owned paths would be overwritten; stop and report `conflicts`.
+- `error`: Git or source-root resolution failed; stop and report `reason`.

package/enhancements/0.6/overrides/conflicts.json

@@ -303,6 +303,7 @@
       "severity": "error",
       "target": ".codex/hooks/inject-workflow-state.py",
       "whenOperations": [
+        "workflow-state-worktree-root-fallback",
         "workflow-state-codex-session-start-guard",
         "workflow-state-stale-task-status",
         "workflow-state-untracked-helper",
@@ -312,11 +313,13 @@
       "assertion": {
         "type": "required-literal",
         "values": [
+          "# BEGIN skill-garden patch workflow-state-worktree-root-fallback v0.6",
           "# BEGIN skill-garden patch workflow-state-codex-session-start-guard v0.6",
           "# 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-main-subject-routing v0.6",
+          "_find_trellis_root_from_git",
           "DEFAULT_PROMPT_INJECTION_SKIP_KEYWORD = \"no-trellis\"",
           "\"ZCODE_PROJECT_DIR\": \"zcode\"",
           "Normalize `codex.dispatch_mode` from .trellis/config.yaml to \"auto\" or \"inline\"."
@@ -476,7 +479,10 @@
         "type": "required-literal",
         "values": [
           "Only an explicit current-request workflow instruction such as `直接做` / `不要任务` may override automatic `task_plan`.",
-          "python3 ./.trellis/scripts/untracked_flow.py begin --summary \"<bounded work summary>\" --source <inferred|user-explicit>",
+          "Use quick direct edit for one-turn small fixes",
+          "Use tracked direct edit only when the user explicitly wants no task but still wants later turns to remember the current phase",
+          "python3 ./.trellis/scripts/untracked_flow.py begin --summary \"<bounded work summary>\" --source <inferred|user-explicit> --mode tracked-direct-edit",
+          "Never create `untracked_flow` for `workflow_action` itself",
           "A same-item hit resumes the existing state",
           "`active-work-conflict` blocks unrelated code writes until the current item is completed, explicitly abandoned, or adopted into a task",
           "Unrelated read-only requests may continue without mutating the state.",

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

@@ -3,6 +3,25 @@
   "id": "inject-workflow-state-shared-runtime",
   "purpose": "hook_override",
   "operations": [
+    {
+      "id": "workflow-state-worktree-root-fallback",
+      "operation": "replace",
+      "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": "worktree-root-selector.py" },
+      "content": { "source": "worktree-root-content.py" }
+    },
     {
       "id": "workflow-state-codex-session-start-guard",
       "operation": "insert",

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

@@ -0,0 +1,70 @@
+def _git_output(start: Path, *args: str) -> Optional[str]:
+    """Run a read-only git command for best-effort Trellis root fallback."""
+    import subprocess
+
+    try:
+        result = subprocess.run(
+            ["git", "-C", str(start), *args],
+            check=False,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.DEVNULL,
+            text=True,
+            timeout=2,
+        )
+    except (OSError, subprocess.SubprocessError):
+        return None
+    if result.returncode != 0:
+        return None
+    output = result.stdout.strip()
+    return output or None
+
+
+def _resolve_git_common_dir(start: Path) -> Optional[Path]:
+    """Return the current repository's common git dir."""
+    output = _git_output(start, "rev-parse", "--path-format=absolute", "--git-common-dir")
+    if output is None:
+        output = _git_output(start, "rev-parse", "--git-common-dir")
+    if output is None:
+        return None
+    common_dir = Path(output)
+    if common_dir.is_absolute():
+        return common_dir.resolve()
+    top_level = _git_output(start, "rev-parse", "--show-toplevel")
+    if top_level is None:
+        return None
+    return (Path(top_level) / common_dir).resolve()
+
+
+def _find_trellis_root_from_git(start: Path) -> Optional[Path]:
+    """Find a sibling worktree that carries .trellis/ for this Git repository."""
+    common_dir = _resolve_git_common_dir(start)
+    if common_dir is not None:
+        candidate = common_dir.parent
+        if (candidate / ".trellis").is_dir():
+            return candidate
+
+    output = _git_output(start, "worktree", "list", "--porcelain")
+    if output is None:
+        return None
+    for line in output.splitlines():
+        if not line.startswith("worktree "):
+            continue
+        candidate = Path(line.split(" ", 1)[1]).expanduser().resolve()
+        if (candidate / ".trellis").is_dir():
+            return candidate
+    return None
+
+
+def find_trellis_root(start: Path) -> Optional[Path]:
+    """Walk up from start, then fall back to the Git worktree carrying .trellis/.
+
+    Linked worktrees often do not contain the untracked .trellis/ runtime. The
+    hook still needs the main worktree's runtime state so direct-edit cursors can
+    be resumed from the linked worktree without copying .trellis/.
+    """
+    cur = start.resolve()
+    while cur != cur.parent:
+        if (cur / ".trellis").is_dir():
+            return cur
+        cur = cur.parent
+    return _find_trellis_root_from_git(start.resolve())

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

@@ -0,0 +1,12 @@
+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

package/enhancements/0.6/overrides/patches/workflow/intent-routing/request-triage/content.md

@@ -1,6 +1,7 @@
 - Infer `discuss`, `inspect`, `direct_edit`, `task_plan`, or `workflow_action` from the whole current request, scope, risk, side effects, active-task state, and latest explicit switch. Do not classify from one keyword alone.
 - Treat requests for an opinion, expressions of discomfort, rejected proposals, or questions about how something should change as `discuss`; treat requests to inspect, explain, verify, or locate a cause as `inspect`. Both are read-only unless the current request explicitly authorizes a concrete edit. Selecting a repair does not authorize editing while scope is unknown or permission to skip task planning; inspect first and reclassify from evidence.
 - `direct_edit` requires known, bounded, low-risk, reversible scope, no unresolved design choice, and simple validation. Permission/authentication/data-scope/security, database/migration/release/external effects, or unknown scope remain strong `task_plan` boundaries. Shared contracts, cross-package/layer or multi-entry behavior, configuration, historical regressions, and systematic validation raise the evidence and validation bar, but do not automatically require `task_plan`. An exact rollback or mechanically synchronized known change may remain `direct_edit` or `workflow_action` when its behavior, scope, side effects, and validation are already determined.
+- `direct_edit` has two execution shapes. Use quick direct edit for one-turn small fixes, wording/config tweaks, focused release-note corrections, or other changes that can be edited, validated, and reported without remembering a later phase; do not create `untracked_flow` for those. Use tracked direct edit only when the user explicitly wants no task but still wants later turns to remember the current phase, or when the work is likely to continue across turns with `下一步` / `继续` / check / push handoff.
 - When project-local SOPs or conventions may change the correct action for non-trivial work, build a short query from the request, intended commands, affected files or systems, package/layer, and domain terms; run `python3 ./.trellis/scripts/spec_router.py "<short query describing the intended action>"` once per user intent, workflow phase, or decision boundary and follow its returned `load_strategy` and `action`. Skip discovery for pure Q&A, simple read-only inspection, opening local tools, or trivial edits unless project rules may alter the approach.
 - When an active task exists, apply the Active Task Scope Guard before artifact ownership, task routing, or file edits. New implementation outside the active task title/brief requires a new task, an artifact update before continuing, or an explicit untracked path that does not reuse current progress. `task_intent.py` executes the already-decided safety boundary; it does not decide semantic ownership.
 - High-confidence reversible steps proceed without a mechanical task-creation question. Clear complex implementation intent may create a planning task and enter `trellis-brainstorm`, but never authorizes `task.py start` or implementation. Ask one focused question only when ambiguity changes material side effects or crosses an independent destructive, production, database, credential, external-system, permission, or safety boundary.

package/enhancements/0.6/overrides/patches/workflow/state-no-task/content.md

@@ -1,6 +1,7 @@
 No active task. Infer the current request intent before acting.
 Repair intent alone is not a no-task switch; inspect unknown scope and reclassify before edits. Only an explicit current-request workflow instruction such as `直接做` / `不要任务` may override automatic `task_plan`.
 For non-trivial project work, follow the `Request Triage` Project Knowledge Discovery contract before routing the action. Load a Trellis capability directly only when the user explicitly names it or the request exactly matches that capability; route project-specific workflow actions through the matched SOP instead of keyword-mapping a general release/publish request to `trellis-release`.
-Handle `discuss` and `inspect` silently. For non-destructive `direct_edit`, state once that work will use the session-scoped untracked flow, then run `python3 ./.trellis/scripts/untracked_flow.py begin --summary "<bounded work summary>" --source <inferred|user-explicit>`.
+Handle `discuss` and `inspect` silently. For quick direct edit, make the bounded edit, run focused validation, and report without creating `untracked_flow`; small wording/config tweaks, release dry-runs, version checks, local SOP steps, and other one-turn fixes stay in this path unless the current request explicitly asks future `下一步` / `继续` / check / push handoff to remember this no-task work. For tracked direct edit, state once that work will use the session-scoped untracked flow, then run `python3 ./.trellis/scripts/untracked_flow.py begin --summary "<bounded work summary>" --source <inferred|user-explicit> --mode tracked-direct-edit`.
+Never create `untracked_flow` for `workflow_action` itself, including release/publish, commit, push, finish-work, task operations, snapshot sync, auto-loop control, or read-only inspection. If a workflow action reveals a separate code/config fix, pause that workflow action, explain the separate fix, and only create tracked direct edit when the user wants later turns to remember that fix's check/spec/push handoff; otherwise keep it as quick direct edit.
 A same-item hit resumes the existing state; `active-work-conflict` blocks unrelated code writes until the current item is completed, explicitly abandoned, or adopted into a task. Unrelated read-only requests may continue without mutating the state. A successful `begin` starts at `stage=implement`; the helper is a workflow cursor and does not gate edits on file scope, Git state, or owner evidence.
 For high-confidence complex implementation, create an auto-routed planning task through `task_intent.py create`, show one non-blocking switch hint, and enter `trellis-brainstorm`. Ask only for material ambiguity or independent safety gates.

package/enhancements/0.6/overrides/patches/workflow/state-untracked/content.md

@@ -1,6 +1,6 @@
 [workflow-state:untracked]
 The current-session untracked work item is at `implement`. Run `python3 ./.trellis/scripts/untracked_flow.py status`, then enter Phase 2.1 through `trellis-route(target=implement)` without creating task artifacts or task-scoped route decisions.
-The helper is only a workflow cursor: it does not validate file scope, Git state, focused validation, or owner evidence. After focused validation is complete, run `python3 ./.trellis/scripts/untracked_flow.py advance --stage check` and continue through the normal Phase 2.1 completion contract.
+The helper is only a workflow cursor: it does not validate file scope, Git state, focused validation, or owner evidence. Its `owner` / `remainingOwners` fields are route reminders for `trellis-check-all` -> `trellis-update-spec` -> `trellis-push`, not proof that any owner already ran. After focused validation is complete, run `python3 ./.trellis/scripts/untracked_flow.py advance --stage check` and continue through the normal Phase 2.1 completion contract.
 A different implementation request remains blocked by the single-active-work guard until this item is completed, explicitly abandoned, or adopted through `python3 ./.trellis/scripts/task_intent.py adopt "<title>" --slug <slug>`; adoption continues through planning artifacts, Brief review, and `task.py start`, and never authorizes immediate implementation. Unrelated read-only requests may continue without changing state.
 [/workflow-state:untracked]