flower-trellis 0.6.1 → 0.6.3

package/src/plugin/application-service.js

@@ -16,6 +16,11 @@ 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";
 
 /**
  * 计算 lock roots 可达的全部 Plugin。
@@ -151,7 +156,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,onPreflight?:(result:object)=>void}} options 添加选项
    * @returns {object} 生命周期结果
    */
   add(options) {
@@ -168,6 +173,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", {
@@ -189,12 +199,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,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 +225,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 +252,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", {
@@ -410,13 +445,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 +479,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 +508,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;

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)) ||

package/src/plugin/auth/gitlab-credential-resolver.js

@@ -0,0 +1,234 @@
+import { execFile } from "node:child_process";
+import { PLUGIN_RUNTIME_ERROR_CODES, PluginRuntimeError } from "../runtime-errors.js";
+
+const GLAB_COMMAND = "glab";
+const GLAB_AUTH_TIMEOUT_MS = 5_000;
+const GLAB_AUTH_MAX_BUFFER = 1024 * 1024;
+const HOST_BOUND_TOKEN_NAMES = ["FLOWER_GITLAB_TOKEN", "GITLAB_TOKEN", "GLAB_TOKEN"];
+const HOST_BOUND_HOST_NAMES = ["FLOWER_GITLAB_HOST", "GITLAB_HOST", "GLAB_HOST", "CI_SERVER_HOST", "CI_SERVER_URL"];
+
+/**
+ * 返回 GitLab source 的小写 host[:port]。
+ *
+ * @param {{baseUrl:string}} source GitLab 来源
+ * @returns {string} host[:port]
+ */
+export function gitLabCredentialHost(source) {
+  return new URL(source.baseUrl).host.toLowerCase();
+}
+
+/**
+ * 把 host、origin 或项目 URL 规范化为小写 host[:port]。
+ *
+ * @param {unknown} value 原始 host 或 URL
+ * @returns {string|null} 规范化 host；无法解析时返回 null
+ */
+export function normalizeGitLabCredentialHost(value) {
+  const raw = String(value || "").trim();
+  if (!raw) return null;
+  try {
+    const url = /^https?:\/\//i.test(raw) ? new URL(raw) : new URL(`https://${raw.replace(/^\/+/, "")}`);
+    return url.host.toLowerCase();
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * 判断原始 host/URL 是否与 GitLab source 完全同 host。
+ *
+ * @param {unknown} value 原始 host 或 URL
+ * @param {{baseUrl:string}} source GitLab 来源
+ * @returns {boolean} 是否同 host
+ */
+export function isSameGitLabCredentialHost(value, source) {
+  return normalizeGitLabCredentialHost(value) === gitLabCredentialHost(source);
+}
+
+/**
+ * 从 `glab auth status --show-token` 输出中提取同 host token。
+ *
+ * @param {string} output glab stdout/stderr 合并文本
+ * @param {{baseUrl:string}} source GitLab 来源
+ * @returns {string|null} access token；无法证明同 host 或未输出 token 时返回 null
+ */
+export function parseGlabAuthStatusToken(output, source) {
+  const text = String(output || "");
+  const host = gitLabCredentialHost(source);
+  const escapedHost = host.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const hostPattern = new RegExp(`(^|[^A-Za-z0-9.-])${escapedHost}($|[^A-Za-z0-9.-])`, "i");
+  if (!hostPattern.test(text)) return null;
+  for (const line of text.split(/\r?\n/)) {
+    const match = line.match(/\btoken\b[^:]*:\s*([^\s]+)/i);
+    if (!match) continue;
+    const token = match[1].replace(/^['"]|['"]$/g, "");
+    if (!token || token.includes("*") || token === "[REDACTED]") continue;
+    return token;
+  }
+  return null;
+}
+
+/**
+ * 从 host 绑定的环境变量中解析 GitLab token。
+ *
+ * @param {{baseUrl:string}} source GitLab 来源
+ * @param {NodeJS.ProcessEnv|Record<string,string|undefined>} [env] 环境变量
+ * @returns {{authorized:true,scopes:string[],expiresAt:null,persistent:false,accessToken:string,credentialSource:"env"}|null} 环境凭据
+ */
+export function resolveGitLabEnvironmentCredential(source, env = process.env) {
+  const hostKey = gitLabCredentialHost(source).toUpperCase().replace(/[^A-Z0-9]+/g, "_");
+  for (const name of HOST_BOUND_TOKEN_NAMES.map((prefix) => `${prefix}_${hostKey}`)) {
+    const accessToken = String(env[name] || "").trim();
+    if (accessToken) return externalCredential(accessToken, "env");
+  }
+  const hostMatched = HOST_BOUND_HOST_NAMES.some((name) => isSameGitLabCredentialHost(env[name], source));
+  if (!hostMatched) return null;
+  for (const name of HOST_BOUND_TOKEN_NAMES) {
+    const accessToken = String(env[name] || "").trim();
+    if (accessToken) return externalCredential(accessToken, "env");
+  }
+  return null;
+}
+
+/**
+ * 默认执行 glab 的安全包装。
+ *
+ * @param {string[]} args glab 参数
+ * @param {{command?:string,timeoutMs?:number}} [options] 命令配置
+ * @returns {Promise<{stdout:string,stderr:string}>} 子进程输出
+ */
+export async function runGlab(args, options = {}) {
+  return new Promise((resolve, reject) => {
+    execFile(options.command || GLAB_COMMAND, args, {
+      timeout: options.timeoutMs || GLAB_AUTH_TIMEOUT_MS,
+      maxBuffer: GLAB_AUTH_MAX_BUFFER,
+      windowsHide: true,
+    }, (error, stdout, stderr) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+      resolve({ stdout, stderr });
+    });
+  });
+}
+
+/**
+ * GitLab 凭据解析器，统一 Flower Keyring、glab 与环境 fallback。
+ */
+export class GitLabCredentialResolver {
+  /**
+   * 创建 GitLab 凭据解析器。
+   *
+   * @param {{store:import("./credential-store.js").CredentialStore,persistent?:boolean,env?:NodeJS.ProcessEnv|Record<string,string|undefined>,runGlab?:(args:string[],options?:object)=>Promise<{stdout?:string,stderr?:string}>,glabCommand?:string,glabTimeoutMs?:number}} options 依赖注入
+   */
+  constructor(options) {
+    this.store = options.store;
+    this.persistent = Boolean(options.persistent);
+    this.env = options.env || process.env;
+    this.runGlab = options.runGlab || runGlab;
+    this.glabCommand = options.glabCommand || GLAB_COMMAND;
+    this.glabTimeoutMs = options.glabTimeoutMs || GLAB_AUTH_TIMEOUT_MS;
+  }
+
+  /**
+   * 按 Flower Keyring、glab、环境变量顺序解析凭据。
+   *
+   * @param {object} source GitLab 来源
+   * @returns {Promise<{authorized:boolean,scopes:string[],expiresAt:number|null,persistent:boolean,accessToken?:string,credentialSource?:string,credential?:object}>} 解析结果
+   */
+  async resolve(source) {
+    const credential = await this.store.get(source);
+    if (credential) {
+      return {
+        authorized: true,
+        scopes: credential.scope,
+        expiresAt: credential.expiresAt,
+        persistent: this.persistent,
+        accessToken: credential.accessToken,
+        credentialSource: "flower",
+        credential,
+      };
+    }
+    const external = await this.resolveExternal(source);
+    return external || {
+      authorized: false,
+      scopes: [],
+      expiresAt: null,
+      persistent: false,
+    };
+  }
+
+  /**
+   * 解析非 Flower 管理的全局 GitLab 凭据。
+   *
+   * @param {object} source GitLab 来源
+   * @returns {Promise<{authorized:true,scopes:string[],expiresAt:null,persistent:false,accessToken:string,credentialSource:string}|null>} 外部凭据
+   */
+  async resolveExternal(source) {
+    const glabCredential = await this.#resolveGlab(source);
+    if (glabCredential) return glabCredential;
+    return resolveGitLabEnvironmentCredential(source, this.env);
+  }
+
+  /**
+   * 返回不含 token 的登录状态。
+   *
+   * @param {object} source GitLab 来源
+   * @returns {Promise<{authorized:boolean,scopes:string[],expiresAt:number|null,persistent:boolean}>} 非敏感状态
+   */
+  async status(source) {
+    const resolution = await this.resolve(source);
+    return {
+      authorized: resolution.authorized,
+      scopes: resolution.scopes,
+      expiresAt: resolution.expiresAt,
+      persistent: resolution.persistent,
+    };
+  }
+
+  /** @param {object} source @returns {Promise<{authorized:true,scopes:string[],expiresAt:null,persistent:false,accessToken:string,credentialSource:"glab"}|null>} */
+  async #resolveGlab(source) {
+    let output;
+    try {
+      output = await this.runGlab([
+        "auth",
+        "status",
+        "--hostname",
+        gitLabCredentialHost(source),
+        "--show-token",
+      ], {
+        command: this.glabCommand,
+        timeoutMs: this.glabTimeoutMs,
+        source,
+      });
+    } catch {
+      return null;
+    }
+    const accessToken = parseGlabAuthStatusToken(`${output?.stdout || ""}\n${output?.stderr || ""}`, source);
+    return accessToken ? externalCredential(accessToken, "glab") : null;
+  }
+}
+
+/**
+ * 构造非持久外部凭据结果。
+ *
+ * @param {string} accessToken access token
+ * @param {"glab"|"env"} credentialSource 凭据来源
+ * @returns {{authorized:true,scopes:string[],expiresAt:null,persistent:false,accessToken:string,credentialSource:"glab"|"env"}} 外部凭据
+ */
+function externalCredential(accessToken, credentialSource) {
+  if (!accessToken) {
+    throw new PluginRuntimeError("GitLab 外部凭据为空", {
+      code: PLUGIN_RUNTIME_ERROR_CODES.AUTH_REQUIRED,
+    });
+  }
+  return {
+    authorized: true,
+    scopes: [],
+    expiresAt: null,
+    persistent: false,
+    accessToken,
+    credentialSource,
+  };
+}

package/src/plugin/auth/gitlab-oauth.js

@@ -1,7 +1,13 @@
 import crypto from "node:crypto";
 import http from "node:http";
 import { spawn } from "node:child_process";
-import { CREDENTIAL_SCHEMA_VERSION, GITLAB_OAUTH_SCOPES, validateCredential } from "./credential-store.js";
+import { GitLabCredentialResolver } from "./gitlab-credential-resolver.js";
+import {
+  CREDENTIAL_SCHEMA_VERSION,
+  GITLAB_OAUTH_REQUEST_SCOPES,
+  isGitLabCredentialScopeSufficient,
+  validateCredential,
+} from "./credential-store.js";
 import { PLUGIN_RUNTIME_ERROR_CODES, PluginRuntimeError } from "../runtime-errors.js";
 
 const DEVICE_GRANT = "urn:ietf:params:oauth:grant-type:device_code";
@@ -131,7 +137,7 @@ export class GitLabOAuthClient {
         redirect_uri: callback.redirectUri,
         response_type: "code",
         state: pkce.state,
-        scope: GITLAB_OAUTH_SCOPES.join(" "),
+        scope: GITLAB_OAUTH_REQUEST_SCOPES.join(" "),
         code_challenge: pkce.challenge,
         code_challenge_method: "S256",
       }).toString();
@@ -167,7 +173,7 @@ export class GitLabOAuthClient {
   async loginWithDevice(source, options = {}) {
     const device = await this.#postForm(source, "/oauth/authorize_device", {
       client_id: source.oauth.applicationId,
-      scope: GITLAB_OAUTH_SCOPES.join(" "),
+      scope: GITLAB_OAUTH_REQUEST_SCOPES.join(" "),
     }, { signal: options.signal });
     if (
       typeof device.device_code !== "string" ||
@@ -253,7 +259,7 @@ export class GitLabOAuthClient {
         ? payload.scope.split(/[ ,]+/).filter(Boolean)
         : [];
     let tokenPayload = payload;
-    if (!GITLAB_OAUTH_SCOPES.every((scope) => responseScopes.includes(scope))) {
+    if (!isGitLabCredentialScopeSufficient(responseScopes)) {
       const tokenInfo = await this.#readTokenInfo(source, payload.access_token);
       tokenPayload = { ...payload, scope: tokenInfo.scope || tokenInfo.scopes || [] };
     }
@@ -395,13 +401,21 @@ export class GitLabCredentialManager {
   /**
    * 创建凭据管理器。
    *
-   * @param {{store:import("./credential-store.js").CredentialStore,oauth:GitLabOAuthClient,now?:()=>number}} options 依赖
+   * @param {{store:import("./credential-store.js").CredentialStore,oauth:GitLabOAuthClient,now?:()=>number,persistent?:boolean,credentialResolver?:GitLabCredentialResolver,env?:NodeJS.ProcessEnv|Record<string,string|undefined>,runGlab?:(args:string[],options?:object)=>Promise<{stdout?:string,stderr?:string}>,glabCommand?:string}} options 依赖
    */
   constructor(options) {
     this.store = options.store;
     this.oauth = options.oauth;
     this.now = options.now || Date.now;
+    this.resolver = options.credentialResolver || new GitLabCredentialResolver({
+      store: options.store,
+      persistent: options.persistent,
+      env: options.env,
+      runGlab: options.runGlab,
+      glabCommand: options.glabCommand,
+    });
     this.refreshes = new Map();
+    this.externalTokens = new Map();
   }
 
   /**
@@ -413,6 +427,13 @@ export class GitLabCredentialManager {
   async getAccessToken(source) {
     const credential = await this.store.get(source);
     if (!credential) {
+      const externalKey = `${source.id}\u0000${source.baseUrl}`;
+      if (this.externalTokens.has(externalKey)) return this.externalTokens.get(externalKey);
+      const external = await this.resolver.resolveExternal(source);
+      if (external) {
+        this.externalTokens.set(externalKey, external.accessToken);
+        return external.accessToken;
+      }
       throw new PluginRuntimeError(`GitLab source 尚未登录:${source.id}`, {
         code: PLUGIN_RUNTIME_ERROR_CODES.AUTH_REQUIRED,
         path: source.id,

package/src/plugin/authoring/scaffold.js

@@ -133,7 +133,12 @@ function renderPackageFiles(options) {
     dependencies: {},
     capabilities: { profile: options.profile, required },
     content: {
-      skills: [`skills/${options.pluginId}`],
+      skills: [{
+        name: options.pluginId,
+        path: `skills/${options.pluginId}`,
+        version: options.version,
+        description: `${options.name}。用于执行该 Plugin 提供的专业工作流。`,
+      }],
       tests: ["tests"],
     },
     ...(options.includePatches ? {

package/src/plugin/authoring/templates/rd-guide/CODEOWNERS

@@ -1,2 +1,2 @@
 # integration 审核材料必须由受保护 owner 审批。
-/.flower-marketplace/integration-review.json @digital-rd-governance/plugin-integration-owners
+/.flower-plugin/integration-review.json @digital-rd-governance/plugin-integration-owners

package/src/plugin/authoring/templates/rd-guide/gitlab-ci.yml

@@ -2,8 +2,8 @@ flower-plugin-validate:
   image: node:22
   script:
     - npm install --global flower-trellis
-    - flower-trellis plugin validate .flower-marketplace/marketplace.json --subject marketplace --checkout-map .flower-marketplace/checkouts.json --ci --json > flower-plugin-validation.json
-    - node .flower-marketplace/verify-integration-review.mjs flower-plugin-validation.json .flower-marketplace/integration-review.json
+    - flower-trellis plugin validate .flower-plugin/marketplace.json --subject marketplace --checkout-map .flower-plugin/checkouts.json --ci --json > flower-plugin-validation.json
+    - node .flower-plugin/verify-integration-review.mjs flower-plugin-validation.json .flower-plugin/integration-review.json
   artifacts:
     when: always
     paths:

package/src/plugin/authoring/templates/rd-guide/verify-integration-review.mjs

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 
 const validationPath = process.argv[2] || "flower-plugin-validation.json";
-const reviewPath = process.argv[3] || ".flower-marketplace/integration-review.json";
+const reviewPath = process.argv[3] || ".flower-plugin/integration-review.json";
 const validation = JSON.parse(fs.readFileSync(validationPath, "utf8"));
 
 if (!validation.ok) {