@rudderhq/server 0.5.0 → 0.5.1

package/dist/services/chats.js

@@ -1,75 +1,24 @@
-import { agentIntegrationChatBindings, agentIntegrations, approvals, assets, chatAttachments, chatContextLinks, chatControlActions, chatConversations, chatConversationUserStates, chatGenerationEvents, chatGenerations, chatMessages, chatQueuedMessages, messengerCustomGroupEntries, messengerCustomGroups } from "@rudderhq/db";
-import { chatInlineVisualMappingsFromStructuredPayload, MESSENGER_FORK_GROUP_DEFAULT_ICON, sanitizeChatStructuredPayload } from "@rudderhq/shared";
-import { and, asc, desc, eq, gt, gte, inArray, isNull, lt, or, sql } from "drizzle-orm";
+import { agentIntegrationChatBindings, agentIntegrations, approvals, assets, chatAttachments, chatContextLinks, chatControlActions, chatConversations, chatConversationUserStates, chatGenerationEvents, chatGenerations, chatMessages, chatQueuedMessages } from "@rudderhq/db";
+import { sanitizeChatStructuredPayload } from "@rudderhq/shared";
+import { and, asc, desc, eq, gt, gte, inArray, isNotNull, isNull, lt, or, sql } from "drizzle-orm";
 import { randomUUID } from "node:crypto";
 import { conflict, notFound, unprocessable } from "../errors.js";
 import { logActivity } from "./activity-log.js";
 import { agentService } from "./agents.js";
 import { approvalService } from "./approvals.js";
+import { ensureChatFamilyGroup } from "./chat-family-groups.js";
 import { chatGenerationProtocolService } from "./chat-generation-protocol.js";
+import { ACTIVE_CHAT_GENERATION_STATUSES, CHAT_GENERATION_CONTROL_LEASE_MS, NATIVE_STEER_GENERATION_STATUSES, SERVER_QUEUE_RUNNING_STATUSES, } from "./chats.constants.js";
+import { createChatConversation, createChatWithInitialMessage } from "./chats.create.js";
+import { conversationMutability, nextForkTitle } from "./chats.fork-helpers.js";
+import { buildSearchSnippet, CHAT_TRANSCRIPT_KEY, chatTranscriptFromPayload, chatTranscriptSummaryFromEntries, contentPath, escapeLikePattern, incomingMessagePreviewSql, issueProposalFromPayload, isVisibleIncomingChatMessage, listContextLinksForConversationIds, listPrimaryIssues, operationProposalDecisionStatusFromPayload, operationProposalFromPayload, resolveContextEntities, safeTrim, stripChatMetadataFromPayload, textContains, truncatePreview, visibleIncomingMessageSql, withOperationProposalDecisionState, withPersistedTranscript, } from "./chats.helpers.js";
+import { copyForkInlineVisualMessages, listRecentUserChatMessages, updateTrustedInlineVisualMappings, } from "./chats.inline-visual-persistence.js";
 import { issueApprovalService } from "./issue-approvals.js";
 import { issueService } from "./issues.js";
 import { normalizeLocalLibraryPathMarkdown } from "./library-path-markdown.js";
 import { organizationService } from "./orgs.js";
 import { isPostgresError } from "./postgres-errors.js";
 const CHAT_TITLE_MAX_LENGTH = 200;
