@capybara-hq/kernel 0.1.0-rc.5 → 0.1.0-rc.7

package/dist/catalog/marketplaces.schemas.js

@@ -0,0 +1,53 @@
+import { z } from "zod";
+import { MARKETPLACE_MAX_MIRRORS } from "../config/schema.js";
+export const MarketplaceUrl = z.string().min(1).max(2000);
+export const MarketplaceForm = z.enum(["http", "git"]);
+export const MarketplaceRef = z.string().min(1).max(256);
+export const MarketplaceAddBody = z.object({
+    name: z.string().min(1).max(100),
+    url: MarketplaceUrl,
+    form: MarketplaceForm.optional(),
+    ref: MarketplaceRef.optional(),
+    mirrors: z.array(MarketplaceUrl).max(MARKETPLACE_MAX_MIRRORS).optional(),
+    token: z.string().min(1).max(4096).optional(),
+});
+export const MarketplaceEntriesQuery = z.object({
+    sourceId: z.string().min(1).max(100).optional(),
+    q: z.string().max(200).optional(),
+});
+export const MarketplacePatchBody = z
+    .object({
+    name: z.string().min(1).max(100).optional(),
+    url: MarketplaceUrl.optional(),
+    form: MarketplaceForm.optional(),
+    ref: MarketplaceRef.nullable().optional(),
+    mirrors: z.array(MarketplaceUrl).max(MARKETPLACE_MAX_MIRRORS).optional(),
+    enabled: z.boolean().optional(),
+    token: z.string().min(1).max(4096).nullable().optional(),
+})
+    .strict();
+export const MarketplaceImportBody = z.object({ version: z.string().min(1).max(256).optional() });
+/** `:id` of a marketplace as the routes take it (`@Param`). */
+export const MarketplaceIdPathParams = z.object({ id: z.string().min(1) });
+/** `:id` and the entry `:name` of the import route (`@Param`). */
+export const MarketplaceEntryPathParams = MarketplaceIdPathParams.extend({
+    name: z.string().min(1),
+});
+export const MARKETPLACE_ROUTES = [
+    { route: "GET /api/v1/admin/marketplaces" },
+    { route: "POST /api/v1/admin/marketplaces", body: MarketplaceAddBody },
+    { route: "GET /api/v1/orgs/:orgId/marketplaces/entries", query: MarketplaceEntriesQuery },
+    { route: "GET /api/v1/admin/marketplaces/entries", query: MarketplaceEntriesQuery },
+    {
+        route: "PATCH /api/v1/admin/marketplaces/:id",
+        params: MarketplaceIdPathParams,
+        body: MarketplacePatchBody,
+    },
+    { route: "DELETE /api/v1/admin/marketplaces/:id", params: MarketplaceIdPathParams },
+    { route: "POST /api/v1/admin/marketplaces/:id/refresh", params: MarketplaceIdPathParams },
+    {
+        route: "POST /api/v1/admin/marketplaces/:id/entries/:name/import",
+        params: MarketplaceEntryPathParams,
+        body: MarketplaceImportBody,
+    },
+];

package/dist/catalog/marketplaces.service.d.ts

@@ -181,7 +181,7 @@ export declare function headsToResolve(entries: readonly MarketplaceEntry[], imp
 /** The host versions (an entry's `minKernel` is judged against them). */
 export declare const HOST_VERSIONS: {
     readonly kernel: string;
-    readonly sdk: "0.1.0-rc.3";
+    readonly sdk: "0.1.0-rc.5";
 };
 /** Whether this deployment satisfies the entry's `minKernel`. */
 export declare const entryCompatible: (e: Pick<MarketplaceEntry, "minKernel">) => boolean;
@@ -297,6 +297,20 @@ export declare class MarketplacesService {
         mirrors?: string[];
         token?: string;
     }, opts?: ActorOpts): Promise<MarketplaceView>;
