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

package/dist/identity/settings.d.ts

@@ -3,7 +3,7 @@ import type { KernelSchemaDb } from "../db/kernel-schema.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
 import type { KernelLogger } from "../log.js";
-import { EnterpriseAdminLock } from "./enterprise-admin.js";
+import { SuperAdminLock } from "./super-admin.js";
 /** 沙箱 cpu（核）与内存（MB）覆盖的范围（C19）。 */
 export declare const SANDBOX_CPU_RANGE: {
     readonly min: 0.25;
@@ -20,11 +20,13 @@ export declare const SANDBOX_LIMIT_OVERRIDE: z.ZodObject<{
 }, z.core.$strict>;
 export type SandboxLimitOverride = z.infer<typeof SANDBOX_LIMIT_OVERRIDE>;
 /**
- * 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 declare const SUBAGENT_LIMIT_OVERRIDE: z.ZodObject<{
-    maxConcurrentPerRun: z.ZodOptional<z.ZodNumber>;
+    maxDepth: z.ZodOptional<z.ZodNumber>;
+    maxConcurrentPerConversation: z.ZodOptional<z.ZodNumber>;
     maxDispatchesPerRun: z.ZodOptional<z.ZodNumber>;
     maxTokensPerRun: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strict>;
@@ -32,7 +34,7 @@ export type SubagentLimitOverride = z.infer<typeof SUBAGENT_LIMIT_OVERRIDE>;
 export declare const DEPLOYMENT_SETTINGS: z.ZodObject<{
     orgCreation: z.ZodDefault<z.ZodEnum<{
         anyone: "anyone";
-        enterprise_admin: "enterprise_admin";
+        super_admin: "super_admin";
     }>>;
     runConcurrencyOverrides: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodNumber>>;
     priceCurrency: z.ZodDefault<z.ZodString>;
@@ -41,7 +43,8 @@ export declare const DEPLOYMENT_SETTINGS: z.ZodObject<{
         memoryMb: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strict>>>;
     subagentLimitOverrides: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
-        maxConcurrentPerRun: z.ZodOptional<z.ZodNumber>;
+        maxDepth: z.ZodOptional<z.ZodNumber>;
+        maxConcurrentPerConversation: z.ZodOptional<z.ZodNumber>;
         maxDispatchesPerRun: z.ZodOptional<z.ZodNumber>;
         maxTokensPerRun: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strict>>>;
@@ -53,6 +56,7 @@ export declare const DEPLOYMENT_SETTINGS: z.ZodObject<{
         allow: "allow";
         deny: "deny";
     }>>;
+    orgMarketplaceBrowse: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strip>;
 export type DeploymentSettings = z.infer<typeof DEPLOYMENT_SETTINGS>;
 /**
@@ -66,7 +70,7 @@ export type DeploymentSettings = z.infer<typeof DEPLOYMENT_SETTINGS>;
 export declare const DEPLOYMENT_SETTINGS_PATCH: z.ZodObject<{
     orgCreation: z.ZodOptional<z.ZodEnum<{
         anyone: "anyone";
-        enterprise_admin: "enterprise_admin";
+        super_admin: "super_admin";
     }>>;
     runConcurrencyOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodNullable<z.ZodNumber>>>;
     priceCurrency: z.ZodOptional<z.ZodString>;
@@ -75,7 +79,8 @@ export declare const DEPLOYMENT_SETTINGS_PATCH: z.ZodObject<{
         memoryMb: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strict>>>>;
     subagentLimitOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodNullable<z.ZodObject<{
-        maxConcurrentPerRun: z.ZodOptional<z.ZodNumber>;
+        maxDepth: z.ZodOptional<z.ZodNumber>;
+        maxConcurrentPerConversation: z.ZodOptional<z.ZodNumber>;
         maxDispatchesPerRun: z.ZodOptional<z.ZodNumber>;
         maxTokensPerRun: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strict>>>>;
@@ -87,6 +92,7 @@ export declare const DEPLOYMENT_SETTINGS_PATCH: z.ZodObject<{
         allow: "allow";
         deny: "deny";
     }>>;
+    orgMarketplaceBrowse: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
 export type DeploymentSettingsPatch = z.infer<typeof DEPLOYMENT_SETTINGS_PATCH>;
 /**
@@ -102,18 +108,23 @@ export declare function readSandboxLimitOverride(db: KernelSchemaDb, orgId: stri
 export declare function readSubagentLimitOverride(db: KernelSchemaDb, orgId: string): Promise<SubagentLimitOverride | undefined>;
 /**
  * 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.
  */
 export declare function assertCustomAllowed(db: KernelSchemaDb, key: "customConnectors" | "customSkills"): Promise<void>;
+/**
+ * The deployment setting `orgMarketplaceBrowse`, read live from PG (in the caller's transaction
+ * when there is one); missing or invalid -> the default, true.
+ */
+export declare function readOrgMarketplaceBrowse(db: KernelSchemaDb): Promise<boolean>;
 /** Deployment settings: one row per key, defaults for missing keys. */
 export declare class SettingsService {
     private readonly db;
     readonly txHost: TransactionHost;
     private readonly adminLock;
     private readonly log;
-    constructor(db: KernelDb, txHost: TransactionHost, adminLock: EnterpriseAdminLock, log: Pick<KernelLogger, "warn">);
+    constructor(db: KernelDb, txHost: TransactionHost, adminLock: SuperAdminLock, log: Pick<KernelLogger, "warn">);
     /**
      * Reads every setting, in the context's transaction when there is one (a caller holding a
      * transaction connection does not take a second one from the pool). Each key is validated on
@@ -121,7 +132,7 @@ export declare class SettingsService {
      * valid keys apply; unknown keys (written by a newer version) are ignored.
      */
     get(): Promise<DeploymentSettings>;
-    /** Updates settings under the enterprise admin lock, re-checking the actor (else `forbidden`). */
+    /** Updates settings under the super admin lock, re-checking the actor (else `forbidden`). */
     update(patch: DeploymentSettingsPatch, actorAccountId: string, actorTokenId?: string): Promise<DeploymentSettings>;
     private write;
 }

package/dist/identity/settings.js

@@ -15,7 +15,7 @@ import { TransactionHost } from "../infra/database/transaction-host.js";
 import { Transactional } from "../infra/database/transactional.decorator.js";
 import { KERNEL_LOGGER } from "../infra/tokens.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 +37,34 @@ 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"]);
 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 +76,18 @@ 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 自写技能（`SkillWrite`，私有 agent 的
