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

package/dist/skills/skills.module.js

@@ -6,10 +6,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { Module } from "@nestjs/common";
 import { AgentLookupModule } from "../agents/agent-lookup.js";
+import { CatalogImportModule } from "../catalog/catalog-import.module.js";
 import { AttachmentsModule } from "../conversations/attachments.module.js";
 import { EventLogModule } from "../conversations/event-log.js";
 import { OrgLockModule } from "../orgs/org-lock.js";
 import { StorageModule } from "../storage/storage.module.js";
+import { AgentSkillsService } from "./agent-skills.service.js";
 import { SkillsCatalogService } from "./catalog.js";
 import { SkillChangesService } from "./changes.service.js";
 import { SkillInvoker } from "./invoke.js";
@@ -22,9 +24,29 @@ let SkillsModule = class SkillsModule {
 };
 SkillsModule = __decorate([
     Module({
-        imports: [StorageModule, OrgLockModule, EventLogModule, AttachmentsModule, AgentLookupModule],
-        providers: [SkillsService, SkillChangesService, SkillsCatalogService, SkillInvoker],
-        exports: [SkillsService, SkillChangesService, SkillsCatalogService, SkillInvoker],
+        imports: [
+            StorageModule,
+            OrgLockModule,
+            EventLogModule,
+            AttachmentsModule,
+            AgentLookupModule,
+            // the owner's new version of a skill it promoted goes to the platform row (ruling P3-4)
+            CatalogImportModule,
+        ],
+        providers: [
+            AgentSkillsService,
+            SkillsService,
+            SkillChangesService,
+            SkillsCatalogService,
+            SkillInvoker,
+        ],
+        exports: [
+            AgentSkillsService,
+            SkillsService,
+            SkillChangesService,
+            SkillsCatalogService,
+            SkillInvoker,
+        ],
     })
 ], SkillsModule);
 export { SkillsModule };

package/dist/skills/skills.schemas.d.ts

@@ -0,0 +1,44 @@
+import { z } from "zod";
+import type { RouteSchemas } from "../platform/route-schemas.js";
+/** `POST /skills`: an uploaded skill package (`POST /skills/uploads` gives the id); no text form. */
+export declare const SkillCreateBody: z.ZodObject<{
+    uploadId: z.ZodString;
+    shareable: z.ZodOptional<z.ZodBoolean>;
+}, z.core.$strict>;
+/** `:id` where the route validates it (`@ZParam`). */
+export declare const SkillIdParams: z.ZodObject<{
+    id: z.ZodString;
+}, z.core.$strip>;
+/** `:id` where the route takes it as is (`@Param`). */
+export declare const SkillPathParams: z.ZodObject<{
+    id: z.ZodString;
+}, z.core.$strip>;
+export declare const SkillShareableSchema: z.ZodObject<{
+    shareable: z.ZodBoolean;
+}, z.core.$strict>;
+/** `:id` of `GET /skill-changes/:id` (taken as is). */
+export declare const SkillChangePathParams: z.ZodObject<{
+    id: z.ZodString;
+}, z.core.$strip>;
+/** `:agentId` of the agent's skills and invocable skills routes (taken as is). */
+export declare const AgentSkillsListParams: z.ZodObject<{
+    agentId: z.ZodString;
+}, z.core.$strip>;
+export declare const AgentSkillPathParams: z.ZodObject<{
+    agentId: z.ZodString;
+    skillId: z.ZodString;
+}, z.core.$strip>;
+/** `POST /agents/:agentId/skills/uploads`: a skill package upload onto the agent. */
+export declare const AgentSkillUploadBody: z.ZodObject<{
+    name: z.ZodString;
+    size: z.ZodNumber;
+}, z.core.$strict>;
+/** `POST /agents/:agentId/skills`: an uploaded package registered as one of the agent's skills. */
+export declare const AgentSkillRegisterBody: z.ZodObject<{
+    uploadId: z.ZodString;
+}, z.core.$strict>;
+/** `?conversationId=` of `GET /agents/:agentId/invocable-skills`. */
+export declare const InvocableSkillsQuerySchema: z.ZodObject<{
+    conversationId: z.ZodOptional<z.ZodString>;
+}, z.core.$strict>;
+export declare const SKILL_ROUTES: readonly RouteSchemas[];

