coder · ibetitsmike · Jul 29, 2026 · Jul 23, 2026 · Jul 23, 2026 · Jul 23, 2026
diff --git a/site/src/api/queries/chatMessageEdits.test.ts b/site/src/api/queries/chatMessageEdits.test.ts
@@ -1,6 +1,10 @@
+import type { InfiniteData } from "react-query";
 import { describe, expect, it } from "vitest";
 import type * as TypesGen from "#/api/typesGenerated";
-import { buildOptimisticEditedMessage } from "./chatMessageEdits";
+import {
+	buildOptimisticEditedMessage,
+	reconcileEditedMessageInCache,
+} from "./chatMessageEdits";
 
 const makeUserMessage = (
 	content: readonly TypesGen.ChatMessagePart[] = [
@@ -42,3 +46,50 @@ describe("buildOptimisticEditedMessage", () => {
 		expect(message.content).toEqual([existingFilePart]);
 	});
 });
+
+describe("reconcileEditedMessageInCache", () => {
+	it("drops messages the edit deleted, such as stale hook notices", () => {
+		const staleNotice: TypesGen.ChatMessage = {
+			id: 2,
+			chat_id: "chat-1",
+			created_at: "2025-01-01T00:00:00.000Z",
+			role: "system",
+			content: [{ type: "text", text: "old hook notice" }],
+		};
+		const newNotice: TypesGen.ChatMessage = {
+			id: 5,
+			chat_id: "chat-1",
+			created_at: "2025-01-01T00:01:00.000Z",
+			role: "system",
+			content: [{ type: "text", text: "new hook notice" }],
+		};
+		const replacement: TypesGen.ChatMessage = {
+			id: 6,
+			chat_id: "chat-1",
+			created_at: "2025-01-01T00:01:00.000Z",
+			role: "user",
+			content: [{ type: "text", text: "edited prompt" }],
+		};
+		const currentData: InfiniteData<TypesGen.ChatMessagesResponse> = {
+			pages: [
+				{
+					messages: [staleNotice, makeUserMessage()],
+					queued_messages: [],
+					has_more: false,
+				},
+			],
+			pageParams: [undefined],
+		};
+
+		const reconciled = reconcileEditedMessageInCache({
+			currentData,
+			optimisticMessageId: 1,
+			responseMessages: [newNotice, replacement],
+			deletedMessageIds: [staleNotice.id, 1],
+		});
+
+		const ids = reconciled?.pages[0]?.messages.map((message) => message.id);
+		// Reversed from responseMessages: the first page is newest first.
+		expect(ids).toEqual([replacement.id, newNotice.id]);
+	});
+});
diff --git a/site/src/api/queries/chatMessageEdits.ts b/site/src/api/queries/chatMessageEdits.ts
@@ -117,28 +117,35 @@ export const projectEditedConversationIntoCache = ({
 export const reconcileEditedMessageInCache = ({
 	currentData,
 	optimisticMessageId,
-	responseMessage,
+	responseMessages,
+	deletedMessageIds,
 }: {
 	currentData: InfiniteData<TypesGen.ChatMessagesResponse> | undefined;
 	optimisticMessageId: number;
-	responseMessage: TypesGen.ChatMessage;
+	responseMessages: readonly TypesGen.ChatMessage[];
+	deletedMessageIds?: readonly number[];
 }): InfiniteData<TypesGen.ChatMessagesResponse> | undefined => {
-	if (!currentData?.pages?.length) {
+	if (!currentData?.pages?.length || responseMessages.length === 0) {
 		return currentData;
 	}
 
+	const responseIDs = new Set(responseMessages.map((message) => message.id));
+	const deletedIDs = new Set(deletedMessageIds ?? []);
 	const replacedPages = currentData.pages.map((page, pageIndex) => {
 		const preservedMessages = page.messages.filter(
 			(message) =>
-				message.id !== optimisticMessageId && message.id !== responseMessage.id,
+				message.id !== optimisticMessageId &&
+				!responseIDs.has(message.id) &&
+				!deletedIDs.has(message.id),
 		);
 		if (pageIndex !== 0) {
 			return { ...page, messages: preservedMessages };
 		}
-		return {
-			...page,
-			messages: upsertFirstPageMessage(preservedMessages, responseMessage),
-		};
+		let messages = preservedMessages;
+		for (const responseMessage of responseMessages) {
+			messages = upsertFirstPageMessage(messages, responseMessage);
+		}
+		return { ...page, messages };
 	});
 
 	return {

diff --git a/site/src/api/queries/chats.ts b/site/src/api/queries/chats.ts
@@ -23,6 +23,9 @@ export const chatMessagesKey = (chatId: string) =>
 export const chatPromptsKey = (chatId: string) =>
 	["chats", chatId, "prompts"] as const;
 
+const chatQueueConvergenceKey = (chatId: string) =>
+	["chats", chatId, "queue-convergence"] as const;
+
 export const chatACLKey = (chatId: string) => ["chats", chatId, "acl"] as const;
 
 export type ChatListPRStatusFilter = "draft" | "open" | "merged" | "closed";
@@ -748,6 +751,15 @@ export const chatACL = (chatId: string) => ({
 
 const MESSAGES_PAGE_SIZE = 50;
 
+// The queued messages ride on the uncursored page of the messages endpoint,
+// so settling the queue after a promote needs its own request. Refetching
+// chatMessagesForInfiniteScroll would reload every page already scrolled.
+export const chatQueueConvergence = (chatId: string) => ({
+	queryKey: chatQueueConvergenceKey(chatId),
+	queryFn: () => API.experimental.getChatMessages(chatId),
+	gcTime: 0,
+});
+
 export const chatMessagesForInfiniteScroll = (chatId: string) => ({
 	queryKey: chatMessagesKey(chatId),
 	initialPageParam: undefined as number | undefined,
@@ -1427,7 +1439,8 @@ export const editChatMessage = (queryClient: QueryClient, chatId: string) => ({
 			reconcileEditedMessageInCache({
 				currentData: current,
 				optimisticMessageId: variables.messageId,
-				responseMessage: response.message,
+				responseMessages: response.messages ?? [response.message],
+				deletedMessageIds: response.deleted_message_ids,
 			}),
 		);
 	},