flower-trellis 0.5.0-beta.1 → 0.5.0-beta.3

package/README.md

@@ -6,7 +6,7 @@
 
 > 一条命令装好 [Trellis](https://docs.trytrellis.app/) 工程框架,并自动融合 **skill-garden** 强化包。
 
-`flower-trellis` 是 Trellis 的 npm 封装 CLI,把原本要分两步的工作合并为一键完成:安装/升级 Trellis 本体,并在其上叠加 skill-garden 的强化包(一组 `trellis-*` 技能与 workflow / skill override)。强化包以快照形式随包发布,安装过程**零网络依赖**。
+`flower-trellis` 是 Trellis 的 npm 封装 CLI,把原本要分两步的工作合并为一键完成:安装/升级 Trellis 本体,并在其上叠加 skill-garden 的强化包(一组 `trellis-*` 技能与统一 Patch catalog)。强化包以快照形式随包发布,安装过程**零网络依赖**。
 
 底层调用官方 `@mindfoldhq/trellis` 的 `init` / `update`,并按目标项目的 Trellis 版本自动选择匹配的强化包变体(`old` / `0.5` / `0.6`)。
 
@@ -209,8 +209,9 @@ flower banner → 平台多选菜单 → Trellis 原生交互(模板 / monorepo
 
 - **统一品牌头部**:Trellis 子进程在伪终端(`node-pty`)中运行,其原生的模板 / monorepo / 冲突等交互完整保留,但重复打印的启动 banner 被过滤,全程只呈现一个 flower banner。
 - **按平台铺设技能**:Claude 铺到 `.claude/skills`,Codex / Gemini 等铺到 `.agents/skills`;并做平台后处理:Codex 兼容清理旧 `config.toml` 的 `[features.multi_agent_v2]`,在保留上游 hooks 的基础上补全 `SessionStart`;Claude Code 只在 `startup` SessionStart 挂载启动更新检查。
-- **幂等执行**:`workflow.md` 注入前先按 `BEGIN/END` 标记清除旧块再重注入(块数恒定,不会翻倍,首次注入前备份到 `.trellis/.backup-flower/`);技能文件覆盖式铺设,并通过 `.trellis/.flower-manifest.json` 记录已铺路径,升级时删除已淘汰项。
-- **上线事项账本**:强化包通过 finish-work skill override 在归档前智能识别 SQL、配置、批处理 / 部署脚本 / 数据修复、外部系统 / 依赖平台等上线事项,必要时写入任务 `release.md`;`trellis-release` 可在正式上线前核对任务文档、`release.md` 和 git 证据,生成 `YYYY-MM-DD-<release-slug>.md` 格式的版本 / 批次操作单。
+- **幂等执行**:0.6 Patch 使用受管 marker 原位升级，完整预检通过后只写 changed 文件，首次修改前备份到 `.trellis/.backup-flower/`；技能资产覆盖式铺设，并通过 `.trellis/.flower-manifest.json` 精确清理已淘汰路径。0.5/old 继续使用兼容注入路径。
+- **结构化 Patch**:Trellis 0.6 的 workflow、skill、hook 与平台配置统一通过 `insert / replace / remove` 预检后应用；selector/baseline 或已知最终协议冲突时在写入前停止。
+- **上线事项账本**:强化包通过 Finish-Work Patch 在归档前智能识别 SQL、配置、批处理 / 部署脚本 / 数据修复、外部系统 / 依赖平台等上线事项,必要时写入任务 `release.md`;`trellis-release` 可在正式上线前核对任务文档、`release.md` 和 git 证据,生成 `YYYY-MM-DD-<release-slug>.md` 格式的版本 / 批次操作单。
 - **安全中止**:`Ctrl+C` 取消后不会继续叠加。
 
 ## 强化包与更新
@@ -224,6 +225,8 @@ flower banner → 平台多选菜单 → Trellis 原生交互(模板 / monorepo
   npm i -g flower-trellis@latest && flower-trellis update
   ```
 
+- **0.6 兼容门禁**:当前强化快照已登记 Trellis `0.6.5`。未登记的同一 `0.6.x` 会显示 `untested-upstream` 警告，并在完整 Patch/冲突检查通过后继续；`0.7+` / `1.x` 不会自动复用 0.6 baseline。遇到未支持的新版本时，先升级 flower-trellis，或使用 `--no-enhance` 只运行纯上游 Trellis。
+
 - **通用技能**:`flower-trellis update` 会用新版快照覆盖仓库中已经启用的 common skill,
   未启用项不会自动安装;若某个已安装 common skill 已从新版快照移除,更新会精确删除其
   `.codex/skills` / `.claude/skills` 或历史 `.agents/skills` 副本。

package/enhancements/0.6/overrides/bundles/finish-work.json

@@ -0,0 +1,7 @@
+{
+  "schemaVersion": 1,
+  "id": "trellis-finish-work",
+  "aliases": ["finish-work", "finish-work-enhancement"],
+  "installMode": "full-or-selected",
+  "patches": ["skills/trellis-finish-work/exact-bookkeeping"]
+}

package/enhancements/0.6/overrides/bundles/intent-routing.json

@@ -0,0 +1,30 @@
+{
+  "schemaVersion": 1,
+  "id": "intent-routing",
+  "aliases": ["workflow-enhancement", "task-intent"],
+  "installMode": "full-or-selected",
+  "patches": [
+    "workflow/hub",
+    "workflow/phase-ownership",
+    "workflow/state-no-task",
+    "workflow/state-missing-task",
+    "workflow/runtime-contract-reference",
+    "workflow/states-planning",
+    "workflow/states-in-progress",
+    "workflow/intent-routing/phase-summary",
+    "workflow/intent-routing/request-triage",
+    "workflow/intent-routing/phase-index-create-task",
+    "workflow/intent-routing/phase-one-goal",
+    "workflow/intent-routing/create-task-rule",
+    "workflow/intent-routing/create-task-command",
+    "workflow/intent-routing/customization-intent-invariant",
+    "hooks/inject-workflow-state/shared-runtime",
+    "hooks/codex-session-start/no-task-routing",
+    "hooks/codex-session-start/missing-task-routing",
+    "hooks/claude-session-start/no-task-routing",
+    "hooks/claude-session-start/missing-task-routing",
+    "skills/trellis-start/no-task-routing",
+    "skills/trellis-brainstorm/planning-authorization",
+    "skills/trellis-brainstorm/auto-task-create"
+  ]
+}

package/enhancements/0.6/overrides/bundles/shared-hook-runtime.json

@@ -0,0 +1,7 @@
+{
+  "schemaVersion": 1,
+  "id": "shared-hook-runtime",
+  "aliases": [],
+  "installMode": "full-only",
+  "patches": ["hooks/inject-workflow-state/shared-runtime"]
+}

package/enhancements/0.6/overrides/bundles/update-spec-flow.json

@@ -0,0 +1,7 @@
+{
+  "schemaVersion": 1,
+  "id": "trellis-update-spec",
+  "aliases": ["update-spec", "update-spec-enhancement"],
+  "installMode": "full-or-selected",
+  "patches": ["skills/trellis-update-spec/autonomous-evaluation"]
+}

package/enhancements/0.6/overrides/compatibility.json

@@ -0,0 +1,13 @@
+{
+  "schemaVersion": 1,
+  "variant": "0.6",
+  "compatibleLine": {
+    "major": 0,
+    "minor": 6
+  },
+  "testedVersions": [
+    "0.6.5"
+  ],
+  "untestedPatchPolicy": "warning",
+  "newLinePolicy": "error"
+}

package/enhancements/0.6/overrides/conflicts.json

@@ -0,0 +1,145 @@
+{
+  "schemaVersion": 1,
+  "rules": [
+    {
+      "id": "workflow-no-direct-dispatch-routing",
+      "severity": "error",
+      "target": ".trellis/workflow.md",
+      "whenOperations": [
+        "workflow-active-task-routing"
+      ],
+      "assertion": {
+        "type": "absent-literal",
+        "values": [
+          "- `in_progress` implementation/check -> dispatch `trellis-implement` / `trellis-check`.",
+          "- Before editing -> `trellis-before-dev`; after editing -> `trellis-check`."
+        ]
+      },
+      "owner": "trellis-route",
+      "reason": "Phase 2.1/2.2 必须先解析 route_decision，不能由上游 routing 表直接选择执行模式。"
+    },
+    {
+      "id": "workflow-no-direct-implement-walkthrough",
+      "severity": "error",
+      "target": ".trellis/workflow.md",
+      "whenOperations": [
+        "workflow-phase-2-implement"
+      ],
+      "assertion": {
+        "type": "absent-literal",
+        "values": [
+          "Spawn the implement sub-agent:"
+        ]
+      },
+      "owner": "trellis-route",
+      "reason": "Phase 2.1 只负责进入 trellis-route，具体 inline/subagent 执行由 route 结果所有。"
+    },
+    {
+      "id": "workflow-no-auto-fix-check",
+      "severity": "error",
+      "target": ".trellis/workflow.md",
+      "whenOperations": [
+        "workflow-phase-2-check"
+      ],
+      "assertion": {
+        "type": "absent-literal",
+        "values": [
+          "- Auto-fix issues it finds",
+          "If issues are found → fix → re-check, until green."
+        ]
+      },
+      "owner": "trellis-check-all",
+      "reason": "Check-All 必须 audit-only collect-all，修复只能在统一报告后获得授权。"
+    },
+    {
+      "id": "workflow-no-local-only-commit",
+      "severity": "error",
+      "target": ".trellis/workflow.md",
+      "whenOperations": [
+        "workflow-phase-3-commit"
+      ],
+      "assertion": {
+        "type": "absent-literal",
+        "values": [
+          "Proposed commits (in order):",
+          "Never push to remote in this step."
+        ]
+      },
+      "owner": "trellis-push",
+      "reason": "Phase 3.4 普通模式由 trellis-push 执行 exact commit + push。"
+    },
+    {
+      "id": "workflow-required-route-pointer",
+      "severity": "error",
+      "target": ".trellis/workflow.md",
+      "whenOperations": [
+        "workflow-phase-2-implement",
+        "workflow-phase-2-check"
+      ],
+      "assertion": {
+        "type": "required-literal",
+        "values": [
+          "<!-- BEGIN skill-garden patch workflow-phase-2-implement v0.6 -->\n#### 2.1 Implement `[required · repeatable]`\n\nImplementation requires an active `in_progress` task and reviewed planning artifacts. Run `trellis-route(target=implement)` before editing or dispatching.",
+          "<!-- BEGIN skill-garden patch workflow-phase-2-check v0.6 -->\n#### 2.2 Quality check `[required · repeatable]`\n\nRun `trellis-route(target=check)`, then execute the unified `trellis-check-all` entry using the validated inline/subagent route."
+        ]
+      },
+      "owner": "trellis-route",
+      "reason": "Phase 2.1/2.2 的受管 section 必须保留统一 route 入口。"
+    },
+    {
+      "id": "workflow-required-finish-pointers",
+      "severity": "error",
+      "target": ".trellis/workflow.md",
+      "whenOperations": [
+        "workflow-phase-3-update-spec",
+        "workflow-phase-3-commit"
+      ],
+      "assertion": {
+        "type": "required-literal",
+        "values": [
+          "<!-- BEGIN skill-garden patch workflow-phase-3-update-spec v0.6 -->\n#### 3.3 Spec update `[required · once]`\n\nLoad `trellis-update-spec` and let it decide whether the task produced executable knowledge that must be recorded.",
+          "<!-- BEGIN skill-garden patch workflow-phase-3-commit v0.6 -->\n#### 3.4 Commit changes `[required · once]`\n\nLoad `trellis-push`. It owns dirty-file classification, exact file/message planning, one-shot confirmation, Git safety checks, ordinary commit + push, and current-task progress synchronization."
+        ]
+      },
+      "owner": "workflow-phase-ownership",
+      "reason": "Phase 3.3/3.4 的受管 section 必须保留到权威 Skill 的一跳入口。"
+    },
+    {
+      "id": "workflow-no-covering-language",
+      "severity": "error",
+      "target": ".trellis/workflow.md",
+      "whenOperations": [
+        "workflow-hub",
+        "workflow-active-task-routing",
+        "workflow-phase-3-commit"
+      ],
+      "assertion": {
+        "type": "absent-literal",
+        "values": [
+          "HIGHEST PRIORITY: skill-garden overrides",
+          "This hub overrides any conflicting Trellis workflow",
+          "overrides lower \"Active Task Routing\"",
+          "fully supersedes the lower Phase 3.4 walkthrough"
+        ]
+      },
+      "owner": "workflow-phase-ownership",
+      "reason": "冲突正文应被结构化替换，Hub 不再通过优先级文字压制下层协议。"
+    },
+    {
+      "id": "workflow-state-hub-pointer-budget",
+      "severity": "warning",
+      "target": ".trellis/workflow.md",
+      "whenOperations": [
+        "workflow-state-in-progress",
+        "workflow-state-in-progress-inline"
+      ],
+      "assertion": {
+        "type": "max-occurrences",
+        "value": "The Workflow Hub is the source of truth for Task Brief, Routing, Post-Check, Commit, and Task Progress gates.",
+        "max": 0
+      },
+      "owner": "workflow-state",
+      "reason": "该 Hub 职责句已从两个 in-progress state 删除，任一回流都需要重新评审。"
+    }
+  ]
+}

package/enhancements/0.6/overrides/patches/hooks/claude-session-start/missing-task-routing/content.py

@@ -0,0 +1,6 @@
+        return (
+            f"Status: MISSING TASK POINTER\nTask: {task_ref}\n"
+            "Next-Action: Run `python3 ./.trellis/scripts/task.py finish`. If cleanup fails, report it "
+            "and stop. If cleanup succeeds, treat the current request as NO ACTIVE TASK in the same "
+            "turn and follow no_task Request Intent Routing before any edit, task creation, or task start."
+        )

package/enhancements/0.6/overrides/patches/hooks/claude-session-start/missing-task-routing/patch.json

@@ -0,0 +1,13 @@
+{
+  "schemaVersion": 2,
+  "id": "claude-session-start-missing-task",
+  "purpose": "intent_routing",
+  "operations": [{
+    "id": "claude-session-start-missing-task",
+    "operation": "replace",
+    "targets": [{ "kind": "hook", "path": ".claude/hooks/session-start.py", "missing": "skip", "markerStyle": "hash" }],
+    "selector": { "type": "literal", "source": "selector.py" },
+    "content": { "source": "content.py" },
+    "legacyMarkers": [{ "namespace": "patch", "id": "claude-session-start-stale-task" }]
+  }]
+}

package/enhancements/0.6/overrides/patches/hooks/claude-session-start/missing-task-routing/selector.py

@@ -0,0 +1,5 @@
+        return (
+            f"Status: STALE POINTER\nTask: {task_ref}\n"
+            f"Next-Action: Run `python3 ./.trellis/scripts/task.py finish` to clear the stale pointer, "
+            "then ask the user what to work on next."
+        )

package/enhancements/0.6/overrides/patches/hooks/claude-session-start/no-task-routing/patch.json

@@ -0,0 +1,13 @@
+{
+  "schemaVersion": 2,
+  "id": "claude-session-start-no-task",
+  "purpose": "intent_routing",
+  "operations": [{
+    "id": "claude-session-start-no-task",
+    "operation": "replace",
+    "targets": [{ "kind": "hook", "path": ".claude/hooks/session-start.py", "missing": "skip", "markerStyle": "hash" }],
+    "selector": { "type": "literal", "source": "selector.py" },
+    "content": { "source": "content.py" },
+    "legacyMarkers": [{ "namespace": "transform", "id": "claude-session-start-no-task", "style": "hash" }]
+  }]
+}

package/enhancements/0.6/overrides/patches/hooks/codex-session-start/missing-task-routing/content.py

@@ -0,0 +1,6 @@
+        return (
+            f"Status: MISSING TASK POINTER\nTask: {task_ref}\n"
+            "Next: Run python3 ./.trellis/scripts/task.py finish. If cleanup fails, report it and stop. "
+            "If cleanup succeeds, treat the current request as NO ACTIVE TASK in the same turn and "
+            "follow no_task Request Intent Routing before any edit, task creation, or task start."
+        )

package/enhancements/0.6/overrides/patches/hooks/codex-session-start/missing-task-routing/patch.json

@@ -0,0 +1,13 @@
+{
+  "schemaVersion": 2,
+  "id": "codex-session-start-missing-task",
+  "purpose": "intent_routing",
+  "operations": [{
+    "id": "codex-session-start-missing-task",
+    "operation": "replace",
+    "targets": [{ "kind": "hook", "path": ".codex/hooks/session-start.py", "missing": "skip", "markerStyle": "hash" }],
+    "selector": { "type": "literal", "source": "selector.py" },
+    "content": { "source": "content.py" },
+    "legacyMarkers": [{ "namespace": "patch", "id": "codex-session-start-stale-task" }]
+  }]
+}

package/enhancements/0.6/overrides/patches/hooks/codex-session-start/missing-task-routing/selector.py

@@ -0,0 +1,4 @@
+        return (
+            f"Status: STALE POINTER\nTask: {task_ref}\n"
+            "Next: Task directory not found. Run: python3 ./.trellis/scripts/task.py finish"
+        )

package/enhancements/0.6/overrides/patches/hooks/codex-session-start/no-task-routing/patch.json

@@ -0,0 +1,13 @@
+{
+  "schemaVersion": 2,
+  "id": "codex-session-start-no-task",
+  "purpose": "intent_routing",
+  "operations": [{
+    "id": "codex-session-start-no-task",
+    "operation": "replace",
+    "targets": [{ "kind": "hook", "path": ".codex/hooks/session-start.py", "missing": "skip", "markerStyle": "hash" }],
+    "selector": { "type": "literal", "source": "selector.py" },
+    "content": { "source": "content.py" },
+    "legacyMarkers": [{ "namespace": "transform", "id": "codex-session-start-no-task", "style": "hash" }]
+  }]
+}