package/dist/skills/skills.schemas.js

@@ -0,0 +1,68 @@
+import { hasControlChars, MEDIA_NAME_MAX_CHARS } from "@capybara-hq/plugin-sdk";
+import { z } from "zod";
+import { SKILL_PACKAGE_UPLOAD_MAX_BYTES } from "../conversations/attachments.service.js";
+/** `POST /skills`: an uploaded skill package (`POST /skills/uploads` gives the id); no text form. */
+export const SkillCreateBody = z
+    .object({ uploadId: z.string().min(1).max(100), shareable: z.boolean().optional() })
+    .strict();
+/** `:id` where the route validates it (`@ZParam`). */
+export const SkillIdParams = z.object({ id: z.string().min(1).max(100) });
+/** `:id` where the route takes it as is (`@Param`). */
+export const SkillPathParams = z.object({ id: z.string().min(1) });
+export const SkillShareableSchema = z.object({ shareable: z.boolean() }).strict();
+/** `:id` of `GET /skill-changes/:id` (taken as is). */
+export const SkillChangePathParams = z.object({ id: z.string().min(1).max(100) });
+/** `:agentId` of the agent's skills and invocable skills routes (taken as is). */
+export const AgentSkillsListParams = z.object({ agentId: z.string().min(1).max(100) });
+export const AgentSkillPathParams = AgentSkillsListParams.extend({
+    skillId: z.string().min(1).max(100),
+});
+/** `POST /agents/:agentId/skills/uploads`: a skill package upload onto the agent. */
+export const AgentSkillUploadBody = z
+    .object({
+    name: z
+        .string()
+        .min(1)
+        .max(MEDIA_NAME_MAX_CHARS)
+        .refine((s) => !hasControlChars(s), "name must not contain control characters"),
+    size: z.number().int().min(1).max(SKILL_PACKAGE_UPLOAD_MAX_BYTES),
+})
+    .strict();
+/** `POST /agents/:agentId/skills`: an uploaded package registered as one of the agent's skills. */
+export const AgentSkillRegisterBody = z.object({ uploadId: z.string().min(1).max(100) }).strict();
+/** `?conversationId=` of `GET /agents/:agentId/invocable-skills`. */
+export const InvocableSkillsQuerySchema = z
+    .object({ conversationId: z.string().min(1).max(100).optional() })
+    .strict();
+export const SKILL_ROUTES = [
+    { route: "GET /api/v1/orgs/:orgId/skill-changes/:id", params: SkillChangePathParams },
+    { route: "GET /api/v1/orgs/:orgId/agents/:agentId/skills", params: AgentSkillsListParams },
+    {
+        route: "POST /api/v1/orgs/:orgId/agents/:agentId/skills",
+        params: AgentSkillsListParams,
+        body: AgentSkillRegisterBody,
+    },
+    {
+        route: "DELETE /api/v1/orgs/:orgId/agents/:agentId/skills/:skillId",
+        params: AgentSkillPathParams,
+    },
+    {
+        route: "POST /api/v1/orgs/:orgId/agents/:agentId/skills/:skillId/share",
+        params: AgentSkillPathParams,
+    },
+    {
+        route: "GET /api/v1/orgs/:orgId/agents/:agentId/invocable-skills",
+        params: AgentSkillsListParams,
+        query: InvocableSkillsQuerySchema,
+    },
+    { route: "GET /api/v1/orgs/:orgId/skills" },
+    { route: "GET /api/v1/orgs/:orgId/skills/:id", params: SkillPathParams },
+    { route: "POST /api/v1/orgs/:orgId/skills", body: SkillCreateBody },
+    {
+        route: "PUT /api/v1/orgs/:orgId/skills/:id/shareable",
+        params: SkillIdParams,
+        body: SkillShareableSchema,
+    },
+    { route: "GET /api/v1/orgs/:orgId/skills/:id/delete-preview", params: SkillIdParams },
+    { route: "DELETE /api/v1/orgs/:orgId/skills/:id", params: SkillPathParams },
+];

