From adb671f28dc9e3a0844f432fa7e71c60f114ab1c Mon Sep 17 00:00:00 2001
From: Haileyesus <something@gmail.com>
Date: Tue, 10 Feb 2026 12:24:21 +0300
Subject: [PATCH] fix(shell): resolve clipboard handling for copy and paste
 events

---
 src/components/Shell.jsx | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/Shell.jsx b/src/components/Shell.jsx
index ba6a686..78e7af4 100644
--- a/src/components/Shell.jsx
+++ b/src/components/Shell.jsx
@@ -369,12 +369,28 @@ function Shell({ selectedProject, selectedSession, initialCommand, isPlainShell
         copyAuthUrlToClipboard(authUrlRef.current).catch(() => {});
       }
 
-      if ((event.ctrlKey || event.metaKey) && event.key === 'c' && terminal.current.hasSelection()) {
+      if (
+        event.type === 'keydown' &&
+        (event.ctrlKey || event.metaKey) &&
+        event.key?.toLowerCase() === 'c' &&
+        terminal.current.hasSelection()
+      ) {
+        event.preventDefault();
+        event.stopPropagation();
         document.execCommand('copy');
         return false;
       }
 
-      if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
+      if (
+        event.type === 'keydown' &&
+        (event.ctrlKey || event.metaKey) &&
+        event.key?.toLowerCase() === 'v'
+      ) {
+        // Block native browser/xterm paste so clipboard data is only sent after
+        // the explicit clipboard-read flow resolves (avoids duplicate pastes).
+        event.preventDefault();
+        event.stopPropagation();
+
         navigator.clipboard.readText().then(text => {
           if (ws.current && ws.current.readyState === WebSocket.OPEN) {
             ws.current.send(JSON.stringify({