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

package/enhancements/MANIFEST.json

@@ -1,5 +1,5 @@
 {
-  "syncedAt": "2026-07-07T08:47:14.594Z",
+  "syncedAt": "2026-07-07T09:44:07.804Z",
   "syncedFrom": "vendor/skill-garden",
   "sourceCommit": "5fdebe60e923c91ba912461b99413b5c8e11a38c",
   "common": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flower-trellis",
-  "version": "0.4.5-beta.1",
+  "version": "0.4.5-beta.3",
   "description": "一键安装/升级 Trellis 并自动融合 skill-garden 强化包(默认 Claude + agents)",
   "type": "module",
   "bin": {

package/src/assets/flower_update_hook.py

@@ -17,6 +17,7 @@ from pathlib import Path
 
 
 ACTIONABLE_STATUSES = {"update_available", "project_out_of_sync"}
+SELF_CHECK_TIMEOUT_SECONDS = 30
 
 
 def _debug(message: str) -> None:
@@ -57,7 +58,7 @@ def _run_self_check(project_dir: Path) -> dict | None:
             text=True,
             encoding="utf-8",
             errors="replace",
-            timeout=8,
+            timeout=SELF_CHECK_TIMEOUT_SECONDS,
             cwd=str(project_dir),
         )
     except (subprocess.TimeoutExpired, FileNotFoundError, PermissionError) as exc:
@@ -84,6 +85,8 @@ def _format_context(data: dict) -> str:
     out_of_sync_reasons = project.get("outOfSyncReasons") or []
     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')}",
@@ -114,11 +117,22 @@ def _format_context(data: dict) -> str:
     return "\n".join(lines)
 
 
-def _emit_context(context: str) -> None:
+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")
+    if ai.get("mode") == "ask" and command:
+        return "flower-trellis 发现可执行更新;必须先询问用户是否执行 recommended_command,确认前禁止运行。"
+    if command:
+        return "flower-trellis 发现可执行更新;已注入 recommended_command。"
+    return "flower-trellis update context injected"
+
+
+def _emit_context(context: str, system_message: str) -> None:
     """输出 Codex / Claude Code 都接受的 SessionStart hook JSON。"""
     result = {
         "suppressOutput": True,
-        "systemMessage": "flower-trellis update context injected",
+        "systemMessage": system_message,
         "hookSpecificOutput": {
             "hookEventName": "SessionStart",
             "additionalContext": context,
@@ -138,7 +152,7 @@ def main() -> None:
     data = _run_self_check(_project_dir(hook_input))
     if not data or data.get("status") not in ACTIONABLE_STATUSES:
         return
-    _emit_context(_format_context(data))
+    _emit_context(_format_context(data), _system_message(data))
 
 
 if __name__ == "__main__":

package/src/lib/claude-tweaks.js

@@ -4,6 +4,7 @@ import { FLOWER_UPDATE_HOOK_REL } from "./flower-assets.js";
 
 const WORKFLOW_HOOK_SCRIPT = ".claude/hooks/inject-workflow-state.py";
 const DEFAULT_COMMAND = `python3 ${FLOWER_UPDATE_HOOK_REL}`;
+const FLOWER_UPDATE_TIMEOUT = 30;
 
 /** 容错读取 Claude settings JSON。 */
 function readSettings(settingsPath) {
@@ -45,6 +46,20 @@ function hasFlowerHook(hooks) {
   );
 }
 
+/** 将已有 flower update hook 的超时迁移到当前预算。 */
+function normalizeFlowerHookTimeout(hooks) {
+  let changed = false;
+  for (const hook of hooks) {
+    if (hook?.type !== "command" || typeof hook.command !== "string") continue;
+    if (!hook.command.includes(FLOWER_UPDATE_HOOK_REL)) continue;
+    if (hook.timeout !== FLOWER_UPDATE_TIMEOUT) {
+      hook.timeout = FLOWER_UPDATE_TIMEOUT;
+      changed = true;
+    }
+  }
+  return changed;
+}
+
 /** 合并 Claude startup hook,并确保 clear / compact 不运行 update hook。 */
 function mergeClaudeHooks(settingsPath) {
   const config = readSettings(settingsPath);
@@ -71,8 +86,9 @@ function mergeClaudeHooks(settingsPath) {
     if (group.hooks.length !== before) changed = true;
   }
 
+  changed = normalizeFlowerHookTimeout(startup.hooks) || changed;
   if (!hasFlowerHook(startup.hooks)) {
-    startup.hooks.push({ type: "command", command, timeout: 8 });
+    startup.hooks.push({ type: "command", command, timeout: FLOWER_UPDATE_TIMEOUT });
     changed = true;
   }
 

package/src/lib/self-check.js

@@ -28,6 +28,8 @@ function readProjectTrellisVersion(target) {
 
 /** 判断远程探测缓存是否仍在 interval 内。 */
 function isRemoteCacheFresh(updateCheck, now = new Date()) {
+  if (updateCheck.lastStatus === "offline" || updateCheck.lastErrorCode) return false;
+  if (!updateCheck.lastRemote) return false;
   if (!updateCheck.lastCheckedAt) return false;
   const checkedAt = new Date(updateCheck.lastCheckedAt).getTime();
   if (!Number.isFinite(checkedAt)) return false;
@@ -332,7 +334,6 @@ export async function buildSelfCheck(target, options = {}) {
   if (!tags) {
     if (writeCache && manifest) {
       writeUpdateCheck(absoluteTarget, {
-        lastCheckedAt: now.toISOString(),
         lastStatus: "offline",
         lastErrorCode: "fetch_failed",
       });

package/src/lib/update-check.js

@@ -1,6 +1,7 @@
 import { spawnSync } from "node:child_process";
 import { confirm } from "@inquirer/prompts";
 import chalk from "chalk";
+import { readManifest, readUpdateCheck, writeUpdateCheck } from "./manifest.js";
 import { isRunningViaNpx } from "./runtime-env.js";
 import { flowerVersion } from "./versions.js";
 
@@ -16,8 +17,8 @@ import { flowerVersion } from "./versions.js";
 const REGISTRY = "https://registry.npmjs.org";
 /** 待检测的包名(即本包)。 */
 const PKG = "flower-trellis";
-/** 网络探测超时(毫秒)—— init/update 是重操作,2.5s 探测可接受且不显著影响体感。 */
-const TIMEOUT_MS = 2500;
+/** 网络探测超时(毫秒)—— 启动检查有 hook 总预算兜底,5s 可降低 registry 偶发慢响应误判。 */
+const TIMEOUT_MS = 5000;
 
 /**
  * 取 npm 上 flower-trellis 的 dist-tags;任何失败(离线/超时/非 200/解析异常)一律
@@ -173,13 +174,29 @@ export function getUpdateRecommendation(current, tags) {
   return null;
 }
 
+/** 尽力而为刷新目标项目 manifest 里的远端探测缓存。 */
+function rememberRemoteTags(target, tags, status) {
+  try {
+    if (!readManifest(target)) return;
+    writeUpdateCheck(target, {
+      lastCheckedAt: new Date().toISOString(),
+      lastRemote: tags,
+      lastStatus: status,
+      lastErrorCode: null,
+    });
+  } catch {
+    // 缓存写入只是优化后续启动提示,失败不能影响 init/update 主流程。
+  }
+}
+
 /**
  * 检测 flower-trellis 自身是否有新版本,并按场景提示/引导升级。在 init / update 的
  * 品牌头部之后、主操作之前调用。
  *
  * 短路条件(任一命中即跳过,什么都不打印):关闭开关(`--no-update-check` 使
- * `ctx.updateCheck===false`,或环境变量 `FLOWER_NO_UPDATE_CHECK` 非空)、经 npx 运行、
- * 网络探测失败、无升级推荐。
+ * `ctx.updateCheck===false`,目标 manifest 的 `updateCheck.enabled=false` /
+ * `policy=off`,或环境变量 `FLOWER_NO_UPDATE_CHECK` 非空)、经 npx 运行、网络探测失败、
+ * 无升级推荐。
  *
  * 发现新版时的行为:
  *  - 交互 TTY:打印通知 → confirm 询问是否升级 → 同意则执行推荐的 npm install 命令;
@@ -194,6 +211,8 @@ export function getUpdateRecommendation(current, tags) {
 export async function checkForUpdate(ctx, commandLabel) {
   // 1. 关闭开关:显式 flag 或环境变量
   if (ctx.updateCheck === false || process.env.FLOWER_NO_UPDATE_CHECK) return;
+  const updateCheck = readUpdateCheck(ctx.target);
+  if (!updateCheck.enabled || updateCheck.policy === "off") return;
   // 2. npx 本就是最新版,跳过(连通知都不打,避免误导)
   if (isRunningViaNpx(import.meta.url)) return;
 
@@ -204,6 +223,7 @@ export async function checkForUpdate(ctx, commandLabel) {
   // 4. 根据本地版本通道生成推荐;无推荐时不打扰
   const current = flowerVersion();
   const recommendation = getUpdateRecommendation(current, tags);
+  rememberRemoteTags(ctx.target, tags, recommendation ? "update_available" : "up_to_date");
   if (!recommendation) return;
 
   // 5. 打印发现新版本通知(粉色品牌色,与 banner 一致)