@devries-cameron20 / t3code Mirror · read-only / commits / cebdf39984
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 14:45 UTC

fix(web): cancelled queued-message edits release their staged uploads (#29570)

Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>

Alex Southwell committed Nov 15, 2026 at 01:43 UTC cebdf399842f227c0952b31499e3ed25643cfa5c
4 files changed +130 -8
apps/web/src/components/chat/queuedMessageEdit.test.ts
+7
@@ -8,6 +8,7 @@ import {
8 type ComposerFileAttachment,
9 type ComposerImageAttachment,
10 } from "../../composerDraftStore";
11 +import { readAttachmentUpload, useAttachmentUploadStore } from "../../lib/attachmentUploadQueue";
12 import { environmentContextRecord, responseContextRecord } from "../../lib/composerContextRecords";
13 import { prepareQueuedEditAttachments, recoverQueuedMessageEdit } from "./queuedMessageEdit";
14
@@ -166,10 +167,16 @@ describe("queued message file edits", () => {
167 const store = useComposerDraftStore.getState();
168 store.setPrompt(threadTarget, "Separate draft");
169 store.addFiles(editTarget, [file]);
170 + useAttachmentUploadStore.setState({
171 + uploadsByImageId: {
172 + [file.id]: { status: "ready", environmentId, attachmentId: uploadedFile.id },
173 + },
174 + });
175 expect(recoverQueuedMessageEdit({ editTarget, threadTarget, originalText: "" })).toBe(
176 "discarded",
177 );
178 expect(store.getComposerDraft(threadTarget)?.prompt).toBe("Separate draft");
179 expect(store.getComposerDraft(editTarget)).toBeNull();
180 + expect(readAttachmentUpload(file.id)).toBeUndefined();
181 });
182 });
apps/web/src/components/chat/queuedMessageEdit.ts
+17 -1
@@ -7,6 +7,20 @@ import {
7 type ComposerImageAttachment,
8 type ComposerThreadTarget,
9 } from "../../composerDraftStore";
10 +import { releaseDraftAttachments } from "../../lib/attachmentUploadQueue";
11 +
12 +/** Staged attachments upload as soon as they are added, so a dropped edit must release them. */
13 +export function discardQueuedEditDraft(target: ComposerThreadTarget): void {
14 + const store = useComposerDraftStore.getState();
15 + const draft = store.getComposerDraft(target);
16 + if (draft) {
17 + releaseDraftAttachments([...draft.images, ...draft.files]);
18 + for (const image of draft.images) {
19 + if (image.previewUrl.startsWith("blob:")) URL.revokeObjectURL(image.previewUrl);
20 + }
21 + }
22 + store.clearComposerContent(target);
23 +}
24
25 export function recoverQueuedMessageEdit(input: {
26 readonly editTarget: ComposerThreadTarget;
@@ -28,8 +42,10 @@ export function recoverQueuedMessageEdit(input: {
42 });
43 if (recovery === "kept") {
44 store.moveComposerContent(input.editTarget, input.threadTarget);
45 + store.clearComposerContent(input.editTarget);
46 + } else {
47 + discardQueuedEditDraft(input.editTarget);
48 }
32 - store.clearComposerContent(input.editTarget);
49 return recovery;
50 }
51
apps/web/src/components/chat/useQueuedRunEdit.browser.test.tsx
+74
@@ -28,6 +28,7 @@ import { deriveComposerSendState } from "../ChatView.logic";
28 import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
29 import { AppAtomRegistryProvider, appAtomRegistry } from "../../rpc/atomRegistry";
30 import { useQueuedRunEdit } from "./useQueuedRunEdit";
31 +import { readAttachmentUpload, useAttachmentUploadStore } from "../../lib/attachmentUploadQueue";
32
33 interface RunStatus {
34 readonly id: RunId;
@@ -150,6 +151,7 @@ function view(
151
152 function setup() {
153 mocks.editQueuedRun.mockReset();
154 + useAttachmentUploadStore.setState({ uploadsByImageId: {} });
155 useComposerDraftStore.setState({ draftsByThreadKey: {}, draftThreadsByThreadKey: {} });
156 setRuns(THREAD_A, "queued");
157 setRuns(THREAD_B, "queued");
@@ -406,6 +408,78 @@ describe("useQueuedRunEdit", () => {
408 expect(promptOf(THREAD_A)).toBe("");
409 });
410
411 + it.each([
412 + { transition: "cancel", result: "Success" },
413 + { transition: "recover", result: "Failure" },
414 + { transition: "replace", result: "Success" },
415 + ] as const)(
416 + "settles saved attachments after $transition and $result",
417 + async ({ transition, result }) => {
418 + const { hook } = setup();
419 + let finishSave!: (result: { readonly _tag: "Success" | "Failure" }) => void;
420 + let started!: () => void;
421 + const saving = new Promise<{ readonly _tag: "Success" | "Failure" }>((resolve) => {
422 + finishSave = resolve;
423 + });
424 + const requested = new Promise<void>((resolve) => {
425 + started = resolve;
426 + });
427 + mocks.editQueuedRun.mockImplementation(() => {
428 + started();
429 + return saving;
430 + });
431 + await using _screen = await render(view(THREAD_A, "queued", hook));
432 + await beginChangedEdit(hook);
433 + const image = {
434 + type: "image" as const,
435 + id: "saved-image",
436 + name: "image.png",
437 + mimeType: "image/png",
438 + sizeBytes: 5,
439 + file: new File(["image"], "image.png", { type: "image/png" }),
440 + previewUrl: "blob:saved-image",
441 + };
442 + using revoke = vi.spyOn(URL, "revokeObjectURL").mockImplementation(() => {});
443 + await act(() =>
444 + useComposerDraftStore.getState().addImage(requireHook(hook).draftTarget, image),
445 + );
446 + useAttachmentUploadStore.setState({
447 + uploadsByImageId: {
448 + [image.id]: { status: "ready", environmentId: ENV, attachmentId: "saved-upload" },
449 + },
450 + });
451 + const target = requireHook(hook).draftTarget;
452 + const saved = requireHook(hook).saveEdit(
453 + { ...savedContent("changed"), images: [image] },
454 + () => {},
455 + );
456 + await act(() => requested);
457 + expect(requireHook(hook).isSaving).toBe(true);
458 + if (transition === "cancel") await act(() => requireHook(hook).cancelEdit());
459 + if (transition === "recover") await act(() => setRuns(THREAD_A, "running"));
460 + if (transition === "replace") {
461 + await beginChangedEdit(hook);
462 + await act(() =>
463 + useComposerDraftStore.getState().addImage(requireHook(hook).draftTarget, image),
464 + );
465 + }
466 + expect(readAttachmentUpload(image.id)).toBeDefined();
467 + expect(revoke).not.toHaveBeenCalled();
468 + finishSave({ _tag: result });
469 + await act(() => saved);
470 + if (transition === "cancel") {
471 + expect(readAttachmentUpload(image.id)).toBeUndefined();
472 + expect(revoke).toHaveBeenCalledWith(image.previewUrl);
473 + expect(useComposerDraftStore.getState().getComposerDraft(target)).toBeNull();
474 + } else {
475 + expect(readAttachmentUpload(image.id)).toBeDefined();
476 + expect(revoke).not.toHaveBeenCalled();
477 + const owner = transition === "recover" ? THREAD_A : target;
478 + expect(useComposerDraftStore.getState().getComposerDraft(owner)?.images).toEqual([image]);
479 + }
480 + },
481 + );
482 +
483 it("leaves a newer edit alone when a save from before navigation finishes", async () => {
484 const { hook } = setup();
485 let finishSave: (result: { readonly _tag: "Success" }) => void = () => {};
apps/web/src/components/chat/useQueuedRunEdit.ts
+32 -7
@@ -60,7 +60,11 @@ import { useAtomCommand } from "../../state/use-atom-command";
60 import { stackedThreadToast, toastManager } from "../ui/toast";
61 import type { ChatComposerHandle } from "./ChatComposer";
62 import { fileAttachmentCapabilityBlockReason } from "./composerAttachmentFiles";
63 -import { prepareQueuedEditAttachments, recoverQueuedMessageEdit } from "./queuedMessageEdit";
63 +import {
64 + discardQueuedEditDraft,
65 + prepareQueuedEditAttachments,
66 + recoverQueuedMessageEdit,
67 +} from "./queuedMessageEdit";
68 import type { EditQueuedRunRequest } from "./QueuedRunsControl";
69
70 interface EditingQueuedRun {
@@ -232,10 +236,12 @@ export function useQueuedRunEdit(input: {
236 const focusComposerSoon = () => {
237 window.requestAnimationFrame(() => composerRef.current?.focusAtEnd());
238 };
235 - const clearEditDraft = (runId: RunId) =>
236 - useComposerDraftStore
237 - .getState()
238 - .clearComposerContent(queuedRunEditDraftId(routeThreadRef, runId));
239 + const clearEditDraft = (runId: RunId) => {
240 + const target = queuedRunEditDraftId(routeThreadRef, runId);
241 + // A save in flight still sends these uploads.
242 + if (isSaving) useComposerDraftStore.getState().clearComposerContent(target);
243 + else discardQueuedEditDraft(target);
244 + };
245
246 const beginEdit = useStableCallback((request: EditQueuedRunRequest) => {
247 if (activeThreadId === null) return;
@@ -366,10 +372,29 @@ export function useQueuedRunEdit(input: {
372 });
373 setThreadError(editing.threadId, error);
374 const current = finishSave(error === null);
375 + if (!current) {
376 + // A failed save can recover into the thread draft; a newer edit can also retain resources.
377 + const drafts = Object.values(useComposerDraftStore.getState().draftsByThreadKey);
378 + const retainedIds = new Set(
379 + drafts.flatMap((draft) =>
380 + [...draft.images, ...draft.files].map((attachment) => attachment.id),
381 + ),
382 + );
383 + releaseDraftAttachments(
384 + newAttachments.filter((attachment) => !retainedIds.has(attachment.id)),
385 + );
386 + const retainedPreviews = new Set(
387 + drafts.flatMap((draft) => draft.images.map((image) => image.previewUrl)),
388 + );
389 + for (const image of content.images) {
390 + if (image.previewUrl.startsWith("blob:") && !retainedPreviews.has(image.previewUrl)) {
391 + URL.revokeObjectURL(image.previewUrl);
392 + }
393 + }
394 + return;
395 + }
396 if (error !== null) return;
397 releaseDraftAttachments(newAttachments);
371 - // The edit was cancelled or begun again while this save ran; its drafts are the newer edit's.
372 - if (!current) return;
398 promptRef.current = "";
399 clearEditDraft(editing.runId);
400 composerRef.current?.resetCursorState();