Skip to content

fix(web): failed attachment uploads no longer block sending #20737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 1 commit into from
Oct 18, 2026
Merged

fix(web): failed attachment uploads no longer block sending #20737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,9 @@ import { useComposerHandleContext } from "../composerHandleContext";
import {
awaitAttachmentUploads,
getUploadedAttachments,
readAttachmentUpload,
releaseDraftAttachments,
retryAttachmentUpload,
startAttachmentUpload,
} from "../lib/attachmentUploadQueue";
import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
Expand Down Expand Up @@ -6521,7 +6523,11 @@ export default function ChatView(props: ChatViewProps) {
: supportsAttachmentUploads;
if (turnUsesAttachmentUploads && composerAttachmentsSnapshot.length > 0) {
for (const attachment of composerAttachmentsSnapshot) {
startAttachmentUpload({
const upload =
readAttachmentUpload(attachment.id)?.status === "failed"
? retryAttachmentUpload
: startAttachmentUpload;
upload({
environmentId,
image: attachment,
draftTarget: composerDraftTarget,
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/lib/attachmentUploadState.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe("attachmentUploadBlockReason", () => {
).toBe("Attachments still uploading");
});

it("asks the user to retry or remove failed uploads", () => {
it("leaves send enabled for failed uploads so sending can retry them", () => {
expect(
attachmentUploadBlockReason({
imageIds: ["image-1"],
Expand All @@ -46,7 +46,7 @@ describe("attachmentUploadBlockReason", () => {
"image-1": { status: "failed", environmentId, reason: "Upload failed" },
},
}),
).toBe("Retry or remove the failed attachment");
).toBeNull();
});

it("does not accept an upload from another environment", () => {
Expand Down
12 changes: 3 additions & 9 deletions apps/web/src/lib/attachmentUploadState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,16 @@ export function attachmentUploadBlockReason(input: {
readonly environmentId: EnvironmentId;
}): string | null {
let pending = 0;
let failed = 0;

for (const imageId of input.imageIds) {
const upload = input.uploadsByImageId[imageId];
if (upload?.status === "failed" && upload.environmentId === input.environmentId) {
failed += 1;
} else if (upload?.status !== "ready" || upload.environmentId !== input.environmentId) {
// Send retries failed uploads, so they must not disable it.
if (upload?.status === "failed" && upload.environmentId === input.environmentId) continue;
if (upload?.status !== "ready" || upload.environmentId !== input.environmentId) {
pending += 1;
}
}

if (failed > 0) {
return failed === 1
? "Retry or remove the failed attachment"
: "Retry or remove the failed attachments";
}
if (pending > 0) {
return pending === 1 ? "Attachment still uploading" : "Attachments still uploading";
}
Expand Down
Loading