diff --git a/apps/mobile/src/state/composer-attachment-uploads.ts b/apps/mobile/src/state/composer-attachment-uploads.ts index 0779d153d3f2..16ea5369ffc7 100644 --- a/apps/mobile/src/state/composer-attachment-uploads.ts +++ b/apps/mobile/src/state/composer-attachment-uploads.ts @@ -72,6 +72,17 @@ export function retryComposerAttachmentUpload(environmentId: EnvironmentId, atta uploadQueue?.retry(composerAttachmentUploadKey(environmentId, attachmentId)); } +export function markComposerAttachmentUploadFailed( + environmentId: EnvironmentId, + attachmentId: string, + reason: string, +) { + composerAttachmentUploads().markFailed( + composerAttachmentUploadKey(environmentId, attachmentId), + reason, + ); +} + type ComposerAttachmentUploadRequest = { readonly environmentId: EnvironmentId; readonly attachment: DraftComposerAttachment; diff --git a/apps/mobile/src/state/threadOutboxDelivery.permissions.test.ts b/apps/mobile/src/state/threadOutboxDelivery.permissions.test.ts index b8588e0d4008..4e6bf98977ef 100644 --- a/apps/mobile/src/state/threadOutboxDelivery.permissions.test.ts +++ b/apps/mobile/src/state/threadOutboxDelivery.permissions.test.ts @@ -67,6 +67,7 @@ vi.mock("./session", async () => { sessionHasScope(appAtomRegistry.get(sessionStateAtom(environmentId)), scope), }; }); + vi.mock("./projects", async () => { const { Atom } = await import("effect/reactivity"); return { environmentProjects: { projectsAtom: Atom.make([]) } }; @@ -109,7 +110,10 @@ vi.mock("./git", () => ({ gitEnvironment: { preparePullRequestThread: state.chec vi.mock("../lib/modelOptions", () => ({ isModelSelectionUnavailable: state.modelUnavailable })); vi.mock("../lib/uuid", () => ({ uuidv4: () => "uuid", randomHex: () => "abcd" })); vi.mock("../lib/attachmentUpload", () => ({ prepareTurnAttachments: state.prepare })); -vi.mock("./composer-attachment-uploads", () => ({ uploadComposerAttachmentShared: vi.fn() })); +vi.mock("./composer-attachment-uploads", () => ({ + uploadComposerAttachmentShared: vi.fn(), + markComposerAttachmentUploadFailed: vi.fn(), +})); vi.mock("./thread-outbox", async () => { const { createThreadOutboxManager } = await import("./thread-outbox-manager"); const { appAtomRegistry } = await import("./atom-registry"); diff --git a/apps/mobile/src/state/threadOutboxDelivery.test.ts b/apps/mobile/src/state/threadOutboxDelivery.test.ts index e77ce11e2c72..2f3572cbfb10 100644 --- a/apps/mobile/src/state/threadOutboxDelivery.test.ts +++ b/apps/mobile/src/state/threadOutboxDelivery.test.ts @@ -30,6 +30,7 @@ const harness = vi.hoisted(() => ({ typeof import("./thread-outbox-manager").createThreadOutboxManager >, removePersistedFile: vi.fn(async () => undefined), + markAttachmentUploadFailed: vi.fn(), removeOutboxMessage: vi.fn(async (_message: QueuedThreadMessage) => undefined), prepareTurnAttachments: vi.fn(), draftFile: (() => { @@ -88,7 +89,10 @@ vi.mock("../lib/uuid", () => ({ vi.mock("../lib/attachmentUpload", () => ({ prepareTurnAttachments: harness.prepareTurnAttachments, })); -vi.mock("./composer-attachment-uploads", () => ({ uploadComposerAttachmentShared: vi.fn() })); +vi.mock("./composer-attachment-uploads", () => ({ + uploadComposerAttachmentShared: vi.fn(), + markComposerAttachmentUploadFailed: harness.markAttachmentUploadFailed, +})); vi.mock("./projects", () => ({ environmentProjects: {} })); @@ -236,6 +240,7 @@ afterEach(() => { appAtomRegistry.set(threadComposerErrorsAtom, {}); harness.draftFile.setWriteError(null); harness.removePersistedFile.mockClear(); + harness.markAttachmentUploadFailed.mockClear(); harness.removeOutboxMessage.mockClear(); harness.prepareTurnAttachments.mockReset(); }); @@ -955,6 +960,44 @@ describe("thread outbox recovery rollback", () => { }), ); + it.effect( + "restores a server-rejected upload as failed and without its ID so retry uploads fresh", + () => + Effect.gen(function* () { + const base = withReusedFileUpload( + queuedMessage({ + messageId: "message-claim-rejected", + text: "two reports", + fileUri: "file:///a.pdf", + }), + "pending-kept", + ); + const rejected = { + ...base.attachments[0]!, + id: "file-rejected", + fileUri: "file:///b.pdf", + uploadedAttachmentId: "pending-rejected", + }; + const message = { ...base, attachments: [base.attachments[0]!, rejected] }; + yield* Effect.promise(() => harness.manager.enqueue(message)); + + expect(yield* restoreRejectedQueuedMessage(message, "rejected", "pending-rejected")).toBe( + "restored", + ); + + const restored = composerDrafts.getComposerDraftSnapshot( + `${message.environmentId}:${message.threadId}`, + ).attachments; + expect(restored.map((attachment) => attachment.uploadedAttachmentId)).toEqual([ + "pending-kept", + undefined, + ]); + expect(harness.markAttachmentUploadFailed.mock.calls).toEqual([ + [message.environmentId, "file-rejected", "rejected"], + ]); + }), + ); + it.effect("leaves no error when the restored text is resent before recovery finishes", () => Effect.gen(function* () { const message = queuedMessage({ messageId: "message-resent", text: "resend me" }); diff --git a/apps/mobile/src/state/threadOutboxDelivery.ts b/apps/mobile/src/state/threadOutboxDelivery.ts index d9e56da0d922..48ea7b4a431d 100644 --- a/apps/mobile/src/state/threadOutboxDelivery.ts +++ b/apps/mobile/src/state/threadOutboxDelivery.ts @@ -59,7 +59,10 @@ import { } from "./pending-thread-creation"; import { environmentProjects } from "./projects"; import { environmentServerConfigsAtom, serverEnvironment } from "./server"; -import { uploadComposerAttachmentShared } from "./composer-attachment-uploads"; +import { + markComposerAttachmentUploadFailed, + uploadComposerAttachmentShared, +} from "./composer-attachment-uploads"; import { gitEnvironment } from "./git"; import { environmentSession, readEnvironmentScope, sessionHasScope } from "./session"; import { @@ -457,12 +460,30 @@ export const recoverEditedCreationAfterDelivery = Effect.fn("ThreadOutbox.recove }, ); +/** A server claim rejected this upload; restore with local bytes so the next send uploads fresh. */ +function withoutRejectedUpload( + attachments: QueuedThreadMessage["attachments"], + rejectedAttachmentId: string | undefined, +): QueuedThreadMessage["attachments"] { + if (rejectedAttachmentId === undefined) return attachments; + return attachments.map((attachment) => { + const hasLocalBytes = + attachment.fileUri !== undefined || + (attachment.type === "image" && attachment.dataUrl !== undefined); + if (attachment.uploadedAttachmentId !== rejectedAttachmentId || !hasLocalBytes) { + return attachment; + } + const { uploadedAttachmentId: _id, uploadEnvironmentId: _environmentId, ...rest } = attachment; + return rest; + }); +} + /** * Hands an undeliverable message back to its draft with the reason. "blocked" means the draft * cannot take it yet (attachment cap); "deferred" means an editor or newer write owns it. */ export const restoreRejectedQueuedMessage = Effect.fn("ThreadOutbox.restoreRejectedMessage")( - function* (queuedMessage: QueuedThreadMessage, message: string) { + function* (queuedMessage: QueuedThreadMessage, message: string, rejectedAttachmentId?: string) { const draftKey = recoveryDraftKey(queuedMessage); const threadKey = scopedThreadKey(queuedMessage.environmentId, queuedMessage.threadId); const editing = () => isEditingQueuedMessage(queuedMessage.messageId); @@ -515,7 +536,7 @@ export const restoreRejectedQueuedMessage = Effect.fn("ThreadOutbox.restoreRejec mergeComposerDraftContent(draftKey, { text: queuedMessage.text, context: queuedMessage.context, - attachments: queuedMessage.attachments, + attachments: withoutRejectedUpload(queuedMessage.attachments, rejectedAttachmentId), }), ).pipe( Effect.ensuring( @@ -558,6 +579,18 @@ export const restoreRejectedQueuedMessage = Effect.fn("ThreadOutbox.restoreRejec if (!removed) return yield* withdraw(restoredDraft); // After queue removal, the draft owns content and must never roll back. rollback = null; + const rejectedAttachment = queuedMessage.attachments.find( + (attachment) => + rejectedAttachmentId !== undefined && + attachment.uploadedAttachmentId === rejectedAttachmentId, + ); + if (rejectedAttachment) { + markComposerAttachmentUploadFailed( + queuedMessage.environmentId, + rejectedAttachment.id, + message, + ); + } if (queuedMessage.creation) { clearThreadComposerError(threadKey, queuedMessage.messageId); recordPendingThreadCreationOutcome({ @@ -714,7 +747,11 @@ function reportCommandFailure( queuedMessage: QueuedThreadMessage, commandResult: AtomCommandResult, stage: ThreadOutboxCommandStage, -): { readonly action: "retry" | "restore"; readonly message: string } | null { +): { + readonly action: "retry" | "restore"; + readonly message: string; + readonly rejectedAttachmentId?: string; +} | null { if (!AsyncResult.isFailure(commandResult)) { return null; } @@ -733,6 +770,12 @@ function reportCommandFailure( return { action, message: errorDisplayMessage(error, m) ?? m(msg("The message could not be sent.")), + ...(typeof error === "object" && + error !== null && + "attachmentId" in error && + typeof error.attachmentId === "string" + ? { rejectedAttachmentId: error.attachmentId } + : {}), }; } @@ -813,8 +856,13 @@ export function createThreadOutboxDelivery(): { const restoreQueuedMessage = Effect.fn("ThreadOutbox.restoreQueuedMessage")(function* ( queuedMessage: QueuedThreadMessage, message: string, + rejectedAttachmentId?: string, ) { - const result = yield* restoreRejectedQueuedMessage(queuedMessage, message); + const result = yield* restoreRejectedQueuedMessage( + queuedMessage, + message, + rejectedAttachmentId, + ); if (result === "retry") return yield* retryDelivery; if (result !== "blocked" || disposed || blockedRecoveries.has(queuedMessage.messageId)) { return; @@ -1024,7 +1072,11 @@ export function createThreadOutboxDelivery(): { return yield* retryDelivery; } if (failure?.action === "restore") { - return yield* restoreQueuedMessage(persistedMessage, failure.message); + return yield* restoreQueuedMessage( + persistedMessage, + failure.message, + failure.rejectedAttachmentId, + ); } acknowledgedExistingThreadMessageIds.add(persistedMessage.messageId); const outcome = yield* completeQueuedMessageDelivery( @@ -1135,7 +1187,11 @@ export function createThreadOutboxDelivery(): { const failure = reportCommandFailure(queuedMessage, checkout, "start-turn"); if (failure?.action === "retry") return yield* retryDelivery; if (failure?.action === "restore") - return yield* restoreQueuedMessage(persistedMessage, failure.message); + return yield* restoreQueuedMessage( + persistedMessage, + failure.message, + failure.rejectedAttachmentId, + ); if (!AsyncResult.isSuccess(checkout)) return yield* retryDelivery; if (!checkout.value.worktreePath || !checkout.value.isOnPullRequestHead) { const term = changeRequestTermKind( @@ -1198,7 +1254,11 @@ export function createThreadOutboxDelivery(): { return yield* retryDelivery; } if (failure?.action === "restore") { - return yield* restoreQueuedMessage(persistedMessage, failure.message); + return yield* restoreQueuedMessage( + persistedMessage, + failure.message, + failure.rejectedAttachmentId, + ); } recordPendingThreadCreationOutcome({ kind: "delivered", message: persistedMessage }); const outcome = yield* completeQueuedMessageDelivery( diff --git a/apps/server/src/orchestration-v2/AttachmentClaims.test.ts b/apps/server/src/orchestration-v2/AttachmentClaims.test.ts index a67f7ee180db..64d00d6949c8 100644 --- a/apps/server/src/orchestration-v2/AttachmentClaims.test.ts +++ b/apps/server/src/orchestration-v2/AttachmentClaims.test.ts @@ -149,18 +149,14 @@ describe("AttachmentClaims", () => { const mismatched = { ...staged, sizeBytes: 999 }; const config = yield* ServerConfig.ServerConfig; - const result = yield* Effect.exit( + const failure = yield* Effect.flip( claimPendingAttachments({ threadId: "thread-claims-4", attachments: [good, mismatched], }), ); - - expect(result._tag).toBe("Failure"); - if (result._tag === "Failure") { - const error = result.cause; - expect(String(error)).toContain("stored size does not match"); - } + expect(failure.message).toContain("stored size does not match"); + expect(failure.attachmentId).toBe(mismatched.id); const claimedFiles = NodeFS.readdirSync(config.attachmentsDir).filter((entry) => entry.startsWith("thread-claims-4-"), ); diff --git a/apps/server/src/orchestration-v2/AttachmentClaims.ts b/apps/server/src/orchestration-v2/AttachmentClaims.ts index be48ef68b555..2bc018ea07bb 100644 --- a/apps/server/src/orchestration-v2/AttachmentClaims.ts +++ b/apps/server/src/orchestration-v2/AttachmentClaims.ts @@ -21,6 +21,7 @@ export class AttachmentClaimError extends Schema.TaggedError new AttachmentClaimError({ + attachmentId: attachment.id, message: `Attachment '${attachment.name}' cannot be sent: attachment not found.`, cause, }), @@ -113,6 +116,7 @@ export const claimPendingAttachments = Effect.fn("AttachmentClaims.claimPendingA ); if (Number(info.size) !== attachment.sizeBytes) { return yield* new AttachmentClaimError({ + attachmentId: attachment.id, message: `Attachment '${attachment.name}' cannot be sent: stored size does not match.`, }); } @@ -133,6 +137,7 @@ export const claimPendingAttachments = Effect.fn("AttachmentClaims.claimPendingA }); if (expectedPath !== claim.finalPath) { return yield* new AttachmentClaimError({ + attachmentId: attachment.id, message: `Attachment '${attachment.name}' cannot be sent: attachment type does not match the upload.`, }); } @@ -142,6 +147,7 @@ export const claimPendingAttachments = Effect.fn("AttachmentClaims.claimPendingA Effect.mapError( (cause) => new AttachmentClaimError({ + attachmentId: attachment.id, message: `Failed to claim attachment '${attachment.name}' for this thread.`, cause, }), diff --git a/apps/server/src/ws.ts b/apps/server/src/ws.ts index bbe80f28e968..e5644f7f531e 100644 --- a/apps/server/src/ws.ts +++ b/apps/server/src/ws.ts @@ -2030,6 +2030,9 @@ export const layerWsRpc = ( commandType: command.type, message: detail ?? "Failed to dispatch orchestration V2 command", ...(detail === undefined ? {} : { detail }), + ...(cause._tag === "AttachmentClaimError" && cause.attachmentId !== undefined + ? { attachmentId: cause.attachmentId } + : {}), cause, }); }), @@ -2253,6 +2256,9 @@ export const layerWsRpc = ( commandId: input.commandId, projectId: input.projectId, message: cause.message, + ...(cause.attachmentId !== undefined + ? { attachmentId: cause.attachmentId } + : {}), cause, }), ThreadLaunchError: (cause) => diff --git a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx index 82819be4f53f..1bde741ed941 100644 --- a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx +++ b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx @@ -212,6 +212,7 @@ export function ComposerAttachmentMediaRow({ {!ready || ready.previewUrl ? ( @@ -372,7 +374,11 @@ export function ComposerAttachmentMediaRow({ return (