From 01172ffb9aa0e4d220445e6c6940ff13bf2ddd09 Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 03:55:03 -0700
Subject: [PATCH 01/10] fix(native-chat): preserve IME composition during
 streaming

---
 .../native-chat/NativeChatComposer.tsx        |   1 +
 .../native-chat/NativeChatComposerField.tsx   |  63 ++++-
 .../native-chat-composer-autogrow.test.tsx    |   1 +
 .../native-chat-composer-composition.test.tsx | 216 ++++++++++++++++++
 4 files changed, 277 insertions(+), 4 deletions(-)
 create mode 100644 src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx

diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
index 256e7878f7a3..5205eb193832 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
@@ -411,6 +411,7 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
             handleDraftChange(event.currentTarget.value, event.currentTarget)
           }
         }}
+        onBlur={() => (isComposingRef.current = false)}
         onPaste={handlePaste}
         pickerListboxId={picker.listboxId}
         onChoosePickerItem={completeItem}
diff --git a/src/renderer/src/components/native-chat/NativeChatComposerField.tsx b/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
index 7206b0288bd2..0e6be795c731 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
@@ -1,11 +1,14 @@
 import type {
   ClipboardEventHandler,
   CompositionEventHandler,
+  FocusEventHandler,
   KeyboardEventHandler,
   RefObject
 } from 'react'
+import { useLayoutEffect, useRef } from 'react'
 import { Image as ImageIcon, ImageOff, X } from 'lucide-react'
 import { translate } from '@/i18n/i18n'
