@capybara-hq/kernel 0.1.0-rc.14 → 0.1.0-rc.16

package/dist/platform/ops/catalog-admin.ops.d.ts

@@ -1,8 +1,10 @@
 import { type OnModuleInit } from "@nestjs/common";
+import { type AppearanceResult, AppearanceService } from "../../catalog/appearance.service.js";
 import { CatalogService } from "../../catalog/catalog.service.js";
 import { CatalogScopeService } from "../../catalog/catalog-scope.service.js";
 import { PluginImport, type PluginReview } from "../../catalog/plugin-import.js";
 import { KernelDb } from "../../infra/database/kernel-db.js";
+import { ThemesService } from "../../themes/themes.service.js";
 import { PlatformOperations } from "../registry.js";
 /** `plugins.set-shown` on a plugin an org owns. */
 export declare const ORG_OWNED = "An org owns this plugin and manages who sees it; the super admin changes that in the admin console, not here.";
@@ -41,6 +43,20 @@ export declare const reviewBrief: (r: PluginReview) => {
         resolved: string | null;
     }[];
 };
+/**
+ * The card of an "apply this plugin's appearance" operation (client extensions spec §6.5), from the
+ * route's dry run: the theme it sets (its name), the slots it replaces and how many were skipped.
+ */
+export declare function appearanceSummary(level: "platform" | "org", plugin: {
+    zh: string;
+    en: string;
+}, r: AppearanceResult, theme: {
+    zh: string;
+    en: string;
+} | null): {
+    zh: string;
+    en: string;
+};
 /**
  * The super admin's platform catalog operations of the `Platform` tool (spec §14.2, §14.5 item
  * 1): prepare an import from npm or git and read its review (a person confirms it on the web: the
@@ -55,7 +71,9 @@ export declare class CatalogAdminOperations implements OnModuleInit {
     private readonly scope;
     private readonly pluginImport;
     private readonly kdb;
-    constructor(registry: PlatformOperations, catalog: CatalogService, scope: CatalogScopeService, pluginImport: PluginImport, kdb: KernelDb);
+    private readonly appearance;
+    private readonly themes;
+    constructor(registry: PlatformOperations, catalog: CatalogService, scope: CatalogScopeService, pluginImport: PluginImport, kdb: KernelDb, appearance: AppearanceService, themes: ThemesService);
     /** The precheck refusal of another org's private plugin (the phase-1 rule), else null. */
     private otherOrgs;
     /** Whether an org owns the item (its owner org manages it, not the super admin's agent). */

package/dist/platform/ops/catalog-admin.ops.js

@@ -11,11 +11,13 @@ import { ToolError } from "@capybara-hq/plugin-sdk";
 import { Inject, Injectable } from "@nestjs/common";
 import { z } from "zod";
 import { CatalogDisabledBody, CatalogGitImportBody, CatalogIdPathParams, CatalogNpmImportBody, CatalogScope, CatalogScopeBody, CatalogScopeOrgs, CatalogShownBody, CatalogStagingPathParams, } from "../../catalog/admin-catalog.schemas.js";
+import { AppearanceService } from "../../catalog/appearance.service.js";
 import { CatalogService } from "../../catalog/catalog.service.js";
 import { CatalogScopeService } from "../../catalog/catalog-scope.service.js";
 import { PluginImport } from "../../catalog/plugin-import.js";
 import { ApiError } from "../../errors.js";
 import { KernelDb } from "../../infra/database/kernel-db.js";
+import { ThemesService } from "../../themes/themes.service.js";
 import { defineOperation } from "../operation.js";
 import { PlatformOperations } from "../registry.js";
 import { precheckBy, viaAgent } from "./errors.js";
