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

package/dist/tools/breaker.d.ts

@@ -1,5 +1,5 @@
 import type { Redis } from "ioredis";
-import type { KernelConfig } from "../config/schema.js";
+import { KernelConfigService } from "../infra/config/kernel-config.service.js";
 /** 熔断器键：每个组织 × 连接器一个 hash（`f` = 连续失败次数，`o` = 打开到期的毫秒时间戳）。 */
 export declare const breakerKey: (orgId: string, connectorId: string) => string;
 export type BreakerState = {
@@ -19,7 +19,7 @@ export declare function breakerOpenMessage(connectorName: string, failures: numb
 export declare class Breaker {
     private readonly redis;
     private readonly config;
-    constructor(redis: Redis, config: () => KernelConfig);
+    constructor(redis: Redis, config: Pick<KernelConfigService, "get">);
     check(orgId: string, connectorId: string): Promise<BreakerState>;
     /** 记一次失败，返回当前连续失败次数。 */
     failure(orgId: string, connectorId: string): Promise<number>;

package/dist/tools/breaker.js

@@ -1,3 +1,15 @@
+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 { Inject, Injectable } from "@nestjs/common";
+import { KernelConfigService } from "../infra/config/kernel-config.service.js";
+import { REDIS } from "../infra/tokens.js";
 /** 熔断器键：每个组织 × 连接器一个 hash（`f` = 连续失败次数，`o` = 打开到期的毫秒时间戳）。 */
 export const breakerKey = (orgId, connectorId) => `capk:breaker:${orgId}:${connectorId}`;
 /**
@@ -47,7 +59,7 @@ export function breakerOpenMessage(connectorName, failures, retryAfterSeconds) {
  * `tools.breakerOpenSeconds` 秒，期间直接拒绝；到期后半开放行，成功清零、失败立即重新打开。
  * 状态只在 Redis（多副本共享），计数与打开状态都带 TTL。
  */
-export class Breaker {
+let Breaker = class Breaker {
     redis;
     config;
     constructor(redis, config) {
@@ -62,11 +74,17 @@ export class Breaker {
     }
     /** 记一次失败，返回当前连续失败次数。 */
     async failure(orgId, connectorId) {
-        const { breakerFailures, breakerOpenSeconds } = this.config().tools;
+        const { breakerFailures, breakerOpenSeconds } = this.config.get().tools;
         return Number(await this.redis.eval(FAILURE, 1, breakerKey(orgId, connectorId), breakerFailures, breakerOpenSeconds * 1000, COUNT_TTL_MS));
     }
     /** 调用成功：清零。 */
     async success(orgId, connectorId) {
         await this.redis.del(breakerKey(orgId, connectorId));
     }
-}
+};
+Breaker = __decorate([
+    Injectable(),
+    __param(0, Inject(REDIS)),
+    __param(1, Inject(KernelConfigService))
+], Breaker);
+export { Breaker };

package/dist/tools/builtins/ask-user.d.ts

@@ -1,5 +1,5 @@
 import { type FormAnswer, type InputForm } from "@capybara-hq/plugin-sdk";
-import type { KernelConfig } from "../../config/schema.js";
+import type { KernelConfigService } from "../../infra/config/kernel-config.service.js";
 import type { BuiltinTool } from "../registry.js";
 interface Question {
     question: string;
@@ -23,6 +23,6 @@ export declare function answerText(questions: Question[], answer: FormAnswer): s
  * 默认 allow（提问本身就是让用户参与，不再审批）。
  */
 export declare function askUserTool(deps: {
-    config: () => KernelConfig;
+    config: Pick<KernelConfigService, "get">;
 }): BuiltinTool;
 export {};

package/dist/tools/builtins/ask-user.js

@@ -132,7 +132,7 @@ export function askUserTool(deps) {
                     throw new ToolError(`Option labels must be unique within a question; "${q.question}" has duplicates. Provide distinct labels.`);
                 }
             }
-            const state = { hours: deps.config().tools.approvalTimeoutHours };
+            const state = { hours: deps.config.get().tools.approvalTimeoutHours };
             return { kind: "input_required", form: questionsForm(questions), state };
         },
     };

package/dist/tools/builtins/builtin-tools.d.ts

@@ -0,0 +1,21 @@
+import { AttachmentsService } from "../../conversations/attachments.service.js";
+import { EventLog } from "../../conversations/event-log.js";
+import { KernelConfigService } from "../../infra/config/kernel-config.service.js";
+import { KernelDb } from "../../infra/database/kernel-db.js";
+import { SandboxService } from "../../sandbox/sandbox.service.js";
+import { SkillChangesService } from "../../skills/changes.service.js";
+import { StorageService } from "../../storage/storage.service.js";
+import { ToolOutputs } from "../outputs.js";
+import type { BuiltinTool } from "../registry.js";
+/**
+ * The kernel's builtin tools, built once from the injected services (their specs: names,
+ * descriptions and schemas, are the factories' own and unchanged). `tool_search` and `skill_load`
+ * are added to a run by the registry (`forAgent`: organization setting and threshold, a skills
+ * catalog snapshot), not by agent definitions; `skill_write` only when a definition names it.
+ */
+export declare class BuiltinTools {
+    private readonly tools;
+    constructor(db: KernelDb, config: KernelConfigService, outputs: ToolOutputs, storage: StorageService, skillChanges: SkillChangesService, attachments: AttachmentsService, eventLog: EventLog, sandbox: SandboxService);
+    /** The builtin tools, in a fixed order. */
+    list(): readonly BuiltinTool[];
+}

package/dist/tools/builtins/builtin-tools.js

@@ -0,0 +1,80 @@
+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 { Inject, Injectable } from "@nestjs/common";
+import { AttachmentsService } from "../../conversations/attachments.service.js";
+import { EventLog } from "../../conversations/event-log.js";
+import { KernelConfigService } from "../../infra/config/kernel-config.service.js";
+import { KernelDb } from "../../infra/database/kernel-db.js";
+import { SandboxService } from "../../sandbox/sandbox.service.js";
+import { SkillChangesService } from "../../skills/changes.service.js";
+import { StorageService } from "../../storage/storage.service.js";
+import { ToolOutputs } from "../outputs.js";
+import { agentTool } from "./agent.js";
+import { askUserTool } from "./ask-user.js";
+import { readToolOutputTool } from "./read-tool-output.js";
+import { sandboxTools } from "./sandbox/index.js";
+import { skillLoadTool } from "./skill-load.js";
+import { skillWriteTool } from "./skill-write.js";
+import { toolSearchTool } from "./tool-search.js";
+/**
+ * The kernel's builtin tools, built once from the injected services (their specs: names,
+ * descriptions and schemas, are the factories' own and unchanged). `tool_search` and `skill_load`
+ * are added to a run by the registry (`forAgent`: organization setting and threshold, a skills
+ * catalog snapshot), not by agent definitions; `skill_write` only when a definition names it.
+ */
+let BuiltinTools = class BuiltinTools {
+    tools;
+    constructor(db, config, outputs, storage, skillChanges, attachments, eventLog, sandbox) {
+        const sandboxDeps = {
+            sandbox,
+            attachments,
+            storage,
+            eventLog,
+            config,
+        };
+        this.tools = [
+            askUserTool({ config }),
+            readToolOutputTool({ outputs, config }),
+            toolSearchTool(),
+            // dispatches sub-agents; the tool pipeline handles its calls (sub-agents spec §4, §7.1)
+            agentTool,
+            ...sandboxTools(sandboxDeps),
+            // 技能加载：对话日志里有技能目录快照时由注册表自动加入（Ruling M17）
+            skillLoadTool({
+                storage,
+                config,
+                sandbox,
+                attachments,
+                eventLog,
+                get db() {
+                    return db.db;
+                },
+            }),
+            // 自写技能：agent 定义显式引用才可用
+            skillWriteTool({ changes: skillChanges }),
+        ];
+    }
+    /** The builtin tools, in a fixed order. */
+    list() {
+        return this.tools;
+    }
+};
+BuiltinTools = __decorate([
+    Injectable(),
+    __param(0, Inject(KernelDb)),
+    __param(1, Inject(KernelConfigService)),
+    __param(2, Inject(ToolOutputs)),
+    __param(3, Inject(StorageService)),
+    __param(4, Inject(SkillChangesService)),
+    __param(5, Inject(AttachmentsService)),
+    __param(6, Inject(EventLog)),
+    __param(7, Inject(SandboxService))
+], BuiltinTools);
+export { BuiltinTools };

package/dist/tools/builtins/read-tool-output.d.ts

@@ -1,4 +1,4 @@
-import type { KernelConfig } from "../../config/schema.js";
+import type { KernelConfigService } from "../../infra/config/kernel-config.service.js";
 import { type ToolOutputs } from "../outputs.js";
 import type { BuiltinTool } from "../registry.js";
 /**
@@ -14,5 +14,5 @@ export declare function readPage(id: string, content: string, opts: {
 /** 内置工具 `read_tool_output`：读本会话未过期的输出存档（只读、默认 allow）。 */
 export declare function readToolOutputTool(deps: {
     outputs: Pick<ToolOutputs, "load">;
-    config: () => KernelConfig;
+    config: Pick<KernelConfigService, "get">;
 }): BuiltinTool;

package/dist/tools/builtins/read-tool-output.js

@@ -95,7 +95,7 @@ export function readToolOutputTool(deps) {
             const content = await deps.outputs.load({ orgId: ctx.orgId, conversationId: ctx.conversationId }, id);
             if (content === null)
                 throw new ToolError(outputNotFoundText(id));
-            const cfg = deps.config().tools;
+            const cfg = deps.config.get().tools;
             const budget = Math.max(1, Math.min(cfg.maxResultReadChars, cfg.outputSpillChars - FOOTER_RESERVE));
             return {
                 content: [

package/dist/tools/builtins/sandbox/bash.js

@@ -89,13 +89,13 @@ export function sandboxBashTool(deps) {
         unavailable: unavailableWhenNoSandbox(deps),
         // 命令自己的超时先到（提供方停掉命令、返回 timedOut），管线的时限再留出等锁与创建 / 恢复的余量
         timeoutMs: (input) => {
-            const cfg = deps.config();
+            const cfg = deps.config.get();
             const max = cfg.sandbox.limits.maxCommandSeconds;
             return Math.min(secondsFor(input, max), max) * 1000 + sandboxBaseTimeoutMs(cfg);
         },
         async run(input, ctx) {
             const { command, description } = input;
-            const max = deps.config().sandbox.limits.maxCommandSeconds;
+            const max = deps.config.get().sandbox.limits.maxCommandSeconds;
             const req = input.timeoutSeconds;
             if (req !== undefined && req > max) {
                 throw new ToolError(`timeoutSeconds ${req} is over the limit of ${max} seconds; pass a value of at most ${max}.`);

package/dist/tools/builtins/sandbox/common.d.ts

@@ -2,6 +2,7 @@ import { type SandboxHandle, type SandboxProvider } from "@capybara-hq/plugin-sd
 import type { KernelConfig } from "../../../config/schema.js";
 import type { AttachmentsService } from "../../../conversations/attachments.service.js";
 import type { EventLog } from "../../../conversations/event-log.js";
+import type { KernelConfigService } from "../../../infra/config/kernel-config.service.js";
 import { type SandboxService } from "../../../sandbox/sandbox.service.js";
 import type { StorageService } from "../../../storage/storage.service.js";
 import type { BuiltinCallContext } from "../../registry.js";
@@ -13,7 +14,7 @@ export interface SandboxToolDeps {
     storage: Pick<StorageService, "kernel" | "available">;
     /** `publishChanged`: `sandbox_deliver` announces `changed: files` (UI refresh B). */
     eventLog: Pick<EventLog, "append"> & Partial<Pick<EventLog, "publishChanged">>;
-    config: () => KernelConfig;
+    config: Pick<KernelConfigService, "get">;
 }
 /** 回调拿到的沙箱：句柄、提供方与「调用 signal + 锁丢失」合并后的 signal（每个提供方调用都传它）。 */
 export interface SandboxSession {
@@ -37,9 +38,11 @@ export declare const SYNC_MARKER = "/workspace/attachments/.capybara-sync.json";
 /** 附件文件名的上限（UTF-8 字节，常见文件系统单个文件名上限 255 字节，留出 `-N` 后缀的余量）。 */
 export declare const ATTACHMENT_NAME_MAX_BYTES = 200;
 /**
- * 沙箱工具时限里额外留出的余量（毫秒）：创建 / 恢复沙箱，以及命令超时后停命令的兜底——E2B 杀进程脚本没跑完时
- * 重启沙箱（杀进程最多约 20 秒，加 pause + 冷启动 connect 最多 120 秒，约 160 秒）。首次创建时拉取镜像不在其内
- * （部署时应预先拉好 `sandbox.image`，见 plugins/sandbox-docker/README.md）。
+ * Extra margin (ms) on top of a sandbox tool's time limit: creating / resuming the sandbox, and the
+ * fallback for stopping a command after its timeout (when the E2B kill script does not finish, the
+ * sandbox is restarted: up to about 20 s to kill, plus pause and a cold connect of up to 120 s, about
+ * 160 s). Pulling the image on first creation is not included (deployments pre-pull
+ * `sandbox.image`; see the sandbox-docker plugin's README in capybara-hq/plugins).
  */
 export declare const SANDBOX_SETUP_MARGIN_MS = 180000;
 /**

package/dist/tools/builtins/sandbox/common.js

@@ -22,9 +22,11 @@ const MARKER_MAX_BYTES = 1024 * 1024;
 /** 附件文件名的上限（UTF-8 字节，常见文件系统单个文件名上限 255 字节，留出 `-N` 后缀的余量）。 */
 export const ATTACHMENT_NAME_MAX_BYTES = 200;
 /**
- * 沙箱工具时限里额外留出的余量（毫秒）：创建 / 恢复沙箱，以及命令超时后停命令的兜底——E2B 杀进程脚本没跑完时
- * 重启沙箱（杀进程最多约 20 秒，加 pause + 冷启动 connect 最多 120 秒，约 160 秒）。首次创建时拉取镜像不在其内
- * （部署时应预先拉好 `sandbox.image`，见 plugins/sandbox-docker/README.md）。
+ * Extra margin (ms) on top of a sandbox tool's time limit: creating / resuming the sandbox, and the
+ * fallback for stopping a command after its timeout (when the E2B kill script does not finish, the
+ * sandbox is restarted: up to about 20 s to kill, plus pause and a cold connect of up to 120 s, about
+ * 160 s). Pulling the image on first creation is not included (deployments pre-pull
+ * `sandbox.image`; see the sandbox-docker plugin's README in capybara-hq/plugins).
  */
 export const SANDBOX_SETUP_MARGIN_MS = 180_000;
 /**

package/dist/tools/builtins/sandbox/deliver.js

@@ -97,7 +97,7 @@ export function sandboxDeliverTool(deps) {
         defaultPolicy: "allow",
         // 没有沙箱或没有对象存储都交付不了（先报沙箱的原因）
         unavailable: () => unavailableWhenNoSandbox(deps)() ?? (deps.storage.available ? null : NO_STORAGE_REASON),
-        timeoutMs: () => 2 * sandboxBaseTimeoutMs(deps.config()),
+        timeoutMs: () => 2 * sandboxBaseTimeoutMs(deps.config.get()),
         async run(input, ctx) {
             // 存储在调用前就核对：不为一个交付不了的文件去 stat / 读沙箱
             if (!deps.storage.available)
@@ -109,7 +109,7 @@ export function sandboxDeliverTool(deps) {
                 throw new ToolError(BAD_NAME);
             }
             const name = given ?? defaultName(path);
-            const max = deps.config().sandbox.deliverMaxBytes;
+            const max = deps.config.get().sandbox.deliverMaxBytes;
             const { value: data, notices } = await inSandbox(deps, ctx, async ({ h, p, signal }) => {
                 const st = await p.stat(h, path, signal);
                 if (st === null)

package/dist/tools/builtins/sandbox/edit.js

@@ -48,7 +48,7 @@ export function sandboxEditTool(deps) {
         spec: SPEC,
         defaultPolicy: "allow",
         unavailable: unavailableWhenNoSandbox(deps),
-        timeoutMs: () => sandboxBaseTimeoutMs(deps.config()),
+        timeoutMs: () => sandboxBaseTimeoutMs(deps.config.get()),
         async run(input, ctx) {
             const { oldText, newText, replaceAll = false } = input;
             const path = checkWritable(input.path);

package/dist/tools/builtins/sandbox/glob.js

@@ -42,7 +42,7 @@ export function sandboxGlobTool(deps) {
         spec: SPEC,
         defaultPolicy: "allow",
         unavailable: unavailableWhenNoSandbox(deps),
-        timeoutMs: () => sandboxBaseTimeoutMs(deps.config()),
+        timeoutMs: () => sandboxBaseTimeoutMs(deps.config.get()),
         async run(input, ctx) {
             const startedAt = Date.now();
             const { pattern } = input;
@@ -65,7 +65,7 @@ export function sandboxGlobTool(deps) {
                 const r = await p.exec(h, {
                     command: "find . -type f -print0",
                     cwd: dir,
-                    timeoutMs: searchTimeoutMs(deps.config(), startedAt, Date.now(), ctx.runDeadline),
+                    timeoutMs: searchTimeoutMs(deps.config.get(), startedAt, Date.now(), ctx.runDeadline),
                     maxOutputBytes: MAX_FIND_BYTES,
                     signal,
                 });

package/dist/tools/builtins/sandbox/grep.js

@@ -70,7 +70,7 @@ export function sandboxGrepTool(deps) {
         spec: SPEC,
         defaultPolicy: "allow",
         unavailable: unavailableWhenNoSandbox(deps),
-        timeoutMs: () => sandboxBaseTimeoutMs(deps.config()),
+        timeoutMs: () => sandboxBaseTimeoutMs(deps.config.get()),
         async run(input, ctx) {
             const startedAt = Date.now();
             const { pattern, glob, ignoreCase = false } = input;
@@ -96,7 +96,7 @@ export function sandboxGrepTool(deps) {
                 const r = await p.exec(h, {
                     command,
                     cwd,
-                    timeoutMs: searchTimeoutMs(deps.config(), startedAt, Date.now(), ctx.runDeadline),
+                    timeoutMs: searchTimeoutMs(deps.config.get(), startedAt, Date.now(), ctx.runDeadline),
                     maxOutputBytes: MAX_GREP_BYTES,
                     signal,
                 });

package/dist/tools/builtins/sandbox/read.js

@@ -76,7 +76,7 @@ export function sandboxReadTool(deps) {
         spec: SPEC,
         defaultPolicy: "allow",
         unavailable: unavailableWhenNoSandbox(deps),
-        timeoutMs: () => sandboxBaseTimeoutMs(deps.config()),
+        timeoutMs: () => sandboxBaseTimeoutMs(deps.config.get()),
         async run(input, ctx) {
             const { offset = 1, limit = DEFAULT_LIMIT } = input;
             const path = checkPath(input.path);

package/dist/tools/builtins/sandbox/write.js

@@ -37,7 +37,7 @@ export function sandboxWriteTool(deps) {
         spec: SPEC,
         defaultPolicy: "allow",
         unavailable: unavailableWhenNoSandbox(deps),
-        timeoutMs: () => sandboxBaseTimeoutMs(deps.config()),
+        timeoutMs: () => sandboxBaseTimeoutMs(deps.config.get()),
         async run(input, ctx) {
             const path = checkWritable(input.path);
             const data = new TextEncoder().encode(input.content);

package/dist/tools/builtins/skill-load.d.ts

@@ -1,6 +1,6 @@
 import { type ObjectStore } from "@capybara-hq/plugin-sdk";
 import type { EventLog } from "../../conversations/event-log.js";
-import type { KernelDb, SkillManifest } from "../../db/kernel-schema.js";
+import type { KernelSchemaDb, SkillManifest } from "../../db/kernel-schema.js";
 import { type CatalogSkill } from "../../runtime/context/skills.js";
 import type { BuiltinCallContext, BuiltinTool } from "../registry.js";
 import { type SandboxToolDeps } from "./sandbox/common.js";
@@ -27,7 +27,7 @@ export declare const SKILLS_MARKER_DIR = "/skills/.capybara";
 export declare const skillMarkerPath: (name: string) => string;
 /** 依赖：沙箱工具的依赖，加上读技能行用的库与读快照用的日志。 */
 export interface SkillLoadDeps extends SandboxToolDeps {
-    db: KernelDb;
+    db: KernelSchemaDb;
     eventLog: Pick<EventLog, "append" | "latestOfType">;
 }
 /** A stored skill file is missing or does not match its manifest entry (size, sha256). */
@@ -45,7 +45,7 @@ export declare function readSkillFile(store: ObjectStore, key: string, file: Ski
  * 没有 `skill_versions` 行，新技能连 `skills` 行都没有）。绝不按版本号解析——被拒绝的草稿与之后别人批准的同号版本
  * 内容不同。都没有 → undefined（已移除）。
  */
-export declare function findSkillVersion(db: KernelDb, ctx: Pick<BuiltinCallContext, "orgId" | "conversationId">, entry: Pick<CatalogSkill, "id" | "source">): Promise<{
+export declare function findSkillVersion(db: KernelSchemaDb, ctx: Pick<BuiltinCallContext, "orgId" | "conversationId">, entry: Pick<CatalogSkill, "id" | "source">): Promise<{
     manifest: SkillManifest;
     object_prefix: string;
 } | undefined>;

package/dist/tools/builtins/skill-load.js

@@ -352,7 +352,7 @@ export function skillLoadTool(deps) {
         spec: SPEC,
         defaultPolicy: "allow",
         // 可能要创建 / 恢复沙箱并复制文件：与沙箱工具同一时限
-        timeoutMs: () => sandboxBaseTimeoutMs(deps.config()),
+        timeoutMs: () => sandboxBaseTimeoutMs(deps.config.get()),
         async run(input, ctx) {
             const asked = input.name;
             const snap = await deps.eventLog.latestOfType(ctx.conversationId, "skills_catalog");

package/dist/tools/canonical-json.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 键排序、去掉 undefined 的 JSON（jsonb 不保留键顺序，指纹必须与顺序无关）。A leaf module (re-exported by
+ * registry.ts): the sandbox service compares handles with it without importing the tool registry,
+ * which imports the builtin tools that inject the sandbox service (an ESM import cycle).
+ */
+export declare function canonicalJson(v: unknown): string;

package/dist/tools/canonical-json.js

@@ -0,0 +1,16 @@
+/**
+ * 键排序、去掉 undefined 的 JSON（jsonb 不保留键顺序，指纹必须与顺序无关）。A leaf module (re-exported by
+ * registry.ts): the sandbox service compares handles with it without importing the tool registry,
+ * which imports the builtin tools that inject the sandbox service (an ESM import cycle).
+ */
+export function canonicalJson(v) {
+    if (Array.isArray(v))
+        return `[${v.map(canonicalJson).join(",")}]`;
+    if (v !== null && typeof v === "object") {
+        const entries = Object.entries(v)
+            .filter(([, x]) => x !== undefined)
+            .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
+        return `{${entries.map(([k, x]) => `${JSON.stringify(k)}:${canonicalJson(x)}`).join(",")}}`;
+    }
+    return JSON.stringify(v);
+}

package/dist/tools/connector-content.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 { ConnectorContent, ConnectorPromptView, ConnectorResourceView, ConnectorUnavailable } from "./connector-content.js";
+import { ConnectorContent, type ConnectorPromptView, type ConnectorResourceView, type ConnectorUnavailable } from "./connector-content.js";
 declare const PromptBody: z.ZodObject<{
     arguments: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, z.core.$strict>;

package/dist/tools/connector-content.controller.js

@@ -7,12 +7,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { Body, Controller, Get, HttpCode, Inject, Param, Post, Query } from "@nestjs/common";
+import { Controller, Get, HttpCode, Inject, Param, Post } from "@nestjs/common";
 import { z } from "zod";
-import { CONNECTOR_CONTENT } from "../http/tokens.js";
-import { ZodPipe } from "../http/zod.pipe.js";
 import { CurrentPrincipal, requireUser } from "../identity/principal.js";
+import { createZodDto } from "../infra/validation/create-zod-dto.js";
+import { ZBody, ZQuery } from "../infra/validation/zod-params.js";
 import { CurrentOrg, OrgAction } from "../orgs/org.guard.js";
+import { ConnectorContent, } from "./connector-content.js";
 const PromptBody = z
     .object({
     arguments: z
@@ -22,6 +23,10 @@ const PromptBody = z
 })
     .strict();
 const ResourcesQuery = z.object({ query: z.string().max(200).optional() });
+class ConnectorPromptBody extends createZodDto(PromptBody, "ConnectorPromptBody") {
+}
+class ConnectorResourcesQuery extends createZodDto(ResourcesQuery, "ConnectorResourcesQuery") {
+}
 /**
  * 连接器内容（`/api/v1/orgs/:orgId/connectors/...`）：网页输入框的 `/` 斜杠命令（prompts）与 `@` 资源引用。
  * 都是 `connectors.use`、仅限用户主体，以发起人自己的凭据访问连接器（个人连接器须已连接）。
@@ -59,7 +64,7 @@ __decorate([
     OrgAction("connectors.use"),
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
-    __param(2, Query(new ZodPipe(ResourcesQuery)))
+    __param(2, ZQuery(ConnectorResourcesQuery))
 ], ConnectorContentController.prototype, "resources", null);
 __decorate([
     Post(":connectorId/prompts/:name"),
@@ -69,10 +74,10 @@ __decorate([
     __param(1, CurrentOrg()),
     __param(2, Param("connectorId")),
     __param(3, Param("name")),
-    __param(4, Body(new ZodPipe(PromptBody)))
+    __param(4, ZBody(ConnectorPromptBody))
 ], ConnectorContentController.prototype, "renderPrompt", null);
 ConnectorContentController = __decorate([
     Controller("api/v1/orgs/:orgId/connectors"),
-    __param(0, Inject(CONNECTOR_CONTENT))
+    __param(0, Inject(ConnectorContent))
 ], ConnectorContentController);
 export { ConnectorContentController };

package/dist/tools/connector-content.d.ts

@@ -1,9 +1,9 @@
 import type { Logger, PromptInfo } from "@capybara-hq/plugin-sdk";
-import type { KernelConfig } from "../config/schema.js";
-import type { KernelDb } from "../db/kernel-schema.js";
-import type { Breaker } from "./breaker.js";
-import { type Credentials } from "./credentials.js";
-import type { ToolRegistry } from "./registry.js";
+import { KernelConfigService } from "../infra/config/kernel-config.service.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
+import { Breaker } from "./breaker.js";
+import { Credentials } from "./credentials.js";
+import { ToolRegistry } from "./registry.js";
 /** 每个附件的正文上限（字符）。 */
 export declare const MAX_ATTACHMENT_CHARS = 50000;
 /** 一条消息最多附件数。 */
@@ -42,17 +42,14 @@ export interface AttachmentMeta {
     uri: string;
     name: string;
 }
-export interface ConnectorContentDeps {
-    db: KernelDb;
-    registry: Pick<ToolRegistry, "findConnector">;
-    credentials: Pick<Credentials, "injection" | "onUnauthorized">;
-    breaker: Pick<Breaker, "check">;
-    config: () => KernelConfig;
-    log: Logger;
-}
 export declare class ConnectorContent {
-    private readonly d;
-    constructor(d: ConnectorContentDeps);
+    private readonly db;
+    private readonly registry;
+    private readonly credentials;
+    private readonly breaker;
+    private readonly config;
+    private readonly log;
+    constructor(db: KernelDb, registry: Pick<ToolRegistry, "findConnector">, credentials: Pick<Credentials, "injection" | "onUnauthorized">, breaker: Pick<Breaker, "check">, config: Pick<KernelConfigService, "get">, log: Logger);
     private activeConnectors;
     private connectorRow;
     /**