+import { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
 import { cn } from '@/lib/utils'
 import { NATIVE_FILE_DROP_TARGET } from '../../../../shared/native-file-drop'
 import { basename } from '@/lib/path'
@@ -41,6 +44,7 @@ export type NativeChatComposerFieldProps = {
   onKeyDown: KeyboardEventHandler<HTMLTextAreaElement>
   onCompositionStart: CompositionEventHandler<HTMLTextAreaElement>
   onCompositionEnd: CompositionEventHandler<HTMLTextAreaElement>
+  onBlur: FocusEventHandler<HTMLTextAreaElement>
   onPaste: ClipboardEventHandler<HTMLTextAreaElement>
   pickerListboxId: string
   onChoosePickerItem: (item: NativeChatPickerItem) => void
@@ -84,6 +88,7 @@ export function NativeChatComposerField({
   onKeyDown,
   onCompositionStart,
   onCompositionEnd,
+  onBlur,
   onPaste,
   pickerListboxId,
   onChoosePickerItem,
@@ -100,6 +105,31 @@ export function NativeChatComposerField({
   sessionOptionsSnapshot,
   sessionOptionsPickerRequest
 }: NativeChatComposerFieldProps): React.JSX.Element {
+  const imeEnterGesture = useImeEnterGestureOwnership()
+  const deferredDraftRef = useRef<string | null>(null)
+  const lastDraftRef = useRef(draft)
+
+  // Browser owns the provisional value; React synchronizes drafts only between IME sessions.
+  useLayoutEffect(() => {
+    const textarea = textareaRef.current
+    if (!textarea) {
+      return
+    }
+    if (imeEnterGesture.isComposing()) {
+      if (draft !== lastDraftRef.current) {
+        deferredDraftRef.current = textarea.value === draft ? null : draft
+      }
+      lastDraftRef.current = draft
+      return
+    }
+    deferredDraftRef.current = null
+    lastDraftRef.current = draft
+    if (textarea.value === draft) {
+      return
+    }
+    textarea.value = draft
+  }, [draft, imeEnterGesture, textareaRef])
+
   return (
     <div className="shrink-0 bg-background">
       {/* Extra bottom padding keeps the input box off the window rim. */}
@@ -167,13 +197,38 @@ export function NativeChatComposerField({
             ) : null}
             <textarea
               ref={textareaRef}
-              value={draft}
+              defaultValue={draft}
               disabled={disabled}
               rows={2}
               onChange={(e) => onDraftChange(e.target.value, e.currentTarget)}
-              onKeyDown={onKeyDown}
-              onCompositionStart={onCompositionStart}
-              onCompositionEnd={onCompositionEnd}
+              onKeyDown={(event) => {
+                if (!imeEnterGesture.ownsKeyDown(event)) {
+                  onKeyDown(event)
+                }
+              }}
+              onKeyUp={imeEnterGesture.onKeyUp}
+              onBlur={(event) => {
+                imeEnterGesture.reset()
+                const deferredDraft = deferredDraftRef.current
+                deferredDraftRef.current = null
+                if (deferredDraft !== null) {
+                  event.currentTarget.value = deferredDraft
+                } else if (event.currentTarget.value !== draft) {
+                  onDraftChange(event.currentTarget.value, event.currentTarget)
+                }
+                onBlur(event)
+              }}
+              onCompositionStart={(event) => {
+                deferredDraftRef.current = null
+                lastDraftRef.current = draft
+                imeEnterGesture.setComposing(true)
+                onCompositionStart(event)
+              }}
+              onCompositionEnd={(event) => {
+                deferredDraftRef.current = null
+                imeEnterGesture.setComposing(false)
+                onCompositionEnd(event)
+              }}
               onPaste={onPaste}
               onSelect={(e) => onTextareaSelect(e.currentTarget)}
               aria-expanded={autocomplete.mode === 'slash' || autocomplete.mode === 'skill'}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
index 96f828761142..cce865bac10b 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
@@ -49,6 +49,7 @@ function renderField(draft: string): HTMLTextAreaElement {
       onKeyDown={vi.fn()}
       onCompositionStart={vi.fn()}
       onCompositionEnd={vi.fn()}
+      onBlur={vi.fn()}
       onPaste={vi.fn()}
       pickerListboxId="picker"
       onChoosePickerItem={vi.fn()}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
new file mode 100644
index 000000000000..0085511a5cf1
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
@@ -0,0 +1,216 @@
+// @vitest-environment happy-dom
+
+import { createRef } from 'react'
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('@/i18n/i18n', () => ({
+  translate: (_key: string, fallback: string) => fallback
+}))
+
+vi.mock('./NativeChatComposerActions', () => ({
+  NativeChatComposerActions: () => <div data-testid="composer-actions" />
+}))
+
+vi.mock('./NativeChatAutocompleteMenus', () => ({
+  NativeChatMentionHint: () => null,
+  NativeChatPickerMenu: () => null
+}))
+
+import {
+  NativeChatComposerField,
+  type NativeChatComposerFieldProps
+} from './NativeChatComposerField'
+
+afterEach(() => cleanup())
+
+function fieldProps(
+  overrides: Partial<NativeChatComposerFieldProps> = {}
+): NativeChatComposerFieldProps {
+  return {
+    textareaRef: createRef<HTMLTextAreaElement>(),
+    draft: '',
+    disabled: false,
+    hasPty: true,
+    canSend: true,
+    autocomplete: { mode: 'none' },
+    activeSuggestion: 0,
+    notice: null,
+    imageAttachments: [],
+    sendButtonDisabled: false,
+    isWorking: false,
+    attachDisabled: false,
+    dictationDisabled: false,
+    isDictating: false,
+    isDictationHoldMode: false,
+    onDraftChange: vi.fn(),
+    onTextareaSelect: vi.fn(),
+    onKeyDown: vi.fn(),
+    onCompositionStart: vi.fn(),
+    onCompositionEnd: vi.fn(),
+    onBlur: vi.fn(),
+    onPaste: vi.fn(),
+    pickerListboxId: 'picker',
+    onChoosePickerItem: vi.fn(),
+    onRetrySkills: vi.fn(),
+    onAcceptMention: vi.fn(),
+    onRemoveImageAttachment: vi.fn(),
+    onAttach: vi.fn(),
+    onDictationToggle: vi.fn(),
+    onDictationHoldStart: vi.fn(),
+    onDictationHoldEnd: vi.fn(),
+    onSend: vi.fn(),
+    sessionOptionsSurface: null,
+    sessionOptionsSnapshot: [],
+    ...overrides
+  }
+}
+
+function textarea(): HTMLTextAreaElement {
+  return screen.getByRole('textbox') as HTMLTextAreaElement
+}
+
+describe('native chat composer composition ownership', () => {
+  it('preserves the focused browser preedit through 120 stale streaming rerenders', () => {
+    const textareaRef = createRef<HTMLTextAreaElement>()
+    const onCompositionEnd = vi.fn()
+    const props = fieldProps({ textareaRef, onCompositionEnd })
+    const view = render(<NativeChatComposerField {...props} />)
+    const input = textarea()
+    input.focus()
+    fireEvent.compositionStart(input)
+    input.value = '가'
+
+    for (let index = 0; index < 120; index += 1) {
+      view.rerender(<NativeChatComposerField {...props} draft={`stale streaming draft ${index}`} />)
+      expect(textarea()).toBe(input)
+      expect(document.activeElement).toBe(input)
+      expect(input.value).toBe('가')
+    }
+
+    fireEvent.compositionEnd(input, { data: '가' })
+    expect(onCompositionEnd).toHaveBeenCalledOnce()
+    expect(input.value).toBe('가')
+  })
+
+  it('synchronizes launch, programmatic, cleared, and pane-scoped drafts while idle', () => {
+    const textareaRef = createRef<HTMLTextAreaElement>()
+    const props = fieldProps({ textareaRef, draft: 'launch draft' })
+    const view = render(<NativeChatComposerField {...props} />)
+    const input = textarea()
+
+    for (const draft of ['programmatic insertion', '', 'next pane draft']) {
+      view.rerender(<NativeChatComposerField {...props} draft={draft} />)
+      expect(textarea()).toBe(input)
+      expect(input.value).toBe(draft)
+    }
+  })
+
+  it('keeps adopting change events and exposes the final deletion at composition end', () => {
+    const onDraftChange = vi.fn()
+    let settledValue: string | null = null
+    render(
+      <NativeChatComposerField
+        {...fieldProps({
+          draft: '한',
+          onDraftChange,
+          onCompositionEnd: (event) => {
+            settledValue = event.currentTarget.value
+          }
+        })}
+      />
+    )
+    const input = textarea()
+    fireEvent.compositionStart(input)
+    fireEvent.change(input, { target: { value: '한글' } })
+    expect(onDraftChange).toHaveBeenLastCalledWith('한글', input)
+
+    input.value = ''
+    fireEvent.compositionEnd(input, { data: '' })
+    expect(settledValue).toBe('')
+  })
+
+  it('uses the shared Enter gesture owner without swallowing the next deliberate Enter', () => {
+    const onKeyDown = vi.fn()
+    render(<NativeChatComposerField {...fieldProps({ draft: '가', onKeyDown })} />)
+    const input = textarea()
+    fireEvent.compositionStart(input)
+
+    fireEvent.keyDown(input, { key: 'Process', keyCode: 229, isComposing: true })
+    fireEvent.compositionEnd(input, { data: '가' })
+    const redispatch = fireEvent.keyDown(input, {
+      key: 'Enter',
+      keyCode: 13,
+      isComposing: false
+    })
+
+    expect(redispatch).toBe(false)
+    expect(onKeyDown).not.toHaveBeenCalled()
+
+    fireEvent.keyUp(input, { key: 'Enter', keyCode: 13 })
+    fireEvent.keyDown(input, { key: 'Enter', keyCode: 13, isComposing: false })
+    expect(onKeyDown).toHaveBeenCalledOnce()
+  })
+
+  it('releases composition ownership on blur even when compositionend is omitted', () => {
+    const onBlur = vi.fn()
+    const onKeyDown = vi.fn()
+    const props = fieldProps({ draft: '가', onBlur, onKeyDown })
+    const view = render(<NativeChatComposerField {...props} />)
+    const input = textarea()
+    fireEvent.compositionStart(input)
+    input.value = '각'
+
+    fireEvent.blur(input)
+    view.rerender(<NativeChatComposerField {...props} draft="external draft" />)
+    fireEvent.keyDown(input, { key: 'Enter', keyCode: 13, isComposing: false })
+
+    expect(onBlur).toHaveBeenCalledOnce()
+    expect(input.value).toBe('external draft')
+    expect(onKeyDown).toHaveBeenCalledOnce()
+  })
+
+  it('applies a draft deferred before blur when compositionend is omitted', () => {
+    const onBlur = vi.fn()
+    const props = fieldProps({ onBlur })
+    const view = render(<NativeChatComposerField {...props} />)
+    const input = textarea()
+    fireEvent.compositionStart(input)
+    input.value = '각'
+
+    view.rerender(<NativeChatComposerField {...props} draft="next pane draft" />)
+    expect(input.value).toBe('각')
+    fireEvent.blur(input)
+
+    expect(onBlur).toHaveBeenCalledOnce()
+    expect(input.value).toBe('next pane draft')
+  })
+
+  it('adopts the browser value on blur when compositionend is omitted without a deferred draft', () => {
+    const onDraftChange = vi.fn()
+    render(<NativeChatComposerField {...fieldProps({ onDraftChange })} />)
+    const input = textarea()
+    fireEvent.compositionStart(input)
+    input.value = '각'
+
+    fireEvent.blur(input)
+
+    expect(onDraftChange).toHaveBeenCalledOnce()
+    expect(onDraftChange).toHaveBeenCalledWith('각', input)
+  })
+
+  it('does not mistake a same-draft streaming rerender for a deferred draft', () => {
+    const onDraftChange = vi.fn()
+    const props = fieldProps({ onDraftChange })
+    const view = render(<NativeChatComposerField {...props} />)
+    const input = textarea()
+    fireEvent.compositionStart(input)
+    input.value = '각'
+
+    view.rerender(<NativeChatComposerField {...props} />)
+    fireEvent.blur(input)
+
+    expect(input.value).toBe('각')
+    expect(onDraftChange).toHaveBeenCalledWith('각', input)
+  })
+})

From e11e166c41119f136ce7d9f9d7560c26c9fd71e7 Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 04:15:10 -0700
Subject: [PATCH 02/10] fix(native-chat): remount composer when draft owner
 changes

---
 .../native-chat/NativeChatComposer.test.tsx   | 27 ++++++++++++++++++-
 .../native-chat/NativeChatComposer.tsx        | 14 +++++-----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
index d3cc335357cb..8c704a84e4ff 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
@@ -103,7 +103,7 @@ vi.mock('./native-chat-draft-cache', () => ({
 vi.mock('./NativeChatComposerField', () => ({
   NativeChatComposerField: (props: { onSend?: () => void; onStop?: () => void }) => {
     mocks.fieldProps = props
-    return null
+    return <div data-testid="native-chat-composer-field" />
   }
 }))
 vi.mock('./use-native-chat-skills', () => ({
@@ -402,6 +402,7 @@ describe('NativeChatComposer', () => {
         agent="codex"
       />
     )
+    const field = view.getByTestId('native-chat-composer-field')
 
     view.rerender(
       <NativeChatComposer
@@ -421,6 +422,30 @@ describe('NativeChatComposer', () => {
     )
 
     expect(new Set(mocks.draftScopeKeys)).toEqual(new Set(['tab-1:leaf-1']))
+    expect(view.getByTestId('native-chat-composer-field')).toBe(field)
+  })
+
+  it('remounts the composer field when draft ownership moves to another pane', () => {
+    const view = render(
+      <NativeChatComposer
+        terminalTabId="tab-1"
+        paneKey="tab-1:leaf-1"
+        targetPtyId="pty-1"
+        agent="codex"
+      />
+    )
+    const previousField = view.getByTestId('native-chat-composer-field')
+
+    view.rerender(
+      <NativeChatComposer
+        terminalTabId="tab-1"
+        paneKey="tab-1:leaf-2"
+        targetPtyId="pty-2"
+        agent="codex"
+      />
+    )
+
+    expect(view.getByTestId('native-chat-composer-field')).not.toBe(previousField)
   })
 
   it('adopts an IME deletion delivered only by compositionend', () => {
diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
index 5205eb193832..1b5f33abea88 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
@@ -82,8 +82,7 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
     // images survive both TUI/GUI toggles and PTY replacement on reconnect.
     // Why: local, SSH, and runtime reconnects can replace or temporarily clear
     // the PTY id. Pane identity is the stable ownership key for unsent input.
-    const draftScopeKey = paneKey
-    const { draft, setDraft } = useNativeChatDraft(draftScopeKey)
+    const { draft, setDraft } = useNativeChatDraft(paneKey)
     const [caret, setCaret] = useState(draft.length)
     useNativeChatLaunchDraftAdoption({
       terminalTabId,
@@ -118,10 +117,10 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
     // Place the caret at the end of the (possibly restored) draft when the
     // composer is reused for a different pane. Adjusted during render (matching
     // the draft reload) so caret and text stay consistent on the first paint.
-    const lastDraftScopeKey = useRef(draftScopeKey)
-    if (lastDraftScopeKey.current !== draftScopeKey) {
-      lastDraftScopeKey.current = draftScopeKey
-      setCaret(readNativeChatDraftCache(draftScopeKey).length)
+    const lastDraftScopeKey = useRef(paneKey)
+    if (lastDraftScopeKey.current !== paneKey) {
+      lastDraftScopeKey.current = paneKey
+      setCaret(readNativeChatDraftCache(paneKey).length)
     }
 
     const agentCommands = useMemo(
@@ -134,7 +133,7 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
     const picker = useNativeChatPickerState({
       agent,
       terminalTabId,
-      draftScopeKey,
+      draftScopeKey: paneKey,
       draft,
       caret,
       agentCommands,
@@ -380,6 +379,7 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
 
     return (
       <NativeChatComposerField
+        key={paneKey}
         textareaRef={textareaRef}
         draft={draft}
         disabled={disabled}

From 3931fd7faeb89409b0574de9205f371e9324a42b Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 04:16:16 -0700
Subject: [PATCH 03/10] fix(native-chat): reset composition across draft owners

---
 .../components/native-chat/NativeChatComposer.test.tsx | 10 +++++++++-
 .../src/components/native-chat/NativeChatComposer.tsx  |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
index 8c704a84e4ff..7684b9d2fdcf 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
@@ -12,6 +12,7 @@ import { clearNativeChatModelEnrichmentForTests } from './native-chat-session-op
 
 const mocks = vi.hoisted(() => ({
   cancelPendingSends: vi.fn(),
+  composerIsComposing: null as (() => boolean) | null,
   fieldProps: null as {
     onSend?: () => void
     onStop?: () => void
@@ -133,7 +134,10 @@ vi.mock('../dictation/dictation-control-events', () => ({
   dispatchDictationControl: vi.fn()
 }))
 vi.mock('./use-native-chat-composer-keydown', () => ({
-  useNativeChatComposerKeyDown: () => vi.fn()
+  useNativeChatComposerKeyDown: (args: { isComposing: () => boolean }) => {
+    mocks.composerIsComposing = args.isComposing
+    return vi.fn()
+  }
 }))
 vi.mock('./use-native-chat-send-lifecycle', () => ({
   useNativeChatSendLifecycle: () => ({
@@ -155,6 +159,7 @@ describe('NativeChatComposer', () => {
     mocks.imageAttachments = []
     mocks.draftScopeKeys.length = 0
     mocks.confirmationObserver = null
+    mocks.composerIsComposing = null
     mocks.createClaudeModelSwitchConfirmationObserver.mockImplementation(() => {
       const observer = {
         ready: Promise.resolve(),
@@ -435,6 +440,8 @@ describe('NativeChatComposer', () => {
       />
     )
     const previousField = view.getByTestId('native-chat-composer-field')
+    act(() => mocks.fieldProps?.onCompositionStart?.())
+    expect(mocks.composerIsComposing?.()).toBe(true)
 
     view.rerender(
       <NativeChatComposer
@@ -446,6 +453,7 @@ describe('NativeChatComposer', () => {
     )
 
     expect(view.getByTestId('native-chat-composer-field')).not.toBe(previousField)
+    expect(mocks.composerIsComposing?.()).toBe(false)
   })
 
   it('adopts an IME deletion delivered only by compositionend', () => {
diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
index 1b5f33abea88..4de6cbf09754 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
@@ -106,7 +106,6 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
     )
     const dictationState = useAppStore((store) => store.dictationState)
     const voiceSettings = useAppStore((store) => store.settings?.voice)
-    const isDictationHoldMode = voiceSettings?.dictationMode === 'hold'
     const dictationDisabled = voiceSettings?.enabled !== true || !voiceSettings.sttModel
     const isDictating =
       dictationPressed ||
@@ -120,6 +119,7 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
     const lastDraftScopeKey = useRef(paneKey)
     if (lastDraftScopeKey.current !== paneKey) {
       lastDraftScopeKey.current = paneKey
+      isComposingRef.current = false
       setCaret(readNativeChatDraftCache(paneKey).length)
     }
 
@@ -394,7 +394,7 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
         attachDisabled={disabled}
         dictationDisabled={dictationDisabled}
         isDictating={isDictating}
-        isDictationHoldMode={isDictationHoldMode}
+        isDictationHoldMode={voiceSettings?.dictationMode === 'hold'}
         onDraftChange={handleDraftChange}
         onTextareaSelect={(element) => {
           syncCaret(element)

From d1722a48270c76893bd91f7ec6d3efe1d7f627fc Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 04:51:44 -0700
Subject: [PATCH 04/10] fix(native-chat): key pane-owned composer state

---
 .../native-chat/NativeChatComposer.tsx        | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
index 4de6cbf09754..87cf5024da1a 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
@@ -14,7 +14,6 @@ import {
   pushHistory,
   type HistoryState
 } from './native-chat-composer-state'
-import { readNativeChatDraftCache } from './native-chat-draft-cache'
 import { useNativeChatDraft } from './use-native-chat-draft'
 import { useNativeChatLaunchDraftAdoption } from './use-native-chat-launch-draft-adoption'
 import { NativeChatComposerField } from './NativeChatComposerField'
@@ -57,8 +56,8 @@ const ESC = '\x1b'
  * Slash-command and `@file` autocomplete are agent-aware; image paste persists a
  * temp file and injects the agent-appropriate path (or reports unsupported).
  */
-export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeChatComposerProps>(
-  function NativeChatComposer(
+const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatComposerProps>(
+  function NativeChatComposerPane(
     {
       terminalTabId,
       paneKey,
@@ -113,16 +112,6 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
       dictationState === 'listening' ||
       dictationState === 'stopping'
 
-    // Place the caret at the end of the (possibly restored) draft when the
-    // composer is reused for a different pane. Adjusted during render (matching
-    // the draft reload) so caret and text stay consistent on the first paint.
-    const lastDraftScopeKey = useRef(paneKey)
-    if (lastDraftScopeKey.current !== paneKey) {
-      lastDraftScopeKey.current = paneKey
-      isComposingRef.current = false
-      setCaret(readNativeChatDraftCache(paneKey).length)
-    }
-
     const agentCommands = useMemo(
       () =>
         structuredTransport
@@ -379,7 +368,6 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
 
     return (
       <NativeChatComposerField
-        key={paneKey}
         textareaRef={textareaRef}
         draft={draft}
         disabled={disabled}
@@ -441,3 +429,9 @@ export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeCha
     )
   }
 )
+
+export const NativeChatComposer = forwardRef<NativeChatComposerHandle, NativeChatComposerProps>(
+  function NativeChatComposer(props, ref): React.JSX.Element {
+    return <NativeChatComposerPane key={props.paneKey} {...props} ref={ref} />
+  }
+)

From bea8731b2f6d3c1c387877930b010b241ceadf4b Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 16:21:36 -0700
Subject: [PATCH 05/10] fix(native-chat): preserve resolved attachments through
 IME

---
 .../native-chat/NativeChatComposer.test.tsx   |  56 ++++++--
 .../native-chat/NativeChatComposer.tsx        |  41 +++---
 .../native-chat/NativeChatComposerField.tsx   |  58 +++------
 .../native-chat-composer-autogrow.test.tsx    |  15 ++-
 .../native-chat-composer-composition.test.tsx | 120 ++++++++++++------
 ...-native-chat-composer-attachments.test.tsx | 115 ++++++++++++-----
 .../use-native-chat-composer-attachments.ts   |  62 ++++++---
 ...-native-chat-external-attachments.test.tsx |  53 ++++++++
 .../use-native-chat-external-attachments.ts   |   8 +-
 9 files changed, 357 insertions(+), 171 deletions(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
index 7684b9d2fdcf..be54ac6ac003 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
@@ -13,11 +13,16 @@ import { clearNativeChatModelEnrichmentForTests } from './native-chat-session-op
 const mocks = vi.hoisted(() => ({
   cancelPendingSends: vi.fn(),
   composerIsComposing: null as (() => boolean) | null,
+  attachmentIsComposing: null as (() => boolean) | null,
+  flushPendingAttachments: vi.fn(),
   fieldProps: null as {
     onSend?: () => void
     onStop?: () => void
-    onCompositionStart?: () => void
-    onCompositionEnd?: (event: { currentTarget: HTMLTextAreaElement }) => void
+    imeEnterGesture?: {
+      isComposing: () => boolean
+      setComposing: (active: boolean) => void
+    }
+    onImeSettled?: (element: HTMLTextAreaElement) => void
     sessionOptionsSurface?: SessionOptionsSurface | null
     sessionOptionsSnapshot?: SessionOptionDescriptor[]
     attachDisabled?: boolean
@@ -111,12 +116,16 @@ vi.mock('./use-native-chat-skills', () => ({
   useNativeChatSkills: () => ({ status: 'ready', skills: [], error: null, retry: () => {} })
 }))
 vi.mock('./use-native-chat-composer-attachments', () => ({
-  useNativeChatComposerAttachments: () => ({
-    imageAttachments: mocks.imageAttachments,
-    attachResolvedPaths: vi.fn(),
-    clearImageAttachments: vi.fn(),
-    removeImageAttachment: vi.fn()
-  })
+  useNativeChatComposerAttachments: (args: { isComposing: () => boolean }) => {
+    mocks.attachmentIsComposing = args.isComposing
+    return {
+      imageAttachments: mocks.imageAttachments,
+      attachResolvedPaths: vi.fn(),
+      clearImageAttachments: vi.fn(),
+      flushPendingAttachments: mocks.flushPendingAttachments,
+      removeImageAttachment: vi.fn()
+    }
+  }
 }))
 vi.mock('./use-native-chat-composer-paste', () => ({
   useNativeChatComposerPaste: () => ({
@@ -160,6 +169,7 @@ describe('NativeChatComposer', () => {
     mocks.draftScopeKeys.length = 0
     mocks.confirmationObserver = null
     mocks.composerIsComposing = null
+    mocks.attachmentIsComposing = null
     mocks.createClaudeModelSwitchConfirmationObserver.mockImplementation(() => {
       const observer = {
         ready: Promise.resolve(),
@@ -440,7 +450,7 @@ describe('NativeChatComposer', () => {
       />
     )
     const previousField = view.getByTestId('native-chat-composer-field')
-    act(() => mocks.fieldProps?.onCompositionStart?.())
+    act(() => mocks.fieldProps?.imeEnterGesture?.setComposing(true))
     expect(mocks.composerIsComposing?.()).toBe(true)
 
     view.rerender(
@@ -456,6 +466,21 @@ describe('NativeChatComposer', () => {
     expect(mocks.composerIsComposing?.()).toBe(false)
   })
 
+  it('shares one stable composition owner between keyboard and attachment paths', () => {
+    render(
+      <NativeChatComposer
+        terminalTabId="tab-1"
+        paneKey="tab-1:leaf-1"
+        targetPtyId="pty-1"
+        agent="codex"
+      />
+    )
+
+    expect(mocks.attachmentIsComposing).toBe(mocks.composerIsComposing)
+    act(() => mocks.fieldProps?.imeEnterGesture?.setComposing(true))
+    expect(mocks.attachmentIsComposing?.()).toBe(true)
+  })
+
   it('adopts an IME deletion delivered only by compositionend', () => {
     render(
       <NativeChatComposer
@@ -468,14 +493,19 @@ describe('NativeChatComposer', () => {
     const textarea = document.createElement('textarea')
     textarea.value = ''
     mocks.setDraft.mockClear()
+    mocks.flushPendingAttachments.mockClear()
 
     act(() => {
-      mocks.fieldProps?.onCompositionStart?.()
-      mocks.fieldProps?.onCompositionEnd?.({ currentTarget: textarea })
+      mocks.fieldProps?.imeEnterGesture?.setComposing(false)
+      mocks.fieldProps?.onImeSettled?.(textarea)
     })
 
     expect(mocks.setDraft).toHaveBeenCalledOnce()
     expect(mocks.setDraft).toHaveBeenCalledWith('')
+    expect(mocks.flushPendingAttachments).toHaveBeenCalledOnce()
+    expect(mocks.setDraft.mock.invocationCallOrder[0]).toBeLessThan(
+      mocks.flushPendingAttachments.mock.invocationCallOrder[0] ?? Number.POSITIVE_INFINITY
+    )
   })
 
   it('does not duplicate a composition value already adopted by onChange', () => {
@@ -490,10 +520,12 @@ describe('NativeChatComposer', () => {
     const textarea = document.createElement('textarea')
     textarea.value = 'hello'
     mocks.setDraft.mockClear()
+    mocks.flushPendingAttachments.mockClear()
 
-    act(() => mocks.fieldProps?.onCompositionEnd?.({ currentTarget: textarea }))
+    act(() => mocks.fieldProps?.onImeSettled?.(textarea))
 
     expect(mocks.setDraft).not.toHaveBeenCalled()
+    expect(mocks.flushPendingAttachments).toHaveBeenCalledOnce()
   })
 
   it('renders the Claude model picker while host discovery is still pending', () => {
diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
index 87cf5024da1a..3bfbfe812dc9 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
@@ -36,6 +36,7 @@ import type {
 } from './native-chat-composer-types'
 import { dispatchNativeChatStructuredComposerText } from './native-chat-structured-composer-dispatch'
 import { useNativeChatPtyComposerSend } from './use-native-chat-pty-composer-send'
+import { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
 
 export type {
   NativeChatComposerHandle,
@@ -97,7 +98,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
     const [notice, setNotice] = useState<string | null>(null)
     const [dictationPressed, setDictationPressed] = useState(false)
     const textareaRef = useRef<HTMLTextAreaElement>(null)
-    const isComposingRef = useRef(false)
+    const imeEnterGesture = useImeEnterGestureOwnership()
     const { cancelPendingSends, trackPendingSend } = useNativeChatSendLifecycle(
       terminalTabId,
       targetPtyId,
@@ -157,17 +158,20 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       setCaret(el.selectionStart ?? el.value.length)
     }, [])
 
+    const attachments = useNativeChatComposerAttachments({
+      attachmentScopeKey: paneKey,
+      allowWithoutTarget: Boolean(structuredTransport),
+      caret,
+      disabled,
+      isComposing: imeEnterGesture.isComposing,
+      resolveTarget,
+      textareaRef,
+      setCaret,
+      setDraft,
+      setNotice
+    })
     const { imageAttachments, attachResolvedPaths, clearImageAttachments, removeImageAttachment } =
-      useNativeChatComposerAttachments({
-        attachmentScopeKey: paneKey,
-        allowWithoutTarget: Boolean(structuredTransport),
-        caret,
-        resolveTarget,
-        textareaRef,
-        setCaret,
-        setDraft,
-        setNotice
-      })
+      attachments
     const sendButtonDisabled = isWorking
       ? !hasPty || !onStop
       : disabled || (draft.trim() === '' && imageAttachments.length === 0)
@@ -343,7 +347,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       activeSuggestion,
       draft,
       history,
-      isComposing: () => isComposingRef.current,
+      isComposing: imeEnterGesture.isComposing,
       completePickerItem: completeItem,
       dispatchPickerCommand,
       dismissPicker: dismiss,
@@ -383,6 +387,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
         dictationDisabled={dictationDisabled}
         isDictating={isDictating}
         isDictationHoldMode={voiceSettings?.dictationMode === 'hold'}
+        imeEnterGesture={imeEnterGesture}
         onDraftChange={handleDraftChange}
         onTextareaSelect={(element) => {
           syncCaret(element)
@@ -390,16 +395,12 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
           setActiveSuggestion(0)
         }}
         onKeyDown={handleKeyDown}
-        onCompositionStart={() => {
-          isComposingRef.current = true
-        }}
-        onCompositionEnd={(event) => {
-          isComposingRef.current = false
-          if (event.currentTarget.value !== draft) {
-            handleDraftChange(event.currentTarget.value, event.currentTarget)
+        onImeSettled={(element) => {
+          if (element.value !== draft) {
+            handleDraftChange(element.value, element)
           }
+          attachments.flushPendingAttachments()
         }}
-        onBlur={() => (isComposingRef.current = false)}
         onPaste={handlePaste}
         pickerListboxId={picker.listboxId}
         onChoosePickerItem={completeItem}
diff --git a/src/renderer/src/components/native-chat/NativeChatComposerField.tsx b/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
index 0e6be795c731..28e973ff9fdb 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
@@ -1,14 +1,8 @@
-import type {
-  ClipboardEventHandler,
-  CompositionEventHandler,
-  FocusEventHandler,
-  KeyboardEventHandler,
-  RefObject
-} from 'react'
-import { useLayoutEffect, useRef } from 'react'
+import type { ClipboardEventHandler, KeyboardEventHandler, RefObject } from 'react'
+import { useLayoutEffect } from 'react'
 import { Image as ImageIcon, ImageOff, X } from 'lucide-react'
 import { translate } from '@/i18n/i18n'
-import { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
+import type { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
 import { cn } from '@/lib/utils'
 import { NATIVE_FILE_DROP_TARGET } from '../../../../shared/native-file-drop'
 import { basename } from '@/lib/path'
@@ -39,12 +33,11 @@ export type NativeChatComposerFieldProps = {
   dictationDisabled: boolean
   isDictating: boolean
   isDictationHoldMode: boolean
+  imeEnterGesture: ReturnType<typeof useImeEnterGestureOwnership>
   onDraftChange: (value: string, element: HTMLTextAreaElement) => void
   onTextareaSelect: (element: HTMLTextAreaElement) => void
   onKeyDown: KeyboardEventHandler<HTMLTextAreaElement>
-  onCompositionStart: CompositionEventHandler<HTMLTextAreaElement>
-  onCompositionEnd: CompositionEventHandler<HTMLTextAreaElement>
-  onBlur: FocusEventHandler<HTMLTextAreaElement>
+  onImeSettled: (element: HTMLTextAreaElement) => void
   onPaste: ClipboardEventHandler<HTMLTextAreaElement>
   pickerListboxId: string
   onChoosePickerItem: (item: NativeChatPickerItem) => void
@@ -83,12 +76,11 @@ export function NativeChatComposerField({
   dictationDisabled,
   isDictating,
   isDictationHoldMode,
+  imeEnterGesture,
   onDraftChange,
   onTextareaSelect,
   onKeyDown,
-  onCompositionStart,
-  onCompositionEnd,
-  onBlur,
+  onImeSettled,
   onPaste,
   pickerListboxId,
   onChoosePickerItem,
@@ -105,25 +97,12 @@ export function NativeChatComposerField({
   sessionOptionsSnapshot,
   sessionOptionsPickerRequest
 }: NativeChatComposerFieldProps): React.JSX.Element {
-  const imeEnterGesture = useImeEnterGestureOwnership()
-  const deferredDraftRef = useRef<string | null>(null)
-  const lastDraftRef = useRef(draft)
-
   // Browser owns the provisional value; React synchronizes drafts only between IME sessions.
   useLayoutEffect(() => {
     const textarea = textareaRef.current
-    if (!textarea) {
+    if (!textarea || imeEnterGesture.isComposing()) {
       return
     }
-    if (imeEnterGesture.isComposing()) {
-      if (draft !== lastDraftRef.current) {
-        deferredDraftRef.current = textarea.value === draft ? null : draft
-      }
-      lastDraftRef.current = draft
-      return
-    }
-    deferredDraftRef.current = null
-    lastDraftRef.current = draft
     if (textarea.value === draft) {
       return
     }
@@ -208,26 +187,21 @@ export function NativeChatComposerField({
               }}
               onKeyUp={imeEnterGesture.onKeyUp}
               onBlur={(event) => {
+                const compositionWasActive = imeEnterGesture.isComposing()
                 imeEnterGesture.reset()
-                const deferredDraft = deferredDraftRef.current
-                deferredDraftRef.current = null
-                if (deferredDraft !== null) {
-                  event.currentTarget.value = deferredDraft
-                } else if (event.currentTarget.value !== draft) {
-                  onDraftChange(event.currentTarget.value, event.currentTarget)
+                if (compositionWasActive) {
+                  onImeSettled(event.currentTarget)
                 }
-                onBlur(event)
               }}
-              onCompositionStart={(event) => {
-                deferredDraftRef.current = null
-                lastDraftRef.current = draft
+              onCompositionStart={() => {
                 imeEnterGesture.setComposing(true)
-                onCompositionStart(event)
               }}
               onCompositionEnd={(event) => {
-                deferredDraftRef.current = null
+                const compositionWasActive = imeEnterGesture.isComposing()
                 imeEnterGesture.setComposing(false)
-                onCompositionEnd(event)
+                if (compositionWasActive) {
+                  onImeSettled(event.currentTarget)
+                }
               }}
               onPaste={onPaste}
               onSelect={(e) => onTextareaSelect(e.currentTarget)}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
index cce865bac10b..2ed991ae764e 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
@@ -23,11 +23,13 @@ vi.mock('./NativeChatAutocompleteMenus', () => ({
 }))
 
 import { NativeChatComposerField } from './NativeChatComposerField'
+import { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
 
 afterEach(() => cleanup())
 
-function renderField(draft: string): HTMLTextAreaElement {
-  render(
+function TestField({ draft }: { draft: string }): React.JSX.Element {
+  const imeEnterGesture = useImeEnterGestureOwnership()
+  return (
     <NativeChatComposerField
       textareaRef={createRef<HTMLTextAreaElement>()}
       draft={draft}
@@ -44,12 +46,11 @@ function renderField(draft: string): HTMLTextAreaElement {
       dictationDisabled={false}
       isDictating={false}
       isDictationHoldMode={false}
+      imeEnterGesture={imeEnterGesture}
       onDraftChange={vi.fn()}
       onTextareaSelect={vi.fn()}
       onKeyDown={vi.fn()}
-      onCompositionStart={vi.fn()}
-      onCompositionEnd={vi.fn()}
-      onBlur={vi.fn()}
+      onImeSettled={vi.fn()}
       onPaste={vi.fn()}
       pickerListboxId="picker"
       onChoosePickerItem={vi.fn()}
@@ -65,6 +66,10 @@ function renderField(draft: string): HTMLTextAreaElement {
       sessionOptionsSnapshot={[]}
     />
   )
+}
+
+function renderField(draft: string): HTMLTextAreaElement {
+  render(<TestField draft={draft} />)
   return screen.getByRole('textbox') as HTMLTextAreaElement
 }
 
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
index 0085511a5cf1..83615703120d 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
@@ -1,7 +1,7 @@
 // @vitest-environment happy-dom
 
 import { createRef } from 'react'
-import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
 vi.mock('@/i18n/i18n', () => ({
@@ -21,12 +21,18 @@ import {
   NativeChatComposerField,
   type NativeChatComposerFieldProps
 } from './NativeChatComposerField'
+import { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
 
 afterEach(() => cleanup())
 
-function fieldProps(
-  overrides: Partial<NativeChatComposerFieldProps> = {}
-): NativeChatComposerFieldProps {
+type TestFieldProps = Omit<NativeChatComposerFieldProps, 'imeEnterGesture'>
+
+function TestField(props: TestFieldProps): React.JSX.Element {
+  const imeEnterGesture = useImeEnterGestureOwnership()
+  return <NativeChatComposerField {...props} imeEnterGesture={imeEnterGesture} />
+}
+
+function fieldProps(overrides: Partial<TestFieldProps> = {}): TestFieldProps {
   return {
     textareaRef: createRef<HTMLTextAreaElement>(),
     draft: '',
@@ -46,9 +52,7 @@ function fieldProps(
     onDraftChange: vi.fn(),
     onTextareaSelect: vi.fn(),
     onKeyDown: vi.fn(),
-    onCompositionStart: vi.fn(),
-    onCompositionEnd: vi.fn(),
-    onBlur: vi.fn(),
+    onImeSettled: vi.fn(),
     onPaste: vi.fn(),
     pickerListboxId: 'picker',
     onChoosePickerItem: vi.fn(),
@@ -73,34 +77,35 @@ function textarea(): HTMLTextAreaElement {
 describe('native chat composer composition ownership', () => {
   it('preserves the focused browser preedit through 120 stale streaming rerenders', () => {
     const textareaRef = createRef<HTMLTextAreaElement>()
-    const onCompositionEnd = vi.fn()
-    const props = fieldProps({ textareaRef, onCompositionEnd })
-    const view = render(<NativeChatComposerField {...props} />)
+    const onImeSettled = vi.fn()
+    const props = fieldProps({ textareaRef, onImeSettled })
+    const view = render(<TestField {...props} />)
     const input = textarea()
     input.focus()
     fireEvent.compositionStart(input)
     input.value = '가'
 
     for (let index = 0; index < 120; index += 1) {
-      view.rerender(<NativeChatComposerField {...props} draft={`stale streaming draft ${index}`} />)
+      view.rerender(<TestField {...props} draft={`stale streaming draft ${index}`} />)
       expect(textarea()).toBe(input)
       expect(document.activeElement).toBe(input)
       expect(input.value).toBe('가')
     }
 
     fireEvent.compositionEnd(input, { data: '가' })
-    expect(onCompositionEnd).toHaveBeenCalledOnce()
+    expect(onImeSettled).toHaveBeenCalledOnce()
+    expect(onImeSettled).toHaveBeenCalledWith(input)
     expect(input.value).toBe('가')
   })
 
   it('synchronizes launch, programmatic, cleared, and pane-scoped drafts while idle', () => {
     const textareaRef = createRef<HTMLTextAreaElement>()
     const props = fieldProps({ textareaRef, draft: 'launch draft' })
-    const view = render(<NativeChatComposerField {...props} />)
+    const view = render(<TestField {...props} />)
     const input = textarea()
 
     for (const draft of ['programmatic insertion', '', 'next pane draft']) {
-      view.rerender(<NativeChatComposerField {...props} draft={draft} />)
+      view.rerender(<TestField {...props} draft={draft} />)
       expect(textarea()).toBe(input)
       expect(input.value).toBe(draft)
     }
@@ -110,12 +115,12 @@ describe('native chat composer composition ownership', () => {
     const onDraftChange = vi.fn()
     let settledValue: string | null = null
     render(
-      <NativeChatComposerField
+      <TestField
         {...fieldProps({
           draft: '한',
           onDraftChange,
-          onCompositionEnd: (event) => {
-            settledValue = event.currentTarget.value
+          onImeSettled: (element) => {
+            settledValue = element.value
           }
         })}
       />
@@ -132,7 +137,7 @@ describe('native chat composer composition ownership', () => {
 
   it('uses the shared Enter gesture owner without swallowing the next deliberate Enter', () => {
     const onKeyDown = vi.fn()
-    render(<NativeChatComposerField {...fieldProps({ draft: '가', onKeyDown })} />)
+    render(<TestField {...fieldProps({ draft: '가', onKeyDown })} />)
     const input = textarea()
     fireEvent.compositionStart(input)
 
@@ -153,64 +158,97 @@ describe('native chat composer composition ownership', () => {
   })
 
   it('releases composition ownership on blur even when compositionend is omitted', () => {
-    const onBlur = vi.fn()
+    const onImeSettled = vi.fn()
     const onKeyDown = vi.fn()
-    const props = fieldProps({ draft: '가', onBlur, onKeyDown })
-    const view = render(<NativeChatComposerField {...props} />)
+    const props = fieldProps({ draft: '가', onImeSettled, onKeyDown })
+    const view = render(<TestField {...props} />)
     const input = textarea()
     fireEvent.compositionStart(input)
     input.value = '각'
 
     fireEvent.blur(input)
-    view.rerender(<NativeChatComposerField {...props} draft="external draft" />)
+    view.rerender(<TestField {...props} draft="external draft" />)
     fireEvent.keyDown(input, { key: 'Enter', keyCode: 13, isComposing: false })
 
-    expect(onBlur).toHaveBeenCalledOnce()
+    expect(onImeSettled).toHaveBeenCalledOnce()
     expect(input.value).toBe('external draft')
     expect(onKeyDown).toHaveBeenCalledOnce()
   })
 
-  it('applies a draft deferred before blur when compositionend is omitted', () => {
-    const onBlur = vi.fn()
-    const props = fieldProps({ onBlur })
-    const view = render(<NativeChatComposerField {...props} />)
+  it('settles the browser value instead of an unrelated draft rerender on blur', () => {
+    const onImeSettled = vi.fn()
+    const props = fieldProps({ onImeSettled })
+    const view = render(<TestField {...props} />)
     const input = textarea()
     fireEvent.compositionStart(input)
     input.value = '각'
 
-    view.rerender(<NativeChatComposerField {...props} draft="next pane draft" />)
+    view.rerender(<TestField {...props} draft="programmatic draft" />)
     expect(input.value).toBe('각')
     fireEvent.blur(input)
 
-    expect(onBlur).toHaveBeenCalledOnce()
-    expect(input.value).toBe('next pane draft')
+    expect(onImeSettled).toHaveBeenCalledOnce()
+    expect(onImeSettled).toHaveBeenCalledWith(input)
+    expect(input.value).toBe('각')
   })
 
-  it('adopts the browser value on blur when compositionend is omitted without a deferred draft', () => {
-    const onDraftChange = vi.fn()
-    render(<NativeChatComposerField {...fieldProps({ onDraftChange })} />)
+  it('exposes the browser value on blur when compositionend is omitted', () => {
+    const onImeSettled = vi.fn()
+    render(<TestField {...fieldProps({ onImeSettled })} />)
     const input = textarea()
     fireEvent.compositionStart(input)
     input.value = '각'
 
     fireEvent.blur(input)
 
-    expect(onDraftChange).toHaveBeenCalledOnce()
-    expect(onDraftChange).toHaveBeenCalledWith('각', input)
+    expect(onImeSettled).toHaveBeenCalledOnce()
+    expect(onImeSettled.mock.calls[0]?.[0].value).toBe('각')
   })
 
-  it('does not mistake a same-draft streaming rerender for a deferred draft', () => {
-    const onDraftChange = vi.fn()
-    const props = fieldProps({ onDraftChange })
-    const view = render(<NativeChatComposerField {...props} />)
+  it('settles once when compositionend and blur arrive in one batch', () => {
+    const onImeSettled = vi.fn()
+    render(<TestField {...fieldProps({ onImeSettled })} />)
+    const input = textarea()
+    fireEvent.compositionStart(input)
+    input.value = '각'
+
+    act(() => {
+      fireEvent.compositionEnd(input, { data: '각' })
+      fireEvent.blur(input)
+    })
+
+    expect(onImeSettled).toHaveBeenCalledOnce()
+    expect(onImeSettled).toHaveBeenCalledWith(input)
+  })
+
+  it('settles once when blur precedes compositionend in one batch', () => {
+    const onImeSettled = vi.fn()
+    render(<TestField {...fieldProps({ onImeSettled })} />)
+    const input = textarea()
+    fireEvent.compositionStart(input)
+    input.value = '각'
+
+    act(() => {
+      fireEvent.blur(input)
+      fireEvent.compositionEnd(input, { data: '각' })
+    })
+
+    expect(onImeSettled).toHaveBeenCalledOnce()
+    expect(onImeSettled).toHaveBeenCalledWith(input)
+  })
+
+  it('keeps the browser value through a same-draft streaming rerender', () => {
+    const onImeSettled = vi.fn()
+    const props = fieldProps({ onImeSettled })
+    const view = render(<TestField {...props} />)
     const input = textarea()
     fireEvent.compositionStart(input)
     input.value = '각'
 
-    view.rerender(<NativeChatComposerField {...props} />)
+    view.rerender(<TestField {...props} />)
     fireEvent.blur(input)
 
     expect(input.value).toBe('각')
-    expect(onDraftChange).toHaveBeenCalledWith('각', input)
+    expect(onImeSettled).toHaveBeenCalledWith(input)
   })
 })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
index 06b61d9610bf..43601198fe06 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
@@ -16,7 +16,8 @@ vi.mock('@/runtime/runtime-terminal-inspection', () => ({
   isRemoteRuntimePtyId: () => false
 }))
 
-type ProbeApi = ReturnType<typeof useNativeChatComposerAttachments>
+type AttachmentApi = ReturnType<typeof useNativeChatComposerAttachments>
+type ProbeApi = AttachmentApi & { adoptDraft: (draft: string) => void }
 
 const target: NativeChatResolvedTarget = {
   ptyId: 'pty-1',
@@ -26,34 +27,52 @@ const target: NativeChatResolvedTarget = {
 function Probe({
   scopeKey,
   structured = false,
+  disabled = false,
+  isComposing,
   onReady
 }: {
   scopeKey: string
   structured?: boolean
+  disabled?: boolean
+  isComposing: () => boolean
   onReady: (api: ProbeApi) => void
 }): React.JSX.Element {
   const [caret, setCaret] = useState(0)
-  const [, setDraftValue] = useState('')
+  const [draftValue, setDraftValue] = useState('')
   const [, setNotice] = useState<string | null>(null)
   const textareaRef = useRef<HTMLTextAreaElement>(null)
   const api = useNativeChatComposerAttachments({
     attachmentScopeKey: scopeKey,
     allowWithoutTarget: structured,
     caret,
+    disabled,
+    isComposing,
     resolveTarget: () => (structured ? null : target),
     textareaRef,
     setCaret,
     setDraft: (updater) => setDraftValue((previous) => updater(previous)),
     setNotice
   })
-  onReady(api)
-  return createElement('textarea', { ref: textareaRef })
+  onReady({ ...api, adoptDraft: setDraftValue })
+  return (
+    <div>
+      <textarea ref={textareaRef} />
+      <output>{draftValue}</output>
+    </div>
+  )
 }
 
 async function renderProbe(
   scopeKey: string,
-  structured = false
-): Promise<{ root: Root; latest: () => ProbeApi; rerender: (scopeKey: string) => Promise<void> }> {
+  structured = false,
+  options: { disabled?: boolean; isComposing?: () => boolean } = {}
+): Promise<{
+  draft: () => string
+  latest: () => ProbeApi
+  rerender: (scopeKey: string, disabled?: boolean) => Promise<void>
+  root: Root
+  textarea: () => HTMLTextAreaElement
+}> {
   const container = document.createElement('div')
   document.body.append(container)
   // onReady fires on every render, so keep the freshest snapshot — reading a
@@ -63,13 +82,26 @@ async function renderProbe(
   const onReady = (next: ProbeApi): void => {
     api = next
   }
-  await act(async () => {
-    root.render(createElement(Probe, { scopeKey, structured, onReady }))
-  })
+  const isComposing = options.isComposing ?? (() => false)
+  const render = async (nextScopeKey: string, disabled: boolean): Promise<void> => {
+    await act(async () => {
+      root.render(
+        createElement(Probe, {
+          scopeKey: nextScopeKey,
+          structured,
+          disabled,
+          isComposing,
+          onReady
+        })
+      )
+    })
+  }
+  await render(scopeKey, options.disabled ?? false)
   if (!api) {
     throw new Error('Probe did not render')
   }
   return {
+    draft: () => container.querySelector('output')?.textContent ?? '',
     root,
     latest: () => {
       if (!api) {
@@ -77,10 +109,14 @@ async function renderProbe(
       }
       return api
     },
-    rerender: async (nextScopeKey: string) => {
-      await act(async () => {
-        root.render(createElement(Probe, { scopeKey: nextScopeKey, structured, onReady }))
-      })
+    rerender: (nextScopeKey: string, disabled = options.disabled ?? false) =>
+      render(nextScopeKey, disabled),
+    textarea: () => {
+      const textarea = container.querySelector('textarea')
+      if (!textarea) {
+        throw new Error('Probe textarea is not mounted')
+      }
+      return textarea
     }
   }
 }
@@ -142,25 +178,46 @@ describe('useNativeChatComposerAttachments', () => {
     act(() => probe.root.unmount())
   })
 
-  it('rescopes attachments when the scope key changes (composer reused for another pane)', async () => {
-    const probe = await renderProbe('pty-1')
-    await act(async () => {
-      probe.latest().attachResolvedPaths(['/tmp/orca-native-chat-pane-1.png'])
+  it('adopts browser text before draining ordered duplicate paths exactly once', async () => {
+    let composing = true
+    const probe = await renderProbe('pty-1', false, { isComposing: () => composing })
+    const textarea = probe.textarea()
+    textarea.focus()
+    textarea.value = '각 '
+    textarea.setSelectionRange(2, 2)
+    const focus = vi.spyOn(textarea, 'focus')
+
+    act(() => {
+      probe.latest().attachResolvedPaths(['/remote/b.txt', '/remote/b.txt'])
+      probe.latest().attachResolvedPaths(['/remote/a.txt'])
+    })
+    expect(probe.draft()).toBe('')
+
+    composing = false
+    textarea.blur()
+    act(() => {
+      probe.latest().adoptDraft(textarea.value)
+      probe.latest().flushPendingAttachments()
+      probe.latest().flushPendingAttachments()
     })
-    expect(probe.latest().imageAttachments).toMatchObject([
-      { path: '/tmp/orca-native-chat-pane-1.png' }
-    ])
 
-    // Reused for a different pane: pane-1's chip must not stay live (it would
-    // otherwise be submitted to pane-2's target now that images defer to submit).
-    await probe.rerender('pty-2')
-    expect(probe.latest().imageAttachments).toMatchObject([])
+    expect(probe.draft()).toBe('각 @/remote/b.txt @/remote/b.txt @/remote/a.txt ')
+    expect(focus).not.toHaveBeenCalled()
+    expect(document.activeElement).not.toBe(textarea)
+    act(() => probe.root.unmount())
+  })
 
-    // Switching back restores pane-1's still-cached chip.
-    await probe.rerender('pty-1')
-    expect(probe.latest().imageAttachments).toMatchObject([
-      { path: '/tmp/orca-native-chat-pane-1.png' }
-    ])
+  it('drops queued paths after any disabled transition', async () => {
+    let composing = true
+    const probe = await renderProbe('pty-1', false, { isComposing: () => composing })
+
+    act(() => probe.latest().attachResolvedPaths(['/remote/a.txt']))
+    await probe.rerender('pty-1', true)
+    await probe.rerender('pty-1', false)
+    composing = false
+    act(() => probe.latest().flushPendingAttachments())
+
+    expect(probe.draft()).toBe('')
     act(() => probe.root.unmount())
   })
 })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
index b9d94d8e2533..4bcbca1d82d4 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
@@ -1,4 +1,4 @@
-import { useCallback, useRef, useState, type RefObject } from 'react'
+import { useCallback, useLayoutEffect, useRef, useState, type RefObject } from 'react'
 import { translate } from '@/i18n/i18n'
 import { isNativeChatImageAttachmentPath } from './native-chat-image-paste'
 import {
@@ -13,6 +13,8 @@ export type UseNativeChatComposerAttachmentsArgs = {
   attachmentScopeKey: string
   allowWithoutTarget?: boolean
   caret: number
+  disabled: boolean
+  isComposing: () => boolean
   resolveTarget: () => NativeChatResolvedTarget | null
   textareaRef: RefObject<HTMLTextAreaElement | null>
   setCaret: (caret: number) => void
@@ -24,6 +26,8 @@ export function useNativeChatComposerAttachments({
   attachmentScopeKey,
   allowWithoutTarget = false,
   caret,
+  disabled,
+  isComposing,
   resolveTarget,
   textareaRef,
   setCaret,
@@ -31,25 +35,24 @@ export function useNativeChatComposerAttachments({
   setNotice
 }: UseNativeChatComposerAttachmentsArgs): {
   imageAttachments: NativeChatComposerImageAttachment[]
-  appendImageAttachments: (paths: string[]) => void
   attachResolvedPaths: (paths: string[]) => void
   clearImageAttachments: () => void
+  flushPendingAttachments: () => void
   removeImageAttachment: (id: string) => void
 } {
   const [imageAttachments, setImageAttachments] = useState<NativeChatComposerImageAttachment[]>(
     () => readNativeChatAttachmentCache(attachmentScopeKey)
   )
   const imageAttachmentCounter = useRef(0)
+  const pendingResolvedPathsRef = useRef<string[]>([])
+  const disabledRef = useRef(disabled)
 
-  // Reload chips from the cache when the composer is reused for a different pane
-  // (scope-key change), adjusting state during render rather than in an effect.
-  // Without this the previous pane's chips would stay live and be submitted to
-  // the new target now that images are deferred to submit.
-  const lastScopeKey = useRef(attachmentScopeKey)
-  if (lastScopeKey.current !== attachmentScopeKey) {
-    lastScopeKey.current = attachmentScopeKey
-    setImageAttachments(readNativeChatAttachmentCache(attachmentScopeKey))
-  }
+  useLayoutEffect(() => {
+    disabledRef.current = disabled
+    if (disabled) {
+      pendingResolvedPathsRef.current = []
+    }
+  }, [disabled])
 
   const updateImageAttachments = useCallback(
     (
@@ -97,17 +100,15 @@ export function useNativeChatComposerAttachments({
         setCaret(before.length + insertion.length)
         return next
       })
-      setNotice(null)
-      requestAnimationFrame(() => textareaRef.current?.focus())
     },
-    [caret, setCaret, setDraft, setNotice, textareaRef]
+    [caret, setCaret, setDraft, textareaRef]
   )
 
   // Attach paths the TARGET AGENT can read: local paths for local worktrees,
   // already-uploaded remote paths for SSH worktrees (the composer uploads
   // before calling this — see native-chat-attachment-upload.ts).
-  const attachResolvedPaths = useCallback(
-    (paths: string[]) => {
+  const applyResolvedPaths = useCallback(
+    (paths: string[], focus: boolean) => {
       const target = resolveTarget()
       if (
         (!target && !allowWithoutTarget) ||
@@ -128,8 +129,8 @@ export function useNativeChatComposerAttachments({
       // diverge and removing a chip needs no TUI un-paste.
       appendImageAttachments(imagePaths)
       insertFileReferences(filePaths)
-      if (imagePaths.length > 0) {
-        setNotice(null)
+      setNotice(null)
+      if (focus && paths.length > 0) {
         requestAnimationFrame(() => textareaRef.current?.focus())
       }
     },
@@ -143,11 +144,34 @@ export function useNativeChatComposerAttachments({
     ]
   )
 
+  const attachResolvedPaths = useCallback(
+    (paths: string[]) => {
+      if (paths.length === 0 || disabledRef.current) {
+        return
+      }
+      if (isComposing()) {
+        pendingResolvedPathsRef.current.push(...paths)
+        return
+      }
+      applyResolvedPaths(paths, true)
+    },
+    [applyResolvedPaths, isComposing]
+  )
+
+  const flushPendingAttachments = useCallback(() => {
+    const paths = pendingResolvedPathsRef.current
+    pendingResolvedPathsRef.current = []
+    if (paths.length === 0 || disabledRef.current) {
+      return
+    }
+    applyResolvedPaths(paths, false)
+  }, [applyResolvedPaths])
+
   return {
     imageAttachments,
-    appendImageAttachments,
     attachResolvedPaths,
     clearImageAttachments: () => updateImageAttachments(() => []),
+    flushPendingAttachments,
     removeImageAttachment: (id) =>
       updateImageAttachments((prev) => prev.filter((attachment) => attachment.id !== id))
   }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx
index 3d9017a0c8a8..7e87169252ae 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx
@@ -24,6 +24,14 @@ import { useNativeChatExternalAttachments } from './use-native-chat-external-att
 
 type HookApi = ReturnType<typeof useNativeChatExternalAttachments>
 
+function deferred<T>(): { promise: Promise<T>; resolve: (value: T) => void } {
+  let resolve: (value: T) => void = () => undefined
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise
+  })
+  return { promise, resolve }
+}
+
 function Probe({
   disabled,
   attachResolvedPaths,
@@ -127,6 +135,40 @@ describe('useNativeChatExternalAttachments', () => {
     expect(attachResolvedPaths).toHaveBeenCalledWith(['/remote/wt/.orca/drops/a.txt'])
   })
 
+  it('delivers concurrent SSH resolutions in order without deduplicating paths', async () => {
+    mocks.resolveNativeChatAttachmentOwner.mockReturnValue({
+      kind: 'ssh',
+      connectionId: 'conn-1',
+      worktreePath: '/remote/wt',
+      expectedExecutionHostId: 'ssh:conn-1',
+      expectedSshTargetId: 'conn-1',
+      expectedSshConnectionGeneration: 4
+    })
+    const firstUpload = deferred<string[]>()
+    const secondUpload = deferred<string[]>()
+    mocks.uploadNativeChatAttachmentPaths
+      .mockReturnValueOnce(firstUpload.promise)
+      .mockReturnValueOnce(secondUpload.promise)
+    const attachResolvedPaths = vi.fn()
+    const probe = await renderProbe({ attachResolvedPaths })
+
+    act(() => {
+      probe.latest().attachExternalPaths(['/local/a.txt'])
+      probe.latest().attachExternalPaths(['/local/b.txt'])
+    })
+    await act(async () => {
+      secondUpload.resolve(['/remote/wt/.orca/drops/b.txt', '/remote/wt/.orca/drops/b.txt'])
+    })
+    await act(async () => {
+      firstUpload.resolve(['/remote/wt/.orca/drops/a.txt'])
+    })
+
+    expect(attachResolvedPaths.mock.calls).toEqual([
+      [['/remote/wt/.orca/drops/b.txt', '/remote/wt/.orca/drops/b.txt']],
+      [['/remote/wt/.orca/drops/a.txt']]
+    ])
+  })
+
   it('shows the not-ready notice instead of attaching unresolved paths', async () => {
     mocks.resolveNativeChatAttachmentOwner.mockReturnValue({ kind: 'not-ready' })
     const attachResolvedPaths = vi.fn()
@@ -153,6 +195,17 @@ describe('useNativeChatExternalAttachments', () => {
     expect(attachResolvedPaths).not.toHaveBeenCalled()
   })
 
+  it('ignores local attachment insertion while already disabled', async () => {
+    mocks.resolveNativeChatAttachmentOwner.mockReturnValue({ kind: 'local' })
+    const attachResolvedPaths = vi.fn()
+    const probe = await renderProbe({ disabled: true, attachResolvedPaths })
+
+    act(() => probe.latest().attachExternalPaths(['/local/a.txt']))
+
+    expect(mocks.resolveNativeChatAttachmentOwner).not.toHaveBeenCalled()
+    expect(attachResolvedPaths).not.toHaveBeenCalled()
+  })
+
   it('drops an upload that resolves after the composer became disabled', async () => {
     mocks.resolveNativeChatAttachmentOwner.mockReturnValue({
       kind: 'ssh',
diff --git a/src/renderer/src/components/native-chat/use-native-chat-external-attachments.ts b/src/renderer/src/components/native-chat/use-native-chat-external-attachments.ts
index 25794e4c1287..3bdd27f95e0a 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-external-attachments.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-external-attachments.ts
@@ -1,4 +1,4 @@
-import { useCallback, useRef } from 'react'
+import { useCallback, useLayoutEffect, useRef } from 'react'
 import { useAppStore } from '@/store'
 import {
   nativeChatLocalAttachmentUnsupportedNotice,
@@ -35,7 +35,9 @@ export function useNativeChatExternalAttachments({
   resolveAttachmentOwner: () => NativeChatAttachmentOwner
 } {
   const disabledRef = useRef(disabled)
-  disabledRef.current = disabled
+  useLayoutEffect(() => {
+    disabledRef.current = disabled
+  }, [disabled])
 
   const resolveAttachmentOwner = useCallback(
     () =>
@@ -47,7 +49,7 @@ export function useNativeChatExternalAttachments({
 
   const attachExternalPaths = useCallback(
     (paths: string[]) => {
-      if (paths.length === 0) {
+      if (paths.length === 0 || disabledRef.current) {
         return
       }
       const owner = resolveAttachmentOwner()

From 33b3e86550f9ac913de3865819f8603e33ff72d1 Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 20:24:45 -0700
Subject: [PATCH 06/10] fix(native-chat): bound deferred attachment paths

---
 ...-native-chat-composer-attachments.test.tsx | 39 +++++++++++++++++--
 .../use-native-chat-composer-attachments.ts   | 26 +++++++++++--
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
index 43601198fe06..b74850260a60 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
@@ -8,6 +8,7 @@ import {
   useNativeChatComposerAttachments
 } from './use-native-chat-composer-attachments'
 import type { NativeChatResolvedTarget } from './native-chat-composer-target'
+import { NATIVE_FILE_DROP_MAX_PATHS } from '../../../../shared/native-file-drop'
 
 vi.mock('@/i18n/i18n', () => ({
   translate: (_key: string, fallback: string) => fallback
@@ -39,7 +40,7 @@ function Probe({
 }): React.JSX.Element {
   const [caret, setCaret] = useState(0)
   const [draftValue, setDraftValue] = useState('')
-  const [, setNotice] = useState<string | null>(null)
+  const [notice, setNotice] = useState<string | null>(null)
   const textareaRef = useRef<HTMLTextAreaElement>(null)
   const api = useNativeChatComposerAttachments({
     attachmentScopeKey: scopeKey,
@@ -57,7 +58,8 @@ function Probe({
   return (
     <div>
       <textarea ref={textareaRef} />
-      <output>{draftValue}</output>
+      <output data-draft>{draftValue}</output>
+      <output data-notice>{notice}</output>
     </div>
   )
 }
@@ -69,6 +71,7 @@ async function renderProbe(
 ): Promise<{
   draft: () => string
   latest: () => ProbeApi
+  notice: () => string
   rerender: (scopeKey: string, disabled?: boolean) => Promise<void>
   root: Root
   textarea: () => HTMLTextAreaElement
@@ -101,7 +104,7 @@ async function renderProbe(
     throw new Error('Probe did not render')
   }
   return {
-    draft: () => container.querySelector('output')?.textContent ?? '',
+    draft: () => container.querySelector('[data-draft]')?.textContent ?? '',
     root,
     latest: () => {
       if (!api) {
@@ -109,6 +112,7 @@ async function renderProbe(
       }
       return api
     },
+    notice: () => container.querySelector('[data-notice]')?.textContent ?? '',
     rerender: (nextScopeKey: string, disabled = options.disabled ?? false) =>
       render(nextScopeKey, disabled),
     textarea: () => {
@@ -220,4 +224,33 @@ describe('useNativeChatComposerAttachments', () => {
     expect(probe.draft()).toBe('')
     act(() => probe.root.unmount())
   })
+
+  it('caps paths queued during composition and keeps overflow visible after flush', async () => {
+    let composing = true
+    const probe = await renderProbe('pty-1', false, { isComposing: () => composing })
+    const acceptedPaths = Array.from(
+      { length: NATIVE_FILE_DROP_MAX_PATHS },
+      (_, index) => `/remote/accepted-${index}.txt`
+    )
+
+    act(() => {
+      probe.latest().attachResolvedPaths(acceptedPaths)
+      probe.latest().attachResolvedPaths(['/remote/rejected.txt'])
+    })
+
+    expect(probe.draft()).toBe('')
+    expect(probe.notice()).toBe(
+      'Too many attachments are waiting. Finish composing before attaching more.'
+    )
+
+    composing = false
+    act(() => probe.latest().flushPendingAttachments())
+
+    expect(probe.draft().match(/@\/remote\/accepted-/g)).toHaveLength(NATIVE_FILE_DROP_MAX_PATHS)
+    expect(probe.draft()).not.toContain('rejected.txt')
+    expect(probe.notice()).toBe(
+      'Too many attachments are waiting. Finish composing before attaching more.'
+    )
+    act(() => probe.root.unmount())
+  })
 })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
index 4bcbca1d82d4..63bbf35aabe9 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
@@ -1,5 +1,6 @@
 import { useCallback, useLayoutEffect, useRef, useState, type RefObject } from 'react'
 import { translate } from '@/i18n/i18n'
+import { NATIVE_FILE_DROP_MAX_PATHS } from '../../../../shared/native-file-drop'
 import { isNativeChatImageAttachmentPath } from './native-chat-image-paste'
 import {
   formatNativeChatFileReference,
@@ -45,12 +46,14 @@ export function useNativeChatComposerAttachments({
   )
   const imageAttachmentCounter = useRef(0)
   const pendingResolvedPathsRef = useRef<string[]>([])
+  const pendingPathLimitRejectedRef = useRef(false)
   const disabledRef = useRef(disabled)
 
   useLayoutEffect(() => {
     disabledRef.current = disabled
     if (disabled) {
       pendingResolvedPathsRef.current = []
+      pendingPathLimitRejectedRef.current = false
     }
   }, [disabled])
 
@@ -108,7 +111,7 @@ export function useNativeChatComposerAttachments({
   // already-uploaded remote paths for SSH worktrees (the composer uploads
   // before calling this — see native-chat-attachment-upload.ts).
   const applyResolvedPaths = useCallback(
-    (paths: string[], focus: boolean) => {
+    (paths: string[], focus: boolean, preserveNotice = false) => {
       const target = resolveTarget()
       if (
         (!target && !allowWithoutTarget) ||
@@ -129,7 +132,9 @@ export function useNativeChatComposerAttachments({
       // diverge and removing a chip needs no TUI un-paste.
       appendImageAttachments(imagePaths)
       insertFileReferences(filePaths)
-      setNotice(null)
+      if (!preserveNotice) {
+        setNotice(null)
+      }
       if (focus && paths.length > 0) {
         requestAnimationFrame(() => textareaRef.current?.focus())
       }
@@ -150,21 +155,34 @@ export function useNativeChatComposerAttachments({
         return
       }
       if (isComposing()) {
+        if (paths.length > NATIVE_FILE_DROP_MAX_PATHS - pendingResolvedPathsRef.current.length) {
+          // Reject the whole completion so ordered path batches are never partially applied.
+          pendingPathLimitRejectedRef.current = true
+          setNotice(
+            translate(
+              'components.native-chat.composer.pendingAttachmentLimit',
+              'Too many attachments are waiting. Finish composing before attaching more.'
+            )
+          )
+          return
+        }
         pendingResolvedPathsRef.current.push(...paths)
         return
       }
       applyResolvedPaths(paths, true)
     },
-    [applyResolvedPaths, isComposing]
+    [applyResolvedPaths, isComposing, setNotice]
   )
 
   const flushPendingAttachments = useCallback(() => {
     const paths = pendingResolvedPathsRef.current
+    const preserveNotice = pendingPathLimitRejectedRef.current
     pendingResolvedPathsRef.current = []
+    pendingPathLimitRejectedRef.current = false
     if (paths.length === 0 || disabledRef.current) {
       return
     }
-    applyResolvedPaths(paths, false)
+    applyResolvedPaths(paths, false, preserveNotice)
   }, [applyResolvedPaths])
 
   return {

From 473e8383f89ea549617dfe6f917cf9eba3aea96b Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 21:01:15 -0700
Subject: [PATCH 07/10] fix(native-chat): add pending attachment overflow
 translation

---
 src/renderer/src/i18n/locales/en.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 6660bb6c2007..4992043417c4 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -16551,7 +16551,8 @@
           "ultra": "Ultra",
           "on": "On",
           "off": "Off"
-        }
+        },
+        "pendingAttachmentLimit": "Too many attachments are waiting. Finish composing before attaching more."
       },
       "tool": {
         "running": "Running…",
@@ -17107,4 +17108,4 @@
   "quickOpen": {
     "moreMatchesAvailable": "More matches may be available. Refine your search to narrow the results."
   }
-}
+}\n
\ No newline at end of file

From b12950b50ad3cfd49f9f89b3bf20300cf6dfb27a Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 21:03:01 -0700
Subject: [PATCH 08/10] test(native-chat): publish attachment probe after
 render

---
 .../native-chat/use-native-chat-composer-attachments.test.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
index b74850260a60..679d2bce127c 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { act, createElement, useRef, useState } from 'react'
+import { act, createElement, useEffect, useRef, useState } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import {
   clearNativeChatAttachmentCacheForTests,
@@ -54,7 +54,7 @@ function Probe({
     setDraft: (updater) => setDraftValue((previous) => updater(previous)),
     setNotice
   })
-  onReady({ ...api, adoptDraft: setDraftValue })
+  useEffect(() => {\n    onReady({ ...api, adoptDraft: setDraftValue })\n  }, [api, onReady])
   return (
     <div>
       <textarea ref={textareaRef} />

From 83b8b7b6c92392bcfb8fd0d509eabc152f32d457 Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 21:04:52 -0700
Subject: [PATCH 09/10] fix(native-chat): repair localization file newline

---
 src/renderer/src/i18n/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 4992043417c4..12bc8a13e865 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -17108,4 +17108,4 @@
   "quickOpen": {
     "moreMatchesAvailable": "More matches may be available. Refine your search to narrow the results."
   }
-}\n
\ No newline at end of file
+}

From b723f90afa30cada8edbb18b358f39bbdad0b038 Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 29 Aug 2026 21:05:05 -0700
Subject: [PATCH 10/10] fix(native-chat): use effect for attachment probe
 publication

---
 .../native-chat/use-native-chat-composer-attachments.test.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
index 679d2bce127c..16487c53314e 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
@@ -54,7 +54,9 @@ function Probe({
     setDraft: (updater) => setDraftValue((previous) => updater(previous)),
     setNotice
   })
-  useEffect(() => {\n    onReady({ ...api, adoptDraft: setDraftValue })\n  }, [api, onReady])
+  useEffect(() => {
+    onReady({ ...api, adoptDraft: setDraftValue })
+  }, [api, onReady])
   return (
     <div>
       <textarea ref={textareaRef} />