@@ -64,6 +66,37 @@ export const reviewBrief = (r) => ({
 const conflictText = (cs) => cs
     .map((c) => `skill "${c.name}" is already used in org ${c.orgName} (${c.plugins.length > 0 ? `${c.plugins.length} plugin(s)` : "its own skill"})`)
     .join("; ");
+/**
+ * The card of an "apply this plugin's appearance" operation (client extensions spec §6.5), from the
+ * route's dry run: the theme it sets (its name), the slots it replaces and how many were skipped.
+ */
+export function appearanceSummary(level, plugin, r, theme) {
+    const zh = [];
+    const en = [];
+    if (r.theme !== null && theme !== null) {
+        zh.push(`${level === "platform" ? "平台" : "本组织"}默认主题改为「${theme.zh}」`);
+        en.push(`${level === "platform" ? "platform" : "org"} default theme becomes "${theme.en}"`);
+    }
+    if (r.replacements.length > 0) {
+        const slots = r.replacements.map((x) => x.slot).join(", ");
+        zh.push(`替换 ${slots}`);
+        en.push(`replaces ${slots}`);
+    }
+    if (r.skipped.length > 0) {
+        zh.push(`跳过 ${r.skipped.length} 项`);
+        en.push(`${r.skipped.length} skipped`);
+    }
+    if (zh.length === 0) {
+        return {
+            zh: `插件「${plugin.zh}」的外观已经应用，没有改动`,
+            en: `The appearance of plugin "${plugin.en}" is applied already; nothing changes`,
+        };
+    }
+    return {
+        zh: `应用插件「${plugin.zh}」的外观：${zh.join("；")}`,
+        en: `Apply the appearance of plugin "${plugin.en}": ${en.join("; ")}`,
+    };
+}
 /** A scope preview as the admin console shows it (orgs named); conflicting plugins counted. */
 const previewBrief = (p) => ({
     affected: p.affected,
@@ -93,12 +126,16 @@ let CatalogAdminOperations = class CatalogAdminOperations {
     scope;
     pluginImport;
     kdb;
-    constructor(registry, catalog, scope, pluginImport, kdb) {
+    appearance;
+    themes;
+    constructor(registry, catalog, scope, pluginImport, kdb, appearance, themes) {
         this.registry = registry;
         this.catalog = catalog;
         this.scope = scope;
         this.pluginImport = pluginImport;
         this.kdb = kdb;
+        this.appearance = appearance;
+        this.themes = themes;
     }
     /** The precheck refusal of another org's private plugin (the phase-1 rule), else null. */
     async otherOrgs(itemId, orgId) {
@@ -585,6 +622,50 @@ let CatalogAdminOperations = class CatalogAdminOperations {
                     return { deleted: input.itemId };
                 },
             }),
+            defineOperation({
+                id: "plugins.platform-apply-appearance",
+                description: "Apply a platform plugin's suggested appearance (super admin; the admin console's 应用此插件的外观): in one step, its theme becomes the platform default theme and each component it suggests replaces the built-in block of its slot (shell.brand, conversation.empty, conversation.composer.frame) in the platform arrangement; orgs that set their own keep theirs. The card shows exactly what changes; a theme that cannot be the platform default (scope not all, or off in an org) refuses the whole call, a component that is not available is skipped. Asked every time, never remembered.",
+                input: z.object({ itemId: ItemId }).strict(),
+                example: { itemId: "3f1c2a9e-5b7d-4e21-9c0a-1d2e3f4a5b6c" },
+                authz: { superAdmin: true },
+                mirrors: ["POST /api/v1/admin/catalog/items/:id/appearance"],
+                renames: { itemId: "id" },
+                // the route's dry run is this operation's card and precheck, never a confirmed call
+                omits: ["dryRun"],
+                confirm: "platform",
+                rememberable: false,
+                errors: [
+                    {
+                        code: "catalog.item_not_found",
+                        next: "Check the plugin id with plugins.platform-list; only a plugin whose plugin.json has suggestedAppearance can be applied.",
+                    },
+                    {
+                        code: "theme.not_available",
+                        next: "The plugin's theme cannot be the platform default: give it scope all (plugins.component-scope-preview, then plugins.set-component-scope) and make sure no org switched it off, then apply again.",
+                    },
+                ],
+                precheck: async (i, ctx) => {
+                    const other = await this.otherOrgs(i.itemId, ctx.orgId);
+                    if (other !== null)
+                        return other;
+                    return precheckBy(() => this.appearance.apply({ platform: true }, i.itemId, { accountId: ctx.actorAccountId }, true));
+                },
+                summary: async (i, ctx) => {
+                    const [n, r] = await Promise.all([
+                        this.names(i.itemId),
+                        this.appearance.apply({ platform: true }, i.itemId, { accountId: ctx.actorAccountId }, true),
+                    ]);
+                    const theme = r.theme && localized(await this.themes.nameOf(r.theme.to), r.theme.to);
+                    return appearanceSummary("platform", n, r, theme);
+                },
+                run: async (input, ctx) => {
+                    await assertNotOtherOrgs(this.kdb.db, input.itemId, ctx.orgId);
+                    return this.appearance.apply({ platform: true }, input.itemId, {
+                        accountId: ctx.actorAccountId,
+                        auditDetail: viaAgent("plugins.platform-apply-appearance", ctx),
+                    }, false);
+                },
+            }),
         ]);
     }
 };
@@ -594,6 +675,8 @@ CatalogAdminOperations = __decorate([
     __param(1, Inject(CatalogService)),
     __param(2, Inject(CatalogScopeService)),
     __param(3, Inject(PluginImport)),
-    __param(4, Inject(KernelDb))
+    __param(4, Inject(KernelDb)),
+    __param(5, Inject(AppearanceService)),
+    __param(6, Inject(ThemesService))
 ], CatalogAdminOperations);
 export { CatalogAdminOperations };

package/dist/platform/ops/org-plugins.ops.d.ts

@@ -1,10 +1,12 @@
 import { type OnModuleInit } from "@nestjs/common";
+import { AppearanceService } from "../../catalog/appearance.service.js";
 import { CatalogScopeService } from "../../catalog/catalog-scope.service.js";
 import { OrgCatalogService } from "../../catalog/org-catalog.service.js";
 import { OrgPluginUploads } from "../../catalog/org-plugin-uploads.js";
 import { OwnedItems } from "../../catalog/owned-items.js";
 import { PluginInstaller } from "../../catalog/plugin-install.js";
 import { KernelDb } from "../../infra/database/kernel-db.js";
+import { ThemesService } from "../../themes/themes.service.js";
 import { PlatformOperations } from "../registry.js";
 /**
  * The org's own plugin operations of the `Platform` tool (spec §14.2): the org's plugin installs
@@ -20,7 +22,11 @@ export declare class OrgPluginsOperations implements OnModuleInit {
     private readonly owned;
     private readonly scope;
     private readonly kdb;
-    constructor(registry: PlatformOperations, installer: PluginInstaller, orgCatalog: OrgCatalogService, uploads: OrgPluginUploads, owned: OwnedItems, scope: CatalogScopeService, kdb: KernelDb);
+    private readonly appearance;
+    private readonly themes;
+    constructor(registry: PlatformOperations, installer: PluginInstaller, orgCatalog: OrgCatalogService, uploads: OrgPluginUploads, owned: OwnedItems, scope: CatalogScopeService, kdb: KernelDb, appearance: AppearanceService, themes: ThemesService);
+    /** The display name of the live plugin of `extension`, or the name when it cannot be read. */
+    private pluginNames;
     /** The org's own live plugin `id`, or null (another org's, a platform one, deleted, unknown). */
     private ownedItem;
     /** The precheck refusal of a plugin the org does not own. */

package/dist/platform/ops/org-plugins.ops.js

@@ -9,20 +9,23 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { Inject, Injectable } from "@nestjs/common";
 import { z } from "zod";
+import { AppearanceService } from "../../catalog/appearance.service.js";
 import { CatalogScopeService } from "../../catalog/catalog-scope.service.js";
 import { PluginInstallPathParams } from "../../catalog/org-catalog.schemas.js";
 import { OrgCatalogService } from "../../catalog/org-catalog.service.js";
+import { OrgExtensionParams } from "../../catalog/org-extension.schemas.js";
 import { OrgPluginUploads } from "../../catalog/org-plugin-uploads.js";
 import { OrgOwnedDeleteBody, OrgOwnedPluginParams, OrgOwnedShareableBody, OrgUploadStagingParams, } from "../../catalog/org-plugin-uploads.schemas.js";
 import { OwnedItems } from "../../catalog/owned-items.js";
 import { PluginInstaller } from "../../catalog/plugin-install.js";
 import { KernelDb } from "../../infra/database/kernel-db.js";
+import { ThemesService } from "../../themes/themes.service.js";
 import { defineOperation } from "../operation.js";
 import { PlatformOperations } from "../registry.js";
-import { reviewBrief } from "./catalog-admin.ops.js";
+import { appearanceSummary, reviewBrief } from "./catalog-admin.ops.js";
 import { precheckBy, viaAgent } from "./errors.js";
 import { Cursor, pageOf, startOf } from "./paging.js";
-import { named } from "./summary.js";
+import { localized, named, orElse } from "./summary.js";
 const InstallId = PluginInstallPathParams.shape.installId.max(100);
 /** An org-owned plugin's catalog item id (`:id` of the owned-plugins routes). */
 const OwnedId = OrgOwnedPluginParams.shape.id;
@@ -51,7 +54,9 @@ let OrgPluginsOperations = class OrgPluginsOperations {
     owned;
     scope;
     kdb;
-    constructor(registry, installer, orgCatalog, uploads, owned, scope, kdb) {
+    appearance;
+    themes;
+    constructor(registry, installer, orgCatalog, uploads, owned, scope, kdb, appearance, themes) {
         this.registry = registry;
         this.installer = installer;
         this.orgCatalog = orgCatalog;
@@ -59,6 +64,20 @@ let OrgPluginsOperations = class OrgPluginsOperations {
         this.owned = owned;
         this.scope = scope;
         this.kdb = kdb;
+        this.appearance = appearance;
+        this.themes = themes;
+    }
+    /** The display name of the live plugin of `extension`, or the name when it cannot be read. */
+    pluginNames(extension) {
+        return orElse(async () => {
+            const row = await this.kdb.db
+                .selectFrom("catalog_items")
+                .select("display_name")
+                .where("name", "=", extension)
+                .where("deleted_at", "is", null)
+                .executeTakeFirst();
+            return localized(row?.display_name, extension);
+        }, { zh: named(extension), en: named(extension) });
     }
     /** The org's own live plugin `id`, or null (another org's, a platform one, deleted, unknown). */
     async ownedItem(orgId, id) {
@@ -313,6 +332,44 @@ let OrgPluginsOperations = class OrgPluginsOperations {
                     return { withdrawn: input.itemId };
                 },
             }),
+            defineOperation({
+                id: "plugins.apply-appearance",
+                description: "Apply a plugin's suggested appearance in this org (org admins; the 扩展 page's 应用此插件的外观), for a plugin whose extension is on here: in one step, its theme becomes the org's default theme (whether members may pick their own stays as it is) and each component it suggests replaces the built-in block of its slot (shell.brand, conversation.empty, conversation.composer.frame) in the org's arrangement. The card shows exactly what changes; a theme that is not on in the org refuses the whole call, a component that is not available is skipped. Asked every time, never remembered.",
+                input: z.object({ extension: OrgExtensionParams.shape.extension }).strict(),
+                example: { extension: "theme-cyberpunk" },
+                authz: { orgAction: "org.update" },
+                mirrors: ["POST /api/v1/orgs/:orgId/extensions/:extension/appearance"],
+                // the route's dry run is this operation's card and precheck, never a confirmed call
+                omits: ["dryRun"],
+                confirm: "org",
+                rememberable: false,
+                errors: [
+                    {
+                        code: "extension.not_found",
+                        next: "Check the extension with extensions.list: it must be on in this org and its plugin must suggest an appearance.",
+                    },
+                    {
+                        code: "theme.not_available",
+                        next: {
+                            orgAdmin: "The plugin's theme is not on in this org: switch it on in the org's appearance settings on the web, or ask the super admin to offer it to this org, then apply again.",
+                            member: "Ask an org admin to switch the plugin's theme on in this org first.",
+                        },
+                    },
+                ],
+                precheck: (i, ctx) => precheckBy(() => this.appearance.apply({ orgId: ctx.orgId }, i.extension, { accountId: ctx.actorAccountId }, true)),
+                summary: async (i, ctx) => {
+                    const [n, r] = await Promise.all([
+                        this.pluginNames(i.extension),
+                        this.appearance.apply({ orgId: ctx.orgId }, i.extension, { accountId: ctx.actorAccountId }, true),
+                    ]);
+                    const theme = r.theme && localized(await this.themes.nameIn(ctx.orgId, r.theme.to), r.theme.to);
+                    return appearanceSummary("org", n, r, theme);
+                },
+                run: async (input, ctx) => this.appearance.apply({ orgId: ctx.orgId }, input.extension, {
+                    accountId: ctx.actorAccountId,
+                    auditDetail: viaAgent("plugins.apply-appearance", ctx),
+                }, false),
+            }),
         ]);
     }
 };