+    /**
+     * The read-only checks of {@link add}, for the `Platform` tool's precheck (before the card): the
+     * name, URL and git fields as `add` checks them (throws `validation_failed`), then the source
+     * that has the same URL and ref already, if any (adding a duplicate is allowed; the tool points
+     * the agent at the existing source instead).
+     */
+    checkAdd(input: {
+        name: string;
+        url: string;
+        ref?: string;
+    }): Promise<{
+        id: string;
+        name: string;
+    } | null>;
     private writeAdd;
     /**
      * Updates a custom marketplace (audit `marketplace.updated`, listing the changed fields, the

package/dist/catalog/marketplaces.service.js

@@ -496,6 +496,25 @@ let MarketplacesService = class MarketplacesService {
         await this.writeAdd(actor, id, { ...input, name, form, url }, opts);
         return this.get(id);
     }
+    /**
+     * The read-only checks of {@link add}, for the `Platform` tool's precheck (before the card): the
+     * name, URL and git fields as `add` checks them (throws `validation_failed`), then the source
+     * that has the same URL and ref already, if any (adding a duplicate is allowed; the tool points
+     * the agent at the existing source instead).
+     */
+    async checkAdd(input) {
+        this.checkName(input.name);
+        const { form, url } = marketplaceForm(input.url);
+        this.checkUrls(url, []);
+        this.checkGitFields(form, input.ref ?? null, []);
+        const same = await this.db
+            .selectFrom("marketplaces")
+            .select(["id", "name"])
+            .where("url", "=", url)
+            .where("ref", input.ref === undefined ? "is" : "=", input.ref ?? null)
+            .executeTakeFirst();
+        return same ?? null;
+    }
     async writeAdd(actor, id, input, opts) {
         const { name, url, form } = input;
         const t = this.db;
@@ -639,6 +658,7 @@ let MarketplacesService = class MarketplacesService {
                 ...(set.url !== undefined && { url: set.url }),
                 ...(set.form !== undefined && { form: set.form }),
                 ...(set.ref !== undefined && { ref: set.ref }),
+                ...opts.auditDetail,
             },
         });
     }