package/dist/skills/skills.service.d.ts

@@ -1,13 +1,16 @@
-import { type SkillInvocation } from "@capybara-hq/plugin-sdk";
 import type { AgentDefinition } from "../agents/definition.js";
+import { type Owner } from "../catalog/ownership.js";
+import { type OwnerVersion, PlatformComponents } from "../catalog/platform-components.js";
 import { AttachmentsService, type CreatedAttachment } from "../conversations/attachments.service.js";
+import { EventLog } from "../conversations/event-log.js";
 import type { KernelSchemaDb, SkillManifest, SourceFormat } from "../db/kernel-schema.js";
 import { ApiError } from "../errors.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
+import type { KernelLogger } from "../log.js";
 import { OrgLock } from "../orgs/org-lock.js";
 import { StorageService } from "../storage/storage.service.js";
-import { type SkillPackageFile } from "./package.js";
+import { type SkillPackageInput } from "./package.js";
 /** Where an org skill came from (spec §9.2): the org's own, or a catalog plugin at a version. */
 export type SkillSource = {
     kind: "org";
@@ -22,10 +25,13 @@ export interface SkillConflict {
     source: SkillSource;
 }
 /**
- * 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 declare function skillConflicts(db: KernelSchemaDb, orgId: string, itemId: string, skillNames: readonly string[]): Promise<SkillConflict[]>;
 /** One line of the conflict message (spec §9.2). */
@@ -40,7 +46,7 @@ export interface SkillSummary {
     name: string;
     description: string;
     currentVersion: number;
-    createdBy: string;
+    createdBy: string | null;
     createdAt: Date;
     updatedAt: Date;
     /** The catalog item name the skill came from; null for the org's own (uploaded or written). */
@@ -57,13 +63,34 @@ export interface SkillSummary {
     manual: boolean;
     /** Phase D: the current version runs as a sub-agent when a person invokes it. */
     fork: boolean;
+    /**
+     * Phase 2: `platform` for a platform skill (deployment-owned, on in the org; not deletable or
+     * versioned by the org), `org` for the org's own.
+     */
+    origin: "org" | "platform";
+    /**
+     * A platform skill's owner (ruling P3-1): the platform, or the org whose upload it came from
+     * (absent on the org's own skills).
+     */
+    owner?: Owner;
+    /**
+     * The org's own skill is marked 可共享 by its org (plugin scope phase 3, ruling P3-6); false for
+     * platform skills and agents' skills.
+     */
+    shareable: boolean;
+    /**
+     * Phase 2, in the library list only: a platform skill's unpinned org copies linked to it (ruling
+     * B2). They resolve to this skill under their own ids, so an agent that selects one of them
+     * selects this skill.
+     */
+    linkedIds?: string[];
 }
 /** 技能的一个版本（含文件清单）。 */
 export interface SkillVersionView {
     version: number;
     files: SkillManifest["files"];
     description: string;
-    createdBy: string;
+    createdBy: string | null;
     createdAt: Date;
 }
 /** 技能详情：各版本新的在前。 */
@@ -84,7 +111,8 @@ export interface UploadedSkill {
     created: boolean;
 }
 /**
- * 在调用方事务里核对 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 忽略已删除的技能）。
  */
@@ -114,21 +142,35 @@ export declare function assertPinnedSkills(db: KernelSchemaDb, orgId: string, ag
  * 技能库（M5 T13）：组织技能的上传（新技能或新版本）、列表、详情与软删除。
  * 字节在对象存储 `kernel/<orgId>/skills/<uploadId>/<path>`，元数据在 PG；无进程内状态，可多副本共用。
  */
-/** A validated skill package: its name, description, files and invocation. */
-interface SkillPackageInput {
-    name: string;
-    description: string;
-    files: SkillPackageFile[];
-    /** Phase D: stored in the manifest when it is not the default. */
-    invocation?: SkillInvocation;
-}
+export { type SkillPackageInput, skillManifest } from "./package.js";
 export declare class SkillsService {
     private readonly db;
     private readonly storage;
     private readonly attachments;
     readonly txHost: TransactionHost;
     private readonly orgLock;
-    constructor(db: KernelDb, storage: StorageService, attachments: AttachmentsService, txHost: TransactionHost, orgLock: OrgLock);
+    /** The owner's new versions of a skill it promoted go to the platform row (ruling P3-4). */
+    private readonly platform;
+    private readonly eventLog;
+    private readonly log;
+    constructor(db: KernelDb, storage: StorageService, attachments: AttachmentsService, txHost: TransactionHost, orgLock: OrgLock, 
+    /** The owner's new versions of a skill it promoted go to the platform row (ruling P3-4). */
+    platform: PlatformComponents, eventLog: EventLog, log: KernelLogger);
+    private readonly catalogDeps;
+    /**
+     * 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).
+     */
+    private putVersionFiles;
+    /**
+     * 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.
+     */
+    private promotedSummary;
     /** 登记一个技能包上传（预签名 POST，`application/zip`，≤ 50MB）；角色由路由的 `skills.manage` 把关。 */
     createUpload(orgId: string, accountId: string, input: {
         name: string;
@@ -143,7 +185,7 @@ export declare class SkillsService {
      * 第 3 步之前中断不会留下可见的版本；已写的文件由清理任务在上传过期后删除（未被任何版本引用时）。
      * 同一上传已经产生过版本（上次提交了、响应丢了而重试）→ 直接返回那个版本（同组织、同一发起人）。
      */
-    upload(orgId: string, actorAccountId: string, uploadId: string, actorTokenId?: string): Promise<UploadedSkill>;
+    upload(orgId: string, actorAccountId: string, uploadId: string, actorTokenId?: string, shareable?: boolean): Promise<UploadedSkill>;
     /**
      * 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
@@ -152,16 +194,22 @@ export declare class SkillsService {
      */
     private createUploadedVersionIn;
     /**
-     * 用一组已校验的技能文件创建组织技能或给同名技能新增版本（上传与企业目录安装共用）：
+     * 用一组已校验的技能文件创建组织技能或给同名技能新增版本（上传与平台目录安装共用）：
      * 1. 把文件写到 `kernel/<orgId>/<prefix>`（缺省 `skills/<新 id>/`）；
      * 2. 一个事务里：锁组织行并复核 `skills.manage`（目录安装：按条目策略复核），
      *    同名未删除的组织技能存在则 `current_version + 1`，否则新建；技能与版本都记下 `directory` 来源（没有则清空：
      *    自定义上传盖在目录技能上就不再算目录安装），写版本与审计
      *    （`skill.created` / `skill.version_created`，目录安装时 detail 带 directory）。
      */
-    createVersionFromFiles(orgId: string, actorAccountId: string, pkg: SkillPackageInput, opts?: {
+    createVersionFromFiles(orgId: string, 
+    /** null: the kernel itself (the plugin scope sync installing a plugin), no role check. */
+    actorAccountId: string | null, pkg: SkillPackageInput, opts?: {
         prefix?: string;
         actorTokenId?: string;
+        /** Merged into the audit event's detail. */
+        auditDetail?: Record<string, unknown>;
+        /** The owner shares a new skill with other orgs (default false). */
+        shareable?: boolean;
         /** Catalog provenance; `approvedBy` is the item whose policy approves it (default `itemId`). */
         catalog?: {
             itemId: string;
@@ -172,7 +220,24 @@ export declare class SkillsService {
             /** The plugin manifest suggests pinning this skill (spec §9.1). */
             suggestPinned?: boolean;
         };
+        /**
+         * The files are already stored (no storage I/O here, so it may join a transaction): at
+         * `prefix` in `kernel/<orgId>/`, or, for a skill the org promoted, the platform version
+         * {@link prepareStoredVersion} wrote. The caller discards that one when this fails.
+         */
+        stored?: {
+            owner?: OwnerVersion;
+        };
     }): Promise<UploadedSkill>;
+    /**
+     * For a new version whose files are already in `kernel/<orgId>/` (a proposed version's draft):
+     * when the org skill of that name is one the org promoted, writes the files as the platform
+     * row's next version (never inside a transaction) and returns it for
+     * `createVersionFromFiles({ stored: { owner } })`; else nothing is written.
+     */
+    prepareStoredVersion(orgId: string, pkg: SkillPackageInput): Promise<OwnerVersion | undefined>;
+    /** Deletes a platform version {@link prepareStoredVersion} wrote that was not used. */
+    discardStoredVersion(owner: OwnerVersion): Promise<void>;
     /** Writes a skill package's files to `kernel/<orgId>/<prefix>` (a few at a time). */
     private putFiles;
     /** The transaction of {@link createVersionFromFiles}. */
@@ -183,19 +248,43 @@ export declare class SkillsService {
      * 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`.
      */
-    revertVersionIn(orgId: string, skillId: string, version: number, actorAccountId: string, reason: string): Promise<boolean>;
+    revertVersionIn(orgId: string, skillId: string, version: number, actorAccountId: string | null, reason: string): Promise<boolean>;
     /**
      * 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.
      */
-    softDeleteIn(orgId: string, skillId: string, actorAccountId: string, reason: string): Promise<boolean>;
-    /** 组织技能库（`scope=org`、未删除），按名字排序。 */
+    softDeleteIn(orgId: string, skillId: string, actorAccountId: string | null, reason: string): Promise<boolean>;
+    /**
+     * 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`).
+     */
     list(orgId: string): Promise<SkillSummary[]>;
+    /**
+     * The agent's skills as the agent page lists them, by name: {@link listForAgent} (`shared:
+     * false`) plus `sharePending`, true while a share request of the skill waits for an org admin,
+     * and the org skills the agent shared (`origin_agent_id`; `scope: 'org'`, `shared: true`, same
+     * id as before sharing): the agent keeps them without selecting them.
+     */
+    listOwnForAgent(orgId: string, agentId: string): Promise<(SkillSummary & {
+        sharePending: boolean;
+        shared: boolean;
+    })[]>;
     /** 对该 agent 自动生效的技能（`scope=agent`、未删除），按名字排序。 */
     listForAgent(orgId: string, agentId: string): Promise<SkillSummary[]>;
-    /** 组织技能详情：各版本与文件清单。不存在 / 已删除 / 不是组织技能 → `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).
+     */
     get(orgId: string, skillId: string): Promise<SkillDetail>;
+    /**
+     * 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.
+     */
+    private getPlatform;
     /** 读某版本 SKILL.md 的正文（见 {@link SkillDetail.body}）；任何读取问题都返回 null，不让详情失败。 */
     private readBody;
     /**
@@ -205,5 +294,13 @@ export declare class SkillsService {
     softDelete(orgId: string, skillId: string, actorAccountId: string, actorTokenId?: string): Promise<void>;
     /** The transaction of {@link softDelete}. */
     private softDeleteTx;
+    /**
+     * 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`. Its pending version
+     * proposals are cancelled in the same transaction (trials reverted; drafts deleted and events
+     * published after the commit). The owner delete of a
+     * promoted skill (`OwnedItems.deleteSkill`) calls it after its platform row was dealt with.
+     */
+    deleteOrgSkillIn(orgId: string, skillId: string, actorAccountId: string, actorTokenId: string | undefined, auditDetail?: Record<string, unknown>): Promise<void>;
 }
-export {};