@capybara-hq/kernel 0.1.0-rc.2 → 0.1.0-rc.20

package/dist/identity/settings.js

@@ -7,6 +7,7 @@ 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 { EXTENSION_NAME_RE } from "@capybara-hq/plugin-sdk";
 import { Inject, Injectable } from "@nestjs/common";
 import { z } from "zod";
 import { ApiError } from "../errors.js";
@@ -14,8 +15,10 @@ import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
 import { Transactional } from "../infra/database/transactional.decorator.js";
 import { KERNEL_LOGGER } from "../infra/tokens.js";
+import { assertPlatformDefaultEligible, lockThemeShared } from "../themes/theme-state.js";
+import { mergeArrangement, UiArrangementPatchSchema, UiArrangementSchema, } from "../ui/arrangement.js";
 import { audit } from "./audit.js";
-import { EnterpriseAdminLock } from "./enterprise-admin.js";
+import { SuperAdminLock } from "./super-admin.js";
 /** 币种代码：ISO 4217 的三位大写字母（如 USD、CNY）。 */
 const CurrencyCode = z.string().regex(/^[A-Z]{3}$/, "must be a 3-letter ISO 4217 currency code");
 /** 沙箱 cpu（核）与内存（MB）覆盖的范围（C19）。 */
@@ -37,23 +40,84 @@ export const SANDBOX_LIMIT_OVERRIDE = z
     message: "give cpu, memoryMb or both",
 });
 /**
- * One organization's sub-agent limits (sub-agents spec §8.2): any of the three `subagents.*`
- * values, within the same bounds; the ones not given use the deployment's config.
+ * One organization's sub-agent limits (sub-agents spec §8.2, agent map spec §6): any of the
+ * `subagents.*` values, within the same bounds (0 for dispatches or tokens: no limit); the ones not
+ * given use the deployment's config.
  */
 export const SUBAGENT_LIMIT_OVERRIDE = z
     .object({
-    maxConcurrentPerRun: z.number().int().min(1).max(20).optional(),
-    maxDispatchesPerRun: z.number().int().min(1).max(500).optional(),
-    maxTokensPerRun: z.number().int().min(10_000).optional(),
+    maxDepth: z.number().int().min(1).max(5).optional(),
+    maxConcurrentPerConversation: z.number().int().min(1).max(20).optional(),
+    maxDispatchesPerRun: z
+        .number()
+        .int()
+        .max(500)
+        .refine((n) => n === 0 || n >= 1, "0 (no limit) or 1 to 500")
+        .optional(),
+    maxTokensPerRun: z
+        .number()
+        .int()
+        .refine((n) => n === 0 || n >= 10_000, "0 (no limit) or at least 10,000")
+        .optional(),
 })
     .strict()
     .refine((o) => Object.values(o).some((v) => v !== undefined), {
-    message: "give maxConcurrentPerRun, maxDispatchesPerRun or maxTokensPerRun",
+    message: "give maxDepth, maxConcurrentPerConversation, maxDispatchesPerRun or maxTokensPerRun",
 });
-/** 组织能否自建连接器 / 技能（C22）：`deny` 时只能从企业目录安装（T26 执行）。 */
+/** 组织能否自建连接器 / 技能（C22）：`deny` 时只能从平台目录安装（T26 执行）。 */
 const CustomPolicy = z.enum(["allow", "deny"]);
