@capybara-hq/kernel 0.1.0-rc.23 → 0.1.0-rc.24

package/dist/runtime/run-finish.js

@@ -14,47 +14,78 @@ import { pauseQueueIn } from "../conversations/queue.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 { OutboxService } from "../infra/outbox/outbox.service.js";
 import { ScheduledTaskRunTracker } from "../schedules/run-tracker.js";
-export const TERMINAL_STATUSES = new Set([
-    "completed",
-    "failed",
-    "aborted",
-]);
+import { ApprovalsService } from "../tools/approvals.service.js";
+import { QuestionsService } from "../tools/questions.service.js";
+import { ACTIVE_RUN_STATUSES, lockWaitRowsIn, oweEnsureRun, TERMINAL_STATUSES, } from "./run-jobs.js";
+import { pairStoppedForks } from "./subagents/skill-fork.js";
+import { oweDeliverToParent, oweStopChildren } from "./subagents/tree-jobs.js";
 /**
- * Writes runs' terminal states (one instance; the run worker, the run queue's orphan repairs, the
- * waits and the eval replays finish runs through it).
+ * Writes runs' terminal states (one instance; the run worker, the run queue's orphan abort, the
+ * `run-orphan-check`, the waits and the eval replays finish runs through it).
  */
 let RunFinish = class RunFinish {
     kdb;
     eventLog;
     txHost;
     taskRuns;
+    outbox;
+    approvals;
+    questions;
     constructor(kdb, eventLog, txHost, 
     /** A scheduled task's run follows its kernel run's end in the same transaction (spec §6). */
-    taskRuns) {
+    taskRuns, 
+    /** The run's end owes the conversation's ensure-run backstop (transactional outbox spec §6). */
+    outbox, 
+    /** A finished run's pending approvals are cancelled in its terminal transaction. */
+    approvals, 
+    /** ... and its pending input requests. */
+    questions) {
         this.kdb = kdb;
         this.eventLog = eventLog;
         this.txHost = txHost;
         this.taskRuns = taskRuns;
+        this.outbox = outbox;
+        this.approvals = approvals;
+        this.questions = questions;
     }
     /**
      * 在调用方的事务内写运行的终态：会话行锁 → 运行仍未结束才写终态事件、推进 `consumed_seq`、更新 `runs.status`。
+     * It also owes the conversation's ensure-run backstop under the terminal event's seq.
+     *
+     * A finished run waits on nothing: its pending approvals and input requests (one asked just
+     * before the run failed, while it was still `running`) are cancelled before its terminal event
+     * (`approval_decided` / `question_answered` with `cancelled`). Lock order, as every path that
+     * writes them: the conversation row, the run's approval and input request rows, the run row.
+     *
+     * Sub-agents (transactional outbox spec §6): before the terminal event the run's open fork
+     * invocation gets its report (`pairStoppedForks`; an `Agent` call has its result from its
+     * dispatch), so no terminal path leaves an open call. After it, the stops and the delivery the
+     * run's end causes are owed here (runtime/subagents/tree-jobs.ts), the caller still doing them
+     * right after its commit: `stop-tree` when an active fork child remains or a sub-agent run a
+     * person stopped has sub-agents below it, `deliver-to-parent` for a sub-agent's run. The
+     * delivery is a job, not written here: this transaction holds the child's conversation and run
+     * rows, and the parent's conversation row comes first in the dispatch's lock order (parent
+     * conversation, parent run, budget run, child conversation).
      * 返回终态事件的 seq；运行已是终态（例如已被其他副本标记失败）→ 返回 null，什么都不写。
      *
      * `consumed_seq = GREATEST(consumed_seq, consumed, runs.trigger_seq)`：不回退，且失败 / 中止 / 完成都至少
      * 消费到触发该运行的消息——否则结束时的 ensureRun 会对同一条消息无限重试（失败）或卡住会话。
      * 超时（`floorToTrigger: false`）只取 `GREATEST(consumed_seq, consumed)`：没吸收的消息留给下一轮（R34）。
-     * 加锁顺序与 `RunQueue.ensureRun` 一致（先会话行、后 runs 行），不会互相死锁。
+     * Lock order as `RunQueue.ensureRun` and the decisions take it: the conversation row, the run's
+     * approval and input request rows, the run row; they never deadlock with each other.
      * 调用方在提交后对非 null 的返回值调用 {@link notifyFinished}。
      */
     async finishIn(a) {
         const t = this.kdb.db;
-        await t
+        const conv = await t
             .selectFrom("conversations")
-            .select("id")
+            .select(["kind", "org_id"])
             .where("id", "=", a.conversationId)
             .forUpdate()
             .executeTakeFirst();
+        const pending = await lockWaitRowsIn(t, a.runId);
         const run = await t
             .selectFrom("runs")
             .select("status")
@@ -63,7 +94,11 @@ let RunFinish = class RunFinish {
             .executeTakeFirst();
         if (!run || TERMINAL_STATUSES.has(run.status))
             return null;
-        await a.beforeTerminal?.();
+        if (pending.approvals)
+            await this.approvals.cancelPendingIn(a.runId);
+        if (pending.questions)
+            await this.questions.cancelPendingIn(a.runId);
+        await pairStoppedForks(t, this.eventLog, a.runId);
         const [ev] = await this.eventLog.appendIn(a.conversationId, [
             { ...a.event, runId: a.runId, idemKey: `${a.event.type}:${a.runId}` },
         ]);
@@ -85,7 +120,42 @@ let RunFinish = class RunFinish {
         // a failed or stopped run pauses the queued messages until the person resumes (spec §5.7)
         if (a.status !== "completed")
             await pauseQueueIn(t, a.conversationId);
-        return ev.seq;
+        const seq = ev.seq;
+        // what arrived during the run starts the next one after the commit (the run worker's post-job
+        // ensureRun); owed here too, for when that never happens (an eval's hidden conversation never
+        // starts runs)
+        if (conv && (conv.kind === "chat" || conv.kind === "subagent")) {
+            await oweEnsureRun(this.outbox, a.conversationId, seq, conv.org_id);
+        }
+        if (conv)
+            await this.oweTreeWork(a, conv.kind, conv.org_id);
+        return seq;
+    }
+    /** {@link finishIn}'s owed stops and delivery of a run's sub-agent tree. */
+    async oweTreeWork(a, kind, orgId) {
+        const t = this.kdb.db;
+        if (kind === "subagent")
+            await oweDeliverToParent(this.outbox, a.runId, orgId);
+        const forkChild = await t
+            .selectFrom("subagent_dispatches as sd")
+            .innerJoin("runs as cr", "cr.id", "sd.child_run_id")
+            .select("sd.child_run_id")
+            .where("sd.parent_run_id", "=", a.runId)
+            .where("sd.for_skill", "=", true)
+            .where("cr.status", "in", ACTIVE_RUN_STATUSES)
+            .limit(1)
+            .executeTakeFirst();
+        const stoppedWithChildren = kind === "subagent" &&
+            personStopped(a.event) &&
+            (await t
+                .selectFrom("conversations")
+                .select("id")
+                .where("parent_conversation_id", "=", a.conversationId)
+                .where("kind", "=", "subagent")
+                .limit(1)
+                .executeTakeFirst()) !== undefined;
+        if (forkChild || stoppedWithChildren)
+            await oweStopChildren(this.outbox, a.runId, orgId);
     }
     /** 自开事务写终态并在提交后发布会话通知；返回值同 {@link finishIn}。 */
     async finish(a) {
@@ -109,9 +179,22 @@ RunFinish = __decorate([
     __param(0, Inject(KernelDb)),
     __param(1, Inject(EventLog)),
     __param(2, Inject(TransactionHost)),
-    __param(3, Inject(ScheduledTaskRunTracker))
+    __param(3, Inject(ScheduledTaskRunTracker)),
+    __param(4, Inject(OutboxService)),
+    __param(5, Inject(ApprovalsService)),
+    __param(6, Inject(QuestionsService))
 ], RunFinish);
 export { RunFinish };
+/**
+ * A `run_aborted` a person caused (an account and no `detail`): a sub-agent run stopped that way
+ * stops its descendants (`Waits.stopDescendantsOfStopped`, agent map spec §6).
+ */
+function personStopped(event) {
+    if (event.type !== "run_aborted")
+        return false;
+    const p = event.payload;
+    return typeof p?.byAccountId === "string" && p.detail === undefined;
+}
 /** The message of a `run_failed` event's error, for the task run (undefined otherwise). */
 function failureMessage(event) {
     if (event.type !== "run_failed")

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

@@ -1,6 +1,8 @@
 import type { Job, Queue } from "bullmq";
-import type { ConversationKind } from "../db/kernel-schema.js";
+import type { ConversationKind, KernelSchemaDb } from "../db/kernel-schema.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
+import { TransactionHost } from "../infra/database/transaction-host.js";
+import { OutboxService } from "../infra/outbox/outbox.service.js";
 import type { KernelLogger } from "../log.js";
 /** 内核运行队列的 BullMQ 队列名（不含 `:`；与插件队列 `cap.<插件>.<名>` 不会重名）。 */
 export declare const RUN_QUEUE_NAME = "cap-kernel-runs";
@@ -10,9 +12,23 @@ export declare const RUN_QUEUE_NAME = "cap-kernel-runs";
  */
 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 declare const runQueueNameFor: (kind: ConversationKind) => typeof RUN_QUEUE_NAME | typeof SUBAGENT_RUN_QUEUE_NAME;
 /** 未结束的运行状态（waiting：等人处理审批 / 输入请求，没有任务、不占会话锁与配额）。 */
 export declare const ACTIVE_RUN_STATUSES: readonly ["queued", "running", "waiting"];
+/** 运行的终态。 */
+export type TerminalStatus = "completed" | "failed" | "aborted";
+/** The terminal run statuses (here, not in `run-finish.ts`, which the sub-agent modules import). */
+export declare const TERMINAL_STATUSES: ReadonlySet<string>;
+/**
+ * Locks a run's approval and input request rows (`FOR UPDATE`, in id order) in the caller's
+ * transaction, after its conversation row and before its run row: the one lock order of every path
+ * that writes them (conversation, decided rows, run; ruling R19), so a stop, a run's end, a decision
+ * and a timeout never deadlock. Returns whether any of them is still pending.
+ */
+export declare function lockWaitRowsIn(t: KernelSchemaDb, runId: string): Promise<{
+    approvals: boolean;
+    questions: boolean;
+}>;
 /** 运行任务的数据。 */
 export interface RunJobData {
     runId: string;
@@ -21,26 +37,92 @@ export interface RunJobData {
 /** 同一触发点（会话 + 最新用户消息 seq）只投递一次。 */
 export declare const runJobId: (conversationId: string, maxUserSeq: number) => string;
 /**
- * The producer side of the two run queues (`cap-kernel-runs`, `cap-kernel-subagent-runs`): adds
- * run jobs under the caller's job id and looks them up. The run queue (`ensureRun`, orphan
- * repairs), the waits (resumes) and the sub-agent dispatch enqueue through it; the run worker
- * consumes both queues.
+ * A resumed run's job id: apart from the per-message `run-<conversationId>-<seq>`, and one per
+ * wait, so the same wait resumes its run once.
+ */
+export declare const resumeJobId: (conversationId: string, waitId: string) => string;
+/** The BullMQ job name of every run job, on both run queues (an outbox registry name). */
+export declare const RUN_JOB = "run";
+/**
+ * The ensure-run backstop (transactional outbox spec §6 "Sending a message"): a maintenance job
+ * that calls `RunQueue.ensureRun` for a conversation. Every transaction that may start a run
+ * after its commit (a message, a queue change, a background task's finish, a sub-agent's delivery,
+ * a run's end) owes one, {@link ENSURE_RUN_BACKSTOP_MS} later, and its caller still calls
+ * `ensureRun` right after the commit: the job only matters when that call never happened (the
+ * process died) or failed (Redis was down).
+ */
+export declare const ENSURE_RUN_JOB = "ensure-run";
+/** How long after its transaction the ensure-run backstop fires (a backstop, not a second call). */
+export declare const ENSURE_RUN_BACKSTOP_MS = 30000;
+/** The ensure-run job's data. */
+export interface EnsureRunJobData {
+    conversationId: string;
+}
+/**
+ * The ensure-run job id: one per conversation and the seq of the event the transaction wrote (a
+ * write without an event of its own uses the conversation's newest seq; no `:`).
+ */
+export declare const ensureRunJobId: (conversationId: string, seq: number | string) => string;
+/**
+ * Owes the ensure-run backstop of `conversationId` in the caller's transaction (throws outside
+ * one). False when the same job id is already owed (the owed job does the same).
+ */
+export declare function oweEnsureRun(outbox: Pick<OutboxService, "add">, conversationId: string, seq: number | string, orgId: string): Promise<boolean>;
+/**
+ * The producer side of the two run queues (`cap-kernel-runs`, `cap-kernel-subagent-runs`): owes
+ * run jobs in the caller's transaction ({@link owe}: `ensureRun`, the sub-agent dispatch, the
+ * `run-orphan-check`) and looks them up; the run worker consumes both queues.
  */
 export declare class RunJobs {
-    private readonly kdb;
+    private readonly outbox;
     private readonly queues;
-    constructor(kdb: KernelDb, runs: Queue<RunJobData>, subagentRuns: Queue<RunJobData>, log: KernelLogger);
+    constructor(runs: Queue<RunJobData>, subagentRuns: Queue<RunJobData>, log: KernelLogger, outbox: OutboxService);
     /** The BullMQ queue `name` (default: conversation runs). */
     queue(name?: string): Queue<RunJobData>;
     /** A run job by id on the queue `name`, or undefined. */
     getJob(jobId: string, name?: string): Promise<Job<RunJobData> | undefined>;
     /**
-     * Enqueues a run job under the caller's job id (`ensureRun`, resumes, dispatches, repairs). 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.
+     * Owes the run job in the caller's transaction (transactional outbox spec §6): the outbox row
+     * commits or rolls back with the run row, on the queue of the conversation's `kind`. Returns
+     * false when the same job id is already owed (nothing written; the caller creates no run).
      */
-    enqueue(data: RunJobData, jobId: string, kind?: ConversationKind): Promise<void>;
+    owe(data: RunJobData, jobId: string, kind: ConversationKind, orgId: string): Promise<boolean>;
+    /** {@link oweEnsureRun} in the caller's transaction. */
+    oweEnsureRun(conversationId: string, seq: number | string, orgId: string): Promise<boolean>;
 }
-/** The run queues' producer (the sub-agent dispatch, the run queue and the waits use it). */
+/**
+ * What {@link RunResume.resumeIn} found: `queued`, the run was waiting on nothing else and now is
+ * queued with its resume job owed; `still-running`, the run has not reached `waiting` yet (its
+ * suspend's re-check resumes it); `other-wait-pending`, the run still waits on another approval,
+ * input request or fork sub-agent; `not-waiting`, the run is queued or finished (or gone).
+ */
+export type ResumeOutcome = "queued" | "still-running" | "other-wait-pending" | "not-waiting";
+/**
+ * The resume of a waiting run (transactional outbox spec §6 "Resumes and timeouts", "Decisions
+ * resume in their own transaction"), in the caller's transaction. A decision (approvals, questions,
+ * a reply's skips) calls it after writing the decided row, so the lock order is the decided row,
+ * then the `runs` row. It lives beside the run jobs, not in `Waits`, so the tools domain (which the
+ * runtime imports) can call it; `Waits.resume` wraps it in a transaction of its own.
+ */
+export declare class RunResume {
+    private readonly kdb;
+    private readonly outbox;
+    readonly txHost: TransactionHost;
+    constructor(kdb: KernelDb, outbox: Pick<OutboxService, "add">, txHost: TransactionHost);
+    /**
+     * Locks the run row (`FOR UPDATE`); when it is `waiting` and waits on nothing else (no pending
+     * approval or input request, no active fork sub-agent), sets it `queued` (adding this wait's
+     * time to `waited_ms`, recording the resume job id) and owes the resume job
+     * {@link resumeJobId}`(conversation, waitId)` on its conversation kind's run queue. A `running`
+     * run is left alone: its suspend has not set `waiting` yet and re-checks the wait after.
+     */
+    resumeIn(runId: string, waitId: string): Promise<ResumeOutcome>;
+}
+/**
+ * The run queues' producer (the sub-agent dispatch, the run queue and the waits use it), the
+ * resume of a waiting run (the waits and the decisions of the tools domain use it) and the
+ * lost-jobs canary of the run queues (the `run-orphan-check` reports it, the admin overview reads
+ * it).
+ */
 export declare class RunJobsModule {
 }

package/dist/runtime/run-jobs.js

@@ -9,9 +9,15 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { getQueueToken } from "@nestjs/bullmq";
 import { Inject, Injectable, Module } from "@nestjs/common";
+import { sql } from "kysely";
 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 { OutboxService } from "../infra/outbox/outbox.service.js";
 import { QueueModule } from "../infra/queue/queue.module.js";
 import { KERNEL_LOGGER } from "../infra/tokens.js";
+import { MAINTENANCE_QUEUE_NAME } from "./maintenance-queue.js";
+import { QueueLostJobs } from "./queue-lost-jobs.js";
 /** 内核运行队列的 BullMQ 队列名（不含 `:`；与插件队列 `cap.<插件>.<名>` 不会重名）。 */
 export const RUN_QUEUE_NAME = "cap-kernel-runs";
 /**
@@ -23,21 +29,87 @@ export const SUBAGENT_RUN_QUEUE_NAME = "cap-kernel-subagent-runs";
 export const runQueueNameFor = (kind) => kind === "subagent" ? SUBAGENT_RUN_QUEUE_NAME : RUN_QUEUE_NAME;
 /** 未结束的运行状态（waiting：等人处理审批 / 输入请求，没有任务、不占会话锁与配额）。 */
 export const ACTIVE_RUN_STATUSES = ["queued", "running", "waiting"];
+/** The terminal run statuses (here, not in `run-finish.ts`, which the sub-agent modules import). */
+export const TERMINAL_STATUSES = new Set([
+    "completed",
+    "failed",
+    "aborted",
+]);
+/**
+ * Locks a run's approval and input request rows (`FOR UPDATE`, in id order) in the caller's
+ * transaction, after its conversation row and before its run row: the one lock order of every path
+ * that writes them (conversation, decided rows, run; ruling R19), so a stop, a run's end, a decision
+ * and a timeout never deadlock. Returns whether any of them is still pending.
+ */
+export async function lockWaitRowsIn(t, runId) {
+    const approvals = await t
+        .selectFrom("approvals")
+        .select("status")
+        .where("run_id", "=", runId)
+        .orderBy("id")
+        .forUpdate()
+        .execute();
+    const questions = await t
+        .selectFrom("questions")
+        .select("status")
+        .where("run_id", "=", runId)
+        .orderBy("id")
+        .forUpdate()
+        .execute();
+    return {
+        approvals: approvals.some((r) => r.status === "pending"),
+        questions: questions.some((r) => r.status === "pending"),
+    };
+}
 /** 同一触发点（会话 + 最新用户消息 seq）只投递一次。 */
 export const runJobId = (conversationId, maxUserSeq) => `run-${conversationId}-${maxUserSeq}`;
-/** The options of every run job: one attempt (the run's own paths handle failures), not kept. */
-const RUN_JOB_OPTIONS = { attempts: 1, removeOnComplete: true, removeOnFail: true };
 /**
- * The producer side of the two run queues (`cap-kernel-runs`, `cap-kernel-subagent-runs`): adds
- * run jobs under the caller's job id and looks them up. The run queue (`ensureRun`, orphan
- * repairs), the waits (resumes) and the sub-agent dispatch enqueue through it; the run worker
- * consumes both queues.
+ * A resumed run's job id: apart from the per-message `run-<conversationId>-<seq>`, and one per
+ * wait, so the same wait resumes its run once.
+ */
+export const resumeJobId = (conversationId, waitId) => `run-${conversationId}-resume-${waitId}`;
+/** The BullMQ job name of every run job, on both run queues (an outbox registry name). */
+export const RUN_JOB = "run";
+/**
+ * The ensure-run backstop (transactional outbox spec §6 "Sending a message"): a maintenance job
+ * that calls `RunQueue.ensureRun` for a conversation. Every transaction that may start a run
+ * after its commit (a message, a queue change, a background task's finish, a sub-agent's delivery,
+ * a run's end) owes one, {@link ENSURE_RUN_BACKSTOP_MS} later, and its caller still calls
+ * `ensureRun` right after the commit: the job only matters when that call never happened (the
+ * process died) or failed (Redis was down).
+ */
+export const ENSURE_RUN_JOB = "ensure-run";
+/** How long after its transaction the ensure-run backstop fires (a backstop, not a second call). */
+export const ENSURE_RUN_BACKSTOP_MS = 30_000;
+/**
+ * The ensure-run job id: one per conversation and the seq of the event the transaction wrote (a
+ * write without an event of its own uses the conversation's newest seq; no `:`).
+ */
+export const ensureRunJobId = (conversationId, seq) => `ensure-run-${conversationId}-${seq}`;
+/**
+ * Owes the ensure-run backstop of `conversationId` in the caller's transaction (throws outside
+ * one). False when the same job id is already owed (the owed job does the same).
+ */
+export function oweEnsureRun(outbox, conversationId, seq, orgId) {
+    return outbox.add({
+        queue: MAINTENANCE_QUEUE_NAME,
+        name: ENSURE_RUN_JOB,
+        jobId: ensureRunJobId(conversationId, seq),
+        data: { conversationId },
+        runAt: new Date(Date.now() + ENSURE_RUN_BACKSTOP_MS),
+        orgId,
+    });
+}
+/**
+ * The producer side of the two run queues (`cap-kernel-runs`, `cap-kernel-subagent-runs`): owes
+ * run jobs in the caller's transaction ({@link owe}: `ensureRun`, the sub-agent dispatch, the
+ * `run-orphan-check`) and looks them up; the run worker consumes both queues.
  */
 let RunJobs = class RunJobs {
-    kdb;
+    outbox;
     queues;
-    constructor(kdb, runs, subagentRuns, log) {
-        this.kdb = kdb;
+    constructor(runs, subagentRuns, log, outbox) {
+        this.outbox = outbox;
         this.queues = { [RUN_QUEUE_NAME]: runs, [SUBAGENT_RUN_QUEUE_NAME]: subagentRuns };
         for (const [name, q] of Object.entries(this.queues)) {
             q.on("error", (err) => log.error("run queue error", { err, queue: name }));
@@ -55,39 +127,138 @@ let RunJobs = class RunJobs {
         return this.queue(name).getJob(jobId);
     }
     /**
-     * Enqueues a run job under the caller's job id (`ensureRun`, resumes, dispatches, repairs). 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.
+     * Owes the run job in the caller's transaction (transactional outbox spec §6): the outbox row
+     * commits or rolls back with the run row, on the queue of the conversation's `kind`. Returns
+     * false when the same job id is already owed (nothing written; the caller creates no run).
      */
-    async enqueue(data, jobId, kind) {
-        const k = kind ??
-            (await this.kdb.db
-                .selectFrom("conversations")
-                .select("kind")
-                .where("id", "=", data.conversationId)
-                .executeTakeFirst())?.kind ??
-            "chat";
-        await this.queue(runQueueNameFor(k)).add("run", data, { jobId, ...RUN_JOB_OPTIONS });
+    owe(data, jobId, kind, orgId) {
+        return this.outbox.add({
+            queue: runQueueNameFor(kind),
+            name: RUN_JOB,
+            jobId,
+            data,
+            orgId,
+        });
+    }
+    /** {@link oweEnsureRun} in the caller's transaction. */
+    oweEnsureRun(conversationId, seq, orgId) {
+        return oweEnsureRun(this.outbox, conversationId, seq, orgId);
     }
 };
 RunJobs = __decorate([
     Injectable(),
-    __param(0, Inject(KernelDb)),
-    __param(1, Inject(getQueueToken(RUN_QUEUE_NAME))),
-    __param(2, Inject(getQueueToken(SUBAGENT_RUN_QUEUE_NAME))),
-    __param(3, Inject(KERNEL_LOGGER))
+    __param(0, Inject(getQueueToken(RUN_QUEUE_NAME))),
+    __param(1, Inject(getQueueToken(SUBAGENT_RUN_QUEUE_NAME))),
+    __param(2, Inject(KERNEL_LOGGER)),
+    __param(3, Inject(OutboxService))
 ], RunJobs);
 export { RunJobs };
+/**
+ * The resume of a waiting run (transactional outbox spec §6 "Resumes and timeouts", "Decisions
+ * resume in their own transaction"), in the caller's transaction. A decision (approvals, questions,
+ * a reply's skips) calls it after writing the decided row, so the lock order is the decided row,
+ * then the `runs` row. It lives beside the run jobs, not in `Waits`, so the tools domain (which the
+ * runtime imports) can call it; `Waits.resume` wraps it in a transaction of its own.
+ */
+let RunResume = class RunResume {
+    kdb;
+    outbox;
+    txHost;
+    constructor(kdb, outbox, txHost) {
+        this.kdb = kdb;
+        this.outbox = outbox;
+        this.txHost = txHost;
+    }
+    /**
+     * Locks the run row (`FOR UPDATE`); when it is `waiting` and waits on nothing else (no pending
+     * approval or input request, no active fork sub-agent), sets it `queued` (adding this wait's
+     * time to `waited_ms`, recording the resume job id) and owes the resume job
+     * {@link resumeJobId}`(conversation, waitId)` on its conversation kind's run queue. A `running`
+     * run is left alone: its suspend has not set `waiting` yet and re-checks the wait after.
+     */
+    async resumeIn(runId, waitId) {
+        const t = this.kdb.db;
+        const run = await t
+            .selectFrom("runs")
+            .select("status")
+            .where("id", "=", runId)
+            .forUpdate()
+            .executeTakeFirst();
+        if (run?.status === "running")
+            return "still-running";
+        if (run?.status !== "waiting")
+            return "not-waiting";
+        const row = await t
+            .updateTable("runs")
+            .set({
+            status: "queued",
+            queued_at: sql `now()`,
+            job_id: sql `'run-' || conversation_id || '-resume-' || ${waitId}::text`,
+            waited_ms: sql `waited_ms + COALESCE(floor(extract(epoch FROM now() - waiting_since) * 1000), 0)::bigint`,
+            waiting_since: null,
+            wait_expires_at: null,
+        })
+            .where("id", "=", runId)
+            .where(({ not, exists, selectFrom }) => not(exists(selectFrom("approvals")
+            .select(sql `1`.as("one"))
+            .where("approvals.run_id", "=", runId)
+            .where("approvals.status", "=", "pending"))))
+            .where(({ not, exists, selectFrom }) => not(exists(selectFrom("questions")
+            .select(sql `1`.as("one"))
+            .where("questions.run_id", "=", runId)
+            .where("questions.status", "=", "pending"))))
+            // a fork invocation's sub-agent (agent map spec §5.4: background `Agent` children never
+            // hold their parent run) is no longer active
+            .where(({ not, exists, selectFrom }) => not(exists(selectFrom("subagent_dispatches as sd")
+            .innerJoin("runs as cr", "cr.id", "sd.child_run_id")
+            .select(sql `1`.as("one"))
+            .where("sd.parent_run_id", "=", runId)
+            .where("sd.for_skill", "=", true)
+            .where("cr.status", "in", ACTIVE_RUN_STATUSES))))
+            .returning("conversation_id")
+            .executeTakeFirst();
+        if (!row)
+            return "other-wait-pending";
+        const conv = await t
+            .selectFrom("conversations")
+            .select(["kind", "org_id"])
+            .where("id", "=", row.conversation_id)
+            .executeTakeFirstOrThrow();
+        await this.outbox.add({
+            queue: runQueueNameFor(conv.kind),
+            name: RUN_JOB,
+            jobId: resumeJobId(row.conversation_id, waitId),
+            data: { runId, conversationId: row.conversation_id },
+            orgId: conv.org_id,
+        });
+        return "queued";
+    }
+};
+__decorate([
+    Transactional({ propagation: "mandatory" })
+], RunResume.prototype, "resumeIn", null);
+RunResume = __decorate([
+    Injectable(),
+    __param(0, Inject(KernelDb)),
+    __param(1, Inject(OutboxService)),
+    __param(2, Inject(TransactionHost))
+], RunResume);
+export { RunResume };
 /** The run queues' registration (re-exported: the admin health reads their counts). */
 const RUN_QUEUES_MODULE = QueueModule.registerQueue(RUN_QUEUE_NAME, SUBAGENT_RUN_QUEUE_NAME);
-/** The run queues' producer (the sub-agent dispatch, the run queue and the waits use it). */
+/**
+ * The run queues' producer (the sub-agent dispatch, the run queue and the waits use it), the
+ * resume of a waiting run (the waits and the decisions of the tools domain use it) and the
+ * lost-jobs canary of the run queues (the `run-orphan-check` reports it, the admin overview reads
+ * it).
+ */
 let RunJobsModule = class RunJobsModule {
 };
 RunJobsModule = __decorate([
     Module({
         imports: [RUN_QUEUES_MODULE],
-        providers: [RunJobs],
-        exports: [RunJobs, RUN_QUEUES_MODULE],
+        providers: [RunJobs, RunResume, QueueLostJobs],
+        exports: [RunJobs, RunResume, QueueLostJobs, RUN_QUEUES_MODULE],
     })
 ], RunJobsModule);
 export { RunJobsModule };