Skip to content

Commit 5271b43

Browse files
committed
fix(web): keep queued message anchors and attachments intact on remove
Remove no longer re-anchors the other queued messages. Restore syncs the composer refs before the next send and moves attachments over the per-turn cap back into the queue instead of dropping them. The tool boundary is picked by activity sequence, not array position. Made with Claude Fable 5.1 in Claude Code.
1 parent 5f82a85 commit 5271b43

3 files changed

Lines changed: 109 additions & 20 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6798,14 +6798,52 @@ export default function ChatView(props: ChatViewProps) {
67986798
const nextPrompt = prompts.join("\n\n");
67996799
promptRef.current = nextPrompt;
68006800
setComposerDraftPrompt(composerDraftTarget, nextPrompt);
6801-
const images = messages.flatMap((message) => message.images);
6802-
const files = messages.flatMap((message) => message.files);
6803-
if (images.length > 0) addComposerDraftImages(composerDraftTarget, images);
6804-
if (files.length > 0) addComposerDraftFiles(composerDraftTarget, files);
6805-
setComposerDraftTerminalContexts(composerDraftTarget, [
6801+
// The draft store silently drops attachments over the per-turn cap. Split
6802+
// the overflow back into the queue so nothing is lost; the user can send
6803+
// the first batch and the rest follows as a queued message.
6804+
const attachmentRoom = Math.max(
6805+
0,
6806+
PROVIDER_SEND_TURN_MAX_ATTACHMENTS -
6807+
composerImagesRef.current.length -
6808+
composerFilesRef.current.length,
6809+
);
6810+
const attachments = messages.flatMap((message) => [...message.images, ...message.files]);
6811+
const restored = attachments.slice(0, attachmentRoom);
6812+
const overflow = attachments.slice(attachmentRoom);
6813+
const restoredImages = restored.filter((attachment) => attachment.type === "image");
6814+
const restoredFiles = restored.filter((attachment) => attachment.type === "file");
6815+
// The composer syncs these refs from the draft in an effect; a send before
6816+
// that effect runs must already see the restored content.
6817+
composerImagesRef.current = [...composerImagesRef.current, ...restoredImages];
6818+
composerFilesRef.current = [...composerFilesRef.current, ...restoredFiles];
6819+
if (restoredImages.length > 0) addComposerDraftImages(composerDraftTarget, restoredImages);
6820+
if (restoredFiles.length > 0) addComposerDraftFiles(composerDraftTarget, restoredFiles);
6821+
if (overflow.length > 0 && activeThreadKey) {
6822+
useQueuedMessageStore.getState().enqueue(activeThreadKey, {
6823+
prompt: "",
6824+
images: overflow.filter((attachment) => attachment.type === "image"),
6825+
files: overflow.filter((attachment) => attachment.type === "file"),
6826+
terminalContexts: [],
6827+
previewAnnotations: [],
6828+
reviewComments: [],
6829+
submissionIntent: "foreground",
6830+
queuedAfterToolActivityId: latestCompletedToolActivityId(threadActivities),
6831+
createdAt: new Date().toISOString(),
6832+
});
6833+
toastManager.add(
6834+
stackedThreadToast({
6835+
type: "info",
6836+
title: "Some attachments stayed queued",
6837+
description: `A message holds at most ${PROVIDER_SEND_TURN_MAX_ATTACHMENTS} attachments. The rest will send as a follow-up.`,
6838+
}),
6839+
);
6840+
}
6841+
const restoredTerminalContexts = [
68066842
...composerTerminalContextsRef.current,
68076843
...messages.flatMap((message) => message.terminalContexts),
6808-
]);
6844+
];
6845+
composerTerminalContextsRef.current = restoredTerminalContexts;
6846+
setComposerDraftTerminalContexts(composerDraftTarget, restoredTerminalContexts);
68096847
const draft = useComposerDraftStore.getState().getComposerDraft(composerDraftTarget);
68106848
setComposerDraftPreviewAnnotations(composerDraftTarget, [
68116849
...(draft?.previewAnnotations ?? []),
@@ -7783,9 +7821,7 @@ export default function ChatView(props: ChatViewProps) {
77837821

77847822
const onRemoveQueuedMessage = (id: string) => {
77857823
if (!activeThreadKey) return;
7786-
const message = useQueuedMessageStore
7787-
.getState()
7788-
.take(activeThreadKey, id, latestToolActivityId);
7824+
const message = useQueuedMessageStore.getState().remove(activeThreadKey, id);
77897825
if (message) restoreQueuedMessagesToComposer([message]);
77907826
};
77917827
// Stop also cancels the queue: the messages return to the composer instead

‎apps/web/src/queuedMessageStore.test.ts‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ describe("queuedMessageStore", () => {
6060
).toBe(false);
6161
});
6262

63+
it("remove keeps the other messages' anchors", () => {
64+
const { enqueue, remove } = useQueuedMessageStore.getState();
65+
const first = enqueue("thread-a", { ...makeMessage("first"), queuedAfterToolActivityId: "t1" });
66+
const second = enqueue("thread-a", makeMessage("second"));
67+
68+
expect(remove("thread-a", second.id)?.prompt).toBe("second");
69+
expect(remove("thread-a", second.id)).toBeNull();
70+
expect(useQueuedMessageStore.getState().queuesByThreadKey["thread-a"]).toEqual([first]);
71+
});
72+
6373
it("drain empties one thread's queue in order", () => {
6474
const { enqueue, drain } = useQueuedMessageStore.getState();
6575
enqueue("thread-a", makeMessage("first"));
@@ -74,14 +84,20 @@ describe("queuedMessageStore", () => {
7484

7585
describe("queued message dispatch timing", () => {
7686
const activities = [
77-
{ id: "a1", kind: "tool.started" },
78-
{ id: "a2", kind: "tool.completed" },
79-
{ id: "a3", kind: "tool.updated" },
87+
{ id: "a1", kind: "tool.started", sequence: 1, createdAt: "2026-01-01T00:00:01Z" },
88+
{ id: "a2", kind: "tool.completed", sequence: 2, createdAt: "2026-01-01T00:00:02Z" },
89+
{ id: "a3", kind: "tool.updated", sequence: 3, createdAt: "2026-01-01T00:00:03Z" },
8090
];
8191

82-
it("finds the newest completed tool call", () => {
92+
it("finds the newest completed tool call by sequence, not position", () => {
8393
expect(latestCompletedToolActivityId(activities)).toBe("a2");
8494
expect(latestCompletedToolActivityId([])).toBeNull();
95+
expect(
96+
latestCompletedToolActivityId([
97+
{ id: "late", kind: "tool.completed", sequence: 9, createdAt: "2026-01-01T00:00:09Z" },
98+
{ id: "early", kind: "tool.completed", sequence: 4, createdAt: "2026-01-01T00:00:04Z" },
99+
]),
100+
).toBe("late");
85101
});
86102

87103
it("waits mid-turn until a tool call finishes after the message was queued", () => {

‎apps/web/src/queuedMessageStore.ts‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ interface QueuedMessageStoreState {
4343
id: string,
4444
toolActivityId: string | null,
4545
) => QueuedComposerMessage | null;
46+
/** Removes one message without touching the others' anchors. Null when already gone. */
47+
remove: (threadKey: string, id: string) => QueuedComposerMessage | null;
4648
/** Removes and returns every queued message for the thread, oldest first. */
4749
drain: (threadKey: string) => QueuedComposerMessage[];
4850
}
@@ -86,6 +88,26 @@ export const useQueuedMessageStore = create<QueuedMessageStoreState>()((set, get
8688
});
8789
return entry;
8890
},
91+
remove: (threadKey, id) => {
92+
const queue = get().queuesByThreadKey[threadKey];
93+
const entry = queue?.find((message) => message.id === id);
94+
if (!queue || !entry) {
95+
return null;
96+
}
97+
set((state) => {
98+
const remaining = (state.queuesByThreadKey[threadKey] ?? EMPTY_QUEUE).filter(
99+
(message) => message.id !== id,
100+
);
101+
const queuesByThreadKey = { ...state.queuesByThreadKey };
102+
if (remaining.length === 0) {
103+
delete queuesByThreadKey[threadKey];
104+
} else {
105+
queuesByThreadKey[threadKey] = remaining;
106+
}
107+
return { queuesByThreadKey };
108+
});
109+
return entry;
110+
},
89111
drain: (threadKey) => {
90112
const queue = get().queuesByThreadKey[threadKey];
91113
if (!queue || queue.length === 0) {
@@ -100,17 +122,32 @@ export const useQueuedMessageStore = create<QueuedMessageStoreState>()((set, get
100122
},
101123
}));
102124

103-
/** The newest finished tool call. Its id changing is the boundary a queued message goes out on. */
125+
/**
126+
* The newest finished tool call. Its id changing is the boundary a queued
127+
* message goes out on. Live arrays are sorted, but a snapshot loaded from the
128+
* database is not, so pick by sequence rather than position.
129+
*/
104130
export function latestCompletedToolActivityId(
105-
activities: ReadonlyArray<{ readonly id: string; readonly kind: string }>,
131+
activities: ReadonlyArray<{
132+
readonly id: string;
133+
readonly kind: string;
134+
readonly sequence?: number | undefined;
135+
readonly createdAt: string;
136+
}>,
106137
): string | null {
107-
for (let index = activities.length - 1; index >= 0; index -= 1) {
108-
const activity = activities[index];
109-
if (activity?.kind === "tool.completed") {
110-
return activity.id;
138+
let latest: (typeof activities)[number] | null = null;
139+
for (const activity of activities) {
140+
if (activity.kind !== "tool.completed") continue;
141+
if (
142+
latest === null ||
143+
(activity.sequence ?? -1) > (latest.sequence ?? -1) ||
144+
((activity.sequence ?? -1) === (latest.sequence ?? -1) &&
145+
activity.createdAt > latest.createdAt)
146+
) {
147+
latest = activity;
111148
}
112149
}
113-
return null;
150+
return latest?.id ?? null;
114151
}
115152

116153
/**

0 commit comments

Comments
 (0)