flower-trellis 0.6.2 → 0.6.4

package/src/plugin/application-service.js

@@ -16,6 +16,13 @@ import { hashDirectoryIfExists, hashFileIfExists } from "./install/content-hash.
 import { getPluginPatchPlanner } from "./runtime-extensions.js";
 import { isRuntimeBuiltinProviderTrusted } from "./runtime-extensions.js";
 import { compareUtf8 } from "./stable-order.js";
+import {
+  contentSelectionsEqual,
+  normalizeContentSelection,
+  selectContentSkillEntries,
+} from "./content-selection.js";
+
+const SKILL_GARDEN_MIGRATION_OWNER_ID = "flower/skill-garden";
 
 /**
  * 计算 lock roots 可达的全部 Plugin。
@@ -117,6 +124,94 @@ function standardContentPlan(graph) {
   };
 }
 
+/**
+ * 校验冻结 Plugin 的 lock/state 对应关系与当前目标摘要。
+ *
+ * @param {string} projectRoot 项目根
+ * @param {import("./contracts.js").ResolvedPlugin} locked 冻结 lock entry
+ * @param {import("./contracts.js").PluginStateEntry} applied 冻结 state entry
+ * @returns {void}
+ */
+function assertPreservedState(projectRoot, locked, applied) {
+  if (
+    applied.version !== locked.version ||
+    !contentSelectionsEqual(applied.contentSelection, locked.contentSelection)
+  ) {
+    throw new PluginRuntimeError(`冻结 Plugin 的 lock/state 不一致:${locked.id}`, {
+      code: PLUGIN_RUNTIME_ERROR_CODES.TARGET_DRIFT,
+      path: locked.id,
+    });
+  }
+  for (const entry of applied.paths) {
+    const target = path.join(projectRoot, ...entry.path.split("/"));
+    const actual = entry.kind === "directory"
+      ? hashDirectoryIfExists(target)
+      : hashFileIfExists(target);
+    if (actual !== entry.hash) {
+      throw new PluginRuntimeError(`冻结 Plugin 目标摘要漂移:${entry.path}`, {
+        code: PLUGIN_RUNTIME_ERROR_CODES.TARGET_DRIFT,
+        path: entry.path,
+        details: { expected: entry.hash, actual },
+      });
+    }
+  }
+  for (const patchEntry of applied.patches) {
+    const target = path.join(projectRoot, ...patchEntry.target.split("/"));
+    const actual = hashFileIfExists(target);
+    if (actual !== patchEntry.resultHash) {
+      throw new PluginRuntimeError(`冻结 Plugin Patch 目标摘要漂移:${patchEntry.target}`, {
+        code: PLUGIN_RUNTIME_ERROR_CODES.TARGET_DRIFT,
+        path: patchEntry.target,
+        details: { expected: patchEntry.resultHash, actual },
+      });
+    }
+  }
+}
+
+/**
+ * 判断两个项目内路径是否相同或存在父子关系。
+ *
+ * @param {string} left 左路径
+ * @param {string} right 右路径
+ * @returns {boolean} 是否相交
+ */
+function pathsOverlap(left, right) {
+  return left === right || left.startsWith(`${right}/`) || right.startsWith(`${left}/`);
+}
+
+/**
+ * 阻止活跃 Plugin 的计划改写冻结 Plugin 的受管目标。
+ *
+ * @param {import("./contracts.js").PluginStateEntry[]} preservedEntries 冻结 state entries
+ * @param {{mutations?:Array<{owner:string,target:string}>,directoryClaims?:Array<{owner:string,path:string}>,directoryRemovals?:Array<{owner:string,path:string}>,patchMutations?:Array<{owner:string,target:string}>}} plan 活跃计划片段
+ * @returns {void}
+ */
+function assertNoPreservedTargetConflicts(preservedEntries, plan) {
+  const protectedTargets = preservedEntries.flatMap((plugin) => [
+    ...plugin.paths.map(({ path: target }) => ({ owner: plugin.id, target })),
+    ...plugin.patches.map(({ target }) => ({ owner: plugin.id, target })),
+  ]);
+  const activeTargets = [
+    ...(plan.mutations || []).map(({ owner, target }) => ({ owner, target })),
+    ...(plan.directoryClaims || []).map(({ owner, path: target }) => ({ owner, target })),
+    ...(plan.directoryRemovals || []).map(({ owner, path: target }) => ({ owner, target })),
+    ...(plan.patchMutations || []).map(({ owner, target }) => ({ owner, target })),
+  ];
+  for (const active of activeTargets) {
+    const protectedTarget = protectedTargets.find((entry) => pathsOverlap(active.target, entry.target));
+    if (!protectedTarget) continue;
+    throw new PluginRuntimeError(`活跃 Plugin 计划与冻结目标冲突:${active.target}`, {
+      code: PLUGIN_RUNTIME_ERROR_CODES.CONTENT_CONFLICT,
+      path: active.target,
+      details: {
+        activeOwner: active.owner,
+        preservedOwner: protectedTarget.owner,
+        preservedTarget: protectedTarget.target,
+      },
+    });
+  }
+}
+
 /**
  * Flower Plugin 生命周期应用服务。
  */
