From 4d4f14feb8d240e83176f75a05012e029a7ef453 Mon Sep 17 00:00:00 2001
From: brainage04 <thomasmcmah21@gmail.com>
Date: Tue, 21 Jul 2026 17:32:30 +1000
Subject: [PATCH 1/3] fix(web): materialize Android picker images on selection

---
 apps/web/src/features/composer/Composer.tsx   | 86 +++++++++++++------
 apps/web/src/features/composer/attachments.ts | 77 +++++++++++++++++
 .../features/session-runtime/image-upload.ts  |  2 +-
 apps/web/test/composer-runtime.test.ts        | 61 +++++++++++++
 4 files changed, 199 insertions(+), 27 deletions(-)

diff --git a/apps/web/src/features/composer/Composer.tsx b/apps/web/src/features/composer/Composer.tsx
index f8f44f4..1744730 100644
--- a/apps/web/src/features/composer/Composer.tsx
+++ b/apps/web/src/features/composer/Composer.tsx
@@ -31,6 +31,7 @@ import {
 } from "../context-packet/context-packet.ts";
 import {
   admitAttachments,
+  materializeAttachmentCandidates,
   toPromptAttachment,
   type AttachmentCandidate,
   type StagedAttachment,
@@ -71,6 +72,10 @@ const IMAGE_REVISION_REASON =
   "Images cannot be added to a plan revision. Remove them or finish the revision first.";
 const IMAGE_ACTIVE_TURN_REASON =
   "Images can be sent with the next prompt after the running turn finishes.";
+const IMAGE_PREPARATION_PENDING_REASON =
+  "Your selected images are still being prepared. Wait a moment and send again.";
+const IMAGE_PREPARATION_FAILED_REASON =
+  "The selected images could not be prepared. Try choosing them again or selecting them through Files.";
 
 function filesToCandidates(files: ArrayLike<File>): AttachmentCandidate[] {
   return Array.from(files, (file) => ({ file }));
@@ -153,6 +158,8 @@ export function Composer({
   const contextNotice = useComposer((state) => state.contextNoticeBySessionId[sessionId] ?? null);
   const textareaRef = useRef<HTMLTextAreaElement | null>(null);
   const fileInputRef = useRef<HTMLInputElement | null>(null);
+  const attachmentIntakeTailRef = useRef<Promise<void>>(Promise.resolve());
+  const [preparingAttachmentCount, setPreparingAttachmentCount] = useState(0);
   const [caret, setCaret] = useState(0);
   const [menuIndex, setMenuIndex] = useState(0);
   const [menuDismissed, setMenuDismissed] = useState(false);
@@ -330,6 +337,10 @@ export function Composer({
   );
 
   const submit = useCallback(() => {
+    if (preparingAttachmentCount > 0) {
+      setRejections([IMAGE_PREPARATION_PENDING_REASON]);
+      return;
+    }
     const text = draft.trim();
     if (text === "" && attachments.length === 0) return;
     if (attachments.length > 0 && !controls.attachmentsSupported) {
@@ -373,6 +384,7 @@ export function Composer({
       },
     );
   }, [
+    preparingAttachmentCount,
     draft,
     attachments,
     controls.attachmentsSupported,
@@ -386,6 +398,10 @@ export function Composer({
   ]);
 
   const queueFollowUp = useCallback(() => {
+    if (preparingAttachmentCount > 0) {
+      setRejections([IMAGE_PREPARATION_PENDING_REASON]);
+      return;
+    }
     const text = draft.trim();
     if (text === "") return;
     if (attachments.length > 0) {
@@ -393,7 +409,7 @@ export function Composer({
       return;
     }
     runSubmission({ kind: "followUp", text }, { text: draft, attachmentIds: [] });
-  }, [draft, attachments.length, runSubmission]);
+  }, [draft, attachments.length, preparingAttachmentCount, runSubmission]);
 
   // While observed/reconciling the gate carries its own reason; the generic
   // host copy only applies when the host truly lacks image prompts.
@@ -404,26 +420,39 @@ export function Composer({
   }, [attachmentsUnavailableReason, setRejections]);
 
   const intake = useCallback(
-    (candidates: readonly AttachmentCandidate[]) => {
+    (candidates: readonly AttachmentCandidate[]): Promise<void> => {
       if (!controls.attachmentsSupported) {
         reportUnsupportedImages();
-        return;
-      }
-      const stagedBySession = composerStore.getState().attachmentsBySessionId;
-      const existing = stagedBySession[sessionId] ?? [];
-      let stagedBytes = 0;
-      let stagedCount = 0;
-      for (const staged of Object.values(stagedBySession)) {
-        stagedCount += staged.length;
-        for (const attachment of staged) stagedBytes += attachment.sizeBytes;
+        return Promise.resolve();
       }
-      const result = admitAttachments(existing, candidates, { stagedBytes, stagedCount });
-      if (result.accepted.length > 0) {
-        composerStore.getState().addAttachments(sessionId, result.accepted);
-      }
-      setRejections(result.rejections);
+
+      setPreparingAttachmentCount((count) => count + 1);
+      // Start every picker read now, before this batch waits behind an earlier
+      // intake and before the file input is cleared.
+      const materialized = materializeAttachmentCandidates(candidates);
+      const task = attachmentIntakeTailRef.current.then(async () => {
+        const prepared = await materialized;
+        const stagedBySession = composerStore.getState().attachmentsBySessionId;
+        const existing = stagedBySession[sessionId] ?? [];
+        let stagedBytes = 0;
+        let stagedCount = 0;
+        for (const staged of Object.values(stagedBySession)) {
+          stagedCount += staged.length;
+          for (const attachment of staged) stagedBytes += attachment.sizeBytes;
+        }
+        const result = admitAttachments(existing, prepared.accepted, { stagedBytes, stagedCount });
+        if (result.accepted.length > 0) {
+          composerStore.getState().addAttachments(sessionId, result.accepted);
+        }
+        setRejections([...prepared.rejections, ...result.rejections]);
+      });
+      const settled = task
+        .catch(() => setRejections([IMAGE_PREPARATION_FAILED_REASON]))
+        .finally(() => setPreparingAttachmentCount((count) => Math.max(0, count - 1)));
+      attachmentIntakeTailRef.current = settled;
+      return settled;
     },
-    [sessionId, controls.attachmentsSupported, reportUnsupportedImages],
+    [sessionId, controls.attachmentsSupported, reportUnsupportedImages, setRejections],
   );
 
   const requestAttachmentPicker = useCallback(() => {
@@ -494,7 +523,9 @@ export function Composer({
   };
 
   const primaryLabel = revisingPlanId !== null ? "Send revision" : turnActive ? "Steer" : "Send";
-  const canSubmit = !disabled && (draft.trim() !== "" || attachments.length > 0);
+  const preparingAttachments = preparingAttachmentCount > 0;
+  const canSubmit =
+    !disabled && !preparingAttachments && (draft.trim() !== "" || attachments.length > 0);
   const runOptionsSummary = `${controls.modelLabel ?? "Host model"} · ${thinkingLabel(controls.thinking)}`;
 
   return (
@@ -601,7 +632,7 @@ export function Composer({
             if (event.dataTransfer.files.length === 0) return;
             event.preventDefault();
             if (disabled) return;
-            intake(filesToCandidates(event.dataTransfer.files));
+            void intake(filesToCandidates(event.dataTransfer.files));
           }}
         >
           {revisingPlanId !== null && (
@@ -695,7 +726,7 @@ export function Composer({
               if (event.clipboardData.files.length === 0) return;
               event.preventDefault();
               if (disabled) return;
-              intake(filesToCandidates(event.clipboardData.files));
+              void intake(filesToCandidates(event.clipboardData.files));
             }}
             onSelect={(event) => setCaret(event.currentTarget.selectionStart)}
             placeholder={
@@ -717,8 +748,11 @@ export function Composer({
               className="hidden"
               multiple
               onChange={(event) => {
-                if (event.target.files !== null) intake(filesToCandidates(event.target.files));
-                event.target.value = "";
+                const input = event.currentTarget;
+                if (input.files === null) return;
+                void intake(filesToCandidates(input.files)).finally(() => {
+                  input.value = "";
+                });
               }}
               ref={fileInputRef}
               type="file"
@@ -781,7 +815,7 @@ export function Composer({
                   </TooltipPopup>
                 </Tooltip>
                 <Button
-                  disabled={disabled || sending || draft.trim() === ""}
+                  disabled={disabled || sending || preparingAttachments || draft.trim() === ""}
                   onClick={queueFollowUp}
                   size="xs"
                   variant="outline"
@@ -791,7 +825,7 @@ export function Composer({
               </>
             )}
             <Button
-              aria-busy={sending || undefined}
+              aria-busy={sending || preparingAttachments || undefined}
               aria-label={primaryLabel}
               className="ml-1"
               disabled={!canSubmit || sending}
@@ -831,10 +865,10 @@ export function Composer({
               onCancel={() => onIntent({ kind: "cancel" })}
               onQueue={queueFollowUp}
               onSubmit={submit}
-              primaryBusy={sending}
+              primaryBusy={sending || preparingAttachments}
               primaryDisabled={!canSubmit || sending}
               primaryLabel={primaryLabel}
-              queueDisabled={disabled || sending || draft.trim() === ""}
+              queueDisabled={disabled || sending || preparingAttachments || draft.trim() === ""}
               turnActive={turnActive}
             />
           </div>
diff --git a/apps/web/src/features/composer/attachments.ts b/apps/web/src/features/composer/attachments.ts
index 69bd7f1..bffb31d 100644
--- a/apps/web/src/features/composer/attachments.ts
+++ b/apps/web/src/features/composer/attachments.ts
@@ -2,6 +2,10 @@
 // URLs stay renderer-local; the live runtime converts a File into an appserver
 // upload and sends only the resulting image id across the wire.
 import type { PromptAttachment } from "../session-runtime/intents.ts";
+import {
+  readFileWithFileReader,
+  sniffPromptImageMimeType,
+} from "../session-runtime/image-upload.ts";
 
 export const MAX_ATTACHMENTS = 8;
 export const MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024; // Mirrors app-wire.
@@ -57,6 +61,19 @@ export interface AttachmentIntakeOptions {
   readonly stagedCount?: number;
 }
 
+export interface AttachmentMaterialization {
+  readonly accepted: readonly AttachmentCandidate[];
+  readonly rejections: readonly string[];
+}
+
+export interface AttachmentMaterializationOptions {
+  /**
+   * Test seam. Production deliberately starts FileReader synchronously while
+   * the Android picker grant is fresh instead of retaining its lazy File.
+   */
+  readonly readFile?: (file: File) => Promise<ArrayBuffer>;
+}
+
 function formatBytes(bytes: number): string {
   if (bytes >= 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
   if (bytes >= 1024) return `${Math.round(bytes / 1024)} kB`;
@@ -78,6 +95,66 @@ export function provisionalImageMediaType(file: File): string | null {
   return IMAGE_EXTENSIONS[file.name.slice(dot + 1).toLowerCase()] ?? null;
 }
 
+/**
+ * Copy picker-backed Files into renderer-owned Files before the input is
+ * cleared. Android content providers can invalidate or mutate their synthetic
+ * File metadata after the change event; starting every FileReader here keeps
+ * the grant live, and staging only the immutable copies removes that lifetime
+ * from preview and submission.
+ */
+export async function materializeAttachmentCandidates(
+  candidates: readonly AttachmentCandidate[],
+  options: AttachmentMaterializationOptions = {},
+): Promise<AttachmentMaterialization> {
+  const readFile = options.readFile ?? readFileWithFileReader;
+  const results = await Promise.all(
+    candidates.map(async ({ file }) => {
+      let buffer: ArrayBuffer;
+      try {
+        // This call occurs synchronously for every candidate before the outer
+        // function reaches its first await.
+        buffer = await readFile(file);
+      } catch {
+        return {
+          candidate: null,
+          rejection: `${file.name || "untitled"}: the selected image could not be read. Try choosing it again or selecting it through Files.`,
+        } as const;
+      }
+
+      const name = file.name || "untitled";
+      const mediaType = sniffPromptImageMimeType(new Uint8Array(buffer));
+      if (mediaType === null) {
+        return {
+          candidate: null,
+          rejection: `${name}: attach a PNG, JPEG, WebP, or GIF image.`,
+        } as const;
+      }
+
+      try {
+        return {
+          candidate: {
+            file: new File([buffer], name, { type: mediaType }),
+          },
+          rejection: null,
+        } as const;
+      } catch {
+        return {
+          candidate: null,
+          rejection: `${name}: could not prepare a stable image copy.`,
+        } as const;
+      }
+    }),
+  );
+
+  const accepted: AttachmentCandidate[] = [];
+  const rejections: string[] = [];
+  for (const result of results) {
+    if (result.candidate === null) rejections.push(result.rejection);
+    else accepted.push(result.candidate);
+  }
+  return { accepted, rejections };
+}
+
 /**
  * Validate candidates against the current attachment list. This first slice
  * accepts images only; text/file parity waits for an explicit host protocol.
diff --git a/apps/web/src/features/session-runtime/image-upload.ts b/apps/web/src/features/session-runtime/image-upload.ts
index 8d82f2a..6c9f8f5 100644
--- a/apps/web/src/features/session-runtime/image-upload.ts
+++ b/apps/web/src/features/session-runtime/image-upload.ts
@@ -125,7 +125,7 @@ function hex(bytes: Uint8Array): string {
   return Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
 }
 
-function readFileWithFileReader(file: File): Promise<ArrayBuffer> {
+export function readFileWithFileReader(file: File): Promise<ArrayBuffer> {
   if (typeof globalThis.FileReader !== "function") {
     return Promise.reject(new Error("This browser cannot read the selected file."));
   }
diff --git a/apps/web/test/composer-runtime.test.ts b/apps/web/test/composer-runtime.test.ts
index fa2431d..31848b4 100644
--- a/apps/web/test/composer-runtime.test.ts
+++ b/apps/web/test/composer-runtime.test.ts
@@ -6,6 +6,7 @@ import { describe, expect, it } from "vite-plus/test";
 
 import {
   admitAttachments,
+  materializeAttachmentCandidates,
   MAX_STAGED_ATTACHMENT_BYTES,
   MAX_STAGED_ATTACHMENTS,
   toPromptAttachment,
@@ -120,6 +121,66 @@ describe("slash commands", () => {
 });
 
 describe("attachments", () => {
+  it("reads Android picker Files immediately and stages an owned byte-backed copy", async () => {
+    const jpeg = new Uint8Array([0xff, 0xd8, 0xff, 0xe1, 0x00, 0x10]);
+    const source = new File([jpeg], "1000049502.jpg", {
+      type: "application/octet-stream",
+      lastModified: 1,
+    });
+    let readerStarted = false;
+    let sourceArrayBufferCalls = 0;
+    Object.defineProperty(source, "arrayBuffer", {
+      configurable: true,
+      value: () => {
+        sourceArrayBufferCalls += 1;
+        return Promise.reject(new DOMException("picker grant expired", "NotReadableError"));
+      },
+    });
+
+    const originalFileReader = Object.getOwnPropertyDescriptor(globalThis, "FileReader");
+    class PickerFileReader {
+      result: string | ArrayBuffer | null = null;
+      error: DOMException | null = null;
+      onload: (() => void) | null = null;
+      onerror: (() => void) | null = null;
+      onabort: (() => void) | null = null;
+
+      readAsArrayBuffer(file: Blob): void {
+        expect(file).toBe(source);
+        readerStarted = true;
+        const buffer = new ArrayBuffer(jpeg.byteLength);
+        new Uint8Array(buffer).set(jpeg);
+        this.result = buffer;
+        queueMicrotask(() => this.onload?.());
+      }
+    }
+    Object.defineProperty(globalThis, "FileReader", {
+      configurable: true,
+      value: PickerFileReader,
+    });
+
+    try {
+      const pending = materializeAttachmentCandidates([{ file: source }]);
+      expect(readerStarted).toBe(true);
+
+      const result = await pending;
+      expect(result.rejections).toEqual([]);
+      expect(result.accepted).toHaveLength(1);
+      const owned = result.accepted[0]?.file;
+      if (owned === undefined) throw new Error("materialized attachment omitted its owned File");
+      expect(owned).toBeInstanceOf(File);
+      expect(owned).not.toBe(source);
+      expect(owned.name).toBe("1000049502.jpg");
+      expect(owned.type).toBe("image/jpeg");
+      expect(owned.size).toBe(jpeg.byteLength);
+      expect(sourceArrayBufferCalls).toBe(0);
+      expect(new Uint8Array(await owned.arrayBuffer())).toEqual(jpeg);
+    } finally {
+      if (originalFileReader === undefined) Reflect.deleteProperty(globalThis, "FileReader");
+      else Object.defineProperty(globalThis, "FileReader", originalFileReader);
+    }
+  });
+
   it("uses crypto-backed collision-resistant ids by default", () => {
     const result = admitAttachments(
       [],

From f2d8210e1b5b268e3ed9322fe8864fd0bb227a4c Mon Sep 17 00:00:00 2001
From: Wolfgang Schoenberger <221313372+wolfiesch@users.noreply.github.com>
Date: Tue, 21 Jul 2026 07:34:52 -0700
Subject: [PATCH 2/3] fix(web): bound picker attachment materialization

---
 apps/web/src/features/composer/Composer.tsx   |  27 +++--
 apps/web/src/features/composer/attachments.ts |  40 ++++++-
 apps/web/test/composer-runtime.test.ts        | 112 ++++++++++++++++++
 3 files changed, 169 insertions(+), 10 deletions(-)

diff --git a/apps/web/src/features/composer/Composer.tsx b/apps/web/src/features/composer/Composer.tsx
index 1744730..021f324 100644
--- a/apps/web/src/features/composer/Composer.tsx
+++ b/apps/web/src/features/composer/Composer.tsx
@@ -81,6 +81,21 @@ function filesToCandidates(files: ArrayLike<File>): AttachmentCandidate[] {
   return Array.from(files, (file) => ({ file }));
 }
 
+function attachmentIntakeState(sessionId: string): {
+  readonly existing: readonly StagedAttachment[];
+  readonly stagedBytes: number;
+  readonly stagedCount: number;
+} {
+  const stagedBySession = composerStore.getState().attachmentsBySessionId;
+  let stagedBytes = 0;
+  let stagedCount = 0;
+  for (const staged of Object.values(stagedBySession)) {
+    stagedCount += staged.length;
+    for (const attachment of staged) stagedBytes += attachment.sizeBytes;
+  }
+  return { existing: stagedBySession[sessionId] ?? [], stagedBytes, stagedCount };
+}
+
 // ---------------------------------------------------------------------------
 // Composer
 // ---------------------------------------------------------------------------
@@ -429,17 +444,11 @@ export function Composer({
       setPreparingAttachmentCount((count) => count + 1);
       // Start every picker read now, before this batch waits behind an earlier
       // intake and before the file input is cleared.
-      const materialized = materializeAttachmentCandidates(candidates);
+      const initialState = attachmentIntakeState(sessionId);
+      const materialized = materializeAttachmentCandidates(candidates, initialState);
       const task = attachmentIntakeTailRef.current.then(async () => {
         const prepared = await materialized;
-        const stagedBySession = composerStore.getState().attachmentsBySessionId;
-        const existing = stagedBySession[sessionId] ?? [];
-        let stagedBytes = 0;
-        let stagedCount = 0;
-        for (const staged of Object.values(stagedBySession)) {
-          stagedCount += staged.length;
-          for (const attachment of staged) stagedBytes += attachment.sizeBytes;
-        }
+        const { existing, stagedBytes, stagedCount } = attachmentIntakeState(sessionId);
         const result = admitAttachments(existing, prepared.accepted, { stagedBytes, stagedCount });
         if (result.accepted.length > 0) {
           composerStore.getState().addAttachments(sessionId, result.accepted);
diff --git a/apps/web/src/features/composer/attachments.ts b/apps/web/src/features/composer/attachments.ts
index bffb31d..2e70217 100644
--- a/apps/web/src/features/composer/attachments.ts
+++ b/apps/web/src/features/composer/attachments.ts
@@ -72,6 +72,12 @@ export interface AttachmentMaterializationOptions {
    * the Android picker grant is fresh instead of retaining its lazy File.
    */
   readonly readFile?: (file: File) => Promise<ArrayBuffer>;
+  /** Attachments already staged for the active session. */
+  readonly existing?: readonly StagedAttachment[];
+  /** Declared bytes already staged across every session. */
+  readonly stagedBytes?: number;
+  /** Images already staged across every session. */
+  readonly stagedCount?: number;
 }
 
 function formatBytes(bytes: number): string {
@@ -107,8 +113,41 @@ export async function materializeAttachmentCandidates(
   options: AttachmentMaterializationOptions = {},
 ): Promise<AttachmentMaterialization> {
   const readFile = options.readFile ?? readFileWithFileReader;
+  const existing = options.existing ?? [];
+  let count = existing.length;
+  let stagedBytes =
+    options.stagedBytes ?? existing.reduce((total, attachment) => total + attachment.sizeBytes, 0);
+  let stagedCount = options.stagedCount ?? existing.length;
+  const seenFiles = new Set(existing.map((attachment) => attachment.file));
   const results = await Promise.all(
     candidates.map(async ({ file }) => {
+      const name = file.name || "untitled";
+      let rejection: string | null = null;
+      if (count >= MAX_ATTACHMENTS) {
+        rejection = `${name}: limit of ${MAX_ATTACHMENTS} attachments reached.`;
+      } else if (provisionalImageMediaType(file) === null) {
+        rejection = `${name}: attach a PNG, JPEG, WebP, or GIF image.`;
+      } else if (file.size === 0) {
+        rejection = `${name}: the image is empty.`;
+      } else if (file.size > MAX_ATTACHMENT_BYTES) {
+        rejection = `${name}: ${formatBytes(file.size)} is over the ${formatBytes(MAX_ATTACHMENT_BYTES)} limit.`;
+      } else if (seenFiles.has(file)) {
+        rejection = `${name}: already attached.`;
+      } else if (stagedCount >= MAX_STAGED_ATTACHMENTS) {
+        rejection = `${name}: the app already has ${MAX_STAGED_ATTACHMENTS} staged images. Remove one before adding another.`;
+      } else if (stagedBytes + file.size > MAX_STAGED_ATTACHMENT_BYTES) {
+        rejection = `${name}: staged images across sessions would exceed ${formatBytes(MAX_STAGED_ATTACHMENT_BYTES)}. Remove one before adding another.`;
+      }
+      if (rejection !== null) return { candidate: null, rejection } as const;
+
+      // Reserve the declared budget before starting another concurrent read.
+      // Final admission rechecks the owned File's actual byte size and current
+      // store state after every read settles.
+      count += 1;
+      stagedBytes += file.size;
+      stagedCount += 1;
+      seenFiles.add(file);
+
       let buffer: ArrayBuffer;
       try {
         // This call occurs synchronously for every candidate before the outer
@@ -121,7 +160,6 @@ export async function materializeAttachmentCandidates(
         } as const;
       }
 
-      const name = file.name || "untitled";
       const mediaType = sniffPromptImageMimeType(new Uint8Array(buffer));
       if (mediaType === null) {
         return {
diff --git a/apps/web/test/composer-runtime.test.ts b/apps/web/test/composer-runtime.test.ts
index 31848b4..14adcca 100644
--- a/apps/web/test/composer-runtime.test.ts
+++ b/apps/web/test/composer-runtime.test.ts
@@ -7,6 +7,8 @@ import { describe, expect, it } from "vite-plus/test";
 import {
   admitAttachments,
   materializeAttachmentCandidates,
+  MAX_ATTACHMENT_BYTES,
+  MAX_ATTACHMENTS,
   MAX_STAGED_ATTACHMENT_BYTES,
   MAX_STAGED_ATTACHMENTS,
   toPromptAttachment,
@@ -121,6 +123,116 @@ describe("slash commands", () => {
 });
 
 describe("attachments", () => {
+  it("rejects oversized and excess picker Files before reading their bytes", async () => {
+    const jpeg = new Uint8Array([0xff, 0xd8, 0xff, 0xe1, 0x00, 0x10]);
+    const oversized = new File([jpeg], "oversized.jpg", { type: "image/jpeg" });
+    Object.defineProperty(oversized, "size", {
+      configurable: true,
+      value: MAX_ATTACHMENT_BYTES + 1,
+    });
+    const candidates = [
+      { file: oversized },
+      ...Array.from({ length: MAX_ATTACHMENTS + 1 }, (_, index) => ({
+        file: new File([jpeg], `image-${index}.jpg`, { type: "image/jpeg" }),
+      })),
+    ];
+    const reads: File[] = [];
+
+    const result = await materializeAttachmentCandidates(candidates, {
+      readFile: (file) => {
+        reads.push(file);
+        return Promise.resolve(new Uint8Array(jpeg).buffer);
+      },
+    });
+
+    expect(reads).toHaveLength(MAX_ATTACHMENTS);
+    expect(reads).not.toContain(oversized);
+    expect(result.accepted).toHaveLength(MAX_ATTACHMENTS);
+    expect(result.rejections).toEqual([
+      "oversized.jpg: 20.0 MB is over the 20.0 MB limit.",
+      `image-${MAX_ATTACHMENTS}.jpg: limit of ${MAX_ATTACHMENTS} attachments reached.`,
+    ]);
+  });
+
+  it("reads and materializes a repeated source File only once", async () => {
+    const jpeg = new Uint8Array([0xff, 0xd8, 0xff, 0xe1, 0x00, 0x10]);
+    const source = new File([jpeg], "repeat.jpg", { type: "image/jpeg" });
+    const reads: File[] = [];
+
+    const result = await materializeAttachmentCandidates([{ file: source }, { file: source }], {
+      readFile: (file) => {
+        reads.push(file);
+        return Promise.resolve(new Uint8Array(jpeg).buffer);
+      },
+    });
+
+    expect(reads).toEqual([source]);
+    expect(result.accepted).toHaveLength(1);
+    expect(result.rejections).toEqual(["repeat.jpg: already attached."]);
+  });
+
+  it("applies current session and global staging budgets before reading", async () => {
+    const jpeg = new Uint8Array([0xff, 0xd8, 0xff, 0xe1, 0x00, 0x10]);
+    const existing = admitAttachments(
+      [],
+      Array.from({ length: MAX_ATTACHMENTS - 1 }, (_, index) => ({
+        file: new File([jpeg], `existing-${index}.jpg`, { type: "image/jpeg" }),
+      })),
+      deterministicAttachmentOptions(),
+    ).accepted;
+    const reads: File[] = [];
+    const readFile = (file: File): Promise<ArrayBuffer> => {
+      reads.push(file);
+      return Promise.resolve(new Uint8Array(jpeg).buffer);
+    };
+
+    const promptBudget = await materializeAttachmentCandidates(
+      [
+        { file: new File([jpeg], "last-slot.jpg", { type: "image/jpeg" }) },
+        { file: new File([jpeg], "no-slot.jpg", { type: "image/jpeg" }) },
+      ],
+      {
+        existing,
+        stagedBytes: existing.reduce((total, attachment) => total + attachment.sizeBytes, 0),
+        stagedCount: existing.length,
+        readFile,
+      },
+    );
+    expect(reads.map((file) => file.name)).toEqual(["last-slot.jpg"]);
+    expect(promptBudget.rejections).toEqual([
+      `no-slot.jpg: limit of ${MAX_ATTACHMENTS} attachments reached.`,
+    ]);
+
+    reads.length = 0;
+    const globalBudget = await materializeAttachmentCandidates(
+      [{ file: new File([jpeg], "global-limit.jpg", { type: "image/jpeg" }) }],
+      {
+        stagedBytes: MAX_STAGED_ATTACHMENT_BYTES,
+        stagedCount: MAX_STAGED_ATTACHMENTS,
+        readFile,
+      },
+    );
+    expect(reads).toEqual([]);
+    expect(globalBudget.accepted).toEqual([]);
+    expect(globalBudget.rejections[0]).toContain(
+      `already has ${MAX_STAGED_ATTACHMENTS} staged images`,
+    );
+
+    const byteBudget = await materializeAttachmentCandidates(
+      [{ file: new File([jpeg], "global-bytes.jpg", { type: "image/jpeg" }) }],
+      {
+        stagedBytes: MAX_STAGED_ATTACHMENT_BYTES,
+        stagedCount: 0,
+        readFile,
+      },
+    );
+    expect(reads).toEqual([]);
+    expect(byteBudget.accepted).toEqual([]);
+    expect(byteBudget.rejections[0]).toContain(
+      "staged images across sessions would exceed 160.0 MB",
+    );
+  });
+
   it("reads Android picker Files immediately and stages an owned byte-backed copy", async () => {
     const jpeg = new Uint8Array([0xff, 0xd8, 0xff, 0xe1, 0x00, 0x10]);
     const source = new File([jpeg], "1000049502.jpg", {

From 4bbb427b708e2b174838cb66f42eada9175fb4cf Mon Sep 17 00:00:00 2001
From: Alexander Kirilin <github@alexanderkirilin.com>
Date: Tue, 21 Jul 2026 12:03:02 -0400
Subject: [PATCH 3/3] fix(web): bound asynchronous attachment intake

---
 apps/web/src/features/composer/Composer.tsx          | 12 +++++++-----
 apps/web/src/features/composer/composer-store.ts     |  8 ++++++++
 .../t3code/imports/f2-transcript-20260711.json       |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/features/composer/Composer.tsx b/apps/web/src/features/composer/Composer.tsx
index 021f324..2e5bf8a 100644
--- a/apps/web/src/features/composer/Composer.tsx
+++ b/apps/web/src/features/composer/Composer.tsx
@@ -442,12 +442,14 @@ export function Composer({
       }
 
       setPreparingAttachmentCount((count) => count + 1);
-      // Start every picker read now, before this batch waits behind an earlier
-      // intake and before the file input is cleared.
-      const initialState = attachmentIntakeState(sessionId);
-      const materialized = materializeAttachmentCandidates(candidates, initialState);
+      const generation = composerStore.getState().sessionGeneration(sessionId);
+      // Serialize materialization as well as admission. This reserves the
+      // global staged byte/count budget before another picker batch allocates
+      // renderer-owned copies, bounding transient Android WebView memory.
       const task = attachmentIntakeTailRef.current.then(async () => {
-        const prepared = await materialized;
+        const initialState = attachmentIntakeState(sessionId);
+        const prepared = await materializeAttachmentCandidates(candidates, initialState);
+        if (composerStore.getState().sessionGeneration(sessionId) !== generation) return;
         const { existing, stagedBytes, stagedCount } = attachmentIntakeState(sessionId);
         const result = admitAttachments(existing, prepared.accepted, { stagedBytes, stagedCount });
         if (result.accepted.length > 0) {
diff --git a/apps/web/src/features/composer/composer-store.ts b/apps/web/src/features/composer/composer-store.ts
index 6df826b..751c115 100644
--- a/apps/web/src/features/composer/composer-store.ts
+++ b/apps/web/src/features/composer/composer-store.ts
@@ -48,6 +48,8 @@ export interface ComposerStoreState {
   finishSubmission(sessionId: string, token: SubmissionToken): void;
   setSubmissionNotice(sessionId: string, notice: SubmissionNotice): void;
   setAttachmentRejections(sessionId: string, rejections: readonly string[]): void;
+  /** Monotonic lifetime token invalidated by permanent session deletion. */
+  sessionGeneration(sessionId: string): number;
   /** Invalidate async owners and release renderer-owned values after permanent deletion. */
   disposeSession(sessionId: string): void;
 }
@@ -62,6 +64,7 @@ export interface ComposerStoreOptions {
 export function createComposerStore(options: ComposerStoreOptions = {}): ComposerStoreApi {
   const revokePreviewUrl = options.revokePreviewUrl ?? ((url: string) => URL.revokeObjectURL(url));
   let submissionSequence = 0;
+  const sessionGenerations = new Map<string, number>();
   return createStore<ComposerStoreState>((set, get) => ({
     attachmentsBySessionId: {},
     contextItemsBySessionId: {},
@@ -212,7 +215,12 @@ export function createComposerStore(options: ComposerStoreOptions = {}): Compose
         };
       });
     },
+    sessionGeneration: (sessionId) => sessionGenerations.get(sessionId) ?? 0,
     disposeSession: (sessionId) => {
+      sessionGenerations.set(
+        sessionId,
+        (sessionGenerations.get(sessionId) ?? 0) + 1,
+      );
       const attachments = get().attachmentsBySessionId[sessionId] ?? [];
       for (const attachment of attachments) revokePreviewUrl(attachment.previewUrl);
       set((state) => {
diff --git a/provenance/t3code/imports/f2-transcript-20260711.json b/provenance/t3code/imports/f2-transcript-20260711.json
index b5e2a2f..f1f43e2 100644
--- a/provenance/t3code/imports/f2-transcript-20260711.json
+++ b/provenance/t3code/imports/f2-transcript-20260711.json
@@ -44,7 +44,7 @@
       "sourceBlobSha": "fdb8bfe7b183480b7b71f2213d907cc211be0e64",
       "targetPath": "apps/web/src/features/composer/composer-store.ts",
       "classification": "adapted",
-      "checksum": "sha256:d8a4a6c4c576f52b755008719d6c117a56a864e91c00ceb447a892710e019bed"
+      "checksum": "sha256:1f6f506691722216a2e42b24efba3099f13c5041b4c01def529679feea1b0796"
     }
   ]
 }