From fce1cd3672d8ca5be0a8f8cc308ae6f300cc2a94 Mon Sep 17 00:00:00 2001
From: yuki <y1217ats@gmail.com>
Date: Mon, 16 Mar 2026 19:24:39 +0900
Subject: [PATCH] feat: add Cmd+Enter and Ctrl+Enter to send messages

Support external keyboard shortcuts for sending messages on iOS/iPad
and web platforms. This adds metaKey and ctrlKey to the KeyPressEvent
interface and handles Cmd+Enter / Ctrl+Enter as a send action in
AgentInput, enabling a common workflow for users with external
keyboards.

Closes #76
Relates to #198

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 packages/happy-app/sources/components/AgentInput.tsx      | 8 ++++++++
 packages/happy-app/sources/components/MultiTextInput.tsx  | 6 +++++-
 .../happy-app/sources/components/MultiTextInput.web.tsx   | 6 +++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/happy-app/sources/components/AgentInput.tsx b/packages/happy-app/sources/components/AgentInput.tsx
index bb312aabbc..3ba1a63dfe 100644
--- a/packages/happy-app/sources/components/AgentInput.tsx
+++ b/packages/happy-app/sources/components/AgentInput.tsx
@@ -498,6 +498,14 @@ export const AgentInput = React.memo(React.forwardRef<MultiTextInputHandle, Agen
             return true;
         }
 
+        // Cmd+Enter or Ctrl+Enter sends on all platforms (external keyboard support)
+        if (event.key === 'Enter' && (event.metaKey || event.ctrlKey)) {
+            if (props.value.trim()) {
+                props.onSend();
+                return true;
+            }
+        }
+
         // Original key handling
         if (Platform.OS === 'web') {
             if (agentInputEnterToSend && event.key === 'Enter' && !event.shiftKey) {
diff --git a/packages/happy-app/sources/components/MultiTextInput.tsx b/packages/happy-app/sources/components/MultiTextInput.tsx
index f7213fb1ec..93ee3bf1a5 100644
--- a/packages/happy-app/sources/components/MultiTextInput.tsx
+++ b/packages/happy-app/sources/components/MultiTextInput.tsx
@@ -8,6 +8,8 @@ export type SupportedKey = 'Enter' | 'Escape' | 'ArrowUp' | 'ArrowDown' | 'Arrow
 export interface KeyPressEvent {
     key: SupportedKey;
     shiftKey: boolean;
+    metaKey: boolean;
+    ctrlKey: boolean;
 }
 
 export type OnKeyPressCallback = (event: KeyPressEvent) => boolean;
@@ -96,7 +98,9 @@ export const MultiTextInput = React.forwardRef<MultiTextInputHandle, MultiTextIn
         if (normalizedKey) {
             const keyEvent: KeyPressEvent = {
                 key: normalizedKey,
-                shiftKey: (nativeEvent as any).shiftKey || false
+                shiftKey: (nativeEvent as any).shiftKey || false,
+                metaKey: (nativeEvent as any).metaKey || false,
+                ctrlKey: (nativeEvent as any).ctrlKey || false,
             };
             
             const handled = onKeyPress(keyEvent);
diff --git a/packages/happy-app/sources/components/MultiTextInput.web.tsx b/packages/happy-app/sources/components/MultiTextInput.web.tsx
index 0cec9ac15f..e582096c3b 100644
--- a/packages/happy-app/sources/components/MultiTextInput.web.tsx
+++ b/packages/happy-app/sources/components/MultiTextInput.web.tsx
@@ -9,6 +9,8 @@ export type SupportedKey = 'Enter' | 'Escape' | 'ArrowUp' | 'ArrowDown' | 'Arrow
 export interface KeyPressEvent {
     key: SupportedKey;
     shiftKey: boolean;
+    metaKey: boolean;
+    ctrlKey: boolean;
 }
 
 export type OnKeyPressCallback = (event: KeyPressEvent) => boolean;
@@ -98,7 +100,9 @@ export const MultiTextInput = React.forwardRef<MultiTextInputHandle, MultiTextIn
         if (normalizedKey) {
             const keyEvent: KeyPressEvent = {
                 key: normalizedKey,
-                shiftKey: e.shiftKey
+                shiftKey: e.shiftKey,
+                metaKey: e.metaKey,
+                ctrlKey: e.ctrlKey,
             };
             
             const handled = onKeyPress(keyEvent);