@@ -667,7 +687,7 @@ let MarketplacesService = class MarketplacesService {
             ...(opts.actorTokenId !== undefined && { actorTokenId: opts.actorTokenId }),
             action: "marketplace.removed",
             target: id,
-            detail: { name: row.name, url: row.url },
+            detail: { name: row.name, url: row.url, ...opts.auditDetail },
         });
     }
     /**
@@ -1204,6 +1224,7 @@ let MarketplacesService = class MarketplacesService {
                     from: cur.last_status,
                     to: status,
                     ...(lastError !== null && { error: lastError }),
+                    ...opts.auditDetail,
                 },
             });
         }

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

@@ -5,40 +5,10 @@ import { type OrgContext } from "../orgs/org.guard.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 { CatalogMarketplaceRequestBody, CatalogRequestBody, CatalogRequestsListQuery, OrgPluginInstallBody, OrgPluginSwitchBody } from "./org-catalog.schemas.js";
 import { OrgCatalogService } from "./org-catalog.service.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>;
-}, z.core.$strict>;
-/**
- * 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<{
-    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>;
 /** 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<{
@@ -70,24 +40,6 @@ declare const TemplateConnectorBody: z.ZodObject<{
         }, z.core.$strict>>;
     }, 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 禁止脚本与一切外部
  * 请求，nosniff 防浏览器按内容另行判型。
@@ -97,14 +49,6 @@ declare const DecideBody: z.ZodObject<{
     approve: z.ZodBoolean;
     reason: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
-declare const AdminListQuery: z.ZodObject<{
-    status: z.ZodOptional<z.ZodEnum<{
-        approved: "approved";
-        cancelled: "cancelled";
-        pending: "pending";
-        rejected: "rejected";
-    }>>;
-}, z.core.$strip>;
 /**
  * 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);
@@ -150,23 +94,23 @@ export declare class OrgCatalogController {
      * 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(principal: Principal, org: OrgContext, itemId: string, body: z.infer<typeof CatalogRequestBody>): Promise<{
         request: CatalogRequestView;
     }>;
     /**
      * 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<{
+    marketplaceRequest(principal: Principal, org: OrgContext, body: z.infer<typeof CatalogMarketplaceRequestBody>): Promise<{
         request: CatalogRequestView;
     }>;
-    setSwitch(principal: Principal, org: OrgContext, itemId: string, body: z.infer<typeof SwitchBody>): Promise<{
+    setSwitch(principal: Principal, org: OrgContext, itemId: string, body: z.infer<typeof OrgPluginSwitchBody>): 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">>;
+    install(principal: Principal, org: OrgContext, itemId: string, body: z.infer<typeof OrgPluginInstallBody>, 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
@@ -209,7 +153,7 @@ export declare class OrgCatalogController {
 export declare class AdminCatalogRequestsController {
     private readonly requests;
     constructor(requests: CatalogRequestsService);
-    list(q: z.infer<typeof AdminListQuery>): Promise<{
+    list(q: z.infer<typeof CatalogRequestsListQuery>): Promise<{
         requests: CatalogRequestView[];
     }>;
     decide(principal: Principal, id: string, body: z.infer<typeof DecideBody>): Promise<{

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

@@ -14,54 +14,14 @@ 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 { CatalogConnectorInput, CatalogMarketplaceRequestBody, CatalogRequestBody, CatalogRequestsListQuery, OrgPluginInstallBody, OrgPluginSwitchBody, } from "./org-catalog.schemas.js";
 import { OrgCatalogService } from "./org-catalog.service.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(),
-})
-    .strict();
-const ConnectorInput = z
-    .object({
-    name: z.string().trim().min(1).max(80).optional(),
-    slug: z.string().max(24).optional(),
-    endpoint: z.record(z.string(), z.unknown()).optional(),
-    credential: CredentialValue.optional(),
-    client: z
-        .object({
-        clientId: z.string().min(1).max(500),
-        clientSecret: z.string().min(1).max(4000).optional(),
-    })
-        .strict()
-        .optional(),
-})
-    .strict();
-/**
- * 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({
-    connectors: z.record(z.string(), ConnectorInput).optional(),
-    extensionConfig: z.record(z.string(), z.unknown()).optional(),
-})
-    .strict();
 /** The connectors body (ruling P2-10): the input of missing connectors, by template id, as at install. */
 const ConnectorsBody = z
     .object({
-    inputs: z.object({ connectors: z.record(z.string(), ConnectorInput) }).strict(),
+    inputs: z.object({ connectors: z.record(z.string(), CatalogConnectorInput) }).strict(),
 })
     .strict();
 /**
@@ -71,18 +31,7 @@ const ConnectorsBody = z
 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(),
+    config: CatalogConnectorInput.omit({ name: true }),
 })
     .strict();
 /**
@@ -100,24 +49,21 @@ export async function sendCatalogIcon(reply, icon) {
 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(),
-});
-class CatalogRequestsQuery extends createZodDto(AdminListQuery, "CatalogRequestsQuery") {
+class CatalogRequestsQuery extends createZodDto(CatalogRequestsListQuery, "CatalogRequestsQuery") {
 }
 class CatalogDecideBody extends createZodDto(DecideBody, "CatalogDecideBody") {
 }
-class OrgPluginInstallBody extends createZodDto(InstallBody, "OrgPluginInstallBody") {
+class OrgPluginInstallBodyDto extends createZodDto(OrgPluginInstallBody, "OrgPluginInstallBody") {
 }
 class OrgPluginConnectorsBody extends createZodDto(ConnectorsBody, "OrgPluginConnectorsBody") {
 }
-class OrgPluginSwitchBody extends createZodDto(SwitchBody, "OrgPluginSwitchBody") {
+class OrgPluginSwitchBodyDto extends createZodDto(OrgPluginSwitchBody, "OrgPluginSwitchBody") {
 }
 class OrgTemplateConnectorBody extends createZodDto(TemplateConnectorBody, "OrgTemplateConnectorBody") {
 }
-class CatalogRequestBody extends createZodDto(RequestBody, "CatalogRequestBody") {
+class CatalogRequestBodyDto extends createZodDto(CatalogRequestBody, "CatalogRequestBody") {
 }
-class CatalogMarketplaceRequestBody extends createZodDto(MarketplaceRequestBody, "CatalogMarketplaceRequestBody") {
+class CatalogMarketplaceRequestBodyDto extends createZodDto(CatalogMarketplaceRequestBody, "CatalogMarketplaceRequestBody") {
 }
 /**
  * The platform catalog from an organization's view (`/api/v1/orgs/:orgId/...`, human users only):
@@ -289,7 +235,7 @@ __decorate([
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("itemId")),
-    __param(3, ZBody(CatalogRequestBody))
+    __param(3, ZBody(CatalogRequestBodyDto))
 ], OrgCatalogController.prototype, "request", null);
 __decorate([
     Post("marketplace-requests"),
@@ -297,7 +243,7 @@ __decorate([
     OrgAction("catalog.decide"),
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
-    __param(2, ZBody(CatalogMarketplaceRequestBody))
+    __param(2, ZBody(CatalogMarketplaceRequestBodyDto))
 ], OrgCatalogController.prototype, "marketplaceRequest", null);
 __decorate([
     Put("catalog/:itemId/switch"),
@@ -305,7 +251,7 @@ __decorate([
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("itemId")),
-    __param(3, ZBody(OrgPluginSwitchBody))
+    __param(3, ZBody(OrgPluginSwitchBodyDto))
 ], OrgCatalogController.prototype, "setSwitch", null);
 __decorate([
     Post("catalog/:itemId/install"),
@@ -313,7 +259,7 @@ __decorate([
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("itemId")),
-    __param(3, ZBody(OrgPluginInstallBody)),
+    __param(3, ZBody(OrgPluginInstallBodyDto)),
     __param(4, Res({ passthrough: true }))
 ], OrgCatalogController.prototype, "install", null);
 __decorate([

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

@@ -0,0 +1,79 @@
+import { z } from "zod";
+import type { RouteSchemas } from "../platform/route-schemas.js";
+export declare const CatalogRequestBody: 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. */
+export declare const CatalogMarketplaceRequestBody: z.ZodObject<{
+    marketplaceId: z.ZodString;
+    name: z.ZodString;
+    version: z.ZodString;
+    note: z.ZodOptional<z.ZodString>;
+}, z.core.$strict>;
+export declare const CatalogConnectorInput: 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>;
+/**
+ * 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).
+ */
+export declare const OrgPluginInstallBody: 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>;
+/** The switch body: on (with the install inputs), or off (with the preview's hash to confirm). */
+export declare const OrgPluginSwitchBody: 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>;
+/** `:itemId` as the routes take it (`@Param`). */
+export declare const CatalogItemPathParams: z.ZodObject<{
+    itemId: z.ZodString;
+}, z.core.$strip>;
+/** `:installId` as the uninstall route takes it (`@Param`). */
+export declare const PluginInstallPathParams: z.ZodObject<{
+    installId: z.ZodString;
+}, z.core.$strip>;
+/** The super admin's request list filter. */
+export declare const CatalogRequestsListQuery: z.ZodObject<{
+    status: z.ZodOptional<z.ZodEnum<{
+        approved: "approved";
+        cancelled: "cancelled";
+        pending: "pending";
+        rejected: "rejected";
+    }>>;
+}, z.core.$strip>;
+export declare const ORG_CATALOG_ROUTES: readonly RouteSchemas[];

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

