@capybara-hq/kernel 0.1.0-rc.1 → 0.1.0-rc.11

package/dist/skills/skills.service.js

@@ -1,20 +1,43 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 import { randomUUID } from "node:crypto";
 import { parseSkillMd, SKILL_ENTRY_FILE } from "@capybara-hq/plugin-sdk";
+import { Inject, Injectable } from "@nestjs/common";
 import { sql } from "kysely";
-import { assertItemInstallable } from "../catalog/requests.service.js";
-import { SKILL_PACKAGE_CONTENT_TYPE, skillFilesPrefix, } from "../conversations/attachments.service.js";
+import { offeredNamed } from "../catalog/component-state.js";
+import { PLATFORM_OWNER } from "../catalog/ownership.js";
+import { PlatformComponents } from "../catalog/platform-components.js";
+import { assertItemInstallable } from "../catalog/request-rules.js";
+import { AttachmentsService, SKILL_PACKAGE_CONTENT_TYPE, skillFilesPrefix, } from "../conversations/attachments.service.js";
 import { ApiError } from "../errors.js";
 import { audit } from "../identity/audit.js";
 import { assertCustomAllowed } from "../identity/settings.js";
-import { lockOrgAndAuthorize } from "../orgs/org-lock.js";
+import { notifySharedUpdate } from "../inbox/org-notices.js";
+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 { OrgLock } from "../orgs/org-lock.js";
 import { textBytesTokens } from "../runtime/context/tokens.js";
+import { StorageService } from "../storage/storage.service.js";
+import { buildSkillWrite } from "../tools/builtins/skill-write.js";
 import { invocationOf, PINNED_SKILLS_LIMITS } from "./catalog.js";
