flower-trellis 0.6.0-beta.1 → 0.6.0-beta.2

package/enhancements/MANIFEST.json

@@ -1,5 +1,5 @@
 {
-  "syncedAt": "2026-08-03T13:49:40.703Z",
+  "syncedAt": "2026-08-03T15:09:38.275Z",
   "syncedFrom": "vendor/skill-garden",
   "sourceCommit": "99505703777997be615cecb2e950fbd766398bc9",
   "common": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flower-trellis",
-  "version": "0.6.0-beta.1",
+  "version": "0.6.0-beta.2",
   "description": "一键安装/升级 Trellis 并自动融合 skill-garden 强化包(默认 Claude + agents)",
   "type": "module",
   "bin": {
@@ -68,9 +68,9 @@
     "commit-and-tag-version": "^12.7.3"
   },
   "flowerReleaseNotes": {
-    "version": "0.6.0-beta.1",
+    "version": "0.6.0-beta.2",
     "source": "CHANGELOG.md",
-    "body": "### 🐛 修复 Bug Fixes\n\n* 同步简化 untracked 流程与 Push 路由 ([26ce73a](https://github.com/SilentFlower/flower-trellis/commit/26ce73a0a9a5dbcc3b8a623ca08b062a54a1e810))",
+    "body": "### 🐛 修复 Bug Fixes\n\n* 修复 Skill-Garden update 平台状态污染 ([787d4c7](https://github.com/SilentFlower/flower-trellis/commit/787d4c797834b4a0bb909e4eb20afe0be281fde1))",
     "truncated": false
   },
   "optionalDependencies": {

package/src/builtin-plugins/skill-garden/content-adapter.js

@@ -343,6 +343,46 @@ export function projectSkillGardenContent(options) {
     });
   }
 