@@ -0,0 +1,82 @@
+import { z } from "zod";
+import { CredentialValue } from "../tools/connectors.schemas.js";
+export const CatalogRequestBody = 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. */
+export const CatalogMarketplaceRequestBody = 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(),
+})
+    .strict();
+export const CatalogConnectorInput = z
+    .object({
+    name: z.string().trim().min(1).max(80).optional(),
+    slug: z.string().max(24).optional(),
+    endpoint: z.record(z.string(), z.unknown()).optional(),
+    credential: CredentialValue.optional(),
+    client: z
+        .object({
+        clientId: z.string().min(1).max(500),
+        clientSecret: z.string().min(1).max(4000).optional(),
+    })
+        .strict()
+        .optional(),
+})
+    .strict();
+/**
+ * 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).
+ */
+export const OrgPluginInstallBody = z
+    .object({
+    connectors: z.record(z.string(), CatalogConnectorInput).optional(),
+    extensionConfig: z.record(z.string(), z.unknown()).optional(),
+})
+    .strict();
+/** The switch body: on (with the install inputs), or off (with the preview's hash to confirm). */
+export const OrgPluginSwitchBody = z
+    .object({
+    enabled: z.boolean(),
+    inputs: OrgPluginInstallBody.optional(),
+    confirm: z
+        .string()
+        .regex(/^[0-9a-f]{64}$/)
+        .optional(),
+})
+    .strict();
+/** `:itemId` as the routes take it (`@Param`). */
+export const CatalogItemPathParams = z.object({ itemId: z.string().min(1) });
+/** `:installId` as the uninstall route takes it (`@Param`). */
+export const PluginInstallPathParams = z.object({ installId: z.string().min(1) });
+/** The super admin's request list filter. */
+export const CatalogRequestsListQuery = z.object({
+    status: z.enum(["pending", "approved", "rejected", "cancelled"]).optional(),
+});
+export const ORG_CATALOG_ROUTES = [
+    { route: "GET /api/v1/orgs/:orgId/catalog" },
+    { route: "GET /api/v1/orgs/:orgId/catalog/:itemId", params: CatalogItemPathParams },
+    {
+        route: "POST /api/v1/orgs/:orgId/catalog/:itemId/requests",
+        params: CatalogItemPathParams,
+        body: CatalogRequestBody,
+    },
+    { route: "POST /api/v1/orgs/:orgId/marketplace-requests", body: CatalogMarketplaceRequestBody },
+    {
+        route: "PUT /api/v1/orgs/:orgId/catalog/:itemId/switch",
+        params: CatalogItemPathParams,
+        body: OrgPluginSwitchBody,
+    },
+    { route: "GET /api/v1/orgs/:orgId/plugin-installs" },
+    {
+        route: "DELETE /api/v1/orgs/:orgId/plugin-installs/:installId",
+        params: PluginInstallPathParams,
+    },
+    { route: "GET /api/v1/admin/catalog/requests", query: CatalogRequestsListQuery },
+];

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

