From e8e182f85f378b10f99b88fe68b7ad8677282477 Mon Sep 17 00:00:00 2001
From: Adamulek123 <adam.bogucki2018@gmail.com>
Date: Sat, 31 Oct 2026 17:41:36 +0100
Subject: [PATCH 1/8] fix(web): identify failed composer attachments

---
 .../orchestration-v2/AttachmentClaims.test.ts | 10 ++-----
 .../src/orchestration-v2/AttachmentClaims.ts  |  6 ++++
 apps/server/src/ws.ts                         |  6 ++++
 .../chat/ComposerAttachmentStrip.tsx          |  6 ++++
 apps/web/src/components/chat/chatViewSend.ts  |  2 ++
 .../src/components/chat/useComposerSend.ts    |  6 ++++
 .../components/chat/useMultipleModelSend.ts   | 11 ++++++-
 .../composerContextPresentation.tsx           |  2 ++
 .../web/src/lib/attachmentUploadQueue.test.ts | 24 +++++++++++++++
 apps/web/src/lib/attachmentUploadQueue.ts     | 30 +++++++++++++++++++
 packages/contracts/src/orchestrationV2.ts     |  2 ++
 11 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/apps/server/src/orchestration-v2/AttachmentClaims.test.ts b/apps/server/src/orchestration-v2/AttachmentClaims.test.ts
index a67f7ee180db7..64d00d6949c84 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 be48ef68b5559..2bc018ea07bbe 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<AttachmentClaimErro
   "AttachmentClaimError",
   {
     message: Schema.String,
+    attachmentId: Schema.optional(Schema.String),
     cause: Schema.optional(Schema.Defect()),
   },
 ) {}
@@ -99,6 +100,7 @@ export const claimPendingAttachments = Effect.fn("AttachmentClaims.claimPendingA
           });
           if (!claim.ok) {
             return yield* new AttachmentClaimError({
+              attachmentId: attachment.id,
               message: `Attachment '${attachment.name}' cannot be sent: ${claim.reason}.`,
             });
           }
@@ -106,6 +108,7 @@ export const claimPendingAttachments = Effect.fn("AttachmentClaims.claimPendingA
             Effect.mapError(
               (cause) =>
                 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 4781fcf78dde6..74c3e1309accd 100644
--- a/apps/server/src/ws.ts
+++ b/apps/server/src/ws.ts
@@ -1911,6 +1911,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,
                     });
                   }),
@@ -2101,6 +2104,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 e3560312925e5..fddef5d3db2fa 100644
--- a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
+++ b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
@@ -230,6 +230,12 @@ export function ComposerAttachmentMediaRow({
                   {image.name}
                 </div>
               )}