+  /**
+   * 只有目录当前全部文件都会在本轮删除时，才登记父目录清理。
+   *
+   * 旧版本可能只登记 check-all agent 文件，没登记 `.gemini` / `.zcode` 父目录。
+   * 这里用当前目录完整文件集合做 fail-closed 判断，避免删除包含用户内容的平台目录。
+   *
+   * @param {string} directory 项目内目录
+   * @param {Set<string>} staleTargets 本轮确认淘汰的旧受管文件
+   */
+  function addDirectoryRemovalIfOnlyStaleFiles(directory, staleTargets) {
+    assertSafePosixRelativePath(directory, "skill-garden 待删目录");
+    const absoluteDirectory = path.join(projectRoot, ...directory.split("/"));
+    const existingTargets = listExistingFiles(absoluteDirectory)
+      .map((file) => `${directory}/${file.path}`);
+    if (existingTargets.length === 0) return;
+    if (!existingTargets.every((target) => staleTargets.has(target))) return;
+    const beforeHash = hashDirectoryIfExists(absoluteDirectory);
+    if (beforeHash === null) return;
+    if (directoryRemovals.some(({ path: targetPath }) => targetPath === directory)) return;
+    directoryRemovals.push({ owner: resolved.id, path: directory, beforeHash });
+  }
+
+  /**
+   * 为旧平台 check-all agent 规划安全父目录清理。
+   *
+   * @param {Set<string>} staleTargets 本轮确认淘汰的旧受管 check-all agent
+   */
+  function addStaleCheckAllDirectoryRemovals(staleTargets) {
+    for (const target of [...staleTargets].sort(compareUtf8)) {
+      const parent = path.posix.dirname(target);
+      if (parent !== "." && parent !== target) {
+        addDirectoryRemovalIfOnlyStaleFiles(parent, staleTargets);
+      }
+      const [root] = target.split("/");
+      if (root && root !== parent) {
+        addDirectoryRemovalIfOnlyStaleFiles(root, staleTargets);
+      }
+    }
+  }
+
   /**
    * 把一个来源目录按 copyPath 语义投影到目标目录。
    *
@@ -591,6 +631,12 @@ export function projectSkillGardenContent(options) {
     const selectedPlatforms = new Set(options.platformSelection?.platforms || []);
     const body = fs.readFileSync(path.join(variantDir, CHECK_ALL_AGENT_BODY_REL), "utf8");
     const checkAllSkillRoot = path.join(variantDir, ".agents", "skills", "trellis-check-all");
+    const checkAllTargets = new Set(
+      catalog.platforms
+        .filter(({ checkAll }) => checkAll.eligible)
+        .map(({ checkAll }) => checkAll.target),
+    );
+    const desiredCheckAllTargets = new Set();
     for (const entry of catalog.platforms.filter(({ checkAll }) => checkAll.eligible)) {
       const runtimePlatforms = entry.runtimePlatforms || [entry.id];
       const enabled = selectedPlatforms.size > 0
@@ -613,8 +659,16 @@ export function projectSkillGardenContent(options) {
         "exclusive",
         pluginPackage.skillGarden.variant === "0.6",
       );
+      desiredCheckAllTargets.add(entry.checkAll.target);
       installed.add(`agent:trellis-check-all:${entry.id}`);
     }
+    const staleCheckAllTargets = new Set();
+    for (const entry of previous?.paths || []) {
+      if (!checkAllTargets.has(entry.path) || desiredCheckAllTargets.has(entry.path)) continue;
+      paths.delete(entry.path);
+      staleCheckAllTargets.add(entry.path);
+    }
+    addStaleCheckAllDirectoryRemovals(staleCheckAllTargets);
     addFile(
       ".trellis/agents/check-all.md",
       Buffer.from([

package/src/builtin-plugins/skill-garden/runtime.js

@@ -1,7 +1,12 @@
 import "../../plugin/install/patch-planner.js";
+import { getConfiguredPlatforms } from "@mindfoldhq/trellis/dist/configurators/index.js";
 import { PluginApplicationService } from "../../plugin/application-service.js";
-import { detectPluginPlatforms } from "../../plugin/install/platform-detector.js";
+import {
+  detectPluginPlatforms,
+  listPluginPlatforms,
+} from "../../plugin/install/platform-detector.js";
 import { PLUGIN_RUNTIME_ERROR_CODES } from "../../plugin/runtime-errors.js";
+import { compareUtf8 } from "../../plugin/stable-order.js";
 import { ProjectStore } from "../../plugin/state/project-store.js";
 import { SourceRegistry } from "../../plugin/sources/source-registry.js";
 import {
@@ -9,13 +14,40 @@ import {
   SkillGardenBuiltinProvider,
 } from "./provider.js";
 
+const TRELLIS_TO_PLUGIN_PLATFORM = new Map([
+  ["claude-code", "claude"],
+]);
+
 /**
- * 选择与旧 enhancement fallback 一致的平台参数。
+ * 读取 Trellis 已配置平台并转换为 Plugin 平台 ID。
+ *
+ * @param {string} projectRoot 项目根
+ * @returns {string[]} Plugin 平台列表；无法读取或没有命中时返回空数组
+ */
+function configuredTrellisPluginPlatforms(projectRoot) {
+  try {
+    const supported = new Set(listPluginPlatforms());
+    return [...new Set([...getConfiguredPlatforms(projectRoot)]
+      .map((platform) => TRELLIS_TO_PLUGIN_PLATFORM.get(platform) || platform)
+      .filter((platform) => supported.has(platform)))]
+      .sort(compareUtf8);
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * 选择 Skill-Garden lifecycle 的显式平台参数。
+ *
+ * 优先使用 Trellis 模板 hash 记录的平台，避免旧 Plugin state 污染把未启用平台继续投影。
+ * 缺少 hash 记录的旧项目继续沿用原生检测与 Claude fallback，保持旧 enhancement 兼容行为。
  *
  * @param {string} projectRoot 项目根
- * @returns {string[]} 显式平台；可自动检测时返回空数组
+ * @returns {string[]} 显式平台
  */
-function compatibilityPlatforms(projectRoot) {
+export function resolveSkillGardenPlatforms(projectRoot) {
+  const configured = configuredTrellisPluginPlatforms(projectRoot);
+  if (configured.length > 0) return configured;
   try {
     return detectPluginPlatforms(projectRoot).platforms;
   } catch (error) {
@@ -46,7 +78,7 @@ export function applySkillGardenPlugin(projectRoot, options = {}) {
   const service = new PluginApplicationService(projectRoot, { registry, store });
   const declared = store.readPlugins().plugins.some(({ id }) => id === SKILL_GARDEN_PLUGIN_ID);
   const lifecycleOptions = {
-    platforms: compatibilityPlatforms(projectRoot),
+    platforms: resolveSkillGardenPlatforms(projectRoot),
     dryRun: Boolean(options.dryRun),
     nonInteractive: true,
     onPreflight: options.onPreflight,

package/src/commands/update.js

@@ -14,6 +14,7 @@ import {
   snapshotUpdateBackups,
 } from "../lib/update-backups.js";
 import { ProjectStore } from "../plugin/state/project-store.js";
+import { resolveSkillGardenPlatforms } from "../builtin-plugins/skill-garden/runtime.js";
 import { SKILL_GARDEN_PLUGIN_ID } from "../builtin-plugins/skill-garden/provider.js";
 import { showCommandCompletion } from "../lib/command-completion.js";
 import { reportTelemetry } from "../lib/telemetry.js";
@@ -56,7 +57,26 @@ function sandboxTrellisUpdateArgs(passthrough) {
   return args;
 }
 
-async function replayPlugins(ctx, target, dryRun, compensationSnapshot = null) {
+/**
+ * 把平台列表转换成 Plugin CLI 的重复 `--platform` 参数。
+ *
+ * @param {string[]} platforms Plugin 平台 ID
+ * @returns {string[]} CLI passthrough 参数
+ */
+function pluginPlatformArgs(platforms) {
+  return platforms.flatMap((platform) => ["--platform", platform]);
+}
+
+/**
+ * 在 `flower-trellis update` 流程中重放 Plugin Runtime。
+ *
+ * @param {object} ctx update 命令上下文
+ * @param {string} target 目标项目根
+ * @param {boolean} dryRun 是否仅预演
+ * @param {ReturnType<typeof createUpdateSnapshot>|null} [compensationSnapshot] 失败补偿快照
+ * @returns {Promise<void>} Plugin 重放完成
+ */
+export async function replayPlugins(ctx, target, dryRun, compensationSnapshot = null) {
   const onPreflight = compensationSnapshot
     ? ({ plan }) => extendUpdateSnapshot(compensationSnapshot, [
       ...plan.contentMutations.map(({ target: mutationTarget }) => mutationTarget),
@@ -72,6 +92,7 @@ async function replayPlugins(ctx, target, dryRun, compensationSnapshot = null) {
       passthrough: [
         declared ? "update" : "add",
         SKILL_GARDEN_PLUGIN_ID,
+        ...pluginPlatformArgs(resolveSkillGardenPlatforms(target)),
         ...(dryRun ? ["--dry-run"] : []),
       ],
     }, {