flower-trellis 0.6.8-beta.2 → 0.6.8

package/enhancements/MANIFEST.json

@@ -1,5 +1,5 @@
 {
-  "syncedAt": "2026-09-15T08:32:43.985Z",
+  "syncedAt": "2026-09-16T09:48:56.489Z",
   "syncedFrom": "vendor/skill-garden",
   "sourceCommit": "66f538fafba63953cf40b7044bc390055012c4a7",
   "common": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flower-trellis",
-  "version": "0.6.8-beta.2",
+  "version": "0.6.8",
   "description": "一键安装/升级 Trellis 并自动融合 skill-garden 强化包(默认 Claude + agents)",
   "type": "module",
   "bin": {
@@ -70,9 +70,9 @@
     "commit-and-tag-version": "^12.7.3"
   },
   "flowerReleaseNotes": {
-    "version": "0.6.8-beta.2",
+    "version": "0.6.8",
     "source": "CHANGELOG.md",
-    "body": "### 🐛 修复 Bug Fixes\n\n* **auto-loop:** 同步恢复自纠与回归验证 ([288bd9f](https://github.com/SilentFlower/flower-trellis/commit/288bd9f1fd029203243cc41cb8bdf7858d831c77))\n* **auto-loop:** 同步框架冲突修复与回归验证 ([f240a17](https://github.com/SilentFlower/flower-trellis/commit/f240a172d16abb6e7826b4ae79e37d8ce9ff5fcc))\n* **codex:** 强化 Astra 工作流确认边界 ([fd14a49](https://github.com/SilentFlower/flower-trellis/commit/fd14a49df6f5086b3097a06a1d1355fd7e0a6915))\n* **trellis:** 同步风险展示优化与回归验证 ([07f17a8](https://github.com/SilentFlower/flower-trellis/commit/07f17a8ea40c72fe62d3c99ffef37beb36c06101))",
+    "body": "### 🐛 修复 Bug Fixes\n\n* **trellis:** 减少重复确认与输出，修复技能之间的流程衔接 ([01f79eb](https://github.com/SilentFlower/flower-trellis/commit/01f79eb94dc61b1283f35187b1756f0d2fbe1206))\n  - **任务 Brief**：避免进入实现或恢复会话时重复展示、确认已批准的内容。\n  - **任务恢复**：Start 统一交给 Continue 恢复进度，复用已加载的有效上下文。\n  - **收尾提交**：归档与会话日志合并为一次精确提交，保留原有自动推送条件。\n  - **输出精简**：Push 成功后简要显示结果；Check-All 的问题处置选项只展示一次。\n  - **规范更新**：统一 Check-All、Update-Spec 和 Break-Loop 的承接规则；已有规范覆盖时允许无需修改。\n  - **需求处理**：修正 PRD 创建顺序、需求准确性与覆盖率检查方向，避免把必要的实现细节误判为需求扩张。\n  - **平台与入口**：创建命令时遵循实际平台目录；修正普通检查和软件发版的入口指引。\n* **auto-loop:** 同步恢复自纠与回归验证 ([288bd9f](https://github.com/SilentFlower/flower-trellis/commit/288bd9f1fd029203243cc41cb8bdf7858d831c77))\n* **auto-loop:** 同步框架冲突修复与回归验证 ([f240a17](https://github.com/SilentFlower/flower-trellis/commit/f240a172d16abb6e7826b4ae79e37d8ce9ff5fcc))\n* **check-all:** 同步报告落盘规则与规范 ([0477456](https://github.com/SilentFlower/flower-trellis/commit/04774560d8cde20b6bb6abe025bcaa0bf1bb5514))\n* **codex:** 强化 Astra 工作流确认边界 ([fd14a49](https://github.com/SilentFlower/flower-trellis/commit/fd14a49df6f5086b3097a06a1d1355fd7e0a6915))\n* **hooks:** 修复 Windows 更新检查入口与路径参数 ([ed7e68f](https://github.com/SilentFlower/flower-trellis/commit/ed7e68f0cfac6cead9c88817d82ab795450bd724))\n* **push:** 同步保留变更展示与落盘规则 ([9bcd747](https://github.com/SilentFlower/flower-trellis/commit/9bcd74761777f108be0a7286f0e253c06b0cb0ba))\n* **skills:** 迁移通用技能到共享 agents 目录 ([7ebdf05](https://github.com/SilentFlower/flower-trellis/commit/7ebdf0560ccc53ecd252f6e8b259d417d0a53d78))\n* **trellis:** 同步风险展示优化与回归验证 ([07f17a8](https://github.com/SilentFlower/flower-trellis/commit/07f17a8ea40c72fe62d3c99ffef37beb36c06101))\n\n\n### 🧰 维护 Maintenance\n\n* **trellis:** 同步 Flower 0.6.7 与插件安装记录 ([690f1b4](https://github.com/SilentFlower/flower-trellis/commit/690f1b4e87d4bffdb02800e576acf882382de566))\n* **trellis:** 同步 Flower 0.6.8-beta.0 安装记录 ([2ea16ed](https://github.com/SilentFlower/flower-trellis/commit/2ea16ed3f0ddfe8a7d34d1b132fb3cb55d419344))",
     "truncated": false
   },
   "optionalDependencies": {

package/src/assets/flower_update_hook.py

@@ -9,6 +9,7 @@ from __future__ import annotations
 
 import argparse
 import json
+import ntpath
 import os
 import re
 import shutil
@@ -144,25 +145,45 @@ def _project_dir(hook_input: dict) -> Path:
 
 
 def _run_self_check(project_dir: Path) -> dict | None:
-    """执行 flower-trellis self-check 并解析 JSON。"""
+    """执行 flower-trellis self-check，保留目标路径并解析 JSON。
+
+    Args:
+        project_dir: 要检查的项目目录。
+    Returns:
+        CLI 检查结果或安装、环境诊断。
+    """
     bootstrap = _check_cli(project_dir)
     if bootstrap:
         return bootstrap
+    # Windows 不会按 PATHEXT 为裸命令补 .CMD，执行时必须使用探测到的入口路径。
+    cli_path = shutil.which("flower-trellis")
+    if not cli_path:
+        return {"status": "cli_unavailable", "reason": "Flower 入口在执行前已不可用，请检查 PATH"}
+    command = [cli_path, "self-check", "--json", "--target", str(project_dir)]
+    run_options = {}
+    if os.name == "nt" and os.path.splitext(cli_path)[1].lower() in {".cmd", ".bat"}:
+        command_processor = os.environ.get("COMSPEC")
+        if not command_processor and os.environ.get("SystemRoot"):
+            command_processor = os.path.join(os.environ["SystemRoot"], "System32", "cmd.exe")
+        if not command_processor or not ntpath.isabs(command_processor):
+            return {"status": "cli_unavailable", "reason": "Windows 命令解释器的绝对路径无法确认，请检查 COMSPEC 与 SystemRoot"}
+        # 批处理即使 shell=False 也会经过 CMD；带引号的环境占位符保留路径中的 &、^ 和 %。
+        # 禁用 AutoRun 与延迟展开，避免宿主配置或 !变量! 改变检查命令及路径。
+        environment = os.environ.copy()
+        environment["FLOWER_UPDATE_HOOK_CLI"] = cli_path
+        environment["FLOWER_UPDATE_HOOK_TARGET"] = str(project_dir)
+        command = f'"{command_processor}" /d /v:off /s /c ""%FLOWER_UPDATE_HOOK_CLI%" self-check --json --target "%FLOWER_UPDATE_HOOK_TARGET%""'
+        run_options = {"executable": command_processor, "env": environment}
     try:
         result = subprocess.run(
-            [
-                "flower-trellis",
-                "self-check",
-                "--json",
-                "--target",
-                str(project_dir),
-            ],
+            command,
             capture_output=True,
             text=True,
             encoding="utf-8",
             errors="replace",
             timeout=SELF_CHECK_TIMEOUT_SECONDS,
             cwd=str(project_dir),
+            **run_options,
         )
     except subprocess.TimeoutExpired:
         return {"status": "cli_unavailable", "reason": "Flower CLI 检查超时，不能据此判定未安装"}