fix(terminal): intercept Cmd+V on macOS to prevent paste-then-edit garbling

src/contexts/workspace/presentation/renderer/components/terminalNode/inputBridge.ts

@@ -58,6 +58,25 @@ export function isWindowsTerminalPasteShortcut(
   return event.key === 'Insert' && event.shiftKey && !event.ctrlKey
 }
 
+export function isMacPlatform(platformInfo: PlatformInfo | undefined = navigator): boolean {
+  if (!platformInfo) {
+    return false
+  }
+
+  return /mac/i.test(platformInfo.platform ?? '') || /macintosh/i.test(platformInfo.userAgent ?? '')
+}
+
+export function isMacTerminalPasteShortcut(
+  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
+  platformInfo: PlatformInfo | undefined = navigator,
+): boolean {
+  if (!isMacPlatform(platformInfo) || event.ctrlKey || event.altKey) {
+    return false
+  }
+
+  return event.key.toLowerCase() === 'v' && event.metaKey && !event.shiftKey
+}
+
 function isTerminalFindShortcut(
   event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey'>,
 ): boolean {
@@ -195,7 +214,11 @@ export function handleTerminalCustomKeyEvent({
   }
 
   if (event.type !== 'keydown' || !isWindowsTerminalCopyShortcut(event, platformInfo)) {
-    if (event.type === 'keydown' && isWindowsTerminalPasteShortcut(event, platformInfo)) {
+    if (
+      event.type === 'keydown' &&
+      (isWindowsTerminalPasteShortcut(event, platformInfo) ||
+        isMacTerminalPasteShortcut(event, platformInfo))
+    ) {
       event.preventDefault()
       event.stopPropagation()
       void pasteClipboardText({ terminal })

tests/unit/contexts/terminalInputBridge.spec.ts

@@ -2,9 +2,48 @@ import { describe, expect, it, vi } from 'vitest'
 import {
   createPtyWriteQueue,
   handleTerminalCustomKeyEvent,
+  isMacTerminalPasteShortcut,
   pasteTextFromClipboard,
 } from '../../../src/contexts/workspace/presentation/renderer/components/terminalNode/inputBridge'
 
+describe('isMacTerminalPasteShortcut', () => {
+  it('returns true for Cmd+V on macOS', () => {
+    expect(
+      isMacTerminalPasteShortcut(
+        { key: 'v', metaKey: true, ctrlKey: false, altKey: false, shiftKey: false },
+        { platform: 'MacIntel' },
+      ),
+    ).toBe(true)
+  })
+
+  it('returns false for Cmd+V on Windows', () => {
+    expect(
+      isMacTerminalPasteShortcut(
+        { key: 'v', metaKey: true, ctrlKey: false, altKey: false, shiftKey: false },
+        { platform: 'Win32' },
+      ),
+    ).toBe(false)
+  })
+
+  it('returns false for Ctrl+V on macOS', () => {
+    expect(
+      isMacTerminalPasteShortcut(
+        { key: 'v', metaKey: false, ctrlKey: true, altKey: false, shiftKey: false },
+        { platform: 'MacIntel' },
+      ),
+    ).toBe(false)
+  })
+
+  it('returns false for Cmd+Shift+V', () => {
+    expect(
+      isMacTerminalPasteShortcut(
+        { key: 'v', metaKey: true, ctrlKey: false, altKey: false, shiftKey: true },
+        { platform: 'MacIntel' },
+      ),
+    ).toBe(false)
+  })
+})
+
 describe('handleTerminalCustomKeyEvent', () => {
   it('copies the selected terminal text on Windows Ctrl+C', async () => {
     const copySelectedText = vi.fn(async () => undefined)
@@ -180,6 +219,98 @@ describe('handleTerminalCustomKeyEvent', () => {
     expect(terminal.paste).toHaveBeenCalledWith('clipboard payload')
   })
 
+  it('pastes clipboard text on macOS Cmd+V', () => {
+    const pasteClipboardText = vi.fn()
+    const event = {
+      type: 'keydown',
+      key: 'v',
+      ctrlKey: false,
+      shiftKey: false,
+      altKey: false,
+      metaKey: true,
+      preventDefault: vi.fn(),
+      stopPropagation: vi.fn(),
+    } as unknown as KeyboardEvent
+    const terminal = {
+      hasSelection: () => false,
+      getSelection: () => '',
+      paste: vi.fn(),
+    }
+
+    const result = handleTerminalCustomKeyEvent({
+      event,
+      pasteClipboardText,
+      platformInfo: { platform: 'MacIntel' },
+      ptyWriteQueue: {
+        enqueue: vi.fn(),
+        flush: vi.fn(),
+      },
+      terminal,
+    })
+
+    expect(result).toBe(false)
+    expect(pasteClipboardText).toHaveBeenCalledWith({ terminal })
+    expect(event.preventDefault).toHaveBeenCalledTimes(1)
+    expect(event.stopPropagation).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not intercept macOS Cmd+C (lets xterm.js handle copy)', () => {
+    const pasteClipboardText = vi.fn()
+    const copySelectedText = vi.fn(async () => undefined)
+
+    const result = handleTerminalCustomKeyEvent({
+      copySelectedText,
+      event: new KeyboardEvent('keydown', { key: 'c', metaKey: true }),
+      pasteClipboardText,
+      platformInfo: { platform: 'MacIntel' },
+      ptyWriteQueue: {
+        enqueue: vi.fn(),
+        flush: vi.fn(),
+      },
+      terminal: {
+        hasSelection: () => true,
+        getSelection: () => 'selected output',
+        paste: vi.fn(),
+      },
+    })
+
+    expect(result).toBe(true)
+    expect(pasteClipboardText).not.toHaveBeenCalled()
+    expect(copySelectedText).not.toHaveBeenCalled()
+  })
+
+  it('does not intercept macOS Cmd+Shift+V', () => {
+    const pasteClipboardText = vi.fn()
+    const event = {
+      type: 'keydown',
+      key: 'v',
+      ctrlKey: false,
+      shiftKey: true,
+      altKey: false,
+      metaKey: true,
+      preventDefault: vi.fn(),
+      stopPropagation: vi.fn(),
+    } as unknown as KeyboardEvent
+
+    const result = handleTerminalCustomKeyEvent({
+      event,
+      pasteClipboardText,
+      platformInfo: { platform: 'MacIntel' },
+      ptyWriteQueue: {
+        enqueue: vi.fn(),
+        flush: vi.fn(),
+      },
+      terminal: {
+        hasSelection: () => false,
+        getSelection: () => '',
+        paste: vi.fn(),
+      },
+    })
+
+    expect(result).toBe(true)
+    expect(pasteClipboardText).not.toHaveBeenCalled()
+  })
+
   it('preserves binary writes as a separate PTY payload', async () => {
     const writes: Array<{ data: string; encoding: 'utf8' | 'binary' }> = []
     const ptyWriteQueue = createPtyWriteQueue(async payload => {