webtun 1.4.5 → 1.5.0

package/README.md

@@ -32,6 +32,8 @@
 - **Multi-tab terminal** — drag tabs to reorder, side-by-side sessions like your desktop
 - **File explorer** — browse, upload, download, rename, delete, cut/copy/paste with conflict resolution (replace, merge, keep both, skip)
 - **WebSocket + xterm.js** — responsive, low-latency typing
+- **Bracketed paste** — Ctrl+V works correctly in TUI apps (vim, nano, htop, mc)
+- **Command history** — automatic capture with smart dedup, works with pasted commands
 
 ### Mobile-First UX
 - **Touch gestures** — swipe to close tabs, swipe from edge to open sidebar, pull-to-refresh file list
@@ -41,16 +43,28 @@
 - **Selection mode** — toggle between terminal interaction and text selection
 - **Responsive** — optimized for phones (480px), tablets (1024px), and landscape orientation
 
+### Settings
+- **Right-click menu toggle** — enable/disable custom terminal context menu (Settings > Terminal)
+- **Terminal scroll** — reliable mouse wheel scroll in all apps, including TUI apps with mouse tracking
+
 ### File Explorer
-- **Multi-select** — select all / deselect all, batch delete and download files
-- **Zip / Extract** — right-click any file or folder to zip; right-click `.zip` files to extract
+- **Multi-select** — select all / deselect all, batch delete, download, zip, cut, and copy files
+- **Context menu on selection** — right-click actions (zip, download, delete, cut, copy) operate on all selected files
+- **Zip / Extract** — right-click any file or folder to zip; right-click `.zip` files to extract (archiver v8)
+- **Folder download** — folders download as `.zip` archives automatically
 - **Image viewer** — click images (.png, .jpg, .gif, .svg, .webp, .bmp, .ico) to preview inline
-- **Cut, Copy, Paste** — with conflict resolution dialog (replace, merge folders, keep both, skip, cancel)
+- **Cut, Copy, Paste** — multi-file support with conflict resolution dialog (replace, merge folders, keep both, skip, cancel)
 - **Upload with progress** — per-file progress bar via XHR
 - **Breadcrumb navigation** — tappable directory segments for quick navigation
 - **Long-press context menu** — rename, delete, download, copy on touch devices
 - **Text selection** — long-press file names to select and copy text on touch devices
 
+### System Stats
+- **CPU, Memory, Disk, Uptime** — real-time usage with progress bars
+- **GPU detection** — cross-platform (Linux: nvidia-smi/lspci, macOS: system_profiler, Windows: WMI)
+- **Multi-GPU support** — detects and displays all GPUs with VRAM, utilization, and temperature
+- **Top processes** — sorted by CPU usage
+
 ### Desktop App (Electron)
 - Cross-platform app for Linux & Windows
 - Runs the server as a child process — no terminal needed
@@ -231,6 +245,17 @@ kill $(pgrep -f 'cloudflared tunnel')
 | Protocol | WebSocket (ws) |
 | Tunnel | Cloudflare Tunnel (cloudflared) |
 | Desktop | Electron + electron-builder |