+              {upload?.status === "failed" && (
+                <span
+                  aria-hidden="true"
+                  className="pointer-events-none absolute inset-0 rounded-lg border-2 border-destructive"
+                />
+              )}
               {source?.kind === "snap-shot" ? (
                 <SnapShotAttachmentDetails
                   source={source}
diff --git a/apps/web/src/components/chat/chatViewSend.ts b/apps/web/src/components/chat/chatViewSend.ts
index 81a00823a98be..c6c0a84434923 100644
--- a/apps/web/src/components/chat/chatViewSend.ts
+++ b/apps/web/src/components/chat/chatViewSend.ts
@@ -79,6 +79,7 @@ export async function startFanoutThread(input: {
   readonly uncertainSubmissions: Map<string, ThreadId>;
   readonly start: (threadId: ThreadId) => Promise<AtomCommandResult<unknown, unknown>>;
   readonly openThread: (threadId: ThreadId) => void;
+  readonly onFailure?: (error: unknown) => void;
 }): Promise<boolean> {
   const { retryKey, uncertainSubmissions } = input;
   const uncertainThreadId = uncertainSubmissions.get(retryKey);
@@ -101,6 +102,7 @@ export async function startFanoutThread(input: {
     }
     return true;
   } catch (error) {
+    input.onFailure?.(error);
     if (requestMayHaveStarted && !uncertainSubmissions.has(retryKey)) {
       uncertainSubmissions.set(retryKey, targetThreadId);
     }
diff --git a/apps/web/src/components/chat/useComposerSend.ts b/apps/web/src/components/chat/useComposerSend.ts
index b22c313f6932b..4e3916b3090c4 100644
--- a/apps/web/src/components/chat/useComposerSend.ts
+++ b/apps/web/src/components/chat/useComposerSend.ts
@@ -103,6 +103,7 @@ import { type ComposerDispatchMode } from "@t3tools/client-runtime/state/compose
 import {
   awaitAttachmentUploads,
   getUploadedAttachments,
+  markAttachmentClaimFailure,
   readAttachmentUpload,
   releaseDraftAttachments,
   retryAttachmentUpload,
@@ -1470,6 +1471,11 @@ export function useComposerSend(input: ComposerSendInput) {
       }
       if (!isAtomCommandInterrupted(failure)) {
         const error = squashAtomCommandFailure(failure);
+        markAttachmentClaimFailure({
+          environmentId,
+          attachments: composerAttachmentsSnapshot,
+          error,
+        });
         setThreadError(
           threadIdForSend,
           error instanceof Error ? error.message : "Failed to send message.",
diff --git a/apps/web/src/components/chat/useMultipleModelSend.ts b/apps/web/src/components/chat/useMultipleModelSend.ts
index 8a2a1dd409643..30e4198716633 100644
--- a/apps/web/src/components/chat/useMultipleModelSend.ts
+++ b/apps/web/src/components/chat/useMultipleModelSend.ts
@@ -18,7 +18,10 @@ import {
   useComposerDraftStore,
 } from "../../composerDraftStore";
 import type { ComposerHandleRef } from "../../composerHandleContext";
-import { releaseDraftAttachments } from "../../lib/attachmentUploadQueue";
+import {
+  markAttachmentClaimFailure,
+  releaseDraftAttachments,
+} from "../../lib/attachmentUploadQueue";
 import type { buildMessageContext } from "../../lib/composerContextRecords";
 import { appAtomRegistry } from "../../rpc/atomRegistry";
 import { threadEnvironment } from "../../state/threads";
@@ -157,6 +160,12 @@ export function useMultipleModelSend(input: MultipleModelSendInput) {
             ]),
             model: target.selection.model,
             uncertainSubmissions: uncertainSubmissionsRef.current,
+            onFailure: (error) =>
+              markAttachmentClaimFailure({
+                environmentId,
+                attachments: attachmentsSnapshot,
+                error,
+              }),
             start: (targetThreadId) => {
               return startThreadTurn({
                 environmentId,
diff --git a/apps/web/src/components/composerContextPresentation.tsx b/apps/web/src/components/composerContextPresentation.tsx
index f8ac8222177f0..2505582aa1bba 100644
--- a/apps/web/src/components/composerContextPresentation.tsx
+++ b/apps/web/src/components/composerContextPresentation.tsx
@@ -210,6 +210,8 @@ function ImageContextChip(props: {
             previewUrl={props.record.previewUrl}
             size={formatAttachmentSize(props.record.sizeBytes)}
             suffix={uploadStatusSuffix(props.upload)}
+            {...(props.upload?.status === "failed" ? { state: "invalid" as const } : {})}
+            aria-label={`Image attachment, ${props.record.name}, ${formatAttachmentSize(props.record.sizeBytes)}${props.upload?.status === "failed" ? ", upload failed" : ""}`}
             onClick={() => actions.expandImage(props.record.id)}
           />
         }
diff --git a/apps/web/src/lib/attachmentUploadQueue.test.ts b/apps/web/src/lib/attachmentUploadQueue.test.ts
index c18f9e716378c..0418201166a60 100644
--- a/apps/web/src/lib/attachmentUploadQueue.test.ts
+++ b/apps/web/src/lib/attachmentUploadQueue.test.ts
@@ -56,6 +56,7 @@ vi.mock("../state/session", () => ({
 import {
   awaitAttachmentUploads,
   getUploadedAttachments,
+  markAttachmentClaimFailure,
   readAttachmentUpload,
   releaseAttachmentUpload,
   releaseDraftAttachment,
@@ -210,6 +211,29 @@ describe("attachmentUploadQueue", () => {
     vi.unstubAllGlobals();
   });
 
+  it("marks only the matching upload when same-named images fail server validation", () => {
+    const images = [makeImage("first"), makeImage("second")].map((image) => ({
+      ...image,
+      name: "image.png",
+    }));
+    useAttachmentUploadStore.setState({
+      uploadsByImageId: {
+        first: { status: "ready", environmentId: firstEnvironment, attachmentId: "pending-1" },
+        second: { status: "ready", environmentId: firstEnvironment, attachmentId: "pending-2" },
+      },
+    });
+    markAttachmentClaimFailure({
+      environmentId: firstEnvironment,
+      attachments: images,
+      error: { attachmentId: "pending-2" },
+    });
+    expect(readAttachmentUpload("first")?.status).toBe("ready");
+    expect(readAttachmentUpload("second")).toMatchObject({
+      status: "failed",
+      attachmentId: "pending-2",
+    });
+  });
+
   it("keeps an attachment local until its own environment grants write access", async () => {
     const image = makeImage("permission-gain");
     mocks.readEnvironmentScope.mockImplementation(
diff --git a/apps/web/src/lib/attachmentUploadQueue.ts b/apps/web/src/lib/attachmentUploadQueue.ts
index 6477028fe6bad..602951328c582 100644
--- a/apps/web/src/lib/attachmentUploadQueue.ts
+++ b/apps/web/src/lib/attachmentUploadQueue.ts
@@ -84,6 +84,36 @@ export function readAttachmentUpload(imageId: string): AttachmentUploadState | u
   return useAttachmentUploadStore.getState().uploadsByImageId[imageId];
 }
 
+/** Associate a server claim failure with the local draft attachment, regardless of its name. */
+export function markAttachmentClaimFailure(input: {
+  readonly environmentId: EnvironmentId;
+  readonly attachments: ReadonlyArray<ComposerImageAttachment | ComposerFileAttachment>;
+  readonly error: unknown;
+}): void {
+  if (
+    typeof input.error !== "object" ||
+    input.error === null ||
+    !("attachmentId" in input.error) ||
+    typeof input.error.attachmentId !== "string"
+  )
+    return;
+  for (const attachment of input.attachments) {
+    const upload = readAttachmentUpload(attachment.id);
+    if (
+      upload?.status !== "ready" ||
+      upload.environmentId !== input.environmentId ||
+      upload.attachmentId !== input.error.attachmentId
+    )
+      continue;
+    setUploadState(attachment.id, {
+      status: "failed",
+      environmentId: input.environmentId,
+      attachmentId: upload.attachmentId,
+      reason: input.error instanceof Error ? input.error.message : "Attachment could not be sent.",
+    });
+  }
+}
+
 function resolveCurrentFileDraftTarget(job: DraftFileOwner): ComposerThreadTarget | undefined {
   if (job.draftTarget === undefined || job.image.type !== "file") {
     return undefined;
diff --git a/packages/contracts/src/orchestrationV2.ts b/packages/contracts/src/orchestrationV2.ts
index 1c80128f8bbc5..4af7bd46e5c45 100644
--- a/packages/contracts/src/orchestrationV2.ts
+++ b/packages/contracts/src/orchestrationV2.ts
@@ -3888,6 +3888,7 @@ export class OrchestrationV2DispatchCommandError extends Schema.TaggedError<Orch
     commandType: Schema.String,
     message: Schema.String,
     detail: Schema.optional(Schema.String),
+    attachmentId: Schema.optional(Schema.String),
     cause: Schema.optional(Schema.Defect()),
   },
 ) {}
@@ -3915,6 +3916,7 @@ export class OrchestrationV2ThreadLaunchError extends Schema.TaggedError<Orchest
     commandId: CommandId,
     projectId: ProjectId,
     message: Schema.String,
+    attachmentId: Schema.optional(Schema.String),
     cause: Schema.optional(Schema.Defect()),
   },
 ) {}

From 76275bdb009257ec4d150f0476e68efa80b88e3c Mon Sep 17 00:00:00 2001
From: Adamulek123 <adam.bogucki2018@gmail.com>
Date: Sat, 31 Oct 2026 17:47:59 +0100
Subject: [PATCH 2/8] fix(web): reveal failed attachments in composer

---
 apps/web/src/components/chat/ChatComposer.tsx | 20 ++++++++++++++
 .../chat/ComposerAttachmentStrip.tsx          |  1 +
 .../composerContextPresentation.tsx           |  3 +++
 apps/web/src/lib/attachmentUploadQueue.ts     |  4 ++-
 .../contracts/src/orchestrationV2.test.ts     | 26 ++++++++++++++++++-
 5 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index c423773fb6fc6..23ea6273c4911 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -1034,6 +1034,26 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   const pasteAsTextShortcutUntilRef = useRef(0);
   const composerFormRef = useRef<HTMLFormElement>(null);
   const composerSurfaceRef = useRef<HTMLDivElement>(null);
+  const previousFailedAttachmentIds = useRef(new Set<string>());
+  // Reveal the first newly failed attachment without moving focus away from the draft.
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- scrolls the mounted attachment element when an upload fails
+  useLayoutEffect(() => {
+    const failed = new Set(
+      [...composerImages, ...composerFiles]
+        .filter((attachment) => uploadsByImageId[attachment.id]?.status === "failed")
+        .map((attachment) => attachment.id),
+    );
+    const newlyFailed = new Set(
+      [...failed].filter((id) => !previousFailedAttachmentIds.current.has(id)),
+    );
+    previousFailedAttachmentIds.current = failed;
+    if (newlyFailed.size === 0) return;
+    const target = Array.from(
+      composerSurfaceRef.current?.querySelectorAll<HTMLElement>("[data-failed-attachment-id]") ??
+        [],
+    ).find((element) => newlyFailed.has(element.dataset.failedAttachmentId ?? ""));
+    target?.scrollIntoView({ block: "nearest", inline: "nearest" });
+  }, [composerImages, composerFiles, uploadsByImageId]);
   const providerInputRejectedRef = useRef(false);
   const composerSelectLockRef = useRef(false);
   const composerMenuOpenRef = useRef(false);
diff --git a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
index fddef5d3db2fa..4b5c8dfc083e3 100644
--- a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
+++ b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
@@ -177,6 +177,7 @@ export function ComposerAttachmentMediaRow({
           return (
             <SnapShotAttachmentFrame
               key={image.id}
+              data-failed-attachment-id={upload?.status === "failed" ? image.id : undefined}
               data-chat-composer-expanded-image="true"
               aria-hidden={snapShotAnimationPending || undefined}
               inert={snapShotAnimationPending || undefined}
diff --git a/apps/web/src/components/composerContextPresentation.tsx b/apps/web/src/components/composerContextPresentation.tsx
index 2505582aa1bba..1066f43a32c16 100644
--- a/apps/web/src/components/composerContextPresentation.tsx
+++ b/apps/web/src/components/composerContextPresentation.tsx
@@ -211,6 +211,9 @@ function ImageContextChip(props: {
             size={formatAttachmentSize(props.record.sizeBytes)}
             suffix={uploadStatusSuffix(props.upload)}
             {...(props.upload?.status === "failed" ? { state: "invalid" as const } : {})}
+            data-failed-attachment-id={
+              props.upload?.status === "failed" ? props.record.id : undefined
+            }
             aria-label={`Image attachment, ${props.record.name}, ${formatAttachmentSize(props.record.sizeBytes)}${props.upload?.status === "failed" ? ", upload failed" : ""}`}
             onClick={() => actions.expandImage(props.record.id)}
           />
diff --git a/apps/web/src/lib/attachmentUploadQueue.ts b/apps/web/src/lib/attachmentUploadQueue.ts
index 602951328c582..b10daec3c8257 100644
--- a/apps/web/src/lib/attachmentUploadQueue.ts
+++ b/apps/web/src/lib/attachmentUploadQueue.ts
@@ -108,7 +108,9 @@ export function markAttachmentClaimFailure(input: {
     setUploadState(attachment.id, {
       status: "failed",
       environmentId: input.environmentId,
-      attachmentId: upload.attachmentId,
+      ...(attachment.type !== "file" || attachment.uploadedAttachmentId !== upload.attachmentId
+        ? { attachmentId: upload.attachmentId }
+        : {}),
       reason: input.error instanceof Error ? input.error.message : "Attachment could not be sent.",
     });
   }
diff --git a/packages/contracts/src/orchestrationV2.test.ts b/packages/contracts/src/orchestrationV2.test.ts
index 3782307171e87..ff08938e97fc2 100644
--- a/packages/contracts/src/orchestrationV2.test.ts
+++ b/packages/contracts/src/orchestrationV2.test.ts
@@ -2,9 +2,11 @@ import { describe, expect, it } from "@effect/vitest";
 import * as DateTime from "effect/DateTime";
 import * as Schema from "effect/Schema";
 
-import { NodeId, RunAttemptId, TrimmedNonEmptyString } from "./index.ts";
+import { CommandId, NodeId, ProjectId, RunAttemptId, TrimmedNonEmptyString } from "./index.ts";
 import {
   latestProviderTurnForAttempt,
+  OrchestrationV2DispatchCommandError,
+  OrchestrationV2ThreadLaunchError,
   OrchestrationV2ProviderCapabilities,
   OrchestrationV2ProviderThread,
   OrchestrationV2ProviderThreadJson,
@@ -35,6 +37,28 @@ const decodeOrchestrationV2ProviderCapabilities = Schema.decodeUnknownSync(
 );
 
 describe("orchestration V2 contracts", () => {
+  it("preserves the failed attachment ID in dispatch and launch errors", () => {
+    const dispatch = Schema.toCodecJson(OrchestrationV2DispatchCommandError);
+    const launch = Schema.toCodecJson(OrchestrationV2ThreadLaunchError);
+    const dispatchError = new OrchestrationV2DispatchCommandError({
+      commandId: CommandId.make("command"),
+      commandType: "message.dispatch",
+      message: "failed",
+      attachmentId: "pending-1",
+    });
+    const launchError = new OrchestrationV2ThreadLaunchError({
+      commandId: CommandId.make("command"),
+      projectId: ProjectId.make("project"),
+      message: "failed",
+      attachmentId: "pending-2",
+    });
+    expect(
+      Schema.decodeUnknownSync(dispatch)(Schema.encodeSync(dispatch)(dispatchError)).attachmentId,
+    ).toBe("pending-1");
+    expect(
+      Schema.decodeUnknownSync(launch)(Schema.encodeSync(launch)(launchError)).attachmentId,
+    ).toBe("pending-2");
+  });
   it("decodes thread event types from a newer server as skippable items", () => {
     const decodeWireItems = Schema.decodeUnknownSync(
       Schema.toCodecJson(Schema.Array(OrchestrationV2RpcSchemas.subscribeThread.output)),

From ac52ff34180fd77b3422d2a3bffa55702fe9c8e8 Mon Sep 17 00:00:00 2001
From: Adamulek123 <adam.bogucki2018@gmail.com>
Date: Sun, 8 Nov 2026 12:00:59 +0100
Subject: [PATCH 3/8] fix(web): reveal failed composer attachments with a brief
 glow

---
 apps/web/src/components/chat/ChatComposer.tsx |  8 +-
 .../chat/ComposerAttachmentStrip.tsx          |  4 +-
 apps/web/src/index.css                        | 78 +++++++++++++++++++
 .../contracts/src/orchestrationV2.test.ts     |  8 +-
 4 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index 23ea6273c4911..64f7dc0141f69 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -1052,7 +1052,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       composerSurfaceRef.current?.querySelectorAll<HTMLElement>("[data-failed-attachment-id]") ??
         [],
     ).find((element) => newlyFailed.has(element.dataset.failedAttachmentId ?? ""));
-    target?.scrollIntoView({ block: "nearest", inline: "nearest" });
+    target?.scrollIntoView({
+      block: "nearest",
+      inline: "nearest",
+      behavior: window.matchMedia("(prefers-reduced-motion: reduce)").matches
+        ? "instant"
+        : "smooth",
+    });
   }, [composerImages, composerFiles, uploadsByImageId]);
   const providerInputRejectedRef = useRef(false);
   const composerSelectLockRef = useRef(false);
diff --git a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
index 4b5c8dfc083e3..51a21efafab4d 100644
--- a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
+++ b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
@@ -156,7 +156,7 @@ export function ComposerAttachmentMediaRow({
         "mb-3 flex max-w-full gap-2",
         pendingSnapShotIds.length > 0 ||
           expandedImages.some((image) => image.source?.kind === "snap-shot")
-          ? "snap-x snap-proximity overflow-x-auto overscroll-x-contain pb-1 scrollbar-thumb-foreground/18 scrollbar-track-transparent [scrollbar-width:thin] [&::-webkit-scrollbar]:h-2.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:border-3 [&::-webkit-scrollbar-thumb]:border-transparent [&::-webkit-scrollbar-thumb]:bg-foreground/18 [&::-webkit-scrollbar-thumb]:bg-clip-content [&::-webkit-scrollbar-thumb:hover]:bg-foreground/28 [&::-webkit-scrollbar-track]:mx-1 [&::-webkit-scrollbar-track]:bg-transparent"
+          ? "-mx-3 snap-x snap-proximity overflow-x-auto overscroll-x-contain p-3 scrollbar-thumb-foreground/18 scrollbar-track-transparent [scrollbar-width:thin] [&::-webkit-scrollbar]:h-2.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:border-3 [&::-webkit-scrollbar-thumb]:border-transparent [&::-webkit-scrollbar-thumb]:bg-foreground/18 [&::-webkit-scrollbar-thumb]:bg-clip-content [&::-webkit-scrollbar-thumb:hover]:bg-foreground/28 [&::-webkit-scrollbar-track]:mx-1 [&::-webkit-scrollbar-track]:bg-transparent"
           : "flex-wrap",
       )}
     >
@@ -234,7 +234,7 @@ export function ComposerAttachmentMediaRow({
               {upload?.status === "failed" && (
                 <span
                   aria-hidden="true"
-                  className="pointer-events-none absolute inset-0 rounded-lg border-2 border-destructive"
+                  className="composer-attachment-failure-highlight pointer-events-none absolute inset-0 rounded-[inherit] border border-destructive/60"
                 />
               )}
               {source?.kind === "snap-shot" ? (
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index e186516791252..4a859c202d5b5 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -659,6 +659,84 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
   margin-left: var(--live-activity-focus-width);
 }
 
+/* Match the citation reveal's two pulses, hold, and fade without a running animation. */
+@keyframes composer-attachment-failure-reveal {
+  0%,
+  21.667%,
+  100% {
+    background-color: transparent;
+  }
+  10.833%,
+  32.5%,
+  85% {
+    background-color: var(--attachment-failure-tint);
+  }
+}
+
+[data-failed-attachment-id][data-slot="context-chip"],
+.composer-attachment-failure-highlight {
+  --attachment-failure-tint: color-mix(in oklab, var(--primary) 45%, transparent);
+  animation: composer-attachment-failure-reveal 3s ease-in-out;
+}
+
+.composer-attachment-failure-highlight {
+  --attachment-failure-tint: color-mix(in oklab, var(--destructive) 12%, transparent);
+}
+
+@keyframes composer-attachment-failure-glow {
+  0%,
+  21.667% {
+    box-shadow: 0 0 0 0 transparent;
+  }
+  10.833%,
+  32.5% {
+    box-shadow:
+      0 0 0 3px color-mix(in oklab, var(--destructive) 12%, transparent),
+      0 0 14px 3px color-mix(in oklab, var(--destructive) 24%, transparent);
+  }
+  85% {
+    box-shadow:
+      0 0 0 2px color-mix(in oklab, var(--destructive) 8%, transparent),
+      0 0 10px 1px color-mix(in oklab, var(--destructive) 18%, transparent);
+  }
+  100% {
+    box-shadow: 0 0 0 0 transparent;
+  }
+}
+
+[data-chat-composer-expanded-image][data-failed-attachment-id] {
+  animation: composer-attachment-failure-glow 3s ease-in-out;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  [data-chat-composer-expanded-image][data-failed-attachment-id] {
+    animation: none;
+  }
+
+  [data-failed-attachment-id][data-slot="context-chip"],
+  .composer-attachment-failure-highlight {
+    animation-name: composer-attachment-failure-reveal-reduced;
+  }
+}
+
+@keyframes composer-attachment-failure-reveal-reduced {
+  0%,
+  85% {
+    background-color: var(--attachment-failure-tint);
+  }
+  100% {
+    background-color: transparent;
+  }
+}
+
+@media (forced-colors: active) {
+  [data-failed-attachment-id] {
+    animation: none;
+    outline: 1px solid Mark;
+    outline-offset: -1px;
+  }
+}
+
 @property --assistant-citation-highlight-opacity {
   syntax: "<number>";
   inherits: true;
diff --git a/packages/contracts/src/orchestrationV2.test.ts b/packages/contracts/src/orchestrationV2.test.ts
index ff08938e97fc2..eb3b5bb2f9165 100644
--- a/packages/contracts/src/orchestrationV2.test.ts
+++ b/packages/contracts/src/orchestrationV2.test.ts
@@ -53,11 +53,11 @@ describe("orchestration V2 contracts", () => {
       attachmentId: "pending-2",
     });
     expect(
-      Schema.decodeUnknownSync(dispatch)(Schema.encodeSync(dispatch)(dispatchError)).attachmentId,
+      Schema.decodeSync(dispatch)(Schema.encodeSync(dispatch)(dispatchError)).attachmentId,
     ).toBe("pending-1");
-    expect(
-      Schema.decodeUnknownSync(launch)(Schema.encodeSync(launch)(launchError)).attachmentId,
-    ).toBe("pending-2");
+    expect(Schema.decodeSync(launch)(Schema.encodeSync(launch)(launchError)).attachmentId).toBe(
+      "pending-2",
+    );
   });
   it("decodes thread event types from a newer server as skippable items", () => {
     const decodeWireItems = Schema.decodeUnknownSync(

From 2bee003ccd9a31ae955da586854a02dbeee0477a Mon Sep 17 00:00:00 2001
From: Adamulek123 <adam.bogucki2018@gmail.com>
Date: Sun, 8 Nov 2026 12:19:35 +0100
Subject: [PATCH 4/8] fix(web): reveal failed file and video attachments

---
 apps/web/src/components/chat/ComposerAttachmentStrip.tsx | 2 ++
 apps/web/src/components/composerContextPresentation.tsx  | 1 +
 apps/web/src/components/contextChipParts.tsx             | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
index 51a21efafab4d..49f15d65934b1 100644
--- a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
+++ b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
@@ -341,6 +341,7 @@ export function ComposerAttachmentMediaRow({
           <div
             key={file.id}
             className="relative h-16 w-16 shrink-0 snap-start overflow-hidden rounded-lg border border-border/80 bg-black"
+            data-failed-attachment-id={upload?.status === "failed" ? file.id : undefined}
           >
             <button
               type="button"
@@ -449,6 +450,7 @@ export function ComposerAttachmentFileList({
           <div
             key={file.id}
             className="flex min-w-0 items-center gap-2 py-1 text-sm text-foreground"
+            data-failed-attachment-id={upload?.status === "failed" ? file.id : undefined}
           >
             <PierreEntryIcon pathValue={file.name} kind="file" theme={resolvedTheme} />
             <button
diff --git a/apps/web/src/components/composerContextPresentation.tsx b/apps/web/src/components/composerContextPresentation.tsx
index 1066f43a32c16..ff632b1286946 100644
--- a/apps/web/src/components/composerContextPresentation.tsx
+++ b/apps/web/src/components/composerContextPresentation.tsx
@@ -252,6 +252,7 @@ function FileContextChip(props: {
       isVideo={isVideo}
       theme={resolvedTheme}
       error={props.upload?.status === "failed"}
+      failedAttachmentId={props.upload?.status === "failed" ? props.record.id : undefined}
       unresolved={needsReattach}
       suffix={suffix}
       accessibleLabel={`${isVideo && !needsReattach ? "Preview video" : "File"} attachment, ${props.record.name}, ${size}`}
diff --git a/apps/web/src/components/contextChipParts.tsx b/apps/web/src/components/contextChipParts.tsx
index a1112d037d908..333efcf3f364b 100644
--- a/apps/web/src/components/contextChipParts.tsx
+++ b/apps/web/src/components/contextChipParts.tsx
@@ -188,6 +188,7 @@ export function FileChip(props: {
   copyMarkdown?: string;
   disabled?: boolean;
   error?: boolean;
+  failedAttachmentId?: string | undefined;
   unresolved?: boolean;
   onOpen?: (() => void) | undefined;
   svgPreview?:
@@ -211,6 +212,7 @@ export function FileChip(props: {
     "aria-label": [props.accessibleLabel, props.suffix].filter(Boolean).join(", "),
     "data-markdown-copy": props.copyMarkdown,
     "data-context-unresolved": props.unresolved ? "true" : undefined,
+    "data-failed-attachment-id": props.failedAttachmentId,
   } as const;
   return (
     <Tooltip>
@@ -286,6 +288,7 @@ function SvgFileChip(props: ComponentProps<typeof FileChip>) {
             onClick={props.onOpen}
             onPreviewError={() => setFailedPreviewUrl(url)}
             data-markdown-copy={props.copyMarkdown}
+            data-failed-attachment-id={props.failedAttachmentId}
             aria-label={props.accessibleLabel}
             {...(props.error ? { state: "invalid" as const } : {})}
           />

From 4ec7eda6e0ce34c7b632e3b9a79ad15e349ac238 Mon Sep 17 00:00:00 2001
From: Adamulek123 <adam.bogucki2018@gmail.com>
Date: Sun, 8 Nov 2026 22:05:15 +0100
Subject: [PATCH 5/8] fix(web): show failure treatment on file and video
 attachments

---
 .../src/components/chat/ComposerAttachmentStrip.tsx   |  4 ++--
 apps/web/src/components/contextChipParts.tsx          |  2 +-
 apps/web/src/index.css                                | 11 +++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
index 49f15d65934b1..c088117addee9 100644
--- a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
+++ b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
@@ -340,7 +340,7 @@ export function ComposerAttachmentMediaRow({
         return (
           <div
             key={file.id}
-            className="relative h-16 w-16 shrink-0 snap-start overflow-hidden rounded-lg border border-border/80 bg-black"
+            className="composer-attachment-failure-frame relative h-16 w-16 shrink-0 snap-start overflow-hidden rounded-lg border border-border/80 bg-black"
             data-failed-attachment-id={upload?.status === "failed" ? file.id : undefined}
           >
             <button
@@ -449,7 +449,7 @@ export function ComposerAttachmentFileList({
         return (
           <div
             key={file.id}
-            className="flex min-w-0 items-center gap-2 py-1 text-sm text-foreground"
+            className="composer-attachment-failure-frame flex min-w-0 items-center gap-2 rounded-md py-1 text-sm text-foreground"
             data-failed-attachment-id={upload?.status === "failed" ? file.id : undefined}
           >
             <PierreEntryIcon pathValue={file.name} kind="file" theme={resolvedTheme} />
diff --git a/apps/web/src/components/contextChipParts.tsx b/apps/web/src/components/contextChipParts.tsx
index 333efcf3f364b..8fb4e22e1574b 100644
--- a/apps/web/src/components/contextChipParts.tsx
+++ b/apps/web/src/components/contextChipParts.tsx
@@ -289,7 +289,7 @@ function SvgFileChip(props: ComponentProps<typeof FileChip>) {
             onPreviewError={() => setFailedPreviewUrl(url)}
             data-markdown-copy={props.copyMarkdown}
             data-failed-attachment-id={props.failedAttachmentId}
-            aria-label={props.accessibleLabel}
+            aria-label={[props.accessibleLabel, props.suffix].filter(Boolean).join(", ")}
             {...(props.error ? { state: "invalid" as const } : {})}
           />
         }
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 4a859c202d5b5..5bdc63d7f30bb 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -704,12 +704,19 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
   }
 }
 
-[data-chat-composer-expanded-image][data-failed-attachment-id] {
+.composer-attachment-failure-frame[data-failed-attachment-id] {
+  outline: 1px solid var(--destructive);
+  outline-offset: -1px;
+}
+
+[data-chat-composer-expanded-image][data-failed-attachment-id],
+.composer-attachment-failure-frame[data-failed-attachment-id] {
   animation: composer-attachment-failure-glow 3s ease-in-out;
 }
 
 @media (prefers-reduced-motion: reduce) {
-  [data-chat-composer-expanded-image][data-failed-attachment-id] {
+  [data-chat-composer-expanded-image][data-failed-attachment-id],
+  .composer-attachment-failure-frame[data-failed-attachment-id] {
     animation: none;
   }
 

From 85db113a91ac1836da65580aefffce57d06c13c6 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Sun, 15 Nov 2026 06:41:12 +0000
Subject: [PATCH 6/8] fix(web): keep the failed-attachment fix, drop new visual
 treatment

Revert the reveal animations, glow, outlines, scroll-into-view, strip
padding and label changes so the PR only routes the server's failed
attachment ID to the matching composer upload, which then shows the
existing failed state. Drop the contract round-trip test the schema
types already guarantee.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 apps/web/src/components/chat/ChatComposer.tsx | 26 ------
 .../chat/ComposerAttachmentStrip.tsx          | 15 +---
 .../composerContextPresentation.tsx           |  6 --
 apps/web/src/components/contextChipParts.tsx  |  5 +-
 apps/web/src/index.css                        | 85 -------------------
 .../contracts/src/orchestrationV2.test.ts     | 26 +-----
 6 files changed, 5 insertions(+), 158 deletions(-)

diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index e0f87229e71ae..199758cab4e20 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -1026,32 +1026,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   const pasteAsTextShortcutUntilRef = useRef(0);
   const composerFormRef = useRef<HTMLFormElement>(null);
   const composerSurfaceRef = useRef<HTMLDivElement>(null);
-  const previousFailedAttachmentIds = useRef(new Set<string>());
-  // Reveal the first newly failed attachment without moving focus away from the draft.
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- scrolls the mounted attachment element when an upload fails
-  useLayoutEffect(() => {
-    const failed = new Set(
-      [...composerImages, ...composerFiles]
-        .filter((attachment) => uploadsByImageId[attachment.id]?.status === "failed")
-        .map((attachment) => attachment.id),
-    );
-    const newlyFailed = new Set(
-      [...failed].filter((id) => !previousFailedAttachmentIds.current.has(id)),
-    );
-    previousFailedAttachmentIds.current = failed;
-    if (newlyFailed.size === 0) return;
-    const target = Array.from(
-      composerSurfaceRef.current?.querySelectorAll<HTMLElement>("[data-failed-attachment-id]") ??
-        [],
-    ).find((element) => newlyFailed.has(element.dataset.failedAttachmentId ?? ""));
-    target?.scrollIntoView({
-      block: "nearest",
-      inline: "nearest",
-      behavior: window.matchMedia("(prefers-reduced-motion: reduce)").matches
-        ? "instant"
-        : "smooth",
-    });
-  }, [composerImages, composerFiles, uploadsByImageId]);
   const providerInputRejectedRef = useRef(false);
   const composerSelectLockRef = useRef(false);
   const composerMenuOpenRef = useRef(false);
diff --git a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
index 8b3dd476884ca..ca98b4d2f6c79 100644
--- a/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
+++ b/apps/web/src/components/chat/ComposerAttachmentStrip.tsx
@@ -181,7 +181,7 @@ export function ComposerAttachmentMediaRow({
         "mb-3 flex max-w-full gap-2",
         pendingSnapShotIds.length > 0 ||
           expandedImages.some((image) => image.source?.kind === "snap-shot")
-          ? "-mx-3 snap-x snap-proximity overflow-x-auto overscroll-x-contain p-3 scrollbar-thumb-foreground/18 scrollbar-track-transparent [scrollbar-width:thin] [&::-webkit-scrollbar]:h-2.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:border-3 [&::-webkit-scrollbar-thumb]:border-transparent [&::-webkit-scrollbar-thumb]:bg-foreground/18 [&::-webkit-scrollbar-thumb]:bg-clip-content [&::-webkit-scrollbar-thumb:hover]:bg-foreground/28 [&::-webkit-scrollbar-track]:mx-1 [&::-webkit-scrollbar-track]:bg-transparent"
+          ? "snap-x snap-proximity overflow-x-auto overscroll-x-contain pb-1 scrollbar-thumb-foreground/18 scrollbar-track-transparent [scrollbar-width:thin] [&::-webkit-scrollbar]:h-2.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:border-3 [&::-webkit-scrollbar-thumb]:border-transparent [&::-webkit-scrollbar-thumb]:bg-foreground/18 [&::-webkit-scrollbar-thumb]:bg-clip-content [&::-webkit-scrollbar-thumb:hover]:bg-foreground/28 [&::-webkit-scrollbar-track]:mx-1 [&::-webkit-scrollbar-track]:bg-transparent"
           : "flex-wrap",
       )}
     >
@@ -202,7 +202,6 @@ export function ComposerAttachmentMediaRow({
           return (
             <SnapShotAttachmentFrame
               key={image.id}
-              data-failed-attachment-id={upload?.status === "failed" ? image.id : undefined}
               data-chat-composer-expanded-image="true"
               aria-hidden={snapShotAnimationPending || undefined}
               inert={snapShotAnimationPending || undefined}
@@ -252,12 +251,6 @@ export function ComposerAttachmentMediaRow({
               ) : (
                 <ComposerImageFallback />
               )}
-              {upload?.status === "failed" && (
-                <span
-                  aria-hidden="true"
-                  className="composer-attachment-failure-highlight pointer-events-none absolute inset-0 rounded-[inherit] border border-destructive/60"
-                />
-              )}
               {source?.kind === "snap-shot" ? (
                 <SnapShotAttachmentDetails
                   source={source}
@@ -363,8 +356,7 @@ export function ComposerAttachmentMediaRow({
         return (
           <div
             key={file.id}
-            className="composer-attachment-failure-frame relative h-16 w-16 shrink-0 snap-start overflow-hidden rounded-lg border border-border/80 bg-black"
-            data-failed-attachment-id={upload?.status === "failed" ? file.id : undefined}
+            className="relative h-16 w-16 shrink-0 snap-start overflow-hidden rounded-lg border border-border/80 bg-black"
           >
             <button
               type="button"
@@ -472,8 +464,7 @@ export function ComposerAttachmentFileList({
         return (
           <div
             key={file.id}
-            className="composer-attachment-failure-frame flex min-w-0 items-center gap-2 rounded-md py-1 text-sm text-foreground"
-            data-failed-attachment-id={upload?.status === "failed" ? file.id : undefined}
+            className="flex min-w-0 items-center gap-2 py-1 text-sm text-foreground"
           >
             <PierreEntryIcon pathValue={file.name} kind="file" theme={resolvedTheme} />
             <button
diff --git a/apps/web/src/components/composerContextPresentation.tsx b/apps/web/src/components/composerContextPresentation.tsx
index 7f213c98237cc..ad9be211cb3cf 100644
--- a/apps/web/src/components/composerContextPresentation.tsx
+++ b/apps/web/src/components/composerContextPresentation.tsx
@@ -198,11 +198,6 @@ function ImageContextChip(props: {
             previewUrl={props.record.previewUrl}
             size={formatAttachmentSize(props.record.sizeBytes)}
             suffix={suffix}
-            {...(props.upload?.status === "failed" ? { state: "invalid" as const } : {})}
-            data-failed-attachment-id={
-              props.upload?.status === "failed" ? props.record.id : undefined
-            }
-            aria-label={`Image attachment, ${props.record.name}, ${formatAttachmentSize(props.record.sizeBytes)}${props.upload?.status === "failed" ? ", upload failed" : ""}`}
             onClick={() => actions.expandImage(props.record.id)}
           />
         }
@@ -241,7 +236,6 @@ function FileContextChip(props: {
       isVideo={isVideo}
       theme={resolvedTheme}
       error={props.upload?.status === "failed"}
-      failedAttachmentId={props.upload?.status === "failed" ? props.record.id : undefined}
       unresolved={needsReattach}
       suffix={suffix}
       accessibleLabel={`${isVideo && !needsReattach ? "Preview video" : "File"} attachment, ${props.record.name}, ${size}`}
diff --git a/apps/web/src/components/contextChipParts.tsx b/apps/web/src/components/contextChipParts.tsx
index fb4d3c2c7cfe4..a5eb5d64fa516 100644
--- a/apps/web/src/components/contextChipParts.tsx
+++ b/apps/web/src/components/contextChipParts.tsx
@@ -202,7 +202,6 @@ export function FileChip(props: {
   copyMarkdown?: string;
   disabled?: boolean;
   error?: boolean;
-  failedAttachmentId?: string | undefined;
   unresolved?: boolean;
   onOpen?: (() => void) | undefined;
   svgPreview?:
@@ -226,7 +225,6 @@ export function FileChip(props: {
     "aria-label": [props.accessibleLabel, props.suffix].filter(Boolean).join(", "),
     "data-markdown-copy": props.copyMarkdown,
     "data-context-unresolved": props.unresolved ? "true" : undefined,
-    "data-failed-attachment-id": props.failedAttachmentId,
   } as const;
   return (
     <Tooltip>
@@ -302,8 +300,7 @@ function SvgFileChip(props: ComponentProps<typeof FileChip>) {
             onClick={props.onOpen}
             onPreviewError={() => setFailedPreviewUrl(url)}
             data-markdown-copy={props.copyMarkdown}
-            data-failed-attachment-id={props.failedAttachmentId}
-            aria-label={[props.accessibleLabel, props.suffix].filter(Boolean).join(", ")}
+            aria-label={props.accessibleLabel}
             {...(props.error ? { state: "invalid" as const } : {})}
           />
         }
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 4c42d3cda3ba5..771c714b1ff8a 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -659,91 +659,6 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
   margin-left: var(--live-activity-focus-width);
 }
 
-/* Match the citation reveal's two pulses, hold, and fade without a running animation. */
-@keyframes composer-attachment-failure-reveal {
-  0%,
-  21.667%,
-  100% {
-    background-color: transparent;
-  }
-  10.833%,
-  32.5%,
-  85% {
-    background-color: var(--attachment-failure-tint);
-  }
-}
-
-[data-failed-attachment-id][data-slot="context-chip"],
-.composer-attachment-failure-highlight {
-  --attachment-failure-tint: color-mix(in oklab, var(--primary) 45%, transparent);
-  animation: composer-attachment-failure-reveal 3s ease-in-out;
-}
-
-.composer-attachment-failure-highlight {
-  --attachment-failure-tint: color-mix(in oklab, var(--destructive) 12%, transparent);
-}
-
-@keyframes composer-attachment-failure-glow {
-  0%,
-  21.667% {
-    box-shadow: 0 0 0 0 transparent;
-  }
-  10.833%,
-  32.5% {
-    box-shadow:
-      0 0 0 3px color-mix(in oklab, var(--destructive) 12%, transparent),
-      0 0 14px 3px color-mix(in oklab, var(--destructive) 24%, transparent);
-  }
-  85% {
-    box-shadow:
-      0 0 0 2px color-mix(in oklab, var(--destructive) 8%, transparent),
-      0 0 10px 1px color-mix(in oklab, var(--destructive) 18%, transparent);
-  }
-  100% {
-    box-shadow: 0 0 0 0 transparent;
-  }
-}
-
-.composer-attachment-failure-frame[data-failed-attachment-id] {
-  outline: 1px solid var(--destructive);
-  outline-offset: -1px;
-}
-
-[data-chat-composer-expanded-image][data-failed-attachment-id],
-.composer-attachment-failure-frame[data-failed-attachment-id] {
-  animation: composer-attachment-failure-glow 3s ease-in-out;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  [data-chat-composer-expanded-image][data-failed-attachment-id],
-  .composer-attachment-failure-frame[data-failed-attachment-id] {
-    animation: none;
-  }
-
-  [data-failed-attachment-id][data-slot="context-chip"],
-  .composer-attachment-failure-highlight {
-    animation-name: composer-attachment-failure-reveal-reduced;
-  }
-}
-
-@keyframes composer-attachment-failure-reveal-reduced {
-  0%,
-  85% {
-    background-color: var(--attachment-failure-tint);
-  }
-  100% {
-    background-color: transparent;
-  }
-}
-
-@media (forced-colors: active) {
-  [data-failed-attachment-id] {
-    animation: none;
-    outline: 1px solid Mark;
-    outline-offset: -1px;
-  }
-}
-
 @property --assistant-citation-highlight-opacity {
   syntax: "<number>";
   inherits: true;
diff --git a/packages/contracts/src/orchestrationV2.test.ts b/packages/contracts/src/orchestrationV2.test.ts
index c1fc8222a1f70..76f78f536d7c5 100644
--- a/packages/contracts/src/orchestrationV2.test.ts
+++ b/packages/contracts/src/orchestrationV2.test.ts
@@ -2,12 +2,10 @@ import { describe, expect, it } from "@effect/vitest";
 import * as DateTime from "effect/DateTime";
 import * as Schema from "effect/Schema";
 
-import { CommandId, NodeId, ProjectId, RunAttemptId, TrimmedNonEmptyString } from "./index.ts";
+import { NodeId, RunAttemptId, TrimmedNonEmptyString } from "./index.ts";
 import {
   latestProviderTurnForAttempt,
   OrchestrationV2CheckpointFileSummary,
-  OrchestrationV2DispatchCommandError,
-  OrchestrationV2ThreadLaunchError,
   OrchestrationV2ProviderCapabilities,
   OrchestrationV2ProviderThread,
   OrchestrationV2ProviderThreadJson,
@@ -39,28 +37,6 @@ const decodeOrchestrationV2ProviderCapabilities = Schema.decodeUnknownSync(
 );
 
 describe("orchestration V2 contracts", () => {
-  it("preserves the failed attachment ID in dispatch and launch errors", () => {
-    const dispatch = Schema.toCodecJson(OrchestrationV2DispatchCommandError);
-    const launch = Schema.toCodecJson(OrchestrationV2ThreadLaunchError);
-    const dispatchError = new OrchestrationV2DispatchCommandError({
-      commandId: CommandId.make("command"),
-      commandType: "message.dispatch",
-      message: "failed",
-      attachmentId: "pending-1",
-    });
-    const launchError = new OrchestrationV2ThreadLaunchError({
-      commandId: CommandId.make("command"),
-      projectId: ProjectId.make("project"),
-      message: "failed",
-      attachmentId: "pending-2",
-    });
-    expect(
-      Schema.decodeSync(dispatch)(Schema.encodeSync(dispatch)(dispatchError)).attachmentId,
-    ).toBe("pending-1");
-    expect(Schema.decodeSync(launch)(Schema.encodeSync(launch)(launchError)).attachmentId).toBe(
-      "pending-2",
-    );
-  });
   it("decodes thread event types from a newer server as skippable items", () => {
     const decodeWireItems = Schema.decodeUnknownSync(
       Schema.toCodecJson(Schema.Array(OrchestrationV2RpcSchemas.subscribeThread.output)),

From c33c28a40b11139d372e01c663867471a865b831 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Sun, 15 Nov 2026 06:47:39 +0000
Subject: [PATCH 7/8] test(github): give the failing thread-read stub the new
 truncated field

Main fails to typecheck since #32707 made pull request activity carry
`truncated`; this stub was added without it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../src/server/GitHubPullRequestProvider.test.ts               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/source-control-github/src/server/GitHubPullRequestProvider.test.ts b/packages/source-control-github/src/server/GitHubPullRequestProvider.test.ts
index 67cff51379f55..5911bd3c3a117 100644
--- a/packages/source-control-github/src/server/GitHubPullRequestProvider.test.ts
+++ b/packages/source-control-github/src/server/GitHubPullRequestProvider.test.ts
@@ -849,7 +849,8 @@ describe("getChangeRequestActivity", () => {
 
   const failingThreadRead = (error: GitHubPullRequestApi.GitHubPullRequestApiError) =>
     Layer.mock(GitHubPullRequestApi.GitHubPullRequestApi)({
-      getPullRequestActivity: () => Effect.succeed({ author: null, comments: [], commits: [] }),
+      getPullRequestActivity: () =>
+        Effect.succeed({ author: null, comments: [], commits: [], truncated: false }),
       listReviewThreadComments: () => Effect.fail(error),
     });
   const retryAt = 1_900_000_000_000;

From 46b93d1f12f17f63b8d65b2ec2b1d75e11a0ed11 Mon Sep 17 00:00:00 2001
From: Adamulek123 <adam.bogucki2018@gmail.com>
Date: Sun, 15 Nov 2026 12:35:07 +0100
Subject: [PATCH 8/8] fix(web): retry restored rejected attachments

---
 .../web/src/lib/attachmentUploadQueue.test.ts | 30 +++++++++++++++++++
 apps/web/src/lib/attachmentUploadQueue.ts     |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/lib/attachmentUploadQueue.test.ts b/apps/web/src/lib/attachmentUploadQueue.test.ts
index 510db116bf275..9c3669261c654 100644
--- a/apps/web/src/lib/attachmentUploadQueue.test.ts
+++ b/apps/web/src/lib/attachmentUploadQueue.test.ts
@@ -235,6 +235,36 @@ describe("attachmentUploadQueue", () => {
     });
   });
 
+  it("rechecks a server-rejected restored document when local bytes are unavailable", async () => {
+    const file = {
+      ...makeFile("restored"),
+      file: null,
+      uploadedAttachmentId: "pending-original",
+      uploadEnvironmentId: firstEnvironment,
+    };
+    useAttachmentUploadStore.setState({
+      uploadsByImageId: {
+        [file.id]: {
+          status: "ready",
+          environmentId: firstEnvironment,
+          attachmentId: "pending-original",
+        },
+      },
+    });
+    mocks.executeAtomQuery.mockResolvedValue({ _tag: "Success", value: {} });
+    markAttachmentClaimFailure({
+      environmentId: firstEnvironment,
+      attachments: [file],
+      error: { attachmentId: "pending-original" },
+    });
+    retryAttachmentUpload({ environmentId: firstEnvironment, image: file });
+    await awaitAttachmentUploads([file.id]);
+    expect(
+      getUploadedAttachments({ environmentId: firstEnvironment, images: [file] })?.[0]?.id,
+    ).toBe("pending-original");
+    expect(TestXmlHttpRequest.requests).toHaveLength(0);
+  });
+
   it("reuploads a server-rejected persisted document instead of reusing its ID", async () => {
     const file = {
       ...makeFile("rejected"),
diff --git a/apps/web/src/lib/attachmentUploadQueue.ts b/apps/web/src/lib/attachmentUploadQueue.ts
index 142b8b8d33fcb..2bb934e909604 100644
--- a/apps/web/src/lib/attachmentUploadQueue.ts
+++ b/apps/web/src/lib/attachmentUploadQueue.ts
@@ -110,7 +110,7 @@ export function markAttachmentClaimFailure(input: {
     setUploadState(attachment.id, {
       status: "failed",
       environmentId: input.environmentId,
-      forceReupload: true,
+      forceReupload: attachment.file !== null,
       ...(attachment.type !== "file" || attachment.uploadedAttachmentId !== upload.attachmentId
         ? { attachmentId: upload.attachmentId }
         : {}),