@@ -76,7 +76,14 @@ export function usePageContext(origins: string[], scopeKey: string) {
     let focusRequested = false
     const confirmFocus = () => {
       const bridge = bridgeRef.current
-      if (!focusRequested || bridge?.sessionId !== sessionId || !document.hasFocus()) return
+      if (
+        !focusRequested ||
+        bridge?.sessionId !== sessionId ||
+        !document.hasFocus() ||
+        !composerFocus?.current?.isFocused()
+      ) {
+        return
+      }
       focusRequested = false
       const message: AppToExtensionMessage = {
         channel: 'sim-extension',
@@ -98,7 +105,7 @@ export function usePageContext(origins: string[], scopeKey: string) {
       if (parsed.data.type === 'focus-composer') {
         if (bridgeRef.current?.sessionId === sessionId) {
           focusRequested = true
-          composerFocus?.current?.()
+          composerFocus?.current?.focus()
           confirmFocus()
         }
         return
 
@@ -7,7 +7,7 @@ import { useSession } from '@/lib/auth/client'
 import ExtensionLoading from '@/app/extension/loading'
 import { ExtensionSignIn } from '@/app/extension/sign-in'
 import { FeatureFlagsProvider } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
-import { ChatInputFocusContext } from '@/hooks/use-chat-input-focus'
+import { ChatInputFocusContext, type ChatInputFocusHandle } from '@/hooks/use-chat-input-focus'
 
 interface ExtensionIdentity {
   origins: string[]
@@ -29,7 +29,7 @@ export function ExtensionProviders({
   modelSelectorEnabled,
   planModeEnabled,
 }: ExtensionProvidersProps) {
-  const focusComposer = useRef<(() => void) | null>(null)
+  const focusComposer = useRef<ChatInputFocusHandle | null>(null)
   const { data: session, isPending, error } = useSession()
   if (isPending) return <ExtensionLoading />
   const accessDenied = isApiClientError(error) && (error.status === 401 || error.status === 403)
 
@@ -1,7 +1,12 @@
 import { createContext, type RefObject, useContext, useEffect, useImperativeHandle } from 'react'
 import { isMobileViewport } from '@/hooks/use-is-mobile'
 
-export const ChatInputFocusContext = createContext<RefObject<(() => void) | null> | null>(null)
+export interface ChatInputFocusHandle {
+  focus: () => void
+  isFocused: () => boolean
+}
+
+export const ChatInputFocusContext = createContext<RefObject<ChatInputFocusHandle | null> | null>(null)
 
 interface UseChatInputFocusProps {
   textareaRef: RefObject<HTMLTextAreaElement | null>
@@ -12,9 +17,13 @@ export function useChatInputFocus({ textareaRef }: UseChatInputFocusProps) {
   const requestedFocus = useContext(ChatInputFocusContext)
   useImperativeHandle(
     requestedFocus,
-    () => () => {
-      if (!document.querySelector('[role="dialog"], dialog[open]')) textareaRef.current?.focus()
-    },
+    () => ({
+      focus: () => {
+        if (!document.querySelector('[role="dialog"], dialog[open]')) textareaRef.current?.focus()
+      },
+      isFocused: () =>
+        textareaRef.current !== null && document.activeElement === textareaRef.current,
+    }),
     [textareaRef]
   )
   useEffect(() => {
 
@@ -15,6 +15,7 @@ import {
   type Locator,
   type Page,
   type Request,
+  type Route,
 } from '@playwright/test'
 import { pageSnapshotSchema } from '@sim/browser-extension-protocol'
 import { assertDisposableTestDatabaseUrl } from '@sim/db/testing/test-infrastructure'
@@ -529,7 +530,7 @@ try {
           buffer: Buffer.from('This synthetic file belongs only to extension QA.'),
         })
     )
-  const attachScreenshot = async (target: Locator) => {
+  const screenshotFile = async () => {
     const name = 'drop-fixture.png'
     const png = resolve(temporary, name)
     await writeFile(
@@ -539,8 +540,146 @@ try {
         'base64'
       )
     )
+    return { name, png }
+  }
+  const attachScreenshot = async (target: Locator) => {
+    const { name, png } = await screenshotFile()
     return uploadFile(name, () => dropOnChat(shell, target, { files: [png] }))
   }
+  const verifyPendingCaptureDrop = async (scope: 'workspace' | 'organization' | 'assistant') => {
+    const app = frame()
+    const input = app.getByRole('textbox', {
+      name: scope === 'workspace' ? 'Message' : 'Ask Sim',
+      exact: true,
+    })
+    await expect(input).toBeVisible()
+    await expect(attachments()).toHaveCount(0)
+    const greeting = app.getByRole('heading', { name: 'How can I help?', exact: true })
+    await expect(greeting).toBeVisible()
+    const priorPreference = await worker.evaluate(() =>
+      chrome.storage.local.get('referenceCurrentPage')
+    )
+    // Hold the real transport result so the body drop overlaps pending submission deterministically.
+    const gate = await app.evaluateHandle((parentOrigin) => {
+      let held: MessageEvent<unknown> | undefined
+      let released = false
+      const receive = (event: MessageEvent<unknown>) => {
+        const message = event.data
+        if (
+          released ||
+          event.source !== window.parent ||
+          event.origin !== parentOrigin ||
+          typeof message !== 'object' ||
+          message === null ||
+          !('channel' in message) ||
+          message.channel !== 'sim-extension' ||
+          !('type' in message) ||
+          message.type !== 'send-context'
+        )
+          return
+        held = event
+        event.stopImmediatePropagation()
+      }
+      window.addEventListener('message', receive, true)
+      return {
+        held: () => held !== undefined,
+        release: () => {
+          released = true
+          if (held) window.dispatchEvent(held)
+          held = undefined
+        },
+        dispose: () => window.removeEventListener('message', receive, true),
+      }
+    }, `chrome-extension://${extensionId}`)
+    const endpoint = `${base.origin}/api/mothership/chat`
+    const uploadEndpoint = `${base.origin}/api/files/uploads`
+    const submitted: Record<string, unknown>[] = []
+    let uploadAttempts = 0
+    const interceptChat = (route: Route) => {
+      if (route.request().method() !== 'POST') return route.continue()
+      submitted.push(toRecord(route.request().postDataJSON()))
+      injectedRequests.add(route.request())
+      return route.fulfill({ status: 403, json: { error: 'QA pending capture admission check' } })
+    }
+    const interceptUpload = (route: Route) => {
+      if (route.request().method() !== 'POST') return route.continue()
+      uploadAttempts++
+      injectedRequests.add(route.request())
+      return route.fulfill({ status: 409, json: { error: 'QA unexpected pending upload' } })
+    }
+    await browserContext.route(endpoint, interceptChat)
+    await browserContext.route(uploadEndpoint, interceptUpload)
+    try {
+      await app.getByRole('button', { name: 'Add resources', exact: true }).press('Enter')
+      const preference = app.getByRole('menuitemcheckbox', { name: 'Reference current page' })
+      await expect(preference).toBeVisible()
+      if ((await preference.getAttribute('aria-checked')) !== 'true')
+        await preference.press('Enter')
+      else await preference.press('Escape')
+      await expect(
+        app.getByRole('button', { name: 'Attach current page', exact: true })
+      ).toHaveText('Current page')
+      const draft = `Preserve the original ${scope} send during a screenshot drop.`
+      await input.fill(draft)
+      await source.bringToFront()
+      await input.press('Enter')
+      await expect.poll(() => gate.evaluate((capture) => capture.held())).toBe(true)
+      const preparing = () =>
+        input.evaluate((element) => Boolean(element.closest('[inert][aria-busy="true"]')))
+      await expect.poll(preparing).toBe(true)
+      const { name, png } = await screenshotFile()
+      const pageCount = browserContext.pages().length
+      const previousUrl = app.url()
+      await dropOnChat(shell, greeting, { files: [png] })
+      await app.evaluate(
+        () => new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
+      )
+      await screenshot(`pending-capture-drop-${scope}`)
+      assert.equal(uploadAttempts, 0, `${scope}: a body drop started uploading during capture`)
+      await expect(input).toHaveValue(draft)
+      await expect(app.getByRole('button', { name: `Remove ${name}`, exact: true })).toHaveCount(0)
+      assert.equal(submitted.length, 0, `${scope}: the held capture committed early`)
+      assert.equal(app.url(), previousUrl)
+      assert.equal(browserContext.pages().length, pageCount)
+      await expect.poll(preparing).toBe(true)
+      await gate.evaluate((capture) => capture.release())
+      await expect.poll(() => submitted.length).toBe(1)
+      const body = submitted[0]
+      assert(String(body.message).startsWith(draft))
+      assert.equal(
+        body[scope === 'workspace' ? 'workspaceId' : 'organizationId'],
+        scope === 'workspace' ? alphaId : organizationId
+      )
+      if (scope === 'assistant') assert.equal(body.mode, 'assistant')
+      const pages = submittedPages(body)
+      assert.equal(pages.length, 1)
+      assert(pages[0].text.includes('ORCHID-482'))
+      assert.equal(pages[0].url, `${fixtureOrigin}/page`)
+      assert.equal(body.fileAttachments, undefined)
+      await expect.poll(preparing).toBe(false)
+      await expect(
+        app.getByText('Your draft changed while the page was being read. Send again to continue.', {
+          exact: true,
+        })
+      ).toHaveCount(0)
+      assert.equal(uploadAttempts, 0)
+      await browserContext.unroute(uploadEndpoint, interceptUpload)
+      await attachScreenshot(greeting)
+      await screenshot(`pending-capture-drop-${scope}-recovered`)
+      await app.getByRole('button', { name: `Remove ${name}`, exact: true }).click()
+      assert.equal(submitted.length, 1, `${scope}: recovering drops duplicated the turn`)
+    } finally {
+      await gate.evaluate((capture) => capture.release()).catch(() => {})
+      await gate.evaluate((capture) => capture.dispose()).catch(() => {})
+      await gate.dispose()
+      await browserContext.unroute(endpoint, interceptChat)
+      await browserContext.unroute(uploadEndpoint, interceptUpload)
+      await worker.evaluate(async (previous) => {
+        if ('referenceCurrentPage' in previous) await chrome.storage.local.set(previous)
+        else await chrome.storage.local.remove('referenceCurrentPage')
+      }, priorPreference)
+    }
+  }
   await checkNative(
     'Capture, preview, removal, and the three-page cap use the real composer',
     async () => {
@@ -1703,6 +1842,22 @@ try {
       }
     }
   )
+  await checkNative(
+    'Pending page reference freezes body file drops in workspace and organization chat',
+    async () => {
+      for (const scope of ['workspace', 'organization'] as const) {
+        await shell.close()
+        panel = await openPanel()
+        shell = panel
+        await shell.goto(`chrome-extension://${extensionId}/sidepanel.html`)
+        await observeCaptureReceipts()
+        await navigate(
+          `${base.origin}/extension/${scope === 'workspace' ? alphaId : `o/${organizationId}`}`
+        )
+        await verifyPendingCaptureDrop(scope)
+      }
+    }
+  )
   await checkNative(
     'A screenshot dropped on the workspace or organization chat body uploads once and can be sent by itself',
     async () => {
@@ -2228,6 +2383,20 @@ try {
       } else await shell.unroute('**/api/mothership/chat')
     }
   )
+  await checkAccess(
+    'Restricted Assistant freezes body file drops while a page reference is pending',
+    async () => {
+      await shell.close()
+      panel = await openPanel()
+      shell = panel
+      if (!liveChat) await shell.clock.install()
+      await shell.goto(`chrome-extension://${extensionId}/sidepanel.html`)
+      await observeCaptureReceipts()
+      await navigate(`${base.origin}/extension/o/${organizationId}`)
+      await expect(frame().getByRole('button', { name: 'Attach image', exact: true })).toBeVisible()
+      await verifyPendingCaptureDrop('assistant')
+    }
+  )
   await checkAccess(
     'Revoking organization membership removes the live composer and pending captures',
     async () => {