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

package/dist/evals/runs.service.js

@@ -1,63 +1,34 @@
-import { Queue } from "bullmq";
+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); }
+};
+var EvalRunsService_1;
+import { Inject, Injectable } from "@nestjs/common";
 import { sql } from "kysely";
-import { paramIssues } from "../agents/agents.service.js";
-import { normalizeStoredDefinition, } from "../agents/definition.js";
+import { normalizeStoredDefinition, paramIssues, } from "../agents/definition.js";
 import { effectiveDefinition, NO_SELECTION, selectionAt, } from "../conversations/selection.js";
 import { ApiError } from "../errors.js";
 import { audit } from "../identity/audit.js";
-import { costOf, priceKey } from "../models/prices.js";
-import { lockOrgAndAuthorize } from "../orgs/org-lock.js";
-import { ProviderListError } from "../runtime/providers.js";
-import { bullConnection } from "../runtime/run-queue.js";
-import { ACTIVE_EVAL_STATUSES, recountCases, skipPendingJudges, usageTokens } from "./budget.js";
+import { SettingsService } from "../identity/settings.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 { Transactional } from "../infra/database/transactional.decorator.js";
+import { LockService } from "../infra/lock/lock.service.js";
+import { costOf, PricesService, priceKey } from "../models/prices.js";
+import { ModelPurposesService } from "../models/purposes.js";
+import { OrgLock } from "../orgs/org-lock.js";
+import { ProviderListError, ProviderRegistry } from "../runtime/providers.js";
+import { ACTIVE_EVAL_STATUSES, EvalBudget, usageTokens } from "./budget.js";
+import { EvalJobs } from "./jobs.js";
 import { judgeOverheadTokens } from "./judge.js";
 import { candidateModel } from "./step-replay.js";
-/** 评测队列的 BullMQ 队列名（不含 `:`，C7）。 */
-export const EVAL_QUEUE_NAME = "cap-kernel-evals";
-/** 每个用例一个任务（C7；不含 `:`）。 */
-export const evalJobId = (runId, caseId) => `eval-${runId}-${caseId}`;
-/** 评测队列（生产方）：懒建连接；`close()` 关闭。 */
-export class EvalQueue {
-    redisUrl;
-    log;
-    queue;
-    conn;
-    closed = false;
-    constructor(redisUrl, log) {
-        this.redisUrl = redisUrl;
-        this.log = log;
-    }
-    get() {
-        if (this.closed)
-            throw new Error("eval queue is closed");
-        if (!this.queue) {
-            this.conn = bullConnection(this.redisUrl, this.log);
-            this.queue = new Queue(EVAL_QUEUE_NAME, { connection: this.conn });
-            this.queue.on("error", (err) => this.log.error("eval queue error", { err }));
-        }
-        return this.queue;
-    }
-    async enqueue(jobs) {
-        await this.get().addBulk(jobs.map((data) => ({
-            name: "case",
-            data,
-            opts: {
-                jobId: evalJobId(data.runId, data.caseId),
-                // 处理函数外的暂时故障（PG / Redis）：指数退避重试，不让整个用例一次失败。
-                // 结果按认领号写入，重做不会重复写结果
-                attempts: 3,
-                backoff: { type: "exponential", delay: 1000 },
-                removeOnComplete: true,
-                removeOnFail: 1000,
-            },
-        })));
-    }
-    async close() {
-        this.closed = true;
-        await this.queue?.close().catch(() => { });
-        this.conn?.disconnect();
-    }
-}
+export { EVAL_QUEUE_NAME, evalJobId } from "./jobs.js";
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const setNotFound = () => new ApiError("eval.set_not_found", "Eval set not found");
 const runNotFound = () => new ApiError("eval.run_not_found", "Eval run not found");
