Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/web/src/components/chat/queuedMessageEdit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
type ComposerFileAttachment,
type ComposerImageAttachment,
} from "../../composerDraftStore";
import { readAttachmentUpload, useAttachmentUploadStore } from "../../lib/attachmentUploadQueue";
import { prepareQueuedEditAttachments, recoverQueuedMessageEdit } from "./queuedMessageEdit";

const environmentId = EnvironmentId.make("remote-environment");
Expand Down Expand Up @@ -128,10 +129,16 @@ describe("queued message file edits", () => {
const store = useComposerDraftStore.getState();
store.setPrompt(threadTarget, "Separate draft");
store.addFiles(editTarget, [file]);
useAttachmentUploadStore.setState({
uploadsByImageId: {
[file.id]: { status: "ready", environmentId, attachmentId: uploadedFile.id },
},
});
expect(recoverQueuedMessageEdit({ editTarget, threadTarget, originalText: "" })).toBe(
"discarded",
);
expect(store.getComposerDraft(threadTarget)?.prompt).toBe("Separate draft");
expect(store.getComposerDraft(editTarget)).toBeNull();
expect(readAttachmentUpload(file.id)).toBeUndefined();
});
});
18 changes: 17 additions & 1 deletion apps/web/src/components/chat/queuedMessageEdit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ import {
type ComposerImageAttachment,
type ComposerThreadTarget,
} from "../../composerDraftStore";
import { releaseDraftAttachments } from "../../lib/attachmentUploadQueue";

/** Staged attachments upload as soon as they are added, so a dropped edit must release them. */
export function discardQueuedEditDraft(target: ComposerThreadTarget): void {
const store = useComposerDraftStore.getState();
const draft = store.getComposerDraft(target);
if (draft) {
releaseDraftAttachments([...draft.images, ...draft.files]);
for (const image of draft.images) {
if (image.previewUrl.startsWith("blob:")) URL.revokeObjectURL(image.previewUrl);
}
}
store.clearComposerContent(target);
}

export function recoverQueuedMessageEdit(input: {
readonly editTarget: ComposerThreadTarget;
Expand All @@ -28,8 +42,10 @@ export function recoverQueuedMessageEdit(input: {
});
if (recovery === "kept") {
store.moveComposerPromptAndImages(input.editTarget, input.threadTarget);
store.clearComposerContent(input.editTarget);
} else {
discardQueuedEditDraft(input.editTarget);
}
store.clearComposerContent(input.editTarget);
return recovery;
}

Expand Down
16 changes: 11 additions & 5 deletions apps/web/src/components/chat/useQueuedRunEdit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ import { useAtomCommand } from "../../state/use-atom-command";
import { stackedThreadToast, toastManager } from "../ui/toast";
import type { ChatComposerHandle } from "./ChatComposer";
import { fileAttachmentCapabilityBlockReason } from "./composerAttachmentFiles";
import { prepareQueuedEditAttachments, recoverQueuedMessageEdit } from "./queuedMessageEdit";
import {
discardQueuedEditDraft,
prepareQueuedEditAttachments,
recoverQueuedMessageEdit,
} from "./queuedMessageEdit";
import type { EditQueuedRunRequest } from "./QueuedRunsControl";

interface EditingQueuedRun {
Expand Down Expand Up @@ -230,10 +234,12 @@ export function useQueuedRunEdit(input: {
const focusComposerSoon = () => {
window.requestAnimationFrame(() => composerRef.current?.focusAtEnd());
};
const clearEditDraft = (runId: RunId) =>
useComposerDraftStore
.getState()
.clearComposerContent(queuedEditDraftTarget(routeThreadRef, runId));
const clearEditDraft = (runId: RunId) => {
const target = queuedEditDraftTarget(routeThreadRef, runId);
// A save in flight still sends these uploads.
if (isSaving) useComposerDraftStore.getState().clearComposerContent(target);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
else discardQueuedEditDraft(target);
};

const beginEdit = useStableCallback((request: EditQueuedRunRequest) => {
if (activeThreadId === null) return;
Expand Down
Loading