-const FORK_TITLE_SUFFIX_PATTERN = / \(([1-9]\d*)\)$/;
-const ACTIVE_CHAT_GENERATION_STATUSES = [
-    "starting",
-    "active",
-    "running",
-    "tool_busy",
-    "closing",
-    "stop_requested",
-    "stopping",
-];
-const NATIVE_STEER_GENERATION_STATUSES = ["starting", "active", "running", "tool_busy"];
-const SERVER_QUEUE_RUNNING_STATUSES = ["dequeue_claimed", "running_next"];
-const CHAT_GENERATION_CONTROL_LEASE_MS = 30_000;
-function baseForkTitle(title, sourceIsFork, familyTitles) {
-    const trimmed = title.trim() || "Forked conversation";
-    if (!sourceIsFork)
-        return trimmed;
-    const match = trimmed.match(FORK_TITLE_SUFFIX_PATTERN);
-    const index = Number(match?.[1]);
-    if (!match || index < 2)
-        return trimmed;
-    for (const familyTitle of familyTitles) {
-        const candidateBase = familyTitle.trim();
-        if (!candidateBase || candidateBase === trimmed)
-            continue;
-        if (numberedForkTitle(candidateBase, index) !== trimmed)
-            continue;
-        if (index === 2 || familyTitles.has(numberedForkTitle(candidateBase, index - 1))) {
-            return candidateBase;
-        }
-    }
-    return trimmed;
-}
-function numberedForkTitle(baseTitle, index) {
-    const suffix = ` (${index})`;
-    const availableBaseLength = CHAT_TITLE_MAX_LENGTH - suffix.length;
-    const truncatedBase = baseTitle.slice(0, availableBaseLength).trimEnd() || "Forked conversation";
-    return `${truncatedBase}${suffix}`;
-}
-function nextForkTitle(source, familyTitles) {
-    const existingTitles = new Set(familyTitles);
-    const baseTitle = baseForkTitle(source.title, Boolean(source.forkedFromConversationId), existingTitles);
-    let index = 2;
-    while (existingTitles.has(numberedForkTitle(baseTitle, index)))
-        index += 1;
-    return numberedForkTitle(baseTitle, index);
-}
-function conversationMutability(row, sourceMetadata, sourceMetadataByConversationId) {
-    if (sourceMetadata)
-        return "external_bound_chat";
-    if ((row.forkedFromConversationId && sourceMetadataByConversationId.has(row.forkedFromConversationId)) ||
-        (row.forkRootConversationId && sourceMetadataByConversationId.has(row.forkRootConversationId))) {
-        return "native_fork_from_external";
-    }
-    return "native_chat";
-}
-import { buildSearchSnippet, CHAT_TRANSCRIPT_KEY, chatTranscriptFromPayload, chatTranscriptSummaryFromEntries, contentPath, escapeLikePattern, incomingMessagePreviewSql, issueProposalFromPayload, isVisibleIncomingChatMessage, listContextLinksForConversationIds, listPrimaryIssues, operationProposalDecisionStatusFromPayload, operationProposalFromPayload, resolveContextEntities, safeTrim, stripChatMetadataFromPayload, textContains, truncatePreview, visibleIncomingMessageSql, withOperationProposalDecisionState, withPersistedTranscript, } from "./chats.helpers.js";
 export function chatService(db) {
     const generationProtocol = chatGenerationProtocolService(db);
     const QUEUED_MESSAGE_CLAIM_LEASE_MS = 2 * 60 * 1000;
@@ -606,7 +555,7 @@ export function chatService(db) {
         const rows = await db
             .select()
             .from(chatQueuedMessages)
-            .where(and(eq(chatQueuedMessages.conversationId, conversationId), inArray(chatQueuedMessages.status, [
+            .where(and(eq(chatQueuedMessages.conversationId, conversationId), isNull(chatQueuedMessages.cancelledAt), inArray(chatQueuedMessages.status, [
             "queued",
             "steer_pending",
             "acceptance_unknown",
@@ -1121,6 +1070,28 @@ export function chatService(db) {
                 .returning();
             if (!item)
                 throw conflict("Queued Steer feedback changed while provider evidence was resolving");
+            const linkedSteerMessageId = item.continuationMessageId ?? item.sourceMessageId;
+            if (linkedSteerMessageId) {
+                const linkedSteerMessage = await tx
+                    .select({ structuredPayload: chatMessages.structuredPayload })
+                    .from(chatMessages)
+                    .where(and(eq(chatMessages.id, linkedSteerMessageId), eq(chatMessages.orgId, input.orgId), eq(chatMessages.conversationId, input.conversationId), eq(chatMessages.role, "user")))
+                    .limit(1)
+                    .then((rows) => rows[0] ?? null);
+                const steerPayload = linkedSteerMessage?.structuredPayload;
+                if (steerPayload && steerPayload.source === "steer") {
+                    await tx
+                        .update(chatMessages)
+                        .set({
+                        structuredPayload: {
+                            ...steerPayload,
+                            deliveryDisposition: input.disposition,
+                        },
+                        updatedAt: now,
+                    })
+                        .where(eq(chatMessages.id, linkedSteerMessageId));
+                }
+            }
             return { action, item: hydrateQueuedMessage(item), applied: true };
         });
     }
@@ -1425,7 +1396,7 @@ export function chatService(db) {
             const item = await tx
                 .select()
                 .from(chatQueuedMessages)
-                .where(and(eq(chatQueuedMessages.id, input.itemId), eq(chatQueuedMessages.orgId, input.orgId), eq(chatQueuedMessages.conversationId, input.conversationId), inArray(chatQueuedMessages.status, ["queued", "steer_pending", "continuation_pending"])))
+                .where(and(eq(chatQueuedMessages.id, input.itemId), eq(chatQueuedMessages.orgId, input.orgId), eq(chatQueuedMessages.conversationId, input.conversationId), isNull(chatQueuedMessages.cancelledAt), inArray(chatQueuedMessages.status, ["queued", "steer_pending", "continuation_pending"])))
                 .limit(1)
                 .then((rows) => rows[0] ?? null);
             if (!item)
@@ -1479,7 +1450,7 @@ export function chatService(db) {
                 version: sql `${chatQueuedMessages.version} + 1`,
                 updatedAt: now,
             })
-                .where(and(eq(chatQueuedMessages.id, item.id), eq(chatQueuedMessages.version, item.version)))
+                .where(and(eq(chatQueuedMessages.id, item.id), eq(chatQueuedMessages.version, item.version), isNull(chatQueuedMessages.cancelledAt)))
                 .returning();
             if (!updatedItem)
                 throw conflict("Queued feedback changed while continuation was being scheduled");
@@ -1503,7 +1474,7 @@ export function chatService(db) {
             version: sql `${chatQueuedMessages.version} + 1`,
             updatedAt: now,
         })
-            .where(and(eq(chatQueuedMessages.conversationId, input.conversationId), eq(chatQueuedMessages.id, input.itemId), eq(chatQueuedMessages.status, "queued")))
+            .where(and(eq(chatQueuedMessages.conversationId, input.conversationId), eq(chatQueuedMessages.id, input.itemId), eq(chatQueuedMessages.status, "queued"), isNull(chatQueuedMessages.cancelledAt)))
             .returning();
         if (!row)
             throw conflict("Queued message was changed or is no longer steerable");
@@ -1519,12 +1490,12 @@ export function chatService(db) {
                 const candidates = await tx
                     .select()
                     .from(chatQueuedMessages)
-                    .where(and(inArray(chatQueuedMessages.status, ["continuation_pending", "steer_pending", "queued"]), sql `jsonb_typeof(${chatQueuedMessages.requestActor}) = 'object'`, or(isNull(chatQueuedMessages.deliveryLeaseExpiresAt), lt(chatQueuedMessages.deliveryLeaseExpiresAt, now)), sql `${chatQueuedMessages.status} <> 'steer_pending' or coalesce((
+                    .where(and(inArray(chatQueuedMessages.status, ["continuation_pending", "steer_pending", "queued"]), isNull(chatQueuedMessages.cancelledAt), sql `jsonb_typeof(${chatQueuedMessages.requestActor}) = 'object'`, or(isNull(chatQueuedMessages.deliveryLeaseExpiresAt), lt(chatQueuedMessages.deliveryLeaseExpiresAt, now)), sql `(${chatQueuedMessages.status} <> 'steer_pending' or coalesce((
             select steer_action.provider_disposition
             from ${chatControlActions} as steer_action
             where steer_action.id = ${chatQueuedMessages.controlActionId}
             limit 1
-          ), 'not_sent') in ('not_sent', 'rejected')`))
+          ), 'not_sent') in ('not_sent', 'rejected'))`))
                     .orderBy(sql `case
             when ${chatQueuedMessages.status} = 'continuation_pending' then 0
             when ${chatQueuedMessages.status} = 'steer_pending' then 1
@@ -1653,7 +1624,7 @@ export function chatService(db) {
                         version: sql `${chatQueuedMessages.version} + 1`,
                         updatedAt: now,
                     })
-                        .where(and(eq(chatQueuedMessages.id, candidate.id), eq(chatQueuedMessages.version, candidate.version)))
+                        .where(and(eq(chatQueuedMessages.id, candidate.id), eq(chatQueuedMessages.version, candidate.version), isNull(chatQueuedMessages.cancelledAt)))
                         .returning();
                     if (!claimed)
                         throw conflict("Queued continuation changed while being claimed");
@@ -1689,7 +1660,7 @@ export function chatService(db) {
             deliveryLeaseExpiresAt: new Date(now.getTime() + input.leaseMs),
             updatedAt: now,
         })
-            .where(and(eq(chatQueuedMessages.id, input.itemId), eq(chatQueuedMessages.continuationGenerationId, input.generationId), eq(chatQueuedMessages.deliveryLeaseToken, input.leaseToken), eq(chatQueuedMessages.deliveryLeaseEpoch, input.leaseEpoch), inArray(chatQueuedMessages.status, SERVER_QUEUE_RUNNING_STATUSES)))
+            .where(and(eq(chatQueuedMessages.id, input.itemId), eq(chatQueuedMessages.continuationGenerationId, input.generationId), eq(chatQueuedMessages.deliveryLeaseToken, input.leaseToken), eq(chatQueuedMessages.deliveryLeaseEpoch, input.leaseEpoch), isNull(chatQueuedMessages.cancelledAt), inArray(chatQueuedMessages.status, SERVER_QUEUE_RUNNING_STATUSES)))
             .returning({ id: chatQueuedMessages.id });
         return Boolean(row);
     }
@@ -1705,13 +1676,19 @@ export function chatService(db) {
             if (!item)
                 return null;
             const isSteer = item.deliveryIntent === "steer" || item.status === "running_next";
-            const succeeded = input.status === "completed";
-            const nextStatus = succeeded
-                ? (isSteer ? "delivered" : "completed")
-                : "failed_actionable";
-            const nextDisposition = succeeded
-                ? (isSteer ? "delivered" : null)
-                : "failed_actionable";
+            const cancelled = Boolean(item.cancelledAt);
+            const succeeded = !cancelled && input.status === "completed";
+            const nextStatus = cancelled
+                ? "cancelled"
+                : succeeded
+                    ? (isSteer ? "delivered" : "completed")
+                    : "failed_actionable";
+            const nextDisposition = cancelled
+                ? "cancelled"
+                : succeeded
+                    ? (isSteer ? "delivered" : null)
+                    : "failed_actionable";
+            const terminalReason = cancelled ? "operator_cancelled" : (input.reason ?? input.status);
             const [updated] = await tx
                 .update(chatQueuedMessages)
                 .set({
@@ -1720,25 +1697,27 @@ export function chatService(db) {
                 deliveryLeaseToken: null,
                 deliveryLeaseOwner: null,
                 deliveryLeaseExpiresAt: null,
-                lastDeliveryReason: succeeded ? null : (input.reason ?? input.status),
-                reconciliationReason: succeeded ? null : (input.reason ?? input.status),
+                lastDeliveryReason: succeeded ? null : terminalReason,
+                reconciliationReason: succeeded ? null : terminalReason,
                 version: sql `${chatQueuedMessages.version} + 1`,
                 updatedAt: now,
             })
                 .where(and(eq(chatQueuedMessages.id, item.id), eq(chatQueuedMessages.version, item.version)))
                 .returning();
+            if (!updated)
+                return null;
             if (item.controlActionId) {
                 await tx
                     .update(chatControlActions)
                     .set({
                     localDisposition: nextDisposition ?? (succeeded ? "delivered" : "failed_actionable"),
-                    lastError: succeeded ? null : (input.reason ?? input.status),
+                    lastError: succeeded ? null : terminalReason,
                     resolvedAt: now,
                     updatedAt: now,
                 })
                     .where(eq(chatControlActions.id, item.controlActionId));
             }
-            return updated ? hydrateQueuedMessage(updated) : null;
+            return hydrateQueuedMessage(updated);
         });
     }
     async function releaseServerQueuedMessageClaim(input) {
@@ -1764,12 +1743,18 @@ export function chatService(db) {
                 || generation.status === "tool_busy"
                 || generation.status === "closing"));
             const isSteer = item.deliveryIntent === "steer" || item.status === "running_next";
-            const nextStatus = providerMayHaveStarted
-                ? (isSteer ? "acceptance_unknown" : "failed_actionable")
-                : (isSteer ? "continuation_pending" : "queued");
-            const nextDisposition = providerMayHaveStarted
-                ? (isSteer ? "acceptance_unknown" : "failed_actionable")
-                : (isSteer ? "continuation_pending" : null);
+            const cancelled = Boolean(item.cancelledAt);
+            const nextStatus = cancelled
+                ? "cancelled"
+                : providerMayHaveStarted
+                    ? (isSteer ? "acceptance_unknown" : "failed_actionable")
+                    : (isSteer ? "continuation_pending" : "queued");
+            const nextDisposition = cancelled
+                ? "cancelled"
+                : providerMayHaveStarted
+                    ? (isSteer ? "acceptance_unknown" : "failed_actionable")
+                    : (isSteer ? "continuation_pending" : null);
+            const releaseReason = cancelled ? "operator_cancelled" : input.reason;
             const [updated] = await tx
                 .update(chatQueuedMessages)
                 .set({
@@ -1779,25 +1764,27 @@ export function chatService(db) {
                 deliveryLeaseToken: null,
                 deliveryLeaseOwner: null,
                 deliveryLeaseExpiresAt: null,
-                lastDeliveryReason: input.reason,
-                reconciliationReason: input.reason,
+                lastDeliveryReason: releaseReason,
+                reconciliationReason: releaseReason,
                 version: sql `${chatQueuedMessages.version} + 1`,
                 updatedAt: now,
             })
                 .where(and(eq(chatQueuedMessages.id, item.id), eq(chatQueuedMessages.version, item.version)))
                 .returning();
+            if (!updated)
+                return null;
             if (generation) {
                 await tx
                     .update(chatGenerations)
                     .set({
                     status: "aborted",
-                    terminalReason: input.reason,
+                    terminalReason: releaseReason,
                     controlState: providerMayHaveStarted ? "control_lost" : "terminal",
                     runtimeTerminalAt: now,
                     completedAt: now,
                     updatedAt: now,
                 })
-                    .where(eq(chatGenerations.id, generation.id));
+                    .where(and(eq(chatGenerations.id, generation.id), inArray(chatGenerations.status, ACTIVE_CHAT_GENERATION_STATUSES)));
             }
             if (item.controlActionId) {
                 await tx
@@ -1805,13 +1792,13 @@ export function chatService(db) {
                     .set({
                     localDisposition: nextDisposition ?? "pending",
                     providerDisposition: providerMayHaveStarted ? "unverified" : "not_sent",
-                    lastError: input.reason,
+                    lastError: releaseReason,
                     resolvedAt: providerMayHaveStarted ? now : null,
                     updatedAt: now,
                 })
                     .where(eq(chatControlActions.id, item.controlActionId));
             }
-            return updated ? hydrateQueuedMessage(updated) : null;
+            return hydrateQueuedMessage(updated);
         });
     }
     async function recoverExpiredServerQueueClaims(now = new Date()) {
@@ -1852,7 +1839,7 @@ export function chatService(db) {
             const [candidate] = await tx
                 .select()
                 .from(chatQueuedMessages)
-                .where(and(eq(chatQueuedMessages.conversationId, conversationId), eq(chatQueuedMessages.status, "queued")))
+                .where(and(eq(chatQueuedMessages.conversationId, conversationId), eq(chatQueuedMessages.status, "queued"), isNull(chatQueuedMessages.cancelledAt)))
                 .orderBy(asc(chatQueuedMessages.position), asc(chatQueuedMessages.createdAt))
                 .limit(1);
             if (!candidate)
@@ -1868,13 +1855,26 @@ export function chatService(db) {
                 version: sql `${chatQueuedMessages.version} + 1`,
                 updatedAt: now,
             })
-                .where(and(eq(chatQueuedMessages.id, candidate.id), eq(chatQueuedMessages.conversationId, conversationId), eq(chatQueuedMessages.status, "queued"), eq(chatQueuedMessages.version, candidate.version)))
+                .where(and(eq(chatQueuedMessages.id, candidate.id), eq(chatQueuedMessages.conversationId, conversationId), eq(chatQueuedMessages.status, "queued"), eq(chatQueuedMessages.version, candidate.version), isNull(chatQueuedMessages.cancelledAt)))
                 .returning();
             return row ? hydrateQueuedMessage(row) : null;
         });
     }
     async function releaseQueuedMessageClaim(input) {
         const now = new Date();
+        const [cancelledRow] = await db
+            .update(chatQueuedMessages)
+            .set({
+            status: "cancelled",
+            deliveryDisposition: "cancelled",
+            lastDeliveryReason: "operator_cancelled",
+            version: sql `${chatQueuedMessages.version} + 1`,
+            updatedAt: now,
+        })
+            .where(and(eq(chatQueuedMessages.conversationId, input.conversationId), eq(chatQueuedMessages.id, input.itemId), eq(chatQueuedMessages.status, "dequeue_claimed"), isNotNull(chatQueuedMessages.cancelledAt), isNull(chatQueuedMessages.deliveryLeaseToken), isNull(chatQueuedMessages.continuationGenerationId)))
+            .returning();
+        if (cancelledRow)
+            return hydrateQueuedMessage(cancelledRow);
         const [row] = await db
             .update(chatQueuedMessages)
             .set({
@@ -1883,27 +1883,38 @@ export function chatService(db) {
             version: sql `${chatQueuedMessages.version} + 1`,
             updatedAt: now,
         })
-            .where(and(eq(chatQueuedMessages.conversationId, input.conversationId), eq(chatQueuedMessages.id, input.itemId), eq(chatQueuedMessages.status, "dequeue_claimed")))
+            .where(and(eq(chatQueuedMessages.conversationId, input.conversationId), eq(chatQueuedMessages.id, input.itemId), eq(chatQueuedMessages.status, "dequeue_claimed"), isNull(chatQueuedMessages.cancelledAt), isNull(chatQueuedMessages.deliveryLeaseToken), isNull(chatQueuedMessages.continuationGenerationId)))
             .returning();
         return row ? hydrateQueuedMessage(row) : null;
     }
     async function reclaimStaleQueuedMessageClaims(conversationId) {
         const cutoff = new Date(Date.now() - QUEUED_MESSAGE_CLAIM_LEASE_MS);
+        const now = new Date();
+        await db
+            .update(chatQueuedMessages)
+            .set({
+            status: "cancelled",
+            deliveryDisposition: "cancelled",
+            lastDeliveryReason: "operator_cancelled",
+            version: sql `${chatQueuedMessages.version} + 1`,
+            updatedAt: now,
+        })
+            .where(and(eq(chatQueuedMessages.conversationId, conversationId), eq(chatQueuedMessages.status, "dequeue_claimed"), isNotNull(chatQueuedMessages.cancelledAt), isNull(chatQueuedMessages.deliveryLeaseToken), isNull(chatQueuedMessages.continuationGenerationId), lt(chatQueuedMessages.updatedAt, cutoff)));
         await db
             .update(chatQueuedMessages)
             .set({
             status: "queued",
             lastDeliveryReason: "claim_expired",
             version: sql `${chatQueuedMessages.version} + 1`,
-            updatedAt: new Date(),
+            updatedAt: now,
         })
-            .where(and(eq(chatQueuedMessages.conversationId, conversationId), eq(chatQueuedMessages.status, "dequeue_claimed"), lt(chatQueuedMessages.updatedAt, cutoff)));
+            .where(and(eq(chatQueuedMessages.conversationId, conversationId), eq(chatQueuedMessages.status, "dequeue_claimed"), isNull(chatQueuedMessages.cancelledAt), isNull(chatQueuedMessages.deliveryLeaseToken), isNull(chatQueuedMessages.continuationGenerationId), lt(chatQueuedMessages.updatedAt, cutoff)));
     }
     async function assertQueuedMessageClaimedForDelivery(input) {
         const row = await db
             .select()
             .from(chatQueuedMessages)
-            .where(and(eq(chatQueuedMessages.conversationId, input.conversationId), eq(chatQueuedMessages.id, input.itemId)))
+            .where(and(eq(chatQueuedMessages.conversationId, input.conversationId), eq(chatQueuedMessages.id, input.itemId), isNull(chatQueuedMessages.cancelledAt)))
             .limit(1)
             .then((rows) => rows[0] ?? null);
         if (!row || row.status !== "dequeue_claimed") {
@@ -1949,19 +1960,120 @@ export function chatService(db) {
     }
     async function hydrateMessages(rows, options = {}) {
         const includeTranscript = options.includeTranscript !== false;
-        const [attachmentsByMessageId, approvalsById] = await Promise.all([
+        const assistantMessageIds = rows
+            .filter((row) => row.role === "assistant")
+            .map((row) => row.id);
+        const nativeSteerMessageIds = rows
+            .filter((row) => row.role === "user" && row.structuredPayload?.source === "steer")
+            .map((row) => row.id);
+        const [attachmentsByMessageId, approvalsById, generationMessageRows, linkedSteerQueueRows] = await Promise.all([
             listAttachmentsForMessageIds(rows.map((row) => row.id)),
             listApprovalsForMessages(rows),
+            assistantMessageIds.length > 0
+                ? db
+                    .select({
+                    assistantMessageId: chatGenerationEvents.assistantMessageId,
+                    generationId: chatGenerationEvents.generationId,
+                })
+                    .from(chatGenerationEvents)
+                    .where(inArray(chatGenerationEvents.assistantMessageId, assistantMessageIds))
+                    .orderBy(desc(chatGenerationEvents.generationSeq))
+                : Promise.resolve([]),
+            nativeSteerMessageIds.length > 0
+                ? db
+                    .select({
+                    sourceMessageId: chatQueuedMessages.sourceMessageId,
+                    continuationMessageId: chatQueuedMessages.continuationMessageId,
+                    deliveryDisposition: chatQueuedMessages.deliveryDisposition,
+                    continuationGenerationId: chatQueuedMessages.continuationGenerationId,
+                    dequeuedAt: chatQueuedMessages.dequeuedAt,
+                })
+                    .from(chatQueuedMessages)
+                    .where(or(inArray(chatQueuedMessages.sourceMessageId, nativeSteerMessageIds), inArray(chatQueuedMessages.continuationMessageId, nativeSteerMessageIds)))
+                : Promise.resolve([]),
         ]);
+        const generationIdByAssistantMessageId = new Map();
+        for (const generationMessageRow of generationMessageRows) {
+            if (!generationMessageRow.assistantMessageId)
+                continue;
+            if (generationIdByAssistantMessageId.has(generationMessageRow.assistantMessageId))
+                continue;
+            generationIdByAssistantMessageId.set(generationMessageRow.assistantMessageId, generationMessageRow.generationId);
+        }
+        const steerDispositionByMessageId = new Map();
+        for (const queueRow of linkedSteerQueueRows) {
+            const messageIds = new Set([
+                queueRow.sourceMessageId,
+                queueRow.continuationMessageId,
+            ].filter((messageId) => Boolean(messageId)));
+            // `dequeuedAt` is durable provenance that this feedback left the native turn.
+            // A failed continuation claim clears continuationGenerationId and may become
+            // acceptance_unknown, but it must never be projected back into the old transcript.
+            const projectedDisposition = queueRow.continuationGenerationId || queueRow.dequeuedAt
+                ? "continuation_pending"
+                : queueRow.deliveryDisposition === "delivered"
+                    ? "accepted_current"
+                    : queueRow.deliveryDisposition;
+            if (!projectedDisposition)
+                continue;
+            for (const messageId of messageIds) {
+                steerDispositionByMessageId.set(messageId, projectedDisposition);
+            }
+        }
+        const effectiveStructuredPayload = (row) => {
+            const payload = row.structuredPayload;
+            if (!payload || payload.source !== "steer")
+                return payload;
+            const projectedDisposition = steerDispositionByMessageId.get(row.id);
+            return projectedDisposition
+                ? { ...payload, deliveryDisposition: projectedDisposition }
+                : payload;
+        };
+        const nativeSteerTargetGenerationIds = new Set();
+        for (const row of rows) {
+            const payload = effectiveStructuredPayload(row);
+            const targetGenerationId = payload?.source === "steer"
+                && ["pending", "acceptance_unknown", "accepted_current"].includes(typeof payload.deliveryDisposition === "string" ? payload.deliveryDisposition : "")
+                && typeof payload.targetGenerationId === "string"
+                ? payload.targetGenerationId
+                : null;
+            if (targetGenerationId)
+                nativeSteerTargetGenerationIds.add(targetGenerationId);
+        }
+        const nativeSteerAssistantMessageIds = includeTranscript
+            ? []
+            : assistantMessageIds.filter((messageId) => {
+                const generationId = generationIdByAssistantMessageId.get(messageId);
+                return Boolean(generationId && nativeSteerTargetGenerationIds.has(generationId));
+            });
+        const nativeSteerTranscriptPayloadByMessageId = new Map();
+        if (nativeSteerAssistantMessageIds.length > 0) {
+            const transcriptPayloadRows = await db
+                .select({
+                id: chatMessages.id,
+                structuredPayload: chatMessages.structuredPayload,
+            })
+                .from(chatMessages)
+                .where(inArray(chatMessages.id, nativeSteerAssistantMessageIds));
+            for (const transcriptPayloadRow of transcriptPayloadRows) {
+                nativeSteerTranscriptPayloadByMessageId.set(transcriptPayloadRow.id, transcriptPayloadRow.structuredPayload);
+            }
+        }
         return rows.map((row) => {
-            const transcript = includeTranscript ? chatTranscriptFromPayload(row.structuredPayload) : [];
-            const transcriptSummary = includeTranscript
+            const generationId = generationIdByAssistantMessageId.get(row.id) ?? null;
+            const includeRowTranscript = includeTranscript
+                || Boolean(generationId && nativeSteerTargetGenerationIds.has(generationId));
+            const transcriptPayload = nativeSteerTranscriptPayloadByMessageId.get(row.id) ?? row.structuredPayload;
+            const transcript = includeRowTranscript ? chatTranscriptFromPayload(transcriptPayload) : [];
+            const transcriptSummary = includeRowTranscript
                 ? chatTranscriptSummaryFromEntries(transcript)
                 : row.transcriptSummary ?? null;
+            const structuredPayload = effectiveStructuredPayload(row);
             return {
                 ...row,
-                structuredPayload: stripChatMetadataFromPayload(row.structuredPayload),
-                transcript: includeTranscript ? transcript : undefined,
+                generationId,
+                structuredPayload: stripChatMetadataFromPayload(structuredPayload),
+                transcript: includeRowTranscript ? transcript : undefined,
                 transcriptSummary,
                 approval: row.approvalId ? (approvalsById.get(row.approvalId) ?? null) : null,
                 attachments: attachmentsByMessageId.get(row.id) ?? [],
@@ -2113,107 +2225,16 @@ export function chatService(db) {
         return conversation ?? null;
     }
     async function create(orgId, data) {
-        const created = await db.transaction(async (tx) => {
-            const [conversation] = await tx
-                .insert(chatConversations)
-                .values({
-                orgId,
-                title: data.title?.trim() || "New chat",
-                summary: data.summary ?? null,
-                preferredAgentId: data.preferredAgentId ?? null,
-                issueCreationMode: data.issueCreationMode,
-                planMode: data.planMode,
-                createdByUserId: data.createdByUserId,
-            })
-                .returning();
-            if (!conversation)
-                throw new Error("Failed to create chat conversation");
-            const contextLinks = data.contextLinks ?? [];
-            if (contextLinks.length > 0) {
-                await tx
-                    .insert(chatContextLinks)
-                    .values(contextLinks.map((link) => ({
-                    orgId,
-                    conversationId: conversation.id,
-                    entityType: link.entityType,
-                    entityId: link.entityId,
-                    metadata: link.metadata ?? null,
-                })))
-                    .onConflictDoNothing();
-            }
-            return conversation;
-        });
+        const created = await createChatConversation(db, orgId, data);
         return getById(created.id);
     }
+    async function createWithInitialMessage(orgId, data, executor) {
+        return createChatWithInitialMessage(db, orgId, data, executor);
+    }
     function forkSystemEventBody(sourceConversation, sourceMessageId) {
         const messageSuffix = sourceMessageId ? " at message" : "";
         return `Forked from [${sourceConversation.title}](chat://${sourceConversation.id})${messageSuffix}.`;
     }
-    async function findForkFamilyGroup(client, orgId, userId, rootConversationId) {
-        const rootThreadKey = `chat:${rootConversationId}`;
-        return client
-            .select({ id: messengerCustomGroups.id })
-            .from(messengerCustomGroups)
-            .innerJoin(messengerCustomGroupEntries, eq(messengerCustomGroupEntries.groupId, messengerCustomGroups.id))
-            .where(and(eq(messengerCustomGroups.orgId, orgId), eq(messengerCustomGroups.userId, userId), eq(messengerCustomGroupEntries.orgId, orgId), eq(messengerCustomGroupEntries.userId, userId), eq(messengerCustomGroupEntries.threadKey, rootThreadKey)))
-            .orderBy(asc(messengerCustomGroups.sortOrder), asc(messengerCustomGroups.createdAt))
-            .limit(1)
-            .then((rows) => rows[0] ?? null);
-    }
-    async function createForkFamilyGroup(client, orgId, userId, name) {
-        const [lastGroup] = await client
-            .select({ sortOrder: messengerCustomGroups.sortOrder })
-            .from(messengerCustomGroups)
-            .where(and(eq(messengerCustomGroups.orgId, orgId), eq(messengerCustomGroups.userId, userId)))
-            .orderBy(desc(messengerCustomGroups.sortOrder))
-            .limit(1);
-        const now = new Date();
-        const [group] = await client
-            .insert(messengerCustomGroups)
-            .values({
-            orgId,
-            userId,
-            name: name.trim() || "Forked conversation",
-            icon: MESSENGER_FORK_GROUP_DEFAULT_ICON,
-            sortOrder: (lastGroup?.sortOrder ?? -1) + 1,
-            updatedAt: now,
-        })
-            .returning();
-        if (!group)
-            throw new Error("Failed to create Messenger fork group");
-        return group;
-    }
-    async function assignForkThreadToGroup(client, orgId, userId, groupId, threadKey) {
-        const [lastEntry] = await client
-            .select({ sortOrder: messengerCustomGroupEntries.sortOrder })
-            .from(messengerCustomGroupEntries)
-            .where(and(eq(messengerCustomGroupEntries.orgId, orgId), eq(messengerCustomGroupEntries.userId, userId), eq(messengerCustomGroupEntries.groupId, groupId)))
-            .orderBy(desc(messengerCustomGroupEntries.sortOrder))
-            .limit(1);
-        const now = new Date();
-        await client
-            .insert(messengerCustomGroupEntries)
-            .values({
-            orgId,
-            userId,
-            groupId,
-            threadKey,
-            sortOrder: (lastEntry?.sortOrder ?? -1) + 1,
-            updatedAt: now,
-        })
-            .onConflictDoNothing();
-    }
-    async function ensureForkFamilyGroup(client, orgId, userId, rootConversationId, sourceConversationId, childConversationId, groupName) {
-        const existing = await findForkFamilyGroup(client, orgId, userId, rootConversationId);
-        const group = existing ?? await createForkFamilyGroup(client, orgId, userId, groupName);
-        for (const threadKey of [
-            `chat:${rootConversationId}`,
-            `chat:${sourceConversationId}`,
-            `chat:${childConversationId}`,
-        ]) {
-            await assignForkThreadToGroup(client, orgId, userId, group.id, threadKey);
-        }
-    }
     async function forkConversation(input) {
         const created = await db.transaction(async (tx) => {
             const initialSource = await tx
@@ -2326,79 +2347,13 @@ export function chatService(db) {
             const forkMessages = input.sourceMessageId
                 ? messagesToCopy.slice(0, messagesToCopy.findIndex((message) => message.id === input.sourceMessageId) + 1)
                 : messagesToCopy;
-            if (forkMessages.length > 0) {
-                for (const message of forkMessages) {
-                    const copiedMessageId = randomUUID();
-                    const visualMappings = chatInlineVisualMappingsFromStructuredPayload(message.structuredPayload);
-                    const readyAttachmentIds = visualMappings
-                        .filter((mapping) => mapping.status === "ready")
-                        .map((mapping) => mapping.attachmentId);
-                    const copiedAttachmentIdBySourceId = new Map();
-                    const pendingVisualAttachments = [];
-                    if (readyAttachmentIds.length > 0) {
-                        const sourceVisualAttachments = await tx
-                            .select({
-                            id: chatAttachments.id,
-                            assetId: chatAttachments.assetId,
-                            contentType: assets.contentType,
-                            createdByAgentId: assets.createdByAgentId,
-                            createdByUserId: assets.createdByUserId,
-                        })
-                            .from(chatAttachments)
-                            .innerJoin(assets, eq(chatAttachments.assetId, assets.id))
-                            .where(and(eq(chatAttachments.conversationId, source.id), eq(chatAttachments.messageId, message.id), inArray(chatAttachments.id, readyAttachmentIds)));
-                        const safeVisualAttachments = sourceVisualAttachments.filter((attachment) => attachment.contentType === "text/html"
-                            && Boolean(attachment.createdByAgentId)
-                            && !attachment.createdByUserId);
-                        if (safeVisualAttachments.length > 0) {
-                            pendingVisualAttachments.push(...safeVisualAttachments.map((attachment) => {
-                                const copiedAttachmentId = randomUUID();
-                                copiedAttachmentIdBySourceId.set(attachment.id, copiedAttachmentId);
-                                return {
-                                    id: copiedAttachmentId,
-                                    orgId: input.orgId,
-                                    conversationId: child.id,
-                                    messageId: copiedMessageId,
-                                    assetId: attachment.assetId,
-                                };
-                            }));
-                        }
-                    }
-                    const copiedVisualMappings = visualMappings.map((mapping) => {
-                        if (mapping.status === "unavailable")
-                            return mapping;
-                        const copiedAttachmentId = copiedAttachmentIdBySourceId.get(mapping.attachmentId);
-                        return copiedAttachmentId
-                            ? { ...mapping, attachmentId: copiedAttachmentId }
-                            : {
-                                directiveIndex: mapping.directiveIndex,
-                                file: mapping.file,
-                                status: "unavailable",
-                                reason: "fork_source_missing",
-                            };
-                    });
-                    await tx.insert(chatMessages).values({
-                        id: copiedMessageId,
-                        orgId: input.orgId,
-                        conversationId: child.id,
-                        role: message.role,
-                        kind: message.kind,
-                        status: message.status === "streaming" ? "interrupted" : message.status,
-                        body: message.body,
-                        structuredPayload: copiedVisualMappings.length > 0 ? { inlineVisuals: copiedVisualMappings } : null,
-                        approvalId: null,
-                        runId: null,
-                        replyingAgentId: message.replyingAgentId,
-                        chatTurnId: null,
-                        turnVariant: 0,
-                        createdAt: message.createdAt,
-                        updatedAt: message.updatedAt,
-                    });
-                    if (pendingVisualAttachments.length > 0) {
-                        await tx.insert(chatAttachments).values(pendingVisualAttachments);
-                    }
-                }
-            }
+            await copyForkInlineVisualMessages({
+                tx,
+                messages: forkMessages,
+                sourceConversationId: source.id,
+                targetConversationId: child.id,
+                orgId: input.orgId,
+            });
             const [systemEvent] = await tx
                 .insert(chatMessages)
                 .values({
@@ -2427,7 +2382,14 @@ export function chatService(db) {
                 updatedAt: now,
             })
                 .where(eq(chatConversations.id, child.id));
-            await ensureForkFamilyGroup(tx, input.orgId, input.userId, rootConversationId, source.id, child.id, source.title);
+            await ensureChatFamilyGroup(tx, {
+                orgId: input.orgId,
+                userId: input.userId,
+                rootConversationId,
+                sourceConversationId: source.id,
+                childConversationId: child.id,
+                groupName: source.title,
+            });
             return child;
         });
         return getById(created.id, input.userId);
@@ -2626,13 +2588,21 @@ export function chatService(db) {
       end
     `;
     }
+    async function listRecentUserMessages(conversationId, limit) {
+        return listRecentUserChatMessages(db, conversationId, limit);
+    }
     async function listMessages(conversationId, options = {}) {
         const includeTranscript = options.includeTranscript !== false;
+        const conversationOrgIds = db
+            .select({ orgId: chatConversations.orgId })
+            .from(chatConversations)
+            .where(eq(chatConversations.id, conversationId));
+        const messageConditions = and(eq(chatMessages.conversationId, conversationId), inArray(chatMessages.orgId, conversationOrgIds));
         const rows = includeTranscript
             ? await db
                 .select()
                 .from(chatMessages)
-                .where(eq(chatMessages.conversationId, conversationId))
+                .where(messageConditions)
                 .orderBy(chatMessages.createdAt, chatMessages.id)
             : await db
                 .select({
@@ -2655,7 +2625,7 @@ export function chatService(db) {
                 transcriptSummary: transcriptSummarySql(),
             })
                 .from(chatMessages)
-                .where(eq(chatMessages.conversationId, conversationId))
+                .where(messageConditions)
                 .orderBy(chatMessages.createdAt, chatMessages.id);
         return hydrateMessages(rows, { includeTranscript });
     }
@@ -2868,6 +2838,15 @@ export function chatService(db) {
         const [hydrated] = await hydrateMessages([updated]);
         return hydrated ?? null;
     }
+    async function updateMessageInternalInlineVisuals(conversationId, messageId, input) {
+        return updateTrustedInlineVisualMappings({
+            db,
+            hydrateMessages,
+            conversationId,
+            messageId,
+            ...input,
+        });
+    }
     async function markInterruptedStreamingMessages(conversationId) {
         const rows = await db
             .select()
@@ -3000,6 +2979,38 @@ export function chatService(db) {
             };
         });
     }
+    async function removeAttachment(attachmentId) {
+        return db.transaction(async (tx) => {
+            const existing = await tx
+                .select({
+                id: chatAttachments.id,
+                orgId: chatAttachments.orgId,
+                assetId: chatAttachments.assetId,
+                objectKey: assets.objectKey,
+            })
+                .from(chatAttachments)
+                .innerJoin(assets, eq(chatAttachments.assetId, assets.id))
+                .where(eq(chatAttachments.id, attachmentId))
+                .then((rows) => rows[0] ?? null);
+            if (!existing)
+                return null;
+            await tx.delete(chatAttachments).where(eq(chatAttachments.id, attachmentId));
+            const hasRemainingAttachment = await tx
+                .select({ id: chatAttachments.id })
+                .from(chatAttachments)
+                .where(eq(chatAttachments.assetId, existing.assetId))
+                .limit(1)
+                .then((rows) => rows.length > 0);
+            if (!hasRemainingAttachment) {
+                await tx.delete(assets).where(eq(assets.id, existing.assetId));
+            }
+            return {
+                orgId: existing.orgId,
+                objectKey: existing.objectKey,
+                assetDeleted: !hasRemainingAttachment,
+            };
+        });
+    }
     function assertIssueProposalOwnerDecision(issueProposal) {
         const hasAssignee = Boolean(safeTrim(issueProposal.assigneeAgentId) || safeTrim(issueProposal.assigneeUserId));
         const hasUnassignedReason = Boolean(safeTrim(issueProposal.assigneeUnassignedReason));
@@ -3408,9 +3419,11 @@ export function chatService(db) {
         listSummariesByIds,
         getById,
         create,
+        createWithInitialMessage,
         update,
         updateDefaultTitle,
         replaceSystemGeneratedTitle,
+        listRecentUserMessages,
         listAttachmentsForConversation,
         assetHasAttachments,
         remove,
@@ -3453,11 +3466,13 @@ export function chatService(db) {
         getMessageTranscript,
         addMessage,
         updateMessage,
+        updateMessageInternalInlineVisuals,
         markInterruptedStreamingMessages,
         addUserChatMessage,
         addContextLink,
         setProjectContextLink,
         createAttachment,
+        removeAttachment,
         convertToIssue,
         getMessage,
         applyApprovedApproval,