Update file-manager/app.py

file-manager/app.py

@@ -146,6 +146,7 @@ def term_page():
     <div class="bar">
       <b>Terminals</b> — sessions live on the box and survive closing the browser.
       <span style="color:#777">Reopen this page anytime to reattach.</span>
+      <span style="color:#47E6C1;margin-left:12px">Paste: Ctrl/Cmd+V or right-click · Copy: select then Ctrl/Cmd+C</span>
     </div>
     <div id="tabs"></div>
     <div id="term" style="height:68vh;background:#000;border-radius:0 6px 6px 6px"></div>
@@ -156,6 +157,36 @@ def term_page():
     <script>
       let term, fit, current = null, cursor = 0, polling = false;
 
+      // send raw bytes to the PTY (used by both typing and pasting)
+      function sendData(d){
+        if(!current) return;
+        fetch('/fm/term_in', {method:'POST',
+          headers:{'Content-Type':'application/json'},
+          body: JSON.stringify({name: current, data: d})});
+      }
+
+      // FIX 4: robust paste. Reads the clipboard and streams it to the PTY.
+      async function doPaste(){
+        if(!current) return;
+        try {
+          const text = await navigator.clipboard.readText();
+          if(text) sendData(text);
+        } catch(e) {
+          // Clipboard API blocked (insecure context / permissions).
+          // Fall back to a prompt so the user can still paste manually.
+          const text = window.prompt('Paste here (clipboard access was blocked):', '');
+          if(text) sendData(text);
+        }
+      }
+
+      // FIX 5: copy current selection to the clipboard.
+      async function doCopy(){
+        const sel = term.getSelection();
+        if(sel){
+          try { await navigator.clipboard.writeText(sel); } catch(e) {}
+        }
+      }
+
       function initTerm(){
         document.getElementById('term').innerHTML = '';
         term = new Terminal({convertEol:false, cursorBlink:true, fontFamily:'monospace', fontSize:13});
@@ -163,15 +194,41 @@ def term_page():
         term.loadAddon(fit);
         term.open(document.getElementById('term'));
         fit.fit();
+
         // FIX 1: only SEND the keystroke; never echo locally.
         // The PTY (bash) echoes it back through the poll, so echoing here = duplicates.
-        term.onData(d => {
-          if(!current) return;
-          fetch('/fm/term_in', {method:'POST',
-            headers:{'Content-Type':'application/json'},
-            body: JSON.stringify({name: current, data: d})});
+        term.onData(d => sendData(d));
+
+        // FIX 6: intercept clipboard shortcuts BEFORE xterm consumes them.
+        // Returning false stops xterm from also handling the key.
+        term.attachCustomKeyEventHandler((e) => {
+          const mod = e.ctrlKey || e.metaKey;   // Ctrl on Win/Linux, Cmd on Mac
+          if(e.type === 'keydown' && mod && e.key.toLowerCase() === 'v'){
+            e.preventDefault();
+            doPaste();
+            return false;
+          }
+          // Only hijack Ctrl/Cmd+C for copy when there IS a selection,
+          // otherwise let it through so Ctrl+C still sends SIGINT to bash.
+          if(e.type === 'keydown' && mod && e.key.toLowerCase() === 'c' && term.hasSelection()){
+            e.preventDefault();
+            doCopy();
+            return false;
+          }
+          return true;
         });
+
+        // Right-click / middle-click / browser paste event fallback.
+        const el = document.getElementById('term');
+        el.addEventListener('paste', (e) => {
+          e.preventDefault();
+          const text = (e.clipboardData || window.clipboardData).getData('text');
+          if(text) sendData(text);
+        });
+        // Right-click = paste (common terminal convention)
+        el.addEventListener('contextmenu', (e) => { e.preventDefault(); doPaste(); });
       }
+
       window.addEventListener('resize', () => { if(fit) fit.fit(); });
 
       async function refreshTabs(){
@@ -189,7 +246,7 @@ def term_page():
 
           // FIX 3: explicit close button, separate from tab-switch click
           const x = document.createElement('span');
-          x.textContent = '✕';
+          x.textContent = '\\u2715';
           x.style.marginLeft = '8px';
           x.style.color = '#F43256';
           x.onclick = (e) => { e.stopPropagation(); closeSession(n); };
@@ -199,21 +256,18 @@ def term_page():
           wrap.appendChild(t);
         });
         const add = document.createElement('span');
-        add.className = 'tab'; add.textContent = '＋ New';
+        add.className = 'tab'; add.textContent = '\\uFF0B New';
         add.onclick = newSession;
         wrap.appendChild(add);
 
-        // if the current session vanished, drop it (poll will stop touching it)
         if(current && !names.includes(current)){ current = null; }
-        // auto-attach to first session only if nothing is currently attached
         if(!current && names.length){ attach(names[0]); }
       }
 
       async function attach(name){
-        if(current === name){ return; }   // already attached, don't re-stack
+        if(current === name){ return; }
         current = name; cursor = 0;
         initTerm();
-        // replay full scrollback so you see what happened while away
         const r = await fetch('/fm/term_snapshot?name=' + encodeURIComponent(name));
         const j = await r.json();
         if(j.gone){ current = null; refreshTabs(); return; }
@@ -222,7 +276,7 @@ def term_page():
         startPoll();
       }
 
-      // FIX 2: single guarded poll loop — never stack multiple loops (that duplicated output)
+      // FIX 2: single guarded poll loop — never stack multiple loops.
       function startPoll(){
         if(polling) return;
         polling = true;
@@ -255,7 +309,6 @@ def term_page():
         await refreshTabs();
       }
 
-      // boot
       (async () => {
         await refreshTabs();
         const r = await fetch('/fm/term_list');