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

package/dist/extensions/point-defaults.d.ts

@@ -1,14 +1,19 @@
 import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
 import type { KernelLogger } from "../log.js";
+import { EffectiveConfigs } from "./effective-config.js";
 import { OrgExtensionConfigs } from "./org-config.js";
 import { ExtensionRegistry } from "./registry.js";
-/** The outcome of {@link ExtensionPointDefaults.resolve}. */
+/**
+ * The outcome of {@link ExtensionPointDefaults.resolve}: the provider with its org config and its
+ * effective deployment config for the org (layering spec A §6), both to pass back to it.
+ */
 export type PointResolution<T> = {
     ok: true;
     extension: string;
     impl: T;
     orgConfig: unknown;
+    config: unknown;
 } | {
     ok: false;
     reason: "none" | "ambiguous";
@@ -26,8 +31,8 @@ export interface OrgPointDefaultView {
 /**
  * The org default provider of an `org-default` extension point (web tools spec §6). Per call,
  * never cached in process: the candidates are the providers loaded on this replica that are
- * enabled in the org, whose org config is valid and whose `configured()` (when present) does not
- * return false. One candidate is used as is; several need the org's stored default
+ * enabled in the org, whose org config and effective deployment config for the org (layering spec
+ * A §6) are valid, and whose `configured()` (when present) does not return false. One candidate is used as is; several need the org's stored default
  * (`capybara.org_extension_point_defaults`), else the choice is ambiguous. A stored default that
  * is not a candidate (disabled, uninstalled, unconfigured) stays and counts again once it is one.
  */
@@ -36,11 +41,13 @@ export declare class ExtensionPointDefaults {
     readonly txHost: TransactionHost;
     private readonly registry;
     private readonly orgConfigs;
+    private readonly effective;
     private readonly log;
-    constructor(kdb: KernelDb, txHost: TransactionHost, registry: Pick<ExtensionRegistry, "list">, orgConfigs: Pick<OrgExtensionConfigs, "get">, log: KernelLogger);
+    constructor(kdb: KernelDb, txHost: TransactionHost, registry: Pick<ExtensionRegistry, "list">, orgConfigs: Pick<OrgExtensionConfigs, "get">, effective: Pick<EffectiveConfigs, "get">, log: KernelLogger);
     /**
      * The provider of `point` (the name without the major, e.g. `web-search`) for `orgId`, with the
-     * org's decrypted config to pass back to it. Throws when the point has no `selection`.
+     * org's decrypted config and the effective deployment config to pass back to it. Throws when the
+     * point has no `selection`.
      */
     resolve<T>(orgId: string, point: string): Promise<PointResolution<T>>;
     /** Every `org-default` point with its candidates, stored default and effective provider. */

package/dist/extensions/point-defaults.js

@@ -15,6 +15,7 @@ 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 { KERNEL_LOGGER } from "../infra/tokens.js";
+import { EffectiveConfigs } from "./effective-config.js";
 import { enabledExtensionsQuery, isExtensionEnabled } from "./enabled.js";
 import { OrgExtensionConfigs } from "./org-config.js";
 import { ExtensionRegistry } from "./registry.js";
@@ -28,8 +29,8 @@ const hasSelection = (point) => EXTENSION_POINTS[point]?.selection === "org-defa
 /**
  * The org default provider of an `org-default` extension point (web tools spec §6). Per call,
  * never cached in process: the candidates are the providers loaded on this replica that are
- * enabled in the org, whose org config is valid and whose `configured()` (when present) does not
- * return false. One candidate is used as is; several need the org's stored default
+ * enabled in the org, whose org config and effective deployment config for the org (layering spec
+ * A §6) are valid, and whose `configured()` (when present) does not return false. One candidate is used as is; several need the org's stored default
  * (`capybara.org_extension_point_defaults`), else the choice is ambiguous. A stored default that
  * is not a candidate (disabled, uninstalled, unconfigured) stays and counts again once it is one.
  */
@@ -38,17 +39,20 @@ let ExtensionPointDefaults = class ExtensionPointDefaults {
     txHost;
     registry;
     orgConfigs;
+    effective;
     log;
-    constructor(kdb, txHost, registry, orgConfigs, log) {
+    constructor(kdb, txHost, registry, orgConfigs, effective, log) {
         this.kdb = kdb;
         this.txHost = txHost;
         this.registry = registry;
         this.orgConfigs = orgConfigs;
+        this.effective = effective;
         this.log = log;
     }
     /**
      * The provider of `point` (the name without the major, e.g. `web-search`) for `orgId`, with the
-     * org's decrypted config to pass back to it. Throws when the point has no `selection`.
+     * org's decrypted config and the effective deployment config to pass back to it. Throws when the
+     * point has no `selection`.
      */
     async resolve(orgId, point) {
         if (!hasSelection(point)) {
@@ -59,7 +63,13 @@ let ExtensionPointDefaults = class ExtensionPointDefaults {
         if (!chosen.ok)
             return chosen;
         const c = chosen.candidate;
-        return { ok: true, extension: c.extension, impl: c.impl, orgConfig: c.orgConfig };
+        return {
+            ok: true,
+            extension: c.extension,
+            impl: c.impl,
+            orgConfig: c.orgConfig,
+            config: c.config,
+        };
     }
     /** Every `org-default` point with its candidates, stored default and effective provider. */
     async list(orgId) {
@@ -145,11 +155,28 @@ let ExtensionPointDefaults = class ExtensionPointDefaults {
             }
             if (!cfg?.enabled)
                 continue;
-            const configured = impl.configured;
+            // spec A §6: an org whose effective config is not valid gets no call from this extension
+            let effective;
+            try {
+                effective = await this.effective.get(orgId, extension);
+            }
+            catch (err) {
+                this.log.warn("org default provider: provider excluded, cannot read its effective config", {
+                    orgId,
+                    point,
+                    extension,
+                    err,
+                });
+                continue;
+            }
+            if (!effective.ok)
+                continue;
+            const configured = impl
+                .configured;
             if (typeof configured === "function") {
                 let ok;
                 try {
-                    ok = configured.call(impl, cfg.config) !== false;
+                    ok = configured.call(impl, cfg.config, effective.config) !== false;
                 }
                 catch (err) {
                     this.log.warn("org default provider: provider excluded, configured() threw", {
@@ -163,7 +190,7 @@ let ExtensionPointDefaults = class ExtensionPointDefaults {
                 if (!ok)
                     continue;
             }
-            out.push({ extension, impl, orgConfig: cfg.config });
+            out.push({ extension, impl, orgConfig: cfg.config, config: effective.config });
         }
         return out.sort((a, b) => (a.extension < b.extension ? -1 : a.extension > b.extension ? 1 : 0));
     }
@@ -191,7 +218,8 @@ ExtensionPointDefaults = __decorate([
     __param(1, Inject(TransactionHost)),
     __param(2, Inject(ExtensionRegistry)),
     __param(3, Inject(OrgExtensionConfigs)),
-    __param(4, Inject(KERNEL_LOGGER))
+    __param(4, Inject(EffectiveConfigs)),
+    __param(5, Inject(KERNEL_LOGGER))
 ], ExtensionPointDefaults);
 export { ExtensionPointDefaults };
 /** Rules 2-4 of spec §6: one candidate → it; several → the stored default if a candidate. */

package/dist/extensions/resolve.d.ts

@@ -1,7 +1,11 @@
 import { type ExtensionManifest } from "@capybara-hq/plugin-sdk";
 /** 插件依赖解析失败（信息列出插件名与能力名）。 */
 export declare class ExtensionResolveError extends Error {
-    constructor(message: string);
+    /** Error code of the failure, when it has one. */
+    readonly code?: string | undefined;
+    constructor(message: string, 
+    /** Error code of the failure, when it has one. */
+    code?: string | undefined);
 }
 /**
  * 校验 sdk 范围、依赖满足度、单选能力唯一性与无环，返回按依赖拓扑排序后的列表（同层保持输入顺序）。

package/dist/extensions/resolve.js

@@ -1,9 +1,13 @@
-import { EXTENSION_POINT_CARDINALITY, OBJECT_STORE_EXTENSION_POINT, parseExtensionPoint, } from "@capybara-hq/plugin-sdk";
+import { EXTENSION_POINT_CARDINALITY, EXTENSION_POINTS, OBJECT_STORE_EXTENSION_POINT, parseExtensionPoint, } from "@capybara-hq/plugin-sdk";
 import semver from "semver";
 /** 插件依赖解析失败（信息列出插件名与能力名）。 */
 export class ExtensionResolveError extends Error {
-    constructor(message) {
+    code;
+    constructor(message, 
+    /** Error code of the failure, when it has one. */
+    code) {
         super(message);
+        this.code = code;
         this.name = "ExtensionResolveError";
     }
 }
@@ -23,6 +27,15 @@ export function resolveExtensions(manifests, sdkVersion) {
             throw new ExtensionResolveError(`plugin ${m.name}: sdk range "${m.sdk}" is not satisfied by SDK_VERSION ${sdkVersion}`);
         }
     }
+    for (const m of manifests) {
+        for (const ref of m.provides) {
+            const { name, major } = parseExtensionPoint(ref);
+            const majors = EXTENSION_POINTS[name]?.majors;
+            if (majors && !majors.includes(major)) {
+                throw new ExtensionResolveError(`Plugin ${m.name} provides ${ref}, which this kernel no longer supports; upgrade it to a version that provides ${name}@${Math.max(...majors)}.`, "extension.unsupported_extension_point");
+            }
+        }
+    }
     const providers = new Map();
     for (const m of manifests) {
         for (const cap of m.provides)

package/dist/extensions/state.module.d.ts

@@ -0,0 +1,9 @@
+/**
+ * The extension state the model domain reads below the host: the install records with their
+ * packages and approvals, and each extension's effective config per org. Apart from
+ * `ExtensionsModule` so the model provider registry (and the `ctx.models` broker the host injects)
+ * can depend on it without a module cycle (writing-kernel-api: a cycle is cut by moving the shared
+ * part into its own provider both sides inject). `ExtensionsModule` re-exports it.
+ */
+export declare class ExtensionStateModule {
+}

package/dist/extensions/state.module.js

@@ -0,0 +1,38 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { Module } from "@nestjs/common";
+import { SuperAdminLockModule } from "../identity/super-admin.js";
+import { OrgLockModule } from "../orgs/org-lock.js";
+import { StorageModule } from "../storage/storage.module.js";
+import { ExtensionApprovals } from "./approvals.js";
+import { ExtensionBlobs } from "./blobs.js";
+import { EffectiveConfigs } from "./effective-config.js";
+import { ExtensionInstalls } from "./installs.js";
+import { ExtensionRegistryModule } from "./registry.js";
+/**
+ * The extension state the model domain reads below the host: the install records with their
+ * packages and approvals, and each extension's effective config per org. Apart from
+ * `ExtensionsModule` so the model provider registry (and the `ctx.models` broker the host injects)
+ * can depend on it without a module cycle (writing-kernel-api: a cycle is cut by moving the shared
+ * part into its own provider both sides inject). `ExtensionsModule` re-exports it.
+ */
+let ExtensionStateModule = class ExtensionStateModule {
+};
+ExtensionStateModule = __decorate([
+    Module({
+        imports: [ExtensionRegistryModule, SuperAdminLockModule, OrgLockModule, StorageModule],
+        providers: [ExtensionApprovals, ExtensionBlobs, ExtensionInstalls, EffectiveConfigs],
+        exports: [
+            ExtensionRegistryModule,
+            ExtensionApprovals,
+            ExtensionBlobs,
+            ExtensionInstalls,
+            EffectiveConfigs,
+        ],
+    })
+], ExtensionStateModule);
+export { ExtensionStateModule };

package/dist/files/previewers.d.ts

@@ -1,5 +1,6 @@
 import { type FilePreviewer, type Logger, type UiView } from "@capybara-hq/plugin-sdk";
 import { ConversationFiles } from "../conversations/files.js";
+import { EffectiveConfigs } from "../extensions/effective-config.js";
 import { ExtensionHost } from "../extensions/host.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
@@ -39,7 +40,7 @@ export declare class PreviewerRegistry {
     readonly txHost: TransactionHost;
     private readonly timeoutMs;
     private readonly d;
-    constructor(kdb: Pick<KernelDb, "db">, host: Pick<ExtensionHost, "list" | "enabledPlugins">, files: Pick<ConversationFiles, "file">, storage: Pick<StorageService, "kernel">, log: Pick<Logger, "warn">, txHost: TransactionHost, timeoutMs?: number);
+    constructor(kdb: Pick<KernelDb, "db">, host: Pick<ExtensionHost, "list" | "enabledPlugins">, files: Pick<ConversationFiles, "file">, storage: Pick<StorageService, "kernel">, effective: Pick<EffectiveConfigs, "get">, log: Pick<Logger, "warn">, txHost: TransactionHost, timeoutMs?: number);
     /** Every previewer loaded on this replica, in provider order (load order, then list order). */
     private loaded;
     /** The org's previewers (enabled extensions only) in its order, disabled ones included. */
@@ -65,6 +66,12 @@ export declare class PreviewerRegistry {
     private putIn;
     /** Previewers that take this file (viewer must read the conversation), in the org's order. */
     forFile(orgId: string, conversationId: string, viewer: string, fileId: string): Promise<PreviewerItem[]>;
+    /**
+     * The org's enabled previewers that take the file, each with its extension's effective config
+     * for the org. An extension whose effective config is not valid in the org (or cannot be read)
+     * previews nothing there (layering spec A §6): its previewers are left out, so the next one or a
+     * built-in takes the file.
+     */
     private accepting;
     /**
      * Renders a view previewer for one file: 404 `ui.not_found` when it does not take the file (or is

package/dist/files/previewers.js

@@ -12,6 +12,7 @@ import { Inject, Injectable, Optional } from "@nestjs/common";
 import { sql } from "kysely";
 import { ConversationFiles } from "../conversations/files.js";
 import { ApiError } from "../errors.js";
+import { EffectiveConfigs } from "../extensions/effective-config.js";
 import { ExtensionHost } from "../extensions/host.js";
 import { audit } from "../identity/audit.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
@@ -71,7 +72,7 @@ let PreviewerRegistry = class PreviewerRegistry {
     txHost;
     timeoutMs;
     d;
-    constructor(kdb, host, files, storage, log, txHost, timeoutMs = FILE_PREVIEW_TIMEOUT_MS) {
+    constructor(kdb, host, files, storage, effective, log, txHost, timeoutMs = FILE_PREVIEW_TIMEOUT_MS) {
         this.txHost = txHost;
         this.timeoutMs = timeoutMs;
         this.d = {
@@ -82,6 +83,7 @@ let PreviewerRegistry = class PreviewerRegistry {
             enabledPlugins: (orgId) => host.enabledPlugins(orgId),
             files,
             storage,
+            effective,
             log,
         };
     }
@@ -186,8 +188,33 @@ let PreviewerRegistry = class PreviewerRegistry {
         const file = await this.d.files.file(orgId, conversationId, viewer, fileId);
         return (await this.accepting(orgId, file)).map(item);
     }
+    /**
+     * The org's enabled previewers that take the file, each with its extension's effective config
+     * for the org. An extension whose effective config is not valid in the org (or cannot be read)
+     * previews nothing there (layering spec A §6): its previewers are left out, so the next one or a
+     * built-in takes the file.
+     */
     async accepting(orgId, file) {
-        return (await this.ordered(orgId)).filter((l) => !l.disabled && previewerAccepts(l.previewer, file));
+        const taking = (await this.ordered(orgId)).filter((l) => !l.disabled && previewerAccepts(l.previewer, file));
+        const configs = new Map();
+        for (const plugin of new Set(taking.map((l) => l.plugin))) {
+            try {
+                const e = await this.d.effective.get(orgId, plugin);
+                configs.set(plugin, e.ok ? { config: e.config } : null);
+            }
+            catch (err) {
+                this.d.log.warn("file previewer left out: cannot read its effective config", {
+                    orgId,
+                    plugin,
+                    err,
+                });
+                configs.set(plugin, null);
+            }
+        }
+        return taking.flatMap((l) => {
+            const c = configs.get(l.plugin);
+            return c ? [{ ...l, config: c.config }] : [];
+        });
     }
     /**
      * Renders a view previewer for one file: 404 `ui.not_found` when it does not take the file (or is
@@ -224,6 +251,7 @@ let PreviewerRegistry = class PreviewerRegistry {
                             accountId: t.accountId,
                             conversationId: t.conversationId,
                             locale: t.locale,
+                            config: l.config,
                             signal: s,
                             file: {
                                 id: file.id,
@@ -289,9 +317,10 @@ PreviewerRegistry = __decorate([
     __param(1, Inject(ExtensionHost)),
     __param(2, Inject(ConversationFiles)),
     __param(3, Inject(StorageService)),
-    __param(4, Inject(KERNEL_LOGGER)),
-    __param(5, Inject(TransactionHost)),
-    __param(6, Optional()),
-    __param(6, Inject(FILE_PREVIEW_TIMEOUT))
+    __param(4, Inject(EffectiveConfigs)),
+    __param(5, Inject(KERNEL_LOGGER)),
+    __param(6, Inject(TransactionHost)),
+    __param(7, Optional()),
+    __param(7, Inject(FILE_PREVIEW_TIMEOUT))
 ], PreviewerRegistry);
 export { PreviewerRegistry };

package/dist/http/api.module.js

@@ -13,25 +13,30 @@ import { SetupController } from "../admin/setup.controller.js";
 import { AgentsController } from "../agents/agents.controller.js";
 import { AgentsModule } from "../agents/agents.module.js";
 import { ModelsController } from "../agents/models.controller.js";
+import { PendingConnectorsController } from "../agents/pending-connectors.controller.js";
 import { ReadinessController } from "../agents/readiness.controller.js";
-import { AgentTemplatesController } from "../agents/templates.controller.js";
+import { AgentSaveAsTemplateController, AgentTemplatesController, } from "../agents/templates.controller.js";
 import { BackgroundController } from "../background/background.controller.js";
 import { BackgroundModule } from "../background/background.module.js";
 import { AdminCatalogController } from "../catalog/admin-catalog.controller.js";
 import { CatalogModule } from "../catalog/catalog.module.js";
-import { MarketplacesController } from "../catalog/marketplaces.controller.js";
+import { AdminComponentsController, OrgComponentsController, } from "../catalog/component-scope.controller.js";
+import { MarketplacesController, OrgMarketplacesController, } from "../catalog/marketplaces.controller.js";
 import { AdminCatalogRequestsController, OrgCatalogController, } from "../catalog/org-catalog.controller.js";
+import { OrgExtensionConfigsController, OrgExtensionOverridesController, OrgExtensionToolSwitchesController, } from "../catalog/org-extension.controller.js";
+import { OrgOwnedPluginsController, OrgPluginUploadsController, } from "../catalog/org-plugin-uploads.controller.js";
 import { ChannelsModule } from "../channels/channels.module.js";
 import { ChannelConnectionsController } from "../channels/connections.controller.js";
 import { AttachmentsController } from "../conversations/attachments.controller.js";
 import { ConversationsController } from "../conversations/conversations.controller.js";
 import { ConversationsModule } from "../conversations/conversations.module.js";
+import { EnvironmentsController } from "../environments/environments.controller.js";
+import { EnvironmentsModule } from "../environments/environments.module.js";
 import { EvalsModule } from "../evals/evals.module.js";
 import { EvalRunsController } from "../evals/runs.controller.js";
 import { EvalSetsController } from "../evals/sets.controller.js";
 import { TrajectoryController } from "../evals/trajectory.controller.js";
 import { ExtensionsModule } from "../extensions/extensions.module.js";
-import { OrgExtensionConfigsController } from "../extensions/org-config.controller.js";
 import { ExtensionPointDefaultsController } from "../extensions/point-defaults.controller.js";
 import { FilesModule } from "../files/files.module.js";
 import { FilePreviewersController } from "../files/previewers.controller.js";
@@ -41,6 +46,8 @@ import { IdentityModule } from "../identity/identity.module.js";
 import { MeController } from "../identity/me.controller.js";
 import { BindController, MeIdentitiesController, SsoController, } from "../identity/sso.controller.js";
 import { InboxModule } from "../inbox/inbox.module.js";
+import { PlatformInboxController } from "../inbox/platform-inbox.controller.js";
+import { ModelEnablementController } from "../models/enablement.controller.js";
 import { ModelsModule } from "../models/models.module.js";
 import { ModelPurposesController } from "../models/purposes.controller.js";
 import { DirectorySyncController } from "../orgs/directory-sync.controller.js";
@@ -58,6 +65,7 @@ import { StorageModule } from "../storage/storage.module.js";
 import { ApprovalsController, ToolGrantsController } from "../tools/approvals.controller.js";
 import { ConnectorContentController } from "../tools/connector-content.controller.js";
 import { ConnectorsController } from "../tools/connectors.controller.js";
+import { ExtensionToolsController } from "../tools/extension-tools.controller.js";
 import { OAuthCallbackController, OAuthConnectController, } from "../tools/oauth/oauth.controller.js";
 import { QuestionsController } from "../tools/questions.controller.js";
 import { ToolsModule } from "../tools/tools.module.js";
@@ -74,26 +82,36 @@ const CONTROLLERS = [
     AdminController,
     AdminExtensionsController,
     AdminCatalogController,
+    AdminComponentsController,
     MarketplacesController,
+    OrgMarketplacesController,
     OrgExtensionConfigsController,
+    OrgExtensionOverridesController,
+    OrgExtensionToolSwitchesController,
     AgentsController,
     AgentTemplatesController,
+    AgentSaveAsTemplateController,
+    PendingConnectorsController,
     ModelsController,
+    ModelEnablementController,
     ReadinessController,
     ConversationsController,
     BackgroundController,
+    EnvironmentsController,
     AttachmentsController,
     SkillsController,
     SkillChangesController,
     AgentSkillsController,
     InvocableSkillsController,
     InboxController,
+    PlatformInboxController,
     ConversationStreamController,
     ConnectorContentController,
     ConnectorsController,
     ApprovalsController,
     ToolGrantsController,
     QuestionsController,
+    ExtensionToolsController,
     OAuthConnectController,
     OAuthCallbackController,
     SsoController,
@@ -109,6 +127,9 @@ const CONTROLLERS = [
     EvalRunsController,
     ModelPurposesController,
     OrgCatalogController,
+    OrgPluginUploadsController,
+    OrgOwnedPluginsController,
+    OrgComponentsController,
     AdminCatalogRequestsController,
 ];
 /**
@@ -134,6 +155,7 @@ ApiModule = __decorate([
             AgentsModule,
             ConversationsModule,
             BackgroundModule,
+            EnvironmentsModule,
             RuntimeModule,
             ChannelsModule,
             EvalsModule,

package/dist/http/app.d.ts

@@ -45,7 +45,7 @@ export interface CreateHttpAppOptions {
     replicaId?: string | undefined;
     /**
      * The size limit for package uploads ({@link PACKAGE_UPLOAD_ROUTES}: extension packages and
-     * enterprise catalog packages, `application/octet-stream`), i.e. `packages.maxBytes`. The route
+     * platform catalog packages, `application/octet-stream`), i.e. `packages.maxBytes`. The route
      * bodyLimit is one byte more: a package exactly one byte over reaches the handler and returns
      * `extension.package_too_large`; larger ones are refused by Fastify itself (413
      * `payload_too_large`).
@@ -56,11 +56,20 @@ export interface CreateHttpAppOptions {
 export declare const EXTENSION_PACKAGE_UPLOAD_ROUTE = "/api/v1/admin/extensions/packages/file";
 /** The plugin package upload route of the catalog import (Fastify route template). */
 export declare const CATALOG_UPLOAD_ROUTE = "/api/v1/admin/catalog/import/file";
+/** The platform skill version upload route (a skill package zip as the raw body). */
+export declare const COMPONENT_SKILL_UPLOAD_ROUTE = "/api/v1/admin/components/skill/:id/versions";
 /**
  * The upload routes that take raw bytes (`application/octet-stream`, limit `packages.maxBytes`,
- * the enterprise admin is authenticated before the body is read).
+ * the super admin is authenticated before the body is read).
  */
 export declare const PACKAGE_UPLOAD_ROUTES: ReadonlySet<string>;
+/** An org admin's plugin package upload (spec §14, ruling P3-7; a tgz as the raw body). */
+export declare const ORG_PLUGIN_UPLOAD_ROUTE = "/api/v1/orgs/:orgId/catalog/uploads/file";
+/**
+ * The org routes that take raw package bytes (limit `packages.maxBytes`): before the body is read
+ * the caller is authenticated as a person with the org role of `catalog.upload` (ruling P3-29).
+ */
+export declare const ORG_PACKAGE_UPLOAD_ROUTES: ReadonlySet<string>;
 /**
  * Sets up the Fastify side of the kernel's Nest application (built by `buildKernelApp` from
  * `KernelModule`, which provides the health endpoints and the API) without connecting to anything,

package/dist/http/app.js

@@ -3,9 +3,11 @@ import fastifyCookie from "@fastify/cookie";
 import { ApiError, errorBody } from "../errors.js";
 import { AccountsService } from "../identity/accounts.js";
 import { ApiTokenService } from "../identity/api-tokens.js";
-import { authorizeEnterpriseAdmin } from "../identity/auth.guard.js";
+import { authenticateOrgUploader, authorizeSuperAdmin, } from "../identity/auth.guard.js";
 import { SessionService } from "../identity/sessions.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
 import { withLogContext } from "../log-context.js";
+import { authorizeOrgAction } from "../orgs/org.guard.js";
 import { redactPath } from "./error.filter.js";
 import { registerGatewayRoutes } from "./gateway-routes.js";
 import { createPluginRouter, registerPluginDispatch, staticRouteTable, } from "./plugin-dispatch.js";
@@ -13,14 +15,24 @@ import { createPluginRouter, registerPluginDispatch, staticRouteTable, } from ".
 export const EXTENSION_PACKAGE_UPLOAD_ROUTE = "/api/v1/admin/extensions/packages/file";
 /** The plugin package upload route of the catalog import (Fastify route template). */
 export const CATALOG_UPLOAD_ROUTE = "/api/v1/admin/catalog/import/file";
+/** The platform skill version upload route (a skill package zip as the raw body). */
+export const COMPONENT_SKILL_UPLOAD_ROUTE = "/api/v1/admin/components/skill/:id/versions";
 /**
  * The upload routes that take raw bytes (`application/octet-stream`, limit `packages.maxBytes`,
- * the enterprise admin is authenticated before the body is read).
+ * the super admin is authenticated before the body is read).
  */
 export const PACKAGE_UPLOAD_ROUTES = new Set([
     EXTENSION_PACKAGE_UPLOAD_ROUTE,
     CATALOG_UPLOAD_ROUTE,
+    COMPONENT_SKILL_UPLOAD_ROUTE,
 ]);
+/** An org admin's plugin package upload (spec §14, ruling P3-7; a tgz as the raw body). */
+export const ORG_PLUGIN_UPLOAD_ROUTE = "/api/v1/orgs/:orgId/catalog/uploads/file";
+/**
+ * The org routes that take raw package bytes (limit `packages.maxBytes`): before the body is read
+ * the caller is authenticated as a person with the org role of `catalog.upload` (ruling P3-29).
+ */
+export const ORG_PACKAGE_UPLOAD_ROUTES = new Set([ORG_PLUGIN_UPLOAD_ROUTE]);
 /** Paths without an access log line (probes). */
 const QUIET_PATHS = new Set(["/healthz", "/readyz"]);
 /**
@@ -92,11 +104,12 @@ export async function createHttpApp(opts, app) {
         if (LARGE_BODY_ROUTES.has(r.url) && [r.method].flat().includes("POST")) {
             r.bodyLimit = LARGE_BODY_LIMIT;
         }
-        if (PACKAGE_UPLOAD_ROUTES.has(r.url) && opts.packageMaxBytes !== undefined) {
+        const upload = PACKAGE_UPLOAD_ROUTES.has(r.url) || ORG_PACKAGE_UPLOAD_ROUTES.has(r.url);
+        if (upload && opts.packageMaxBytes !== undefined) {
             r.bodyLimit = opts.packageMaxBytes + 1;
         }
     });
-    // 读请求体之前：包上传（插件包、企业目录包）先认证（未认证 / 非企业管理员的大请求体不读进内存）；其余内核路由不收
+    // 读请求体之前：包上传（插件包、平台目录包）先认证（未认证 / 非超级管理员的大请求体不读进内存）；其余内核路由不收
     // application/octet-stream（415）。插件路由 /plugins/* 在自己的作用域里收任何类型，不受影响
     let authServices;
     const services = () => {
@@ -119,7 +132,20 @@ export async function createHttpApp(opts, app) {
             return;
         if (req.method === "POST" && PACKAGE_UPLOAD_ROUTES.has(req.routeOptions.url ?? "")) {
             try {
-                await authorizeEnterpriseAdmin(req, services());
+                await authorizeSuperAdmin(req, services());
+            }
+            catch (e) {
+                return sendError(reply, e, req.method, req.url);
+            }
+            return;
+        }
+        if (req.method === "POST" && ORG_PACKAGE_UPLOAD_ROUTES.has(req.routeOptions.url ?? "")) {
+            try {
+                // the org admin role before the body (ruling P3-29): no one else makes the kernel buffer
+                // a package-sized body
+                const principal = await authenticateOrgUploader(req, services());
+                const orgId = req.params.orgId ?? "";
+                await authorizeOrgAction(app.get(KernelDb, { strict: false }).db, principal, orgId, "catalog.upload");
             }
             catch (e) {
                 return sendError(reply, e, req.method, req.url);

package/dist/http/plugin-dispatch.d.ts

@@ -45,7 +45,10 @@ export declare function createPluginRouter(routes: Route[]): PluginRouter;
  * - `req.signal` aborts only when the client disconnects before the response is written (not on
  *   normal completion); long-lived handlers use it to unsubscribe;
  * - a throwing handler is logged (path redacted with `redactPath`) and returns 500 `internal` (the
- *   error message is not echoed).
+ *   error message is not echoed), except a `model.hook_denied` `ApiError` that escaped from
+ *   `ctx.models.embed` (an organization policy hook denied the call, spec B §5.4): a deliberate
+ *   outcome, not a failure, so it answers 403 `model.hook_denied` with a generic message (the
+ *   routes are unauthenticated: the policy extension's name and reason are not echoed).
  * - Fastify's own errors (a body over 1 MiB and so on) are mapped to the error envelope by the
  *   scope's error handler: 4xx by the common error code table (413 `payload_too_large`, 415
  *   `unsupported_media_type` and so on), 5xx are logged and return `internal`.

package/dist/http/plugin-dispatch.js

@@ -1,6 +1,6 @@
 import { Readable } from "node:stream";
 import FindMyWay from "find-my-way";
-import { errorBody } from "../errors.js";
+import { ApiError, ERROR_CODES, errorBody } from "../errors.js";
 import { ACCESS_COOKIE, REFRESH_COOKIE } from "../identity/cookies.js";
 import { codeForStatus, redactPath } from "./error.filter.js";
 /** 插件路由都在此前缀下（ctx.http.route 已加 `/plugins/<name>` 前缀）。 */
@@ -47,7 +47,10 @@ export function createPluginRouter(routes) {
  * - `req.signal` aborts only when the client disconnects before the response is written (not on
  *   normal completion); long-lived handlers use it to unsubscribe;
  * - a throwing handler is logged (path redacted with `redactPath`) and returns 500 `internal` (the
- *   error message is not echoed).
+ *   error message is not echoed), except a `model.hook_denied` `ApiError` that escaped from
+ *   `ctx.models.embed` (an organization policy hook denied the call, spec B §5.4): a deliberate
+ *   outcome, not a failure, so it answers 403 `model.hook_denied` with a generic message (the
+ *   routes are unauthenticated: the policy extension's name and reason are not echoed).
  * - Fastify's own errors (a body over 1 MiB and so on) are mapped to the error envelope by the
  *   scope's error handler: 4xx by the common error code table (413 `payload_too_large`, 415
  *   `unsupported_media_type` and so on), 5xx are logged and return `internal`.
@@ -108,6 +111,15 @@ export async function registerPluginDispatch(fastify, getTable, log) {
             res = await pluginHandler(webReq);
         }
         catch (err) {
+            if (err instanceof ApiError && err.code === "model.hook_denied") {
+                log.warn("plugin handler refused: a policy hook denied its model call", {
+                    method: req.method,
+                    path: redactPath(path),
+                });
+                return reply
+                    .code(ERROR_CODES["model.hook_denied"])
+                    .send(errorBody(err.code, "An organization policy denied this model call"));
+            }
             log.error("plugin handler failed", { method: req.method, path: redactPath(path), err });
             return reply.code(500).send(errorBody("internal", "Internal error"));
         }