-import { readSkillPackage, storedInvocation } from "./package.js";
+import { checkBuiltSkillFiles, readSkillPackage, skillManifest, } from "./package.js";
+import { PLATFORM_SOURCE, platformSkillsOn, platformSource, skillFileStore, skillVersionsById, usableSkills, } from "./usable.js";
 /**
- * The live org skills named in `skillNames` whose provenance is not catalog item `itemId` (spec
- * §9.2, Decision 8): the org's own skills (`catalog_item_id` null: uploaded or written by an
- * agent) and the skills of other catalog items. A skill of the same item (a reinstall or upgrade)
- * is not a conflict. In the order of `skillNames`.
+ * The skills named in `skillNames` an org would see twice if catalog item `itemId` brought its
+ * skills (spec §9.2, Decision 8; rule 10 of the plugin scope spec): the org's own usable skills
+ * (`catalog_item_id` null: uploaded or written by an agent; unlinked, or pinned copies of another
+ * plugin's platform skill), org skills of other catalog items, and other plugins' platform skills
+ * on in the org. A skill of the same item (an org copy of it, linked or not) is not a conflict;
+ * an unpinned copy of another plugin's platform skill counts through that platform skill. In the
+ * order of `skillNames`.
  */
 export async function skillConflicts(db, orgId, itemId, skillNames) {
     if (skillNames.length === 0)
@@ -22,32 +45,71 @@ export async function skillConflicts(db, orgId, itemId, skillNames) {
     const rows = await db
         .selectFrom("skills as s")
         .leftJoin("catalog_items as i", "i.id", "s.catalog_item_id")
-        .select(["s.name", "s.catalog_item_id", "s.catalog_version", "i.name as item_name"])
+        .leftJoin("platform_skills as p", "p.id", "s.platform_skill_id")
+        .select([
+        "s.name",
+        "s.catalog_item_id",
+        "s.catalog_version",
+        "i.name as item_name",
+        "p.catalog_item_id as platform_item_id",
+        "p.plugin_name as platform_plugin",
+    ])
         .where("s.org_id", "=", orgId)
         .where("s.scope", "=", "org")
         .where("s.deleted_at", "is", null)
         .where("s.name", "in", [...skillNames])
+        .where((eb) => eb.or([eb("s.platform_skill_id", "is", null), eb("s.pinned_version", "is not", null)]))
         .where((eb) => eb.or([eb("s.catalog_item_id", "is", null), eb("s.catalog_item_id", "<>", itemId)]))
+        .where((eb) => eb.or([eb("p.catalog_item_id", "is", null), eb("p.catalog_item_id", "<>", itemId)]))
+        .execute();
+    const byName = new Map();
+    for (const r of rows) {
+        byName.set(r.name, r.catalog_item_id !== null
+            ? {
+                kind: "plugin",
+                name: r.item_name ?? r.catalog_item_id,
+                version: r.catalog_version ?? "",
+            }
+            : r.platform_plugin !== null
+                ? { kind: "plugin", name: r.platform_plugin, version: "" }
+                : { kind: "org" });
+    }
+    const platform = await db
+        .selectFrom("platform_skills as p")
+        .innerJoin("platform_skill_versions as v", (j) => j.onRef("v.skill_id", "=", "p.id").onRef("v.version", "=", "p.current_version"))
+        .select(["p.id", "p.name", "p.plugin_name", "v.catalog_version"])
+        .where("p.deleted_at", "is", null)
+        .where("p.name", "in", [...skillNames])
+        .where((eb) => eb.or([eb("p.catalog_item_id", "is", null), eb("p.catalog_item_id", "<>", itemId)]))
         .execute();
-    const byName = new Map(rows.map((r) => [r.name, r]));
+    const on = await platformSkillsOn(db, orgId, platform.map((p) => p.id));
+    for (const p of platform) {
+        if (!on.has(p.id) || byName.has(p.name))
+            continue;
+        byName.set(p.name, p.plugin_name !== null
+            ? { kind: "plugin", name: p.plugin_name, version: p.catalog_version ?? "" }
+            : { kind: "plugin", name: "platform", version: "" });
+    }
     const out = [];
     for (const name of new Set(skillNames)) {
-        const r = byName.get(name);
-        if (!r)
-            continue;
-        out.push({
-            skill: name,
-            source: r.catalog_item_id === null
-                ? { kind: "org" }
-                : {
-                    kind: "plugin",
-                    name: r.item_name ?? r.catalog_item_id,
-                    version: r.catalog_version ?? "",
-                },
-        });
+        const source = byName.get(name);
+        if (source)
+            out.push({ skill: name, source });
     }
     return out;
 }
+/**
+ * 409 `plugin.skill_conflict` for a new org skill named like platform skills offered to the org
+ * (rule 10): one detail per platform skill, its plugin as the source.
+ */
+function platformNameTaken(name, offered) {
+    const sources = offered.map((p) => ({
+        skill: name,
+        source: { kind: "plugin", name: p.plugin ?? "platform", version: "" },
+    }));
+    const by = sources.map((s) => `plugin "${s.source.name}"`).join(", ");
+    return new ApiError("plugin.skill_conflict", `Skill "${name}" is offered to this organization by ${by}; skill names are unique in an organization. Rename your skill and upload it again.`, sources);
+}
 /** One line of the conflict message (spec §9.2). */
 export function skillConflictLine(c) {
     const source = c.source.kind === "org"
@@ -64,12 +126,26 @@ const PUT_CONCURRENCY = 4;
 /** 详情里读取 SKILL.md 正文的上限。 */
 export const SKILL_BODY_MAX_BYTES = 1024 * 1024;
 const notFound = () => new ApiError("skill.not_found", "Skill not found");
+const nameExists = (name) => new ApiError("skill.name_exists", `A skill named "${name}" already exists in this organization. Choose another name.`);
+/** The checked files of a skill written as text (a built `SKILL.md`); `validation_failed` if not. */
+function textSkillFiles(input) {
+    const built = buildSkillWrite({
+        name: input.name,
+        description: input.description,
+        files: [{ path: SKILL_ENTRY_FILE, content: input.body }],
+    });
+    if ("errors" in built) {
+        throw new ApiError("validation_failed", `Invalid skill: ${built.errors[0] ?? "unknown problem"}`, built.errors.map((message) => ({ path: "body", message })));
+    }
+    return checkBuiltSkillFiles(built.files);
+}
 /**
- * 在调用方事务里核对 agent 定义引用的组织技能：每个 id 都必须是该组织未删除的 `scope=org` 技能，
+ * 在调用方事务里核对 agent 定义引用的组织技能：每个 id 都必须是该组织未删除的 `scope=org` 技能
+ * (or, phase 2, a platform skill on in the org: skills/usable.ts)，
  * 否则 `validation_failed`（path `skills.orgSkills.<i>`）；不可重复。调用方须已锁组织行（技能删除同样锁组织行，二者串行）。
  * `kept`：当前版本里已有的引用（保存时合法），修改时不再核对——技能之后被删也不挡住其他改动（运行时由 T14 忽略已删除的技能）。
  */
-export async function assertOrgSkills(t, orgId, ids, kept = new Set()) {
+export async function assertOrgSkills(db, orgId, ids, kept = new Set()) {
     const details = [];
     const seen = new Set();
     ids.forEach((id, i) => {
@@ -79,15 +155,12 @@ export async function assertOrgSkills(t, orgId, ids, kept = new Set()) {
     });
     const toCheck = [...seen].filter((id) => !kept.has(id));
     if (toCheck.length > 0) {
-        const found = await t
-            .selectFrom("skills")
-            .select("id")
-            .where("org_id", "=", orgId)
-            .where("scope", "=", "org")
-            .where("deleted_at", "is", null)
-            .where("id", "in", toCheck)
-            .execute();
-        const live = new Set([...kept, ...found.map((r) => r.id)]);
+        // The org's skills, its copies linked to a platform skill while that one is on in the org
+        // (as `assertPinnedSkills` sees them), and platform skills on in the org (phase 2)
+        const found = [...(await skillVersionsById(db, orgId, toCheck)).values()]
+            .filter((r) => r.scope === "org")
+            .map((r) => r.id);
+        const live = new Set([...kept, ...found]);
         ids.forEach((id, i) => {
             if (!live.has(id)) {
                 details.push({
@@ -117,7 +190,7 @@ export async function assertOrgSkills(t, orgId, ids, kept = new Set()) {
  *   when the pinned list changed: a pinned skill's new version never blocks an unrelated edit (the
  *   run keeps what fits).
  */
-export async function assertPinnedSkills(t, orgId, agentId, skills, kept = []) {
+export async function assertPinnedSkills(db, orgId, agentId, skills, kept = []) {
     const pinned = skills?.pinned;
     if (pinned === undefined)
         return;
@@ -136,17 +209,12 @@ export async function assertPinnedSkills(t, orgId, agentId, skills, kept = []) {
         }
         unique.push(id);
     }
-    const rows = unique.length === 0
-        ? []
-        : await t
-            .selectFrom("skills as s")
-            .innerJoin("skill_versions as v", (j) => j.onRef("v.skill_id", "=", "s.id").onRef("v.version", "=", "s.current_version"))
-            .select(["s.id", "s.scope", "s.agent_id", "v.manifest"])
-            .where("s.org_id", "=", orgId)
-            .where("s.deleted_at", "is", null)
-            .where("s.id", "in", unique)
-            .execute();
-    const byId = new Map(rows.map((r) => [r.id, r]));
+    // org and agent skills, org copies linked to a platform skill (its current version) and platform
+    // skills on in the org (phase 2)
+    const byId = new Map([...(await skillVersionsById(db, orgId, unique)).values()].map((r) => [
+        r.id,
+        { id: r.id, scope: r.scope, agent_id: r.agentId, manifest: r.manifest },
+    ]));
     const keptSet = new Set(kept);
     const selected = new Set(skills?.orgSkills ?? []);
     for (const id of unique) {
@@ -198,8 +266,52 @@ const summary = (r) => {
         tokenEstimate: textBytesTokens(entryBytes),
         manual: inv.model === false,
         fork: inv.fork !== undefined,
+        origin: "org",
+        shareable: r.scope === "org" && r.shareable,
     };
 };
+/** Platform skills with the columns of {@link summary} (phase 2). */
+const platformSummaryQuery = (db) => db
+    .selectFrom("platform_skills as p")
+    .leftJoin("platform_skill_versions as v", (j) => j.onRef("v.skill_id", "=", "p.id").onRef("v.version", "=", "p.current_version"))
+    .leftJoin("orgs as owner", "owner.id", "p.owner_org_id")
+    .select([
+    "p.id",
+    "p.name",
+    "p.description",
+    "p.current_version",
+    "p.created_at",
+    "p.updated_at",
+    "p.plugin_name",
+    "p.owner_org_id",
+    "owner.name as owner_name",
+    "v.source_format",
+    "v.suggest_pinned",
+    "v.manifest",
+])
+    .where("p.deleted_at", "is", null);
+const platformSummary = (r) => ({
+    ...summary({
+        id: r.id,
+        scope: "org",
+        agent_id: null,
+        name: r.name,
+        description: r.description,
+        current_version: r.current_version,
+        created_by: null,
+        created_at: r.created_at,
+        updated_at: r.updated_at,
+        item_name: r.plugin_name,
+        source_format: r.source_format,
+        suggest_pinned: r.suggest_pinned,
+        manifest: r.manifest,
+        shareable: false,
+    }),
+    origin: "platform",
+    owner: r.owner_org_id === null
+        ? PLATFORM_OWNER
+        : { kind: "org", orgId: r.owner_org_id, name: r.owner_name ?? r.owner_org_id },
+});
 /**
  * Skills with their summary columns: the catalog item name (provenance) and the current version's
  * source format, pinned suggestion and manifest.
@@ -222,21 +334,71 @@ const summaryQuery = (db) => db
     "v.source_format",
     "v.suggest_pinned",
     "v.manifest",
+    "s.shareable",
 ]);
 /**
  * 技能库（M5 T13）：组织技能的上传（新技能或新版本）、列表、详情与软删除。
  * 字节在对象存储 `kernel/<orgId>/skills/<uploadId>/<path>`，元数据在 PG；无进程内状态，可多副本共用。
  */
-export class SkillsService {
-    d;
-    constructor(d) {
-        this.d = d;
+export { skillManifest } from "./package.js";
+let SkillsService = class SkillsService {
+    db;
+    storage;
+    attachments;
+    txHost;
+    orgLock;
+    platform;
+    constructor(db, storage, attachments, txHost, orgLock, 
+    /** The owner's new versions of a skill it promoted go to the platform row (ruling P3-4). */
+    platform) {
+        this.db = db;
+        this.storage = storage;
+        this.attachments = attachments;
+        this.txHost = txHost;
+        this.orgLock = orgLock;
+        this.platform = platform;
+    }
+    /**
+     * Writes a package's files where its version will live: for a new version of a skill the org
+     * promoted (ruling P3-3: a live org skill of the name linked without a pin to a platform skill
+     * the org owns), the platform row's next version prefix in `deployment/` (ruling P3-4); else
+     * `kernel/<orgId>/<prefix>`. Returns the platform version prepared, if any. Never inside a
+     * transaction; the transaction checks that the skill is still promoted (and still at that
+     * version).
+     */
+    async putVersionFiles(orgId, pkg, prefix, catalog) {
+        const promoted = catalog ? undefined : await promotedSkillNamed(this.db.db, orgId, pkg.name);
+        if (promoted !== undefined)
+            return this.platform.prepareOwnerVersion(promoted, pkg.files);
+        await this.putFiles(orgId, prefix, pkg.files);
+        return undefined;
+    }
+    /**
+     * The summary of the org's skill `copyId` it promoted to `platformId`, as it serves now: the
+     * platform row's current version (ruling P3-4) under the org row's id, still the org's own.
+     */
+    async promotedSummary(copyId, platformId) {
+        const own = await summaryQuery(this.db.db).where("s.id", "=", copyId).executeTakeFirstOrThrow();
+        const p = await platformSummaryQuery(this.db.db)
+            .where("p.id", "=", platformId)
+            .executeTakeFirst();
+        if (!p)
+            return summary(own);
+        return {
+            ...platformSummary(p),
+            id: copyId,
+            origin: "org",
+            plugin: own.item_name,
+            createdBy: own.created_by,
+            createdAt: own.created_at,
+            shareable: own.shareable,
+        };
     }
     /** 登记一个技能包上传（预签名 POST，`application/zip`，≤ 50MB）；角色由路由的 `skills.manage` 把关。 */
     async createUpload(orgId, accountId, input) {
-        // 部署设置 customSkills 为 deny：组织只能从企业目录安装技能（C22）
-        await assertCustomAllowed(this.d.db, "customSkills");
-        return this.d.attachments.create(orgId, accountId, { name: input.name, contentType: SKILL_PACKAGE_CONTENT_TYPE, size: input.size }, "skill-package");
+        // 部署设置 customSkills 为 deny：组织只能从平台目录安装技能（C22）
+        await assertCustomAllowed(this.db.db, "customSkills");
+        return this.attachments.create(orgId, accountId, { name: input.name, contentType: SKILL_PACKAGE_CONTENT_TYPE, size: input.size }, "skill-package");
     }
     /**
      * 用一个技能包上传创建技能或新增版本：
@@ -247,11 +409,11 @@ export class SkillsService {
      * 第 3 步之前中断不会留下可见的版本；已写的文件由清理任务在上传过期后删除（未被任何版本引用时）。
      * 同一上传已经产生过版本（上次提交了、响应丢了而重试）→ 直接返回那个版本（同组织、同一发起人）。
      */
-    async upload(orgId, actorAccountId, uploadId, actorTokenId) {
-        this.d.storage.assertAvailable();
+    async upload(orgId, actorAccountId, uploadId, actorTokenId, shareable) {
+        this.storage.assertAvailable();
         const prefix = skillFilesPrefix(uploadId);
         // 重试（上次已提交、响应丢了）：同一上传已产生的版本直接返回，不再要求上传仍可用
-        const done = await this.d.db
+        const done = await this.db
             .selectFrom("skill_versions")
             .innerJoin("skills", "skills.id", "skill_versions.skill_id")
             .select(["skills.id", "skill_versions.version"])
@@ -261,37 +423,115 @@ export class SkillsService {
             .where("skills.deleted_at", "is", null)
             .executeTakeFirst();
         if (done) {
-            const row = await summaryQuery(this.d.db)
+            const row = await summaryQuery(this.db.db)
                 .where("s.id", "=", done.id)
                 .executeTakeFirstOrThrow();
             return { skill: summary(row), version: done.version, created: done.version === 1 };
         }
         // 自建被禁止时先拒绝（事务里再复核一次）
-        await assertCustomAllowed(this.d.db, "customSkills");
-        const zip = await this.d.attachments.readSkillPackage(orgId, actorAccountId, uploadId);
+        await assertCustomAllowed(this.db.db, "customSkills");
+        const zip = await this.attachments.readSkillPackage(orgId, actorAccountId, uploadId);
         const pkg = await readSkillPackage(zip);
-        return this.createVersionFromFiles(orgId, actorAccountId, pkg, {
+        // A skill the org promoted gets its version on the platform row (ruling P3-4). Its retry after
+        // a lost response is not recognized above (the lookup is by the org prefix): the consumed
+        // upload is refused and the owner sees the version in the library (accepted, review M6)
+        const owner = await this.putVersionFiles(orgId, pkg, prefix, false);
+        try {
+            return await this.createUploadedVersionIn(orgId, actorAccountId, uploadId, pkg, prefix, actorTokenId, shareable, owner);
+        }
+        catch (e) {
+            if (owner !== undefined)
+                await this.platform.discardPrefix(owner.prefix);
+            throw e;
+        }
+    }
+    /**
+     * The transaction of {@link upload}: under the org row lock (re-checking `skills.manage`), the
+     * custom-skill policy is re-checked and the upload consumed (of concurrent requests for the same
+     * upload only one succeeds), then the version is written in the same transaction
+     * ({@link createVersionIn} joins it).
+     */
+    async createUploadedVersionIn(orgId, actorAccountId, uploadId, pkg, prefix, actorTokenId, shareable, owner) {
+        await this.orgLock.lockAndAuthorize(orgId, actorAccountId, "skills.manage");
+        await assertCustomAllowed(this.db.db, "customSkills");
+        await this.attachments.consumeSkillPackage(orgId, actorAccountId, uploadId);
+        return this.createVersionIn(orgId, actorAccountId, pkg, skillManifest(pkg), prefix, {
             prefix,
             ...(actorTokenId !== undefined && { actorTokenId }),
-            inTransaction: async (t) => {
-                await assertCustomAllowed(t, "customSkills");
-                await this.d.attachments.consumeSkillPackage(t, orgId, actorAccountId, uploadId);
-            },
+            ...(shareable !== undefined && { shareable }),
+            ...(owner !== undefined && { owner }),
         });
     }
     /**
-     * 用一组已校验的技能文件创建组织技能或给同名技能新增版本（上传与企业目录安装共用）：
+     * The read-only checks of {@link createFromText}, for the `Platform` tool's precheck (before the
+     * card): custom skills allowed, a valid `SKILL.md`, and no live org skill of the name. Throws the
+     * same `ApiError` the create would; the create checks the name again under its lock.
+     */
+    async checkCreateFromText(orgId, input) {
+        await assertCustomAllowed(this.db.db, "customSkills");
+        const pkg = textSkillFiles(input);
+        const existing = await this.db
+            .selectFrom("skills")
+            .select("id")
+            .where("org_id", "=", orgId)
+            .where("scope", "=", "org")
+            .where("name", "=", pkg.name)
+            .where("deleted_at", "is", null)
+            .executeTakeFirst();
+        if (existing)
+            throw nameExists(pkg.name);
+    }
+    /**
+     * Creates an org skill from text (spec §14, P3-24): `SKILL.md` is built from the name,
+     * description and body ({@link buildSkillWrite}, the description a YAML string) and checked like
+     * an uploaded package. The same policy and name rules as an upload, except that a live org skill
+     * of that name is `skill.name_exists` (409) instead of a new version.
+     */
+    async createFromText(orgId, actorAccountId, input) {
+        this.storage.assertAvailable();
+        await assertCustomAllowed(this.db.db, "customSkills");
+        const pkg = textSkillFiles(input);
+        const prefix = skillFilesPrefix(randomUUID());
+        await this.putFiles(orgId, prefix, pkg.files);
+        return this.createVersionIn(orgId, actorAccountId, pkg, skillManifest(pkg), prefix, {
+            prefix,
+            failIfExists: true,
+            ...(input.actorTokenId !== undefined && { actorTokenId: input.actorTokenId }),
+            ...(input.auditDetail !== undefined && { auditDetail: input.auditDetail }),
+            ...(input.shareable !== undefined && { shareable: input.shareable }),
+        });
+    }
+    /**
+     * 用一组已校验的技能文件创建组织技能或给同名技能新增版本（上传与平台目录安装共用）：
      * 1. 把文件写到 `kernel/<orgId>/<prefix>`（缺省 `skills/<新 id>/`）；
-     * 2. 一个事务里：锁组织行并复核 `skills.manage`，执行 `inTransaction`（上传：标记上传已用；目录：按条目策略复核），
+     * 2. 一个事务里：锁组织行并复核 `skills.manage`（目录安装：按条目策略复核），
      *    同名未删除的组织技能存在则 `current_version + 1`，否则新建；技能与版本都记下 `directory` 来源（没有则清空：
      *    自定义上传盖在目录技能上就不再算目录安装），写版本与审计
      *    （`skill.created` / `skill.version_created`，目录安装时 detail 带 directory）。
      */
-    async createVersionFromFiles(orgId, actorAccountId, pkg, opts = {}) {
-        this.d.storage.assertAvailable();
+    async createVersionFromFiles(orgId, 
+    /** null: the kernel itself (the plugin scope sync installing a plugin), no role check. */
+    actorAccountId, pkg, opts = {}) {
+        this.storage.assertAvailable();
         const prefix = opts.prefix ?? skillFilesPrefix(randomUUID());
-        const store = this.d.storage.kernel(orgId);
-        const queue = [...pkg.files];
+        const owner = await this.putVersionFiles(orgId, pkg, prefix, opts.catalog !== undefined);
+        try {
+            return await this.createVersionIn(orgId, actorAccountId, pkg, skillManifest(pkg), prefix, {
+                ...opts,
+                ...(owner !== undefined && { owner }),
+            });
+        }
+        catch (e) {
+            // the loser of two owner versions racing for one number: its objects go (ruling P3-45)
+            if (owner !== undefined)
+                await this.platform.discardPrefix(owner.prefix);
+            throw e;
+        }
+    }
+    /** Writes a skill package's files to `kernel/<orgId>/<prefix>` (a few at a time). */
+    async putFiles(orgId, prefix, files) {
+        const store = this.storage.kernel(orgId);
+        const queue = [...files];
         await Promise.all(Array.from({ length: Math.min(PUT_CONCURRENCY, queue.length) }, async () => {
             for (let f = queue.shift(); f; f = queue.shift()) {
                 await store.put(`${prefix}${f.path}`, f.data, {
@@ -300,108 +540,145 @@ export class SkillsService {
                 });
             }
         }));
-        const invocation = pkg.invocation && storedInvocation(pkg.invocation);
-        const manifest = {
-            name: pkg.name,
-            description: pkg.description,
-            files: pkg.files.map(({ path, size, sha256 }) => ({ path, size, sha256 })),
-            ...(invocation !== undefined && { invocation }),
-        };
-        const actorTokenId = opts.actorTokenId;
-        return this.d.db.transaction().execute(async (t) => {
-            await lockOrgAndAuthorize(t, orgId, actorAccountId, "skills.manage");
-            if (opts.catalog) {
-                const c = opts.catalog;
-                await assertItemInstallable(t, orgId, c.itemId, c.approvedBy ?? c.itemId);
-            }
-            await opts.inTransaction?.(t);
-            const existing = await t
-                .selectFrom("skills")
-                .select(["id", "current_version", "catalog_item_id"])
-                .where("org_id", "=", orgId)
-                .where("scope", "=", "org")
-                .where("name", "=", pkg.name)
-                .where("deleted_at", "is", null)
-                .forUpdate()
-                .executeTakeFirst();
-            // A catalog install never overwrites a skill of other provenance (spec §9.2; planning checks
-            // it first, this closes the race with a skill created since)
-            if (existing && opts.catalog && existing.catalog_item_id !== opts.catalog.itemId) {
-                const conflicts = await skillConflicts(t, orgId, opts.catalog.itemId, [pkg.name]);
-                if (conflicts.length > 0)
-                    throw skillConflictError(conflicts);
+    }
+    /** The transaction of {@link createVersionFromFiles}. */
+    async createVersionIn(orgId, actorAccountId, pkg, manifest, prefix, opts) {
+        await this.orgLock.lockFor(orgId, actorAccountId, "skills.manage");
+        if (opts.catalog) {
+            const c = opts.catalog;
+            await assertItemInstallable(this.db.db, orgId, c.itemId, c.approvedBy ?? c.itemId);
+        }
+        const existing = await this.db
+            .selectFrom("skills")
+            .select(["id", "current_version", "catalog_item_id", "platform_skill_id"])
+            .where("org_id", "=", orgId)
+            .where("scope", "=", "org")
+            .where("name", "=", pkg.name)
+            .where("deleted_at", "is", null)
+            .forUpdate()
+            .executeTakeFirst();
+        if (existing && opts.failIfExists)
+            throw nameExists(pkg.name);
+        // The org's own skill it promoted (ruling P3-3): its new version goes to the platform row and
+        // reaches every org using it (ruling P3-4); the files were written there before this
+        // transaction, for the platform version current then
+        const promoted = existing && !opts.catalog
+            ? await promotedSkillNamed(this.db.db, orgId, pkg.name, existing.id)
+            : undefined;
+        if (promoted !== undefined || opts.owner !== undefined) {
+            if (existing === undefined || promoted === undefined || opts.owner?.platformId !== promoted) {
+                throw new ApiError("component.version_stale", "The skill changed while this version was uploaded; upload it again");
             }
-            const id = existing?.id ?? randomUUID();
-            const version = (existing?.current_version ?? 0) + 1;
-            // 来源跟着最新版本走：目录安装记条目与版本，自定义上传清掉（内容已不是目录里的那份）
-            const provenance = {
-                catalog_item_id: opts.catalog?.itemId ?? null,
-                catalog_version: opts.catalog?.version ?? null,
+            const version = await this.platform.addOwnerVersionIn(opts.owner, manifest, actorAccountId);
+            await audit(this.db.db, {
+                actorAccountId,
+                ...(opts.actorTokenId !== undefined && { actorTokenId: opts.actorTokenId }),
+                orgId,
+                action: "skill.version_created",
+                target: existing.id,
+                detail: { name: pkg.name, version, files: manifest.files.length, platformId: promoted },
+            });
+            await notifySharedUpdate(this.db.db, { kind: "skill", id: promoted }, { name: pkg.name, from: String(version - 1), to: String(version) });
+            return {
+                skill: await this.promotedSummary(existing.id, promoted),
+                version,
+                created: false,
             };
-            if (existing) {
-                await t
-                    .updateTable("skills")
-                    .set({
-                    current_version: version,
-                    description: pkg.description,
-                    ...provenance,
-                    updated_at: sql `now()`,
-                })
-                    .where("id", "=", id)
-                    .execute();
-            }
-            else {
-                await t
-                    .insertInto("skills")
-                    .values({
-                    id,
-                    org_id: orgId,
-                    scope: "org",
-                    agent_id: null,
-                    name: pkg.name,
-                    description: pkg.description,
-                    current_version: 1,
-                    created_by: actorAccountId,
-                    ...provenance,
-                })
-                    .execute();
-            }
-            await t
-                .insertInto("skill_versions")
+        }
+        // A catalog install never overwrites a skill of other provenance (spec §9.2; planning checks
+        // it first, this closes the race with a skill created since)
+        if (existing && opts.catalog && existing.catalog_item_id !== opts.catalog.itemId) {
+            const conflicts = await skillConflicts(this.db.db, orgId, opts.catalog.itemId, [pkg.name]);
+            if (conflicts.length > 0)
+                throw skillConflictError(conflicts);
+        }
+        // Rule 10 (plugin scope phase 2, ruling P2-3): a new org skill may not take the name of a
+        // platform skill offered to the org (on, or one an org admin could switch on)
+        if (!existing && !opts.catalog) {
+            const offered = await offeredNamed(this.db.db, orgId, "skill", pkg.name);
+            if (offered.length > 0)
+                throw platformNameTaken(pkg.name, offered);
+        }
+        const id = existing?.id ?? randomUUID();
+        const version = (existing?.current_version ?? 0) + 1;
+        // An org's own version of a copy linked to a platform skill pins the copy to it (ruling P2-4):
+        // the org's change takes effect, and shows as individually updated later
+        const pin = existing && existing.platform_skill_id !== null && !opts.catalog
+            ? { pinned_version: version }
+            : {};
+        // 来源跟着最新版本走：目录安装记条目与版本，自定义上传清掉（内容已不是目录里的那份）
+        const provenance = {
+            catalog_item_id: opts.catalog?.itemId ?? null,
+            catalog_version: opts.catalog?.version ?? null,
+        };
+        if (existing) {
+            await this.db
+                .updateTable("skills")
+                .set({
+                current_version: version,
+                description: pkg.description,
+                ...provenance,
+                ...pin,
+                updated_at: sql `now()`,
+            })
+                .where("id", "=", id)
+                .execute();
+        }
+        else {
+            await this.db
+                .insertInto("skills")
                 .values({
-                skill_id: id,
-                version,
-                manifest: JSON.stringify(manifest),
-                object_prefix: prefix,
+                id,
+                org_id: orgId,
+                scope: "org",
+                agent_id: null,
+                name: pkg.name,
+                description: pkg.description,
+                current_version: 1,
                 created_by: actorAccountId,
+                ...(opts.shareable !== undefined && { shareable: opts.shareable }),
                 ...provenance,
-                source_format: opts.catalog?.format ?? "capybara",
-                suggest_pinned: opts.catalog?.suggestPinned ?? false,
             })
                 .execute();
-            await audit(t, {
-                actorAccountId,
-                ...(actorTokenId !== undefined && { actorTokenId }),
-                orgId,
-                action: existing ? "skill.version_created" : "skill.created",
-                target: id,
-                detail: {
-                    name: pkg.name,
-                    version,
-                    files: manifest.files.length,
-                    ...(opts.catalog && { catalog: opts.catalog }),
-                },
-            });
-            const row = await summaryQuery(t).where("s.id", "=", id).executeTakeFirstOrThrow();
-            return { skill: summary(row), version, created: !existing };
+        }
+        await this.db
+            .insertInto("skill_versions")
+            .values({
+            skill_id: id,
+            version,
+            manifest: JSON.stringify(manifest),
+            object_prefix: prefix,
+            created_by: actorAccountId,
+            ...provenance,
+            source_format: opts.catalog?.format ?? "capybara",
+            suggest_pinned: opts.catalog?.suggestPinned ?? false,
+        })
+            .execute();
+        await audit(this.db.db, {
+            actorAccountId,
+            ...(opts.actorTokenId !== undefined && { actorTokenId: opts.actorTokenId }),
+            orgId,
+            action: existing ? "skill.version_created" : "skill.created",
+            target: id,
+            detail: {
+                name: pkg.name,
+                version,
+                files: manifest.files.length,
+                ...(opts.catalog && { catalog: opts.catalog }),
+                ...opts.auditDetail,
+            },
         });
+        const row = await summaryQuery(this.db.db).where("s.id", "=", id).executeTakeFirstOrThrow();
+        return { skill: summary(row), version, created: !existing };
     }
     /**
-     * 在调用方事务里撤销应用安装给已有技能加的版本（调用方已锁组织行）：只有当前版本仍是 `version` 时才退回上一版本并删掉
-     * 该版本行（之后又有新版本则不动，返回 false），技能的描述与目录来源也退回上一版本的。审计 `skill.version_reverted`。
+     * In the caller's transaction (`mandatory`: the caller holds the org row lock), reverts the
+     * version a plugin install added to an existing skill: only while `version` is still current,
+     * back to the previous version, deleting this version's row (returns false when a newer version
+     * exists); the skill's description and catalog source revert too. Audit `skill.version_reverted`.
      */
-    async revertVersionIn(t, orgId, skillId, version, actorAccountId, reason) {
-        const row = await t
+    async revertVersionIn(orgId, skillId, version, actorAccountId, reason) {
+        const row = await this.db
             .selectFrom("skills")
             .select(["current_version", "name"])
             .where("id", "=", skillId)
@@ -411,13 +688,13 @@ export class SkillsService {
             .executeTakeFirst();
         if (!row || row.current_version !== version || version <= 1)
             return false;
-        const prev = await t
+        const prev = await this.db
             .selectFrom("skill_versions")
             .select(["manifest", "catalog_item_id", "catalog_version"])
             .where("skill_id", "=", skillId)
             .where("version", "=", version - 1)
             .executeTakeFirst();
-        await t
+        await this.db
             .updateTable("skills")
             .set({
             current_version: version - 1,
@@ -430,12 +707,12 @@ export class SkillsService {
         })
             .where("id", "=", skillId)
             .execute();
-        await t
+        await this.db
             .deleteFrom("skill_versions")
             .where("skill_id", "=", skillId)
             .where("version", "=", version)
             .execute();
-        await audit(t, {
+        await audit(this.db.db, {
             actorAccountId,
             orgId,
             action: "skill.version_reverted",
@@ -445,11 +722,12 @@ export class SkillsService {
         return true;
     }
     /**
-     * 在调用方事务里软删除组织技能（调用方已锁组织行；应用安装的回滚与卸载用）。审计 `skill.deleted`（带 reason）。
-     * 已删除 / 不存在时返回 false。
+     * In the caller's transaction (`mandatory`: the caller holds the org row lock), soft-deletes an
+     * org skill (plugin install rollback and uninstall). Audit `skill.deleted` with the reason.
+     * Returns false when it is already deleted or missing.
      */
-    async softDeleteIn(t, orgId, skillId, actorAccountId, reason) {
-        const r = await t
+    async softDeleteIn(orgId, skillId, actorAccountId, reason) {
+        const r = await this.db
             .updateTable("skills")
             .set({ deleted_at: sql `now()`, updated_at: sql `now()` })
             .where("id", "=", skillId)
@@ -460,7 +738,7 @@ export class SkillsService {
             .executeTakeFirst();
         if (!r)
             return false;
-        await audit(t, {
+        await audit(this.db.db, {
             actorAccountId,
             orgId,
             action: "skill.deleted",
@@ -469,19 +747,50 @@ export class SkillsService {
         });
         return true;
     }
-    /** 组织技能库（`scope=org`、未删除），按名字排序。 */
+    /**
+     * The org skill library, sorted by name: the org's live `scope=org` skills except copies linked
+     * to a platform skill without a pin, and the platform skills on in the org (phase 2,
+     * `usableSkills`; `origin` tells them apart), each with the ids of those copies (`linkedIds`).
+     */
     async list(orgId) {
-        const rows = await summaryQuery(this.d.db)
-            .where("s.org_id", "=", orgId)
-            .where("s.scope", "=", "org")
-            .where("s.deleted_at", "is", null)
-            .orderBy("s.name")
+        const usable = await usableSkills(this.db.db, orgId);
+        const orgIds = usable.filter((u) => u.origin === "org").map((u) => u.id);
+        const platformIds = usable.filter((u) => u.origin === "platform").map((u) => u.id);
+        // the org's own skills it promoted serving a newer platform version (ruling P3-4)
+        const promotedTo = new Map(usable.flatMap((u) => u.origin === "org" &&
+            u.platformSkillId !== undefined &&
+            u.source.startsWith(PLATFORM_SOURCE)
+            ? [[u.id, u.platformSkillId]]
+            : []));
+        const own = orgIds.length === 0
+            ? []
+            : await Promise.all((await summaryQuery(this.db.db).where("s.id", "in", orgIds).orderBy("s.name").execute()).map((r) => {
+                const to = promotedTo.get(r.id);
+                return to === undefined ? summary(r) : this.promotedSummary(r.id, to);
+            }));
+        if (platformIds.length === 0)
+            return own;
+        const links = await this.db
+            .selectFrom("skills")
+            .select(["id", "platform_skill_id"])
+            .where("org_id", "=", orgId)
+            .where("scope", "=", "org")
+            .where("deleted_at", "is", null)
+            .where("pinned_version", "is", null)
+            .where("platform_skill_id", "in", platformIds)
+            .orderBy("id")
             .execute();
-        return rows.map(summary);
+        const linked = new Map();
+        for (const l of links) {
+            const k = l.platform_skill_id;
+            linked.set(k, [...(linked.get(k) ?? []), l.id]);
+        }
+        const platform = (await platformSummaryQuery(this.db.db).where("p.id", "in", platformIds).execute()).map((r) => ({ ...platformSummary(r), linkedIds: linked.get(r.id) ?? [] }));
+        return [...own, ...platform].sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : a.id < b.id ? -1 : 1);
     }
     /** 对该 agent 自动生效的技能（`scope=agent`、未删除），按名字排序。 */
     async listForAgent(orgId, agentId) {
-        const rows = await summaryQuery(this.d.db)
+        const rows = await summaryQuery(this.db.db)
             .where("s.org_id", "=", orgId)
             .where("s.scope", "=", "agent")
             .where("s.agent_id", "=", agentId)
@@ -490,17 +799,43 @@ export class SkillsService {
             .execute();
         return rows.map(summary);
     }
-    /** 组织技能详情：各版本与文件清单。不存在 / 已删除 / 不是组织技能 → `skill.not_found`。 */
+    /**
+     * 组织技能详情：各版本与文件清单。不存在 / 已删除 / 不是组织技能 → `skill.not_found`。
+     * An org copy linked to a platform skill without a pin (ruling B2) serves the platform skill's
+     * content under its own id, so its detail is the platform skill's (its id, versions and body;
+     * 404 while that skill is off in the org); a pinned copy keeps its own (Task 10).
+     */
     async get(orgId, skillId) {
-        const row = await summaryQuery(this.d.db)
+        const link = await this.db
+            .selectFrom("skills")
+            .select("platform_skill_id")
+            .where("id", "=", skillId)
+            .where("org_id", "=", orgId)
+            .where("scope", "=", "org")
+            .where("deleted_at", "is", null)
+            .where("platform_skill_id", "is not", null)
+            .where("pinned_version", "is", null)
+            .executeTakeFirst();
+        if (link?.platform_skill_id) {
+            // the org's own skill it promoted is its own (ruling P3-3): its stored version while that is
+            // the platform's current one, else the platform's newer version under its id (ruling P3-4)
+            const served = (await skillVersionsById(this.db.db, orgId, [skillId])).get(skillId);
+            if (served?.origin !== "org")
+                return this.getPlatform(orgId, link.platform_skill_id);
+            if (served.source.startsWith(PLATFORM_SOURCE)) {
+                const detail = await this.getPlatform(orgId, link.platform_skill_id);
+                return { ...detail, ...(await this.promotedSummary(skillId, link.platform_skill_id)) };
+            }
+        }
+        const row = await summaryQuery(this.db.db)
             .where("s.id", "=", skillId)
             .where("s.org_id", "=", orgId)
             .where("s.scope", "=", "org")
             .where("s.deleted_at", "is", null)
             .executeTakeFirst();
         if (!row)
-            throw notFound();
-        const versions = await this.d.db
+            return this.getPlatform(orgId, skillId);
+        const versions = await this.db
             .selectFrom("skill_versions")
             .select(["version", "manifest", "created_by", "created_at", "object_prefix"])
             .where("skill_id", "=", skillId)
@@ -519,13 +854,51 @@ export class SkillsService {
             })),
         };
     }
+    /**
+     * A platform skill's detail (phase 2): only while it is on in the org, else `skill.not_found`.
+     * Its versions are the platform skill's.
+     */
+    async getPlatform(orgId, skillId) {
+        const usable = (await skillVersionsById(this.db.db, orgId, [skillId])).get(skillId);
+        if (usable?.origin !== "platform" || usable.platformSkillId !== skillId)
+            throw notFound();
+        const row = await platformSummaryQuery(this.db.db)
+            .where("p.id", "=", skillId)
+            .executeTakeFirst();
+        if (!row)
+            throw notFound();
+        const versions = await this.db
+            .selectFrom("platform_skill_versions")
+            .select(["version", "manifest", "created_by", "created_at", "object_prefix"])
+            .where("skill_id", "=", skillId)
+            .orderBy("version", "desc")
+            .execute();
+        const current = versions.find((v) => v.version === row.current_version);
+        return {
+            ...platformSummary(row),
+            body: current
+                ? await this.readBody(orgId, {
+                    manifest: current.manifest,
+                    object_prefix: platformSource(current.object_prefix),
+                })
+                : null,
+            versions: versions.map((v) => ({
+                version: v.version,
+                description: v.manifest.description,
+                files: v.manifest.files,
+                createdBy: v.created_by,
+                createdAt: v.created_at,
+            })),
+        };
+    }
     /** 读某版本 SKILL.md 的正文（见 {@link SkillDetail.body}）；任何读取问题都返回 null，不让详情失败。 */
     async readBody(orgId, v) {
         const entry = v.manifest.files.find((f) => f.path === SKILL_ENTRY_FILE);
         if (!entry || entry.size > SKILL_BODY_MAX_BYTES)
             return null;
         try {
-            const got = await this.d.storage.kernel(orgId).get(`${v.object_prefix}${SKILL_ENTRY_FILE}`);
+            const { store, prefix } = skillFileStore(this.storage, orgId, v.object_prefix);
+            const got = await store.get(`${prefix}${SKILL_ENTRY_FILE}`);
             if (!got)
                 return null;
             const text = new TextDecoder("utf-8", { fatal: true }).decode(await new Response(got.body).arrayBuffer());
@@ -541,27 +914,86 @@ export class SkillsService {
      * 保存时会被拒绝（运行时由 T14 忽略已删除的技能）。不存在 / 已删除 → `skill.not_found`。
      */
     async softDelete(orgId, skillId, actorAccountId, actorTokenId) {
-        await this.d.db.transaction().execute(async (t) => {
-            await lockOrgAndAuthorize(t, orgId, actorAccountId, "skills.manage");
-            const r = await t
-                .updateTable("skills")
-                .set({ deleted_at: sql `now()`, updated_at: sql `now()` })
-                .where("id", "=", skillId)
-                .where("org_id", "=", orgId)
-                .where("scope", "=", "org")
-                .where("deleted_at", "is", null)
-                .returning(["name"])
-                .executeTakeFirst();
-            if (!r)
-                throw notFound();
-            await audit(t, {
-                actorAccountId,
-                ...(actorTokenId !== undefined && { actorTokenId }),
-                orgId,
-                action: "skill.deleted",
-                target: skillId,
-                detail: { name: r.name },
-            });
+        await this.softDeleteTx(orgId, skillId, actorAccountId, actorTokenId);
+    }
+    /** The transaction of {@link softDelete}. */
+    async softDeleteTx(orgId, skillId, actorAccountId, actorTokenId) {
+        await this.orgLock.lockAndAuthorize(orgId, actorAccountId, "skills.manage");
+        await this.deleteOrgSkillIn(orgId, skillId, actorAccountId, actorTokenId);
+    }
+    /**
+     * In the caller's transaction (`mandatory`: the caller holds the org row lock and checked
+     * `skills.manage`), soft-deletes an org-scope skill of the org: what {@link softDelete} writes
+     * (audit `skill.deleted`); missing or deleted -> `skill.not_found`. The owner delete of a
+     * promoted skill (`OwnedItems.deleteSkill`) calls it after its platform row was dealt with.
+     */
+    async deleteOrgSkillIn(orgId, skillId, actorAccountId, actorTokenId, auditDetail) {
+        const r = await this.db
+            .updateTable("skills")
+            .set({ deleted_at: sql `now()`, updated_at: sql `now()` })
+            .where("id", "=", skillId)
+            .where("org_id", "=", orgId)
+            .where("scope", "=", "org")
+            .where("deleted_at", "is", null)
+            .returning(["name"])
+            .executeTakeFirst();
+        if (!r)
+            throw notFound();
+        await audit(this.db.db, {
+            actorAccountId,
+            ...(actorTokenId !== undefined && { actorTokenId }),
+            orgId,
+            action: "skill.deleted",
+            target: skillId,
+            detail: { name: r.name, ...auditDetail },
         });
     }
+};
+__decorate([
+    Transactional()
+], SkillsService.prototype, "createUploadedVersionIn", null);
+__decorate([
+    Transactional()
+], SkillsService.prototype, "createVersionIn", null);
+__decorate([
+    Transactional({ propagation: "mandatory" })
+], SkillsService.prototype, "revertVersionIn", null);
+__decorate([
+    Transactional({ propagation: "mandatory" })
+], SkillsService.prototype, "softDeleteIn", null);
+__decorate([
+    Transactional()
+], SkillsService.prototype, "softDeleteTx", null);
+__decorate([
+    Transactional({ propagation: "mandatory" })
+], SkillsService.prototype, "deleteOrgSkillIn", null);
+SkillsService = __decorate([
+    Injectable(),
+    __param(0, Inject(KernelDb)),
+    __param(1, Inject(StorageService)),
+    __param(2, Inject(AttachmentsService)),
+    __param(3, Inject(TransactionHost)),
+    __param(4, Inject(OrgLock)),
+    __param(5, Inject(PlatformComponents))
+], SkillsService);
+export { SkillsService };
+/**
+ * The platform skill the org's live org skill `name` was promoted to (ruling P3-3: linked without
+ * a pin to a live platform skill the org owns), else undefined. `id`: only that skill.
+ */
+async function promotedSkillNamed(db, orgId, name, id) {
+    let q = db
+        .selectFrom("skills as s")
+        .innerJoin("platform_skills as p", "p.id", "s.platform_skill_id")
+        .select("p.id")
+        .where("s.org_id", "=", orgId)
+        .where("s.scope", "=", "org")
+        .where("s.name", "=", name)
+        .where("s.deleted_at", "is", null)
+        .where("s.pinned_version", "is", null)
+        .where("p.owner_org_id", "=", orgId)
+        .where("p.deleted_at", "is", null);
+    if (id !== undefined)
+        q = q.where("s.id", "=", id);
+    return (await q.executeTakeFirst())?.id;
 }