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

package/dist/conversations/conversations.module.js

@@ -0,0 +1,69 @@
+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;
+};
+import { Module } from "@nestjs/common";
+import { AgentLookupModule } from "../agents/agent-lookup.js";
+import { ProvidersModule } from "../runtime/providers.js";
+import { RuntimeModule } from "../runtime/runtime.module.js";
+import { SandboxModule } from "../sandbox/sandbox.module.js";
+import { SkillsModule } from "../skills/skills.module.js";
+import { StorageModule } from "../storage/storage.module.js";
+import { ToolsModule } from "../tools/tools.module.js";
+import { ConversationAccessModule } from "./access.js";
+import { ConversationArtifacts } from "./artifacts.js";
+import { AttachmentsModule } from "./attachments.module.js";
+import { ConversationsService } from "./conversations.service.js";
+import { EventLogModule } from "./event-log.js";
+import { ConversationFiles } from "./files.js";
+import { ConversationOutputs } from "./outputs-read.js";
+import { ConversationQueue } from "./queue.service.js";
+import { ConversationSandboxStatus } from "./sandbox-status.js";
+/**
+ * Conversations: the one {@link ConversationsService} (messages, model switches, skill
+ * invocations, sub-agent views, abort), the queue, the file / artifact / output reads and the
+ * sandbox status. The event log, the access check and the attachments are their own modules (the
+ * skills and tools use them too) and are re-exported here.
+ */
+let ConversationsModule = class ConversationsModule {
+};
+ConversationsModule = __decorate([
+    Module({
+        imports: [
+            EventLogModule,
+            ConversationAccessModule,
+            AttachmentsModule,
+            AgentLookupModule,
+            StorageModule,
+            SkillsModule,
+            ToolsModule,
+            // the run control (start a run after a message, stop runs) and the model provider registry
+            RuntimeModule,
+            ProvidersModule,
+            // the sandbox status
+            SandboxModule,
+        ],
+        providers: [
+            ConversationsService,
+            ConversationQueue,
+            ConversationOutputs,
+            ConversationArtifacts,
+            ConversationFiles,
+            ConversationSandboxStatus,
+        ],
+        exports: [
+            EventLogModule,
+            ConversationAccessModule,
+            AttachmentsModule,
+            ConversationsService,
+            ConversationQueue,
+            ConversationOutputs,
+            ConversationArtifacts,
+            ConversationFiles,
+            ConversationSandboxStatus,
+        ],
+    })
+], ConversationsModule);
+export { ConversationsModule };

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

@@ -1,11 +1,15 @@
-import type { Logger } from "@capybara-hq/plugin-sdk";
-import { type Transaction } from "kysely";
-import { type AgentsService } from "../agents/agents.service.js";
+import { AgentLookup } from "../agents/agent-lookup.js";
 import type { ModelRef } from "../agents/definition.js";
-import type { KernelDatabase, KernelDb, TitleSource } from "../db/kernel-schema.js";
-import type { ProviderRegistry } from "../runtime/providers.js";
-import type { RenderedInvocation, SkillInvoker } from "../skills/invoke.js";
-import type { EventLog } from "./event-log.js";
+import type { TitleSource } from "../db/kernel-schema.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
+import { TransactionHost } from "../infra/database/transaction-host.js";
+import type { KernelLogger } from "../log.js";
+import { ProviderRegistry } from "../runtime/providers.js";
+import { type RenderedInvocation, SkillInvoker } from "../skills/invoke.js";
+import { ConnectorContent } from "../tools/connector-content.js";
+import { ConversationAccess } from "./access.js";
+import { AttachmentsService } from "./attachments.service.js";
+import { EventLog } from "./event-log.js";
 import type { ConversationEvent, LogContentBlock } from "./events.js";
 import { type Selection } from "./selection.js";
 /** 对外的会话视图。 */
