flower-trellis 0.4.0 → 0.4.2

package/src/commands/update-check.js

@@ -0,0 +1,86 @@
+import fs from "node:fs";
+import path from "node:path";
+import {
+  manifestPath,
+  readManifest,
+  readUpdateCheck,
+  writeUpdateCheck,
+} from "../lib/manifest.js";
+
+const POLICIES = new Set(["off", "notify", "ask", "auto"]);
+
+/** 读取 flag 后面的取值。 */
+function optionValue(args, name) {
+  const index = args.indexOf(name);
+  if (index === -1) return null;
+  return args[index + 1] || null;
+}
+
+/** 确保目标是 Trellis 项目。 */
+function assertTrellisProject(target) {
+  if (!fs.existsSync(path.join(target, ".trellis"))) {
+    throw new Error(`目标不是 Trellis 项目:${target}`);
+  }
+}
+
+/**
+ * flower-trellis update-check:管理 manifest 内的启动更新检查策略。
+ *
+ * @param {object} ctx 见 cli.js 的 parse()
+ */
+export async function updateCheck(ctx) {
+  const args = ctx.passthrough;
+  const action = args.find((arg) => !arg.startsWith("-")) || "get";
+  assertTrellisProject(ctx.target);
+
+  if (action === "get") {
+    const manifest = readManifest(ctx.target);
+    console.log(`manifest: ${manifestPath(ctx.target)}`);
+    console.log(JSON.stringify(readUpdateCheck(ctx.target), null, 2));
+    if (!manifest) console.log("  · manifest 不存在,当前显示默认策略");
+    return;
+  }
+
+  if (action === "set") {
+    const policy = optionValue(args, "--policy");
+    const intervalText = optionValue(args, "--interval-hours");
+    const patch = {};
+    if (policy) {
+      if (!POLICIES.has(policy)) {
+        throw new Error("policy 只能是 off / notify / ask / auto");
+      }
+      patch.policy = policy;
+      patch.enabled = policy !== "off";
+    }
+    if (intervalText !== null) {
+      const intervalHours = Number(intervalText);
+      if (!Number.isFinite(intervalHours) || intervalHours < 0) {
+        throw new Error("--interval-hours 必须是非负数字");
+      }
+      patch.intervalHours = intervalHours;
+    }
+    if (!Object.keys(patch).length) {
+      throw new Error("update-check set 需要 --policy 或 --interval-hours");
+    }
+    writeUpdateCheck(ctx.target, patch);
+    console.log("  ✓ updateCheck 策略已更新");
+    console.log(JSON.stringify(readUpdateCheck(ctx.target), null, 2));
+    return;
+  }
+
+  if (action === "disable") {
+    writeUpdateCheck(ctx.target, { enabled: false });
+    console.log("  ✓ 启动更新检查已关闭(policy 保留)");
+    console.log(JSON.stringify(readUpdateCheck(ctx.target), null, 2));
+    return;
+  }
+
+  if (action === "enable") {
+    writeUpdateCheck(ctx.target, { enabled: true });
+    console.log("  ✓ 启动更新检查已启用(policy 沿用)");
+    console.log(JSON.stringify(readUpdateCheck(ctx.target), null, 2));
+    return;
+  }
+
+  throw new Error("update-check 只支持 get / set / disable / enable");
+}

package/src/lib/apply-enhancements.js

@@ -5,6 +5,8 @@ import { copyScriptAssets } from "./copy-scripts.js";
 import { injectWorkflow } from "./workflow-inject.js";
 import { injectSkillOverrides } from "./skill-override-inject.js";
 import { applyCodexTweaks } from "./codex-tweaks.js";
+import { applyClaudeTweaks } from "./claude-tweaks.js";
+import { copyFlowerAssets } from "./flower-assets.js";
 import { readManifest, writeManifest } from "./manifest.js";
 import { flowerVersion } from "./versions.js";
 import { rmrf } from "./fs-utils.js";
@@ -63,8 +65,11 @@ export function applyEnhancements(target, opts = {}) {
     variantDir,
     skills,
   );
