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

package/dist/tools/connector-content.js

@@ -1,8 +1,23 @@
+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 { ToolError } from "@capybara-hq/plugin-sdk";
+import { Inject, Injectable } from "@nestjs/common";
 import { ApiError } from "../errors.js";
-import { CredentialMissing } from "./credentials.js";
+import { KernelConfigService } from "../infra/config/kernel-config.service.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
+import { KERNEL_LOGGER } from "../infra/tokens.js";
+import { Breaker } from "./breaker.js";
+import { CredentialMissing, Credentials } from "./credentials.js";
 import { renderResult } from "./outputs.js";
 import { redactDeep, redactorFor } from "./redact.js";
+import { ToolRegistry } from "./registry.js";
 import { READ_RESOURCE } from "./resources.js";
 /**
  * 用户直接使用连接器内容（D4，仿 Claude Code）：`/` 斜杠命令（MCP prompts）与 `@` 资源引用。
@@ -27,13 +42,23 @@ const ATTACHMENTS_TIMEOUT_MS = 30_000;
 /** 错误说明里带的上游错误消息最多字符数。 */
 const MAX_DETAIL = 500;
 const errName = (e) => e instanceof Error && typeof e.name === "string" && e.name !== "" ? e.name : "Error";
-export class ConnectorContent {
-    d;
-    constructor(d) {
-        this.d = d;
+let ConnectorContent = class ConnectorContent {
+    db;
+    registry;
+    credentials;
+    breaker;
+    config;
+    log;
+    constructor(db, registry, credentials, breaker, config, log) {
+        this.db = db;
+        this.registry = registry;
+        this.credentials = credentials;
+        this.breaker = breaker;
+        this.config = config;
+        this.log = log;
     }
     async activeConnectors(orgId) {
-        return this.d.db
+        return this.db
             .selectFrom("connectors")
             .select(["id", "slug", "name", "connector", "endpoint", "auth"])
             .where("org_id", "=", orgId)
@@ -44,7 +69,7 @@ export class ConnectorContent {
             .execute();
     }
     async connectorRow(orgId, connectorId) {
-        const r = await this.d.db
+        const r = await this.db
             .selectFrom("connectors")
             .select(["id", "slug", "name", "connector", "endpoint", "auth"])
             .where("org_id", "=", orgId)
@@ -63,7 +88,7 @@ export class ConnectorContent {
     async resourcesEnabled(connectorIds) {
         if (connectorIds.length === 0)
             return new Set();
-        const rows = await this.d.db
+        const rows = await this.db
             .selectFrom("connector_tools")
             .select("connector_id")
             .where("connector_id", "in", connectorIds)
@@ -79,11 +104,11 @@ export class ConnectorContent {
      * `work` 返回 undefined 表示该连接器不支持这项能力。
      */
     async withSession(orgId, app, accountId, timeoutMs, work) {
-        const connector = this.d.registry.findConnector(app.connector);
+        const connector = this.registry.findConnector(app.connector);
         if (!connector) {
             throw new ApiError("connector.connect_failed", `The connector ${app.connector} is not installed`);
         }
-        const breaker = await this.d.breaker.check(orgId, app.id);
+        const breaker = await this.breaker.check(orgId, app.id);
         if (breaker.open) {
             throw new ApiError("connector.connect_failed", `The connector is temporarily unavailable; retry in ${breaker.retryAfterSeconds}s`);
         }
@@ -91,7 +116,7 @@ export class ConnectorContent {
         const injected = [];
         let cached;
         const getAuth = () => {
-            cached ??= this.d.credentials.injection(orgId, app.id, auth, accountId).then((inj) => {
+            cached ??= this.credentials.injection(orgId, app.id, auth, accountId).then((inj) => {
                 injected.push(inj);
                 return inj;
             });
@@ -107,7 +132,7 @@ export class ConnectorContent {
                 onUnauthorized: async () => {
                     const stale = injected.at(-1);
                     cached = undefined;
-                    await this.d.credentials.onUnauthorized(orgId, app.id, auth, accountId, stale);
+                    await this.credentials.onUnauthorized(orgId, app.id, auth, accountId, stale);
                 },
                 signal: AbortSignal.timeout(timeoutMs),
             });
@@ -116,7 +141,7 @@ export class ConnectorContent {
         catch (e) {
             if (e instanceof ApiError)
                 throw e;
-            this.d.log.warn("connector content request failed", { orgId, connectorId: app.id, err: e });
+            this.log.warn("connector content request failed", { orgId, connectorId: app.id, err: e });
             const detail = e instanceof ToolError
                 ? `: ${redact()(e.message).slice(0, MAX_DETAIL)}`
                 : ` (${errName(e)})`;
@@ -124,7 +149,7 @@ export class ConnectorContent {
         }
         finally {
             await session?.close().catch((err) => {
-                this.d.log.warn("connector session close failed", { orgId, connectorId: app.id, err });
+                this.log.warn("connector session close failed", { orgId, connectorId: app.id, err });
             });
         }
     }
@@ -132,7 +157,7 @@ export class ConnectorContent {
     async acrossConnectors(orgId, accountId, work, only) {
         const all = await this.activeConnectors(orgId);
         const apps = only ? await only(all) : all;
-        const timeoutMs = Math.min(this.d.config().tools.timeoutMs, LIST_TIMEOUT_MS);
+        const timeoutMs = Math.min(this.config.get().tools.timeoutMs, LIST_TIMEOUT_MS);
         const results = await Promise.all(apps.map(async (app) => {
             try {
                 return {
@@ -178,7 +203,7 @@ export class ConnectorContent {
      */
     async getPrompt(orgId, connectorId, name, args, accountId) {
         const app = await this.connectorRow(orgId, connectorId);
-        const rendered = await this.withSession(orgId, app, accountId, this.d.config().tools.timeoutMs, async (s) => (s.getPrompt ? s.getPrompt(name, args) : undefined));
+        const rendered = await this.withSession(orgId, app, accountId, this.config.get().tools.timeoutMs, async (s) => (s.getPrompt ? s.getPrompt(name, args) : undefined));
         if (!rendered)
             throw new ApiError("connector.not_found", "This connector does not provide prompts");
         let text = rendered.messages
@@ -233,7 +258,7 @@ export class ConnectorContent {
                 throw new ApiError("connector.resources_disabled", "Reading resources is turned off for this connector");
             }
         }
-        const timeoutMs = Math.min(this.d.config().tools.timeoutMs, ATTACHMENTS_TIMEOUT_MS);
+        const timeoutMs = Math.min(this.config.get().tools.timeoutMs, ATTACHMENTS_TIMEOUT_MS);
         const read = await Promise.all(refs.map(async (ref) => {
             const app = apps.get(ref.connectorId);
             const got = await this.withSession(orgId, app, accountId, timeoutMs, async (s) => {
@@ -264,4 +289,14 @@ export class ConnectorContent {
         }
         return { blocks, attachments };
     }
-}
+};
+ConnectorContent = __decorate([
+    Injectable(),
+    __param(0, Inject(KernelDb)),
+    __param(1, Inject(ToolRegistry)),
+    __param(2, Inject(Credentials)),
+    __param(3, Inject(Breaker)),
+    __param(4, Inject(KernelConfigService)),
+    __param(5, Inject(KERNEL_LOGGER))
+], ConnectorContent);
+export { ConnectorContent };

package/dist/tools/connectors.controller.d.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { type Principal } from "../identity/principal.js";
 import { type OrgContext } from "../orgs/org.guard.js";
-import type { ConnectorDetail, ConnectorPreview, ConnectorSummary, ConnectorsService, ToolIssue } from "./connectors.service.js";
+import { type ConnectorDetail, type ConnectorPreview, type ConnectorSummary, ConnectorsService, type ToolIssue } from "./connectors.service.js";
 /** 凭据值：形状由 `Credentials.validate` 按认证方式校验（不回显值）；这里只限大小。 */
 export declare const CredentialValue: z.ZodRecord<z.ZodString, z.ZodUnknown>;
 declare const CreateBody: z.ZodObject<{

package/dist/tools/connectors.controller.js

@@ -8,13 +8,14 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { ConnectorAuthSchema } from "@capybara-hq/plugin-sdk";
-import { Body, Controller, Delete, Get, HttpCode, Inject, Param, Patch, Post, Put, } from "@nestjs/common";
+import { Controller, Delete, Get, HttpCode, Inject, Param, Patch, Post, Put } from "@nestjs/common";
 import { z } from "zod";
-import { CONNECTORS } from "../http/tokens.js";
-import { ZodPipe } from "../http/zod.pipe.js";
 import { CurrentPrincipal, patTokenId, requireUser, } from "../identity/principal.js";
+import { createZodDto } from "../infra/validation/create-zod-dto.js";
+import { ZBody } from "../infra/validation/zod-params.js";
 import { CurrentOrg, OrgAction } from "../orgs/org.guard.js";
 import { can } from "../orgs/roles.js";
+import { ConnectorsService, } from "./connectors.service.js";
 import { publicEndpoint } from "./endpoint.js";
 /**
  * 没有 `connectors.manage` 的读者只看到端点的公开部分（URL 不带 query、只有头名，见 endpoint.ts），
@@ -76,6 +77,16 @@ const UpdateBody = z
     allowUnannotated: z.boolean().optional(),
 })
     .strict();
+class ConnectorCreateBody extends createZodDto(CreateBody, "ConnectorCreateBody") {
+}
+class ConnectorPreviewBody extends createZodDto(PreviewBody, "ConnectorPreviewBody") {
+}
+class ConnectorUpdateBody extends createZodDto(UpdateBody, "ConnectorUpdateBody") {
+}
+class ConnectorToolReviewBody extends createZodDto(ReviewBody, "ConnectorToolReviewBody") {
+}
+class ConnectorCredentialBody extends createZodDto(CredentialValue, "ConnectorCredentialBody") {
+}
 /**
  * 连接器（`/api/v1/orgs/:orgId/connectors`）：读与个人凭据用 `connectors.use`（访客起），安装 / 修改 / 删除 / 刷新 /
  * 组织凭据用 `connectors.manage`（管理员起）；两者都仅限用户主体。
@@ -150,7 +161,7 @@ __decorate([
     OrgAction("connectors.manage"),
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
-    __param(2, Body(new ZodPipe(CreateBody)))
+    __param(2, ZBody(ConnectorCreateBody))
 ], ConnectorsController.prototype, "create", null);
 __decorate([
     Post("preview"),
@@ -158,7 +169,7 @@ __decorate([
     OrgAction("connectors.manage"),
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
-    __param(2, Body(new ZodPipe(PreviewBody)))
+    __param(2, ZBody(ConnectorPreviewBody))
 ], ConnectorsController.prototype, "preview", null);
 __decorate([
     Get(":connectorId"),
@@ -173,7 +184,7 @@ __decorate([
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("connectorId")),
-    __param(3, Body(new ZodPipe(UpdateBody)))
+    __param(3, ZBody(ConnectorUpdateBody))
 ], ConnectorsController.prototype, "update", null);
 __decorate([
     Delete(":connectorId"),
@@ -199,7 +210,7 @@ __decorate([
     __param(1, CurrentOrg()),
     __param(2, Param("connectorId")),
     __param(3, Param("name")),
-    __param(4, Body(new ZodPipe(ReviewBody)))
+    __param(4, ZBody(ConnectorToolReviewBody))
 ], ConnectorsController.prototype, "review", null);
 __decorate([
     Put(":connectorId/credentials/org"),
@@ -208,7 +219,7 @@ __decorate([
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("connectorId")),
-    __param(3, Body(new ZodPipe(CredentialValue)))
+    __param(3, ZBody(ConnectorCredentialBody))
 ], ConnectorsController.prototype, "setOrgCredential", null);
 __decorate([
     Put(":connectorId/credentials/me"),
@@ -217,7 +228,7 @@ __decorate([
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("connectorId")),
-    __param(3, Body(new ZodPipe(CredentialValue)))
+    __param(3, ZBody(ConnectorCredentialBody))
 ], ConnectorsController.prototype, "setMyCredential", null);
 __decorate([
     Delete(":connectorId/credentials/me"),
@@ -229,6 +240,6 @@ __decorate([
 ], ConnectorsController.prototype, "clearMyCredential", null);
 ConnectorsController = __decorate([
     Controller("api/v1/orgs/:orgId/connectors"),
-    __param(0, Inject(CONNECTORS))
+    __param(0, Inject(ConnectorsService))
 ], ConnectorsController);
 export { ConnectorsController };

package/dist/tools/connectors.service.d.ts

@@ -1,13 +1,13 @@
 import { type AuthHint, type ConnectorOperation, type ToolAnnotations } from "@capybara-hq/plugin-sdk";
-import { type Transaction } from "kysely";
-import type { KernelConfig } from "../config/schema.js";
-import type { KernelDatabase, KernelDb } from "../db/kernel-schema.js";
-import type { ExtensionHost } from "../extensions/host.js";
-import { type ConnectorAuth, type CredentialOwner, type Credentials, type StaticSecret } from "./credentials.js";
-import { type DriftChanges, type ToolDrift, type ToolIssue } from "./drift.js";
+import { ExtensionRegistry } from "../extensions/registry.js";
+import { KernelConfigService } from "../infra/config/kernel-config.service.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
+import { TransactionHost } from "../infra/database/transaction-host.js";
+import { OrgLock } from "../orgs/org-lock.js";
+import { type ConnectorAuth, type CredentialOwner, Credentials, type StaticSecret } from "./credentials.js";
+import { type DriftChanges, ToolDrift, type ToolIssue } from "./drift.js";
 import { type OAuthClientRecord, type OAuthTokenRecord } from "./oauth/tokens.js";
-import { type ToolPolicy, type ToolRegistry } from "./registry.js";
-type Trx = Transaction<KernelDatabase>;
+import { type ToolPolicy, ToolRegistry } from "./registry.js";
 export type { ToolIssue } from "./drift.js";
 type ToolStatus = "enabled" | "disabled" | "pending_review";
 type ToolSource = "connector" | "resources";
@@ -176,13 +176,23 @@ export interface OAuthSetup {
  * （detail 只有凭据类型与归属，没有值）。连接器会话按操作打开、用完即关，不在进程内缓存。
  */
 export declare class ConnectorsService {
-    private readonly db;
+    private readonly kdb;
     private readonly registry;
-    private readonly host;
+    /** Extension manifests (a slug may not take an extension's name). */
+    private readonly extensions;
     private readonly credentials;
     private readonly config;
     private readonly drift;
-    constructor(db: KernelDb, registry: ToolRegistry, host: ExtensionHost, credentials: Credentials, config: () => KernelConfig, drift: ToolDrift);
+    /** The org row lock (orgs/org-lock.ts): joins the caller's transaction. */
+    private readonly orgLock;
+    readonly txHost: TransactionHost;
+    constructor(kdb: KernelDb, registry: ToolRegistry, 
+    /** Extension manifests (a slug may not take an extension's name). */
+    extensions: Pick<ExtensionRegistry, "manifests">, credentials: Credentials, config: Pick<KernelConfigService, "get">, drift: ToolDrift, 
+    /** The org row lock (orgs/org-lock.ts): joins the caller's transaction. */
+    orgLock: Pick<OrgLock, "lockAndAuthorize">, txHost: TransactionHost);
+    /** The kernel-schema handle of the current context (its transaction, else the pool). */
+    private get db();
     /**
      * 校验连接器存在、端点按其 schema 合法、不含凭据样式的头 / query 参数 / URL 用户信息（端点对成员可见，
      * 凭据须走认证设置）；返回解析后的端点。
@@ -218,6 +228,8 @@ export declare class ConnectorsService {
         connector: ConnectorDetail;
         issues: ToolIssue[];
     }>;
+    /** The org-locked, re-checked insert of {@link create} (the outbound checks ran before). */
+    private createIn;
     /**
      * Checks a template update before anything is written (an org plugin upgrade): the endpoint
      * against the connector's schema, and with `resetCredentials` the new credential's shape, or for
@@ -234,7 +246,7 @@ export declare class ConnectorsService {
      * unnamed `derived` tools and the org's own (`admin`) stay (spec §10). Tool definitions are untouched (the next refresh takes the new endpoint through drift review). With `resetCredentials` the credentials are replaced.
      * Audits `connector.template_applied`. Deleted / missing -> `connector.not_found`.
      */
-    applyTemplateIn(t: Trx, orgId: string, connectorId: string, actorAccountId: string, p: PreparedTemplateUpdate, actorTokenId?: string): Promise<void>;
+    applyTemplateIn(orgId: string, connectorId: string, actorAccountId: string, p: PreparedTemplateUpdate, actorTokenId?: string): Promise<void>;
     /**
      * Previews a connector (Ruling A20, for the install wizard): after checking the connector, the
      * endpoint (credential pattern check included) and the credential shape, reads the endpoint
@@ -263,7 +275,7 @@ export declare class ConnectorsService {
      * 在调用方事务里软删除连接器（调用方已锁组织行并按需复核角色；应用安装的回滚与卸载用）：删全部凭据与授权，
      * 审计 `connector.deleted`（`reason` 并进 detail）。已删除 / 不存在 → `connector.not_found`。
      */
-    removeIn(t: Trx, orgId: string, connectorId: string, actorAccountId: string, actorTokenId?: string, reason?: string): Promise<void>;
+    removeIn(orgId: string, connectorId: string, actorAccountId: string, actorTokenId?: string, reason?: string): Promise<void>;
     /**
      * 重新 listTools 并按漂移检测的规则比对写入（见 drift.ts）：新增 / 定义变化的工具待复核（旧定义保留供对比），
      * 消失的工具停用；连接器从未拍过快照时首个快照直接启用。
@@ -278,6 +290,8 @@ export declare class ConnectorsService {
         issues: ToolIssue[];
         changes: DriftChanges;
     }>;
+    /** The org-locked compare-and-write of {@link refresh} (the tool list was fetched before). */
+    private refreshIn;
     /**
      * 复核一个待复核的工具（`connectors.manage`，spec 7.3）。`approve`：采用待复核的新定义（若有）并启用，
      * `reviewed_at` 记为现在；默认策略按新定义的注解重新推导，除非管理员设过（`policy_source = admin`）且来源没变。
@@ -291,6 +305,8 @@ export declare class ConnectorsService {
      * 形状与归属不符 → `validation_failed`。审计只记类型与归属。
      */
     setCredential(orgId: string, connectorId: string, actorAccountId: string, ownership: "org" | "personal", value: unknown, actorTokenId?: string): Promise<void>;
+    /** The org-locked static credential write of {@link setCredential}. */
+    private setCredentialIn;
     /**
      * 轮换 OAuth 客户端（Ruling A18，组织凭据接口，`connectors.manage`）：值为 `{ clientId, clientSecret }`。
      * 客户端凭据连接器先用新客户端取一次 token 验证（失败 → 502 `connector.connect_failed`，什么都不改），再替换客户端并以
@@ -298,6 +314,8 @@ export declare class ConnectorsService {
      * invalid_client 会作废）。审计只记类型与归属。
      */
     private rotateOAuthClient;
+    /** The org-locked client (and token) write of {@link rotateOAuthClient}. */
+    private storeOAuthClient;
     /** 删除发起人自己的个人凭据（`connectors.use`）；本来就没有也成功。 */
     clearMyCredential(orgId: string, connectorId: string, actorAccountId: string, actorTokenId?: string): Promise<void>;
 }