@@ -89,8 +93,6 @@ export interface AttachmentRef {
     connectorId: string;
     uri: string;
 }
-/** 附件解析：以发送者的凭据读取资源，返回追加在消息后的文本块与元数据（见 tools/connector-content.ts）。 */
-export type ResolveAttachments = (orgId: string, accountId: string, refs: AttachmentRef[]) => Promise<ResolvedExtra>;
 /** Resolved `@` resources: the blocks after the user text and their metadata. */
 export interface ResolvedExtra {
     blocks: {
@@ -105,16 +107,7 @@ export interface ResolvedExtra {
         name: string;
     }[];
 }
-/**
- * 消息引用的上传附件（`files`）：在发消息的事务里校验并绑定到会话，返回写进 user_message 的媒体块
- * （`source: {kind: "ref"}`，见 AttachmentsService.bindForMessage）。
- */
-export type BindFiles = (trx: Transaction<KernelDatabase>, orgId: string, conversationId: string, accountId: string, ids: readonly string[]) => Promise<LogContentBlock[]>;
-/**
- * 用户消息的幂等键：客户端的 `clientMessageId` 加前缀，与运行流水线自用的幂等键分开，
- * 避免客户端恰好选中内部键而命中别的事件。
- */
-export declare const userMessageIdemKey: (clientMessageId: string) => string;
+export { userMessageIdemKey } from "./idem-keys.js";
 /** The longest conversation title (characters, after trimming). */
 export declare const CONVERSATION_TITLE_MAX_CHARS = 120;
 /** A user message as posted (`POST …/messages`, or the first message of `POST /conversations`). */
@@ -145,19 +138,30 @@ export declare class ConversationsService {
     private readonly db;
     private readonly eventLog;
     private readonly agents;
-    private readonly runs?;
-    private readonly log?;
-    private readonly resolveAttachments?;
-    private readonly bindFiles?;
+    private readonly access;
+    /** Starts and stops the conversation's runs. */
+    private readonly runs;
     /** Resolves a switched-to model and its declared parameters (UI refresh B). */
-    private readonly models?;
-    /** Renders a person's skill invocation (phase D); without it `skill` is refused. */
-    private readonly invoker?;
-    constructor(db: KernelDb, eventLog: EventLog, agents: AgentsService, runs?: RunControl | undefined, log?: Pick<Logger, "warn"> | undefined, resolveAttachments?: ResolveAttachments | undefined, bindFiles?: BindFiles | undefined, 
+    private readonly providers;
+    private readonly log;
+    /** Reads `@` resources with the sender's credentials. */
+    private readonly content;
+    /** Binds uploaded files to the conversation in the message's transaction. */
+    private readonly attachments;
+    /** Renders a person's skill invocation (phase D). */
+    private readonly invoker;
+    readonly txHost: TransactionHost;
+    constructor(db: KernelDb, eventLog: EventLog, agents: Pick<AgentLookup, "get">, access: Pick<ConversationAccess, "isAccessible">, 
+    /** Starts and stops the conversation's runs. */
+    runs: RunControl, 
     /** Resolves a switched-to model and its declared parameters (UI refresh B). */
-    models?: Pick<ProviderRegistry, "resolve"> | undefined, 
-    /** Renders a person's skill invocation (phase D); without it `skill` is refused. */
-    invoker?: Pick<SkillInvoker, "prepare"> | undefined);
+    providers: Pick<ProviderRegistry, "resolve">, log: Pick<KernelLogger, "warn">, 
+    /** Reads `@` resources with the sender's credentials. */
+    content: Pick<ConnectorContent, "resolveAttachments">, 
+    /** Binds uploaded files to the conversation in the message's transaction. */
+    attachments: Pick<AttachmentsService, "bindForMessage">, 
+    /** Renders a person's skill invocation (phase D). */
+    invoker: Pick<SkillInvoker, "prepare">, txHost: TransactionHost);
     /**
      * 不阻塞地调用一次 `ensureRun`（打开 SSE、读事件时）：它幂等，并顺带清理孤儿运行，
      * 会话不会因为某次运行结束后的投递失败而永远停在「运行中」。失败只记日志。
@@ -179,6 +183,8 @@ export declare class ConversationsService {
         event: ConversationEvent;
         created: boolean;
     }>;
+    /** The conversation row and its first message (undefined: a concurrent retry committed first). */
+    private createIn;
     /**
      * The conversation (and its first event) an earlier first send with this id created. The id used
      * for another agent's conversation → `conflict` (the caller only checked access to `agentId`, so
@@ -200,11 +206,7 @@ export declare class ConversationsService {
     writable(orgId: string, conversationId: string, accountId: string): Promise<ConversationView>;
     /** {@link get}'s row, with the conversation's kind. */
     private readable;
-    /**
-     * 轻量的可见性判定（一条查询，不加载 agent 视图），供长连接（SSE）建立时与定期复核用：
-     * 会话属于该组织且归 viewer 所有、viewer 账号仍为 active、agent 未删除且对 viewer 仍可见
-     * （`visibleTo` 已含「组织未删除、viewer 仍是成员」）。
-     */
+    /** The stream's visibility check ({@link ConversationAccess.isAccessible}). */
     isAccessible(orgId: string, conversationId: string, viewerAccountId: string): Promise<boolean>;
     /**
      * 我的会话，最近更新的在前；只含 agent 仍可用的会话。`after` 为上一页最后一个会话的 id，
@@ -271,6 +273,8 @@ export declare class ConversationsService {
      * `text` 为空时（只发附件，HTTP 层保证此时有 `files` 且没有 `@` 资源）不写文本块。
      */
     postUserMessage(orgId: string, conversationId: string, accountId: string, input: UserMessageInput): Promise<ConversationEvent>;
+    /** A message with files or a model switch: binds the files and writes it in one transaction. */
+    private postIn;
     /**
      * The selection a message switches to, or null when it changes nothing. A model equal to the
      * agent's means "back to the agent's model" (null); a model change without `effort` resets the
@@ -302,15 +306,13 @@ export declare class ConversationsService {
      * `skill`. The queue stores the result and sends it unchanged later.
      */
     prepareQueuedSkill(orgId: string, conv: ConversationView, accountId: string, input: Pick<UserMessageInput, "skill" | "text">): Promise<RenderedInvocation | undefined>;
-    /** `files` need the attachments service (shared with the queue). */
-    checkFilesSupported(input: Pick<UserMessageInput, "files">): void;
     /**
      * Reads the `@` resources with the sender's credentials (nothing when there are none). Shared
      * with the queue, which reads them when a message is queued (decision 15).
      */
     resolveExtra(orgId: string, accountId: string, input: Pick<UserMessageInput, "attachments">): Promise<ResolvedExtra>;
     /** Binds uploaded files inside the message's (or queue item's) transaction; none → no blocks. */
-    bindIn(t: Transaction<KernelDatabase>, orgId: string, conversationId: string, accountId: string, files: readonly string[]): Promise<LogContentBlock[]>;
+    bindIn(orgId: string, conversationId: string, accountId: string, files: readonly string[]): Promise<LogContentBlock[]>;
     private userMessage;
     /**
      * 中止会话当前的运行（queued / running / waiting）：返回 runId；没有 → `run.not_active`。

package/dist/conversations/conversations.service.js

@@ -1,14 +1,32 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 import { randomUUID } from "node:crypto";
+import { Inject, Injectable } from "@nestjs/common";
 import { sql } from "kysely";
-import { visibleTo } from "../agents/agents.service.js";
+import { AgentLookup, visibleTo } from "../agents/agent-lookup.js";
 import { ApiError } from "../errors.js";
-import { NO_SELECTION, planSelection, readSelection, sameModel, sameSelection, } from "./selection.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 { KERNEL_LOGGER } from "../infra/tokens.js";
+import { ProviderRegistry } from "../runtime/providers.js";
+import { RunControl as RunControlService } from "../runtime/run-control.js";
+import { SkillInvoker } from "../skills/invoke.js";
+import { ConnectorContent } from "../tools/connector-content.js";
+import { ConversationAccess, parentReachable } from "./access.js";
+import { AttachmentsService } from "./attachments.service.js";
+import { EventLog } from "./event-log.js";
+import { userMessageIdemKey } from "./idem-keys.js";
+import { NO_SELECTION, planSelection, readSelection } from "./selection.js";
 const notFound = () => new ApiError("conversation.not_found", "Conversation not found");
-/**
- * 用户消息的幂等键：客户端的 `clientMessageId` 加前缀，与运行流水线自用的幂等键分开，
- * 避免客户端恰好选中内部键而命中别的事件。
- */
-export const userMessageIdemKey = (clientMessageId) => `msg:${clientMessageId}`;
+export { userMessageIdemKey } from "./idem-keys.js";
 const COLUMNS = [
     "id",
     "org_id",
@@ -41,25 +59,6 @@ function toView(r) {
 }
 /** The longest conversation title (characters, after trimming). */
 export const CONVERSATION_TITLE_MAX_CHARS = 120;
-/**
- * A sub-agent's conversation is reached through its parent (sub-agents spec §6.1, review m6, the
- * same rule as its trajectory): the parent is a chat conversation of the same owner whose agent is
- * not deleted and still visible to the viewer. Any other kind passes. The child's own `agent_id`
- * (the dispatched agent for an org agent, §5.5) is checked on top by the callers.
- */
-const parentReachable = (viewerAccountId) => (eb) => eb.or([
-    eb("conversations.kind", "<>", "subagent"),
-    eb.exists(eb
-        .selectFrom("conversations as p")
-        .innerJoin("agents", "agents.id", "p.agent_id")
-        .select(sql `1`.as("one"))
-        .whereRef("p.id", "=", "conversations.parent_conversation_id")
-        .whereRef("p.org_id", "=", "conversations.org_id")
-        .where("p.account_id", "=", viewerAccountId)
-        .where("p.kind", "=", "chat")
-        .where("agents.deleted_at", "is", null)
-        .where(visibleTo(viewerAccountId))),
-]);
 /** The sums of the `usage` events matching `where` (over `conversation_events e`), one row. */
 const usageSums = (where) => sql `
   SELECT
@@ -80,41 +79,49 @@ const toUsage = (r) => ({
  * 会话：只有所有者可见；每次访问都实时复核 agent 对所有者仍可用（spec 3.6 R5），
  * 不可用时会话也按不存在处理（`conversation.not_found`）。
  */
-export class ConversationsService {
+let ConversationsService = class ConversationsService {
     db;
     eventLog;
     agents;
+    access;
     runs;
+    providers;
     log;
-    resolveAttachments;
-    bindFiles;
-    models;
+    content;
+    attachments;
     invoker;
-    constructor(db, eventLog, agents, runs, log, resolveAttachments, bindFiles, 
+    txHost;
+    constructor(db, eventLog, agents, access, 
+    /** Starts and stops the conversation's runs. */
+    runs, 
     /** Resolves a switched-to model and its declared parameters (UI refresh B). */
-    models, 
-    /** Renders a person's skill invocation (phase D); without it `skill` is refused. */
-    invoker) {
+    providers, log, 
+    /** Reads `@` resources with the sender's credentials. */
+    content, 
+    /** Binds uploaded files to the conversation in the message's transaction. */
+    attachments, 
+    /** Renders a person's skill invocation (phase D). */
+    invoker, txHost) {
         this.db = db;
         this.eventLog = eventLog;
         this.agents = agents;
+        this.access = access;
         this.runs = runs;
+        this.providers = providers;
         this.log = log;
-        this.resolveAttachments = resolveAttachments;
-        this.bindFiles = bindFiles;
-        this.models = models;
+        this.content = content;
+        this.attachments = attachments;
         this.invoker = invoker;
+        this.txHost = txHost;
     }
     /**
      * 不阻塞地调用一次 `ensureRun`（打开 SSE、读事件时）：它幂等，并顺带清理孤儿运行，
      * 会话不会因为某次运行结束后的投递失败而永远停在「运行中」。失败只记日志。
      */
     kickRun(conversationId) {
-        if (!this.runs)
-            return;
         this.runs
             .ensureRun(conversationId)
-            .catch((err) => this.log?.warn("ensureRun on conversation open failed", { conversationId, err }));
+            .catch((err) => this.log.warn("ensureRun on conversation open failed", { conversationId, err }));
     }
     /** 新建会话；agent 对该账号不可用 → `agent.not_found`。 */
     async create(orgId, accountId, agentId) {
@@ -138,33 +145,11 @@ export class ConversationsService {
         const prior = await this.findCreated(orgId, accountId, agentId, input.clientMessageId);
         if (prior)
             return prior;
-        this.checkFilesSupported(input);
         const next = await this.planSwitch(agent.definition, NO_SELECTION, input);
         const extra = await this.resolveExtra(orgId, accountId, input);
         const invoked = await this.prepareSkill(orgId, agentId, undefined, agent.definition, input);
         const id = randomUUID();
-        const written = await this.db.transaction().execute(async (t) => {
-            const row = await t
-                .insertInto("conversations")
-                .values({
-                id,
-                org_id: orgId,
-                agent_id: agentId,
-                account_id: accountId,
-                create_request_id: input.clientMessageId,
-            })
-                .onConflict((oc) => oc
-                .columns(["org_id", "account_id", "create_request_id"])
-                .where("create_request_id", "is not", null)
-                .doNothing())
-                .returning("id")
-                .executeTakeFirst();
-            // a concurrent retry committed first: answer with its conversation below
-            if (!row)
-                return undefined;
-            const blocks = await this.bindIn(t, orgId, id, accountId, input.files ?? []);
-            return this.writeMessage(t, id, accountId, input, next, extra, blocks, invoked);
-        });
+        const written = await this.createIn(id, orgId, accountId, agentId, input, next, extra, invoked);
         if (!written) {
             const raced = await this.findCreated(orgId, accountId, agentId, input.clientMessageId);
             if (!raced)
@@ -172,9 +157,33 @@ export class ConversationsService {
             return raced;
         }
         await this.eventLog.notify(id, written.seq);
-        await this.runs?.ensureRun(id);
+        await this.runs.ensureRun(id);
         return { conversation: await this.rowView(id), event: written, created: true };
     }
+    /** The conversation row and its first message (undefined: a concurrent retry committed first). */
+    // its own transaction: the caller notifies and publishes after the commit
+    async createIn(id, orgId, accountId, agentId, input, next, extra, invoked) {
+        const row = await this.db
+            .insertInto("conversations")
+            .values({
+            id,
+            org_id: orgId,
+            agent_id: agentId,
+            account_id: accountId,
+            create_request_id: input.clientMessageId,
+        })
+            .onConflict((oc) => oc
+            .columns(["org_id", "account_id", "create_request_id"])
+            .where("create_request_id", "is not", null)
+            .doNothing())
+            .returning("id")
+            .executeTakeFirst();
+        // a concurrent retry committed first: answer with its conversation below
+        if (!row)
+            return undefined;
+        const blocks = await this.bindIn(orgId, id, accountId, input.files ?? []);
+        return this.writeMessage(id, accountId, input, next, extra, blocks, invoked);
+    }
     /**
      * The conversation (and its first event) an earlier first send with this id created. The id used
      * for another agent's conversation → `conflict` (the caller only checked access to `agentId`, so
@@ -197,7 +206,7 @@ export class ConversationsService {
         const event = await this.eventLog.findByIdem(row.id, userMessageIdemKey(clientMessageId));
         if (!event)
             return null;
-        await this.runs?.ensureRun(row.id);
+        await this.runs.ensureRun(row.id);
         return { conversation: toView(row), event, created: false };
     }
     async rowView(id) {
@@ -263,35 +272,9 @@ export class ConversationsService {
         }
         return row;
     }
-    /**
-     * 轻量的可见性判定（一条查询，不加载 agent 视图），供长连接（SSE）建立时与定期复核用：
-     * 会话属于该组织且归 viewer 所有、viewer 账号仍为 active、agent 未删除且对 viewer 仍可见
-     * （`visibleTo` 已含「组织未删除、viewer 仍是成员」）。
-     */
-    async isAccessible(orgId, conversationId, viewerAccountId) {
-        const row = await this.db
-            .selectFrom("conversations")
-            .select("conversations.id")
-            .where("conversations.id", "=", conversationId)
-            .where("conversations.org_id", "=", orgId)
-            .where("conversations.account_id", "=", viewerAccountId)
-            .where("conversations.kind", "in", ["chat", "subagent"])
-            .where(parentReachable(viewerAccountId))
-            .where((eb) => eb.and([
-            eb.exists(eb
-                .selectFrom("accounts")
-                .select(sql `1`.as("one"))
-                .where("accounts.id", "=", viewerAccountId)
-                .where("accounts.status", "=", "active")),
-            eb.exists(eb
-                .selectFrom("agents")
-                .select(sql `1`.as("one"))
-                .whereRef("agents.id", "=", "conversations.agent_id")
-                .where("agents.deleted_at", "is", null)
-                .where(visibleTo(viewerAccountId))),
-        ]))
-            .executeTakeFirst();
-        return row !== undefined;
+    /** The stream's visibility check ({@link ConversationAccess.isAccessible}). */
+    isAccessible(orgId, conversationId, viewerAccountId) {
+        return this.access.isAccessible(orgId, conversationId, viewerAccountId);
     }
     /**
      * 我的会话，最近更新的在前；只含 agent 仍可用的会话。`after` 为上一页最后一个会话的 id，
@@ -373,7 +356,7 @@ export class ConversationsService {
         LIMIT ${opts.perGroup + 1}
       ) cs
       ORDER BY page.latest_at DESC, page.agent_id DESC, cs.updated_at DESC, cs.id DESC
-    `.execute(this.db);
+    `.execute(this.db.db);
         const groups = [];
         let current;
         for (const r of rows) {
@@ -459,7 +442,7 @@ export class ConversationsService {
       CROSS JOIN LATERAL (${usageSums(sql `e.conversation_id = c.id`)}) u
       LEFT JOIN described d ON d.id = c.id
       ORDER BY c.created_at DESC, c.id DESC
-    `.execute(this.db);
+    `.execute(this.db.db);
         const subagents = rows.slice(0, opts.limit).map((r) => ({
             id: r.id,
             agentType: r.subagent_type ?? "",
@@ -487,7 +470,7 @@ export class ConversationsService {
         UNION ALL
         SELECT c.id FROM capybara.conversations c
         WHERE c.parent_conversation_id = ${conversationId} AND c.kind = 'subagent'
-      )`)}`.execute(this.db);
+      )`)}`.execute(this.db.db);
         const row = rows[0];
         return row
             ? toUsage(row)
@@ -529,13 +512,12 @@ export class ConversationsService {
         const conv = await this.writable(orgId, conversationId, accountId);
         const refs = input.attachments ?? [];
         const files = input.files ?? [];
-        this.checkFilesSupported(input);
         // A retry returns the written event (no resource read, no file check, no skill resolution)
         if ((refs.length > 0 || files.length > 0 || input.skill !== undefined) &&
             input.clientMessageId !== undefined) {
             const existing = await this.eventLog.findByIdem(conversationId, userMessageIdemKey(input.clientMessageId));
             if (existing) {
-                await this.runs?.ensureRun(conversationId);
+                await this.runs.ensureRun(conversationId);
                 return existing;
             }
         }
@@ -552,10 +534,7 @@ export class ConversationsService {
             : await this.prepareSkill(orgId, conv.agentId, conversationId, agent, input);
         let event;
         if (files.length > 0 || next !== null) {
-            event = await this.db.transaction().execute(async (t) => {
-                const blocks = await this.bindIn(t, orgId, conversationId, accountId, files);
-                return this.writeMessage(t, conversationId, accountId, input, next, extra, blocks, invoked);
-            });
+            event = await this.postIn(orgId, conversationId, accountId, input, next, extra, invoked);
             await this.eventLog.notify(conversationId, event.seq);
             if (next !== null)
                 await this.eventLog.publishChanged(conversationId, "selection");
@@ -565,9 +544,15 @@ export class ConversationsService {
                 this.userMessage(accountId, input, extra, [], invoked),
             ]);
         }
-        await this.runs?.ensureRun(conversationId);
+        await this.runs.ensureRun(conversationId);
         return event;
     }
+    /** A message with files or a model switch: binds the files and writes it in one transaction. */
+    // its own transaction: the caller notifies and publishes after the commit
+    async postIn(orgId, conversationId, accountId, input, next, extra, invoked) {
+        const blocks = await this.bindIn(orgId, conversationId, accountId, input.files ?? []);
+        return this.writeMessage(conversationId, accountId, input, next, extra, blocks, invoked);
+    }
     /**
      * The selection a message switches to, or null when it changes nothing. A model equal to the
      * agent's means "back to the agent's model" (null); a model change without `effort` resets the
@@ -581,12 +566,7 @@ export class ConversationsService {
         if (next === null)
             return null;
         const { model, effort } = next;
-        if (!this.models) {
-            throw new ApiError("validation_failed", "Request validation failed", [
-                { path: "model", message: "Model switching is not supported" },
-            ]);
-        }
-        const { info } = await this.models.resolve(model ?? agent.model);
+        const { info } = await this.providers.resolve(model ?? agent.model);
         if (effort !== null) {
             const knob = info.parameters.find((p) => p.key === "effort");
             const values = knob?.schema?.enum ?? [];
@@ -613,7 +593,7 @@ export class ConversationsService {
      * Writes the message (preceded by its `model_switched` when it switches) inside `t` and updates
      * `conversations.selection`; returns the `user_message` event. The caller notifies after commit.
      */
-    async writeMessage(t, conversationId, accountId, input, next, extra, blocks, invoked) {
+    async writeMessage(conversationId, accountId, input, next, extra, blocks, invoked) {
         const events = [];
         if (next !== null) {
             events.push({
@@ -625,8 +605,9 @@ export class ConversationsService {
             });
         }
         events.push(this.userMessage(accountId, input, extra, blocks, invoked));
-        const written = await this.eventLog.append(conversationId, events, t);
+        const written = await this.eventLog.appendIn(conversationId, events);
         if (next !== null) {
+            const t = this.db.db;
             // the cache follows the log (a retried message's switch may be an old, deduped event that a
             // later switch already replaced), read under the row lock append took
             await t
@@ -644,11 +625,6 @@ export class ConversationsService {
     async prepareSkill(orgId, agentId, conversationId, agent, input) {
         if (input.skill === undefined)
             return undefined;
-        if (!this.invoker) {
-            throw new ApiError("validation_failed", "Request validation failed", [
-                { path: "skill", message: "Skill invocation is not supported" },
-            ]);
-        }
         return this.invoker.prepare({
             orgId,
             agentId,
@@ -669,14 +645,6 @@ export class ConversationsService {
         const agent = await this.agents.get(orgId, conv.agentId, accountId);
         return this.prepareSkill(orgId, conv.agentId, conv.id, agent.definition, input);
     }
-    /** `files` need the attachments service (shared with the queue). */
-    checkFilesSupported(input) {
-        if ((input.files?.length ?? 0) > 0 && !this.bindFiles) {
-            throw new ApiError("validation_failed", "Request validation failed", [
-                { path: "files", message: "Files are not supported" },
-            ]);
-        }
-    }
     /**
      * Reads the `@` resources with the sender's credentials (nothing when there are none). Shared
      * with the queue, which reads them when a message is queued (decision 15).
@@ -685,18 +653,13 @@ export class ConversationsService {
         const refs = input.attachments ?? [];
         if (refs.length === 0)
             return { blocks: [], attachments: [] };
-        if (!this.resolveAttachments) {
-            throw new ApiError("validation_failed", "Request validation failed", [
-                { path: "attachments", message: "Attachments are not supported" },
-            ]);
-        }
-        return this.resolveAttachments(orgId, accountId, refs);
+        return this.content.resolveAttachments(orgId, accountId, refs);
     }
     /** Binds uploaded files inside the message's (or queue item's) transaction; none → no blocks. */
-    async bindIn(t, orgId, conversationId, accountId, files) {
-        if (files.length === 0 || !this.bindFiles)
+    async bindIn(orgId, conversationId, accountId, files) {
+        if (files.length === 0)
             return [];
-        return this.bindFiles(t, orgId, conversationId, accountId, files);
+        return this.attachments.bindForMessage(orgId, conversationId, accountId, files);
     }
     userMessage(accountId, input, extra, fileBlocks, invoked) {
         // a skill invocation's rendered text replaces the typed arguments as content[0]
@@ -735,20 +698,47 @@ export class ConversationsService {
             .where("status", "in", ["queued", "running", "waiting"])
             .orderBy("created_at", "desc")
             .executeTakeFirst();
-        if (!run || !this.runs)
+        if (!run)
             throw new ApiError("run.not_active", "No active run to abort");
+        const runs = this.runs;
         // 等待中：直接结束；没成功（刚被续跑、已回到 queued）则按下面的常规路径中止。
-        if (run.status === "waiting" &&
-            (await this.runs.abortWaiting(conversationId, run.id, accountId))) {
+        if (run.status === "waiting" && (await runs.abortWaiting(conversationId, run.id, accountId))) {
             this.kickRun(conversationId);
             return run.id;
         }
         // 孤儿运行没有 worker 在听中止广播：直接写成 aborted，之后再看有没有等待中的消息要起新一轮。
-        if (await this.runs.abortIfOrphaned(conversationId, run.id, accountId)) {
+        if (await runs.abortIfOrphaned(conversationId, run.id, accountId)) {
             this.kickRun(conversationId);
             return run.id;
         }
-        await this.runs.requestAbort(run.id, accountId);
+        await runs.requestAbort(run.id, accountId);
         return run.id;
     }
-}
+};
+__decorate([
+    Transactional({ propagation: "requires_new" })
+], ConversationsService.prototype, "createIn", null);
+__decorate([
+    Transactional({ propagation: "requires_new" })
+], ConversationsService.prototype, "postIn", null);
+__decorate([
+    Transactional({ propagation: "mandatory" })
+], ConversationsService.prototype, "writeMessage", null);
+__decorate([
+    Transactional({ propagation: "mandatory" })
+], ConversationsService.prototype, "bindIn", null);
+ConversationsService = __decorate([
+    Injectable(),
+    __param(0, Inject(KernelDb)),
+    __param(1, Inject(EventLog)),
+    __param(2, Inject(AgentLookup)),
+    __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(TransactionHost))
+], ConversationsService);
+export { ConversationsService };