@@ -180,10 +151,25 @@ const resultsViewedKey = (runId, accountId) => `capk:eval-results-viewed:${runId
  * 评测运行（D5、C7）：估算、启动（校验候选、预建结果、每个用例入队一个任务）、查看、结果分页、取消。
  * 执行在 `evals/worker.ts`。写操作在事务里锁组织行并复核角色（`evals.manage`）。
  */
-export class EvalRunsService {
+let EvalRunsService = EvalRunsService_1 = class EvalRunsService {
+    txHost;
     d;
-    constructor(d) {
-        this.d = d;
+    constructor(kdb, orgLock, locks, config, registry, prices, settings, queue, budget, purposes, txHost) {
+        this.txHost = txHost;
+        this.d = {
+            orgLock,
+            get db() {
+                return kdb.db;
+            },
+            locks,
+            config,
+            registry,
+            prices,
+            settings,
+            queue,
+            budget,
+            purposes,
+        };
     }
     async liveSet(orgId, setId) {
         if (!UUID.test(setId))
@@ -330,7 +316,7 @@ export class EvalRunsService {
     async judgePricing(orgId, rubric, judge) {
         if (!judge)
             return null;
-        const configured = this.d.config().evals.judgeMaxOutputTokens;
+        const configured = this.d.config.get().evals.judgeMaxOutputTokens;
         let target;
         try {
             target = await this.d.purposes.resolve(orgId, "eval");
@@ -394,13 +380,13 @@ export class EvalRunsService {
      * 集合的 agent 已删除 → `agent.not_found`（删除 agent 会取消它的运行；之后再估算 / 启动只会建出全部跳过的运行）。
      * 在事务里调用时 FOR SHARE，与删除 agent 互斥。
      */
-    async assertAgentLive(db, agentId) {
-        let q = db
+    async assertAgentLive(agentId, forShare = false) {
+        let q = this.d.db
             .selectFrom("agents")
             .select("id")
             .where("id", "=", agentId)
             .where("deleted_at", "is", null);
-        if (db !== this.d.db)
+        if (forShare)
             q = q.forShare();
         if (!(await q.executeTakeFirst())) {
             throw new ApiError("agent.not_found", "The agent of this eval set was deleted");
@@ -408,7 +394,7 @@ export class EvalRunsService {
     }
     async estimate(orgId, setId, input) {
         const set = await this.liveSet(orgId, setId);
-        await this.assertAgentLive(this.d.db, set.agent_id);
+        await this.assertAgentLive(set.agent_id);
         const caps = this.tokenCaps(input.tokenCap);
         const versionDef = await this.checkCandidate(set.agent_id, input.candidate);
         const plans = await this.plan(setId, input.mode, input.candidate, versionDef);
@@ -417,7 +403,7 @@ export class EvalRunsService {
     }
     /** token 上限：给了就校验 [1, `evals.maxTokenCap`]，缺省 `evals.defaultTokenCap`（D5）。 */
     tokenCaps(tokenCap) {
-        const { defaultTokenCap, maxTokenCap } = this.d.config().evals;
+        const { defaultTokenCap, maxTokenCap } = this.d.config.get().evals;
         const effectiveTokenCap = tokenCap ?? defaultTokenCap;
         if (!Number.isInteger(effectiveTokenCap) ||
             effectiveTokenCap < 1 ||
@@ -433,7 +419,7 @@ export class EvalRunsService {
      */
     async start(orgId, actor, setId, input, actorTokenId) {
         const set = await this.liveSet(orgId, setId);
-        await this.assertAgentLive(this.d.db, set.agent_id);
+        await this.assertAgentLive(set.agent_id);
         const tokenCap = this.tokenCaps(input.tokenCap).effectiveTokenCap;
         const versionDef = await this.checkCandidate(set.agent_id, input.candidate);
         if (input.judge)
@@ -448,97 +434,103 @@ export class EvalRunsService {
         if (firstProblem) {
             throw candidateInvalid(firstProblem.message, firstProblem.details ?? []);
         }
-        const { runId, plans } = await this.d.db.transaction().execute(async (trx) => {
-            await lockOrgAndAuthorize(trx, orgId, actor, "evals.manage");
-            // 与删除用例（锁集合行 FOR UPDATE）互斥：之后读到的用例在提交前不会被删
-            const locked = await trx
-                .selectFrom("eval_sets")
-                .select("id")
-                .where("id", "=", setId)
-                .where("org_id", "=", orgId)
-                .where("deleted_at", "is", null)
-                .forShare()
-                .executeTakeFirst();
-            if (!locked)
-                throw setNotFound();
-            await this.assertAgentLive(trx, set.agent_id);
-            const alive = new Set((await trx
-                .selectFrom("eval_cases")
-                .select("id")
-                .where("set_id", "=", setId)
-                .where("id", "in", planned.map((p) => p.caseId))
-                .execute()).map((r) => r.id));
-            const plans = planned.filter((p) => alive.has(p.caseId));
-            if (plans.length === 0) {
-                throw new ApiError("eval.nothing_to_replay", "The eval set has nothing to replay");
-            }
-            const estimate = await this.summarize(plans, judge);
-            const run = await trx
-                .insertInto("eval_runs")
-                .values({
-                org_id: orgId,
-                set_id: setId,
-                mode: input.mode,
-                candidate: JSON.stringify(input.candidate),
-                judge: input.judge,
-                token_cap: String(tokenCap),
-                cases_total: plans.length,
-                estimate: JSON.stringify(estimate),
-                created_by: actor,
-            })
-                .returning("id")
-                .executeTakeFirstOrThrow();
-            // 候选不合法的用例：结果直接记错误（计入进度，不入队）
-            const rows = plans.flatMap((p) => p.results.map((r) => ({
-                run_id: run.id,
-                case_id: p.caseId,
-                org_id: orgId,
-                step: r.step,
-                model_call_seq: r.modelCallSeq,
-                ...(p.problem !== null && {
-                    status: "error",
-                    error: JSON.stringify(p.problem),
-                }),
-            })));
-            for (let i = 0; i < rows.length; i += INSERT_CHUNK) {
-                await trx
-                    .insertInto("eval_results")
-                    .values(rows.slice(i, i + INSERT_CHUNK))
-                    .execute();
-            }
-            await audit(trx, {
-                actorAccountId: actor,
-                ...(actorTokenId !== undefined && { actorTokenId }),
-                orgId,
-                action: "eval.run_started",
-                target: run.id,
-                detail: { setId, mode: input.mode, judge: input.judge, tokenCap, cases: plans.length },
-            });
-            await recountCases(trx, run.id);
-            return { runId: run.id, plans: plans.filter((p) => p.problem === null) };
-        });
+        const { runId, plans } = await this.startIn(orgId, actor, setId, set.agent_id, input, tokenCap, planned, judge, actorTokenId);
         try {
             await this.d.queue.enqueue(plans.map((p) => ({ runId, caseId: p.caseId, orgId })));
         }
         catch (e) {
-            await this.d.db.transaction().execute(async (trx) => {
-                await trx
-                    .updateTable("eval_runs")
-                    .set({ status: "failed", finished_at: sql `now()` })
-                    .where("id", "=", runId)
-                    .execute();
-                await trx
-                    .updateTable("eval_results")
-                    .set({ status: "skipped", updated_at: sql `now()` })
-                    .where("run_id", "=", runId)
-                    .where("status", "=", "pending")
-                    .execute();
-                await recountCases(trx, runId);
-            });
+            await this.failStartIn(runId);
             throw e;
         }
         return this.get(orgId, runId);
     }
+    /** The run row and its pending results, in a transaction of their own (enqueued after the commit). */
+    async startIn(orgId, actor, setId, agentId, input, tokenCap, planned, judge, actorTokenId) {
+        const db = this.d.db;
+        await this.d.orgLock.lockAndAuthorize(orgId, actor, "evals.manage");
+        // 与删除用例（锁集合行 FOR UPDATE）互斥：之后读到的用例在提交前不会被删
+        const locked = await db
+            .selectFrom("eval_sets")
+            .select("id")
+            .where("id", "=", setId)
+            .where("org_id", "=", orgId)
+            .where("deleted_at", "is", null)
+            .forShare()
+            .executeTakeFirst();
+        if (!locked)
+            throw setNotFound();
+        await this.assertAgentLive(agentId, true);
+        const alive = new Set((await db
+            .selectFrom("eval_cases")
+            .select("id")
+            .where("set_id", "=", setId)
+            .where("id", "in", planned.map((p) => p.caseId))
+            .execute()).map((r) => r.id));
+        const plans = planned.filter((p) => alive.has(p.caseId));
+        if (plans.length === 0) {
+            throw new ApiError("eval.nothing_to_replay", "The eval set has nothing to replay");
+        }
+        const estimate = await this.summarize(plans, judge);
+        const run = await db
+            .insertInto("eval_runs")
+            .values({
+            org_id: orgId,
+            set_id: setId,
+            mode: input.mode,
+            candidate: JSON.stringify(input.candidate),
+            judge: input.judge,
+            token_cap: String(tokenCap),
+            cases_total: plans.length,
+            estimate: JSON.stringify(estimate),
+            created_by: actor,
+        })
+            .returning("id")
+            .executeTakeFirstOrThrow();
+        // 候选不合法的用例：结果直接记错误（计入进度，不入队）
+        const rows = plans.flatMap((p) => p.results.map((r) => ({
+            run_id: run.id,
+            case_id: p.caseId,
+            org_id: orgId,
+            step: r.step,
+            model_call_seq: r.modelCallSeq,
+            ...(p.problem !== null && {
+                status: "error",
+                error: JSON.stringify(p.problem),
+            }),
+        })));
+        for (let i = 0; i < rows.length; i += INSERT_CHUNK) {
+            await db
+                .insertInto("eval_results")
+                .values(rows.slice(i, i + INSERT_CHUNK))
+                .execute();
+        }
+        await audit(db, {
+            actorAccountId: actor,
+            ...(actorTokenId !== undefined && { actorTokenId }),
+            orgId,
+            action: "eval.run_started",
+            target: run.id,
+            detail: { setId, mode: input.mode, judge: input.judge, tokenCap, cases: plans.length },
+        });
+        await this.d.budget.recountCases(run.id);
+        return { runId: run.id, plans: plans.filter((p) => p.problem === null) };
+    }
+    /** The enqueue failed: the run is `failed`, its pending results `skipped`. */
+    async failStartIn(runId) {
+        const db = this.d.db;
+        await db
+            .updateTable("eval_runs")
+            .set({ status: "failed", finished_at: sql `now()` })
+            .where("id", "=", runId)
+            .execute();
+        await db
+            .updateTable("eval_results")
+            .set({ status: "skipped", updated_at: sql `now()` })
+            .where("run_id", "=", runId)
+            .where("status", "=", "pending")
+            .execute();
+        await this.d.budget.recountCases(runId);
+    }
     /** 各运行的汇总（只算已结束的）。 */
     async summaries(rows) {
         const finished = rows
@@ -620,7 +612,7 @@ export class EvalRunsService {
         if (!r)
             throw runNotFound();
         const sums = await this.summaries([r]);
-        return EvalRunsService.toView(r, sums.get(r.id) ?? null);
+        return EvalRunsService_1.toView(r, sums.get(r.id) ?? null);
     }
     async listForSet(orgId, setId) {
         await this.liveSet(orgId, setId);
@@ -633,25 +625,22 @@ export class EvalRunsService {
             .orderBy("id", "desc")
             .execute();
         const sums = await this.summaries(rows);
-        return rows.map((r) => EvalRunsService.toView(r, sums.get(r.id) ?? null));
+        return rows.map((r) => EvalRunsService_1.toView(r, sums.get(r.id) ?? null));
     }
     /**
      * 查看结果的审计 `eval.results_viewed`（结果里有回放出来的对话内容）：每位查看者每次运行每小时一条——Redis
      * `SET NX EX` 去重（多副本共享），轻量轮询因此不会刷审计。Redis 不可用时照写（宁多不漏）。
      */
     async viewed(orgId, runId, actor, actorTokenId) {
-        if (this.d.redis) {
-            let first = true;
-            try {
-                const r = await this.d.redis.set(resultsViewedKey(runId, actor), "1", "EX", RESULTS_VIEWED_TTL_SECONDS, "NX");
-                first = r === "OK";
-            }
-            catch {
-                first = true;
-            }
-            if (!first)
-                return;
+        let first = true;
+        try {
+            first = await this.d.locks.lease(resultsViewedKey(runId, actor), "1", RESULTS_VIEWED_TTL_SECONDS * 1000);
+        }
+        catch {
+            first = true;
         }
+        if (!first)
+            return;
         await audit(this.d.db, {
             actorAccountId: actor,
             ...(actorTokenId !== undefined && { actorTokenId }),
@@ -749,35 +738,7 @@ export class EvalRunsService {
         if (!UUID.test(runId))
             throw runNotFound();
         await this.get(orgId, runId);
-        await this.d.db.transaction().execute(async (trx) => {
-            await lockOrgAndAuthorize(trx, orgId, actor, "evals.manage");
-            const r = await trx
-                .updateTable("eval_runs")
-                .set({ status: "cancelled", finished_at: sql `now()` })
-                .where("id", "=", runId)
-                .where("org_id", "=", orgId)
-                .where("status", "in", [...ACTIVE_EVAL_STATUSES])
-                .executeTakeFirst();
-            if (Number(r.numUpdatedRows) === 0) {
-                throw new ApiError("eval.run_finished", "The eval run has already finished");
-            }
-            await trx
-                .updateTable("eval_results")
-                .set({ status: "skipped", updated_at: sql `now()` })
-                .where("run_id", "=", runId)
-                .where("status", "=", "pending")
-                .execute();
-            await skipPendingJudges(trx, runId);
-            // 尚未开始的用例此刻已全部结束：进度立即反映（在途的用例做完后由 worker 再重算）
-            await recountCases(trx, runId);
-            await audit(trx, {
-                actorAccountId: actor,
-                ...(actorTokenId !== undefined && { actorTokenId }),
-                orgId,
-                action: "eval.run_cancelled",
-                target: runId,
-            });
-        });
+        await this.cancelIn(orgId, actor, runId, actorTokenId);
         return this.get(orgId, runId);
     }
     /**
@@ -787,50 +748,100 @@ export class EvalRunsService {
     async label(orgId, actor, resultId, input, actorTokenId) {
         if (!UUID.test(resultId))
             throw resultNotFound();
-        const row = await this.d.db.transaction().execute(async (trx) => {
-            await lockOrgAndAuthorize(trx, orgId, actor, "evals.manage");
-            // 先锁住这条结果、读出原标注（写进审计）
-            const before = await trx
-                .selectFrom("eval_results")
-                .select("label")
-                .where("id", "=", resultId)
-                .where("org_id", "=", orgId)
-                .forUpdate()
-                .executeTakeFirst();
-            if (!before)
-                throw resultNotFound();
-            const cleared = input.label === null;
-            const r = await trx
-                .updateTable("eval_results")
-                .set({
-                label: input.label,
-                label_note: cleared ? null : (input.note ?? null),
-                labeled_by: cleared ? null : actor,
-                labeled_at: cleared ? null : sql `now()`,
-                updated_at: sql `now()`,
-            })
-                .where("id", "=", resultId)
-                .where("org_id", "=", orgId)
-                .where((eb) => eb.exists(eb
-                .selectFrom("eval_runs as er")
-                .innerJoin("eval_sets as es", "es.id", "er.set_id")
-                .select("er.id")
-                .whereRef("er.id", "=", "eval_results.run_id")
-                .where("es.deleted_at", "is", null)))
-                .returningAll()
-                .executeTakeFirst();
-            if (!r)
-                throw resultNotFound();
-            await audit(trx, {
-                actorAccountId: actor,
-                ...(actorTokenId !== undefined && { actorTokenId }),
-                orgId,
-                action: "eval.result_labeled",
-                target: resultId,
-                detail: { runId: r.run_id, label: input.label, previousLabel: before.label },
-            });
-            return r;
-        });
+        const row = await this.labelIn(orgId, actor, resultId, input, actorTokenId);
         return resultView(row);
     }
-}
+    async cancelIn(orgId, actor, runId, actorTokenId) {
+        await this.d.orgLock.lockAndAuthorize(orgId, actor, "evals.manage");
+        const r = await this.d.db
+            .updateTable("eval_runs")
+            .set({ status: "cancelled", finished_at: sql `now()` })
+            .where("id", "=", runId)
+            .where("org_id", "=", orgId)
+            .where("status", "in", [...ACTIVE_EVAL_STATUSES])
+            .executeTakeFirst();
+        if (Number(r.numUpdatedRows) === 0) {
+            throw new ApiError("eval.run_finished", "The eval run has already finished");
+        }
+        // 尚未开始的用例此刻已全部结束：进度立即反映（在途的用例做完后由 worker 再重算）
+        await this.d.budget.skipRun(runId);
+        await audit(this.d.db, {
+            actorAccountId: actor,
+            ...(actorTokenId !== undefined && { actorTokenId }),
+            orgId,
+            action: "eval.run_cancelled",
+            target: runId,
+        });
+    }
+    async labelIn(orgId, actor, resultId, input, actorTokenId) {
+        await this.d.orgLock.lockAndAuthorize(orgId, actor, "evals.manage");
+        // 先锁住这条结果、读出原标注（写进审计）
+        const before = await this.d.db
+            .selectFrom("eval_results")
+            .select("label")
+            .where("id", "=", resultId)
+            .where("org_id", "=", orgId)
+            .forUpdate()
+            .executeTakeFirst();
+        if (!before)
+            throw resultNotFound();
+        const cleared = input.label === null;
+        const r = await this.d.db
+            .updateTable("eval_results")
+            .set({
+            label: input.label,
+            label_note: cleared ? null : (input.note ?? null),
+            labeled_by: cleared ? null : actor,
+            labeled_at: cleared ? null : sql `now()`,
+            updated_at: sql `now()`,
+        })
+            .where("id", "=", resultId)
+            .where("org_id", "=", orgId)
+            .where((eb) => eb.exists(eb
+            .selectFrom("eval_runs as er")
+            .innerJoin("eval_sets as es", "es.id", "er.set_id")
+            .select("er.id")
+            .whereRef("er.id", "=", "eval_results.run_id")
+            .where("es.deleted_at", "is", null)))
+            .returningAll()
+            .executeTakeFirst();
+        if (!r)
+            throw resultNotFound();
+        await audit(this.d.db, {
+            actorAccountId: actor,
+            ...(actorTokenId !== undefined && { actorTokenId }),
+            orgId,
+            action: "eval.result_labeled",
+            target: resultId,
+            detail: { runId: r.run_id, label: input.label, previousLabel: before.label },
+        });
+        return r;
+    }
+};
+__decorate([
+    Transactional({ propagation: "requires_new" })
+], EvalRunsService.prototype, "startIn", null);
+__decorate([
+    Transactional({ propagation: "requires_new" })
+], EvalRunsService.prototype, "failStartIn", null);
+__decorate([
+    Transactional({ propagation: "requires_new" })
+], EvalRunsService.prototype, "cancelIn", null);
+__decorate([
+    Transactional({ propagation: "requires_new" })
+], EvalRunsService.prototype, "labelIn", null);
+EvalRunsService = EvalRunsService_1 = __decorate([
+    Injectable(),
+    __param(0, Inject(KernelDb)),
+    __param(1, Inject(OrgLock)),
+    __param(2, Inject(LockService)),
+    __param(3, Inject(KernelConfigService)),
+    __param(4, Inject(ProviderRegistry)),
+    __param(5, Inject(PricesService)),
+    __param(6, Inject(SettingsService)),
+    __param(7, Inject(EvalJobs)),
+    __param(8, Inject(EvalBudget)),
+    __param(9, Inject(ModelPurposesService)),
+    __param(10, Inject(TransactionHost))
+], EvalRunsService);
+export { EvalRunsService };

package/dist/evals/sets.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 { EvalCaseDetail, EvalCaseView, EvalSetDetail, EvalSetsService, EvalSetView } from "./sets.service.js";
+import { type EvalCaseDetail, type EvalCaseView, type EvalSetDetail, EvalSetsService, type EvalSetView } from "./sets.service.js";
 declare const CreateBody: z.ZodObject<{
     agentId: z.ZodString;
     name: z.ZodString;

package/dist/evals/sets.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, Delete, Get, HttpCode, Inject, Param, Patch, Post, } from "@nestjs/common";
+import { Controller, Delete, Get, HttpCode, Inject, Param, Patch, Post } from "@nestjs/common";
 import { z } from "zod";
-import { EVAL_SETS } 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 { EvalSetsService, } from "./sets.service.js";
 const NAME = z.string().trim().min(1).max(200);
 const DESCRIPTION = z.string().max(2000);
 const RUBRIC = z.string().min(1).max(20_000);
@@ -43,6 +44,14 @@ const SampleBody = z
     minToolCalls: z.number().int().min(0).max(1000).optional(),
 })
     .strict();
+class CreateBodyDto extends createZodDto(CreateBody, "EvalSetCreateBody") {
+}
+class PatchBodyDto extends createZodDto(PatchBody, "EvalSetPatchBody") {
+}
+class AddCaseBodyDto extends createZodDto(AddCaseBody, "EvalSetAddCaseBody") {
+}
+class SampleBodyDto extends createZodDto(SampleBody, "EvalSetSampleBody") {
+}
 /**
  * 评测集与用例（`/api/v1/orgs/:orgId/eval-sets`）：全部 `evals.manage`（admin 起、只给人）。
  * 用例详情返回快照还原的轨迹，每次写审计 `trajectory.viewed`。
@@ -111,7 +120,7 @@ __decorate([
     OrgAction("evals.manage"),
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
-    __param(2, Body(new ZodPipe(CreateBody)))
+    __param(2, ZBody(CreateBodyDto))
 ], EvalSetsController.prototype, "create", null);
 __decorate([
     Get(),
@@ -132,7 +141,7 @@ __decorate([
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("setId")),
-    __param(3, Body(new ZodPipe(PatchBody)))
+    __param(3, ZBody(PatchBodyDto))
 ], EvalSetsController.prototype, "update", null);
 __decorate([
     Delete(":setId"),
@@ -148,7 +157,7 @@ __decorate([
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("setId")),
-    __param(3, Body(new ZodPipe(AddCaseBody)))
+    __param(3, ZBody(AddCaseBodyDto))
 ], EvalSetsController.prototype, "addCase", null);
 __decorate([
     Post(":setId/cases/sample"),
@@ -157,7 +166,7 @@ __decorate([
     __param(0, CurrentPrincipal()),
     __param(1, CurrentOrg()),
     __param(2, Param("setId")),
-    __param(3, Body(new ZodPipe(SampleBody)))
+    __param(3, ZBody(SampleBodyDto))
 ], EvalSetsController.prototype, "sample", null);
 __decorate([
     Get(":setId/cases/:caseId"),
@@ -178,6 +187,6 @@ __decorate([
 ], EvalSetsController.prototype, "removeCase", null);
 EvalSetsController = __decorate([
     Controller("api/v1/orgs/:orgId/eval-sets"),
-    __param(0, Inject(EVAL_SETS))
+    __param(0, Inject(EvalSetsService))
 ], EvalSetsController);
 export { EvalSetsController };