@@ -151,7 +246,7 @@ export class PluginApplicationService {
   /**
    * 添加或更新一个直接 Plugin 声明并应用完整图。
    *
-   * @param {{id:string,version?:string,platforms?:string[],dryRun?:boolean,approvals?:string[],approvedDigests?:Map<string,string>|Record<string,string>,nonInteractive?:boolean,onPreflight?:(result:object)=>void}} options 添加选项
+   * @param {{id:string,version?:string,platforms?:string[],contentSelection?:import("./contracts.js").PluginContentSelection,dryRun?:boolean,approvals?:string[],approvedDigests?:Map<string,string>|Record<string,string>,nonInteractive?:boolean,preserveIds?:string[],onPreflight?:(result:object)=>void}} options 添加选项
    * @returns {object} 生命周期结果
    */
   add(options) {
@@ -168,6 +263,11 @@ export class PluginApplicationService {
       source: sourceId,
       version: options.version || "*",
     };
+    const contentSelection = normalizeContentSelection(options.contentSelection, {
+      code: PLUGIN_RUNTIME_ERROR_CODES.USAGE_ERROR,
+      path: options.id,
+    });
+    if (contentSelection) declaration.contentSelection = contentSelection;
     const declarations = pluginsFile.plugins.filter(({ id }) => id !== options.id);
     declarations.push(declaration);
     return this.#applyLifecycle("add", {
@@ -178,6 +278,7 @@ export class PluginApplicationService {
       approvals: options.approvals || [],
       approvedDigests: options.approvedDigests,
       nonInteractive: options.nonInteractive,
+      preserveIds: options.preserveIds || [],
       onPreflight: options.onPreflight,
     });
   }
