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

package/dist/catalog/org-catalog.controller.d.ts

@@ -2,18 +2,31 @@ import type { FastifyReply } from "fastify";
 import { z } from "zod";
 import { type Principal } from "../identity/principal.js";
 import { type OrgContext } from "../orgs/org.guard.js";
-import type { CatalogIcon, OrgCatalogDetail, OrgCatalogItem, OrgInstallResult, OrgUpgradeResult } from "./catalog-content.js";
+import type { ConnectorDetail, ToolIssue } from "../tools/connectors.service.js";
+import type { MarketplaceImportResult } from "./catalog.service.js";
+import type { CatalogIcon, OrgCatalogDetail, OrgCatalogItem, OrgInstallResult } from "./catalog-content.js";
 import { OrgCatalogService } from "./org-catalog.service.js";
-import { PluginInstaller, type PluginInstallView, type UninstallReport } from "./plugin-install.js";
-import type { UpgradePreview } from "./plugin-upgrade.js";
+import { PluginInstaller, type PluginInstallView, type UninstallPreview, type UninstallReport } from "./plugin-install.js";
 import { CatalogRequestsService, type CatalogRequestView } from "./requests.service.js";
 declare const RequestBody: z.ZodObject<{
+    kind: z.ZodEnum<{
+        access: "access";
+        enable: "enable";
+    }>;
+    note: z.ZodOptional<z.ZodString>;
+}, z.core.$strict>;
+/** An org admin's request for a marketplace entry not in the catalog yet. */
+declare const MarketplaceRequestBody: z.ZodObject<{
+    marketplaceId: z.ZodString;
+    name: z.ZodString;
+    version: z.ZodString;
     note: z.ZodOptional<z.ZodString>;
-    version: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
-/** The org install body: the version (default the latest), template input, the extension's org config. */
+/**
+ * The org install body: template input, the extension's org config. No version: an org installs the
+ * platform version (one per deployment, ruling P2-17).
+ */
 declare const InstallBody: z.ZodObject<{
-    version: z.ZodOptional<z.ZodString>;
     connectors: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         name: z.ZodOptional<z.ZodString>;
         slug: z.ZodOptional<z.ZodString>;
@@ -26,16 +39,28 @@ declare const InstallBody: z.ZodObject<{
     }, z.core.$strict>>>;
     extensionConfig: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 }, z.core.$strict>;
-/** The upgrade preview body: the target version. */
-declare const UpgradePreviewBody: z.ZodObject<{
-    version: z.ZodString;
+/** The connectors body (ruling P2-10): the input of missing connectors, by template id, as at install. */
+declare const ConnectorsBody: z.ZodObject<{
+    inputs: z.ZodObject<{
+        connectors: z.ZodRecord<z.ZodString, z.ZodObject<{
+            name: z.ZodOptional<z.ZodString>;
+            slug: z.ZodOptional<z.ZodString>;
+            endpoint: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+            credential: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+            client: z.ZodOptional<z.ZodObject<{
+                clientId: z.ZodString;
+                clientSecret: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>>;
+        }, z.core.$strict>>;
+    }, z.core.$strict>;
 }, z.core.$strict>;
-/** The upgrade body: the target version, the preview's diffHash, the inputs it listed. */
-declare const UpgradeBody: z.ZodObject<{
-    version: z.ZodString;
-    diffHash: z.ZodString;
-    connectors: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-        name: z.ZodOptional<z.ZodString>;
+/**
+ * One more connector from a platform connector template (ruling P4-T6-8): its name and an
+ * install's connector input (`config`).
+ */
+declare const TemplateConnectorBody: z.ZodObject<{
+    name: z.ZodOptional<z.ZodString>;
+    config: z.ZodObject<{
         slug: z.ZodOptional<z.ZodString>;
         endpoint: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
         credential: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
@@ -43,8 +68,25 @@ declare const UpgradeBody: z.ZodObject<{
             clientId: z.ZodString;
             clientSecret: z.ZodOptional<z.ZodString>;
         }, z.core.$strict>>;
-    }, z.core.$strict>>>;
-    extensionConfig: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$strict>;
+}, z.core.$strict>;
+/** The switch body: on (with the install inputs), or off (with the preview's hash to confirm). */
+declare const SwitchBody: z.ZodObject<{
+    enabled: z.ZodBoolean;
+    inputs: z.ZodOptional<z.ZodObject<{
+        connectors: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+            name: z.ZodOptional<z.ZodString>;
+            slug: z.ZodOptional<z.ZodString>;
+            endpoint: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+            credential: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+            client: z.ZodOptional<z.ZodObject<{
+                clientId: z.ZodString;
+                clientSecret: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>>;
+        }, z.core.$strict>>>;
+        extensionConfig: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$strict>>;
+    confirm: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
 /**
  * 条目图标的响应头：图标可能是 SVG（可含脚本），只许网页以 `<img>` 显示；直接打开时 CSP sandbox 禁止脚本与一切外部
@@ -52,10 +94,8 @@ declare const UpgradeBody: z.ZodObject<{
  */
 export declare function sendCatalogIcon(reply: FastifyReply, icon: CatalogIcon): Promise<void>;
 declare const DecideBody: z.ZodObject<{
-    decision: z.ZodEnum<{
-        approve: "approve";
-        reject: "reject";
-    }>;
+    approve: z.ZodBoolean;
+    reason: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
 declare const AdminListQuery: z.ZodObject<{
     status: z.ZodOptional<z.ZodEnum<{
@@ -66,21 +106,27 @@ declare const AdminListQuery: z.ZodObject<{
     }>>;
 }, z.core.$strip>;
 /**
- * The enterprise catalog from an organization's view (`/api/v1/orgs/:orgId/...`, human users only):
+ * The platform catalog from an organization's view (`/api/v1/orgs/:orgId/...`, human users only):
  * - `GET catalog` (`catalog.read`, member and up; members do not see disabled items);
- * - `POST catalog/:itemId/requests` (`catalog.request`): a member request, into the org admins'
- *   inbox;
- * - `POST catalog/:itemId/install`: the route only requires `catalog.read`; the service re-checks
+ * - `POST catalog/:itemId/requests` (`catalog.request`; `access` needs an org admin): requests
+ *   under plugin scope (spec §5.1), `enable` into the org admins' inbox, `access` to the super
+ *   admin; `POST marketplace-requests` (org admins): an `import` request for a marketplace entry;
+ * - `PUT catalog/:itemId/switch` (scope phase 1): `{ enabled: true, inputs? }` installs -> 200 `{ item }`;
+ *   `{ enabled: false, confirm? }` -> 200 `{ preview, confirm }`, then with the hash 200 `{ item }`;
+ * - `POST catalog/:itemId/install` (an alias of switching on, no longer creates requests): the route only requires `catalog.read`; the service re-checks
  *   the plugin's component actions (`org.extensions.manage` for an extension, `connectors.manage`
  *   for templates, `skills.manage` for skills) inside the org row lock; needs_approval without a
  *   grant -> 202 `{ request }`, otherwise 201 `{ installed, install }` (the install view);
  * - `GET / DELETE plugin-installs[/:installId]` (`org.extensions.manage`; uninstall re-checks the
  *   plugin's component actions in the service);
- * - `POST plugin-installs/:installId/upgrade/preview` and `.../upgrade` (spec §10; the route only
- *   requires `catalog.read`, the service re-checks the component actions of both versions):
- *   preview -> 200 `{ from, to, diffHash, components, inputs, templates }`; upgrade -> 200 `{ install }`, or
- *   202 `{ request }` for a needs_approval item without a grant;
- * - `POST catalog-requests/:id/decide` (`catalog.decide`, org admins).
+ * - no per-org upgrade: a platform plugin has one version for the deployment, updated by the super
+ *   admin (`PUT /admin/catalog/items/:id/update`, ruling F2);
+ * - `POST connector-templates/:templateId/connectors` (`connectors.manage`): one more connector
+ *   from a platform connector template on in the org (ruling P4-T6-8);
+ * - `POST catalog-requests/:id/decide` (`catalog.decide`, org admins; `enable` and
+ *   `connector_setup` requests, `{ approve, reason? }`; a `connector_setup` request is only
+ *   rejected here, ruling P4-T6-6), `POST catalog-requests/:id/dismiss` (the requester, a decided
+ *   request).
  */
 export declare class OrgCatalogController {
     private readonly catalog;
@@ -100,22 +146,66 @@ export declare class OrgCatalogController {
      * -> 404 `catalog.icon_not_found`; members do not see disabled items.
      */
     icon(org: OrgContext, itemId: string, reply: FastifyReply): Promise<void>;
+    /**
+     * A request for an item (spec §5.1): `enable` (members and up, an item that is off) or `access`
+     * (org admins, a `named` item shown to the org) -> 201 `{ request }`.
+     */
     request(principal: Principal, org: OrgContext, itemId: string, body: z.infer<typeof RequestBody>): Promise<{
         request: CatalogRequestView;
-        created: boolean;
+    }>;
+    /**
+     * An org admin asks for a marketplace entry to be imported (deployment setting
+     * `orgMarketplaceBrowse`) -> 201 `{ request }`.
+     */
+    marketplaceRequest(principal: Principal, org: OrgContext, body: z.infer<typeof MarketplaceRequestBody>): Promise<{
+        request: CatalogRequestView;
+    }>;
+    setSwitch(principal: Principal, org: OrgContext, itemId: string, body: z.infer<typeof SwitchBody>): Promise<{
+        item: OrgCatalogItem;
+    } | {
+        preview: UninstallPreview;
+        confirm: string;
     }>;
     install(principal: Principal, org: OrgContext, itemId: string, body: z.infer<typeof InstallBody>, reply: FastifyReply): Promise<Omit<OrgInstallResult, "status">>;
+    /**
+     * Creates the connectors an installed plugin is missing (ruling P2-10: a connector template on
+     * in the org without a connector there, e.g. added by a platform update; the plugin shows
+     * `needs_config`): `{ inputs: { connectors: { <templateId>: input } } }` with the same input
+     * checks as an install; recorded on the install -> 201 `{ connectors: [{ templateId,
+     * connectorId }] }`. Not installed -> 404 `plugin.install_not_found`; a template not missing ->
+     * 400 `validation_failed`.
+     */
+    configureConnectors(principal: Principal, org: OrgContext, itemId: string, body: z.infer<typeof ConnectorsBody>): Promise<{
+        connectors: {
+            templateId: string;
+            connectorId: string;
+        }[];
+    }>;
+    /**
+     * One more connector from a platform connector template on in the org (rulings P4-7, P4-T6-8):
+     * `{ name?, config: { slug?, endpoint?, credential?, client? } }` with the checks of an install
+     * -> 201 `{ connector, issues }` (as `POST connectors`). A template not usable in the org -> 404
+     * `component.not_found`; off there -> 409 `component.off`; input errors -> 400 at `config.*`.
+     */
+    templateConnector(principal: Principal, org: OrgContext, templateId: string, body: z.infer<typeof TemplateConnectorBody>): Promise<{
+        connector: ConnectorDetail;
+        issues: ToolIssue[];
+    }>;
     listInstalls(org: OrgContext): Promise<{
         installs: PluginInstallView[];
     }>;
     uninstall(principal: Principal, org: OrgContext, installId: string): Promise<UninstallReport>;
-    upgradePreview(principal: Principal, org: OrgContext, installId: string, body: z.infer<typeof UpgradePreviewBody>): Promise<UpgradePreview>;
-    upgrade(principal: Principal, org: OrgContext, installId: string, body: z.infer<typeof UpgradeBody>, reply: FastifyReply): Promise<Omit<OrgUpgradeResult, "status">>;
     decide(principal: Principal, org: OrgContext, id: string, body: z.infer<typeof DecideBody>): Promise<{
         request: CatalogRequestView;
     }>;
+    /** The requester dismisses a decided request from the inbox -> 204. */
+    dismiss(principal: Principal, org: OrgContext, id: string): Promise<void>;
 }
-/** Enterprise admins decide deployment-level catalog requests (`/api/v1/admin/catalog/requests`). */
+/**
+ * Super admins decide `access` and `import` requests (`/api/v1/admin/catalog/requests`):
+ * approving an `import` returns the prepared import (`import: { stagingId, review, ... }`), confirmed
+ * with `POST /api/v1/admin/catalog/imports/:stagingId/confirm`.
+ */
 export declare class AdminCatalogRequestsController {
     private readonly requests;
     constructor(requests: CatalogRequestsService);
@@ -124,6 +214,7 @@ export declare class AdminCatalogRequestsController {
     }>;
     decide(principal: Principal, id: string, body: z.infer<typeof DecideBody>): Promise<{
         request: CatalogRequestView;
+        import?: MarketplaceImportResult;
     }>;
 }
 export {};

package/dist/catalog/org-catalog.controller.js

@@ -7,21 +7,30 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { Controller, Delete, Get, HttpCode, Inject, Param, Post, Res } from "@nestjs/common";
+import { Controller, Delete, Get, HttpCode, Inject, Param, Post, Put, Res } from "@nestjs/common";
 import { z } from "zod";
-import { CurrentPrincipal, EnterpriseAdmin, patTokenId, requireUser, } from "../identity/principal.js";
+import { CurrentPrincipal, patTokenId, requireUser, SuperAdmin, } from "../identity/principal.js";
 import { createZodDto } from "../infra/validation/create-zod-dto.js";
 import { ZBody, ZQuery } from "../infra/validation/zod-params.js";
 import { CurrentOrg, OrgAction } from "../orgs/org.guard.js";
 import { roleAtLeast } from "../orgs/roles.js";
 import { CredentialValue } from "../tools/connectors.controller.js";
 import { OrgCatalogService } from "./org-catalog.service.js";
-import { PluginInstaller } from "./plugin-install.js";
+import { PluginInstaller, } from "./plugin-install.js";
 import { CatalogRequestsService } from "./requests.service.js";
 const RequestBody = z
     .object({
+    kind: z.enum(["access", "enable"]),
+    note: z.string().max(1000).optional(),
+})
+    .strict();
+/** An org admin's request for a marketplace entry not in the catalog yet. */
+const MarketplaceRequestBody = z
+    .object({
+    marketplaceId: z.string().min(1).max(100),
+    name: z.string().min(1).max(214),
+    version: z.string().min(1).max(256),
     note: z.string().max(1000).optional(),
-    version: z.string().min(1).max(256).optional(),
 })
     .strict();
 const ConnectorInput = z
@@ -39,23 +48,41 @@ const ConnectorInput = z
         .optional(),
 })
     .strict();
-/** The org install body: the version (default the latest), template input, the extension's org config. */
+/**
+ * The org install body: template input, the extension's org config. No version: an org installs the
+ * platform version (one per deployment, ruling P2-17).
+ */
 const InstallBody = z
     .object({
-    version: z.string().min(1).max(256).optional(),
     connectors: z.record(z.string(), ConnectorInput).optional(),
     extensionConfig: z.record(z.string(), z.unknown()).optional(),
 })
     .strict();
-/** The upgrade preview body: the target version. */
-const UpgradePreviewBody = z.object({ version: z.string().min(1).max(256) }).strict();
-/** The upgrade body: the target version, the preview's diffHash, the inputs it listed. */
-const UpgradeBody = z
+/** The connectors body (ruling P2-10): the input of missing connectors, by template id, as at install. */
+const ConnectorsBody = z
     .object({
-    version: z.string().min(1).max(256),
-    diffHash: z.string().regex(/^[0-9a-f]{64}$/),
-    connectors: z.record(z.string(), ConnectorInput).optional(),
-    extensionConfig: z.record(z.string(), z.unknown()).optional(),
+    inputs: z.object({ connectors: z.record(z.string(), ConnectorInput) }).strict(),
+})
+    .strict();
+/**
+ * One more connector from a platform connector template (ruling P4-T6-8): its name and an
+ * install's connector input (`config`).
+ */
+const TemplateConnectorBody = z
+    .object({
+    name: z.string().trim().min(1).max(80).optional(),
+    config: ConnectorInput.omit({ name: true }),
+})
+    .strict();
+/** The switch body: on (with the install inputs), or off (with the preview's hash to confirm). */
+const SwitchBody = z
+    .object({
+    enabled: z.boolean(),
+    inputs: InstallBody.optional(),
+    confirm: z
+        .string()
+        .regex(/^[0-9a-f]{64}$/)
+        .optional(),
 })
     .strict();
 /**
@@ -70,7 +97,9 @@ export async function sendCatalogIcon(reply, icon) {
         .header("cache-control", "private, max-age=300")
         .send(Buffer.from(icon.data.buffer, icon.data.byteOffset, icon.data.byteLength));
 }
-const DecideBody = z.object({ decision: z.enum(["approve", "reject"]) }).strict();
+const DecideBody = z
+    .object({ approve: z.boolean(), reason: z.string().max(1000).optional() })
+    .strict();
 const AdminListQuery = z.object({
     status: z.enum(["pending", "approved", "rejected", "cancelled"]).optional(),
 });
@@ -80,28 +109,38 @@ class CatalogDecideBody extends createZodDto(DecideBody, "CatalogDecideBody") {
 }
 class OrgPluginInstallBody extends createZodDto(InstallBody, "OrgPluginInstallBody") {
 }
-class CatalogRequestBody extends createZodDto(RequestBody, "CatalogRequestBody") {
+class OrgPluginConnectorsBody extends createZodDto(ConnectorsBody, "OrgPluginConnectorsBody") {
+}
+class OrgPluginSwitchBody extends createZodDto(SwitchBody, "OrgPluginSwitchBody") {
 }
-class OrgPluginUpgradeBody extends createZodDto(UpgradeBody, "OrgPluginUpgradeBody") {
+class OrgTemplateConnectorBody extends createZodDto(TemplateConnectorBody, "OrgTemplateConnectorBody") {
 }
-class OrgPluginUpgradePreviewBody extends createZodDto(UpgradePreviewBody, "OrgPluginUpgradePreviewBody") {
+class CatalogRequestBody extends createZodDto(RequestBody, "CatalogRequestBody") {
+}
+class CatalogMarketplaceRequestBody extends createZodDto(MarketplaceRequestBody, "CatalogMarketplaceRequestBody") {
 }
 /**
- * The enterprise catalog from an organization's view (`/api/v1/orgs/:orgId/...`, human users only):
+ * The platform catalog from an organization's view (`/api/v1/orgs/:orgId/...`, human users only):
  * - `GET catalog` (`catalog.read`, member and up; members do not see disabled items);
- * - `POST catalog/:itemId/requests` (`catalog.request`): a member request, into the org admins'
- *   inbox;
- * - `POST catalog/:itemId/install`: the route only requires `catalog.read`; the service re-checks
+ * - `POST catalog/:itemId/requests` (`catalog.request`; `access` needs an org admin): requests
+ *   under plugin scope (spec §5.1), `enable` into the org admins' inbox, `access` to the super
+ *   admin; `POST marketplace-requests` (org admins): an `import` request for a marketplace entry;
+ * - `PUT catalog/:itemId/switch` (scope phase 1): `{ enabled: true, inputs? }` installs -> 200 `{ item }`;
+ *   `{ enabled: false, confirm? }` -> 200 `{ preview, confirm }`, then with the hash 200 `{ item }`;
+ * - `POST catalog/:itemId/install` (an alias of switching on, no longer creates requests): the route only requires `catalog.read`; the service re-checks
  *   the plugin's component actions (`org.extensions.manage` for an extension, `connectors.manage`
  *   for templates, `skills.manage` for skills) inside the org row lock; needs_approval without a
  *   grant -> 202 `{ request }`, otherwise 201 `{ installed, install }` (the install view);
  * - `GET / DELETE plugin-installs[/:installId]` (`org.extensions.manage`; uninstall re-checks the
  *   plugin's component actions in the service);
- * - `POST plugin-installs/:installId/upgrade/preview` and `.../upgrade` (spec §10; the route only
- *   requires `catalog.read`, the service re-checks the component actions of both versions):
- *   preview -> 200 `{ from, to, diffHash, components, inputs, templates }`; upgrade -> 200 `{ install }`, or
- *   202 `{ request }` for a needs_approval item without a grant;
- * - `POST catalog-requests/:id/decide` (`catalog.decide`, org admins).
+ * - no per-org upgrade: a platform plugin has one version for the deployment, updated by the super
+ *   admin (`PUT /admin/catalog/items/:id/update`, ruling F2);
+ * - `POST connector-templates/:templateId/connectors` (`connectors.manage`): one more connector
+ *   from a platform connector template on in the org (ruling P4-T6-8);
+ * - `POST catalog-requests/:id/decide` (`catalog.decide`, org admins; `enable` and
+ *   `connector_setup` requests, `{ approve, reason? }`; a `connector_setup` request is only
+ *   rejected here, ruling P4-T6-6), `POST catalog-requests/:id/dismiss` (the requester, a decided
+ *   request).
  */
 let OrgCatalogController = class OrgCatalogController {
     catalog;
@@ -129,13 +168,42 @@ let OrgCatalogController = class OrgCatalogController {
      * -> 404 `catalog.icon_not_found`; members do not see disabled items.
      */
     async icon(org, itemId, reply) {
-        const icon = await this.catalog.icon(itemId, roleAtLeast(org.role, "admin"));
+        const icon = await this.catalog.icon(itemId, roleAtLeast(org.role, "admin"), org.orgId);
         await sendCatalogIcon(reply, icon);
     }
+    /**
+     * A request for an item (spec §5.1): `enable` (members and up, an item that is off) or `access`
+     * (org admins, a `named` item shown to the org) -> 201 `{ request }`.
+     */
     async request(principal, org, itemId, body) {
         const p = requireUser(principal);
         const tokenId = patTokenId(p);
-        return this.requests.request(org.orgId, p.account.id, itemId, body, tokenId !== undefined ? { actorTokenId: tokenId } : {});
+        return {
+            request: await this.requests.requestItem(org.orgId, p.account.id, itemId, body, tokenId !== undefined ? { actorTokenId: tokenId } : {}),
+        };
+    }
+    /**
+     * An org admin asks for a marketplace entry to be imported (deployment setting
+     * `orgMarketplaceBrowse`) -> 201 `{ request }`.
+     */
+    async marketplaceRequest(principal, org, body) {
+        const p = requireUser(principal);
+        const tokenId = patTokenId(p);
+        return {
+            request: await this.requests.requestImport(org.orgId, p.account.id, body, tokenId !== undefined ? { actorTokenId: tokenId } : {}),
+        };
+    }
+    async setSwitch(principal, org, itemId, body) {
+        const p = requireUser(principal);
+        const r = await this.catalog.setSwitch(org.orgId, p.account.id, itemId, body.enabled
+            ? {
+                enabled: true,
+                ...(body.inputs !== undefined && {
+                    inputs: body.inputs,
+                }),
+            }
+            : { enabled: false, ...(body.confirm !== undefined && { confirm: body.confirm }) }, patTokenId(p));
+        return r.kind === "done" ? { item: r.item } : { preview: r.preview, confirm: r.confirm };
     }
     async install(principal, org, itemId, body, reply) {
         const p = requireUser(principal);
@@ -144,32 +212,55 @@ let OrgCatalogController = class OrgCatalogController {
         const { status: _status, ...rest } = r;
         return rest;
     }
-    async listInstalls(org) {
-        return { installs: await this.pluginInstaller.list(org.orgId) };
-    }
-    async uninstall(principal, org, installId) {
+    /**
+     * Creates the connectors an installed plugin is missing (ruling P2-10: a connector template on
+     * in the org without a connector there, e.g. added by a platform update; the plugin shows
+     * `needs_config`): `{ inputs: { connectors: { <templateId>: input } } }` with the same input
+     * checks as an install; recorded on the install -> 201 `{ connectors: [{ templateId,
+     * connectorId }] }`. Not installed -> 404 `plugin.install_not_found`; a template not missing ->
+     * 400 `validation_failed`.
+     */
+    async configureConnectors(principal, org, itemId, body) {
         const p = requireUser(principal);
         const tokenId = patTokenId(p);
-        return this.pluginInstaller.uninstall(org.orgId, p.account.id, installId, tokenId !== undefined ? { actorTokenId: tokenId } : {});
+        return {
+            connectors: await this.pluginInstaller.configureConnectors(org.orgId, p.account.id, itemId, body.inputs, tokenId !== undefined ? { actorTokenId: tokenId } : {}),
+        };
     }
-    upgradePreview(principal, org, installId, body) {
+    /**
+     * One more connector from a platform connector template on in the org (rulings P4-7, P4-T6-8):
+     * `{ name?, config: { slug?, endpoint?, credential?, client? } }` with the checks of an install
+     * -> 201 `{ connector, issues }` (as `POST connectors`). A template not usable in the org -> 404
+     * `component.not_found`; off there -> 409 `component.off`; input errors -> 400 at `config.*`.
+     */
+    async templateConnector(principal, org, templateId, body) {
         const p = requireUser(principal);
-        return this.catalog.upgradePreview(org.orgId, p.account.id, installId, body.version);
+        const tokenId = patTokenId(p);
+        return this.pluginInstaller.addTemplateConnector(org.orgId, p.account.id, templateId, {
+            config: body.config,
+            ...(body.name !== undefined && { name: body.name }),
+        }, tokenId !== undefined ? { actorTokenId: tokenId } : {});
+    }
+    async listInstalls(org) {
+        return { installs: await this.pluginInstaller.list(org.orgId) };
     }
-    async upgrade(principal, org, installId, body, reply) {
+    async uninstall(principal, org, installId) {
         const p = requireUser(principal);
-        const r = await this.catalog.upgrade(org.orgId, p.account.id, installId, body, patTokenId(p));
-        reply.status(r.status);
-        const { status: _status, ...rest } = r;
-        return rest;
+        const tokenId = patTokenId(p);
+        return this.catalog.uninstall(org.orgId, p.account.id, installId, tokenId);
     }
     async decide(principal, org, id, body) {
         const p = requireUser(principal);
         const tokenId = patTokenId(p);
         return {
-            request: await this.requests.decideOrg(org.orgId, p.account.id, id, body.decision, tokenId !== undefined ? { actorTokenId: tokenId } : {}),
+            request: await this.requests.decideOrg(org.orgId, p.account.id, id, body, tokenId !== undefined ? { actorTokenId: tokenId } : {}),
         };
     }
+    /** The requester dismisses a decided request from the inbox -> 204. */
+    async dismiss(principal, org, id) {
+        const p = requireUser(principal);
+        await this.requests.dismiss(org.orgId, p.account.id, id);
+    }
 };
 __decorate([
     Get("catalog"),
@@ -193,12 +284,29 @@ __decorate([
 ], OrgCatalogController.prototype, "icon", null);
 __decorate([
     Post("catalog/:itemId/requests"),
+    HttpCode(201),
     OrgAction("catalog.request"),
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("itemId")),
     __param(3, ZBody(CatalogRequestBody))
 ], OrgCatalogController.prototype, "request", null);
+__decorate([
+    Post("marketplace-requests"),
+    HttpCode(201),
+    OrgAction("catalog.decide"),
+    __param(0, CurrentPrincipal()),
+    __param(1, CurrentOrg()),
+    __param(2, ZBody(CatalogMarketplaceRequestBody))
+], OrgCatalogController.prototype, "marketplaceRequest", null);
+__decorate([
+    Put("catalog/:itemId/switch"),
+    OrgAction("catalog.read"),
+    __param(0, CurrentPrincipal()),
+    __param(1, CurrentOrg()),
+    __param(2, Param("itemId")),
+    __param(3, ZBody(OrgPluginSwitchBody))
+], OrgCatalogController.prototype, "setSwitch", null);
 __decorate([
     Post("catalog/:itemId/install"),
     OrgAction("catalog.read"),
@@ -208,6 +316,22 @@ __decorate([
     __param(3, ZBody(OrgPluginInstallBody)),
     __param(4, Res({ passthrough: true }))
 ], OrgCatalogController.prototype, "install", null);
+__decorate([
+    Post("catalog/:itemId/connectors"),
+    OrgAction("connectors.manage"),
+    __param(0, CurrentPrincipal()),
+    __param(1, CurrentOrg()),
+    __param(2, Param("itemId")),
+    __param(3, ZBody(OrgPluginConnectorsBody))
+], OrgCatalogController.prototype, "configureConnectors", null);
+__decorate([
+    Post("connector-templates/:templateId/connectors"),
+    OrgAction("connectors.manage"),
+    __param(0, CurrentPrincipal()),
+    __param(1, CurrentOrg()),
+    __param(2, Param("templateId")),
+    __param(3, ZBody(OrgTemplateConnectorBody))
+], OrgCatalogController.prototype, "templateConnector", null);
 __decorate([
     Get("plugin-installs"),
     OrgAction("org.extensions.manage"),
@@ -220,24 +344,6 @@ __decorate([
     __param(1, CurrentOrg()),
     __param(2, Param("installId"))
 ], OrgCatalogController.prototype, "uninstall", null);
-__decorate([
-    Post("plugin-installs/:installId/upgrade/preview"),
-    HttpCode(200),
-    OrgAction("catalog.read"),
-    __param(0, CurrentPrincipal()),
-    __param(1, CurrentOrg()),
-    __param(2, Param("installId")),
-    __param(3, ZBody(OrgPluginUpgradePreviewBody))
-], OrgCatalogController.prototype, "upgradePreview", null);
-__decorate([
-    Post("plugin-installs/:installId/upgrade"),
-    OrgAction("catalog.read"),
-    __param(0, CurrentPrincipal()),
-    __param(1, CurrentOrg()),
-    __param(2, Param("installId")),
-    __param(3, ZBody(OrgPluginUpgradeBody)),
-    __param(4, Res({ passthrough: true }))
-], OrgCatalogController.prototype, "upgrade", null);
 __decorate([
     Post("catalog-requests/:id/decide"),
     HttpCode(200),
@@ -247,6 +353,14 @@ __decorate([
     __param(2, Param("id")),
     __param(3, ZBody(CatalogDecideBody))
 ], OrgCatalogController.prototype, "decide", null);
+__decorate([
+    Post("catalog-requests/:id/dismiss"),
+    HttpCode(204),
+    OrgAction("catalog.read"),
+    __param(0, CurrentPrincipal()),
+    __param(1, CurrentOrg()),
+    __param(2, Param("id"))
+], OrgCatalogController.prototype, "dismiss", null);
 OrgCatalogController = __decorate([
     Controller("api/v1/orgs/:orgId"),
     __param(0, Inject(OrgCatalogService)),
@@ -254,7 +368,11 @@ OrgCatalogController = __decorate([
     __param(2, Inject(PluginInstaller))
 ], OrgCatalogController);
 export { OrgCatalogController };
-/** Enterprise admins decide deployment-level catalog requests (`/api/v1/admin/catalog/requests`). */
+/**
+ * Super admins decide `access` and `import` requests (`/api/v1/admin/catalog/requests`):
+ * approving an `import` returns the prepared import (`import: { stagingId, review, ... }`), confirmed
+ * with `POST /api/v1/admin/catalog/imports/:stagingId/confirm`.
+ */
 let AdminCatalogRequestsController = class AdminCatalogRequestsController {
     requests;
     constructor(requests) {
@@ -268,9 +386,7 @@ let AdminCatalogRequestsController = class AdminCatalogRequestsController {
     async decide(principal, id, body) {
         const p = requireUser(principal);
         const tokenId = patTokenId(p);
-        return {
-            request: await this.requests.decideDeployment(p.account.id, id, body.decision, tokenId !== undefined ? { actorTokenId: tokenId } : {}),
-        };
+        return this.requests.decideDeployment(p.account.id, id, body, tokenId !== undefined ? { actorTokenId: tokenId } : {});
     }
 };
 __decorate([
@@ -286,7 +402,7 @@ __decorate([
 ], AdminCatalogRequestsController.prototype, "decide", null);
 AdminCatalogRequestsController = __decorate([
     Controller("api/v1/admin/catalog/requests"),
-    EnterpriseAdmin(),
+    SuperAdmin(),
     __param(0, Inject(CatalogRequestsService))
 ], AdminCatalogRequestsController);
 export { AdminCatalogRequestsController };