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

package/dist/conversations/conversations.service.js

@@ -19,7 +19,6 @@ 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 { KernelEvents } from "../infra/events/kernel-events.js";
-import { KERNEL_LOGGER } from "../infra/tokens.js";
 import { ProviderRegistry } from "../runtime/providers.js";
 import { RunControl as RunControlService } from "../runtime/run-control.js";
 import { rootConversationOf } from "../runtime/subagents/child.js";
@@ -130,7 +129,6 @@ let ConversationsService = class ConversationsService {
     access;
     runs;
     providers;
-    log;
     content;
     attachments;
     invoker;
@@ -144,7 +142,7 @@ let ConversationsService = class ConversationsService {
     /** Starts and stops the conversation's runs. */
     runs, 
     /** Resolves a switched-to model and its declared parameters (UI refresh B). */
-    providers, log, 
+    providers, 
     /** Reads `@` resources with the sender's credentials. */
     content, 
     /** Binds uploaded files to the conversation in the message's transaction. */
@@ -165,7 +163,6 @@ let ConversationsService = class ConversationsService {
         this.access = access;
         this.runs = runs;
         this.providers = providers;
-        this.log = log;
         this.content = content;
         this.attachments = attachments;
         this.invoker = invoker;
@@ -176,15 +173,6 @@ let ConversationsService = class ConversationsService {
         this.events = events;
         this.txHost = txHost;
     }
-    /**
-     * 不阻塞地调用一次 `ensureRun`（打开 SSE、读事件时）：它幂等，并顺带清理孤儿运行，
-     * 会话不会因为某次运行结束后的投递失败而永远停在「运行中」。失败只记日志。
-     */
-    kickRun(conversationId) {
-        this.runs
-            .ensureRun(conversationId)
-            .catch((err) => this.log.warn("ensureRun on conversation open failed", { conversationId, err }));
-    }
     /**
      * Creates an empty conversation bound to its device (`pick`, see
      * {@link ConversationDevices.forNew}); an agent the account cannot use →
@@ -237,7 +225,7 @@ let ConversationsService = class ConversationsService {
             return raced;
         }
         await this.eventLog.notify(id, written.seq);
-        await this.runs.ensureRun(id);
+        await this.startRun(id);
         return { conversation: await this.rowView(id), event: written, events: all, created: true };
     }
     /** The conversation row and its first message (undefined: a concurrent retry committed first). */
@@ -292,9 +280,16 @@ let ConversationsService = class ConversationsService {
             return null;
         // what the first send wrote: the log from its start up to the message
         const events = (await this.eventLog.readAfter(row.id, 0, event.seq)).filter((e) => e.seq <= event.seq);
-        await this.runs.ensureRun(row.id);
+        await this.startRun(row.id);
         return { conversation: toView(row), event, events, created: false };
     }
+    /**
+     * The direct `ensureRun` after a message's commit ({@link RunControl.ensureRunAfterCommit}): a
+     * failure never fails the request, since the message's transaction owes the ensure-run backstop.
+     */
+    startRun(conversationId) {
+        return this.runs.ensureRunAfterCommit(conversationId);
+    }
     async rowView(id) {
         return toView(await this.db
             .selectFrom("conversations")
@@ -352,7 +347,7 @@ let ConversationsService = class ConversationsService {
             if (!(e instanceof ApiError && e.code === "run.not_active"))
                 throw e;
         }
-        await this.markDeleted(conversationId);
+        await this.markDeleted(orgId, conversationId, accountId);
         // after the mark, so no finish or delivery of the stops below can start a run on the deleted
         // root (`ensureRun` refuses it). The sandbox's tasks stop first, so the sub-agents' tasks end
         // as a deletion; the tree stop then only stops a task a sub-agent started in between
@@ -362,13 +357,15 @@ let ConversationsService = class ConversationsService {
         await this.runs.stopTree(conversationId, accountId, { includeSelf: false });
         await this.eventLog.publishChanged(conversationId, "deleted");
     }
-    // the publish happens after the commit, in the caller
-    async markDeleted(conversationId) {
+    // the publish happens after the commit, in the caller; the tree stop after it is owed here
+    // (transactional outbox spec §6), so a process that dies before it still stops the tree
+    async markDeleted(orgId, conversationId, accountId) {
         await this.db
             .updateTable("conversations")
             .set({ deleted_at: sql `now()` })
             .where("id", "=", conversationId)
             .execute();
+        await this.runs.oweStopDeletedTree(conversationId, accountId, orgId);
         // Queued messages must not start a run on a deleted conversation
         await this.db
             .deleteFrom("conversation_queue")
@@ -681,26 +678,28 @@ let ConversationsService = class ConversationsService {
             return conversationId;
         return rootConversationOf(this.db.db, row.parent_conversation_id);
     }
-    /** 读事件（先做 `get` 的可见性判定）；顺带不阻塞地 {@link kickRun}。 */
+    /**
+     * 读事件（先做 `get` 的可见性判定）. A read never changes run state (transactional outbox spec
+     * §6): a run nobody runs is the `run-orphan-check`'s to repair.
+     */
     async listEvents(orgId, conversationId, viewerAccountId, afterSeq, limit) {
         await this.get(orgId, conversationId, viewerAccountId);
-        this.kickRun(conversationId);
         return this.eventLog.readAfter(conversationId, afterSeq, limit);
     }
     /**
      * The turn-aligned page of events before `beforeSeq` (`null`: the log's last page), with how
      * many runs started before it ({@link EventLog.readTurnPageBefore}; history paging spec §2).
-     * Visibility as {@link get}; kicks a stalled run as {@link listEvents} does.
+     * Visibility as {@link get}; a read only, as {@link listEvents}.
      */
     async listEventsBefore(orgId, conversationId, viewerAccountId, beforeSeq, limit) {
         await this.get(orgId, conversationId, viewerAccountId);
-        this.kickRun(conversationId);
         return this.eventLog.readTurnPageBefore(conversationId, beforeSeq, limit, EVENTS_TURN_EXTEND);
     }
     /**
      * 追加一条用户消息；带 `clientMessageId` 时重复提交返回同一事件。写入后调用 `ensureRun`：
      * 没有进行中的运行时投递一轮；运行中则由当前运行在步骤间隙吸收，或在它结束时再次 `ensureRun`。
-     * 投递失败时抛错（消息已写入；客户端带同一 `clientMessageId` 重试会再次触发投递）。
+     * A failed `ensureRun` is logged, not thrown: the message's transaction owes the ensure-run
+     * backstop, which starts the run once the queue is reachable (transactional outbox spec §6).
      *
      * `attachments`（`@` 资源引用）：内核以发送者的凭据读取资源（打码、限长），作为用户文本之后的额外文本块写入同一条
      * user_message，并在 `payload.attachments` 记录元数据（第 i 个附件对应 `content[i + 1]`）。读取失败整条不写。
@@ -719,7 +718,7 @@ let ConversationsService = class ConversationsService {
             input.clientMessageId !== undefined) {
             const existing = await this.eventLog.findByIdem(conversationId, userMessageIdemKey(input.clientMessageId));
             if (existing) {
-                await this.runs.ensureRun(conversationId);
+                await this.startRun(conversationId);
                 return existing;
             }
         }
@@ -750,7 +749,7 @@ let ConversationsService = class ConversationsService {
                 .execute();
             await this.eventLog.publishChanged(conversationId, "archived");
         }
-        await this.runs.ensureRun(conversationId);
+        await this.startRun(conversationId);
         return event;
     }
     /**
@@ -812,10 +811,19 @@ let ConversationsService = class ConversationsService {
      * conversations (network ask-to-allow spec §6.7). The queue's "send now" uses it as the direct
      * send does; announce after the commit with {@link announceSkipped}. `toSeq` is the highest seq
      * written in this conversation (null: none).
+     *
+     * Lock order: this (root) conversation (the caller's), its pending questions, the sub-agents'
+     * conversations with a pending network ask (id order), the asks themselves (the root's and the
+     * sub-agents'), and only then the run rows, as each skipped wait's run resumes in this
+     * transaction. Every run row comes after every conversation and decided row (ruling R19); a
+     * sub-agent's conversation comes after the root's questions, which only this path locks with a
+     * sub-agent conversation after them.
      */
     async skipWaitsIn(conversationId, accountId, messageSeq) {
         const q = await this.questions.skipPendingIn(conversationId, accountId, messageSeq);
         const n = await this.approvals.skipNetworkIn(conversationId, accountId);
+        for (const w of [...q.records, ...n.records])
+            await this.runs.resumeIn(w.runId, w.id);
         const here = n.seqs.get(conversationId);
         const toSeq = q.toSeq === null && here === undefined ? null : Math.max(q.toSeq ?? 0, here ?? 0);
         return { skipped: { questions: q.records, network: n.records, seqs: n.seqs }, toSeq };
@@ -823,7 +831,8 @@ let ConversationsService = class ConversationsService {
     /**
      * After the commit: announces each skipped question (`question.answered`, outcome `skipped`) and
      * network ask (`approval.decided`, status `skipped`; a sub-agent's conversation is notified
-     * first), so its run resumes (waits) and its IM card updates (channel jobs).
+     * first) as domain events with no kernel subscriber: the IM card updates are owed by the skips'
+     * appends (transactional outbox spec §8.1); the run resumed in the message's transaction.
      */
     async announceSkipped(skipped) {
         for (const q of skipped.questions) {
@@ -877,6 +886,10 @@ let ConversationsService = class ConversationsService {
         events.push(this.userMessage(accountId, input, extra, blocks, invoked, context, internal.schedule));
         const { events: written, fresh } = await this.eventLog.appendInReport(conversationId, events);
         const message = written.at(-1);
+        // the run this message starts is owed with it: the direct ensureRun after the commit may never
+        // happen (the process died) or fail (transactional outbox spec §6)
+        if (fresh.at(-1) === true)
+            await this.runs.oweEnsureRun(conversationId, message.seq, orgId);
         const skips = fresh.at(-1) === true
             ? await this.skipWaitsIn(conversationId, accountId, message.seq)
             : { skipped: NO_REPLY_SKIPS, toSeq: null };
@@ -995,13 +1008,15 @@ let ConversationsService = class ConversationsService {
             throw new ApiError("run.not_active", "No active run to abort");
         const runs = this.runs;
         // 等待中：直接结束；没成功（刚被续跑、已回到 queued）则按下面的常规路径中止。
+        // the stop's terminal transaction owed the ensure-run backstop; the direct call starts what
+        // waited for the stopped run now
         if (run.status === "waiting" && (await runs.abortWaiting(conversationId, run.id, accountId))) {
-            this.kickRun(conversationId);
+            await runs.ensureRunAfterCommit(conversationId);
             return run.id;
         }
         // 孤儿运行没有 worker 在听中止广播：直接写成 aborted，之后再看有没有等待中的消息要起新一轮。
         if (await runs.abortIfOrphaned(conversationId, run.id, accountId)) {
-            this.kickRun(conversationId);
+            await runs.ensureRunAfterCommit(conversationId);
             return run.id;
         }
         await runs.requestAbort(run.id, accountId);
@@ -1034,15 +1049,14 @@ ConversationsService = __decorate([
     __param(3, Inject(ConversationAccess)),
     __param(4, Inject(RunControlService)),
     __param(5, Inject(ProviderRegistry)),
-    __param(6, Inject(KERNEL_LOGGER)),
-    __param(7, Inject(ConnectorContent)),
-    __param(8, Inject(AttachmentsService)),
-    __param(9, Inject(SkillInvoker)),
-    __param(10, Inject(BackgroundTaskStopper)),
-    __param(11, Inject(ConversationDevices)),
-    __param(12, Inject(QuestionsService)),
-    __param(13, Inject(ApprovalsService)),
-    __param(14, Inject(KernelEvents)),
-    __param(15, Inject(TransactionHost))
+    __param(6, Inject(ConnectorContent)),
+    __param(7, Inject(AttachmentsService)),
+    __param(8, Inject(SkillInvoker)),
+    __param(9, Inject(BackgroundTaskStopper)),
+    __param(10, Inject(ConversationDevices)),
+    __param(11, Inject(QuestionsService)),
+    __param(12, Inject(ApprovalsService)),
+    __param(13, Inject(KernelEvents)),
+    __param(14, Inject(TransactionHost))
 ], ConversationsService);
 export { ConversationsService };

package/dist/conversations/event-log.d.ts

@@ -1,6 +1,6 @@
 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 { OutboxService } from "../infra/outbox/outbox.service.js";
 import type { KernelLogger } from "../log.js";
 import { type ConversationEvent, type ConversationEventType } from "./events.js";
 /** 事件日志依赖的总线：内核 bus（命名空间 `kernel`）。 */
@@ -74,17 +74,17 @@ export type ConversationChange = (typeof CONVERSATION_CHANGES)[number];
  * seq 由 `conversations.last_seq` 在会话行锁内连续分配（多副本并发写同一会话时串行化）；
  * 幂等键的「先查后写」也在同一把行锁内完成。
  *
- * Every published advance (`notify`) is also announced in-process as `conversation.event-appended`
- * on {@link KernelEvents} (the channel outbound delivery enqueues from it), on this replica, right
- * after the bus publish, in append order.
+ * An append to a conversation with a channel target (`channel_deliveries`, read with the row lock)
+ * owes the conversation's IM delivery in the append's transaction (transactional outbox spec
+ * §8.1); a conversation without one writes nothing more.
  */
 export declare class EventLog {
     private readonly db;
     private readonly bus;
     private readonly log;
-    private readonly events;
+    private readonly outbox;
     readonly txHost: TransactionHost;
-    constructor(db: KernelDb, bus: EventBus, log: Pick<KernelLogger, "warn">, events: Pick<KernelEvents, "emit">, txHost: TransactionHost);
+    constructor(db: KernelDb, bus: EventBus, log: Pick<KernelLogger, "warn">, outbox: Pick<OutboxService, "add">, txHost: TransactionHost);
     /**
      * 追加事件，返回与输入一一对应的事件（幂等命中的为已有事件）。
      * 自开一个独立事务（`requires_new`，与调用方的事务无关），提交后发布 `conv.<id>`。
@@ -107,10 +107,7 @@ export declare class EventLog {
         fresh: boolean[];
     }>;
     private appendOwn;
-    /**
-     * 发布「日志已推进到 toSeq」；发布失败只记日志（事件已提交，订阅方可按 seq 补读）。Then announces
-     * it in-process (`conversation.event-appended`); a failing subscriber is logged by KernelEvents.
-     */
+    /** 发布「日志已推进到 toSeq」；发布失败只记日志（事件已提交，订阅方可按 seq 补读）。 */
     notify(conversationId: string, toSeq: number): Promise<void>;
     /**
      * Publishes a `changed` frame on the conversation topic (rename, generated title, selection, ...).

package/dist/conversations/event-log.js

@@ -9,11 +9,12 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { Inject, Injectable, Module } from "@nestjs/common";
 import { sql } from "kysely";
+import { oweDelivery } from "../channels/deliver-job.js";
 import { ApiError } from "../errors.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 { KernelEvents } from "../infra/events/kernel-events.js";
+import { OutboxService } from "../infra/outbox/outbox.service.js";
 import { KERNEL_BUS, KERNEL_LOGGER } from "../infra/tokens.js";
 import { ConversationEventSchema, } from "./events.js";
 /**
@@ -75,21 +76,21 @@ const EVENT_COLUMNS = [
  * seq 由 `conversations.last_seq` 在会话行锁内连续分配（多副本并发写同一会话时串行化）；
  * 幂等键的「先查后写」也在同一把行锁内完成。
  *
- * Every published advance (`notify`) is also announced in-process as `conversation.event-appended`
- * on {@link KernelEvents} (the channel outbound delivery enqueues from it), on this replica, right
- * after the bus publish, in append order.
+ * An append to a conversation with a channel target (`channel_deliveries`, read with the row lock)
+ * owes the conversation's IM delivery in the append's transaction (transactional outbox spec
+ * §8.1); a conversation without one writes nothing more.
  */
 let EventLog = class EventLog {
     db;
     bus;
     log;
-    events;
+    outbox;
     txHost;
-    constructor(db, bus, log, events, txHost) {
+    constructor(db, bus, log, outbox, txHost) {
         this.db = db;
         this.bus = bus;
         this.log = log;
-        this.events = events;
+        this.outbox = outbox;
         this.txHost = txHost;
     }
     /**
@@ -126,10 +127,7 @@ let EventLog = class EventLog {
         const { events: out, toSeq } = await this.write(conversationId, events, bodies);
         return { events: out, toSeq };
     }
-    /**
-     * 发布「日志已推进到 toSeq」；发布失败只记日志（事件已提交，订阅方可按 seq 补读）。Then announces
-     * it in-process (`conversation.event-appended`); a failing subscriber is logged by KernelEvents.
-     */
+    /** 发布「日志已推进到 toSeq」；发布失败只记日志（事件已提交，订阅方可按 seq 补读）。 */
     async notify(conversationId, toSeq) {
         const msg = { kind: "events", toSeq };
         try {
@@ -138,7 +136,6 @@ let EventLog = class EventLog {
         catch (err) {
             this.log.warn("conversation event notify failed", { conversationId, toSeq, err });
         }
-        await this.events.emit("conversation.event-appended", { conversationId, toSeq });
     }
     /**
      * Publishes a `changed` frame on the conversation topic (rename, generated title, selection, ...).
@@ -300,10 +297,20 @@ let EventLog = class EventLog {
     /** The append itself, in the context's transaction (both callers open or join one). */
     async write(conversationId, events, bodies) {
         const t = this.db;
-        // 先锁会话行：之后的幂等查询与 seq 分配都在这把锁内，并发 append 依次执行。
+        // 先锁会话行：之后的幂等查询与 seq 分配都在这把锁内，并发 append 依次执行。The same statement
+        // reads whether the conversation has a channel target (its primary key), under the lock that
+        // `ChannelJobs.bind` takes too
         const conv = await t
             .selectFrom("conversations")
-            .select("id")
+            .select((eb) => [
+            "org_id",
+            eb
+                .exists(eb
+                .selectFrom("channel_deliveries")
+                .select("channel_deliveries.conversation_id")
+                .whereRef("channel_deliveries.conversation_id", "=", "conversations.id"))
+                .as("im"),
+        ])
             .where("id", "=", conversationId)
             .forUpdate()
             .executeTakeFirst();
@@ -378,6 +385,8 @@ let EventLog = class EventLog {
         }))
             .returning(EVENT_COLUMNS)
             .execute();
+        if (conv.im)
+            await oweDelivery(this.outbox, { conversationId, orgId: conv.org_id, seq: toSeq });
         const bySeq = new Map(inserted.map((r) => [Number(r.seq), toEvent(r)]));
         return {
             events: plan.map((p) => p.kind === "old" ? p.event : bySeq.get(base + p.index + 1)),
@@ -400,7 +409,7 @@ EventLog = __decorate([
     __param(0, Inject(KernelDb)),
     __param(1, Inject(KERNEL_BUS)),
     __param(2, Inject(KERNEL_LOGGER)),
-    __param(3, Inject(KernelEvents)),
+    __param(3, Inject(OutboxService)),
     __param(4, Inject(TransactionHost))
 ], EventLog);
 export { EventLog };

package/dist/conversations/events.js

@@ -776,7 +776,8 @@ export const ConversationEventSchema = z.discriminatedUnion("type", [
          * naming a template's skills the child loads first (skills default-on spec §6.1).
          */
         preamble: z.string(),
-        maxSteps: z.number().int().positive(),
+        /** The child's step limit; 0 = no limit (`runtime.maxSteps` 0, no template limit). */
+        maxSteps: z.number().int().nonnegative(),
         warnings: z.array(z.string()).optional(),
     })),
     /**

package/dist/conversations/queue.service.d.ts

@@ -12,12 +12,12 @@ export declare class ConversationQueue {
     private readonly db;
     private readonly eventLog;
     private readonly conversations;
-    /** Starts the conversation's next run (`ensureRun`). */
+    /** Starts the conversation's next run after a commit (a failure is logged, never thrown). */
     private readonly runs;
     readonly txHost: TransactionHost;
     constructor(db: KernelDb, eventLog: Pick<EventLog, "appendIn" | "notify" | "publishChanged" | "findByIdem">, conversations: Pick<ConversationsService, "get" | "writable" | "resolveExtra" | "bindIn" | "checkPick" | "prepareQueuedSkill" | "skipWaitsIn" | "announceSkipped">, 
-    /** Starts the conversation's next run (`ensureRun`). */
-    runs: Pick<RunControl, "ensureRun" | "wakeHeldTree">, txHost: TransactionHost);
+    /** Starts the conversation's next run after a commit (a failure is logged, never thrown). */
+    runs: Pick<RunControl, "ensureRunAfterCommit" | "oweEnsureRun" | "wakeHeldTree" | "oweHeldTreeIn">, txHost: TransactionHost);
     list(orgId: string, conversationId: string, accountId: string): Promise<{
         items: QueueItem[];
         paused: boolean;
@@ -60,6 +60,11 @@ export declare class ConversationQueue {
     private sendNowIn;
     /** "Continue sending": clears the pause and lets `ensureRun` send the head item. */
     resume(orgId: string, conversationId: string, accountId: string): Promise<void>;
+    /**
+     * Clears the pause and owes the ensure-run backstop that sends the head item (no event of its
+     * own, so under the conversation's newest seq; transactional outbox spec §6).
+     */
+    private resumeIn;
     /** A queued item or a sent message for this client id (outside any transaction). */
     private prior;
     private lockConversation;

package/dist/conversations/queue.service.js

@@ -31,7 +31,7 @@ let ConversationQueue = class ConversationQueue {
     runs;
     txHost;
     constructor(db, eventLog, conversations, 
-    /** Starts the conversation's next run (`ensureRun`). */
+    /** Starts the conversation's next run after a commit (a failure is logged, never thrown). */
     runs, txHost) {
         this.db = db;
         this.eventLog = eventLog;
@@ -101,16 +101,16 @@ let ConversationQueue = class ConversationQueue {
         }
         if (out.created) {
             await this.eventLog.publishChanged(conversationId, "queue");
-            await this.runs.ensureRun(conversationId);
+            await this.runs.ensureRunAfterCommit(conversationId);
         }
         return { item: toItem(out.row), created: out.created };
     }
     // its own transaction: the caller notifies and publishes after the commit
     async addIn(orgId, conversationId, accountId, input, files, skill, extra, internal) {
         const t = this.db.db;
-        await t
+        const conv = await t
             .selectFrom("conversations")
-            .select("id")
+            .select("last_seq")
             .where("id", "=", conversationId)
             .forUpdate()
             .executeTakeFirstOrThrow();
@@ -168,6 +168,9 @@ let ConversationQueue = class ConversationQueue {
         })
             .returning(COLUMNS)
             .executeTakeFirstOrThrow();
+        // on an idle conversation the item goes out at once: owed with it (no event of its own, so
+        // under the conversation's newest seq; transactional outbox spec §6)
+        await this.runs.oweEnsureRun(conversationId, conv.last_seq, orgId);
         return { row, created: true };
     }
     /**
@@ -253,6 +256,8 @@ let ConversationQueue = class ConversationQueue {
         // a task's queued message deleted by a person: its run is skipped (scheduled tasks §6)
         await releaseQueuedTaskRunIn(t, gone.schedule);
         await unpauseIfEmpty(t, conversationId);
+        // the wakes an unpause releases for the tree are owed with it (transactional outbox spec §6)
+        await this.runs.oweHeldTreeIn(conversationId);
     }
     /**
      * Sends a queued item now: it leaves the queue and is posted as a user message in the same
@@ -263,7 +268,7 @@ let ConversationQueue = class ConversationQueue {
      */
     async sendNow(orgId, conversationId, accountId, itemId) {
         await this.conversations.writable(orgId, conversationId, accountId);
-        const { event, fresh, switched, unarchived, skipped, toSeq } = await this.sendNowIn(conversationId, itemId);
+        const { event, fresh, switched, unarchived, skipped, toSeq } = await this.sendNowIn(orgId, conversationId, itemId);
         if (fresh)
             await this.eventLog.notify(conversationId, toSeq);
         await this.conversations.announceSkipped(skipped);
@@ -272,12 +277,12 @@ let ConversationQueue = class ConversationQueue {
         if (unarchived)
             await this.eventLog.publishChanged(conversationId, "archived");
         await this.eventLog.publishChanged(conversationId, "queue");
-        await this.runs.ensureRun(conversationId);
+        await this.runs.ensureRunAfterCommit(conversationId);
         await this.runs.wakeHeldTree(conversationId);
         return event;
     }
     // its own transaction: the caller notifies and publishes after the commit
-    async sendNowIn(conversationId, itemId) {
+    async sendNowIn(orgId, conversationId, itemId) {
         const t = this.db.db;
         await this.lockConversation(conversationId);
         const head = await t
@@ -313,6 +318,10 @@ let ConversationQueue = class ConversationQueue {
         const skips = sent
             ? { skipped: NO_REPLY_SKIPS, toSeq: null }
             : await this.conversations.skipWaitsIn(conversationId, row.account_id, out.event.seq);
+        // the run the sent message starts is owed with it (transactional outbox spec §6), and so are
+        // the wakes the unpause releases for the tree
+        await this.runs.oweEnsureRun(conversationId, out.event.seq, orgId);
+        await this.runs.oweHeldTreeIn(conversationId);
         return {
             ...out,
             fresh: !sent,
@@ -323,16 +332,28 @@ let ConversationQueue = class ConversationQueue {
     /** "Continue sending": clears the pause and lets `ensureRun` send the head item. */
     async resume(orgId, conversationId, accountId) {
         await this.conversations.writable(orgId, conversationId, accountId);
-        await this.db
-            .updateTable("conversations")
-            .set({ queue_paused: false, queue_pause_reason: null })
-            .where("id", "=", conversationId)
-            .execute();
+        await this.resumeIn(orgId, conversationId);
         await this.eventLog.publishChanged(conversationId, "queue");
-        await this.runs.ensureRun(conversationId);
+        await this.runs.ensureRunAfterCommit(conversationId);
         // a paused root holds the wakes of its whole tree (agent map spec §5.3)
         await this.runs.wakeHeldTree(conversationId);
     }
+    /**
+     * Clears the pause and owes the ensure-run backstop that sends the head item (no event of its
+     * own, so under the conversation's newest seq; transactional outbox spec §6).
+     */
+    // its own transaction: the caller publishes and starts the run after the commit
+    async resumeIn(orgId, conversationId) {
+        const conv = await this.db.db
+            .updateTable("conversations")
+            .set({ queue_paused: false, queue_pause_reason: null })
+            .where("id", "=", conversationId)
+            .returning("last_seq")
+            .executeTakeFirstOrThrow();
+        await this.runs.oweEnsureRun(conversationId, conv.last_seq, orgId);
+        // the wakes the root held for its tree (agent map spec §5.3) are owed with the unpause
+        await this.runs.oweHeldTreeIn(conversationId);
+    }
     /** A queued item or a sent message for this client id (outside any transaction). */
     async prior(conversationId, clientMessageId) {
         const row = await this.db
@@ -370,6 +391,9 @@ __decorate([
 __decorate([
     Transactional({ propagation: "requires_new" })
 ], ConversationQueue.prototype, "sendNowIn", null);
+__decorate([
+    Transactional({ propagation: "requires_new" })
+], ConversationQueue.prototype, "resumeIn", null);
 __decorate([
     Transactional({ propagation: "mandatory" })
 ], ConversationQueue.prototype, "lockConversation", null);

package/dist/conversations/titles.d.ts

@@ -5,7 +5,7 @@ import { KernelDb } from "../infra/database/kernel-db.js";
 import { TransactionHost } from "../infra/database/transaction-host.js";
 import { ModelPurposesService } from "../models/purposes.js";
 import { type AuditEntry, type HookRunner } from "../runtime/hook-calls.js";
-import { UsageReporter } from "../runtime/usage-report.js";
+import { UsageReportJobs } from "../runtime/usage-report-jobs.js";
 import { EventLog } from "./event-log.js";
 import { type ConversationEvent } from "./events.js";
 /**
@@ -56,7 +56,7 @@ export declare function titleExcerpt(firstUser: string, firstReply: string): str
 export declare function cleanTitle(reply: string): string | null;
 export interface TitleDeps {
     db: KernelSchemaDb;
-    eventLog: Pick<EventLog, "append" | "appendIn" | "readAfter" | "latestOfType" | "notify" | "publishChanged">;
+    eventLog: Pick<EventLog, "appendInReport" | "readAfter" | "latestOfType" | "notify" | "publishChanged">;
     purposes: Pick<ModelPurposesService, "chat">;
     log: Pick<Logger, "warn">;
     /**
@@ -64,11 +64,10 @@ export interface TitleDeps {
      * title and uses up the attempt) and `model.response` with `purpose: "title"`, like compaction.
      */
     hooks?: HookRunner;
-    usageReport?: Pick<UsageReporter, "enqueue">;
     /** Aborts the call (worker shutdown). */
     signal?: AbortSignal;
     /** The job's transactional writes ({@link TitleGenerator}). */
-    writes: Pick<TitleGenerator, "writeResult" | "auditDenied">;
+    writes: Pick<TitleGenerator, "writeResult" | "writeUsage" | "auditDenied">;
 }
 /** The attempt number to enqueue for this conversation, or null when no title job is due. */
 export declare function titleAttemptDue(db: KernelSchemaDb, conversationId: string): Promise<number | null>;
@@ -93,19 +92,22 @@ export declare class TitleGenerator {
     private readonly purposes;
     /** The title call fires the plugin hooks (`model.request`, `model.response`). */
     private readonly host;
-    private readonly usageReport;
+    /** The title call's `usage.report` delivery, owed with its usage event. */
+    private readonly usage;
     private readonly log;
     readonly txHost: TransactionHost;
     constructor(kdb: KernelDb, eventLog: TitleDeps["eventLog"], purposes: Pick<ModelPurposesService, "chat">, 
     /** The title call fires the plugin hooks (`model.request`, `model.response`). */
     host: {
         readonly hooks?: HookRunner;
-    } | undefined, usageReport: Pick<UsageReporter, "enqueue"> | undefined, log: Pick<Logger, "warn">, txHost: TransactionHost);
+    } | undefined, 
+    /** The title call's `usage.report` delivery, owed with its usage event. */
+    usage: Pick<UsageReportJobs, "oweEvents">, log: Pick<Logger, "warn">, txHost: TransactionHost);
     /** One attempt ({@link runTitleJob}); `signal` aborts the call (the worker stopping). */
     run(conversationId: string, attempt: number, signal?: AbortSignal): Promise<void>;
     /**
-     * Appends the call's `usage` event and writes the title while `title_source IS NULL` (a rename
-     * wins), in one transaction.
+     * Appends the call's `usage` event (owing its `usage.report` delivery) and writes the title while
+     * `title_source IS NULL` (a rename wins), in one transaction.
      */
     writeResult(conversationId: string, attempt: number, out: {
         provider: string;
@@ -115,6 +117,17 @@ export declare class TitleGenerator {
         written: boolean;
         usage: ConversationEvent | undefined;
     }>;
+    /**
+     * Appends the usage event of a call that failed after it was sent (billed, so reported) and owes
+     * its `usage.report` delivery, in one transaction.
+     */
+    writeUsage(conversationId: string, attempt: number, u: {
+        provider: string;
+        model: string;
+        usage: ModelUsage;
+    }): Promise<ConversationEvent | undefined>;
+    /** The usage event and its owed delivery (only when this call wrote it, not on a retry's hit). */
+    private appendUsage;
     /** The `hook.denied` audit row of a denied title call. */
     auditDenied(entry: AuditEntry): Promise<void>;
 }