@@ -189,12 +290,13 @@ export class PluginApplicationService {
    * 其锁定包也已不可重放，逐个更新会在其它节点上撞 `已锁定 Plugin 包不可重放`。
    * 传入 `widen` 时按 `update: "all"` 解析，让全部节点都允许升级，一次性解开这种死锁。
    *
-   * @param {{id?:string|null,version?:string,widen?:Map<string,string>|Record<string,string>,platforms?:string[],dryRun?:boolean,approvals?:string[],approvedDigests?:Map<string,string>|Record<string,string>,nonInteractive?:boolean,onPreflight?:(result:object)=>void}} [options] 更新选项
+   * @param {{id?:string|null,version?:string,widen?:Map<string,string>|Record<string,string>,contentSelection?:import("./contracts.js").PluginContentSelection|null,platforms?:string[],dryRun?:boolean,approvals?:string[],approvedDigests?:Map<string,string>|Record<string,string>,nonInteractive?:boolean,preserveIds?:string[],onPreflight?:(result:object)=>void}} [options] 更新选项
    * @returns {object} 生命周期结果
    */
   update(options = {}) {
     const pluginsFile = this.store.readPlugins();
     const widen = normalizeVersionOverrides(options.widen);
+    const hasContentSelection = Object.prototype.hasOwnProperty.call(options, "contentSelection");
     if (options.id && !pluginsFile.plugins.some(({ id }) => id === options.id)) {
       throw new PluginRuntimeError(`项目未声明 Plugin:${options.id}`, {
         code: PLUGIN_RUNTIME_ERROR_CODES.USAGE_ERROR,
@@ -214,6 +316,18 @@ export class PluginApplicationService {
         path: "widen",
       });
     }
+    if (hasContentSelection && !options.id) {
+      throw new PluginRuntimeError("更新 Content Skill 选择时必须指定 Plugin ID", {
+        code: PLUGIN_RUNTIME_ERROR_CODES.USAGE_ERROR,
+        path: "contentSelection",
+      });
+    }
+    if (hasContentSelection && widen.size > 0) {
+      throw new PluginRuntimeError("更新 Content Skill 选择时不能同时放宽声明范围", {
+        code: PLUGIN_RUNTIME_ERROR_CODES.USAGE_ERROR,
+        path: "contentSelection",
+      });
+    }
     const declaredIds = new Set(pluginsFile.plugins.map(({ id }) => id));
     for (const id of [...widen.keys()].sort(compareUtf8)) {
       if (!declaredIds.has(id)) {
@@ -229,12 +343,24 @@ export class PluginApplicationService {
     const overrides = options.version && options.id
       ? new Map([[options.id, options.version]])
       : widen;
-    const nextPlugins = overrides.size > 0
+    const contentSelection = hasContentSelection
+      ? normalizeContentSelection(options.contentSelection, {
+        code: PLUGIN_RUNTIME_ERROR_CODES.USAGE_ERROR,
+        path: options.id,
+      })
+      : undefined;
+    const nextPlugins = (overrides.size > 0 || hasContentSelection)
       ? {
         ...pluginsFile,
-        plugins: pluginsFile.plugins.map((plugin) => (
-          overrides.has(plugin.id) ? { ...plugin, version: overrides.get(plugin.id) } : plugin
-        )),
+        plugins: pluginsFile.plugins.map((plugin) => {
+          let next = overrides.has(plugin.id) ? { ...plugin, version: overrides.get(plugin.id) } : plugin;
+          if (hasContentSelection && plugin.id === options.id) {
+            next = { ...next };
+            if (contentSelection) next.contentSelection = contentSelection;
+            else delete next.contentSelection;
+          }
+          return next;
+        }),
       }
       : pluginsFile;
     return this.#applyLifecycle("update", {
@@ -245,6 +371,7 @@ export class PluginApplicationService {
       approvals: options.approvals || [],
       approvedDigests: options.approvedDigests,
       nonInteractive: options.nonInteractive,
+      preserveIds: options.preserveIds || [],
       onPreflight: options.onPreflight,
     });
   }
@@ -410,13 +537,32 @@ export class PluginApplicationService {
           severity: "error",
         });
       }
+      const locked = lockById.get(declaration.id);
+      const applied = stateById.get(declaration.id);
+      if (locked && !contentSelectionsEqual(declaration.contentSelection, locked.contentSelection)) {
+        diagnostics.push({
+          code: "verify.content-selection-lock-mismatch",
+          path: declaration.id,
+          message: `Plugin 声明与 lock 的 Content Skill 选择不一致:${declaration.id}`,
+          severity: "error",
+        });
+      }
+      if (applied && !contentSelectionsEqual(declaration.contentSelection, applied.contentSelection)) {
+        diagnostics.push({
+          code: "verify.content-selection-state-mismatch",
+          path: declaration.id,
+          message: `Plugin 声明与 state 的 Content Skill 选择不一致:${declaration.id}`,
+          severity: "error",
+        });
+      }
     }
     for (const id of requestedIds) {
       const locked = lockById.get(id);
       const applied = stateById.get(id);
       if (!locked) continue;
+      let pluginPackage = null;
       try {
-        this.registry.readPackage(locked);
+        pluginPackage = this.registry.readPackage(locked);
       } catch (error) {
         diagnostics.push({
           code: "verify.package-invalid",
@@ -425,6 +571,18 @@ export class PluginApplicationService {
           severity: "error",
         });
       }
+      if (pluginPackage) {
+        try {
+          selectContentSkillEntries(pluginPackage.manifest.content.skills || [], locked.contentSelection, id);
+        } catch (error) {
+          diagnostics.push({
+            code: "verify.content-selection-invalid",
+            path: id,
+            message: error.message,
+            severity: "error",
+          });
+        }
+      }
       if (!applied) {
         diagnostics.push({
           code: "verify.state-missing",
@@ -442,6 +600,14 @@ export class PluginApplicationService {
           severity: "error",
         });
       }
+      if (!contentSelectionsEqual(locked.contentSelection, applied.contentSelection)) {
+        diagnostics.push({
+          code: "verify.content-selection-apply-mismatch",
+          path: id,
+          message: `Plugin lock 与 state 的 Content Skill 选择不一致:${id}`,
+          severity: "error",
+        });
+      }
       for (const entry of applied.paths) {
         const target = path.join(this.projectRoot, ...entry.path.split("/"));
         let actual = null;
@@ -483,10 +649,39 @@ export class PluginApplicationService {
     const pluginsFile = validatePluginsFile(input.plugins);
     const previousLock = this.store.readLock();
     const previousState = this.store.readState();
+    const preservedIds = new Set(input.preserveIds || []);
+    const previousLockById = new Map((previousLock?.plugins || []).map((plugin) => [plugin.id, plugin]));
+    const previousStateById = new Map((previousState?.plugins || []).map((plugin) => [plugin.id, plugin]));
     const resolution = resolvePluginGraph(pluginsFile.plugins, this.registry, {
       lockedPlugins: previousLock?.plugins || [],
       update: input.update,
+      preserveIds: [...preservedIds],
     });
+    const resolvedIds = new Set(resolution.graph.plugins.map(({ id }) => id));
+    const preservedEntries = [];
+    for (const id of [...preservedIds].sort(compareUtf8)) {
+      const previousLocked = previousLockById.get(id);
+      const previousEntry = previousStateById.get(id);
+      if (!previousLocked || !resolvedIds.has(id)) {
+        throw new PluginRuntimeError(`冻结 Plugin 缺少既有 lock:${id}`, {
+          code: PLUGIN_RUNTIME_ERROR_CODES.TARGET_DRIFT,
+          path: id,
+        });
+      }
+      if (!previousEntry) {
+        throw new PluginRuntimeError(`冻结 Plugin 缺少既有 state:${id}`, {
+          code: PLUGIN_RUNTIME_ERROR_CODES.TARGET_DRIFT,
+          path: id,
+        });
+      }
+      assertPreservedState(this.projectRoot, previousLocked, previousEntry);
+      preservedEntries.push(previousEntry);
+    }
+    const activeGraph = {
+      roots: resolution.graph.roots.filter((id) => !preservedIds.has(id)),
+      plugins: resolution.graph.plugins.filter(({ id }) => !preservedIds.has(id)),
+    };
+    const activeSelected = resolution.selected.filter(({ id }) => !preservedIds.has(id));
     let projection = {
       mutations: [],
       payloads: new Map(),
@@ -495,47 +690,45 @@ export class PluginApplicationService {
       directoryRemovals: [],
     };
     let platformSelection = { platforms: [], targets: [] };
-    if (resolution.graph.plugins.length > 0) {
+    if (activeGraph.plugins.length > 0) {
       const platforms = input.platforms.length > 0
         ? input.platforms
         : statePlatforms(previousState);
       platformSelection = this.platformDetector(this.projectRoot, platforms);
       projection = projectPluginContent({
         projectRoot: this.projectRoot,
-        graph: resolution.graph,
-        selected: resolution.selected,
+        graph: activeGraph,
+        selected: activeSelected,
         registry: this.registry,
         platformSelection,
         previousState,
       });
     }
-    const preservedIds = new Set(input.preserveIds || []);
     if (preservedIds.size > 0) {
-      for (const id of preservedIds) {
-        const previousEntry = previousState?.plugins.find((plugin) => plugin.id === id);
-        const nextIndex = projection.state.plugins.findIndex((plugin) => plugin.id === id);
-        if (!previousEntry || nextIndex < 0) {
-          throw new PluginRuntimeError(`冻结 Plugin 缺少既有 state:${id}`, {
-            code: PLUGIN_RUNTIME_ERROR_CODES.TARGET_DRIFT,
-            path: id,
-          });
-        }
-        projection.state.plugins[nextIndex] = structuredClone(previousEntry);
-        const previousLocked = previousLock?.plugins.find((plugin) => plugin.id === id);
-        const graphIndex = resolution.graph.plugins.findIndex((plugin) => plugin.id === id);
-        if (!previousLocked || graphIndex < 0) {
-          throw new PluginRuntimeError(`冻结 Plugin 缺少既有 lock:${id}`, {
-            code: PLUGIN_RUNTIME_ERROR_CODES.TARGET_DRIFT,
-            path: id,
-          });
-        }
-        resolution.graph.plugins[graphIndex] = structuredClone(previousLocked);
-      }
-      projection.mutations = projection.mutations.filter(({ owner }) => !preservedIds.has(owner));
-      projection.directoryClaims = projection.directoryClaims.filter(({ owner }) => !preservedIds.has(owner));
-      projection.directoryRemovals = projection.directoryRemovals
-        .filter(({ owner }) => !preservedIds.has(owner));
-      if (previousState?.migration) projection.state.migration = structuredClone(previousState.migration);
+      const projectedStateById = new Map(projection.state.plugins.map((plugin) => [plugin.id, plugin]));
+      projection.state.plugins = resolution.graph.plugins.map(({ id }) => {
+        if (preservedIds.has(id)) return structuredClone(previousStateById.get(id));
+        const projected = projectedStateById.get(id);
+        if (!projected) throw new Error(`Resolved Plugin 缺少投影 state:${id}`);
+        return projected;
+      });
+      resolution.graph.plugins = resolution.graph.plugins.map((plugin) => (
+        preservedIds.has(plugin.id)
+          ? structuredClone(previousLockById.get(plugin.id))
+          : plugin
+      ));
+      assertNoPreservedTargetConflicts(preservedEntries, {
+        mutations: projection.mutations,
+        directoryClaims: projection.directoryClaims,
+        directoryRemovals: projection.directoryRemovals,
+      });
+    }
+    if (
+      preservedIds.has(SKILL_GARDEN_MIGRATION_OWNER_ID) &&
+      !projection.state.migration &&
+      previousState?.migration
+    ) {
+      projection.state.migration = structuredClone(previousState.migration);
     }
 
     const previousDirectories = new Map();
@@ -545,7 +738,11 @@ export class PluginApplicationService {
       }
     }
     const directoryClaims = [];
-    const desiredDirectoryPaths = new Set();
+    const desiredDirectoryPaths = new Set(
+      projection.state.plugins.flatMap((plugin) => plugin.paths
+        .filter(({ kind }) => kind === "directory")
+        .map(({ path: target }) => target)),
+    );
     const directoryOwners = new Map();
     for (const claim of projection.directoryClaims) {
       desiredDirectoryPaths.add(claim.path);
@@ -623,6 +820,12 @@ export class PluginApplicationService {
         });
       }
     }
+    if (preservedIds.size > 0) {
+      assertNoPreservedTargetConflicts(preservedEntries, {
+        mutations: removalMutations,
+        directoryRemovals,
+      });
+    }
 
     const patchPlanner = getPluginPatchPlanner();
     let patchResult = standardContentPlan(resolution.graph);
@@ -700,6 +903,11 @@ export class PluginApplicationService {
         });
       }
     }
+    if (preservedIds.size > 0) {
+      assertNoPreservedTargetConflicts(preservedEntries, {
+        patchMutations: patchResult.patchMutations,
+      });
+    }
     const grants = new Map(patchResult.grants.map(({ pluginId, grant }) => [pluginId, grant]));
     for (const plugin of resolution.graph.plugins) {
       const grant = grants.get(plugin.id) || (

package/src/plugin/auth/credential-store.js

@@ -3,8 +3,20 @@ import { PLUGIN_RUNTIME_ERROR_CODES, PluginRuntimeError } from "../runtime-error
 /** 凭据载荷 schema 版本。 */
 export const CREDENTIAL_SCHEMA_VERSION = 1;
 
-/** Flower GitLab OAuth 固定 scope。 */
-export const GITLAB_OAUTH_SCOPES = Object.freeze(["read_api", "read_repository"]);
+/** Flower GitLab OAuth 主动请求 scope。 */
+export const GITLAB_OAUTH_REQUEST_SCOPES = Object.freeze([
+  "openid",
+  "profile",
+  "read_user",
+  "write_repository",
+  "api",
+]);
+
+/** 旧版 GitLab OAuth 读取能力 scope。 */
+export const GITLAB_OAUTH_LEGACY_SCOPES = Object.freeze(["read_api", "read_repository"]);
+
+/** 兼容旧内部导入名；新代码应使用 GITLAB_OAUTH_REQUEST_SCOPES。 */
+export const GITLAB_OAUTH_SCOPES = GITLAB_OAUTH_REQUEST_SCOPES;
 
 /**
  * 规范化 GitLab 来源凭据账户名。
@@ -18,6 +30,16 @@ export function credentialAccount(source) {
   return `${url.hostname.toLowerCase()}${port}/${source.id}`;
 }
 
+/**
+ * 判断 GitLab OAuth scope 是否具备当前 REST 读取能力。
+ *
+ * @param {string[]} scopes 实际授权 scope
+ * @returns {boolean} 是否满足读取 Marketplace 所需能力
+ */
+export function isGitLabCredentialScopeSufficient(scopes) {
+  return scopes.includes("api") || GITLAB_OAUTH_LEGACY_SCOPES.every((scope) => scopes.includes(scope));
+}
+
 /**
  * 校验并规范化版本化 OAuth 凭据。
  *
@@ -38,7 +60,7 @@ export function validateCredential(value, source) {
     typeof credential.accessToken !== "string" ||
     credential.accessToken.length === 0 ||
     typeof credential.tokenType !== "string" ||
-    !GITLAB_OAUTH_SCOPES.every((scope) => scopes.includes(scope)) ||
+    !isGitLabCredentialScopeSufficient(scopes) ||
     !(credential.refreshToken === null || typeof credential.refreshToken === "string") ||
     !(credential.createdAt === undefined || credential.createdAt === null || Number.isFinite(credential.createdAt)) ||
     !(credential.expiresAt === null || Number.isFinite(credential.expiresAt)) ||