flower-trellis 0.4.4 → 0.4.5-beta.0

package/enhancements/MANIFEST.json

@@ -1,5 +1,5 @@
 {
-  "syncedAt": "2026-07-07T07:24:58.350Z",
+  "syncedAt": "2026-07-07T08:40:30.218Z",
   "syncedFrom": "vendor/skill-garden",
   "sourceCommit": "5fdebe60e923c91ba912461b99413b5c8e11a38c",
   "common": {

package/package.json

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

package/src/assets/flower_update_hook.py

@@ -81,6 +81,7 @@ def _format_context(data: dict) -> str:
     remote = data.get("remote") or {}
     ai = data.get("ai") or {}
     safety = data.get("safety") or {}
+    out_of_sync_reasons = project.get("outOfSyncReasons") or []
     lines = [
         "<flower-update>",
         f"status: {data.get('status')}",
@@ -90,13 +91,23 @@ def _format_context(data: dict) -> str:
         f"bundled_trellis: {current.get('bundledTrellisVersion')}",
         f"project_trellis: {project.get('trellisVersion')}",
     ]
+    if "outOfSync" in project:
+        lines.append(f"project_out_of_sync: {project.get('outOfSync')}")
+    if out_of_sync_reasons:
+        lines.append(f"project_out_of_sync_reasons: {', '.join(out_of_sync_reasons)}")
     if remote.get("tags"):
         lines.append(f"remote: {json.dumps(remote.get('tags'), ensure_ascii=False)}")
+    if remote.get("errorCode"):
+        lines.append(f"remote_error_code: {remote.get('errorCode')}")
     command = (data.get("commands") or {}).get("recommended") or ai.get("command")
     if command:
         lines.append(f"recommended_command: {command}")
     if safety.get("reasons"):
         lines.append(f"safety_reasons: {', '.join(safety.get('reasons') or [])}")
+    if ai.get("mode"):
+        lines.append(f"ai_mode: {ai.get('mode')}")
+    if ai.get("mode") == "ask":
+        lines.append("ai_required_action: 必须先向用户提出明确确认问题;用户确认前禁止执行 recommended_command。")
     if ai.get("instruction"):
         lines.append(f"ai_instruction: {ai.get('instruction')}")
     lines.append("</flower-update>")

package/src/lib/codex-tweaks.js

@@ -15,6 +15,9 @@ import { FLOWER_UPDATE_HOOK_REL } from "./flower-assets.js";
 const WORKFLOW_HOOK_SCRIPT = ".codex/hooks/inject-workflow-state.py";
 const SESSION_START_SCRIPT = ".codex/hooks/session-start.py";
 const CODEX_DISPATCH_MODE = "sub-agent";
+const SESSION_START_MATCHER = "startup|resume|clear|compact";
+const FLOWER_UPDATE_MATCHER = "startup";
+const SESSION_START_TIMEOUT = 30;
 
 /** 返回一行开头的空白缩进。 */
 function leadingWhitespace(line) {
@@ -258,20 +261,48 @@ function hasCommand(hooks, commandNeedle) {
   );
 }
 
-/** 向 SessionStart 合并单个 command hook,保留既有自定义 hook。 */
-function ensureSessionStartCommand(groups, command, timeout, needle) {
-  for (const group of groups) {
-    const hooks = Array.isArray(group?.hooks) ? group.hooks : [];
-    if (hasCommand(hooks, needle)) return false;
+/** 从所有 SessionStart group 移除目标命令,避免 matcher 迁移后重复触发。 */
+function removeSessionStartCommand(groups, needle) {
+  let changed = false;
+  for (let i = groups.length - 1; i >= 0; i -= 1) {
+    const group = groups[i];
+    if (!Array.isArray(group?.hooks)) continue;
+    const before = group.hooks.length;
+    group.hooks = group.hooks.filter(
+      (hook) => !(hook?.type === "command" &&
+        typeof hook.command === "string" &&
+        hook.command.includes(needle)),
+    );
+    if (group.hooks.length !== before) {
+      changed = true;
+      if (group.hooks.length === 0 && !group.matcher) {
+        groups.splice(i, 1);
+      }
+    }
+  }
+  return changed;
+}
+
+/** 查找或创建指定 matcher 的 SessionStart group。 */
+function ensureSessionStartGroup(groups, matcher) {
+  let group = groups.find((item) => item && item.matcher === matcher);
+  if (!group) {
+    group = { matcher, hooks: [] };
+    groups.push(group);
   }
-  groups.push({
-    hooks: [
-      {
-        type: "command",
-        command,
-        timeout,
-      },
-    ],
+  if (!Array.isArray(group.hooks)) group.hooks = [];
+  return group;
+}
+
+/** 向指定 matcher 的 SessionStart group 归位单个 command hook。 */
+function ensureSessionStartCommand(groups, command, timeout, needle, matcher) {
+  const removed = removeSessionStartCommand(groups, needle);
+  const group = ensureSessionStartGroup(groups, matcher);
+  if (hasCommand(group.hooks, needle)) return removed;
+  group.hooks.push({
+    type: "command",
+    command,
+    timeout,
   });
   return true;
 }
@@ -290,8 +321,20 @@ function mergeHooks(hooksPath) {
   const groups = Array.isArray(config.hooks.SessionStart)
     ? config.hooks.SessionStart
     : [];
-  ensureSessionStartCommand(groups, sessionStartCommand(config), 30, SESSION_START_SCRIPT);
-  ensureSessionStartCommand(groups, flowerUpdateCommand(config), 8, FLOWER_UPDATE_HOOK_REL);
+  ensureSessionStartCommand(
+    groups,
+    sessionStartCommand(config),
+    SESSION_START_TIMEOUT,
+    SESSION_START_SCRIPT,
+    SESSION_START_MATCHER,
+  );
+  ensureSessionStartCommand(
+    groups,
+    flowerUpdateCommand(config),
+    SESSION_START_TIMEOUT,
+    FLOWER_UPDATE_HOOK_REL,
+    FLOWER_UPDATE_MATCHER,
+  );
   config.hooks.SessionStart = groups;
 
   const desired = JSON.stringify(config, null, 2) + "\n";

package/src/lib/self-check.js

@@ -164,13 +164,43 @@ function actionForPolicy(policy, command, safety) {
   }
   return {
     mode: "ask",
-    instruction: "先询问用户是否执行更新;用户确认后再运行推荐命令。",
+    instruction: "必须先询问用户是否执行推荐命令;用户明确确认前禁止运行推荐命令。",
     command,
     downgradedFromAuto: policy === "auto",
     downgradeReasons: policy === "auto" ? safety.reasons : [],
   };
 }
 
+/** 给可执行状态补齐安全检查和 AI 动作建议。 */
+function withAction(target, policy, result, command) {
+  const safety = safetyState(target, result.status, command);
+  return {
+    ...result,
+    safety,
+    ai: actionForPolicy(policy, command, safety),
+  };
+}
+
+/** 生成项目重叠加建议结果。 */
+function projectOutOfSyncResult(base, target, remotePatch = {}) {
+  const command = selfUpdateCommand(target, { projectOnly: true });
+  return withAction(
+    target,
+    base.policy,
+    {
+      ...base,
+      status: "project_out_of_sync",
+      reason: "local_version_mismatch",
+      remote: { ...base.remote, ...remotePatch },
+      commands: {
+        recommended: command,
+        projectUpdate: projectUpdateCommand(target),
+      },
+    },
+    command,
+  );
+}
+
 /** 计算 auto 策略安全门槛。 */
 export function safetyState(target, status, command) {
   const git = gitSafety(target);
@@ -211,6 +241,14 @@ export async function buildSelfCheck(target, options = {}) {
   const currentTrellis = trellisVersion();
   const projectTrellis = readProjectTrellisVersion(absoluteTarget);
   const projectFlower = typeof manifest?.flowerVersion === "string" ? manifest.flowerVersion : null;
+  const projectOutOfSyncReasons = [];
+  if (projectFlower && projectFlower !== currentFlower) {
+    projectOutOfSyncReasons.push("flower_version_mismatch");
+  }
+  if (projectTrellis && projectTrellis !== currentTrellis) {
+    projectOutOfSyncReasons.push("trellis_version_mismatch");
+  }
+  const projectOutOfSync = projectOutOfSyncReasons.length > 0;
 
   const base = {
     status: "up_to_date",
@@ -226,6 +264,8 @@ export async function buildSelfCheck(target, options = {}) {
       flowerVersion: projectFlower,
       trellisVersion: projectTrellis,
       manifestPresent: Boolean(manifest),
+      outOfSync: projectOutOfSync,
+      outOfSyncReasons: projectOutOfSyncReasons,
     },
     remote: {
       tags: updateCheck.lastRemote,
@@ -250,44 +290,35 @@ export async function buildSelfCheck(target, options = {}) {
     return { ...base, status: "skipped", reason: "npx_runtime" };
   }
 
-  const projectOutOfSync =
-    (projectFlower && projectFlower !== currentFlower) ||
-    (projectTrellis && projectTrellis !== currentTrellis);
-
-  if (projectOutOfSync) {
-    const command = selfUpdateCommand(absoluteTarget, { projectOnly: true });
-    const result = {
-      ...base,
-      status: "project_out_of_sync",
-      reason: "local_version_mismatch",
-      commands: {
-        recommended: command,
-        projectUpdate: projectUpdateCommand(absoluteTarget),
-      },
-    };
-    const safety = safetyState(absoluteTarget, result.status, command);
-    result.safety = safety;
-    result.ai = actionForPolicy(updateCheck.policy, command, safety);
-    return result;
-  }
-
   let tags = updateCheck.lastRemote;
   if (!forceRemote && isRemoteCacheFresh(updateCheck, now)) {
     const recommendation = getUpdateRecommendation(currentFlower, tags);
     if (recommendation) {
       const command = selfUpdateCommand(absoluteTarget);
-      const result = {
-        ...base,
-        status: "update_available",
-        reason: "cached_remote_update",
-        remote: { ...base.remote, tags, fromCache: true, skipped: true },
-        recommendation,
-        commands: { recommended: command, npm: recommendation.command },
-      };
-      const safety = safetyState(absoluteTarget, result.status, command);
-      result.safety = safety;
-      result.ai = actionForPolicy(updateCheck.policy, command, safety);
-      return result;
+      return withAction(
+        absoluteTarget,
+        updateCheck.policy,
+        {
+          ...base,
+          status: "update_available",
+          reason: "cached_remote_update",
+          remote: { ...base.remote, tags, fromCache: true, skipped: true },
+          recommendation,
+          commands: {
+            recommended: command,
+            npm: recommendation.command,
+            projectUpdate: projectUpdateCommand(absoluteTarget),
+          },
+        },
+        command,
+      );
+    }
+    if (projectOutOfSync) {
+      return projectOutOfSyncResult(base, absoluteTarget, {
+        tags,
+        fromCache: true,
+        skipped: true,
+      });
     }
     return {
       ...base,
@@ -306,47 +337,55 @@ export async function buildSelfCheck(target, options = {}) {
         lastErrorCode: "fetch_failed",
       });
     }
+    const remotePatch = { tags: updateCheck.lastRemote, errorCode: "fetch_failed" };
+    if (projectOutOfSync) {
+      return projectOutOfSyncResult(base, absoluteTarget, remotePatch);
+    }
     return {
       ...base,
       status: "offline",
       reason: "fetch_failed",
-      remote: { ...base.remote, tags: updateCheck.lastRemote, errorCode: "fetch_failed" },
+      remote: { ...base.remote, ...remotePatch },
     };
   }
 
   const recommendation = getUpdateRecommendation(currentFlower, tags);
-  const status = recommendation ? "update_available" : "up_to_date";
+  const remoteStatus = recommendation ? "update_available" : "up_to_date";
   if (writeCache && manifest) {
     writeUpdateCheck(absoluteTarget, {
       lastCheckedAt: now.toISOString(),
       lastRemote: tags,
-      lastStatus: status,
+      lastStatus: remoteStatus,
       lastErrorCode: null,
     });
   }
 
   if (!recommendation) {
+    if (projectOutOfSync) {
+      return projectOutOfSyncResult(base, absoluteTarget, { tags });
+    }
     return {
       ...base,
-      status,
+      status: remoteStatus,
       remote: { ...base.remote, tags },
     };
   }
 
   const command = selfUpdateCommand(absoluteTarget);
-  const result = {
-    ...base,
-    status,
-    remote: { ...base.remote, tags },
-    recommendation,
-    commands: {
-      recommended: command,
-      npm: recommendation.command,
-      projectUpdate: projectUpdateCommand(absoluteTarget),
+  return withAction(
+    absoluteTarget,
+    updateCheck.policy,
+    {
+      ...base,
+      status: remoteStatus,
+      remote: { ...base.remote, tags },
+      recommendation,
+      commands: {
+        recommended: command,
+        npm: recommendation.command,
+        projectUpdate: projectUpdateCommand(absoluteTarget),
+      },
     },
-  };
-  const safety = safetyState(absoluteTarget, result.status, command);
-  result.safety = safety;
-  result.ai = actionForPolicy(updateCheck.policy, command, safety);
-  return result;
+    command,
+  );
 }