Skip to content

Commit fa86510

Browse files
saphidclaude
authored andcommitted
fix(web): removing a queued message's attachment counts as an edit when its run starts
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 60aec28 commit fa86510

3 files changed

Lines changed: 37 additions & 3 deletions

File tree

‎apps/web/src/components/chat/queuedMessageEdit.test.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,31 @@ describe("queued message file edits", () => {
8686
expect(store.getComposerDraft(editTarget)).toBeNull();
8787
});
8888

89+
it("reports a removed queued attachment as an edit when the run leaves", () => {
90+
const store = useComposerDraftStore.getState();
91+
store.setPrompt(editTarget, "Original message");
92+
expect(
93+
recoverQueuedMessageEdit({
94+
editTarget,
95+
threadTarget,
96+
originalText: "Original message",
97+
removedExistingAttachment: true,
98+
}),
99+
).toBe("kept");
100+
expect(store.getComposerDraft(threadTarget)?.prompt).toBe("Original message");
101+
store.clearComposerContent(threadTarget);
102+
// An attachment-only message leaves nothing to put back in the composer.
103+
expect(
104+
recoverQueuedMessageEdit({
105+
editTarget,
106+
threadTarget,
107+
originalText: "",
108+
removedExistingAttachment: true,
109+
}),
110+
).toBe("discarded");
111+
expect(store.getComposerDraft(threadTarget)).toBeNull();
112+
});
113+
89114
it("does not overwrite a separate draft when the queued run leaves", () => {
90115
const store = useComposerDraftStore.getState();
91116
store.setPrompt(threadTarget, "Separate draft");

‎apps/web/src/components/chat/queuedMessageEdit.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,19 @@ export function recoverQueuedMessageEdit(input: {
1212
readonly editTarget: ComposerThreadTarget;
1313
readonly threadTarget: ComposerThreadTarget;
1414
readonly originalText: string;
15+
readonly removedExistingAttachment?: boolean;
1516
}): "kept" | "discarded" | "clean" {
1617
const store = useComposerDraftStore.getState();
1718
const draft = store.getComposerDraft(input.editTarget);
1819
const recovery = resolveQueuedEditExit({
1920
editChanged:
20-
draft !== null &&
21-
(draft.prompt !== input.originalText || draft.images.length > 0 || draft.files.length > 0),
22-
threadDraftEmpty: !composerDraftHasUserContent(store.getComposerDraft(input.threadTarget)),
21+
input.removedExistingAttachment === true ||
22+
(draft !== null &&
23+
(draft.prompt !== input.originalText || draft.images.length > 0 || draft.files.length > 0)),
24+
// A cleared edit has nothing to put back, so it can only be discarded.
25+
threadDraftEmpty:
26+
composerDraftHasUserContent(draft) &&
27+
!composerDraftHasUserContent(store.getComposerDraft(input.threadTarget)),
2328
});
2429
if (recovery === "kept") {
2530
store.moveComposerPromptAndImages(input.editTarget, input.threadTarget);

‎apps/web/src/components/chat/useQueuedRunEdit.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ interface EditingQueuedRun {
6464
readonly originalText: string;
6565
readonly existingAttachments: ReadonlyArray<ChatAttachment>;
6666
readonly context?: OrchestrationMessageContext | undefined;
67+
/** Removing a server attachment changes the message even when the draft looks untouched. */
68+
readonly removedExistingAttachment?: true;
6769
}
6870

6971
// Keyed by the route thread, so an edit survives navigating away and back.
@@ -265,6 +267,7 @@ export function useQueuedRunEdit(input: {
265267
editTarget: queuedEditDraftTarget(routeThreadRef, edit.runId),
266268
threadTarget: threadDraftTarget,
267269
originalText: edit.originalText,
270+
removedExistingAttachment: edit.removedExistingAttachment === true,
268271
});
269272
if (recovery === "clean") return;
270273
const title = appAtomRegistry.get(
@@ -295,6 +298,7 @@ export function useQueuedRunEdit(input: {
295298
const removeEditingAttachment = useStableCallback((attachmentId: string) => {
296299
queuedRunEdits.update(editKey, (current) => ({
297300
...current,
301+
removedExistingAttachment: true,
298302
existingAttachments: current.existingAttachments.filter(
299303
(attachment) => attachment.id !== attachmentId,
300304
),

0 commit comments

Comments
 (0)