+| Archives | archiver v8 + yauzl |
+
+---
+
+## Security
+
+- **npm audit clean** — 0 known vulnerabilities
+- **PIN authentication** — optional, protects all API endpoints
+- **CSP headers** — restricts script sources to CDN
+- **WebSocket origin check** — prevents cross-site WebSocket hijacking
+- **Rate limiting** — per-IP rate limits on auth and search endpoints
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webtun",
-  "version": "1.4.5",
+  "version": "1.5.0",
   "description": "Self-hosted web terminal with Cloudflare Tunnel, file explorer, and PWA support",
   "author": {
     "name": "Gaurang Patel",

package/public/index.html

@@ -550,13 +550,18 @@ svg { display: block; }
 /* ═══════════════════════════════════════════════════════
     CONTEXT MENU
    ═══════════════════════════════════════════════════════ */
-#ctx-menu { position: fixed; background: var(--bg2); border: 1px solid var(--border); border-radius: var(--radius); box-shadow: 0 4px 20px var(--shadow-color); z-index: 500; display: none; min-width: 160px; overflow: hidden; }
+#ctx-menu { position: fixed; background: var(--bg2); border: 1px solid var(--border); border-radius: var(--radius); box-shadow: 0 4px 20px var(--shadow-color); z-index: 500; display: none; min-width: 160px; overflow: hidden; max-height: calc(100vh - 16px); overflow-y: auto; }
 @media (max-width: 360px) { #ctx-menu { min-width: 140px; max-width: calc(100vw - 16px); font-size: 11px; } }
 #ctx-menu.open { display: block; }
 .ctx-item { padding: 8px 14px; font-size: 12px; cursor: pointer; display: flex; align-items: center; gap: 8px; }
 .ctx-item:hover { background: var(--bg4); }
 .ctx-sep { height: 1px; background: var(--border); margin: 3px 0; }
 .ctx-item.danger { color: var(--red); }
+.ctx-submenu-wrap { }
+.ctx-submenu-arrow { margin-left: auto; font-size: 10px; color: var(--fg3); transition: transform 0.15s; }
+.ctx-submenu-wrap.open > .ctx-item > .ctx-submenu-arrow { transform: rotate(90deg); }
+.ctx-submenu-items { display: none; }
+.ctx-submenu-wrap.open > .ctx-submenu-items { display: block; }
 
 /* ═══════════════════════════════════════════════════════
    TOAST
@@ -660,8 +665,65 @@ svg { display: block; }
 #cmd-lib-search {
   width: calc(100% - 28px); height: 28px; font-size: 12px; margin: 8px 14px 0;
 }
+.cmd-lib-tabs {
+  display: flex; gap: 0; border-bottom: 1px solid var(--border); flex-shrink: 0;
+}
+.cmd-lib-tab {
+  flex: 1; height: 32px; font-size: 12px; font-weight: 600; color: var(--fg2);
+  background: none; border: none; border-bottom: 2px solid transparent;
+  cursor: pointer; transition: all var(--transition-fast);
+  display: flex; align-items: center; justify-content: center; gap: 5px;
+}
+.cmd-lib-tab:hover { color: var(--fg); background: var(--bg3); }
+.cmd-lib-tab.active { color: var(--accent); border-bottom-color: var(--accent); }
+#cmd-hist-list {
+  flex: 1; overflow-y: auto; overflow-x: hidden; padding: 6px; min-height: 0;
+  display: none; flex-direction: column; gap: 2px;
+}
+#cmd-hist-empty {
+  text-align: center; color: var(--fg2); padding: 24px 16px; font-size: 12px;
+}
+.cmd-hist-item {
+  display: flex; align-items: center; gap: 8px; padding: 6px 10px;
+  border-radius: var(--radius-sm); cursor: default; font-size: 12px;
+  transition: background var(--transition-fast);
+}
+.cmd-hist-item:hover { background: var(--bg4); }
+.cmd-hist-item .cmd-hist-cmd {
+  flex: 1; color: var(--fg); font-family: var(--font); overflow: hidden;
+  text-overflow: ellipsis; white-space: nowrap;
+}
+.cmd-hist-item .cmd-hist-time {
+  font-size: 10px; color: var(--fg3); flex-shrink: 0;
+}
+.cmd-hist-item .cmd-hist-run {
+  width: 24px; height: 24px; display: none; align-items: center; justify-content: center;
+  border-radius: var(--radius-sm); color: var(--fg2); flex-shrink: 0; cursor: pointer;
+}
+.cmd-hist-item:hover .cmd-hist-run { display: flex; }
+.cmd-hist-item .cmd-hist-run:hover { background: var(--bg4); color: var(--green); }
+.cmd-hist-item .cmd-hist-del {
+  width: 24px; height: 24px; display: none; align-items: center; justify-content: center;
+  border-radius: var(--radius-sm); color: var(--fg2); flex-shrink: 0; cursor: pointer;
+}
+.cmd-hist-item:hover .cmd-hist-del { display: flex; }
+.cmd-hist-item .cmd-hist-del:hover { color: var(--red); background: var(--bg4); }
+.cmd-hist-header {
+  display: flex; align-items: center; justify-content: space-between;
+  padding: 6px 10px; flex-shrink: 0;
+}
+.cmd-hist-header label { font-size: 11px; color: var(--fg2); display: flex; align-items: center; gap: 4px; }
+.cmd-hist-header input[type="number"] {
+  width: 52px; height: 22px; font-size: 11px; padding: 0 4px; text-align: center;
+}
+.cmd-hist-clear {
+  font-size: 11px; color: var(--red); background: none; border: none; cursor: pointer;
+  padding: 2px 6px; border-radius: var(--radius-sm);
+}
+.cmd-hist-clear:hover { background: var(--bg4); }
 #cmd-lib-list {
-  flex: 1; overflow-y: auto; padding: 6px; min-height: 0;
+  flex: 1; overflow-y: auto; overflow-x: hidden; padding: 6px; min-height: 0;
+  display: flex; flex-direction: column; gap: 2px;
 }
 #cmd-lib-empty {
   text-align: center; color: var(--fg2); padding: 24px 16px; font-size: 12px;
@@ -957,8 +1019,19 @@ svg { display: block; }
               <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
             </button>
           </div>
+          <div class="cmd-lib-tabs">
+            <button class="cmd-lib-tab active" id="cmd-tab-lib" onclick="switchCmdTab('library')">Library</button>
+            <button class="cmd-lib-tab" id="cmd-tab-hist" onclick="switchCmdTab('history')">History</button>
+          </div>
           <input id="cmd-lib-search" type="text" placeholder="Filter commands…" oninput="filterCmdLib()">
           <div id="cmd-lib-list"></div>
+          <div id="cmd-hist-list">
+            <div id="cmd-hist-empty">No commands run yet</div>
+          </div>
+          <div class="cmd-hist-header" id="cmd-hist-header" style="display:none">
+            <label>Keep last <input type="number" id="cmd-hist-max" min="10" max="500" value="50" onchange="updateHistMax(+this.value)"> cmds</label>
+            <button class="cmd-hist-clear" onclick="clearCmdHist()">Clear History</button>
+          </div>
           <div id="cmd-lib-footer">
             <input id="cmd-lib-name-input" type="text" placeholder="Name" onkeydown="if(event.key==='Enter')document.getElementById('cmd-lib-cmd-input').focus()">
             <input id="cmd-lib-cmd-input" type="text" placeholder="Command (e.g. ls -la)" onkeydown="if(event.key==='Enter')addCustomCmd()">
@@ -1118,6 +1191,10 @@ svg { display: block; }
             <label>Bell Sound</label>
             <div class="toggle" id="s-bell" role="switch" tabindex="0" aria-checked="false" onclick="toggleSetting('bell')" onkeydown="if(event.key===' '||event.key==='Enter'){event.preventDefault();toggleSetting('bell')}"></div>
           </div>
+          <div class="setting-row">
+            <label>Right-Click Menu</label>
+            <div class="toggle on" id="s-termRightClick" role="switch" tabindex="0" aria-checked="true" onclick="toggleSetting('termRightClick')" onkeydown="if(event.key===' '||event.key==='Enter'){event.preventDefault();toggleSetting('termRightClick')}"></div>
+          </div>
         </div>
         <div class="settings-section">
           <h3>Interface</h3>
@@ -1198,12 +1275,37 @@ svg { display: block; }
 </div>
 
 <!-- Terminal context menu -->
-<div id="term-ctx-menu" role="menu" style="position:fixed;background:var(--bg2);border:1px solid var(--border);border-radius:var(--radius);box-shadow:0 4px 20px var(--shadow-color);z-index:500;display:none;min-width:160px;overflow:hidden">
+<div id="term-ctx-menu" role="menu" style="position:fixed;background:var(--bg2);border:1px solid var(--border);border-radius:var(--radius);box-shadow:0 4px 20px var(--shadow-color);z-index:500;display:none;min-width:180px;overflow:hidden">
+  <!-- Clipboard -->
   <div class="ctx-item" id="term-ctx-copy" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg> Copy</div>
   <div class="ctx-item" id="term-ctx-paste" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="14" y="2" width="8" height="8" rx="2"/><path d="M16 14H8M8 18h8"/><path d="M5 4h4"/><rect x="2" y="6" width="16" height="16" rx="2"/></svg> Paste</div>
+  <div class="ctx-sep"></div>
   <div class="ctx-item" id="term-ctx-select-all" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M9 3v18"/><path d="M15 3v18"/><path d="M3 9h18"/><path d="M3 15h18"/></svg> Select All</div>
+  <!-- Tab / Path -->
+  <div class="ctx-sep"></div>
+  <div class="ctx-item" id="term-ctx-new-tab" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> New Tab Here</div>
+  <div class="ctx-item" id="term-ctx-copy-cwd" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg> Copy Working Directory</div>
+  <!-- Control -->
   <div class="ctx-sep"></div>
-  <div class="ctx-item" id="term-ctx-clear" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M3 9h18"/></svg> Clear</div>
+  <div class="ctx-item" id="term-ctx-interrupt" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><line x1="9" y1="9" x2="15" y2="15"/><line x1="15" y1="9" x2="9" y2="15"/></svg> Interrupt (Ctrl+C)</div>
+  <!-- More Options -->
+  <div class="ctx-sep"></div>
+  <div class="ctx-submenu-wrap">
+    <div class="ctx-item" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="1"/><circle cx="12" cy="5" r="1"/><circle cx="12" cy="19" r="1"/></svg> More Options<span class="ctx-submenu-arrow">▸</span></div>
+    <div class="ctx-submenu-items">
+      <div class="ctx-item" id="term-ctx-find" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg> Find in Terminal</div>
+      <div class="ctx-item" id="term-ctx-zoom-in" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/><line x1="11" y1="8" x2="11" y2="14"/><line x1="8" y1="11" x2="14" y2="11"/></svg> Zoom In</div>
+      <div class="ctx-item" id="term-ctx-zoom-out" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/><line x1="8" y1="11" x2="14" y2="11"/></svg> Zoom Out</div>
+      <div class="ctx-item" id="term-ctx-select-line" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="3" y1="12" x2="21" y2="12"/></svg> Select Line</div>
+      <div class="ctx-item" id="term-ctx-scroll-top" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="18 15 12 9 6 15"/></svg> Scroll to Top</div>
+      <div class="ctx-item" id="term-ctx-scroll-bottom" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="6 9 12 15 18 9"/></svg> Scroll to Bottom</div>
+      <div class="ctx-item" id="term-ctx-rename" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M17 3a2.85 2.83 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"/><path d="m15 5 4 4"/></svg> Rename Tab</div>
+      <div class="ctx-item" id="term-ctx-bookmark" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z"/></svg> Bookmark Directory</div>
+    </div>
+  </div>
+  <!-- Danger -->
+  <div class="ctx-sep"></div>
+  <div class="ctx-item danger" id="term-ctx-clear" role="menuitem"><svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M3 9h18"/></svg> Clear</div>
 </div>
 
 <!-- Fuzzy Finder Modal -->
@@ -1245,6 +1347,7 @@ svg { display: block; }
           <div class="sys-val" id="sys-uptime-val">—</div>
           <div class="sys-sub" id="sys-uptime-sub"></div>
         </div>
+        <div id="sys-gpu-container"></div>
       </div>
       <div class="settings-section">
         <h3>Top Processes by CPU</h3>
@@ -1373,7 +1476,7 @@ let hasTmux = false;
 let settings = {
   theme: 'light', fontSize: 14, font: "'SF Mono', 'Fira Code', Consolas, monospace",
   cursor: 'block', blink: true, scrollback: 5000, bell: false,
-  mobilekeys: false, confirmclose: true, datasaver: false, autostart: false, keepAwake: false
+  mobilekeys: false, confirmclose: true, datasaver: false, autostart: false, keepAwake: false, termRightClick: true
 };
 let serverPlatform = '';
 
@@ -1804,6 +1907,47 @@ function connectWebSocket(tab, isReconnect = false) {
 
   const sendInput = data => {
     if (ws.readyState !== WebSocket.OPEN) return;
+    // On Enter, capture the command for history
+    for (let i = 0; i < data.length; i++) {
+      const ch = data.charCodeAt(i);
+      if (ch === 13 || ch === 10) { // Enter
+        try {
+          // Prefer stored paste text (avoids single-row truncation from getLine)
+          let text = tab._lastPasteText;
+          tab._lastPasteText = null;
+          if (text) {
+            // For multi-line pastes, take only the last line (the command)
+            const lines = text.split('\n');
+            text = lines[lines.length - 1] || lines[lines.length - 2] || text;
+            text = text.trim();
+          } else {
+            // Read from terminal buffer — collect all rows from prompt to cursor
+            const buf = tab.term.buffer.active;
+            const cursorRow = buf.baseY + buf.cursorY;
+            let collected = '';
+            // Scan upward to find the prompt line (contains $, #, or %)
+            for (let r = cursorRow; r >= Math.max(0, cursorRow - 20); r--) {
+              const row = buf.getLine(r);
+              if (!row) break;
+              const rowText = row.translateToString(false);
+              // Prompt detection: line ends with $, #, or % followed by space
+              if (/\s*[#$%]\s*$/.test(rowText)) {
+                const promptEnd = rowText.search(/[#$%]\s*$/);
+                if (promptEnd >= 0) {
+                  collected = rowText.substring(promptEnd + 1) + collected;
+                }
+                break;
+              }
+              collected = rowText + collected;
+            }
+            text = collected.trim();
+            // Strip any trailing prompt artifacts from multi-row
+            text = text.replace(/\s*[#$%]\s*$/, '').trim();
+          }
+          if (text) addToCmdHist(text);
+        } catch {}
+      }
+    }
     const enc = new TextEncoder().encode(data);
     const buf = new Uint8Array(1 + enc.length);
     buf[0] = 0x00; buf.set(enc, 1);
@@ -2042,6 +2186,21 @@ function initTerminal(tab) {
   tab.closed = false;
   tab.textarea = term.textarea || term.element?.querySelector('.xterm-textarea, textarea');
 
+  // Intercept paste events to use bracketed paste mode (required for TUI apps like vim, nano, mc)
+  if (tab.textarea) {
+    tab.textarea.addEventListener('paste', e => {
+      e.preventDefault();
+      const text = (e.clipboardData || window.clipboardData)?.getData('text');
+      if (!text || !tab.ws || tab.ws.readyState !== WebSocket.OPEN) return;
+      tab._lastPasteText = text;
+      const bracketed = '\x1b[200~' + text + '\x1b[201~';
+      const enc = new TextEncoder().encode(bracketed);
+      const buf = new Uint8Array(1 + enc.length);
+      buf[0] = 0x00; buf.set(enc, 1);
+      tab.ws.send(buf.buffer);
+    }, true);
+  }
+
   // term.onFocus() was removed from xterm.js — use native DOM event instead
   term.element.addEventListener('focusin', () => {
     if (activeTabId !== tab.id) {
@@ -2093,13 +2252,28 @@ function initTerminal(tab) {
 
   // Terminal right-click context menu
   term.element.addEventListener('contextmenu', e => {
+    if (!settings.termRightClick) return;
     e.preventDefault();
     const menu = document.getElementById('term-ctx-menu');
     const sel = term.getSelection();
     document.getElementById('term-ctx-copy').style.opacity = sel ? '' : '0.5';
-    menu.style.left = Math.min(e.clientX, window.innerWidth - 170) + 'px';
-    menu.style.top = Math.min(e.clientY, window.innerHeight - 160) + 'px';
+    // Show first to measure actual dimensions
     menu.style.display = 'block';
+    const mw = menu.offsetWidth;
+    const mh = menu.offsetHeight;
+    const vw = window.innerWidth;
+    const vh = window.innerHeight;
+    let left = e.clientX;
+    let top = e.clientY;
+    // Flip horizontally if overflowing right
+    if (left + mw > vw) left = Math.max(0, e.clientX - mw);
+    // Flip vertically if overflowing bottom
+    if (top + mh > vh) top = Math.max(0, e.clientY - mh);
+    // Clamp to viewport
+    left = Math.max(0, Math.min(left, vw - mw));
+    top = Math.max(0, Math.min(top, vh - mh));
+    menu.style.left = left + 'px';
+    menu.style.top = top + 'px';
   });
 
   // Touch-to-mouse translation for TUI apps (mobile)
@@ -2146,18 +2320,22 @@ function initTerminal(tab) {
     if (!tab.closed) connectWebSocket(tab, false);
   });
 
-  // Scroll terminal on wheel; yield to TUI apps when mouse tracking is active
+  // Scroll terminal on wheel
   tab.wrapper.addEventListener('wheel', e => {
     if (e.ctrlKey || e.metaKey) return;
-    // When a TUI app (vim, htop, tmux…) has mouse tracking on, let the app handle scroll
+    e.preventDefault();
+    // TUI apps with mouse tracking handle scroll themselves — forward the event to xterm.js
     try {
       const core = term._core;
-      if (core && core.coreMouseService && core.coreMouseService.isMouseTrackingActive()) return;
+      if (core && core.coreMouseService && core.coreMouseService.isMouseTrackingActive()) {
+        const vp = tab.wrapper.querySelector('.xterm-viewport');
+        if (vp) vp.dispatchEvent(new WheelEvent('wheel', e));
+        return;
+      }
     } catch (_) {}
     const atTop = term.buffer.active.baseY === 0;
     const atBottom = term.buffer.active.baseY + term.rows >= term.buffer.active.length;
     if (tilesMode && ((e.deltaY < 0 && atTop) || (e.deltaY > 0 && atBottom))) return;
-    e.preventDefault();
     let delta = e.deltaY;
     if (e.deltaMode === 1) delta *= 16;
     else if (e.deltaMode === 2) delta *= 16 * term.rows;
@@ -2686,24 +2864,115 @@ function renderBreadcrumb(fullPath) {
 let fsClipboard = null;
 
 // Terminal context menu actions (registered once)
+function hideTermCtxMenu() {
+  document.getElementById('term-ctx-menu').style.display = 'none';
+  document.querySelectorAll('#term-ctx-menu .ctx-submenu-wrap.open').forEach(el => el.classList.remove('open'));
+}
 document.getElementById('term-ctx-copy').addEventListener('click', () => {
   const t = getActiveTab();
-  if (t?.term) { const sel = t.term.getSelection(); if (sel) navigator.clipboard.writeText(sel); }
-  document.getElementById('term-ctx-menu').style.display = 'none';
+  if (t?.term) {
+    const sel = t.term.getSelection();
+    if (sel) {
+      navigator.clipboard.writeText(sel).then(() => {
+        toast('Copied to clipboard', 'success');
+      }).catch(() => {
+        document.execCommand('copy');
+        toast('Copied to clipboard', 'success');
+      });
+    }
+  }
+  hideTermCtxMenu();
 });
 document.getElementById('term-ctx-paste').addEventListener('click', () => {
   pasteToTerminal();
-  document.getElementById('term-ctx-menu').style.display = 'none';
+  hideTermCtxMenu();
 });
 document.getElementById('term-ctx-select-all').addEventListener('click', () => {
   const t = getActiveTab();
   if (t?.term) t.term.selectAll();
-  document.getElementById('term-ctx-menu').style.display = 'none';
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-select-line').addEventListener('click', () => {
+  selectTermLine();
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-find').addEventListener('click', () => {
+  toggleSearch();
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-zoom-in').addEventListener('click', () => {
+  applyFontSize((settings.fontSize || 14) + 1);
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-zoom-out').addEventListener('click', () => {
+  applyFontSize((settings.fontSize || 14) - 1);
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-new-tab').addEventListener('click', () => {
+  const t = getActiveTab();
+  newTab(null, null, t?.cwd || currentPath);
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-copy-cwd').addEventListener('click', () => {
+  const t = getActiveTab();
+  const cwd = t?.cwd || currentPath;
+  if (cwd) {
+    navigator.clipboard.writeText(cwd).then(() => {
+      toast('Path copied', 'success');
+    }).catch(() => {
+      document.execCommand('copy');
+      toast('Path copied', 'success');
+    });
+  }
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-bookmark').addEventListener('click', () => {
+  const t = getActiveTab();
+  const cwd = t?.cwd || currentPath;
+  if (cwd) {
+    const bm = getBookmarks();
+    if (bm.some(b => b.path === cwd)) { toast('Already bookmarked', 'info'); }
+    else {
+      const sep = cwd.includes('\\') ? '\\' : '/';
+      bm.push({ name: cwd.split(sep).filter(Boolean).pop() || cwd, path: cwd });
+      saveBookmarks(bm);
+      toast('Bookmarked', 'success');
+    }
+  }
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-interrupt').addEventListener('click', () => {
+  sendKey('\x03');
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-rename').addEventListener('click', () => {
+  const t = getActiveTab();
+  if (t?.el) {
+    const span = t.el.querySelector('.tab-title');
+    if (span) span.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }));
+  }
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-scroll-top').addEventListener('click', () => {
+  const t = getActiveTab();
+  if (t?.term) t.term.scrollToTop();
+  hideTermCtxMenu();
+});
+document.getElementById('term-ctx-scroll-bottom').addEventListener('click', () => {
+  const t = getActiveTab();
+  if (t?.term) t.term.scrollToBottom();
+  hideTermCtxMenu();
 });
 document.getElementById('term-ctx-clear').addEventListener('click', () => {
   const t = getActiveTab();
   if (t?.term) t.term.clear();
-  document.getElementById('term-ctx-menu').style.display = 'none';
+  hideTermCtxMenu();
+});
+// Submenu toggle on click
+document.querySelector('#term-ctx-menu .ctx-submenu-wrap > .ctx-item').addEventListener('click', e => {
+  e.stopPropagation();
+  const wrap = e.currentTarget.closest('.ctx-submenu-wrap');
+  wrap.classList.toggle('open');
 });
 
 function showCtxMenu(e, file) {
@@ -2718,24 +2987,21 @@ function showCtxMenu(e, file) {
   document.getElementById('ctx-zip').style.display = '';
   document.getElementById('ctx-folder-size').style.display = file.isDir ? '' : 'none';
   document.getElementById('ctx-extract').style.display = file.isDir ? 'none' : (file.ext === '.zip' ? '' : 'none');
+  // Measure after content is set
   const mw = menu.offsetWidth, mh = menu.offsetHeight;
-  let left = Math.min(e.clientX, window.innerWidth - mw - 8);
-  let top = Math.min(e.clientY, window.innerHeight - mh - 8);
-  if (left < 0) left = 8;
-  if (top < 0) top = 8;
+  const vw = window.innerWidth, vh = window.innerHeight;
+  let left = e.clientX, top = e.clientY;
+  // Flip horizontally if overflowing right
+  if (left + mw > vw) left = Math.max(0, e.clientX - mw);
+  // Flip vertically if overflowing bottom
+  if (top + mh > vh) top = Math.max(0, e.clientY - mh);
+  // Clamp to viewport
+  left = Math.max(0, Math.min(left, vw - mw));
+  top = Math.max(0, Math.min(top, vh - mh));
   menu.style.left = left + 'px';
   menu.style.top = top + 'px';
   menu.classList.add('open');
   menu.style.display = '';
-  requestAnimationFrame(() => {
-    const rect = menu.getBoundingClientRect();
-    if (rect.right > window.innerWidth) {
-      menu.style.left = Math.max(0, window.innerWidth - rect.width - 8) + 'px';
-    }
-    if (rect.bottom > window.innerHeight) {
-      menu.style.top = Math.max(0, window.innerHeight - rect.height - 8) + 'px';
-    }
-  });
 }
 
 document.addEventListener('click', () => {
@@ -2746,12 +3012,20 @@ document.addEventListener('click', () => {
 
 document.getElementById('ctx-open').onclick = () => { if (!ctxTarget) return; if (isImageFile(ctxTarget.path)) openImageViewer(ctxTarget.path); else loadFiles(ctxTarget.path); };
 document.getElementById('ctx-edit').onclick = () => ctxTarget && openFileEditor(ctxTarget.path);
-document.getElementById('ctx-download').onclick = () => ctxTarget && downloadFile(ctxTarget.path);
+document.getElementById('ctx-download').onclick = () => {
+  if (selectedFiles.length > 0) { downloadSelected(); return; }
+  if (ctxTarget) downloadFile(ctxTarget.path);
+};
 document.getElementById('ctx-zip').onclick = async () => {
-  if (!ctxTarget) return;
+  const files = selectedFiles.length > 0 ? selectedFiles : (ctxTarget ? [ctxTarget.path] : []);
+  if (!files.length) return;
   const t = toast('Zipping…', 'info');
-  await zipFile(ctxTarget.path, ctxTarget.name);
+  for (const p of files) {
+    const name = p.split(/[\\/]/).pop();
+    await zipFile(p, name);
+  }
   t.remove();
+  clearSelection();
 };
 document.getElementById('ctx-extract').onclick = async () => {
   if (!ctxTarget) return;
@@ -2776,10 +3050,29 @@ document.getElementById('ctx-folder-size').onclick = async () => {
 };
 document.getElementById('ctx-rename').onclick = () => ctxTarget && startRename(ctxTarget.path, ctxTarget.name);
 document.getElementById('ctx-copy-path').onclick = () => { if (!ctxTarget) return; navigator.clipboard.writeText(ctxTarget.path).then(() => toast('Path copied')).catch(() => toast('Copy failed', 'error')); };
-document.getElementById('ctx-delete').onclick = () => ctxTarget && deleteFile(ctxTarget);
+document.getElementById('ctx-delete').onclick = () => {
+  if (selectedFiles.length > 0) { deleteSelected(); return; }
+  if (ctxTarget) deleteFile(ctxTarget);
+};
 document.getElementById('ctx-open-term').onclick = () => { if (!ctxTarget) return; newTab(`Term @ ${ctxTarget.name}`, null, ctxTarget.path); };
-document.getElementById('ctx-copy').onclick = () => { if (!ctxTarget) return; fsClipboard = { action: 'copy', path: ctxTarget.path, name: ctxTarget.name }; updatePasteUI(); toast('Copied: ' + ctxTarget.name, 'success'); };
-document.getElementById('ctx-cut').onclick = () => { if (!ctxTarget) return; fsClipboard = { action: 'cut', path: ctxTarget.path, name: ctxTarget.name }; updatePasteUI(); toast('Cut: ' + ctxTarget.name, 'success'); };
+document.getElementById('ctx-copy').onclick = () => {
+  const files = selectedFiles.length > 0
+    ? selectedFiles.map(p => ({ path: p, name: p.split(/[\\/]/).pop() }))
+    : (ctxTarget ? [{ path: ctxTarget.path, name: ctxTarget.name }] : []);
+  if (!files.length) return;
+  fsClipboard = { action: 'copy', files };
+  updatePasteUI();
+  toast(`Copied ${files.length} item(s)`, 'success');
+};
+document.getElementById('ctx-cut').onclick = () => {
+  const files = selectedFiles.length > 0
+    ? selectedFiles.map(p => ({ path: p, name: p.split(/[\\/]/).pop() }))
+    : (ctxTarget ? [{ path: ctxTarget.path, name: ctxTarget.name }] : []);
+  if (!files.length) return;
+  fsClipboard = { action: 'cut', files };
+  updatePasteUI();
+  toast(`Cut ${files.length} item(s)`, 'success');
+};
 document.getElementById('ctx-paste').onclick = () => { if (fsClipboard) pasteFile(currentPath); };
 
 function updatePasteUI() {
@@ -2794,38 +3087,44 @@ let _pasteBusy = false;
 async function pasteFile(destDir, conflictMode) {
   if (!fsClipboard || _pasteBusy) return;
   _pasteBusy = true;
-  const label = fsClipboard.action === 'copy' ? 'Copying' : 'Moving';
-  const toastEl = toast(label + '…', 'info');
-  const dest = joinPath(destDir, fsClipboard.name);
-  const ep = fsClipboard.action === 'copy' ? '/api/files/copy' : '/api/files/move';
-  const body = { source: fsClipboard.path, destination: dest };
-  if (conflictMode) body.conflict = conflictMode;
-  const r = await api(ep, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(body)
-  });
-  if (r.conflict) {
-    toastEl.remove();
-    _conflictResolve = { destDir, conflictMode: null };
-    document.getElementById('conflict-name').textContent = r.name;
-    document.getElementById('conflict-dir-hint').style.display = r.isDir ? '' : 'none';
-    document.getElementById('conflict-merge').style.display = r.isDir ? '' : 'none';
-    openOverlay('conflict-overlay');
-    return;
-  }
-  if (r.success) {
+  try {
+    // Support both old single-file and new multi-file format
+    const files = fsClipboard.files || [{ path: fsClipboard.path, name: fsClipboard.name }];
+    const label = fsClipboard.action === 'copy' ? 'Copying' : 'Moving';
+    const toastEl = toast(label + '…', 'info');
+    const ep = fsClipboard.action === 'copy' ? '/api/files/copy' : '/api/files/move';
+    let succeeded = 0, failed = 0;
+    for (const file of files) {
+      const dest = joinPath(destDir, file.name);
+      const body = { source: file.path, destination: dest };
+      if (conflictMode) body.conflict = conflictMode;
+      const r = await api(ep, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(body)
+      });
+      if (r.conflict) {
+        toastEl.remove();
+        _conflictResolve = { destDir, conflictMode: null };
+        document.getElementById('conflict-name').textContent = r.name;
+        document.getElementById('conflict-dir-hint').style.display = r.isDir ? '' : 'none';
+        document.getElementById('conflict-merge').style.display = r.isDir ? '' : 'none';
+        openOverlay('conflict-overlay');
+        return;
+      }
+      if (r.success) succeeded++;
+      else failed++;
+    }
     toastEl.remove();
-    const label = fsClipboard.action === 'copy' ? 'Pasted' : 'Moved';
-    if (r.skipped) toast(label + ' (skipped existing)', 'info');
-    else toast(label, 'success');
+    const opLabel = fsClipboard.action === 'copy' ? 'Pasted' : 'Moved';
+    if (failed === 0) toast(opLabel + ` (${succeeded} item(s))`, 'success');
+    else if (succeeded === 0) toast(opLabel + ' failed', 'error');
+    else toast(`${opLabel} ${succeeded}, ${failed} failed`, 'warning');
     if (fsClipboard.action === 'cut') { fsClipboard = null; updatePasteUI(); }
     refreshFiles();
-  } else {
-    toastEl.remove();
-    toast(r.error || 'Operation failed', 'error');
+  } finally {
+    _pasteBusy = false;
   }
-  _pasteBusy = false;
 }
 
 function resolveConflict(mode) {
@@ -2883,18 +3182,24 @@ async function deleteFile(file) {
   else toast(r.error, 'error');
 }
 
-async function downloadFile(path) {
+async function downloadFile(filePath) {
   try {
-    const r = await fetch(`/api/files/download?path=${encodeURIComponent(path)}`, {
+    const r = await fetch(`/api/files/download?path=${encodeURIComponent(filePath)}`, {
       headers: { 'x-pin-token': authToken }
     });
     if (!r.ok) { toast('Download failed', 'error'); return; }
+    const ct = r.headers.get('content-type') || '';
     const blob = await r.blob();
     const url = URL.createObjectURL(blob);
     const a = document.createElement('a');
     a.href = url;
-    a.download = path.split(/[\\/]/).pop() || 'download';
+    let name = filePath.split(/[\\/]/).pop() || 'download';
+    // Server returns application/zip for directories — append .zip if missing
+    if (ct.includes('zip') && !name.endsWith('.zip')) name += '.zip';
+    a.download = name;
+    document.body.appendChild(a);
     a.click();
+    a.remove();
     URL.revokeObjectURL(url);
   } catch(e) { console.warn('Download failed:', e); toast('Download failed', 'error'); }
 }
@@ -3000,10 +3305,14 @@ async function deleteSelected() {
 }
 
 async function downloadSelected() {
-  for (const p of [...selectedFiles]) {
-    await downloadFile(p);
+  const files = [...selectedFiles];
+  if (!files.length) return;
+  toast(`Downloading ${files.length} item(s)…`, 'info');
+  for (let i = 0; i < files.length; i++) {
+    await downloadFile(files[i]);
+    // Small delay between downloads to avoid browser popup blocking
+    if (i < files.length - 1) await new Promise(r => setTimeout(r, 300));
   }
-  toast('Downloads started', 'success');
   clearSelection();
 }
 
@@ -3644,7 +3953,7 @@ function loadSettings() {
   document.getElementById('s-scrollback').value = settings.scrollback;
   document.getElementById('s-font').value = settings.font;
   document.getElementById('s-cursor').value = settings.cursor;
-  syncToggle('blink'); syncToggle('bell'); syncToggle('mobilekeys'); syncToggle('confirmclose'); syncToggle('datasaver');
+  syncToggle('blink'); syncToggle('bell'); syncToggle('mobilekeys'); syncToggle('confirmclose'); syncToggle('datasaver'); syncToggle('termRightClick');
   syncKeepAwakeUI();
   if (settings.keepAwake && hasWakeLock) { requestWakeLock(); }
   if (isElectron) {
@@ -4191,6 +4500,11 @@ function setupKeyboardShortcuts() {
     if (ctrl && e.shiftKey && e.key === 'ArrowLeft') { e.preventDefault(); cycleTab(-1); }
     if (ctrl && e.shiftKey && e.key === 'r') { e.preventDefault(); refreshPreview(); }
     if (e.key === 'Escape') {
+      const termMenu = document.getElementById('term-ctx-menu');
+      if (termMenu && termMenu.style.display !== 'none') {
+        termMenu.style.display = 'none';
+        return;
+      }
       if (document.getElementById('ctx-menu').classList.contains('open')) {
         document.getElementById('ctx-menu').classList.remove('open');
         return;
@@ -4350,6 +4664,7 @@ function pasteToTerminal() {
       const buf = new Uint8Array(1 + enc.length);
       buf[0] = 0x00; buf.set(enc, 1);
       tab.ws.send(buf.buffer);
+      tab.term?.focus();
       toast('Pasted to terminal', 'success');
     }
   };
@@ -4366,14 +4681,16 @@ function fallbackPaste(callback) {
     _pasteInput = document.createElement('textarea');
     _pasteInput.style.cssText = 'position:fixed;left:0;top:0;width:1px;height:1px;opacity:0;z-index:-1';
     document.body.appendChild(_pasteInput);
-    _pasteInput.addEventListener('input', () => {
-      callback(_pasteInput.value);
-      _pasteInput.value = '';
+    _pasteInput.addEventListener('paste', () => {
+      setTimeout(() => {
+        callback(_pasteInput.value);
+        _pasteInput.value = '';
+      }, 0);
     });
   }
   _pasteInput.value = '';
   _pasteInput.focus();
-  toast('Tap & hold to paste', 'info');
+  document.execCommand('paste');
 }
 
 function selectAllTerm() {
@@ -4915,9 +5232,8 @@ function toggleCmdLib() {
   panel.classList.toggle('open');
   document.getElementById('cmd-lib-toggle').classList.toggle('active', !isOpen);
   if (!isOpen) {
-    renderCmdLib();
-    document.getElementById('cmd-lib-search').value = '';
-    document.getElementById('cmd-lib-search').focus();
+    loadHistMax();
+    switchCmdTab('library');
     setTimeout(() => {
       document.addEventListener('click', closeCmdLibOnClickOutside, true);
     }, 0);
@@ -4999,7 +5315,13 @@ function renderCmdLib(filter) {
         item.appendChild(delBtn);
       }
 
-      item.addEventListener('click', () => runCmdLib(c.cmd));
+      item.addEventListener('click', () => {
+        const tab = getActiveTab();
+        if (!tab?.term) return;
+        tab.term.focus();
+        document.execCommand('insertText', false, c.cmd);
+        toggleCmdLib();
+      });
       section.appendChild(item);
     });
     list.appendChild(section);
@@ -5023,6 +5345,7 @@ function runCmdLib(cmd) {
   buf.set(enc, 1);
   tab.ws.send(buf.buffer);
   tab.term?.focus();
+  addToCmdHist(cmd);
   toast('Running: ' + cmd, 'info');
 }
 
@@ -5053,6 +5376,155 @@ function deleteCustomCmd(name, cmd) {
   toast('Command removed', 'info');
 }
 
+// ═══════════════════════════════════════════════════════
+// COMMAND HISTORY (server-side storage)
+// ═══════════════════════════════════════════════════════
+let cmdHistMax = 50;
+let _cmdHistCache = [];
+
+function histHeaders() {
+  return { 'Content-Type': 'application/json', 'x-pin-token': localStorage.getItem('wt-pin') || '' };
+}
+function histHeadersDelete() {
+  return { 'x-pin-token': localStorage.getItem('wt-pin') || '' };
+}
+async function getCmdHist() {
+  try {
+    const r = await fetch('/api/history', { headers: histHeadersDelete() });
+    if (!r.ok) return _cmdHistCache;
+    const data = await r.json();
+    _cmdHistCache = data.history || [];
+    if (data.max) cmdHistMax = data.max;
+    return _cmdHistCache;
+  } catch { return _cmdHistCache; }
+}
+function loadHistMax() {
+  getCmdHist().then(() => {
+    const el = document.getElementById('cmd-hist-max');
+    if (el) el.value = cmdHistMax;
+  });
+}
+async function addToCmdHist(cmd) {
+  if (!cmd || !cmd.trim()) return;
+  // Strip ANSI escapes and control characters, keep only printable + space + tab
+  const clean = cmd.replace(/\x1b\[[0-9;]*[a-zA-Z~]/g, '')
+    .replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, '')
+    .replace(/[\x00-\x08\x0e-\x1f]/g, '')
+    .trim();
+  if (!clean) return;
+  try {
+    await fetch('/api/history', { method: 'POST', headers: histHeaders(), body: JSON.stringify({ cmd: clean, max: cmdHistMax }) });
+    await getCmdHist();
+  } catch {}
+}
+async function removeCmdHistItem(idx) {
+  try {
+    await fetch('/api/history/' + idx, { method: 'DELETE', headers: histHeadersDelete() });
+    await getCmdHist();
+    renderCmdHist();
+  } catch {}
+}
+async function clearCmdHist() {
+  try {
+    await fetch('/api/history', { method: 'DELETE', headers: histHeadersDelete() });
+    _cmdHistCache = [];
+    renderCmdHist();
+    toast('History cleared', 'info');
+  } catch {}
+}
+async function updateHistMax(val) {
+  cmdHistMax = Math.max(10, Math.min(500, val || 50));
+  try {
+    await fetch('/api/history', { method: 'POST', headers: histHeaders(), body: JSON.stringify({ cmd: '', max: cmdHistMax }) });
+  } catch {}
+}
+function switchCmdTab(tab) {
+  const libBtn = document.getElementById('cmd-tab-lib');
+  const histBtn = document.getElementById('cmd-tab-hist');
+  const libList = document.getElementById('cmd-lib-list');
+  const histList = document.getElementById('cmd-hist-list');
+  const histHeader = document.getElementById('cmd-hist-header');
+  const footer = document.getElementById('cmd-lib-footer');
+  const search = document.getElementById('cmd-lib-search');
+  if (tab === 'library') {
+    libBtn.classList.add('active');
+    histBtn.classList.remove('active');
+    libList.style.display = '';
+    histList.style.display = 'none';
+    histHeader.style.display = 'none';
+    footer.style.display = '';
+    search.placeholder = 'Filter commands…';
+    search.oninput = () => filterCmdLib();
+    filterCmdLib();
+  } else {
+    histBtn.classList.add('active');
+    libBtn.classList.remove('active');
+    histList.style.display = 'flex';
+    libList.style.display = 'none';
+    histHeader.style.display = '';
+    footer.style.display = 'none';
+    search.placeholder = 'Filter history…';
+    search.oninput = () => renderCmdHist();
+    renderCmdHist();
+  }
+  search.value = '';
+  search.focus();
+}
+async function renderCmdHist() {
+  const list = document.getElementById('cmd-hist-list');
+  const hist = await getCmdHist();
+  const q = (document.getElementById('cmd-lib-search').value || '').toLowerCase();
+  const filtered = q ? hist.filter(h => h.cmd.toLowerCase().includes(q)) : hist;
+
+  list.innerHTML = '';
+  if (!filtered.length) {
+    list.innerHTML = '<div id="cmd-hist-empty">No commands run yet</div>';
+    return;
+  }
+
+  filtered.forEach((h, i) => {
+    const realIdx = q ? hist.indexOf(h) : i;
+    const item = document.createElement('div');
+    item.className = 'cmd-hist-item';
+
+    const cmdSpan = document.createElement('span');
+    cmdSpan.className = 'cmd-hist-cmd';
+    cmdSpan.textContent = h.cmd;
+    cmdSpan.title = h.cmd;
+    item.appendChild(cmdSpan);
+
+    const timeSpan = document.createElement('span');
+    timeSpan.className = 'cmd-hist-time';
+    const ago = Date.now() - h.time;
+    timeSpan.textContent = ago < 60000 ? 'just now' : ago < 3600000 ? Math.floor(ago / 60000) + 'm ago' : ago < 86400000 ? Math.floor(ago / 3600000) + 'h ago' : new Date(h.time).toLocaleDateString();
+    if (h.count > 1) timeSpan.textContent = '×' + h.count + ' ' + timeSpan.textContent;
+    item.appendChild(timeSpan);
+
+    const runBtn = document.createElement('button');
+    runBtn.className = 'cmd-hist-run';
+    runBtn.title = 'Run in terminal';
+    runBtn.innerHTML = '<svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="6,3 20,12 6,21"/></svg>';
+    runBtn.addEventListener('click', e => { e.stopPropagation(); runCmdLib(h.cmd); });
+    item.appendChild(runBtn);
+
+    const delBtn = document.createElement('button');
+    delBtn.className = 'cmd-hist-del';
+    delBtn.title = 'Remove';
+    delBtn.textContent = '×';
+    delBtn.addEventListener('click', e => { e.stopPropagation(); removeCmdHistItem(realIdx); });
+    item.appendChild(delBtn);
+
+    item.addEventListener('click', () => {
+      const tab = getActiveTab();
+      if (!tab?.term) return;
+      tab.term.focus();
+      document.execCommand('insertText', false, h.cmd);
+      toggleCmdLib();
+    });
+    list.appendChild(item);
+  });
+}
+
 // ═══════════════════════════════════════════════════════
 // SYSTEM STATS
 // ═══════════════════════════════════════════════════════
@@ -5112,6 +5584,31 @@ async function refreshSystemStats(showLoading) {
   document.getElementById('sys-uptime-val').textContent = fmtUptime(data.uptime);
   document.getElementById('sys-uptime-sub').textContent = data.hostname + ' · ' + data.platform;
 
+  const gpuContainer = document.getElementById('sys-gpu-container');
+  gpuContainer.innerHTML = '';
+  const gpuList = data.gpus || (data.gpu ? [data.gpu] : []);
+  if (gpuList.length) {
+    gpuList.forEach((g, i) => {
+      const card = document.createElement('div');
+      card.className = 'sys-card';
+      const label = gpuList.length > 1 ? `GPU ${i + 1}` : 'GPU';
+      let sub = '';
+      if (g.memTotal > 0) sub += formatSize(g.memTotal * 1024 * 1024) + ' VRAM';
+      else if (g.memTotal === 0 && g.driver !== 'lspci') sub += 'Shared memory';
+      if (g.utilization != null) sub += (sub ? ' · ' : '') + g.utilization + '% util';
+      if (g.temp) sub += (sub ? ' · ' : '') + g.temp + '°C';
+      if (g.driver && g.driver !== 'nvidia' && g.driver !== 'macos' && g.driver !== 'lspci') sub += (sub ? ' · ' : '') + 'Driver: ' + g.driver;
+      let barHtml = '';
+      if (g.memTotal > 0 && g.memUsed) {
+        const pct = Math.round((g.memUsed / g.memTotal) * 100);
+        const cls = pct > 80 ? ' danger' : pct > 50 ? ' warn' : '';
+        barHtml = `<div class="sys-bar"><div class="sys-bar-fill${cls}" style="width:${Math.min(pct, 100)}%"></div></div>`;
+      }
+      card.innerHTML = `<h3>${label}</h3><div class="sys-val">${g.name}</div><div class="sys-sub">${sub || 'No details available'}</div>${barHtml}`;
+      gpuContainer.appendChild(card);
+    });
+  }
+
   const tbody = document.getElementById('sys-proc-body');
   tbody.innerHTML = '';
   if (data.processes) {

package/server.js

@@ -48,7 +48,7 @@ const path = require('path');
 const os = require('os');
 const crypto = require('crypto');
 const { execSync, execFileSync, spawn } = require('child_process');
-const archiver = require('archiver');
+const { ZipArchive } = require('archiver');
 const yauzl = require('yauzl');
 const https = require('https');
 const http = require('http');
@@ -127,6 +127,14 @@ const WORKSPACE_ROOT = process.env.WORKSPACE_ROOT ? path.resolve(process.env.WOR
 app.use(express.json({ limit: '50mb' }));
 app.use(express.static(path.join(__dirname, 'public')));
 
+// Handle malformed JSON gracefully
+app.use((err, req, res, next) => {
+  if (err.type === 'entity.parse.failed') {
+    return res.status(400).json({ error: 'Invalid JSON' });
+  }
+  next(err);
+});
+
 // Security headers
 app.use((req, res, next) => {
   res.setHeader('X-Content-Type-Options', 'nosniff');
@@ -243,7 +251,7 @@ async function dirSize(dir) {
 function createZipArchive(entries, zipPath) {
   return new Promise((resolve, reject) => {
     const output = fs.createWriteStream(zipPath);
-    const archive = archiver('zip', { zlib: { level: 6 } });
+    const archive = new ZipArchive({ zlib: { level: 6 } });
     output.on('close', () => resolve());
     output.on('error', reject);
     archive.on('error', reject);
@@ -262,7 +270,7 @@ function createZipArchive(entries, zipPath) {
 }
 
 function streamZipDirectory(dirPath, res) {
-  const archive = archiver('zip', { zlib: { level: 6 } });
+  const archive = new ZipArchive({ zlib: { level: 6 } });
   archive.on('error', err => {
     if (!res.headersSent) res.status(500).json({ error: err.message });
     else res.end();
@@ -1205,6 +1213,65 @@ app.delete('/api/clipboard', checkPin, (req, res) => {
   res.json({ success: true });
 });
 
+// ── Command history (server-side, persists across sessions) ────────────
+const HISTORY_FILE = path.join(__dirname, '.cmdhist.json');
+let cmdHistory = [];
+let cmdHistMax = 50;
+
+function loadCmdHistory() {
+  try { cmdHistory = JSON.parse(fs.readFileSync(HISTORY_FILE, 'utf8')); } catch { cmdHistory = []; }
+}
+function saveCmdHistory() {
+  try { fs.writeFileSync(HISTORY_FILE, JSON.stringify(cmdHistory)); } catch {}
+}
+loadCmdHistory();
+
+app.get('/api/history', checkPin, (req, res) => {
+  res.json({ history: cmdHistory, max: cmdHistMax });
+});
+
+app.post('/api/history', checkPin, (req, res) => {
+  try {
+    const { cmd, max } = req.body;
+    if (typeof max === 'number' && max >= 10 && max <= 500) {
+      cmdHistMax = max;
+    }
+    if (!cmd || typeof cmd !== 'string' || !cmd.trim()) {
+      // No command — just updating max
+      saveCmdHistory();
+      return res.json({ success: true, history: cmdHistory, max: cmdHistMax });
+    }
+    const clean = cmd.trim();
+    if (cmdHistory.length && cmdHistory[0].cmd === clean) {
+      cmdHistory[0].time = Date.now();
+      cmdHistory[0].count = (cmdHistory[0].count || 1) + 1;
+    } else {
+      cmdHistory.unshift({ cmd: clean, time: Date.now(), count: 1 });
+    }
+    if (cmdHistory.length > cmdHistMax) cmdHistory.length = cmdHistMax;
+    saveCmdHistory();
+    res.json({ success: true, history: cmdHistory });
+  } catch (e) {
+    res.status(500).json({ error: e.message });
+  }
+});
+
+app.delete('/api/history', checkPin, (req, res) => {
+  cmdHistory = [];
+  saveCmdHistory();
+  res.json({ success: true });
+});
+
+app.delete('/api/history/:index', checkPin, (req, res) => {
+  const idx = parseInt(req.params.index);
+  if (isNaN(idx) || idx < 0 || idx >= cmdHistory.length) {
+    return res.status(400).json({ error: 'invalid index' });
+  }
+  cmdHistory.splice(idx, 1);
+  saveCmdHistory();
+  res.json({ success: true, history: cmdHistory });
+});
+
 // ── Session persistence via tmux ──────────────────────────────────────
 const TMUX = (() => { try { return execSync('command -v tmux', { stdio: ['ignore','pipe','ignore'] }).toString().trim(); } catch { return null; } })();
 
@@ -1538,12 +1605,69 @@ app.get('/api/system', checkPin, async (req, res) => {
     }
   } catch {}
 
+  let gpus = [];
+  try {
+    if (os.platform() === 'linux') {
+      // Try nvidia-smi first (NVIDIA GPUs — supports multi-GPU)
+      try {
+        const nvOut = await spawnRead('nvidia-smi', ['--query-gpu=name,memory.total,memory.used,memory.free,utilization.gpu,temperature.gpu', '--format=csv,noheader,nounits']);
+        if (nvOut && nvOut.trim()) {
+          for (const line of nvOut.trim().split('\n')) {
+            const parts = line.split(',').map(s => s.trim());
+            if (parts.length >= 6 && parts[0]) {
+              gpus.push({ name: parts[0], memTotal: +parts[1] || 0, memUsed: +parts[2] || 0, memFree: +parts[3] || 0, utilization: +parts[4] || 0, temp: +parts[5] || 0, driver: 'nvidia' });
+            }
+          }
+        }
+      } catch {}
+      // Fallback: lspci for any GPU (Intel, AMD, etc.)
+      if (!gpus.length) {
+        try {
+          const lspciOut = await spawnRead('lspci', []);
+          if (lspciOut && lspciOut.trim()) {
+            const lines = lspciOut.split('\n').filter(l => /VGA|3D|Display/i.test(l));
+            for (const line of lines) {
+              const name = line.replace(/^[\da-f]+:[\da-f]+\.[\da-f]+\s+/, '').trim();
+              if (name) gpus.push({ name, driver: 'lspci' });
+            }
+          }
+        } catch {}
+      }
+    } else if (os.platform() === 'darwin') {
+      const spOut = await spawnRead('system_profiler', ['SPDisplaysDataType']);
+      if (spOut) {
+        // Split by chipset sections to handle multiple GPUs
+        const sections = spOut.split(/(?=Chipset Model:)/);
+        for (const section of sections) {
+          const chipMatch = section.match(/Chipset Model:\s*(.+)/);
+          const vramMatch = section.match(/VRAM.*?:\s*(\d+)\s*MB/);
+          if (chipMatch) {
+            gpus.push({ name: chipMatch[1].trim(), memTotal: vramMatch ? +vramMatch[1] : 0, driver: 'macos' });
+          }
+        }
+      }
+    } else if (os.platform() === 'win32') {
+      const psGpu = await spawnRead('powershell.exe', ['-Command', "Get-CimInstance -ClassName Win32_VideoController | Select-Object Name,AdapterRAM,DriverVersion | ConvertTo-Json"]);
+      if (psGpu) {
+        const data = JSON.parse(psGpu);
+        const list = Array.isArray(data) ? data : [data];
+        for (const d of list) {
+          if (d && d.Name) {
+            const vramBytes = d.AdapterRAM || 0;
+            gpus.push({ name: d.Name, memTotal: Math.round(vramBytes / (1024 * 1024)), driver: d.DriverVersion || '' });
+          }
+        }
+      }
+    }
+  } catch {}
+
   res.json({
     hostname: os.hostname(),
     platform: os.platform(),
     uptime: os.uptime(),
     cpu: { model: cpuModel, count: cpuCount, usage: cpuUsage, loadAvg },
     memory: { total: totalMem, free: freeMem, used: usedMem, percent: memPercent },
+    gpus,
     disk,
     processes
   });