@@ -324,6 +381,8 @@ OrgPluginsOperations = __decorate([
     __param(3, Inject(OrgPluginUploads)),
     __param(4, Inject(OwnedItems)),
     __param(5, Inject(CatalogScopeService)),
-    __param(6, Inject(KernelDb))
+    __param(6, Inject(KernelDb)),
+    __param(7, Inject(AppearanceService)),
+    __param(8, Inject(ThemesService))
 ], OrgPluginsOperations);
 export { OrgPluginsOperations };

package/dist/platform/ops/org-settings.ops.js

@@ -39,7 +39,7 @@ let OrgSettingsOperations = class OrgSettingsOperations {
         this.registry.register([
             defineOperation({
                 id: "org-settings.get",
-                description: "Read this org's settings: toolSearch, locale, sandboxToolPolicy, platformTool (on, read-only or off), sandboxEgress and wakeOnBackgroundTask (absent means it follows the deployment), theme (the org's default theme id, null or absent following the platform, and personal: allowed or locked), uiArrangement (per UI slot, the extension contributions the org hides and their order; a slot not listed follows the platform), the deployment's sandbox egress default and the sandbox cpu / memory limits in effect.",
+                description: "Read this org's settings: toolSearch, locale, sandboxToolPolicy, platformTool (on, read-only or off), sandboxEgress and wakeOnBackgroundTask (absent means it follows the deployment), theme (the org's default theme id, null or absent following the platform, and personal: allowed or locked), uiArrangement (per list slot, the extension contributions the org hides and their order; per single slot, the contribution that replaces the built-in as use, null for the built-in; a slot not listed follows the platform), the deployment's sandbox egress default and the sandbox cpu / memory limits in effect.",
                 input: z.object({}).strict(),
                 example: {},
                 authz: { orgAction: "org.read" },
@@ -53,7 +53,7 @@ let OrgSettingsOperations = class OrgSettingsOperations {
             }),
             defineOperation({
                 id: "org-settings.update",
-                description: "Change this org's settings (org admins). Give only the settings to change; null clears sandboxEgress or wakeOnBackgroundTask so they follow the deployment again. theme: { id, personal } sets the org's default theme (a theme id from themes.list, or null to follow the platform) and whether members may pick their own (allowed) or not (locked); null clears it. uiArrangement: { <slot>: { hidden, order } } replaces that slot's entry, where hidden and order list contribution keys <extension>/<contribution> (hidden ones are not listed in the web UI but their pages still open by URL); null for a slot makes it follow the platform again; platform.page is refused. Setting platformTool to off or read-only takes effect from the next call and cuts this Platform tool off in the org, so say so before asking; an org admin switches it back on in the web settings.",
+                description: "Change this org's settings (org admins). Give only the settings to change; null clears sandboxEgress or wakeOnBackgroundTask so they follow the deployment again. theme: { id, personal } sets the org's default theme (a theme id from themes.list, or null to follow the platform) and whether members may pick their own (allowed) or not (locked); null clears it. uiArrangement: { <slot>: { hidden, order } } (a list slot) or { <slot>: { use } } (a single slot: shell.brand, conversation.empty, conversation.composer.frame) replaces that slot's entry, where hidden, order and use name contribution keys <extension>/<contribution> (hidden ones are not listed in the web UI but their pages still open by URL; use null is the built-in); null for a slot makes it follow the platform again; platform.page is refused. Setting platformTool to off or read-only takes effect from the next call and cuts this Platform tool off in the org, so say so before asking; an org admin switches it back on in the web settings.",
                 input: OrgSettingsPatchSchema.refine((i) => Object.values(i).some((v) => v !== undefined), {
                     message: "give at least one setting",
                 }),

package/dist/platform/ops/orgs.ops.js

@@ -160,6 +160,7 @@ let OrgsOperations = class OrgsOperations {
                     "orgMarketplaceBrowse",
                     "uiTheme",
                     "uiArrangement",
+                    "clientExtensions",
                 ],
                 extras: ["orgId", "runConcurrency", "sandbox", "subagents"],
                 confirm: "platform",

package/dist/platform/ops/ui.ops.js

@@ -22,7 +22,7 @@ let UiOperations = class UiOperations {
         this.registry.register([
             defineOperation({
                 id: "ui.slots",
-                description: "List the UI slots an extension can contribute to (id, version, where it is, scope and args, accepted kinds view / embed, minimum role, anchors). Use a slot id as a ui contribution's `slot` in a plugin manifest.",
+                description: "List the UI slots an extension can contribute to (id, version, where it is, scope and args, accepted kinds view / embed / component, cardinality list or single, minimum role, anchors). Use a slot id as a ui contribution's `slot` in a plugin manifest.",
                 input: z.object({}).strict(),
                 example: {},
                 // any signed-in person may call the route; every run's actor is a member of this org

package/dist/platform/platform-ops.module.js

@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { Module } from "@nestjs/common";
 import { AgentsModule } from "../agents/agents.module.js";
 import { BackgroundModule } from "../background/background.module.js";
+import { AppearanceModule } from "../catalog/appearance.service.js";
 import { CatalogModule } from "../catalog/catalog.module.js";
 import { ChannelsModule } from "../channels/channels.module.js";
 import { ConversationsModule } from "../conversations/conversations.module.js";
@@ -114,6 +115,7 @@ PlatformOpsModule = __decorate([
             AgentsModule,
             OrgsModule,
             CatalogModule,
+            AppearanceModule,
             ExtensionsModule,
             ToolsModule,
             ConversationsModule,

package/dist/platform/route-schemas.js

@@ -4,6 +4,7 @@ import { AGENT_ROUTES } from "../agents/agents.schemas.js";
 import { AGENT_TEMPLATE_ROUTES } from "../agents/templates.schemas.js";
 import { BACKGROUND_ROUTES } from "../background/background.schemas.js";
 import { ADMIN_CATALOG_ROUTES } from "../catalog/admin-catalog.schemas.js";
+import { APPEARANCE_ROUTES } from "../catalog/appearance.schemas.js";
 import { COMPONENT_SCOPE_ROUTES } from "../catalog/component-scope.schemas.js";
 import { MARKETPLACE_ROUTES } from "../catalog/marketplaces.schemas.js";
 import { ORG_CATALOG_ROUTES } from "../catalog/org-catalog.schemas.js";
@@ -66,6 +67,8 @@ export const ROUTE_SCHEMAS = [
     ...ME_ROUTES,
     // themes (themes spec §9)
     ...THEME_ROUTES,
+    // a plugin's suggested appearance (client extensions spec §6.5)
+    ...APPEARANCE_ROUTES,
     // setup guide checks (setup guides v2 §10.3, §12)
     ...SETUP_CHECK_ROUTES,
     ...SETUP_GUIDE_ROUTES,

package/dist/roles/worker.module.js

@@ -14,6 +14,8 @@ import { PlatformMigration } from "../catalog/platform-migration.js";
 import { PluginScopeWorkersModule } from "../catalog/scope-sync-workers.js";
 import { ChannelsModule, ChannelWorkersModule } from "../channels/channels.module.js";
 import { GatewayCheckJob } from "../channels/supervisor.js";
+import { ClientModule } from "../client/client.module.js";
+import { ClientReportsCron } from "../client/client-reports.cron.js";
 import { AttachmentsModule } from "../conversations/attachments.module.js";
 import { AttachmentCleanupJob } from "../conversations/attachments.service.js";
 import { EventLogModule } from "../conversations/event-log.js";
@@ -55,6 +57,7 @@ let WorkerModule = WorkerModule_1 = class WorkerModule {
             module: WorkerModule_1,
             imports: [
                 KernelScheduleModule,
+                ClientModule,
                 // the queue consumers (their worker options come from the startup config)
                 RuntimeWorkersModule.forRoot(config),
                 EvalWorkersModule.forRoot(config),
@@ -87,6 +90,7 @@ let WorkerModule = WorkerModule_1 = class WorkerModule {
                 BackgroundTaskPollJob,
                 ToolJobs,
                 InitialPasswordCleanupJob,
+                ClientReportsCron,
                 CatalogJobs,
                 PlatformMigration,
                 DirectoryScanJob,

package/dist/themes/render-css.d.ts

@@ -7,6 +7,7 @@ import { type ParsedTheme } from "@capybara-hq/plugin-sdk";
  * the theme's families first, then the built-in stack. Every stored value is re-validated (token
  * names against the overridable list, values against the SDK grammar, radius 0-16, families,
  * paths, weights, styles, roles); one that fails is left out, and `onSkipped` (when given and
- * something was skipped) is called once with the paths of every skipped value.
+ * something was skipped) is called once with the paths of every skipped value. The whole
+ * stylesheet is one `@layer theme { … }` block (client extensions spec §7.2).
  */
 export declare function renderThemeCss(theme: ParsedTheme, assetUrl: (pluginPath: string) => string, onSkipped?: (paths: string[]) => void): string;

package/dist/themes/render-css.js

@@ -73,7 +73,8 @@ const declarations = (d, extra = []) => [...extra, ...[...d].map(([k, v]) => `${
  * the theme's families first, then the built-in stack. Every stored value is re-validated (token
  * names against the overridable list, values against the SDK grammar, radius 0-16, families,
  * paths, weights, styles, roles); one that fails is left out, and `onSkipped` (when given and
- * something was skipped) is called once with the paths of every skipped value.
+ * something was skipped) is called once with the paths of every skipped value. The whole
+ * stylesheet is one `@layer theme { … }` block (client extensions spec §7.2).
  */
 export function renderThemeCss(theme, assetUrl, onSkipped) {
     const skipped = [];
@@ -128,5 +129,7 @@ export function renderThemeCss(theme, assetUrl, onSkipped) {
         rules.push(`:root { ${stacks.join(" ")} }`);
     if (skipped.length > 0)
         onSkipped?.(skipped);
-    return `${rules.join("\n")}\n`;
+    // One block in the `theme` cascade layer (client extensions spec §7.2): the design stylesheet
+    // declares the order design, theme, extensions; an unlayered theme would beat plugin CSS.
+    return `@layer theme {\n${rules.join("\n")}\n}\n`;
 }

package/dist/themes/theme-delivery.service.d.ts

@@ -22,9 +22,11 @@ export declare class ThemeDeliveryService {
     /**
      * The stylesheet of version `version` of theme `id` ({@link renderThemeCss}, asset URLs from
      * {@link themeUrl}); a stored value that fails re-validation is left out with one warning per
-     * render naming every skipped value. Unknown theme or version: 404 `theme.not_found`.
+     * render naming every skipped value. Unknown theme or version, or a `revision` other than the
+     * current `r<THEME_CSS_REVISION>` (an older one promised another format; a later one belongs to a
+     * newer replica): 404 `theme.not_found`, never cached.
      */
-    stylesheet(id: string, version: string): Promise<string>;
+    stylesheet(id: string, version: string, revision: string): Promise<string>;
     /**
      * Asset `file` (a path inside the plugin, as stored: `fonts/MiSans.woff2`) of version `version`
      * of theme `id`: only a font or logo the version's definition names. Unknown theme, version or

package/dist/themes/theme-delivery.service.js

@@ -15,7 +15,7 @@ import { KERNEL_LOGGER } from "../infra/tokens.js";
 import { packagePath } from "../packages/tgz.js";
 import { StorageService } from "../storage/storage.service.js";
 import { renderThemeCss } from "./render-css.js";
-import { themeUrl } from "./theme-state.js";
+import { THEME_CSS_REVISION, themeUrl } from "./theme-state.js";
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 /** A version number as it appears in a delivery URL: a positive int4. */
 const VERSION_RE = /^[1-9]\d{0,9}$/;
@@ -61,9 +61,14 @@ let ThemeDeliveryService = class ThemeDeliveryService {
     /**
      * The stylesheet of version `version` of theme `id` ({@link renderThemeCss}, asset URLs from
      * {@link themeUrl}); a stored value that fails re-validation is left out with one warning per
-     * render naming every skipped value. Unknown theme or version: 404 `theme.not_found`.
+     * render naming every skipped value. Unknown theme or version, or a `revision` other than the
+     * current `r<THEME_CSS_REVISION>` (an older one promised another format; a later one belongs to a
+     * newer replica): 404 `theme.not_found`, never cached.
      */
-    async stylesheet(id, version) {
+    async stylesheet(id, version, revision) {
+        if (revision !== `r${THEME_CSS_REVISION}`) {
+            throw notFound(`Theme ${id} version ${version} stylesheet revision ${revision}`);
+        }
         const { definition } = await this.version(id, version);
         return renderThemeCss(definition, (path) => themeUrl(id, version, path), (skipped) => this.log.warn("theme stylesheet: stored values failed re-validation and were left out", {
             themeId: id,

package/dist/themes/theme-state.d.ts

@@ -6,6 +6,11 @@ import { ApiError } from "../errors.js";
 export interface ThemeRef {
     /** The `platform_themes` id (what settings and picks store). */
     id: string;
+    /**
+     * `"<plugin>/<theme file id>"`: the name the web's `theme=` state token and `useTheme()` carry
+     * (client extensions spec §7.3). Stable across versions, unlike `id`.
+     */
+    key: string;
     /** Its current version. */
     version: string;
     name: LocalizedName;
@@ -19,7 +24,7 @@ export interface ThemeRef {
         wordmark: string | null;
         faviconUrl: string | null;
     } | null;
-    /** `/api/v1/themes/<id>/<version>/theme.css`. */
+    /** `/api/v1/themes/<id>/<version>/r<THEME_CSS_REVISION>/theme.css`. */
     cssUrl: string;
 }
 /** The four colors a theme picker draws per scheme. */
@@ -34,24 +39,40 @@ export type ListedTheme = ThemeRef & {
     swatches: Partial<Record<ThemeScheme, ThemeSwatch>>;
 };
 /**
- * The delivery URL of a theme version (spec §8): its stylesheet, or with `asset` (a path inside the
+ * The render revision of theme stylesheets, a segment of the stylesheet URL (`r<N>/theme.css`).
+ * The stylesheet is cached as immutable for a year, keyed by its URL: bump this whenever
+ * `renderThemeCss`'s output format changes, so no browser keeps an older format under a URL
+ * that now means the new one. The delivery route serves only the current revision (404
+ * `theme.not_found` otherwise). History: (none, `<version>/theme.css`) plain rules; 2: one
+ * `@layer theme { … }` block (client extensions spec §7.2).
+ */
+export declare const THEME_CSS_REVISION = 2;
+/**
+ * The delivery URL of a theme version (spec §8): its stylesheet (with the render revision,
+ * {@link THEME_CSS_REVISION}), or with `asset` (a path inside the
  * plugin as the theme file names it, e.g. `./fonts/MiSans.woff2`) that asset, as one path segment
  * (`assets/fonts%2FMiSans.woff2`; the route decodes it back to the stored path `fonts/MiSans.woff2`).
  * The one builder of these URLs: the listing, the stylesheet and the asset routes all use it.
  */
 export declare function themeUrl(id: string, version: string, asset?: string): string;
-/** The {@link ThemeRef} of version `version` of theme `id`. */
-export declare function themeRefOf(id: string, version: string, def: ParsedTheme): ThemeRef;
+/**
+ * The {@link ThemeRef} of version `version` of theme `id` of plugin `plugin` (null only for a row
+ * without provenance: the key is then the file id alone).
+ */
+export declare function themeRefOf(id: string, version: string, def: ParsedTheme, plugin: string | null): ThemeRef;
 /**
  * The swatches of each scheme the theme defines: its overrides merged onto the current built-in
  * values (a stored definition holds only the theme file's own values, themes spec §6).
  */
 export declare function themeSwatches(def: ParsedTheme): Partial<Record<ThemeScheme, ThemeSwatch>>;
-/** The current definitions of live themes `ids`, by id. */
-export declare function themeDefinitions(db: KernelSchemaDb, ids: readonly string[]): Promise<Map<string, {
+/** A live theme's current definition and its plugin (null: no provenance). */
+export interface ThemeDefinition {
     version: string;
     definition: ParsedTheme;
-}>>;
+    plugin: string | null;
+}
+/** The current definitions of live themes `ids`, by id. */
+export declare function themeDefinitions(db: KernelSchemaDb, ids: readonly string[]): Promise<Map<string, ThemeDefinition>>;
 /** The live themes on in the org, sorted by id. */
 export declare function themesOnIn(db: KernelSchemaDb, orgId: string): Promise<ComponentRow[]>;
 /** The live theme `id` if it can be the platform default, else null. */

package/dist/themes/theme-state.js

@@ -9,7 +9,17 @@ import { packagePath } from "../packages/tgz.js";
 /** The schemes in the order they are listed. */
 const SCHEMES = ["dark", "light"];
 /**
- * The delivery URL of a theme version (spec §8): its stylesheet, or with `asset` (a path inside the
+ * The render revision of theme stylesheets, a segment of the stylesheet URL (`r<N>/theme.css`).
+ * The stylesheet is cached as immutable for a year, keyed by its URL: bump this whenever
+ * `renderThemeCss`'s output format changes, so no browser keeps an older format under a URL
+ * that now means the new one. The delivery route serves only the current revision (404
+ * `theme.not_found` otherwise). History: (none, `<version>/theme.css`) plain rules; 2: one
+ * `@layer theme { … }` block (client extensions spec §7.2).
+ */
+export const THEME_CSS_REVISION = 2;
+/**
+ * The delivery URL of a theme version (spec §8): its stylesheet (with the render revision,
+ * {@link THEME_CSS_REVISION}), or with `asset` (a path inside the
  * plugin as the theme file names it, e.g. `./fonts/MiSans.woff2`) that asset, as one path segment
  * (`assets/fonts%2FMiSans.woff2`; the route decodes it back to the stored path `fonts/MiSans.woff2`).
  * The one builder of these URLs: the listing, the stylesheet and the asset routes all use it.
@@ -17,14 +27,18 @@ const SCHEMES = ["dark", "light"];
 export function themeUrl(id, version, asset) {
     const base = `/api/v1/themes/${encodeURIComponent(id)}/${encodeURIComponent(version)}`;
     return asset === undefined
-        ? `${base}/theme.css`
+        ? `${base}/r${THEME_CSS_REVISION}/theme.css`
         : `${base}/assets/${encodeURIComponent(packagePath(asset))}`;
 }
-/** The {@link ThemeRef} of version `version` of theme `id`. */
-export function themeRefOf(id, version, def) {
+/**
+ * The {@link ThemeRef} of version `version` of theme `id` of plugin `plugin` (null only for a row
+ * without provenance: the key is then the file id alone).
+ */
+export function themeRefOf(id, version, def, plugin) {
     const url = (ref) => (ref === undefined ? null : themeUrl(id, version, ref));
     return {
         id,
+        key: plugin === null ? def.id : `${plugin}/${def.id}`,
         version,
         name: def.name,
         schemes: SCHEMES.filter((s) => def.schemes[s] !== undefined),
@@ -62,12 +76,16 @@ export async function themeDefinitions(db, ids) {
     const rows = await db
         .selectFrom("platform_themes as p")
         .innerJoin("platform_theme_versions as v", (j) => j.onRef("v.theme_id", "=", "p.id").onRef("v.version", "=", "p.current_version"))
-        .select(["p.id", "p.current_version", "v.definition"])
+        .select(["p.id", "p.current_version", "p.plugin_name", "v.definition"])
         .where("p.id", "in", [...ids])
         .where("p.deleted_at", "is", null)
         .execute();
     for (const r of rows) {
-        out.set(r.id, { version: String(r.current_version), definition: r.definition });
+        out.set(r.id, {
+            version: String(r.current_version),
+            definition: r.definition,
+            plugin: r.plugin_name,
+        });
     }
     return out;
 }

package/dist/themes/themes-public.controller.d.ts

@@ -10,8 +10,13 @@ import { ThemesService } from "./themes.service.js";
 export declare class ThemeDeliveryController {
     private readonly delivery;
     constructor(delivery: ThemeDeliveryService);
-    /** The version's stylesheet: scheme overrides, `@font-face` rules and font stacks. */
-    css(id: string, version: string, reply: FastifyReply): Promise<void>;
+    /**
+     * The version's stylesheet: scheme overrides, `@font-face` rules and font stacks, in the render
+     * revision `revision` (`r<THEME_CSS_REVISION>`; only the current one is served). The URL without
+     * a revision (before revision 2) has no route: 404, so a browser's cached unlayered copy is never
+     * answered with the new format under an immutable cache.
+     */
+    css(id: string, version: string, revision: string, reply: FastifyReply): Promise<void>;
     /**
      * A font (`font/woff2`) or logo (`image/svg+xml`, sanitized at import, served under a CSP
      * sandbox; `image/png`) the version names; `file` is its plugin path as one segment