@@ -1,4 +1,5 @@
 import { ExtensionRegistry } from "../extensions/registry.js";
+import { ExtensionAvailability } from "../extensions/unavailable.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
 import type { KernelLogger } from "../log.js";
@@ -35,9 +36,13 @@ export declare class OrgCatalogService {
     private readonly pluginInstaller;
     private readonly log;
     readonly txHost: TransactionHost;
+    /** Why a plugin's extension cannot run (the `unavailable` state's reason). */
+    private readonly availability;
     constructor(kdb: KernelDb, 
     /** The org row lock (orgs/org-lock.ts): joins the caller's transaction. */
-    orgLock: OrgLock, storage: StorageService, registry: ExtensionRegistry, pluginInstaller: PluginInstaller, log: KernelLogger, txHost: TransactionHost);
+    orgLock: OrgLock, storage: StorageService, registry: ExtensionRegistry, pluginInstaller: PluginInstaller, log: KernelLogger, txHost: TransactionHost, 
+    /** Why a plugin's extension cannot run (the `unavailable` state's reason). */
+    availability: ExtensionAvailability);
     /** The kernel-schema handle of the current context (the transaction, else the pool). */
     private get db();
     /**
@@ -99,7 +104,9 @@ export declare class OrgCatalogService {
      * install writes the switch row false in the uninstall's transaction (an `all` item then stays
      * off in the org); removing a failed or stale one writes none.
      */
-    uninstall(orgId: string, actor: string, installId: string, actorTokenId?: string): Promise<UninstallReport>;
+    uninstall(orgId: string, actor: string, installId: string, actorTokenId?: string, 
+    /** Merged into the audit detail (a write made through the Platform tool). */
+    auditDetail?: Record<string, unknown>): Promise<UninstallReport>;
     private itemOf;
     /**
      * Writes the org's switch row of the item under the org row lock. The item row is locked FOR