@capybara-hq/kernel 0.1.0-rc.4 → 0.1.0-rc.6

package/dist/extensions/installs.js

@@ -12,12 +12,13 @@ import { Inject, Injectable } from "@nestjs/common";
 import { configFields } from "../config/fields.js";
 import { ApiError } from "../errors.js";
 import { audit } from "../identity/audit.js";
-import { EnterpriseAdminLock } from "../identity/enterprise-admin.js";
+import { SuperAdminLock } from "../identity/super-admin.js";
 import { KernelConfigService } from "../infra/config/kernel-config.service.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
 import { Transactional } from "../infra/database/transactional.decorator.js";
 import { KEYRING } from "../infra/tokens.js";
+import { OrgLock } from "../orgs/org-lock.js";
 import { fetchNpmPackage, IntegrityMismatchError, NpmFetchError, PackageTooLargeError, } from "../packages/npm.js";
 import { fetchProvenance, PROVENANCE_TIMEOUT_MS, } from "../packages/provenance.js";
 import { ExtensionApprovals } from "./approvals.js";
@@ -45,11 +46,14 @@ let ExtensionInstalls = class ExtensionInstalls {
     registry;
     config;
     keyring;
+    orgLock;
     constructor(db, txHost, 
-    /** The enterprise admin lock (identity/enterprise-admin.ts): joins the transaction. */
+    /** The super admin lock (identity/super-admin.ts): joins the transaction. */
     adminLock, blobs, approvals, 
     /** The config-declared extension names (an install cannot take them, C15). */
-    registry, config, keyring) {
+    registry, config, keyring, 
+    /** The owner org's lock: an org upload re-checks its org admin instead (ruling P3-10). */
+    orgLock) {
         this.db = db;
         this.txHost = txHost;
         this.adminLock = adminLock;
@@ -58,6 +62,7 @@ let ExtensionInstalls = class ExtensionInstalls {
         this.registry = registry;
         this.config = config;
         this.keyring = keyring;
+        this.orgLock = orgLock;
     }
     /**
      * An extension's effective deployment config, not validated yet (C10): the startup config
@@ -84,9 +89,14 @@ let ExtensionInstalls = class ExtensionInstalls {
      * - extension name equal to a config-declared one -> `extension.config_declared`;
      * - an install record of the same name comes from another npm package -> `extension.name_conflict`
      *   (a new version of the same package is an upgrade, handled elsewhere).
-     * `actor` null means the CLI (no enterprise admin re-check, audit without an actor).
+     * `actor` null means the CLI (no super admin re-check, audit without an actor). `owner`: an org
+     * upload (spec §14, P3-10): the actor is re-checked as an org admin of that org (`catalog.upload`)
+     * instead of a super admin; the package is only stored, as always (nothing runs, no install).
      */
     async ingest(actor, bytes, src, opts = {}) {
+        if (opts.owner !== undefined && actor === null) {
+            throw new Error("an org upload has an actor");
+        }
         const maxBytes = this.config.get().packages.maxBytes;
         if (bytes.byteLength > maxBytes) {
             throw new ApiError("extension.package_too_large", `The extension package is larger than ${maxBytes} bytes`);
@@ -121,9 +131,9 @@ let ExtensionInstalls = class ExtensionInstalls {
         if (installed && installed.package_name !== packageName) {
             throw new ApiError("extension.name_conflict", `Extension ${m.name} is already installed from package ${installed.package_name}; package ${packageName} uses the same extension name`);
         }
-        // 写包之前在锁内复核发起人仍是企业管理员（守卫读到的身份可能已过期）；审计在写完后同样复核
+        // 写包之前在锁内复核发起人仍是超级管理员（守卫读到的身份可能已过期）；审计在写完后同样复核
         if (actor !== null)
-            await this.authorize(actor);
+            await this.authorize(actor, opts.owner);
         await this.blobs.put(pkg, bytes, {
             source: src.source,
             ref: src.ref,
@@ -135,7 +145,8 @@ let ExtensionInstalls = class ExtensionInstalls {
             version: m.version,
             sha256: pkg.sha256,
             source: src.source,
-        });
+            ...(opts.owner !== undefined && { orgId: opts.owner.orgId }),
+        }, opts.owner);
         const set = permissionSetOfPackage(pkg);
         const snapshot = (await this.approvals.all()).get(m.name);
         const { added, removed } = diffPermissions(snapshot?.permissions, set);
@@ -153,20 +164,27 @@ let ExtensionInstalls = class ExtensionInstalls {
         };
     }
     /**
-     * The enterprise admin re-check under its lock, in a transaction of its own (`requires_new`, as
+     * The super admin re-check under its lock, in a transaction of its own (`requires_new`, as
      * before the conversion): the package write that follows never runs inside a caller's
      * transaction holding the lock.
      */
-    async authorize(actor) {
-        await this.adminLock.lockAndAuthorize(actor);
+    async authorize(actor, owner) {
+        await this.authorizeIn(actor, owner);
+    }
+    /** The super admin, or for an org upload the owner org's admin, re-checked under its lock. */
+    async authorizeIn(actor, owner) {
+        if (owner !== undefined)
+            await this.orgLock.lockAndAuthorize(owner.orgId, actor, "catalog.upload");
+        else
+            await this.adminLock.lockAndAuthorize(actor);
     }
     /**
      * The `extension.package_uploaded` audit, re-checking the actor under the lock, committed on its
      * own (`requires_new`): the stored package it records is not rolled back by a caller either.
      */
-    async auditUpload(actor, actorTokenId, detail) {
+    async auditUpload(actor, actorTokenId, detail, owner) {
         if (actor !== null)
-            await this.adminLock.lockAndAuthorize(actor);
+            await this.authorizeIn(actor, owner);
         await audit(this.db.db, {
             ...(actor !== null && { actorAccountId: actor }),
             ...(actorTokenId !== undefined && { actorTokenId }),
@@ -182,7 +200,7 @@ let ExtensionInstalls = class ExtensionInstalls {
     /**
      * Fetches one package from the configured npm registry (verified by `dist.integrity`, see
      * packages/npm.ts), downloading only, not storing: download failure -> `packages.npm_failed` (502);
-     * over `packages.maxBytes` -> `extension.package_too_large`. Enterprise catalog npm imports use it
+     * over `packages.maxBytes` -> `extension.package_too_large`. Platform catalog npm imports use it
      * too.
      */
     async fetchNpm(input, signal) {
@@ -332,6 +350,9 @@ let ExtensionInstalls = class ExtensionInstalls {
 __decorate([
     Transactional({ propagation: "requires_new" })
 ], ExtensionInstalls.prototype, "authorize", null);
+__decorate([
+    Transactional({ propagation: "mandatory" })
+], ExtensionInstalls.prototype, "authorizeIn", null);
 __decorate([
     Transactional({ propagation: "requires_new" })
 ], ExtensionInstalls.prototype, "auditUpload", null);
@@ -339,11 +360,12 @@ ExtensionInstalls = __decorate([
     Injectable(),
     __param(0, Inject(KernelDb)),
     __param(1, Inject(TransactionHost)),
-    __param(2, Inject(EnterpriseAdminLock)),
+    __param(2, Inject(SuperAdminLock)),
     __param(3, Inject(ExtensionBlobs)),
     __param(4, Inject(ExtensionApprovals)),
     __param(5, Inject(ExtensionRegistry)),
     __param(6, Inject(KernelConfigService)),
-    __param(7, Inject(KEYRING))
+    __param(7, Inject(KEYRING)),
+    __param(8, Inject(OrgLock))
 ], ExtensionInstalls);
 export { ExtensionInstalls };

package/dist/extensions/org-config.d.ts

@@ -1,4 +1,6 @@
+import { type PluginScope } from "../catalog/scope.js";
 import { type Keyring } from "../ctx/secrets.js";
+import type { KernelSchemaDb } from "../db/kernel-schema.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
 import { KernelEvents } from "../infra/events/kernel-events.js";
@@ -6,6 +8,7 @@ import type { KernelLogger } from "../log.js";
 import { OrgLock } from "../orgs/org-lock.js";
 import { type ConfigIssue, toIssues } from "./config-issues.js";
 import { type JsonSchema } from "./config-json-schema.js";
+import { EffectiveConfigs } from "./effective-config.js";
 import { ExtensionHost } from "./host.js";
 import { ExtensionInstalls } from "./installs.js";
 import { type PermissionGroup } from "./permission-view.js";
@@ -37,7 +40,26 @@ export interface OrgExtensionView {
      * disabled here (`extension.required`); its org config, when it has one, can still be set.
      */
     required: boolean;
+    /** The catalog plugin the extension ships in and its scope (builtin counts as `all`); null without one. */
+    catalogItem: {
+        itemId: string;
+        scope: PluginScope;
+    } | null;
+    /** The org admin can switch it (the plugin's switch): never for an `all` / builtin plugin. */
+    switchable: boolean;
+    /**
+     * The two-level deployment config (spec A §5.3, §5.4): `following` the platform, a `copy` of the
+     * overridable fields, or `none` (the extension has no overridable field, or is unavailable).
+     */
+    overrideState: "following" | "copy" | "none";
+    /**
+     * The org must configure the extension before it works here (spec A §6): its effective config
+     * is not valid, or a required org-only field is missing. Always false when unavailable.
+     */
+    needsConfig: boolean;
 }
+/** The extension points an extension provides, from its permission list's `provides` group. */
+export declare function providesOf(view: Pick<OrgExtensionView, "permissions">): string[];
 /** `put` 的输入：`config` 中的密钥字段缺省 = 保留原值、`null` = 清除、其他值 = 新值。 */
 export interface OrgExtensionInput {
     enabled?: boolean | undefined;
@@ -48,7 +70,7 @@ export interface OrgExtensionInput {
 /** `put` 的内部选项（不来自 HTTP）。 */
 export interface OrgExtensionPutOptions {
     /**
-     * Enable through this enterprise catalog item (the extension's own item, or an app item: plugins
+     * Enable through this platform catalog item (the extension's own item, or an app item: plugins
      * in an app follow the app item's policy, C22). When omitted, judged by every source item in
      * `extension_catalog_sources` (the strictest wins); an extension not installed through the catalog
      * is not bound by catalog policy.
@@ -69,6 +91,13 @@ export interface OrgExtensionPutOptions {
     ifDisabled?: {
         skipped: boolean;
     };
+    /**
+     * Check the role and the config (the given `config`, or with `enabled: true` the stored one,
+     * merged with the stored secrets, against the schema) and write nothing: lets a caller that must
+     * do another write first fail without a side effect. The rules for newly enabling (catalog policy,
+     * dependencies) are left to that write: the plugin install that enables it checks them.
+     */
+    validateOnly?: boolean;
 }
 /**
  * Org-level extension config: enablement and the `config.org` config stored per org.
@@ -90,6 +119,8 @@ export declare class OrgExtensionConfigs {
     private readonly events;
     /** Secret values handled (written or decrypted) are masked in the logs after the commit. */
     private readonly log;
+    /** The effective deployment config of each org (spec A §6): read for `needsConfig`. */
+    private readonly effective;
     /** Test seam only: a deterministic interleaving point after the config rows are read, before the secrets. */
     afterConfigRowRead: (() => Promise<void>) | undefined;
     constructor(kdb: KernelDb, txHost: TransactionHost, keyring: Keyring, host: ExtensionHost, 
@@ -100,7 +131,9 @@ export declare class OrgExtensionConfigs {
     /** `extension.org-disabled` after a disable commits (channel connections drop at once). */
     events: KernelEvents, 
     /** Secret values handled (written or decrypted) are masked in the logs after the commit. */
-    log: KernelLogger);
+    log: KernelLogger, 
+    /** The effective deployment config of each org (spec A §6): read for `needsConfig`. */
+    effective: EffectiveConfigs);
     /** The kernel-schema handle of the current transaction. */
     private get db();
     /** 把一份组织配置里的密钥值登记到日志打码（无密钥时无操作）；调用方须在事务提交后调用。 */
@@ -108,12 +141,34 @@ export declare class OrgExtensionConfigs {
     /** After a write committed: a disabled extension's channel connections drop at once. */
     private afterPut;
     /**
-     * 列出所有已加载插件在该组织下的状态（按加载顺序）；无记录时 enabled=false、config=null。
-     * 之后是已安装但此刻没加载的插件（部署上停用等），`available: false`，按名字排序。
+     * The state of every loaded extension the org sees, in load order (no row: `enabled` false,
+     * `config` null), then the installed extensions not loaded right now (disabled on the deployment
+     * and the like) as `available: false`, sorted by name.
      */
     list(orgId: string): Promise<OrgExtensionView[]>;
+    /**
+     * Fills `overrideState` and the platform half of `needsConfig` (spec A §6) for the views of
+     * extensions with overridable fields (the others always run with the platform's config, which
+     * loaded valid). Reads the org's copy rows once and the effective config of each such extension.
+     */
+    private withLayers;
     /** `REPEATABLE READ` read-only: the config rows and the secrets come from one snapshot. */
     private listSnapshot;
+    /**
+     * How an `enabled` write of this extension is handled: `direct` through {@link put} (a required
+     * bootstrap plugin keeps `extension.required`; an extension without a live item is config-declared;
+     * several live items keep the direct write, the strictest source rules applying), `locked` (a live
+     * item is builtin and the write switches off: `plugin.scope_locked`), or `item` (the single plugin
+     * whose org switch it is).
+     */
+    switchPlan(plugin: string, enabled: boolean): Promise<{
+        kind: "direct";
+    } | {
+        kind: "locked";
+    } | {
+        kind: "item";
+        itemId: string;
+    }>;
     /**
      * Writes enablement and / or config. The actor's role is re-read under the org row lock (needs
      * `org.extensions.manage`).
@@ -125,8 +180,16 @@ export declare class OrgExtensionConfigs {
      * - The merged full config (or, without `config`, the existing config when the result is enabled)
      *   does not satisfy the schema -> `extension.config_invalid`.
      */
-    put(orgId: string, plugin: string, input: OrgExtensionInput, actorAccountId: string, actorTokenId?: string, opts?: OrgExtensionPutOptions): Promise<OrgExtensionView>;
+    put(orgId: string, plugin: string, input: OrgExtensionInput, 
+    /** null: the kernel itself (the plugin scope sync installing a plugin), no role check. */
+    actorAccountId: string | null, actorTokenId?: string, opts?: OrgExtensionPutOptions): Promise<OrgExtensionView>;
     private write;
+    /**
+     * The rules of a write that switches: newly enabling an extension from the platform catalog
+     * re-checks the item policy and grants (C22; one already enabled is unaffected), enabling needs
+     * the dependencies enabled, disabling (without `force`) no enabled dependents.
+     */
+    private assertSwitchRules;
     /**
      * 读取并解密某插件在该组织下的完整配置（供运行时按组织构造插件实例）。
      * A required bootstrap plugin is enabled without a row (its stored config, or `{}`, is validated).
@@ -150,7 +213,7 @@ export declare class OrgExtensionConfigs {
      * 在调用方事务里停用（应用安装的回滚与卸载用；调用方已锁组织行并复核角色）：不检查依赖方，配置保留，
      * 审计 `org.plugin_config.updated`（带 reason）。提交后调用方须再调 {@link afterDisable}。
      */
-    disableIn(orgId: string, plugin: string, actorAccountId: string, reason: string): Promise<boolean>;
+    disableIn(orgId: string, plugin: string, actorAccountId: string | null, reason: string): Promise<boolean>;
     /** {@link disableIn} 的事务提交之后：通知停用（断开该插件的渠道连接等）。 */
     afterDisable(orgId: string, plugin: string): Promise<void>;
     /** 该组织已启用的插件名（只含当前已加载的插件；待批准的不算；必需的引导插件始终算启用）。 */
@@ -175,3 +238,9 @@ export declare class OrgExtensionConfigs {
     /** 该组织在 `kernel` 命名空间下已设置的插件配置密钥键（不解密）。 */
     private setSecretKeys;
 }
+/**
+ * Whether the org sees `plugin` in its extension list (a required bootstrap plugin always; else
+ * under its catalog items' scope, as {@link OrgExtensionConfigs.list} filters). `db` may be a
+ * transaction.
+ */
+export declare function extensionVisibleTo(db: KernelSchemaDb, orgId: string, plugin: string): Promise<boolean>;

package/dist/extensions/org-config.js

@@ -9,7 +9,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { EXTENSION_POINTS, parseExtensionPoint, } from "@capybara-hq/plugin-sdk";
 import { Inject, Injectable } from "@nestjs/common";
-import { assertItemInstallable, assertPluginSourcesInstallable, disabledPluginItems, pluginItemDisabled, } from "../catalog/requests.service.js";
+import { assertItemInstallable, assertPluginSourcesInstallable, disabledPluginItems, pluginItemDisabled, } from "../catalog/request-rules.js";
+import { visibleTo } from "../catalog/scope.js";
 import { changedPaths, configFields, getPath, secretValues } from "../config/fields.js";
 import { createSecrets } from "../ctx/secrets.js";
 import { ApiError } from "../errors.js";
@@ -23,14 +24,36 @@ import { KERNEL_LOGGER, KEYRING } from "../infra/tokens.js";
 import { OrgLock } from "../orgs/org-lock.js";
 import { toIssues } from "./config-issues.js";
 import { configMessages, safeConfigFormSchema } from "./config-json-schema.js";
+import { EffectiveConfigs } from "./effective-config.js";
 import { enabledExtensionsQuery, requiredExtensions } from "./enabled.js";
 import { ExtensionHost } from "./host.js";
 import { ExtensionInstalls } from "./installs.js";
+import { fieldLevels } from "./org-levels.js";
 import { permissionGroups } from "./permission-view.js";
+import { itemLocked, pluginItemsOf } from "./plugin-items.js";
 export { toIssues };
 /** 内核自己的 secrets 命名空间（plugin-sdk 把 `kernel` 列为保留插件名，插件不会与之相撞）。 */
 const SECRETS_NAMESPACE = "kernel";
 const secretKey = (plugin, path) => `plugin-config:${plugin}:${path}`;
+/** The extension points an extension provides, from its permission list's `provides` group. */
+export function providesOf(view) {
+    return view.permissions.filter((g) => g.category === "provides").flatMap((g) => g.items);
+}
+/**
+ * The scope part of an org view: the extension's primary plugin and whether the org can switch it.
+ * With several source items, a builtin one locks the extension on (scope `all`); an `all` one does
+ * not (layering spec §4).
+ */
+function scopeFields(items, required) {
+    const primary = items?.[0];
+    if (!primary)
+        return { catalogItem: null, switchable: !required };
+    const locked = required || items.some(itemLocked);
+    return {
+        catalogItem: { itemId: primary.id, scope: locked ? "all" : primary.scope },
+        switchable: !locked,
+    };
+}
 const isObj = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 /** 按点路径设值，缺失的中间对象自动创建；中间节点不是对象时放弃（交给 schema 校验报错）。 */
 function setDeep(obj, path, value) {
@@ -80,6 +103,7 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
     installs;
     events;
     log;
+    effective;
     /** Test seam only: a deterministic interleaving point after the config rows are read, before the secrets. */
     afterConfigRowRead;
     constructor(kdb, txHost, keyring, host, 
@@ -90,7 +114,9 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
     /** `extension.org-disabled` after a disable commits (channel connections drop at once). */
     events, 
     /** Secret values handled (written or decrypted) are masked in the logs after the commit. */
-    log) {
+    log, 
+    /** The effective deployment config of each org (spec A §6): read for `needsConfig`. */
+    effective) {
         this.kdb = kdb;
         this.txHost = txHost;
         this.keyring = keyring;
@@ -99,6 +125,7 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
         this.installs = installs;
         this.events = events;
         this.log = log;
+        this.effective = effective;
     }
     /** The kernel-schema handle of the current transaction. */
     get db() {
@@ -118,15 +145,38 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
             await this.events.emit("extension.org-disabled", { orgId, plugin });
     }
     /**
-     * 列出所有已加载插件在该组织下的状态（按加载顺序）；无记录时 enabled=false、config=null。
-     * 之后是已安装但此刻没加载的插件（部署上停用等），`available: false`，按名字排序。
+     * The state of every loaded extension the org sees, in load order (no row: `enabled` false,
+     * `config` null), then the installed extensions not loaded right now (disabled on the deployment
+     * and the like) as `available: false`, sorted by name.
      */
     async list(orgId) {
         const installed = (await this.installs.list()).map((r) => ({
             name: r.name,
             version: r.version,
         }));
-        return this.listSnapshot(orgId, installed);
+        return this.withLayers(orgId, await this.listSnapshot(orgId, installed));
+    }
+    /**
+     * Fills `overrideState` and the platform half of `needsConfig` (spec A §6) for the views of
+     * extensions with overridable fields (the others always run with the platform's config, which
+     * loaded valid). Reads the org's copy rows once and the effective config of each such extension.
+     */
+    async withLayers(orgId, views) {
+        const layered = views.filter((v) => v.overrideState !== "none");
+        if (layered.length === 0)
+            return views;
+        const copies = new Set((await this.db
+            .selectFrom("extension_org_overrides")
+            .select("plugin")
+            .where("org_id", "=", orgId)
+            .where("plugin", "in", layered.map((v) => v.plugin))
+            .execute()).map((r) => r.plugin));
+        for (const v of layered) {
+            v.overrideState = copies.has(v.plugin) ? "copy" : "following";
+            if (!(await this.effective.get(orgId, v.plugin)).ok)
+                v.needsConfig = true;
+        }
+        return views;
     }
     /** `REPEATABLE READ` read-only: the config rows and the secrets come from one snapshot. */
     async listSnapshot(orgId, installed) {
@@ -141,10 +191,23 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
         // Required bootstrap plugins are listed enabled (no org config row needed, spec §7)
         const required = await requiredExtensions(t);
         const loaded = this.host.manifests();
-        const views = loaded.map((m) => this.view(m, rows.find((r) => r.plugin === m.name), setKeys, required.has(m.name)));
+        const items = await pluginItemsOf(t, [
+            ...loaded.map((m) => m.name),
+            ...installed.map((i) => i.name),
+        ]);
+        // An extension whose plugin the org is not offered (a `named` plugin without it) is absent
+        const listed = new Set((await t
+            .selectFrom("catalog_item_scope_orgs")
+            .select("item_id")
+            .where("org_id", "=", orgId)
+            .execute()).map((r) => r.item_id));
+        const seen = (name) => required.has(name) || itemsVisible(items.get(name), listed);
+        const views = loaded
+            .filter((m) => seen(m.name))
+            .map((m) => this.view(m, rows.find((r) => r.plugin === m.name), setKeys, required.has(m.name), items.get(m.name)));
         const names = new Set(loaded.map((m) => m.name));
         const unavailable = installed
-            .filter((i) => !names.has(i.name))
+            .filter((i) => !names.has(i.name) && seen(i.name))
             .sort((a, b) => a.name.localeCompare(b.name))
             .map((i) => ({
             plugin: i.name,
@@ -157,9 +220,31 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
             orgConfigSchema: null,
             available: false,
             required: required.has(i.name),
+            ...scopeFields(items.get(i.name), required.has(i.name)),
+            overrideState: "none",
+            needsConfig: false,
         }));
         return [...views, ...unavailable];
     }
+    /**
+     * How an `enabled` write of this extension is handled: `direct` through {@link put} (a required
+     * bootstrap plugin keeps `extension.required`; an extension without a live item is config-declared;
+     * several live items keep the direct write, the strictest source rules applying), `locked` (a live
+     * item is builtin and the write switches off: `plugin.scope_locked`), or `item` (the single plugin
+     * whose org switch it is).
+     */
+    async switchPlan(plugin, enabled) {
+        const t = this.db;
+        if ((await requiredExtensions(t)).has(plugin))
+            return { kind: "direct" };
+        const items = (await pluginItemsOf(t, [plugin])).get(plugin);
+        if (!items)
+            return { kind: "direct" };
+        if (!enabled && items.some(itemLocked))
+            return { kind: "locked" };
+        const [only] = items;
+        return items.length === 1 && only ? { kind: "item", itemId: only.id } : { kind: "direct" };
+    }
     /**
      * Writes enablement and / or config. The actor's role is re-read under the org row lock (needs
      * `org.extensions.manage`).
@@ -171,19 +256,22 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
      * - The merged full config (or, without `config`, the existing config when the result is enabled)
      *   does not satisfy the schema -> `extension.config_invalid`.
      */
-    async put(orgId, plugin, input, actorAccountId, actorTokenId, opts = {}) {
+    async put(orgId, plugin, input, 
+    /** null: the kernel itself (the plugin scope sync installing a plugin), no role check. */
+    actorAccountId, actorTokenId, opts = {}) {
         const manifest = this.manifest(plugin);
         const schema = manifest.config?.org;
         if (input.config !== undefined && !schema) {
             throw new ApiError("extension.no_org_config", `Extension ${plugin} has no organization config`);
         }
-        return this.write(orgId, plugin, manifest, input, actorAccountId, actorTokenId, opts);
+        const view = await this.write(orgId, plugin, manifest, input, actorAccountId, actorTokenId, opts);
+        return (await this.withLayers(orgId, [view]))[0];
     }
     async write(orgId, plugin, manifest, input, actorAccountId, actorTokenId, opts) {
         const schema = manifest.config?.org;
         let seen;
         const t = this.db;
-        await this.orgLock.lockAndAuthorize(orgId, actorAccountId, "org.extensions.manage");
+        await this.orgLock.lockFor(orgId, actorAccountId, "org.extensions.manage");
         const row = await t
             .selectFrom("extension_org_configs")
             .select(["enabled", "config"])
@@ -191,31 +279,18 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
             .where("org_id", "=", orgId)
             .executeTakeFirst();
         const required = (await requiredExtensions(t)).has(plugin);
+        const item = (await pluginItemsOf(t, [plugin])).get(plugin);
         if (required && input.enabled === false)
             throw requiredError(plugin);
         if (opts.ifDisabled && (row?.enabled === true || required)) {
             opts.ifDisabled.skipped = true;
-            return this.view(manifest, row, await this.setSecretKeys(t, orgId), required);
+            return this.view(manifest, row, await this.setSecretKeys(t, orgId), required, item);
         }
         // A required plugin is enabled whatever the row said (it may predate `required`)
         const enabled = required || (input.enabled ?? row?.enabled ?? false);
-        // 新启用来自企业目录的插件：按条目策略与授予复核（C22；已启用的不受影响）
-        if (input.enabled === true && row?.enabled !== true && !required) {
-            // 插件自己的条目 disabled 是总开关，任何途径都不能新启用（裁决 M-5）
-            const killed = await disabledPluginItems(t, [plugin]);
-            if (killed.length > 0)
-                throw pluginItemDisabled(killed);
-            // 经某个条目安装：只看该条目（应用里的插件按应用条目，C22）；直接启用：全部来源里最严格的生效
-            if (opts.viaItem !== undefined) {
-                await assertItemInstallable(t, orgId, opts.viaItem, opts.approvedBy ?? opts.viaItem);
-            }
-            else
-                await assertPluginSourcesInstallable(t, orgId, plugin);
-        }
-        if (input.enabled === true)
-            await this.assertDependenciesEnabled(t, orgId, manifest);
-        else if (input.enabled === false && !input.force) {
-            await this.assertNoEnabledDependents(t, orgId, manifest);
+        // validateOnly: the rules for (newly) enabling and disabling belong to the write that follows
+        if (!opts.validateOnly) {
+            await this.assertSwitchRules(t, orgId, manifest, input, row, required, opts);
         }
         let plain = row?.config ?? null;
         let changed = [];
@@ -253,7 +328,7 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
                 next = r.data;
             }
             seen = { schema, config: next };
-            if (input.config !== undefined) {
+            if (!opts.validateOnly && input.config !== undefined) {
                 changed = changedPaths(schema, before, next);
                 plain = structuredClone(next);
                 for (const p of paths) {
@@ -266,6 +341,10 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
                 }
             }
         }
+        // Also without an org config schema: nothing is written
+        if (opts.validateOnly) {
+            return this.view(manifest, row, await this.setSecretKeys(t, orgId), required, item);
+        }
         // 当前 schema 中已不存在的密钥路径：同一事务内清掉遗留的密文行
         const live = new Set((schema ? secretPaths(schema) : []).map((p) => secretKey(plugin, p)));
         const prefix = secretKey(plugin, "");
@@ -309,7 +388,7 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
             .where("plugin", "=", plugin)
             .where("org_id", "=", orgId)
             .executeTakeFirst();
-        const view = this.view(manifest, saved, await this.setSecretKeys(t, orgId), required);
+        const view = this.view(manifest, saved, await this.setSecretKeys(t, orgId), required, item);
         // Only once the root transaction committed (an outer caller's too): a rolled-back write
         // registers no secrets and disconnects nothing
         afterCommit(async () => {
@@ -318,6 +397,31 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
         });
         return view;
     }
+    /**
+     * The rules of a write that switches: newly enabling an extension from the platform catalog
+     * re-checks the item policy and grants (C22; one already enabled is unaffected), enabling needs
+     * the dependencies enabled, disabling (without `force`) no enabled dependents.
+     */
+    async assertSwitchRules(t, orgId, manifest, input, row, required, opts) {
+        const plugin = manifest.name;
+        if (input.enabled === true && row?.enabled !== true && !required) {
+            // 插件自己的条目 disabled 是总开关，任何途径都不能新启用（裁决 M-5）
+            const killed = await disabledPluginItems(t, [plugin]);
+            if (killed.length > 0)
+                throw pluginItemDisabled(killed);
+            // 经某个条目安装：只看该条目（应用里的插件按应用条目，C22）；直接启用：全部来源里最严格的生效
+            if (opts.viaItem !== undefined) {
+                await assertItemInstallable(t, orgId, opts.viaItem, opts.approvedBy ?? opts.viaItem);
+            }
+            else
+                await assertPluginSourcesInstallable(t, orgId, plugin);
+        }
+        if (input.enabled === true)
+            await this.assertDependenciesEnabled(t, orgId, manifest);
+        else if (input.enabled === false && !input.force) {
+            await this.assertNoEnabledDependents(t, orgId, manifest);
+        }
+    }
     /**
      * 读取并解密某插件在该组织下的完整配置（供运行时按组织构造插件实例）。
      * A required bootstrap plugin is enabled without a row (its stored config, or `{}`, is validated).
@@ -496,7 +600,7 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
             throw new ApiError("extension.not_found", `Extension ${plugin} is not installed`);
         return set;
     }
-    view(m, row, setKeys, required) {
+    view(m, row, setKeys, required, items) {
         const schema = m.config?.org;
         const paths = schema ? secretPaths(schema) : [];
         let config = null;
@@ -516,6 +620,12 @@ let OrgExtensionConfigs = class OrgExtensionConfigs {
             orgConfigSchema: schema ? this.formSchema(m.name, m.version, schema) : null,
             available: true,
             required,
+            ...scopeFields(items, required),
+            overrideState: [...fieldLevels(m.config?.deployment).values()].includes("override")
+                ? "following"
+                : "none",
+            needsConfig: schema !== undefined &&
+                orgConfigIncomplete(schema, config, (p) => setKeys.has(secretKey(m.name, p))),
         };
     }
     /**
@@ -571,7 +681,49 @@ OrgExtensionConfigs = __decorate([
     __param(4, Inject(OrgLock)),
     __param(5, Inject(ExtensionInstalls)),
     __param(6, Inject(KernelEvents)),
-    __param(7, Inject(KERNEL_LOGGER))
+    __param(7, Inject(KERNEL_LOGGER)),
+    __param(8, Inject(EffectiveConfigs))
 ], OrgExtensionConfigs);
 export { OrgExtensionConfigs };
+/**
+ * Whether an org may see an extension with these live catalog items (`listed`: the items whose
+ * `named` list has the org): one visible item is enough; without an item (config-declared, or its
+ * items deleted) it is visible. A builtin item counts as `all`.
+ */
+function itemsVisible(items, listed) {
+    if (!items)
+        return true;
+    return items.some((i) => visibleTo({ scope: i.builtin ? "all" : i.scope }, listed.has(i.id)));
+}
+/**
+ * Whether the org sees `plugin` in its extension list (a required bootstrap plugin always; else
+ * under its catalog items' scope, as {@link OrgExtensionConfigs.list} filters). `db` may be a
+ * transaction.
+ */
+export async function extensionVisibleTo(db, orgId, plugin) {
+    if ((await requiredExtensions(db)).has(plugin))
+        return true;
+    const items = (await pluginItemsOf(db, [plugin])).get(plugin);
+    if (!items)
+        return true;
+    const listed = new Set((await db
+        .selectFrom("catalog_item_scope_orgs")
+        .select("item_id")
+        .where("org_id", "=", orgId)
+        .where("item_id", "in", items.map((i) => i.id))
+        .execute()).map((r) => r.item_id));
+    return itemsVisible(items, listed);
+}
+/**
+ * The stored org-only config does not satisfy the org schema (a required field missing): what the
+ * org form reports before any edit. A set secret is not decrypted here; issues on it or below it
+ * are ignored (it was validated when written).
+ */
+function orgConfigIncomplete(schema, plain, secretSet) {
+    const r = schema.safeParse(plain ?? {});
+    if (r.success)
+        return false;
+    const secrets = secretPaths(schema).filter(secretSet);
+    return toIssues(r.error).some((i) => !secrets.some((p) => i.path === p || i.path.startsWith(`${p}.`)));
+}
 const requiredError = (plugin) => new ApiError("extension.required", `Extension ${plugin} is required by this deployment (a bootstrap plugin): it is enabled in every organization and cannot be disabled`);