Merge branch 'main' into feature/arena-agent-collaboration

packages/cli/src/ui/contexts/KeypressContext.tsx

@@ -36,6 +36,7 @@ import {
   MODIFIER_ALT_BIT,
   MODIFIER_CTRL_BIT,
 } from '../utils/platformConstants.js';
+import { clipboardHasImage } from '../utils/clipboardUtils.js';
 
 import { FOCUS_IN, FOCUS_OUT } from '../hooks/useFocus.js';
 
@@ -54,6 +55,7 @@ export interface Key {
   paste: boolean;
   sequence: string;
   kittyProtocol?: boolean;
+  pasteImage?: boolean;
 }
 
 export type KeypressHandler = (key: Key) => void;
@@ -390,7 +392,7 @@ export function KeypressProvider({
       }
     };
 
-    const handleKeypress = (_: unknown, key: Key) => {
+    const handleKeypress = async (_: unknown, key: Key) => {
       if (key.sequence === FOCUS_IN || key.sequence === FOCUS_OUT) {
         return;
       }
@@ -400,14 +402,28 @@ export function KeypressProvider({
       }
       if (key.name === 'paste-end') {
         isPaste = false;
-        broadcast({
-          name: '',
-          ctrl: false,
-          meta: false,
-          shift: false,
-          paste: true,
-          sequence: pasteBuffer.toString(),
-        });
+        if (pasteBuffer.toString().length > 0) {
+          broadcast({
+            name: '',
+            ctrl: false,
+            meta: false,
+            shift: false,
+            paste: true,
+            sequence: pasteBuffer.toString(),
+          });
+        } else {
+          const hasImage = await clipboardHasImage();
+          broadcast({
+            name: '',
+            ctrl: false,
+            meta: false,
+            shift: false,
+            paste: true,
+            pasteImage: hasImage,
+            sequence: pasteBuffer.toString(),
+          });
+        }
+
         pasteBuffer = Buffer.alloc(0);
         return;
       }
@@ -722,6 +738,7 @@ export function KeypressProvider({
     };
 
     let rl: readline.Interface;
+
     if (usePassthrough) {
       rl = readline.createInterface({
         input: keypressStream,

packages/cli/src/ui/contexts/UIActionsContext.tsx

@@ -17,7 +17,6 @@ import {
 import { type SettingScope } from '../../config/settings.js';
 import { type CodingPlanRegion } from '../../constants/codingPlan.js';
 import type { AuthState } from '../types.js';
-import { type VisionSwitchOutcome } from '../components/ModelSwitchDialog.js';
 import { type ArenaDialogType } from '../hooks/useArenaCommand.js';
 // OpenAICredentials type (previously imported from OpenAIKeyPrompt)
 export interface OpenAICredentials {
@@ -72,8 +71,6 @@ export interface UIActions {
   refreshStatic: () => void;
   handleFinalSubmit: (value: string) => void;
   handleClearScreen: () => void;
-  // Vision switch dialog
-  handleVisionSwitchSelect: (outcome: VisionSwitchOutcome) => void;
   // Welcome back dialog
   handleWelcomeBackSelection: (choice: 'continue' | 'restart') => void;
   handleWelcomeBackClose: () => void;

packages/cli/src/ui/contexts/UIStateContext.tsx

@@ -117,8 +117,6 @@ export interface UIState {
   extensionsUpdateState: Map<string, ExtensionUpdateState>;
   activePtyId: number | undefined;
   embeddedShellFocused: boolean;
-  // Vision switch dialog
-  isVisionSwitchDialogOpen: boolean;
   // Welcome back dialog
   showWelcomeBackDialog: boolean;
   welcomeBackInfo: {