+/** The deployment setting key of the platform default theme (themes spec §7). */
+export const UI_THEME_SETTING = "uiTheme";
+/**
+ * The platform default theme (themes spec §7): a `platform_themes` id, or null for the built-in
+ * theme. Only a platform-owned theme whose effective scope is `all` can be set (checked by
+ * {@link SettingsService.update}); every reader goes through {@link readUiTheme} or
+ * {@link SettingsService.get}, both parsing with this schema.
+ */
+export const UiThemeSetting = z.object({ id: z.string().min(1).max(200).nullable() });
+/** The deployment setting key of the client code kill switch (client extensions spec §10.2). */
+export const CLIENT_EXTENSIONS_SETTING = "clientExtensions";
+/** The plugins listed in `clientExtensions.disabled`: at most this many. */
+export const CLIENT_DISABLED_MAX = 200;
+const ClientDisabledList = z
+    .array(z.string().regex(EXTENSION_NAME_RE, "must be an extension name"))
+    .max(CLIENT_DISABLED_MAX);
+/**
+ * The client code kill switch (client extensions spec §10.2): `enabled: false` stops every plugin's
+ * client code (the shell reads list nothing, delivery is 404); `disabled` names the plugins whose
+ * client code alone is stopped while their server side keeps running. Every reader goes through
+ * {@link readClientExtensions} or {@link SettingsService.get}.
+ */
+export const ClientExtensionsSetting = z.object({
+    enabled: z.boolean(),
+    disabled: ClientDisabledList,
+});
+/** The kill switch's default (and what a missing or invalid stored value reads as): everything on. */
+export const clientExtensionsDefault = () => ({
+    enabled: true,
+    disabled: [],
+});
+/**
+ * Parses a stored `clientExtensions` value (the `deployment_settings` row's `value`, undefined when
+ * the row is missing): the default when missing; when invalid the default too, with a warning naming
+ * the key (a kill switch that fails open is worth a log line, as {@link SettingsService.get} logs
+ * every other invalid key). The one parser of the setting: the settings service and every access
+ * check read through it.
+ */
+export function parseClientExtensions(value, log) {
+    if (value === undefined)
+        return clientExtensionsDefault();
+    const parsed = ClientExtensionsSetting.safeParse(value);
+    if (parsed.success)
+        return parsed.data;
+    log?.warn("invalid deployment setting; using default", {
+        key: CLIENT_EXTENSIONS_SETTING,
+        issues: parsed.error.issues.map((i) => i.message),
+    });
+    return clientExtensionsDefault();
+}
 export const DEPLOYMENT_SETTINGS = z.object({
-    orgCreation: z.enum(["anyone", "enterprise_admin"]).default("anyone"),
+    orgCreation: z.enum(["anyone", "super_admin"]).default("anyone"),
     /** 按组织覆盖运行并发上限（orgId → 上限）；未列出的组织用 `runtime.orgConcurrency`。 */
     runConcurrencyOverrides: z.record(z.string().min(1), z.number().int().positive()).default({}),
     /** 模型价格表（`model_prices`）的币种；只用于显示估算成本，不做换算。 */
@@ -65,13 +129,28 @@ export const DEPLOYMENT_SETTINGS = z.object({
      * not given, use `subagents.*`. Read live on every dispatch and tool resolution.
      */
     subagentLimitOverrides: z.record(z.string().min(1), SUBAGENT_LIMIT_OVERRIDE).default({}),
-    /** 组织能否自建连接器（不经企业目录）。 */
+    /** 组织能否自建连接器（不经平台目录）。 */
     customConnectors: CustomPolicy.default("allow"),
     /**
-     * 组织能否自建技能（不经企业目录）：deny 时组织管理员不能上传技能包。agent 自写技能（`skill_write`，私有 agent 的
-     * agent 级技能与共享 agent 经负责人审批的变更）不受此开关约束——那是 agent 定义的一部分，由 R3 / R4 把关。
+     * Whether the org can create its own skills (not through the platform catalog): on deny org admins
+     * cannot upload skill packages. An agent registering its own skill (`agents.register-skill`) is not
+     * governed by it; only sharing a skill to the org is refused.
      */
     customSkills: CustomPolicy.default("allow"),
+    /**
+     * Org admins may browse the marketplaces read-only and ask for an entry to be imported (plugin
+     * scope spec §5.1 rule 3). false hides the browse route and refuses those requests.
+     */
+    orgMarketplaceBrowse: z.boolean().default(true),
+    /** The platform default theme (themes spec §7); `{ id: null }`: the built-in theme. */
+    uiTheme: UiThemeSetting.default({ id: null }),
+    /**
+     * The platform default arrangement of UI slots (UI slots spec §5): `{ hidden, order }` per list
+     * slot, `{ use }` per single slot (client extensions spec §6.3); orgs override per slot.
+     */
+    uiArrangement: UiArrangementSchema.default({}),
+    /** The client code kill switch (client extensions spec §10.2). */
+    clientExtensions: ClientExtensionsSetting.default(clientExtensionsDefault),
 });
 const DEFAULTS = DEPLOYMENT_SETTINGS.parse({});
 /**
@@ -84,7 +163,7 @@ const DEFAULTS = DEPLOYMENT_SETTINGS.parse({});
  */
 export const DEPLOYMENT_SETTINGS_PATCH = z
     .object({
-    orgCreation: z.enum(["anyone", "enterprise_admin"]).optional(),
+    orgCreation: z.enum(["anyone", "super_admin"]).optional(),
     runConcurrencyOverrides: z
         .record(z.string().min(1), z.number().int().positive().nullable())
         .optional(),
@@ -97,6 +176,28 @@ export const DEPLOYMENT_SETTINGS_PATCH = z
         .optional(),
     customConnectors: CustomPolicy.optional(),
     customSkills: CustomPolicy.optional(),
+    orgMarketplaceBrowse: z.boolean().optional(),
+    /**
+     * The platform default theme: a platform-owned theme whose effective scope is `all`, not
+     * disabled (else 400 `theme.not_available`), or `{ id: null }` for the built-in theme.
+     */
+    uiTheme: UiThemeSetting.strict().optional(),
+    /**
+     * Per slot, the entry to hide / order contributions with (`{ use }` on a single slot); null
+     * removes a slot's entry.
+     */
+    uiArrangement: UiArrangementPatchSchema.optional(),
+    /**
+     * The client code kill switch: each given field replaces the stored one (`disabled` is the
+     * whole list, stored sorted without duplicates); at least one field.
+     */
+    clientExtensions: z
+        .object({ enabled: z.boolean().optional(), disabled: ClientDisabledList.optional() })
+        .strict()
+        .refine((o) => o.enabled !== undefined || o.disabled !== undefined, {
+        message: "give enabled, disabled or both",
+    })
+        .optional(),
 })
     .strict();
 /**
@@ -140,7 +241,7 @@ export async function readSubagentLimitOverride(db, orgId) {
 }
 /**
  * When orgs may not create their own connectors / skills (deployment setting `customConnectors` /
- * `customSkills` is `deny`, C22) throws `catalog.custom_disabled`: install from the enterprise
+ * `customSkills` is `deny`, C22) throws `catalog.custom_disabled`: install from the platform
  * catalog only. Reads PG live every time (can read in the caller's transaction); an invalid stored
  * value counts as allow.
  */
@@ -155,10 +256,83 @@ export async function assertCustomAllowed(db, key) {
     const parsed = CustomPolicy.safeParse(row.value);
     if (parsed.success && parsed.data === "deny") {
         throw new ApiError("catalog.custom_disabled", key === "customConnectors"
-            ? "Custom connectors are disabled in this deployment; install connectors from the enterprise catalog"
-            : "Custom skills are disabled in this deployment; install skills from the enterprise catalog");
+            ? "Custom connectors are disabled in this deployment; install connectors from the platform catalog"
+            : "Custom skills are disabled in this deployment; install skills from the platform catalog");
     }
 }
+/**
+ * The deployment setting `orgMarketplaceBrowse`, read live from PG (in the caller's transaction
+ * when there is one); missing or invalid -> the default, true.
+ */
+export async function readOrgMarketplaceBrowse(db) {
+    const row = await db
+        .selectFrom("deployment_settings")
+        .select("value")
+        .where("key", "=", "orgMarketplaceBrowse")
+        .executeTakeFirst();
+    if (!row)
+        return true;
+    const parsed = z.boolean().safeParse(row.value);
+    return parsed.success ? parsed.data : true;
+}
+/**
+ * The platform default theme setting, read live from PG (in the caller's transaction when there is
+ * one) and parsed with {@link UiThemeSetting}: missing or invalid -> `{ id: null }`. `lock`: the
+ * row is read FOR SHARE, so a concurrent write of the setting (which holds it FOR UPDATE) waits for
+ * the caller's transaction, and the reverse.
+ */
+export async function readUiTheme(db, opts = {}) {
+    let q = db.selectFrom("deployment_settings").select("value").where("key", "=", UI_THEME_SETTING);
+    if (opts.lock)
+        q = q.forShare();
+    const row = await q.executeTakeFirst();
+    const parsed = UiThemeSetting.safeParse(row?.value);
+    return parsed.success ? parsed.data : { id: null };
+}
+/**
+ * Locks the `uiTheme` row FOR UPDATE in the caller's transaction, creating it as `{ id: null }`
+ * first when it is missing (migration 0094 seeds it; a test may have truncated the table), so the
+ * FOR SHARE readers always find a row to wait on.
+ */
+async function lockUiThemeRow(db) {
+    await db
+        .insertInto("deployment_settings")
+        .values({ key: UI_THEME_SETTING, value: JSON.stringify({ id: null }) })
+        .onConflict((oc) => oc.column("key").doNothing())
+        .execute();
+    await db
+        .selectFrom("deployment_settings")
+        .select("key")
+        .where("key", "=", UI_THEME_SETTING)
+        .forUpdate()
+        .execute();
+}
+/**
+ * The platform default arrangement of UI slots, read live (the lists apply it). An invalid
+ * stored value reads as `{}` (the same fallback {@link SettingsService.get} uses).
+ */
+export async function readUiArrangement(db) {
+    const row = await db
+        .selectFrom("deployment_settings")
+        .select("value")
+        .where("key", "=", "uiArrangement")
+        .executeTakeFirst();
+    const parsed = UiArrangementSchema.safeParse(row?.value);
+    return parsed.success ? parsed.data : {};
+}
+/**
+ * The client code kill switch, read live from PG on every request (in the caller's transaction when
+ * there is one; never cached: every replica sees a change at once), through
+ * {@link parseClientExtensions} (missing or invalid -> everything on; invalid also warns on `log`).
+ */
+export async function readClientExtensions(db, log) {
+    const row = await db
+        .selectFrom("deployment_settings")
+        .select("value")
+        .where("key", "=", CLIENT_EXTENSIONS_SETTING)
+        .executeTakeFirst();
+    return parseClientExtensions(row?.value, log);
+}
 /** 按组织合并覆盖：值为 null 删除该组织，其余整项替换；未列出的组织不变。 */
 function mergeByOrg(current, patch) {
     const merged = { ...current };
@@ -208,18 +382,20 @@ let SettingsService = class SettingsService {
         }
         return out;
     }
-    /** Updates settings under the enterprise admin lock, re-checking the actor (else `forbidden`). */
-    async update(patch, actorAccountId, actorTokenId) {
+    /** Updates settings under the super admin lock, re-checking the actor (else `forbidden`). */
+    async update(patch, actorAccountId, actorTokenId, 
+    /** Merged into the audit detail (the Platform tool's `via: "agent"`). */
+    auditDetail) {
         const check = DEPLOYMENT_SETTINGS_PATCH.safeParse(patch);
         if (!check.success) {
             throw new ApiError("validation_failed", "Invalid deployment settings", check.error.issues.map((i) => ({ path: i.path.join("."), message: i.message })));
         }
-        await this.write(check.data, actorAccountId, actorTokenId);
+        await this.write(check.data, actorAccountId, actorTokenId, auditDetail);
         return this.get();
     }
-    async write(patch, actorAccountId, actorTokenId) {
+    async write(patch, actorAccountId, actorTokenId, auditDetail) {
         await this.adminLock.lockAndAuthorize(actorAccountId);
-        // The enterprise admin lock serializes every settings write: the current overrides are read
+        // The super admin lock serializes every settings write: the current overrides are read
         // and merged under it, so no concurrent change is lost
         const next = {};
         if (patch.orgCreation !== undefined)
@@ -230,9 +406,42 @@ let SettingsService = class SettingsService {
             next.customConnectors = patch.customConnectors;
         if (patch.customSkills !== undefined)
             next.customSkills = patch.customSkills;
-        const { runConcurrencyOverrides: runPatch, sandboxLimitOverrides: sandboxPatch, subagentLimitOverrides: subagentPatch, } = patch;
-        if (runPatch !== undefined || sandboxPatch !== undefined || subagentPatch !== undefined) {
+        if (patch.orgMarketplaceBrowse !== undefined) {
+            next.orgMarketplaceBrowse = patch.orgMarketplaceBrowse;
+        }
+        if (patch.uiTheme !== undefined) {
+            // The one theme lock order (themes spec §7), inside the super admin lock above: the chosen
+            // theme's catalog item, then its `platform_themes` row FOR SHARE, then the `uiTheme` row FOR
+            // UPDATE, and only then the eligibility check (on in every live org). The writers that take
+            // a theme away or switch it off in an org (scope, disable, removal, the org switch and
+            // uninstall) hold the item or theme row before they read `uiTheme` FOR SHARE, so they and
+            // this write wait for each other in the same order and never deadlock.
+            if (patch.uiTheme.id !== null)
+                await lockThemeShared(this.db.db, patch.uiTheme.id);
+            await lockUiThemeRow(this.db.db);
+            if (patch.uiTheme.id !== null) {
+                await assertPlatformDefaultEligible(this.db.db, patch.uiTheme.id);
+            }
+            next.uiTheme = { id: patch.uiTheme.id };
+        }
+        const { runConcurrencyOverrides: runPatch, sandboxLimitOverrides: sandboxPatch, subagentLimitOverrides: subagentPatch, uiArrangement: arrangementPatch, clientExtensions: clientPatch, } = patch;
+        if (runPatch !== undefined ||
+            sandboxPatch !== undefined ||
+            subagentPatch !== undefined ||
+            arrangementPatch !== undefined ||
+            clientPatch !== undefined) {
             const current = await this.get();
+            if (clientPatch !== undefined) {
+                next.clientExtensions = {
+                    enabled: clientPatch.enabled ?? current.clientExtensions.enabled,
+                    disabled: clientPatch.disabled === undefined
+                        ? current.clientExtensions.disabled
+                        : [...new Set(clientPatch.disabled)].sort(),
+                };
+            }
+            if (arrangementPatch !== undefined) {
+                next.uiArrangement = mergeArrangement(current.uiArrangement, arrangementPatch);
+            }
             if (runPatch !== undefined) {
                 next.runConcurrencyOverrides = mergeByOrg(current.runConcurrencyOverrides, runPatch);
             }
@@ -259,7 +468,7 @@ let SettingsService = class SettingsService {
             actorAccountId,
             ...(actorTokenId !== undefined && { actorTokenId }),
             action: "deployment.settings.updated",
-            detail: patch,
+            detail: { ...patch, ...auditDetail },
         });
     }
 };
@@ -270,7 +479,7 @@ SettingsService = __decorate([
     Injectable(),
     __param(0, Inject(KernelDb)),
     __param(1, Inject(TransactionHost)),
-    __param(2, Inject(EnterpriseAdminLock)),
+    __param(2, Inject(SuperAdminLock)),
     __param(3, Inject(KERNEL_LOGGER))
 ], SettingsService);
 export { SettingsService };

package/dist/identity/{enterprise-admin.d.ts → super-admin.d.ts}

@@ -2,19 +2,19 @@ import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
 import { XactLock } from "../infra/database/xact-lock.js";
 /**
- * The enterprise admin lock, the one implementation of "lock, then re-check the actor":
+ * The super admin lock, the one implementation of "lock, then re-check the actor":
  * both methods join the caller's transaction (`mandatory`), which holds the lock until it ends.
  */
-export declare class EnterpriseAdminLock {
+export declare class SuperAdminLock {
     private readonly db;
     private readonly xactLock;
     readonly txHost: TransactionHost;
     constructor(db: KernelDb, xactLock: XactLock, txHost: TransactionHost);
     /** Only the lock (callers without an actor: the CLI, bootstrap). */
     lock(): Promise<void>;
-    /** The lock, then {@link assertActiveEnterpriseAdmin} under it. */
+    /** The lock, then {@link assertActiveSuperAdmin} under it. */
     lockAndAuthorize(actorAccountId: string): Promise<void>;
 }
-/** The one {@link EnterpriseAdminLock}: identity, models, the extensions and the catalog import it. */
-export declare class EnterpriseAdminLockModule {
+/** The one {@link SuperAdminLock}: identity, models, the extensions and the catalog import it. */
+export declare class SuperAdminLockModule {
 }

package/dist/identity/{enterprise-admin.js → super-admin.js}

@@ -15,32 +15,32 @@ import { Transactional } from "../infra/database/transactional.decorator.js";
 import { XactLock } from "../infra/database/xact-lock.js";
 /**
  * The transaction-scoped lock (`XactLock`, `pg_advisory_xact_lock`) that serializes every
- * enterprise admin write: revoke / disable / create an admin, deployment settings, prices,
+ * super admin write: revoke / disable / create an admin, deployment settings, prices,
  * purposes, the catalog and extension admin writes, the CLI's `capybara admin grant|revoke`.
  */
-const ENTERPRISE_ADMINS_LOCK = "capybara.enterprise_admins";
+const SUPER_ADMINS_LOCK = "capybara.super_admins";
 /**
- * The run-time re-check of an enterprise admin write (spec 3.6 R5), under
- * {@link ENTERPRISE_ADMINS_LOCK}: the actor must still be an active enterprise admin, else
+ * The run-time re-check of a super admin write (spec 3.6 R5), under
+ * {@link SUPER_ADMINS_LOCK}: the actor must still be an active super admin, else
  * `forbidden`. The identity the auth guard read at the start of the request may be stale (another
  * admin just revoked it), so it is re-read under the lock.
  */
-async function assertActiveEnterpriseAdmin(db, actorAccountId) {
+async function assertActiveSuperAdmin(db, actorAccountId) {
     const actor = await db
         .selectFrom("accounts")
         .select("id")
         .where("id", "=", actorAccountId)
-        .where("is_enterprise_admin", "=", true)
+        .where("is_super_admin", "=", true)
         .where("status", "=", "active")
         .executeTakeFirst();
     if (!actor)
-        throw new ApiError("forbidden", "Enterprise admin required");
+        throw new ApiError("forbidden", "Super admin required");
 }
 /**
- * The enterprise admin lock, the one implementation of "lock, then re-check the actor":
+ * The super admin lock, the one implementation of "lock, then re-check the actor":
  * both methods join the caller's transaction (`mandatory`), which holds the lock until it ends.
  */
-let EnterpriseAdminLock = class EnterpriseAdminLock {
+let SuperAdminLock = class SuperAdminLock {
     db;
     xactLock;
     txHost;
@@ -51,31 +51,31 @@ let EnterpriseAdminLock = class EnterpriseAdminLock {
     }
     /** Only the lock (callers without an actor: the CLI, bootstrap). */
     async lock() {
-        await this.xactLock.lock(ENTERPRISE_ADMINS_LOCK);
+        await this.xactLock.lock(SUPER_ADMINS_LOCK);
     }
-    /** The lock, then {@link assertActiveEnterpriseAdmin} under it. */
+    /** The lock, then {@link assertActiveSuperAdmin} under it. */
     async lockAndAuthorize(actorAccountId) {
-        await this.xactLock.lock(ENTERPRISE_ADMINS_LOCK);
-        await assertActiveEnterpriseAdmin(this.db.db, actorAccountId);
+        await this.xactLock.lock(SUPER_ADMINS_LOCK);
+        await assertActiveSuperAdmin(this.db.db, actorAccountId);
     }
 };
 __decorate([
     Transactional({ propagation: "mandatory" })
-], EnterpriseAdminLock.prototype, "lock", null);
+], SuperAdminLock.prototype, "lock", null);
 __decorate([
     Transactional({ propagation: "mandatory" })
-], EnterpriseAdminLock.prototype, "lockAndAuthorize", null);
-EnterpriseAdminLock = __decorate([
+], SuperAdminLock.prototype, "lockAndAuthorize", null);
+SuperAdminLock = __decorate([
     Injectable(),
     __param(0, Inject(KernelDb)),
     __param(1, Inject(XactLock)),
     __param(2, Inject(TransactionHost))
-], EnterpriseAdminLock);
-export { EnterpriseAdminLock };
-/** The one {@link EnterpriseAdminLock}: identity, models, the extensions and the catalog import it. */
-let EnterpriseAdminLockModule = class EnterpriseAdminLockModule {
+], SuperAdminLock);
+export { SuperAdminLock };
+/** The one {@link SuperAdminLock}: identity, models, the extensions and the catalog import it. */
+let SuperAdminLockModule = class SuperAdminLockModule {
 };
-EnterpriseAdminLockModule = __decorate([
-    Module({ providers: [EnterpriseAdminLock], exports: [EnterpriseAdminLock] })
-], EnterpriseAdminLockModule);
-export { EnterpriseAdminLockModule };
+SuperAdminLockModule = __decorate([
+    Module({ providers: [SuperAdminLock], exports: [SuperAdminLock] })
+], SuperAdminLockModule);
+export { SuperAdminLockModule };

package/dist/identity/write-actor.d.ts

@@ -0,0 +1,11 @@
+import { type Principal } from "./principal.js";
+/**
+ * Who performs a write on the platform's behalf (a super admin acting on an org they need not be
+ * a member of): the account and, for a write made with a personal access token, the token id.
+ */
+export interface WriteActor {
+    accountId: string;
+    tokenId?: string;
+}
+/** The writer of a request: its user and, for a personal access token, the token id. */
+export declare function writeActorOf(principal: Principal): WriteActor;

package/dist/identity/write-actor.js

@@ -0,0 +1,7 @@
+import { patTokenId, requireUser } from "./principal.js";
+/** The writer of a request: its user and, for a personal access token, the token id. */
+export function writeActorOf(principal) {
+    const user = requireUser(principal);
+    const tokenId = patTokenId(user);
+    return { accountId: user.account.id, ...(tokenId !== undefined && { tokenId }) };
+}

package/dist/inbox/inbox.module.d.ts

@@ -1,3 +1,6 @@
-/** The inbox: pending tool approvals, skill changes and catalog requests, read live from PG. */
+/**
+ * The inboxes, read live from PG: an org member's (pending tool approvals, skill changes, catalog
+ * requests, org notices) and the super admin's (`PlatformInboxService`).
+ */
 export declare class InboxModule {
 }

package/dist/inbox/inbox.module.js

@@ -9,14 +9,18 @@ import { CatalogModule } from "../catalog/catalog.module.js";
 import { SkillsModule } from "../skills/skills.module.js";
 import { ToolsModule } from "../tools/tools.module.js";
 import { InboxService } from "./inbox.service.js";
-/** The inbox: pending tool approvals, skill changes and catalog requests, read live from PG. */
+import { PlatformInboxService } from "./platform-inbox.service.js";
+/**
+ * The inboxes, read live from PG: an org member's (pending tool approvals, skill changes, catalog
+ * requests, org notices) and the super admin's (`PlatformInboxService`).
+ */
 let InboxModule = class InboxModule {
 };
 InboxModule = __decorate([
     Module({
         imports: [ToolsModule, SkillsModule, CatalogModule],
-        providers: [InboxService],
-        exports: [InboxService],
+        providers: [InboxService, PlatformInboxService],
+        exports: [InboxService, PlatformInboxService],
     })
 ], InboxModule);
 export { InboxModule };

package/dist/inbox/inbox.schemas.d.ts

@@ -0,0 +1,8 @@
+import { z } from "zod";
+import type { RouteSchemas } from "../platform/route-schemas.js";
+/** `:id` of a notice dismissal (the org's and the platform's inbox). */
+export declare const InboxNoticeParams: z.ZodObject<{
+    id: z.ZodString;
+}, z.core.$strip>;
+/** The inbox routes (the org's and the super admin's) the Platform inbox operations mirror. */
+export declare const INBOX_ROUTES: readonly RouteSchemas[];

package/dist/inbox/inbox.schemas.js

@@ -0,0 +1,11 @@
+import { z } from "zod";
+/** `:id` of a notice dismissal (the org's and the platform's inbox). */
+export const InboxNoticeParams = z.object({ id: z.string().min(1).max(100) });
+/** The inbox routes (the org's and the super admin's) the Platform inbox operations mirror. */
+export const INBOX_ROUTES = [
+    { route: "GET /api/v1/orgs/:orgId/inbox" },
+    { route: "POST /api/v1/orgs/:orgId/inbox/notices/:id/dismiss", params: InboxNoticeParams },
+    { route: "GET /api/v1/admin/inbox" },
+    { route: "GET /api/v1/admin/inbox/count" },
+    { route: "POST /api/v1/admin/inbox/notices/:id/dismiss", params: InboxNoticeParams },
+];

package/dist/inbox/inbox.service.d.ts

@@ -1,14 +1,53 @@
 import { CatalogRequestsService, type CatalogRequestView } from "../catalog/requests.service.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
 import { SkillChangesService, type SkillChangeView } from "../skills/changes.service.js";
 import { ApprovalsService, type ApprovalView } from "../tools/approvals.service.js";
+import type { OrgNoticeDetails } from "./org-notices.js";
+/** The most open org notices one inbox read returns. */
+export declare const ORG_NOTICES_LIST_MAX = 100;
+/** The skill the platform components migration renamed (`skill_renamed`). */
+export interface SkillRenamedDetail {
+    skillId: string;
+    from: string;
+    to: string;
+    platformSkillId: string;
+    plugin: string | null;
+}
+/**
+ * A notice for the org's admins (`org_notices`), shown until one of them dismisses it; `kind`
+ * picks the detail field that is set:
+ * - `skill_renamed` (`skillRenamed`): the platform components migration renamed an org skill whose
+ *   name a platform skill on in the org has; agents keep it, by id;
+ * - `item_shared`, `shared_item_updated`, `upload_confirmed`, `upload_rejected` (`detail`): the
+ *   shapes of {@link OrgNoticeDetails} (plugin scope phase 3, P3-22).
+ */
+export type OrgNoticeView = {
+    id: string;
+    createdAt: string;
+} & ({
+    kind: "skill_renamed";
+    skillRenamed: SkillRenamedDetail;
+} | {
+    [K in keyof OrgNoticeDetails]: {
+        kind: K;
+        detail: OrgNoticeDetails[K];
+    };
+}[keyof OrgNoticeDetails]);
 /** 收件箱一次最多返回的事项数。 */
 export declare const INBOX_MAX_ITEMS = 100;
 /**
  * 收件箱里的一项（按 `type` 区分，形状稳定）：
  * - `tool_approval`：当前用户能处理的待处理工具调用审批（与 `GET /approvals?status=pending` 同一视图）；
- * - `skill_change`：当前用户作为 agent 负责人能决定的待处理技能变更（M5 T15，R4）；
- * - `catalog_request`: pending catalog requests from members, when the current user is an org
- *   admin (M6 T26, C22).
+ * - `skill_change`: pending skill share requests and proposed versions of shared skills, when the
+ *   current user is an org admin (`skillChange.kind`; spec §5.4, §5.5);
+ * - `catalog_request`: pending `enable` requests from members and pending `connector_setup`
+ *   requests (`request.kind`; `request.agent` and `request.connectors` set, `item` null; ruling
+ *   P4-T6-5), when the current user is an org admin (M6 T26, C22; plugin scope spec §5.1);
+ * - `catalog_request_decided`: the current user's own requests in this org that were approved or
+ *   rejected (with the reason), until dismissed (`POST catalog-requests/:id/dismiss`);
+ * - the org notices (`skill_renamed`, `item_shared`, `shared_item_updated`, `upload_confirmed`,
+ *   `upload_rejected`; `type` = the notice's kind): for org admins, until one dismisses it
+ *   (`POST inbox/notices/:id/dismiss`).
  */
 export type InboxItem = {
     type: "tool_approval";
@@ -25,6 +64,17 @@ export type InboxItem = {
     id: string;
     createdAt: string;
     request: CatalogRequestView;
+} | {
+    type: "catalog_request_decided";
+    id: string;
+    /** When it was decided. */
+    createdAt: string;
+    request: CatalogRequestView;
+} | {
+    type: OrgNoticeView["kind"];
+    id: string;
+    createdAt: string;
+    notice: OrgNoticeView;
 };
 /** `GET /inbox` 的结果：新的在前，最多 {@link INBOX_MAX_ITEMS} 项；`truncated` 为 true 表示还有更多。 */
 export interface InboxView {
@@ -35,7 +85,17 @@ export interface InboxView {
 export declare class InboxService {
     private readonly approvals;
     private readonly skillChanges;
+    private readonly kdb;
     private readonly catalogRequests;
-    constructor(approvals: Pick<ApprovalsService, "list">, skillChanges: Pick<SkillChangesService, "listPending">, catalogRequests: Pick<CatalogRequestsService, "listForOrgAdmin">);
+    constructor(approvals: Pick<ApprovalsService, "list">, skillChanges: Pick<SkillChangesService, "listPending">, kdb: KernelDb, catalogRequests: Pick<CatalogRequestsService, "listForOrgAdmin" | "listDecidedForRequester">);
     list(orgId: string, accountId: string): Promise<InboxView>;
+    /** The org's open notices when the account is an org admin (else none), newest first. */
+    private notices;
+    /**
+     * An org admin dismisses an open notice (`POST /orgs/:orgId/inbox/notices/:id/dismiss`); for
+     * every admin of the org. Not an admin, or no open notice of the org with that id ->
+     * `inbox.notice_not_found`.
+     */
+    dismissNotice(orgId: string, accountId: string, id: string): Promise<void>;
+    private isAdmin;
 }