-  const installed = [...skillInstalled, ...scriptInstalled];
-  const newPaths = [...skillPaths, ...scriptPaths];
+  const { installed: flowerInstalled, paths: flowerPaths } = skills.length === 0
+    ? copyFlowerAssets(target)
+    : { installed: [], paths: [] };
+  const installed = [...skillInstalled, ...scriptInstalled, ...flowerInstalled];
+  const newPaths = [...skillPaths, ...scriptPaths, ...flowerPaths];
   const where = [];
   if (newPaths.some((p) => p.startsWith(".claude/skills"))) where.push(".claude/skills");
   if (newPaths.some((p) => p.startsWith(".agents/skills"))) where.push(".agents/skills");
@@ -152,5 +157,10 @@ export function applyEnhancements(target, opts = {}) {
     console.log(`  ✓ codex 调整:${seg};hooks.json 已合并 SessionStart;${dispatch}`);
   }
 
+  const claude = applyClaudeTweaks(target);
+  if (claude.applied) {
+    console.log("  ✓ claude 调整:settings.json 已合并 startup 更新检查 hook");
+  }
+
   return { variant, installed };
 }

package/src/lib/claude-tweaks.js

@@ -0,0 +1,98 @@
+import fs from "node:fs";
+import path from "node:path";
+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}`;
+
+/** 容错读取 Claude settings JSON。 */
+function readSettings(settingsPath) {
+  try {
+    const parsed = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
+    if (parsed && typeof parsed === "object") {
+      const hooks = parsed.hooks && typeof parsed.hooks === "object" ? parsed.hooks : {};
+      return { ...parsed, hooks };
+    }
+  } catch {
+    // 缺失或损坏时用空配置重建,避免后处理阻断 init/update。
+  }
+  return { hooks: {} };
+}
+
+/** 从 Claude UserPromptSubmit hook 推导 Python 命令前缀。 */
+function flowerUpdateCommand(config) {
+  const groups = Array.isArray(config.hooks.UserPromptSubmit)
+    ? config.hooks.UserPromptSubmit
+    : [];
+  for (const group of groups) {
+    const hooks = Array.isArray(group?.hooks) ? group.hooks : [];
+    for (const hook of hooks) {
+      if (hook?.type !== "command" || typeof hook.command !== "string") continue;
+      if (hook.command.includes(WORKFLOW_HOOK_SCRIPT)) {
+        return hook.command.replace(WORKFLOW_HOOK_SCRIPT, FLOWER_UPDATE_HOOK_REL);
+      }
+    }
+  }
+  return DEFAULT_COMMAND;
+}
+
+/** 判断 hook 列表里是否已有 flower update hook。 */
+function hasFlowerHook(hooks) {
+  return hooks.some(
+    (hook) => hook?.type === "command" &&
+      typeof hook.command === "string" &&
+      hook.command.includes(FLOWER_UPDATE_HOOK_REL),
+  );
+}
+
+/** 合并 Claude startup hook,并确保 clear / compact 不运行 update hook。 */
+function mergeClaudeHooks(settingsPath) {
+  const config = readSettings(settingsPath);
+  const groups = Array.isArray(config.hooks.SessionStart)
+    ? config.hooks.SessionStart
+    : [];
+  const command = flowerUpdateCommand(config);
+  let startup = groups.find((group) => group?.matcher === "startup");
+  if (!startup) {
+    startup = { matcher: "startup", hooks: [] };
+    groups.unshift(startup);
+  }
+  if (!Array.isArray(startup.hooks)) startup.hooks = [];
+
+  let changed = false;
+  for (const group of groups) {
+    if (group === startup || !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(FLOWER_UPDATE_HOOK_REL)),
+    );
+    if (group.hooks.length !== before) changed = true;
+  }
+
+  if (!hasFlowerHook(startup.hooks)) {
+    startup.hooks.push({ type: "command", command, timeout: 8 });
+    changed = true;
+  }
+
+  config.hooks.SessionStart = groups;
+  const desired = JSON.stringify(config, null, 2) + "\n";
+  const current = fs.existsSync(settingsPath) ? fs.readFileSync(settingsPath, "utf8") : "";
+  if (current === desired) return changed;
+  fs.writeFileSync(settingsPath, desired);
+  return true;
+}
+
+/**
+ * Claude Code 平台后处理入口。仅当 `.claude/` 存在时执行。
+ *
+ * @param {string} target 目标项目根
+ * @returns {{applied:boolean,settingsWritten?:boolean}}
+ */
+export function applyClaudeTweaks(target) {
+  const claudeDir = path.join(target, ".claude");
+  if (!fs.existsSync(claudeDir)) return { applied: false };
+  const settingsWritten = mergeClaudeHooks(path.join(claudeDir, "settings.json"));
+  return { applied: true, settingsWritten };
+}

package/src/lib/codex-tweaks.js

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import { FLOWER_UPDATE_HOOK_REL } from "./flower-assets.js";
 
 /**
  * flower-trellis 对 Trellis 生成的 codex 配置的定制后处理。
@@ -239,23 +240,40 @@ function sessionStartCommand(config) {
   return `python3 -X utf8 ${SESSION_START_SCRIPT}`;
 }
 
-/**
- * 构造 flower 额外需要的 SessionStart hook。UserPromptSubmit 由 Trellis 上游维护,这里不覆盖。
- * @param {{hooks: object}} config hooks.json 配置
- * @returns {Array<object>} SessionStart hook 数组
- */
-function sessionStartHook(config) {
-  return [
-    {
-      hooks: [
-        {
-          type: "command",
-          command: sessionStartCommand(config),
-          timeout: 30,
-        },
-      ],
-    },
-  ];
+/** 从 Trellis SessionStart 命令推导 flower update hook 命令。 */
+function flowerUpdateCommand(config) {
+  const command = sessionStartCommand(config);
+  if (command.includes(SESSION_START_SCRIPT)) {
+    return command.replace(SESSION_START_SCRIPT, FLOWER_UPDATE_HOOK_REL);
+  }
+  return `python3 -X utf8 ${FLOWER_UPDATE_HOOK_REL}`;
+}
+
+/** 判断 hooks 数组里是否已有指定命令。 */
+function hasCommand(hooks, commandNeedle) {
+  return hooks.some(
+    (hook) => hook?.type === "command" &&
+      typeof hook.command === "string" &&
+      hook.command.includes(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;
+  }
+  groups.push({
+    hooks: [
+      {
+        type: "command",
+        command,
+        timeout,
+      },
+    ],
+  });
+  return true;
 }
 
 /**
@@ -269,7 +287,12 @@ function sessionStartHook(config) {
  */
 function mergeHooks(hooksPath) {
   const config = readHooksConfig(hooksPath);
-  config.hooks.SessionStart = sessionStartHook(config);
+  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);
+  config.hooks.SessionStart = groups;
 
   const desired = JSON.stringify(config, null, 2) + "\n";
   const current = fs.existsSync(hooksPath) ? fs.readFileSync(hooksPath, "utf8") : "";

package/src/lib/flower-assets.js

@@ -0,0 +1,29 @@
+import path from "node:path";
+import { copyPath } from "./fs-utils.js";
+import { PKG_ROOT } from "./paths.js";
+
+/** flower 自有启动更新 hook 脚本名。 */
+export const FLOWER_UPDATE_HOOK = "flower_update_hook.py";
+
+/** flower 自有启动更新 hook 在目标项目内的相对路径。 */
+export const FLOWER_UPDATE_HOOK_REL = `.trellis/scripts/${FLOWER_UPDATE_HOOK}`;
+
+/**
+ * 复制 flower 自有脚本资产。
+ *
+ * 这些脚本属于 flower-trellis 自身能力,不从 skill-garden 快照同步,避免和
+ * `enhancements/<variant>/scripts` 的边界混淆。
+ *
+ * @param {string} target 目标项目根
+ * @returns {{installed:string[],paths:string[]}} 已安装资产和 manifest 路径
+ */
+export function copyFlowerAssets(target) {
+  copyPath(
+    path.join(PKG_ROOT, "src", "assets", FLOWER_UPDATE_HOOK),
+    path.join(target, ...FLOWER_UPDATE_HOOK_REL.split("/")),
+  );
+  return {
+    installed: [`script:${FLOWER_UPDATE_HOOK}`],
+    paths: [FLOWER_UPDATE_HOOK_REL],
+  };
+}

package/src/lib/manifest.js

@@ -11,6 +11,16 @@ import path from "node:path";
  * 放在 .trellis/ 下,随项目的 Trellis 生命周期存在(uninstall 删 .trellis 时一并消失)。
  */
 const MANIFEST_REL = path.join(".trellis", ".flower-manifest.json");
+const UPDATE_POLICIES = new Set(["off", "notify", "ask", "auto"]);
+const DEFAULT_UPDATE_CHECK = {
+  enabled: true,
+  policy: "ask",
+  intervalHours: 24,
+  lastCheckedAt: null,
+  lastRemote: null,
+  lastStatus: null,
+  lastErrorCode: null,
+};
 
 /** manifest 文件的绝对路径。 */
 export function manifestPath(target) {
@@ -26,7 +36,82 @@ export function readManifest(target) {
   }
 }
 
-/** 写入 manifest。 */
+/**
+ * 归一化启动更新检查配置。
+ *
+ * 用户策略字段启用保守默认值;缓存字段只保留结构化摘要,避免把网络错误细节写入项目。
+ *
+ * @param {object|null|undefined} value 原始 updateCheck 字段
+ * @returns {{enabled:boolean,policy:string,intervalHours:number,lastCheckedAt:string|null,lastRemote:object|null,lastStatus:string|null,lastErrorCode:string|null}} 归一化后的 updateCheck
+ */
+export function normalizeUpdateCheck(value) {
+  const raw = value && typeof value === "object" ? value : {};
+  const policy = UPDATE_POLICIES.has(raw.policy) ? raw.policy : DEFAULT_UPDATE_CHECK.policy;
+  const interval = Number(raw.intervalHours);
+  const intervalHours = Number.isFinite(interval) && interval >= 0
+    ? interval
+    : DEFAULT_UPDATE_CHECK.intervalHours;
+  const lastRemote = raw.lastRemote && typeof raw.lastRemote === "object"
+    ? {
+        latest: typeof raw.lastRemote.latest === "string" ? raw.lastRemote.latest : null,
+        beta: typeof raw.lastRemote.beta === "string" ? raw.lastRemote.beta : null,
+      }
+    : null;
+
+  return {
+    enabled: typeof raw.enabled === "boolean" ? raw.enabled : DEFAULT_UPDATE_CHECK.enabled,
+    policy,
+    intervalHours,
+    lastCheckedAt: typeof raw.lastCheckedAt === "string" ? raw.lastCheckedAt : null,
+    lastRemote,
+    lastStatus: typeof raw.lastStatus === "string" ? raw.lastStatus : null,
+    lastErrorCode: typeof raw.lastErrorCode === "string" ? raw.lastErrorCode : null,
+  };
+}
+
+/**
+ * 读取 manifest 里的启动更新检查配置。
+ *
+ * @param {string} target 目标项目根
+ * @returns {ReturnType<typeof normalizeUpdateCheck>} 归一化后的配置
+ */
+export function readUpdateCheck(target) {
+  return normalizeUpdateCheck(readManifest(target)?.updateCheck);
+}
+
+/**
+ * 写入启动更新检查配置,保留 manifest 其它安装清单字段。
+ *
+ * @param {string} target 目标项目根
+ * @param {object} patch 要合并进 updateCheck 的字段
+ * @returns {object} 写入后的 manifest
+ */
+export function writeUpdateCheck(target, patch) {
+  const current = readManifest(target) || {};
+  const updateCheck = normalizeUpdateCheck({
+    ...normalizeUpdateCheck(current.updateCheck),
+    ...(patch || {}),
+  });
+  const next = { ...current, updateCheck };
+  fs.writeFileSync(manifestPath(target), JSON.stringify(next, null, 2) + "\n");
+  return next;
+}
+
+/**
+ * 写入 manifest。
+ *
+ * 若调用方没有显式传入 `updateCheck`,保留目标项目已有策略与缓存,避免全装重写时覆盖用户选择。
+ *
+ * @param {string} target 目标项目根
+ * @param {object} data manifest 新内容
+ */
 export function writeManifest(target, data) {
-  fs.writeFileSync(manifestPath(target), JSON.stringify(data, null, 2) + "\n");
+  const current = readManifest(target);
+  const next = { ...data };
+  if (Object.prototype.hasOwnProperty.call(data, "updateCheck")) {
+    next.updateCheck = normalizeUpdateCheck(data.updateCheck);
+  } else {
+    next.updateCheck = normalizeUpdateCheck(current?.updateCheck);
+  }
+  fs.writeFileSync(manifestPath(target), JSON.stringify(next, null, 2) + "\n");
 }