+     * 组织能否自建技能（不经平台目录）：deny 时组织管理员不能上传技能包。agent 自写技能（`SkillWrite`，私有 agent 的
      * agent 级技能与共享 agent 经负责人审批的变更）不受此开关约束——那是 agent 定义的一部分，由 R3 / R4 把关。
      */
     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),
 });
 const DEFAULTS = DEPLOYMENT_SETTINGS.parse({});
 /**
@@ -84,7 +100,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 +113,7 @@ export const DEPLOYMENT_SETTINGS_PATCH = z
         .optional(),
     customConnectors: CustomPolicy.optional(),
     customSkills: CustomPolicy.optional(),
+    orgMarketplaceBrowse: z.boolean().optional(),
 })
     .strict();
 /**
@@ -140,7 +157,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 +172,25 @@ 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;
+}
 /** 按组织合并覆盖：值为 null 删除该组织，其余整项替换；未列出的组织不变。 */
 function mergeByOrg(current, patch) {
     const merged = { ...current };
@@ -208,7 +240,7 @@ let SettingsService = class SettingsService {
         }
         return out;
     }
-    /** Updates settings under the enterprise admin lock, re-checking the actor (else `forbidden`). */
+    /** Updates settings under the super admin lock, re-checking the actor (else `forbidden`). */
     async update(patch, actorAccountId, actorTokenId) {
         const check = DEPLOYMENT_SETTINGS_PATCH.safeParse(patch);
         if (!check.success) {
@@ -219,7 +251,7 @@ let SettingsService = class SettingsService {
     }
     async write(patch, actorAccountId, actorTokenId) {
         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,6 +262,9 @@ let SettingsService = class SettingsService {
             next.customConnectors = patch.customConnectors;
         if (patch.customSkills !== undefined)
             next.customSkills = patch.customSkills;
+        if (patch.orgMarketplaceBrowse !== undefined) {
+            next.orgMarketplaceBrowse = patch.orgMarketplaceBrowse;
+        }
         const { runConcurrencyOverrides: runPatch, sandboxLimitOverrides: sandboxPatch, subagentLimitOverrides: subagentPatch, } = patch;
         if (runPatch !== undefined || sandboxPatch !== undefined || subagentPatch !== undefined) {
             const current = await this.get();
@@ -270,7 +305,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/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.service.d.ts

@@ -1,14 +1,52 @@
 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).
+ * - `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 +63,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 +84,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;
 }

package/dist/inbox/inbox.service.js

@@ -8,26 +8,36 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { Inject, Injectable } from "@nestjs/common";
+import { sql } from "kysely";
 import { CATALOG_REQUESTS_LIST_MAX, CatalogRequestsService, } from "../catalog/requests.service.js";
+import { ApiError } from "../errors.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
+import { roleAtLeast } from "../orgs/roles.js";
 import { SKILL_CHANGES_LIST_MAX, SkillChangesService, } from "../skills/changes.service.js";
 import { APPROVALS_LIST_MAX, ApprovalsService, } from "../tools/approvals.service.js";
+/** The most open org notices one inbox read returns. */
+export const ORG_NOTICES_LIST_MAX = 100;
 /** 收件箱一次最多返回的事项数。 */
 export const INBOX_MAX_ITEMS = 100;
 /** 收件箱（计划取舍 C6）：按类型汇总各来源的待处理事项。无状态，每次实时读 PG。 */
 let InboxService = class InboxService {
     approvals;
     skillChanges;
+    kdb;
     catalogRequests;
-    constructor(approvals, skillChanges, catalogRequests) {
+    constructor(approvals, skillChanges, kdb, catalogRequests) {
         this.approvals = approvals;
         this.skillChanges = skillChanges;
+        this.kdb = kdb;
         this.catalogRequests = catalogRequests;
     }
     async list(orgId, accountId) {
-        const [approvals, changes, requests] = await Promise.all([
+        const [approvals, changes, requests, decided, notices] = await Promise.all([
             this.approvals.list(orgId, accountId, "pending"),
             this.skillChanges.listPending(orgId, accountId),
             this.catalogRequests.listForOrgAdmin(orgId, accountId),
+            this.catalogRequests.listDecidedForRequester(orgId, accountId),
+            this.notices(orgId, accountId),
         ]);
         const all = [
             ...approvals.map((a) => ({
@@ -48,6 +58,13 @@ let InboxService = class InboxService {
                 createdAt: r.createdAt,
                 request: r,
             })),
+            ...decided.map((r) => ({
+                type: "catalog_request_decided",
+                id: r.id,
+                createdAt: r.decidedAt ?? r.createdAt,
+                request: r,
+            })),
+            ...notices.map((n) => ({ type: n.kind, id: n.id, createdAt: n.createdAt, notice: n })),
         ];
         // 新的在前；同一时刻按 id 定序（结果稳定）
         all.sort((a, b) => a.createdAt !== b.createdAt
@@ -62,17 +79,70 @@ let InboxService = class InboxService {
         // 各来源自己也有上限：某个来源取满了也算还有更多
         const full = approvals.length >= APPROVALS_LIST_MAX ||
             changes.length >= SKILL_CHANGES_LIST_MAX ||
-            requests.length >= CATALOG_REQUESTS_LIST_MAX;
+            requests.length >= CATALOG_REQUESTS_LIST_MAX ||
+            decided.length >= CATALOG_REQUESTS_LIST_MAX ||
+            notices.length >= ORG_NOTICES_LIST_MAX;
         return {
             items: all.slice(0, INBOX_MAX_ITEMS),
             truncated: full || all.length > INBOX_MAX_ITEMS,
         };
     }
+    /** The org's open notices when the account is an org admin (else none), newest first. */
+    async notices(orgId, accountId) {
+        if (!(await this.isAdmin(orgId, accountId)))
+            return [];
+        const rows = await this.kdb.db
+            .selectFrom("org_notices")
+            .select(["id", "kind", "detail", "created_at"])
+            .where("org_id", "=", orgId)
+            .where("dismissed_at", "is", null)
+            .orderBy("created_at", "desc")
+            .orderBy("id")
+            .limit(ORG_NOTICES_LIST_MAX)
+            .execute();
+        return rows.map((r) => {
+            const base = { id: r.id, createdAt: r.created_at.toISOString() };
+            if (r.kind === "skill_renamed") {
+                return { ...base, kind: r.kind, skillRenamed: r.detail };
+            }
+            return { ...base, kind: r.kind, detail: r.detail };
+        });
+    }
+    /**
+     * 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`.
+     */
+    async dismissNotice(orgId, accountId, id) {
+        const notFound = new ApiError("inbox.notice_not_found", "Notice not found");
+        if (!UUID_RE.test(id) || !(await this.isAdmin(orgId, accountId)))
+            throw notFound;
+        const r = await this.kdb.db
+            .updateTable("org_notices")
+            .set({ dismissed_at: sql `now()`, dismissed_by: accountId })
+            .where("id", "=", id)
+            .where("org_id", "=", orgId)
+            .where("dismissed_at", "is", null)
+            .executeTakeFirst();
+        if (r.numUpdatedRows === 0n)
+            throw notFound;
+    }
+    async isAdmin(orgId, accountId) {
+        const m = await this.kdb.db
+            .selectFrom("memberships")
+            .select("role")
+            .where("org_id", "=", orgId)
+            .where("account_id", "=", accountId)
+            .executeTakeFirst();
+        return m !== undefined && roleAtLeast(m.role, "admin");
+    }
 };
 InboxService = __decorate([
     Injectable(),
     __param(0, Inject(ApprovalsService)),
     __param(1, Inject(SkillChangesService)),
-    __param(2, Inject(CatalogRequestsService))
+    __param(2, Inject(KernelDb)),
+    __param(3, Inject(CatalogRequestsService))
 ], InboxService);
 export { InboxService };
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;