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

package/dist/runtime/run-queue.d.ts

@@ -1,71 +1,45 @@
 import type { Logger } from "@capybara-hq/plugin-sdk";
-import { Redis } from "ioredis";
-import { type Transaction } from "kysely";
-import type { EventLog } from "../conversations/event-log.js";
-import type { ConversationKind, KernelDatabase, KernelDb } from "../db/kernel-schema.js";
+import { EventLog } from "../conversations/event-log.js";
+import type { ConversationKind } from "../db/kernel-schema.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
+import { TransactionHost } from "../infra/database/transaction-host.js";
+import { KernelEvents } from "../infra/events/kernel-events.js";
+import { ToolPipeline } from "../tools/pipeline.js";
 import type { RunAbortDetail } from "./abort.js";
-import type { KyselyCheckpointSaver } from "./checkpointer.js";
-import type { ConversationLock } from "./conversation-lock.js";
-/** 内核运行队列的 BullMQ 队列名（不含 `:`；与插件队列 `cap.<插件>.<名>` 不会重名）。 */
-export declare const RUN_QUEUE_NAME = "cap-kernel-runs";
-/**
- * Queue of sub-agent (child) runs (sub-agents spec §7.4): a replica still on a version without
- * sub-agents never takes a child job, and child load shows apart from conversations.
- */
-export declare const SUBAGENT_RUN_QUEUE_NAME = "cap-kernel-subagent-runs";
-/** The run queue of a conversation kind: sub-agent conversations have their own. */
-export declare const runQueueNameFor: (kind: ConversationKind) => string;
-/** 运行任务的数据。 */
-export interface RunJobData {
-    runId: string;
-    conversationId: string;
-}
-/** 同一触发点（会话 + 最新用户消息 seq）只投递一次。 */
-export declare const runJobId: (conversationId: string, maxUserSeq: number) => string;
-/** 未结束的运行状态（waiting：等人处理审批 / 输入请求，没有任务、不占会话锁与配额）。 */
-export declare const ACTIVE_RUN_STATUSES: readonly ["queued", "running", "waiting"];
-type KernelTrx = Transaction<KernelDatabase>;
-/** What an orphan repair does for a parent's sub-agents (wired by the kernel). */
-export interface OrphanSubagents {
-    /** `ToolPipeline.stopOpenAgentCalls`: the run's open `agent` call results, in `t`. */
-    stopOpenCalls(t: KernelTrx, runId: string): Promise<{
-        fire: () => void;
-    }>;
-    /** `stopChildren(runId, null)`: after the commit, its active children stop. */
-    stopChildren(runId: string): Promise<unknown>;
-}
-/** BullMQ 连接要求 maxRetriesPerRequest 为 null（Worker 的阻塞连接）；Queue 复用同样的配置。 */
-export declare function bullConnection(redisUrl: string, log: Pick<Logger, "error">): Redis;
+import { KyselyCheckpointSaver } from "./checkpointer.js";
+import { ConversationLock } from "./conversation-lock.js";
+import { RunFinish } from "./run-finish.js";
+import { type RunJobData, RunJobs } from "./run-jobs.js";
+export { ACTIVE_RUN_STATUSES, RUN_QUEUE_NAME, type RunJobData, runJobId, runQueueNameFor, SUBAGENT_RUN_QUEUE_NAME, } from "./run-jobs.js";
 /**
  * 运行队列（生产方）：`ensureRun` 在会话有未消费的用户消息、且没有进行中的运行时插入 `runs` 行并投递任务。
  * 「是否已有运行」以 PG 为准（会话行锁内检查 `runs` 中的 queued / running），并参考会话锁的持有者；
  * 多副本并发调用对同一会话串行化，同一时刻至多一个未结束的运行。
  */
 export declare class RunQueue {
-    private readonly db;
+    private readonly kdb;
     private readonly eventLog;
     private readonly lock;
-    private readonly redisUrl;
-    private readonly log;
+    private readonly jobs;
+    private readonly finisher;
     /** 运行以孤儿结束（标记失败 / 直接中止）后删除它的 checkpoint thread（thread_id = runId）。 */
-    private readonly checkpoints?;
-    /** Sub-agent cleanup when an orphan repair ends a parent run (sub-agents spec §12). */
-    private readonly subagents?;
-    private readonly queues;
-    private conn;
-    private closed;
-    constructor(db: KernelDb, eventLog: EventLog, lock: Pick<ConversationLock, "holder">, redisUrl: string, log: Pick<Logger, "error" | "warn">, 
+    private readonly checkpoints;
+    /** The run's open `Agent` call results, in the orphan repair's transaction (sub-agents spec §12). */
+    private readonly pipeline;
+    private readonly events;
+    private readonly log;
+    readonly txHost: TransactionHost;
+    constructor(kdb: KernelDb, eventLog: EventLog, lock: Pick<ConversationLock, "holder">, jobs: RunJobs, finisher: Pick<RunFinish, "finishIn">, 
     /** 运行以孤儿结束（标记失败 / 直接中止）后删除它的 checkpoint thread（thread_id = runId）。 */
-    checkpoints?: Pick<KyselyCheckpointSaver, "deleteThread"> | undefined, 
-    /** Sub-agent cleanup when an orphan repair ends a parent run (sub-agents spec §12). */
-    subagents?: OrphanSubagents | undefined);
+    checkpoints: Pick<KyselyCheckpointSaver, "deleteThread">, 
+    /** The run's open `Agent` call results, in the orphan repair's transaction (sub-agents spec §12). */
+    pipeline: Pick<ToolPipeline, "stopOpenAgentCalls">, events: KernelEvents, log: Pick<Logger, "error" | "warn">, txHost: TransactionHost);
+    private get db();
     /**
-     * The `beforeTerminal` of an orphan repair: writes the run's open `agent` call results in `t`;
-     * `fire()` runs their observe hooks after the commit (review m1).
+     * The `beforeTerminal` of an orphan repair: writes the run's open `Agent` call results in the
+     * repair's transaction; `fire()` runs their observe hooks after the commit (review m1).
      */
     private stopOpenCalls;
-    /** The BullMQ queue `name` (default: conversation runs); both share one connection. */
-    private getQueue;
     /**
      * 有未消费的用户消息（最新 user_message 的 seq > `consumed_seq`）、会话锁无人持有、
      * 且没有 queued / running / waiting 的运行时：插入 `runs`（queued）并投递任务，返回 runId；否则返回 null。
@@ -79,10 +53,11 @@ export declare class RunQueue {
      * agent 已软删除的会话不起新运行（孤儿清理照常进行）。
      */
     ensureRun(conversationId: string): Promise<string | null>;
+    /** {@link ensureRun}'s transaction: what it decided goes back through `st`. */
+    private ensureRunIn;
     /**
      * Enqueues a run job under the caller's job id (resumes, dispatches, repairs), with the same
-     * options as {@link ensureRun}. The queue follows the conversation's kind (a sub-agent's runs go
-     * to {@link SUBAGENT_RUN_QUEUE_NAME}); pass `kind` when the caller knows it, else it is read.
+     * options as {@link ensureRun} (see {@link RunJobs.enqueue}).
      */
     enqueue(data: RunJobData, jobId: string, kind?: ConversationKind): Promise<void>;
     /**
@@ -92,6 +67,7 @@ export declare class RunQueue {
      * 不是孤儿（有人在执行或即将执行）或运行已结束 → 返回 false，由调用方走广播中止。
      */
     abortIfOrphaned(conversationId: string, runId: string, byAccountId: string | null, detail?: RunAbortDetail): Promise<boolean>;
+    private abortOrphanIn;
     /**
      * Repairs an orphaned run of a conversation nobody else repairs on demand (a sub-agent's: no
      * `ensureRun` ever runs for it; sub-agents spec §7.5), with the same orphan test as
@@ -105,6 +81,7 @@ export declare class RunQueue {
      * Not an orphan, or already finished → null.
      */
     repairOrphan(conversationId: string, runId: string): Promise<"requeued" | "failed" | null>;
+    private repairOrphanIn;
     /** 会话当前未结束的运行（调用方已持有会话行锁）。 */
     private activeRun;
     /**
@@ -116,6 +93,4 @@ export declare class RunQueue {
     /** 删除已结束运行的 checkpoint thread（失败只记日志）。 */
     private dropCheckpoints;
     private deleteQueued;
-    close(): Promise<void>;
 }
-export {};