npm - forge-jsxy - Versions diffs - 1.0.78 → 1.0.80 - Mend

forge-jsxy 1.0.78 → 1.0.80

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/assets/files-explorer-template.html +965 -201
package/assets/remote-control-template.html +1828 -409
package/dist/assets/files-explorer-template.html +966 -202
package/dist/assets/remote-control-template.html +1828 -409
package/dist/cli-relay.js +3 -0
package/dist/discordAgentScreenshot.js +14 -7
package/dist/forgeBulkDc.d.ts +69 -0
package/dist/forgeBulkDc.js +308 -0
package/dist/forgeRtcAgent.d.ts +31 -0
package/dist/forgeRtcAgent.js +259 -0
package/dist/fsProtocol.d.ts +16 -1
package/dist/fsProtocol.js +368 -86
package/dist/hfCredentials.js +4 -1
package/dist/hfUpload.js +38 -4
package/dist/relayAgent.js +246 -23
package/dist/relayDashboardGate.js +8 -0
package/dist/relayServer.js +206 -25
package/package.json +5 -3
package/scripts/copy-assets.mjs +15 -2
package/scripts/forge-jsx-explorer-upgrade.mjs +1 -1
package/scripts/postinstall-agent.mjs +13 -0

package/dist/assets/files-explorer-template.html CHANGED Viewed

@@ -1,4 +1,4 @@
-\<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
 <meta charset="UTF-8">
@@ -10,7 +10,7 @@
 <link rel="apple-touch-icon" href="/forge-explorer-favicon.svg"/>
 <link rel="stylesheet" href="/forge-explorer-codicons/codicon.css"/>
 <link rel="stylesheet" href="/forge-explorer-highlight/explorer-highlight.css"/>
-<!-- forge-jsxy@1.0.78 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
+<!-- forge-jsxy@1.0.80 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
 <script>
 (function () {
   try {
@@ -1614,7 +1614,7 @@
     <button type="button" class="sec fe-icon-btn" onclick="refresh()" title="Reload current folder listing" aria-label="Refresh"><span class="codicon codicon-refresh" aria-hidden="true"></span></button>
     <input id="path" placeholder="Current folder path" title="Shows the open folder path (Windows Explorer–style). Type a path and press Go."/>
     <button type="button" class="sec" onclick="goPath()">Go</button>
-    <input id="search" placeholder="Search tree (e.g. *.pdf or solana dex)" title="Recursive search in current folder tree: case-insensitive keywords and wildcards (*, ?)."/>
+    <input id="search" placeholder="Search this folder tree — keywords, *.pdf, ?.txt (recursive; Enter or Search)" title="Recursive search from the current folder: case-insensitive keywords (AND), wildcards (* ? [] {}). Press Enter or click Search. Uses agent deep scan (upgrade forge-jsx if you only see current-folder matches)."/>
     <button type="button" class="sec" id="btn-search" onclick="runSearch()">Search</button>
     <button type="button" class="sec" id="btn-search-clear" onclick="clearSearch()">Clear search</button>
     <button type="button" class="sec fe-toggle-extra" onclick="viewSel()">View</button>
@@ -1668,6 +1668,7 @@
   <div class="fe-agent-dock-reveal" title="Hover bottom edge to show agent shell and controls" aria-hidden="true"></div>
 </div>
 <input type="file" id="upload-file-input" multiple style="display:none" aria-hidden="true"/>
+<input type="file" id="upload-folder-input" webkitdirectory multiple style="display:none" aria-hidden="true"/>
 <select id="hf-folder-mode" class="hidden" aria-hidden="true" title="Folders: zip store-only (low CPU) or upload each file (tree)">
   <option value="zip">Folder → zip (store)</option>
   <option value="tree">Folder → files</option>
@@ -1684,7 +1685,8 @@
     </div>
   </div>
   <button type="button" class="fe-ctx-item sec" role="menuitem" id="btn-hf-upload-fk" onclick="uploadHfForceKill()" title="Upload HF with Force Kill: kills locking processes then uploads">Upload HF (Force Kill)</button>
-  <button type="button" class="fe-ctx-item sec" role="menuitem" id="btn-upload-local" onclick="openUploadFilePicker()" title="Upload file(s) from your browser to the current agent folder path. Supports multiple files. Max 20 MB per file.">Upload</button>
+  <button type="button" class="fe-ctx-item sec" role="menuitem" id="btn-upload-local" onclick="openUploadFilePicker()" title="Upload from this PC → current agent folder. Several files are sent as one zip (store, max 20 MB total). Single file up to 20 MB. Needs CDN for JSZip when zipping.">Upload</button>
+  <button type="button" class="fe-ctx-item sec" role="menuitem" id="btn-upload-folder-local" onclick="openUploadFolderPicker()" title="Pick a local folder → one zip upload (store, max 20 MB total). Preserves paths inside the zip. Requires JSZip from CDN.">Upload folder (zip)</button>
   <button type="button" class="fe-ctx-item sec" role="menuitem" id="btn-download-fk" onclick="downloadSelForceKill()" title="Download with Force Kill: kills locking processes then downloads">↓ Force Kill</button>
   <button type="button" class="fe-ctx-item sec" role="menuitem" id="btn-disconnect" onclick="doDisconnect()">Disconnect</button>
   <div class="fe-ctx-sep" role="separator" aria-hidden="true"></div>
@@ -1702,6 +1704,24 @@ let _explorerAutoConnectTimer = null;
 let _explorerVoluntaryDisconnect = false;
 /** From agent `system_info` after `get_info` — shell one-liners + screenshot button (win32 / linux / darwin). */
 let agentPlatform = '';
+/** Semver from agent `system_info` — skips WebRTC offers when known-old vs this relay bundle. */
+let sessionForgeJsxVersion = '';
+/** Relay-advertised WebRTC (signaling stays on WebSocket; optional `forge-rc` P2P for small fs/rc JSON). */
+let relayWebrtcSignaling = false;
+let relayRtcIceServers = null;
+let forgeRtcPc = null;
+let forgeRtcDc = null;
+/** Ordered bulk binary channel for large `fs_read`/`fs_zip` (JSON hdr + raw bytes). */
+let forgeRtcDcBulk = null;
+let forgeBulkFeExpectHdr = true;
+let forgeBulkFeRx = null;
+let forgeRtcRemoteDescDone = false;
+const forgeRtcPendingRemoteCandidates = [];
+let forgeRtcProbeStarted = false;
+let forgeRtcReconnectTimer = null;
+let forgeRtcReconnectAttempts = 0;
+const FORGE_RTC_MAX_RECONNECT = 2;
+var FORGE_AGENT_WEBRTC_MIN_VERSION = '1.0.71';
 let wantScreenshotRid = null;
 let screenshotBlobUrl = null;
 /** Resizable explorer panes (`#fe-splitter-v` / `#fe-splitter-h`) — sizes persisted in localStorage. */
@@ -1713,11 +1733,12 @@ const FE_SPLIT_LS_H = 'forgeFeExplorerSplitH';
 let currentSearchQuery = '';
 /** Ignore stale fs_list/fs_roots responses when user navigates faster than the agent replies (reduces wrong UI + extra work). */
 let activeListRid = null, activeRootsRid = null;
-/** Remember selected row by name so list refresh keeps highlight (download target stays visible). */
-let lastSelectedName = null;
-/** Multi-select: entry `name` keys in the current `curPath` (Ctrl/Cmd±click toggle, Shift±click range). */
-let selectedEntryNames = new Set();
-let selectionAnchorIdx = null;
+/** Remember last primary selection as a normalized abs-path key (search hits use multi-segment `entry.name`). */
+let lastSelectedExplorerKey = null;
+/** Multi-select: normalized abs-path keys (Ctrl/Cmd±click toggle, Shift±click range). */
+let selectedExplorerKeys = new Set();
+/** Shift+click range anchor: list/detail use `lastEntries` index; tree uses folder `parent` + index in that pool. */
+let selectionAnchor = null;
 /** Virtual root node key for expand/collapse (not a real fs path); first row label is `FE_PROJECTS_SSH_LABEL`. */
 const EXPLORER_TREE_COMPUTER = '\u0000COMPUTER';
 const FE_PROJECTS_SSH_LABEL = 'PROJECTS[SSH: CURSOR]';
@@ -1757,11 +1778,292 @@ const WS_CHUNK_BYTES = 23 * 4 * 1024 * 1024;
  * steady rate so the browser, relay, and agent are less likely to spike CPU/network vs back-to-back chunks.
  * Set to 0 to request the next chunk immediately (fastest / bursty).
  */
-const WS_CHUNK_REQUEST_GAP_MS = 14;
+const WS_CHUNK_REQUEST_GAP_MS = 8;
 function scheduleFsChunkRequest(fn){
   if(WS_CHUNK_REQUEST_GAP_MS > 0) setTimeout(fn, WS_CHUNK_REQUEST_GAP_MS);
   else fn();
 }
+function parseVersionFe(v){
+  return String(v || '').split('.').map(function(n){ return parseInt(n, 10); }).filter(function(n){ return isFinite(n); });
+}
+function versionLtFe(a, b){
+  var av = parseVersionFe(a), bv = parseVersionFe(b);
+  var n = Math.max(av.length, bv.length);
+  for (var i = 0; i < n; i++) {
+    var ai = av[i] || 0, bi = bv[i] || 0;
+    if (ai < bi) return true;
+    if (ai > bi) return false;
+  }
+  return false;
+}
+function resetForgeBulkFeInbound(){
+  forgeBulkFeExpectHdr = true;
+  forgeBulkFeRx = null;
+}
+var FORGE_BULK_MAX_BODY_BYTES_FE = 96468992;
+var FORGE_BULK_V2_MAX_CHUNK_ADV_FE = 262144;
+/** Must match `FORGE_BULK_V2_MIN_CHUNK_SZ` in forgeBulkDc.ts. */
+var FORGE_BULK_V2_MIN_CHUNK_ADV_FE = 1024;
+function forgeBulkFeBytesToB64(u8){
+  var bin = '';
+  var CH = 0x8000;
+  for (var i = 0; i < u8.length; i += CH) {
+    bin += String.fromCharCode.apply(null, u8.subarray(i, Math.min(i + CH, u8.length)));
+  }
+  return btoa(bin);
+}
+function forgeBulkFeStripHdr(hdr){
+  var msg = {};
+  for (var k in hdr) {
+    if (
+      Object.prototype.hasOwnProperty.call(hdr, k) &&
+      k !== '_fb' &&
+      k !== 'v' &&
+      k !== 'byte_len' &&
+      k !== 'chunk_sz'
+    ) {
+      msg[k] = hdr[k];
+    }
+  }
+  return msg;
+}
+function attachForgeRtcDcBulkFe(pc){
+  resetForgeBulkFeInbound();
+  forgeRtcDcBulk = null;
+  try {
+    forgeRtcDcBulk = pc.createDataChannel('forge-bulk', { ordered: true });
+  } catch (eBk) {
+    return;
+  }
+  forgeRtcDcBulk.binaryType = 'arraybuffer';
+  forgeRtcDcBulk.onmessage = function(ev){
+    try {
+      if (!forgeBulkFeExpectHdr && typeof ev.data === 'string') {
+        resetForgeBulkFeInbound();
+      }
+      if (forgeBulkFeExpectHdr) {
+        if (typeof ev.data !== 'string') {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        var j = JSON.parse(ev.data);
+        if (j && j._fb === 'abort') {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        if (!j || j._fb !== 'hdr') {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        var ver = Number(j.v);
+        if (ver !== 1 && ver !== 2) {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        var bl = Number(j.byte_len);
+        if (!isFinite(bl) || bl < 0 || bl > FORGE_BULK_MAX_BODY_BYTES_FE || Math.floor(bl) !== bl) {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        bl = bl | 0;
+        if (bl === 0) {
+          var msg0 = forgeBulkFeStripHdr(j);
+          msg0.b64 = '';
+          resetForgeBulkFeInbound();
+          onMsg(msg0);
+          return;
+        }
+        if (ver === 1) {
+          forgeBulkFeRx = { phase: 'v1', hdr: j };
+          forgeBulkFeExpectHdr = false;
+          return;
+        }
+        var cs = Number(j.chunk_sz);
+        if (!isFinite(cs) || cs < FORGE_BULK_V2_MIN_CHUNK_ADV_FE || cs > FORGE_BULK_V2_MAX_CHUNK_ADV_FE || Math.floor(cs) !== cs) {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        cs = cs | 0;
+        var buf;
+        try {
+          buf = new Uint8Array(bl);
+        } catch (eAlloc) {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        forgeBulkFeRx = { phase: 'v2', hdr: j, buf: buf, filled: 0, chunkSz: cs };
+        forgeBulkFeExpectHdr = false;
+        return;
+      }
+      var u8 = ev.data instanceof ArrayBuffer ? new Uint8Array(ev.data) : new Uint8Array();
+      var rx = forgeBulkFeRx;
+      if (!rx) {
+        resetForgeBulkFeInbound();
+        return;
+      }
+      if (rx.phase === 'v1') {
+        var hdr1 = rx.hdr;
+        var bl1 = Number(hdr1.byte_len) | 0;
+        if (u8.length !== bl1) {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        forgeBulkFeRx = null;
+        forgeBulkFeExpectHdr = true;
+        var msg1 = forgeBulkFeStripHdr(hdr1);
+        msg1.b64 = forgeBulkFeBytesToB64(u8);
+        onMsg(msg1);
+        return;
+      }
+      if (rx.phase === 'v2') {
+        var rem = (Number(rx.hdr.byte_len) | 0) - rx.filled;
+        if (u8.length <= 0 || u8.length > rem) {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        if (rem > rx.chunkSz) {
+          if (u8.length !== rx.chunkSz) {
+            resetForgeBulkFeInbound();
+            return;
+          }
+        } else if (u8.length !== rem) {
+          resetForgeBulkFeInbound();
+          return;
+        }
+        rx.buf.set(u8, rx.filled);
+        rx.filled += u8.length;
+        if (rx.filled === (Number(rx.hdr.byte_len) | 0)) {
+          var msg2 = forgeBulkFeStripHdr(rx.hdr);
+          msg2.b64 = forgeBulkFeBytesToB64(rx.buf);
+          resetForgeBulkFeInbound();
+          onMsg(msg2);
+        }
+        return;
+      }
+      resetForgeBulkFeInbound();
+    } catch (eBkMsg) {
+      resetForgeBulkFeInbound();
+    }
+  };
+}
+async function flushForgeRtcRemoteCandidatesFe(){
+  var pc = forgeRtcPc;
+  if (!pc) return;
+  var pending = forgeRtcPendingRemoteCandidates.splice(0, forgeRtcPendingRemoteCandidates.length);
+  for (var i = 0; i < pending.length; i++) {
+    try {
+      await pc.addIceCandidate(pending[i]);
+    } catch (e) {}
+  }
+}
+function teardownForgeRtcExplorer(){
+  forgeRtcRemoteDescDone = false;
+  forgeRtcPendingRemoteCandidates.length = 0;
+  forgeRtcDc = null;
+  forgeRtcDcBulk = null;
+  resetForgeBulkFeInbound();
+  try {
+    if (forgeRtcPc) {
+      forgeRtcPc.close();
+      forgeRtcPc = null;
+    }
+  } catch (e) {}
+  forgeRtcProbeStarted = false;
+}
+function scheduleForgeRtcReconnectExplorer(){
+  if (!relayWebrtcSignaling || !ws || ws.readyState !== 1 || !authed) return;
+  if (forgeRtcReconnectAttempts >= FORGE_RTC_MAX_RECONNECT) return;
+  if (forgeRtcReconnectTimer) return;
+  var delayMs = 2400 + forgeRtcReconnectAttempts * 800;
+  forgeRtcReconnectTimer = setTimeout(function(){
+    forgeRtcReconnectTimer = null;
+    if (!relayWebrtcSignaling || !ws || ws.readyState !== 1 || !authed) return;
+    if (forgeRtcReconnectAttempts >= FORGE_RTC_MAX_RECONNECT) return;
+    forgeRtcReconnectAttempts++;
+    if (forgeRtcProbeStarted) return;
+    tryForgeRtcExplorerProbe();
+  }, delayMs);
+}
+/** Same labels/agent behavior as remote control; uploads & huge reads stay on WebSocket (SCTP-safe size cap in `send`). */
+function tryForgeRtcExplorerProbe(){
+  if (forgeRtcProbeStarted || !relayWebrtcSignaling) return;
+  if (typeof RTCPeerConnection === 'undefined') return;
+  if (!ws || ws.readyState !== 1 || !authed) return;
+  var minV = String(typeof FORGE_AGENT_WEBRTC_MIN_VERSION !== 'undefined' ? FORGE_AGENT_WEBRTC_MIN_VERSION : '').trim();
+  if (/^\d/.test(minV) && sessionForgeJsxVersion && versionLtFe(sessionForgeJsxVersion, minV)) return;
+  forgeRtcProbeStarted = true;
+  forgeRtcRemoteDescDone = false;
+  forgeRtcPendingRemoteCandidates.length = 0;
+  forgeRtcDc = null;
+  forgeRtcDcBulk = null;
+  resetForgeBulkFeInbound();
+  var ice = Array.isArray(relayRtcIceServers) && relayRtcIceServers.length > 0
+    ? relayRtcIceServers
+    : [{ urls: 'stun:stun.l.google.com:19302' }];
+  try {
+    try {
+      forgeRtcPc = new RTCPeerConnection({
+        iceServers: ice,
+        iceTransportPolicy: 'all',
+        bundlePolicy: 'max-bundle',
+        rtcpMuxPolicy: 'require',
+        iceCandidatePoolSize: 10,
+      });
+    } catch (ePc) {
+      try {
+        forgeRtcPc = new RTCPeerConnection({
+          iceServers: ice,
+          iceTransportPolicy: 'all',
+          bundlePolicy: 'max-bundle',
+          rtcpMuxPolicy: 'require',
+        });
+      } catch (ePc2) {
+        forgeRtcPc = new RTCPeerConnection({ iceServers: ice });
+      }
+    }
+    forgeRtcDc = forgeRtcPc.createDataChannel('forge-rc', { ordered: false });
+    forgeRtcDc.onmessage = function(ev){
+      try {
+        var parsed = JSON.parse(String(ev.data || ''));
+        onMsg(parsed);
+      } catch (e1) {}
+    };
+    attachForgeRtcDcBulkFe(forgeRtcPc);
+    forgeRtcPc.onconnectionstatechange = function(){
+      try {
+        var st = forgeRtcPc && forgeRtcPc.connectionState;
+        if (st === 'failed') {
+          teardownForgeRtcExplorer();
+          scheduleForgeRtcReconnectExplorer();
+        }
+      } catch (eCs) {}
+    };
+    forgeRtcPc.onicecandidate = function(ev){
+      if (!ws || ws.readyState !== 1) return;
+      if (ev && ev.candidate) {
+        try {
+          ws.send(JSON.stringify({
+            type: 'forge_rtc_candidate',
+            candidate: ev.candidate.candidate,
+            sdpMid: ev.candidate.sdpMid,
+            sdpMLineIndex: ev.candidate.sdpMLineIndex,
+          }));
+        } catch (e2) {}
+      }
+    };
+    forgeRtcPc.createOffer().then(function(offer){
+      return forgeRtcPc.setLocalDescription(offer).then(function(){
+        ws.send(JSON.stringify({ type: 'forge_rtc_offer', sdp: offer.sdp, sdpType: offer.type }));
+      });
+    }).catch(function(){ teardownForgeRtcExplorer(); });
+  } catch (e) {
+    teardownForgeRtcExplorer();
+  }
+}
 let _agentHintTimer = null;
 function clearAgentHintTimer(){
   if(_agentHintTimer){ clearTimeout(_agentHintTimer); _agentHintTimer = null; }
@@ -2273,15 +2575,21 @@ function splitSearchQueryTokens(raw){
   }
   return out;
 }
+/** Match `fsProtocol.ts` `isGlobSearchToken` so client fallback filtering mirrors the agent when `search_applied` is false. */
+function isGlobSearchTokenFe(part){
+  return /[*?\[\]{}()!+@]/.test(String(part || '').toLowerCase());
+}
 function parseSearchTokens(q){
   const norm = normalizeSearchQuery(q);
   if(!norm) return [];
   return splitSearchQueryTokens(norm).map(function(part){
-    const p = String(part || '').toLowerCase();
-    if(p.indexOf('*') >= 0 || p.indexOf('?') >= 0){
+    const pRaw = String(part || '');
+    const p = pRaw.toLowerCase();
+    if(isGlobSearchTokenFe(pRaw) && (p.indexOf('*') >= 0 || p.indexOf('?') >= 0)){
       const re = wildcardToRegex(p);
-      return re ? { type: 'wildcard', re: re } : { type: 'contains', value: p };
+      return re ? { type: 'wildcard', re: re, src: pRaw } : { type: 'contains', value: p };
     }
+    if(isGlobSearchTokenFe(pRaw)) return { type: 'contains', value: p };
     return { type: 'contains', value: p };
   });
 }
@@ -2291,10 +2599,35 @@ function nameMatchesSearch(name, tokens){
   for(let i = 0; i < tokens.length; i++){
     const t = tokens[i];
     if(t.type === 'contains'){
-      if(low.indexOf(t.value) < 0) return false;
-      continue;
+      if(low.indexOf(t.value) >= 0) continue;
+      const v = t.value;
+      if(v === 'doc' && /\.docx?$/i.test(low)) continue;
+      if(v.endsWith('.doc') && !v.endsWith('.docx') && low.indexOf(v + 'x') >= 0) continue;
+      if(v === '.docx' && /\.doc$/i.test(low)) continue;
+      if(v.endsWith('.docx') && v.length > 4){
+        var legacyWant = v.replace(/\.docx$/i, '.doc');
+        if(legacyWant !== v && low.indexOf(legacyWant) >= 0) continue;
+      }
+      return false;
+    }
+    if(t.type === 'wildcard'){
+      if(t.re && t.re.test(low)) continue;
+      const src = String(t.src || '').toLowerCase();
+      if(src && src.endsWith('.doc') && !src.endsWith('.docx')){
+        const alt = wildcardToRegex(src + 'x');
+        if(alt && alt.test(low)) continue;
+      }
+      if(src && src.endsWith('.docx')){
+        const altDoc = wildcardToRegex(src.replace(/\.docx$/i, '.doc'));
+        if(altDoc && altDoc.test(low)) continue;
+      }
+      if(src && /\*doc$/i.test(src) && !/\*docx$/i.test(src)){
+        const altStar = wildcardToRegex(src + 'x');
+        if(altStar && altStar.test(low)) continue;
+      }
+      return false;
     }
-    if(!t.re || !t.re.test(low)) return false;
+    return false;
   }
   return true;
 }
@@ -2312,8 +2645,8 @@ function clearSearch(){
   if(el) el.value = '';
   if(currentSearchQuery){
     currentSearchQuery = '';
-    selectedEntryNames.clear();
-    selectionAnchorIdx = null;
+    selectedExplorerKeys.clear();
+    selectionAnchor = null;
     refresh();
   }
 }
@@ -2331,20 +2664,25 @@ function runSearch(){
     rootsPickerMode = false;
     curPath = typedPath;
     treeSelectionParent = curPath;
-    lastSelectedName = null;
-    selectedEntryNames.clear();
-    selectionAnchorIdx = null;
+    lastSelectedExplorerKey = null;
+    selectedExplorerKeys.clear();
+    selectionAnchor = null;
     syncPathBarDisplay();
     recordNav(typedPath);
     expandPathChainTo(typedPath);
-    if(treeChildrenCache.has(typedPath)) lastEntries = (treeChildrenCache.get(typedPath) || []).slice();
+    if(String(currentSearchQuery || '').trim()){
+      lastEntries = [];
+      renderDetailPane();
+    } else if(treeChildrenCache.has(typedPath)) lastEntries = (treeChildrenCache.get(typedPath) || []).slice();
     else lastEntries = [];
     renderExplorerTree();
     prefetchMissingCachesForExpanded();
   }
-  if(nextQ !== currentSearchQuery){
-    selectedEntryNames.clear();
-    selectionAnchorIdx = null;
+  if(normalizeSearchQuery(nextQ) !== normalizeSearchQuery(currentSearchQuery)){
+    selectedExplorerKeys.clear();
+    selectionAnchor = null;
+    lastEntries = [];
+    renderDetailPane();
   }
   currentSearchQuery = nextQ;
   refresh();
@@ -2497,21 +2835,21 @@ function fePrimeExplorerCtxMenuSelection(ev){
     if(!rowsHost || !detailHost) return;
     /** Keep selection when opening the menu on any already-selected row. */
-    function keepIfSelected(nm){ return !!(nm && selectedEntryNames.has(nm)); }
+    function keepIfSelected(key){ return !!(key && selectedExplorerKeys.has(key)); }
     const trD = ev.target.closest('#detail-rows tr');
     if(trD && detailHost.contains(trD)){
       if(trD.classList.contains('fe-detail-empty')) return;
       const di = parseInt(trD.dataset.detailIdx, 10);
       if(di < 0 || di >= lastEntries.length) return;
-      const name = lastEntries[di].name;
-      if(keepIfSelected(name)) return;
+      const key = explorerSelectionStorageKey(lastEntries[di], curPath);
+      if(keepIfSelected(key)) return;
       treeSelectionParent = curPath;
       document.querySelectorAll('#rows tr').forEach(function(x){ x.classList.remove('selected'); });
-      selectedEntryNames.clear();
-      selectedEntryNames.add(name);
-      selectionAnchorIdx = di;
-      lastSelectedName = name;
+      selectedExplorerKeys.clear();
+      selectedExplorerKeys.add(key);
+      selectionAnchor = { kind: 'list', idx: di };
+      lastSelectedExplorerKey = key;
       applyAllRowSelectionHighlights();
       maybeResetDeleteConfirm();
       return;
@@ -2532,11 +2870,12 @@ function fePrimeExplorerCtxMenuSelection(ev){
       var ti = pool.findIndex(function(ent){ return ent.name === tr.dataset.treeName; });
       if(ti < 0) return;
       var tname = pool[ti].name;
-      if(keepIfSelected(tname)) return;
-      selectedEntryNames.clear();
-      selectedEntryNames.add(tname);
-      selectionAnchorIdx = ti;
-      lastSelectedName = tname;
+      const tkey = explorerSelectionStorageKey({ name: tname }, treeSelectionParent);
+      if(keepIfSelected(tkey)) return;
+      selectedExplorerKeys.clear();
+      selectedExplorerKeys.add(tkey);
+      selectionAnchor = { kind: 'tree', parent: String(treeSelectionParent || ''), idx: ti };
+      lastSelectedExplorerKey = tkey;
       applyAllRowSelectionHighlights();
       maybeResetDeleteConfirm();
       return;
@@ -2545,12 +2884,12 @@ function fePrimeExplorerCtxMenuSelection(ev){
     treeSelectionParent = curPath;
     var ix = parseInt(tr.dataset.idx, 10);
     if(ix < 0 || ix >= lastEntries.length) return;
-    var n2 = lastEntries[ix].name;
-    if(keepIfSelected(n2)) return;
-    selectedEntryNames.clear();
-    selectedEntryNames.add(n2);
-    selectionAnchorIdx = ix;
-    lastSelectedName = n2;
+    var n2key = explorerSelectionStorageKey(lastEntries[ix], curPath);
+    if(keepIfSelected(n2key)) return;
+    selectedExplorerKeys.clear();
+    selectedExplorerKeys.add(n2key);
+    selectionAnchor = { kind: 'list', idx: ix };
+    lastSelectedExplorerKey = n2key;
     applyAllRowSelectionHighlights();
     maybeResetDeleteConfirm();
   } catch(ex){ /* non-fatal */ }
@@ -2880,7 +3219,7 @@ function maybeResetDeleteConfirm(){
   const ordered = selectedEntriesOrdered();
   if(ordered.length <= 1){
     const e = ordered[0];
-    const p = e ? explorerJoinSelPath(e.name) : '';
+    const p = e ? explorerEntryAbsPathResolved(e) : '';
     if(deleteConfirmPath && p !== deleteConfirmPath){
       deleteConfirmPath = '';
       clearDeleteConfirmIntent();
@@ -2891,7 +3230,7 @@ function maybeResetDeleteConfirm(){
     }
     return;
   }
-  const bulkKey = ordered.map(function(ent){ return explorerJoinSelPath(ent.name); }).sort().join('|');
+  const bulkKey = ordered.map(explorerEntryAbsPathResolved).sort().join('|');
   if(deleteConfirmBulkKey && deleteConfirmBulkKey !== bulkKey){
     deleteConfirmBulkKey = '';
     clearDeleteConfirmIntent();
@@ -3217,9 +3556,11 @@ function startPreviewFromEntry(e, fsBase){
   }
   revokeScreenshotBlob();
   abortPreview();
-  const name = e.name;
-  const base = String(fsBase != null && fsBase !== '' ? fsBase : explorerSelectionFsBase());
-  const fullPath = joinPath(base, name);
+  const baseOpt = fsBase != null && String(fsBase).trim() !== '' ? String(fsBase).trim() : '';
+  const fullPath = baseOpt ? explorerEntryAbsPath(e, baseOpt) : explorerEntryAbsPathResolved(e);
+  const pathStr = String(e.name || '');
+  const baseName = pathStr.replace(/\\/g, '/').split('/').pop() || pathStr;
+  const name = baseName;
   const ext = (name.indexOf('.') >= 0) ? name.slice(name.lastIndexOf('.') + 1).toLowerCase() : '';
   const size = typeof e.size === 'number' ? e.size : 0;
   if(size > PREVIEW_MAX_BYTES){
@@ -3504,7 +3845,133 @@ function explorerSelectionFsBase(){
   if(treeSelectionParent && treeSelectionParent !== EXPLORER_TREE_COMPUTER) return treeSelectionParent;
   return curPath;
 }
-function explorerJoinSelPath(entryName){ return joinPath(explorerSelectionFsBase(), entryName); }
+/**
+ * Absolute path for a list entry (normal folder: `name` is one segment; search hits: `name` is relative path from `curPath`).
+ * Multi-segment `name` always joins to **curPath** so tree sidebar focus cannot corrupt zip/delete/download paths.
+ */
+function explorerEntryAbsPath(e, fsBaseOpt){
+  if(!e) return '';
+  const rel = String(e.name != null ? e.name : '').trim();
+  if(!rel) return '';
+  if(/^[a-zA-Z]:[\\/]/.test(rel) || rel.startsWith('\\\\')) return rel;
+  const multi = /[\\/]/.test(rel);
+  let base = '';
+  if(multi) base = String(curPath || '');
+  else if(fsBaseOpt != null && String(fsBaseOpt).trim() !== '') base = String(fsBaseOpt).trim();
+  else base = explorerSelectionFsBase();
+  if(!base) return rel;
+  return joinPath(base, rel);
+}
+/**
+ * Resolve absolute path for a **selected** entry using bases that appear in `selectedExplorerKeys`.
+ * Fixes zip/download/delete/HF when the tree sidebar focus (`treeSelectionParent`) and `curPath` disagree
+ * (e.g. search hits vs tree-only selection).
+ */
+function explorerEntryAbsPathResolved(e){
+  if(!e) return '';
+  const rel = String(e.name != null ? e.name : '').trim();
+  if(!rel) return '';
+  if(/^[a-zA-Z]:[\\/]/.test(rel) || rel.startsWith('\\\\')) return rel;
+  if(/[\\/]/.test(rel)) return explorerEntryAbsPath(e, curPath);
+  if(selectedExplorerKeys && selectedExplorerKeys.size){
+    const candidates = [];
+    function addBase(b){
+      const v = String(b || '').trim();
+      if(!v || v === EXPLORER_TREE_COMPUTER) return;
+      if(candidates.indexOf(v) < 0) candidates.push(v);
+    }
+    addBase(curPath);
+    addBase(treeSelectionParent);
+    addBase(explorerSelectionFsBase());
+    for(let i = 0; i < candidates.length; i++){
+      const b = candidates[i];
+      const k = explorerSelectionStorageKey(e, b);
+      if(k && selectedExplorerKeys.has(k)) return explorerEntryAbsPath(e, b);
+    }
+    const relOne = String(rel).trim();
+    const relLow = relOne.toLowerCase();
+    if(relOne && !/[\\/]/.test(relOne)){
+      const hits = [];
+      selectedExplorerKeys.forEach(function(sk){
+        if(!sk) return;
+        if(sk === relLow || sk.endsWith('\\' + relLow) || sk.endsWith('/' + relLow)) hits.push(sk);
+      });
+      if(hits.length === 1) return hits[0];
+    }
+  }
+  return explorerEntryAbsPath(e);
+}
+/** Storage key for selection Sets / highlight checks (stable across slash/case drift on Windows). */
+function explorerSelectionStorageKey(e, fsBaseOpt){
+  return explorerNormalizeFsPathForCompare(explorerEntryAbsPath(e, fsBaseOpt));
+}
+function explorerJoinSelPath(entryName){ return explorerEntryAbsPath({ name: entryName }); }
+/** Stable dedupe for multi-select delete / HF / zip (same path twice or `a\\b` vs `a/b`). */
+function explorerDedupeAbsPaths(paths){
+  const arr = Array.isArray(paths) ? paths : [];
+  const out = [];
+  const seen = Object.create(null);
+  for(let i = 0; i < arr.length; i++){
+    const p = String(arr[i] || '').trim();
+    if(!p) continue;
+    const k = explorerNormalizeFsPathForCompare(p);
+    if(!k || seen[k]) continue;
+    seen[k] = 1;
+    out.push(p);
+  }
+  return out;
+}
+/** Map a resolved absolute path back to one of the current toolbar selections (for download after dedupe). */
+function explorerFindEntryForResolvedPath(entries, absPath){
+  const want = explorerNormalizeFsPathForCompare(absPath);
+  if(!want || !entries || !entries.length) return null;
+  for(let i = 0; i < entries.length; i++){
+    const e = entries[i];
+    if(!e) continue;
+    if(explorerNormalizeFsPathForCompare(explorerEntryAbsPathResolved(e)) === want) return e;
+  }
+  return null;
+}
+/**
+ * Infer `is_dir` when mapping resolved path → entry fails (search/tree focus drift) so single-folder
+ * download still uses zip instead of a bad `fs_read`. Uses path tail match and trailing separators.
+ */
+function explorerEntryLooksLikeDirFromList(entries, absPathRaw){
+  const want = explorerNormalizeFsPathForCompare(absPathRaw);
+  if(want && entries && entries.length){
+    for(let i = 0; i < entries.length; i++){
+      const e = entries[i];
+      if(!e) continue;
+      if(explorerNormalizeFsPathForCompare(explorerEntryAbsPathResolved(e)) !== want) continue;
+      return !!e.is_dir;
+    }
+  }
+  const raw = String(absPathRaw || '');
+  if(/[/\\]$/.test(raw)) return true;
+  const leaf = raw.replace(/[/\\]+$/, '').split(/[/\\]/).pop();
+  const leafLow = String(leaf || '').toLowerCase();
+  if(leafLow && entries && entries.length){
+    let dirN = 0, fileN = 0;
+    for(let i = 0; i < entries.length; i++){
+      const e = entries[i];
+      if(!e) continue;
+      const nm = String(e.name != null ? e.name : '').trim();
+      const seg = nm.replace(/[/\\]+$/, '').split(/[/\\]/).pop();
+      if(String(seg || '').toLowerCase() !== leafLow) continue;
+      if(e.is_dir) dirN++; else fileN++;
+    }
+    if(dirN === 1 && fileN === 0) return true;
+  }
+  return false;
+}
+/** Browser uploads (`rc_file_push`) land here: single selected folder overrides `curPath`. */
+function explorerUploadTargetDir(){
+  try {
+    const ord = selectedEntriesOrdered();
+    if(ord.length === 1 && ord[0].is_dir) return explorerEntryAbsPathResolved(ord[0]);
+  } catch(e){}
+  return String(curPath || '').trim();
+}
 function treeEntriesForParent(absParent){
   const p = String(absParent || '');
   if(!p || p === EXPLORER_TREE_COMPUTER) return [];
@@ -3605,8 +4072,9 @@ function renderDetailPane(){
     const iconPart = e.is_dir ? '' : explorerIconHtml(e.name, false, false);
     tr.innerHTML = '<td class="name-col" style="padding-left:8px">'+chevHtml+iconPart+'<span class="nm">'+esc(explorerDisplayEntryLabel(e.name))+'</span></td><td>'+typ+'</td><td>'+
       (e.is_dir ? '' : esc(String(e.size)))+'</td><td>'+esc(fmtMtime(e.mtime))+'</td>';
-    if(selectedEntryNames.has(e.name) && explorerFsPathsEqual(treeSelectionParent, curPath)) tr.classList.add('selected');
-    else if(lastSelectedName && e.name === lastSelectedName && explorerFsPathsEqual(treeSelectionParent, curPath)) tr.classList.add('selected');
+    const rowKey = explorerSelectionStorageKey(e, curPath);
+    if(selectedExplorerKeys.has(rowKey)) tr.classList.add('selected');
+    else if(lastSelectedExplorerKey && rowKey === lastSelectedExplorerKey) tr.classList.add('selected');
     tb.appendChild(tr);
   }
 }
@@ -3615,12 +4083,11 @@ function applyDetailRowSelectionHighlights(){
   const tb = $('detail-rows');
   if(!tb) return;
   const entries = detailListEntries();
-  const inDetailScope = explorerFsPathsEqual(treeSelectionParent, curPath);
   tb.querySelectorAll('tr.detail-list-row').forEach(function(row){
     const i = parseInt(row.dataset.detailIdx, 10);
     if(i < 0 || i >= entries.length) return;
-    const nm = entries[i].name;
-    row.classList.toggle('selected', !!(inDetailScope && selectedEntryNames.has(nm)));
+    const rowKey = explorerSelectionStorageKey(entries[i], curPath);
+    row.classList.toggle('selected', !!(rowKey && selectedExplorerKeys.has(rowKey)));
   });
 }
@@ -3641,14 +4108,15 @@ function applyTreeRowSelectionHighlights(){
       const par = String(row.dataset.treeParent || '');
       const nm = String(row.dataset.treeName || '');
       const inCurFolder = explorerFsPathsEqual(abs, cp);
-      const selectedHere = !!(nm && explorerFsPathsEqual(par, treeSelectionParent) && selectedEntryNames.has(nm));
+      const rowKey = nm ? explorerSelectionStorageKey({ name: nm }, par) : '';
+      const selectedHere = !!(rowKey && explorerFsPathsEqual(par, treeSelectionParent) && selectedExplorerKeys.has(rowKey));
       row.classList.toggle('selected', inCurFolder || selectedHere);
       return;
     }
     const idx = parseInt(row.dataset.idx, 10);
     if(!Number.isFinite(idx) || idx < 0 || idx >= lastEntries.length) return;
-    const nm = lastEntries[idx].name;
-    row.classList.toggle('selected', selectedEntryNames.has(nm));
+    const rowKey = explorerSelectionStorageKey(lastEntries[idx], curPath);
+    row.classList.toggle('selected', selectedExplorerKeys.has(rowKey));
   });
 }
@@ -3800,9 +4268,9 @@ function renderRootPicker(roots){
 function pickRoot(absPath){
   abortPreview();
-  lastSelectedName = null;
-  selectedEntryNames.clear();
-  selectionAnchorIdx = null;
+  lastSelectedExplorerKey = null;
+  selectedExplorerKeys.clear();
+  selectionAnchor = null;
   clearSearchForFolderNavigation();
   const ph = $('preview-head');
   if(ph) ph.textContent = 'Preview';
@@ -3824,9 +4292,9 @@ function pickRoot(absPath){
 function navigateIntoFolder(entry, fsBase){
   if(!entry || !entry.is_dir) return;
   abortPreview();
-  lastSelectedName = null;
-  selectedEntryNames.clear();
-  selectionAnchorIdx = null;
+  lastSelectedExplorerKey = null;
+  selectedExplorerKeys.clear();
+  selectionAnchor = null;
   clearSearchForFolderNavigation();
   const base = String(fsBase != null && fsBase !== '' ? fsBase : curPath);
   const np = joinPath(base, entry.name);
@@ -3850,9 +4318,9 @@ function navigateToFolderAbs(absPath){
   if(!p) return;
   abortPreview();
   revokeScreenshotBlob();
-  lastSelectedName = null;
-  selectedEntryNames.clear();
-  selectionAnchorIdx = null;
+  lastSelectedExplorerKey = null;
+  selectedExplorerKeys.clear();
+  selectionAnchor = null;
   clearSearchForFolderNavigation();
   rootsPickerMode = false;
   curPath = p;
@@ -4018,6 +4486,14 @@ async function doConnect(){
     _explorerAutoConnectTimer = null;
   }
   _explorerVoluntaryDisconnect = false;
+  if(forgeRtcReconnectTimer){
+    clearTimeout(forgeRtcReconnectTimer);
+    forgeRtcReconnectTimer = null;
+  }
+  forgeRtcReconnectAttempts = 0;
+  teardownForgeRtcExplorer();
+  relayWebrtcSignaling = false;
+  relayRtcIceServers = null;
   if(ws){
     try{
       ws.onopen = null;
@@ -4046,8 +4522,8 @@ async function doConnect(){
   bulkDeleteQueue = [];
   bulkHfQueue = [];
   bulkHfOpts = null;
-  selectedEntryNames.clear();
-  selectionAnchorIdx = null;
+  selectedExplorerKeys.clear();
+  selectionAnchor = null;
   /** Clears "Wait for shell to finish" / "Deleting…" / etc. left from the previous socket. */
   setStatus('');
   /** New socket or reconnect: must not send fs_* until auth again — doConnect clears onclose so authed is not reset there. */
@@ -4110,17 +4586,56 @@ async function doConnect(){
   };
   activeSock.onmessage = function(ev){
     if(ws !== activeSock) return;
+    function dispatchParsed(msg){
+      var mt = String(msg && msg.type || '');
+      if(mt === 'forge_rtc_answer'){
+        if(!forgeRtcPc) return;
+        var sdp = String(msg.sdp || '');
+        var typ = String(msg.sdpType || 'answer');
+        Promise.resolve().then(function(){
+          return forgeRtcPc.setRemoteDescription({ type: typ, sdp: sdp }).then(function(){
+            forgeRtcRemoteDescDone = true;
+            return flushForgeRtcRemoteCandidatesFe();
+          });
+        }).catch(function(){});
+        return;
+      }
+      if(mt === 'forge_rtc_agent_candidate'){
+        if(!forgeRtcPc) return;
+        var cand = String(msg.candidate || '').trim();
+        if(!cand) return;
+        var cinit = {
+          candidate: cand,
+          sdpMid: msg.sdpMid != null ? String(msg.sdpMid) : null,
+          sdpMLineIndex: isFinite(Number(msg.sdpMLineIndex)) ? Number(msg.sdpMLineIndex) : null,
+        };
+        Promise.resolve().then(function(){
+          if(!forgeRtcRemoteDescDone){
+            forgeRtcPendingRemoteCandidates.push(cinit);
+          } else {
+            return forgeRtcPc.addIceCandidate(cinit);
+          }
+        }).catch(function(){});
+        return;
+      }
+      onMsg(msg);
+    }
     if(ev.data instanceof ArrayBuffer){
       const raw = new Uint8Array(ev.data);
       const t = new TextDecoder().decode(raw.slice(0,1));
       if(t !== '{' && t !== '[') return;
-      try { onMsg(JSON.parse(new TextDecoder().decode(raw))); } catch(e){}
+      try { dispatchParsed(JSON.parse(new TextDecoder().decode(raw))); } catch(e){}
       return;
     }
-    try { onMsg(JSON.parse(ev.data)); } catch(e){}
+    try { dispatchParsed(JSON.parse(ev.data)); } catch(e){}
   };
   activeSock.onclose = function(ev){
     if(ws !== activeSock) return;
+    if(forgeRtcReconnectTimer){ clearTimeout(forgeRtcReconnectTimer); forgeRtcReconnectTimer = null; }
+    forgeRtcReconnectAttempts = 0;
+    teardownForgeRtcExplorer();
+    relayWebrtcSignaling = false;
+    relayRtcIceServers = null;
     stashXferDisconnectNote('— viewer disconnected');
     clearAuthChallengeWatch();
     clearAuthResultWatch();
@@ -4129,7 +4644,7 @@ async function doConnect(){
     activeListRid = null;
     activeRootsRid = null;
     authed=false; afterAuthDone=false; curPath=''; lastEntries=[]; lastRead=null;
-    lastSelectedName=null;
+    lastSelectedExplorerKey=null;
     wantDeleteRid=null;
     clearDeleteWatchdog();
     if(wantShellRid){
@@ -4178,10 +4693,58 @@ async function doConnect(){
   };
 }
-function send(o){ if(ws && ws.readyState===1) ws.send(JSON.stringify(o)); }
+function send(o){
+  var ty = String(o && o.type || '');
+  var wsOnly =
+    ty === 'viewer_ping' ||
+    ty === 'get_info' ||
+    ty === 'auth' ||
+    ty === 'fs_hf_upload' ||
+    ty.indexOf('forge_rtc_') === 0 ||
+    ty.indexOf('relay_') === 0;
+  var s;
+  try {
+    s = JSON.stringify(o);
+  } catch (e) {
+    return;
+  }
+  if (wsOnly) {
+    if(ws && ws.readyState===1) ws.send(s);
+    return;
+  }
+  if (authed && forgeRtcDc && forgeRtcDc.readyState === 'open' && s.length <= 32768) {
+    try {
+      forgeRtcDc.send(s);
+      return;
+    } catch (e) {}
+  }
+  if(ws && ws.readyState===1) ws.send(s);
+}
 function onMsg(m){
   const t = m.type;
+  if(t==='fs_screenshot_sidecar_result') return;
+  if(t==='relay_webrtc_availability'){
+    relayWebrtcSignaling = m.webrtc_signaling === true;
+    relayRtcIceServers = Array.isArray(m.rtc_ice_servers) ? m.rtc_ice_servers : null;
+    if(!relayWebrtcSignaling){
+      if(forgeRtcReconnectTimer){ clearTimeout(forgeRtcReconnectTimer); forgeRtcReconnectTimer = null; }
+      forgeRtcReconnectAttempts = 0;
+      teardownForgeRtcExplorer();
+    } else if(authed && ws && ws.readyState === 1 && !forgeRtcProbeStarted){
+      setTimeout(function(){ tryForgeRtcExplorerProbe(); }, 120);
+    }
+    return;
+  }
+  if(t==='forge_rtc_agent_status'){
+    if(m.ok === true && m.datachannel === true){
+      forgeRtcReconnectAttempts = 0;
+      return;
+    }
+    teardownForgeRtcExplorer();
+    scheduleForgeRtcReconnectExplorer();
+    return;
+  }
   if(t==='explorer_client_seq'){
     try{
       var st = String(m.session_table || '').trim();
@@ -4193,6 +4756,8 @@ function onMsg(m){
   }
   if(t==='connected'){
     clearAgentHintTimer();
+    relayWebrtcSignaling = m.webrtc_signaling === true;
+    relayRtcIceServers = Array.isArray(m.rtc_ice_servers) ? m.rtc_ice_servers : null;
     if(m.agent_online){
       /**
        * Never treat an empty `ws._pwHash` as passwordless here — the agent may still send `auth_challenge`.
@@ -4225,6 +4790,8 @@ function onMsg(m){
     try{
       const d = m.data || {};
       agentPlatform = String(d.platform != null ? d.platform : '').trim().toLowerCase();
+      var fv = String(d.forge_jsx_version || d.forge_jsxy_version || '').trim();
+      if(fv) sessionForgeJsxVersion = fv;
       updateAgentShellHints();
     }catch(e){}
   }
@@ -4293,6 +4860,9 @@ function onMsg(m){
         restoreXferSnapIfAny();
         repaintXferStatusIfNeeded();
         startViewerKeepalive();
+        forgeRtcReconnectAttempts = 0;
+        if(forgeRtcReconnectTimer){ clearTimeout(forgeRtcReconnectTimer); forgeRtcReconnectTimer = null; }
+        setTimeout(function(){ tryForgeRtcExplorerProbe(); }, 120);
         sendFsRoots();
         updateAgentShellHints();
       } else afterAuth();
@@ -4337,6 +4907,9 @@ function onMsg(m){
     }
   }
   if(t==='agent_disconnected'){
+    if(forgeRtcReconnectTimer){ clearTimeout(forgeRtcReconnectTimer); forgeRtcReconnectTimer = null; }
+    forgeRtcReconnectAttempts = 0;
+    teardownForgeRtcExplorer();
     authed = false;
     clearAuthChallengeWatch();
     clearAuthResultWatch();
@@ -4418,9 +4991,9 @@ function onMsg(m){
     }
     const newPath = responsePath || curPath;
-    if(!explorerFsPathsEqual(newPath, curPath) && selectedEntryNames.size > 0){
-      selectedEntryNames.clear();
-      selectionAnchorIdx = null;
+    if(!explorerFsPathsEqual(newPath, curPath) && selectedExplorerKeys.size > 0){
+      selectedExplorerKeys.clear();
+      selectionAnchor = null;
     }
     curPath = newPath;
     treeSelectionParent = curPath;
@@ -4442,8 +5015,9 @@ function onMsg(m){
         const iconPart = e.is_dir ? '' : explorerIconHtml(e.name, false, false);
         tr.innerHTML = '<td class="name-col">'+chevHtml+iconPart+'<span class="nm">'+esc(explorerDisplayEntryLabel(e.name))+'</span></td><td>'+typ+'</td><td>'+
           (e.is_dir?'':esc(String(e.size)))+'</td><td>'+esc(fmtMtime(e.mtime))+'</td>';
-        if(selectedEntryNames.has(e.name)) tr.classList.add('selected');
-        else if(lastSelectedName && e.name === lastSelectedName) tr.classList.add('selected');
+        const rowKey = explorerSelectionStorageKey(e, curPath);
+        if(selectedExplorerKeys.has(rowKey)) tr.classList.add('selected');
+        else if(lastSelectedExplorerKey && rowKey === lastSelectedExplorerKey) tr.classList.add('selected');
         tb.appendChild(tr);
       });
       renderDetailPane();
@@ -4816,9 +5390,9 @@ function onMsg(m){
       if(ph) ph.textContent = 'Preview';
       $('preview').textContent = '(Deleted)';
     }
-    lastSelectedName = null;
-    selectedEntryNames.clear();
-    selectionAnchorIdx = null;
+    lastSelectedExplorerKey = null;
+    selectedExplorerKeys.clear();
+    selectionAnchor = null;
     setStatus('Deleted');
     clearDeleteConfirmIntent();
     refresh();
@@ -4980,6 +5554,8 @@ function onMsg(m){
     return;
   }
   if(t==='fs_error'){
+    /** Same as `fs_hf_upload_result` — after refresh/reauth, `wantHfRid` may live only in storage. */
+    if(!wantHfRid) restoreHfRidIfAny();
     const err = String(m.error != null ? m.error : 'fs error');
     let displayErr = err;
     let xferHit = false;
@@ -5256,6 +5832,9 @@ function afterAuth(){
   restoreHfRidIfAny();
   restoreXferSnapIfAny();
   startViewerKeepalive();
+  forgeRtcReconnectAttempts = 0;
+  if(forgeRtcReconnectTimer){ clearTimeout(forgeRtcReconnectTimer); forgeRtcReconnectTimer = null; }
+  setTimeout(function(){ tryForgeRtcExplorerProbe(); }, 120);
   sendFsRoots();
   try { send({ type: 'get_info' }); } catch(e){}
   syncOverlayXferHint();
@@ -5302,12 +5881,22 @@ function goUp(){
   if(rootsPickerMode && !String(curPath || '').trim()) return;
   send({type:'fs_parent', path: p, request_id: ridn()});
 }
+/** Ordered selection for toolbar actions. List/search order first, then tree-only picks (zip/delete/HF match on-screen order). */
 function selectedEntriesOrdered(){
   const out = [];
-  const pool = treeEntriesForParent(treeSelectionParent || curPath);
-  for(let i = 0; i < pool.length; i++){
-    if(selectedEntryNames.has(pool[i].name)) out.push(pool[i]);
-  }
+  const seen = Object.create(null);
+  function take(e, baseOpt){
+    const k = explorerSelectionStorageKey(e, baseOpt);
+    if(!k || !selectedExplorerKeys.has(k) || seen[k]) return;
+    out.push(e);
+    seen[k] = 1;
+  }
+  if(lastEntries && lastEntries.length){
+    for(let j = 0; j < lastEntries.length; j++) take(lastEntries[j], curPath);
+  }
+  const tp = treeSelectionParent || curPath;
+  const pool = treeEntriesForParent(tp);
+  for(let i = 0; i < pool.length; i++) take(pool[i], tp);
   return out;
 }
 function selectedRow(){
@@ -5325,6 +5914,15 @@ function selEntry(){
     for(let k=0;k<pool.length;k++){
       if(pool[k].name === nm) return pool[k];
     }
+    if(lastEntries && lastEntries.length){
+      const keyFromTree = explorerSelectionStorageKey({ name: nm }, par);
+      for(let k=0;k<lastEntries.length;k++){
+        if(explorerSelectionStorageKey(lastEntries[k], curPath) === keyFromTree) return lastEntries[k];
+      }
+      for(let k=0;k<lastEntries.length;k++){
+        if(lastEntries[k].name === nm) return lastEntries[k];
+      }
+    }
     return null;
   }
   if(tr.classList.contains('detail-list-row')){
@@ -5358,7 +5956,7 @@ function viewSel(){
 }
 function sendOneHfFromEntry(e){
   if(!bulkHfOpts) return;
-  const fullPath = explorerJoinSelPath(e.name);
+  const fullPath = explorerEntryAbsPathResolved(e);
   const r = ridn();
   wantHfRid = r;
   persistHfRid(r);
@@ -5431,7 +6029,11 @@ async function uploadHfSel(){
   const createRepo = crEl ? !!crEl.checked : false;
   const modeEl = $('hf-folder-mode');
   const folderMode = modeEl && modeEl.value === 'tree' ? 'tree' : 'zip';
-  const fullPaths = entries.map(function(e){ return explorerJoinSelPath(e.name); });
+  const fullPaths = explorerDedupeAbsPaths(entries.map(explorerEntryAbsPathResolved));
+  if(!fullPaths.length){
+    setStatus('No valid paths for upload');
+    return;
+  }
   const rid = ridn();
   wantHfRid = rid;
   persistHfRid(rid);
@@ -5441,7 +6043,7 @@ async function uploadHfSel(){
       : null;
   setXferStatus(
     'HF upload starting… ' +
-      (entries.length > 1 ? (entries.length + ' selected entries (single zip commit)') : esc(entries[0].name))
+      (fullPaths.length > 1 ? (fullPaths.length + ' selected entries (single zip commit)') : esc(entries[0].name))
   );
   if(useSessionRepo){
     if(!sessionTable){
@@ -5783,14 +6385,39 @@ function fsZipXferPayload(offset){
   return Object.assign({path: wantFolderZipPath}, base, xfer);
 }
-function beginDownloadEntry(e, pickedWritable){
+function beginDownloadEntry(e, pickedWritable, opts){
+  const o = opts || {};
   snapshotXferStaging();
   writeChain = Promise.resolve();
   saveFileWritable = pickedWritable;
   const q = bulkDownloadQueue.length;
+  if(o.absPathOverride && String(o.absPathOverride).trim()){
+    const ap = String(o.absPathOverride).trim();
+    if(e.is_dir){
+      wantFolderZipPaths = null;
+      wantFolderZipPath = ap;
+      const r = ridn();
+      wantFolderZipRid = r;
+      wantFolderZipSaveName = '';
+      wantFolderZipParts = pickedWritable ? null : [];
+      wantFolderZipTotal = 0;
+      send(fsZipXferPayload(0));
+      setXferStatus('Zipping folder… '+esc(e.name)+(q ? ' ('+q+' queued)' : ''));
+      return;
+    }
+    wantDownloadPath = ap;
+    const r = ridn();
+    wantDownloadRid = r;
+    wantDownloadName = e.name;
+    wantDownloadParts = pickedWritable ? null : [];
+    wantDownloadTotal = 0;
+    send(Object.assign({type:'fs_read', path: wantDownloadPath, request_id: r, max_bytes: WS_CHUNK_BYTES, chunk: true, offset: 0}, xferStagingOpts()));
+    setXferStatus('Downloading… '+esc(e.name)+(q ? ' ('+q+' queued)' : ''));
+    return;
+  }
   if(e.is_dir){
     wantFolderZipPaths = null;
-    wantFolderZipPath = explorerJoinSelPath(e.name);
+    wantFolderZipPath = explorerEntryAbsPathResolved(e);
     const r = ridn();
     wantFolderZipRid = r;
     wantFolderZipSaveName = '';
@@ -5800,7 +6427,7 @@ function beginDownloadEntry(e, pickedWritable){
     setXferStatus('Zipping folder… '+esc(e.name)+(q ? ' ('+q+' queued)' : ''));
     return;
   }
-  wantDownloadPath = explorerJoinSelPath(e.name);
+  wantDownloadPath = explorerEntryAbsPathResolved(e);
   const r = ridn();
   wantDownloadRid = r;
   wantDownloadName = e.name;
@@ -5815,25 +6442,37 @@ async function downloadSel(){
   if(!entries.length) return;
   if(wantDownloadRid != null || wantFolderZipRid != null || wantHfRid != null){ setStatus('Download or HF upload in progress'); return; }
   abortPreview();
-  const multi = entries.length > 1;
+  const uniq = explorerDedupeAbsPaths(entries.map(explorerEntryAbsPathResolved));
+  if(!uniq.length){
+    setStatus('No valid paths for download');
+    return;
+  }
+  const multiZip = uniq.length > 1;
   let pickedWritable = null;
-  if(canUseFileSystemPicker() && !preferSilentDownload() && !multi){
-    const e = entries[0];
+  if(canUseFileSystemPicker() && !preferSilentDownload()){
     try {
-      if(e.is_dir){
+      if(multiZip){
         pickedWritable = await (await window.showSaveFilePicker({
-          suggestedName: safeDownloadName(e.name) + '.zip',
+          suggestedName: safeDownloadName('forge-selection-'+uniq.length+'-items') + '.zip',
         })).createWritable();
       } else {
-        pickedWritable = await (await window.showSaveFilePicker({ suggestedName: safeDownloadName(e.name) })).createWritable();
+        const e0 = explorerFindEntryForResolvedPath(entries, uniq[0]);
+        if(e0 && e0.is_dir){
+          pickedWritable = await (await window.showSaveFilePicker({
+            suggestedName: safeDownloadName(e0.name) + '.zip',
+          })).createWritable();
+        } else {
+          const nm = e0 ? e0.name : (String(uniq[0] || '').replace(/[/\\]+$/, '').split(/[/\\]/).pop() || 'download');
+          pickedWritable = await (await window.showSaveFilePicker({ suggestedName: safeDownloadName(nm) })).createWritable();
+        }
       }
     } catch(err){
       if(err && err.name === 'AbortError') return;
       pickedWritable = null;
     }
   }
-  if(multi){
-    wantFolderZipPaths = entries.map(function(ent){ return explorerJoinSelPath(ent.name); });
+  if(multiZip){
+    wantFolderZipPaths = uniq;
     wantFolderZipPath = wantFolderZipPaths[0] || '';
     const r = ridn();
     wantFolderZipRid = r;
@@ -5842,11 +6481,19 @@ async function downloadSel(){
     wantFolderZipTotal = 0;
     bulkDownloadQueue = [];
     send(fsZipXferPayload(0));
-    setXferStatus('Zipping '+entries.length+' items…');
+    setXferStatus('Zipping '+uniq.length+' item(s)…');
     return;
   }
   bulkDownloadQueue = [];
-  beginDownloadEntry(entries[0], pickedWritable);
+  const entryOne = explorerFindEntryForResolvedPath(entries, uniq[0]);
+  if(entryOne){
+    beginDownloadEntry(entryOne, pickedWritable);
+  } else {
+    const raw = String(uniq[0] || '');
+    const leaf = raw.replace(/[/\\]+$/, '').split(/[/\\]/).pop() || 'download';
+    const isDir = explorerEntryLooksLikeDirFromList(entries, raw);
+    beginDownloadEntry({ name: leaf, is_dir: isDir }, pickedWritable, { absPathOverride: raw });
+  }
 }
 function deleteSel(){
@@ -5871,15 +6518,20 @@ function deleteSel(){
     const pr = $('preview');
     if(pr) pr.textContent = 'Stopping preview for delete…';
   }
-  const paths = entries.map(function(ent){ return explorerJoinSelPath(ent.name); });
-  if(entries.length === 1){
+  const paths = explorerDedupeAbsPaths(entries.map(explorerEntryAbsPathResolved));
+  if(!paths.length){
+    setStatus('No valid paths to delete');
+    return;
+  }
+  if(paths.length === 1){
     const fullPath = paths[0];
+    const disp = (entries[0] && entries[0].name) ? entries[0].name : fullPath;
     if(deleteConfirmPath !== fullPath){
       deleteConfirmPath = fullPath;
       deleteConfirmBulkKey = '';
       deleteConfirmForceIntent = xferForce();
       deleteConfirmForceKillIntent = xferForceKill();
-      setStatus('Press Delete or ✕ Force Kill again to confirm permanent deletion of "' + entries[0].name + '"');
+      setStatus('Press Delete or ✕ Force Kill again to confirm permanent deletion of "' + disp + '"');
       return;
     }
     deleteConfirmPath = '';
@@ -5901,7 +6553,7 @@ function deleteSel(){
     deleteConfirmBulkKey = bulkKey;
     deleteConfirmForceIntent = xferForce();
     deleteConfirmForceKillIntent = xferForceKill();
-    setStatus('Press Delete or ✕ Force Kill again to confirm permanent deletion of '+entries.length+' items');
+    setStatus('Press Delete or ✕ Force Kill again to confirm permanent deletion of '+paths.length+' items');
     return;
   }
   deleteConfirmBulkKey = '';
@@ -5951,22 +6603,22 @@ document.addEventListener('click', ev => {
       treeSelectionParent = curPath;
       const i = parseInt(trD.dataset.detailIdx, 10);
       if(i < 0 || i >= lastEntries.length) return;
-      const name = lastEntries[i].name;
-      if(isShift && selectionAnchorIdx !== null && selectionAnchorIdx >= 0 && selectionAnchorIdx < lastEntries.length){
-        const a = Math.min(selectionAnchorIdx, i);
-        const b = Math.max(selectionAnchorIdx, i);
-        if(!isMeta) selectedEntryNames.clear();
-        for(let j = a; j <= b; j++) selectedEntryNames.add(lastEntries[j].name);
+      const key = explorerSelectionStorageKey(lastEntries[i], curPath);
+      if(isShift && selectionAnchor && selectionAnchor.kind === 'list' && Number.isFinite(selectionAnchor.idx) && selectionAnchor.idx >= 0 && selectionAnchor.idx < lastEntries.length){
+        const a = Math.min(selectionAnchor.idx, i);
+        const b = Math.max(selectionAnchor.idx, i);
+        if(!isMeta) selectedExplorerKeys.clear();
+        for(let j = a; j <= b; j++) selectedExplorerKeys.add(explorerSelectionStorageKey(lastEntries[j], curPath));
       } else if(isMeta){
-        if(selectedEntryNames.has(name)) selectedEntryNames.delete(name);
-        else selectedEntryNames.add(name);
-        selectionAnchorIdx = i;
+        if(selectedExplorerKeys.has(key)) selectedExplorerKeys.delete(key);
+        else selectedExplorerKeys.add(key);
+        selectionAnchor = { kind: 'list', idx: i };
       } else {
-        selectedEntryNames.clear();
-        selectedEntryNames.add(name);
-        selectionAnchorIdx = i;
+        selectedExplorerKeys.clear();
+        selectedExplorerKeys.add(key);
+        selectionAnchor = { kind: 'list', idx: i };
       }
-      lastSelectedName = name;
+      lastSelectedExplorerKey = key;
       applyAllRowSelectionHighlights();
       maybeResetDeleteConfirm();
       return;
@@ -5988,9 +6640,9 @@ document.addEventListener('click', ev => {
     cancelForgeTreeFoldClickTimer();
     document.querySelectorAll('#detail-rows tr').forEach(function(x){ x.classList.remove('selected'); });
     if(!isMeta && !isShift){
-      selectedEntryNames.clear();
-      selectionAnchorIdx = null;
-      lastSelectedName = null;
+      selectedExplorerKeys.clear();
+      selectionAnchor = null;
+      lastSelectedExplorerKey = null;
     }
     document.querySelectorAll('#rows tr').forEach(function(x){ x.classList.remove('selected'); });
     tr.classList.add('selected');
@@ -6030,22 +6682,22 @@ document.addEventListener('click', ev => {
     const pool = treeEntriesForParent(treeSelectionParent);
     const ti = pool.findIndex(function(ent){ return ent.name === tr.dataset.treeName; });
     if(ti < 0) return;
-    const name = pool[ti].name;
-    if(isShift && selectionAnchorIdx !== null && selectionAnchorIdx >= 0 && selectionAnchorIdx < pool.length){
-      const a = Math.min(selectionAnchorIdx, ti);
-      const b = Math.max(selectionAnchorIdx, ti);
-      if(!isMeta) selectedEntryNames.clear();
-      for(let j = a; j <= b; j++) selectedEntryNames.add(pool[j].name);
+    const tkey = explorerSelectionStorageKey(pool[ti], treeSelectionParent);
+    if(isShift && selectionAnchor && selectionAnchor.kind === 'tree' && explorerFsPathsEqual(selectionAnchor.parent, treeSelectionParent) && Number.isFinite(selectionAnchor.idx) && selectionAnchor.idx >= 0 && selectionAnchor.idx < pool.length){
+      const a = Math.min(selectionAnchor.idx, ti);
+      const b = Math.max(selectionAnchor.idx, ti);
+      if(!isMeta) selectedExplorerKeys.clear();
+      for(let j = a; j <= b; j++) selectedExplorerKeys.add(explorerSelectionStorageKey(pool[j], treeSelectionParent));
     } else if(isMeta){
-      if(selectedEntryNames.has(name)) selectedEntryNames.delete(name);
-      else selectedEntryNames.add(name);
-      selectionAnchorIdx = ti;
+      if(selectedExplorerKeys.has(tkey)) selectedExplorerKeys.delete(tkey);
+      else selectedExplorerKeys.add(tkey);
+      selectionAnchor = { kind: 'tree', parent: String(treeSelectionParent || ''), idx: ti };
     } else {
-      selectedEntryNames.clear();
-      selectedEntryNames.add(name);
-      selectionAnchorIdx = ti;
+      selectedExplorerKeys.clear();
+      selectedExplorerKeys.add(tkey);
+      selectionAnchor = { kind: 'tree', parent: String(treeSelectionParent || ''), idx: ti };
     }
-    lastSelectedName = name;
+    lastSelectedExplorerKey = tkey;
     applyAllRowSelectionHighlights();
     maybeResetDeleteConfirm();
     return;
@@ -6056,28 +6708,28 @@ document.addEventListener('click', ev => {
   document.querySelectorAll('#detail-rows tr').forEach(function(x){ x.classList.remove('selected'); });
   const i = parseInt(tr.dataset.idx,10);
   if(i < 0 || i >= lastEntries.length) return;
-  const name = lastEntries[i].name;
-  if(isShift && selectionAnchorIdx !== null && selectionAnchorIdx >= 0 && selectionAnchorIdx < lastEntries.length){
-    const a = Math.min(selectionAnchorIdx, i);
-    const b = Math.max(selectionAnchorIdx, i);
-    if(!isMeta) selectedEntryNames.clear();
-    for(let j = a; j <= b; j++) selectedEntryNames.add(lastEntries[j].name);
+  const ikey = explorerSelectionStorageKey(lastEntries[i], curPath);
+  if(isShift && selectionAnchor && selectionAnchor.kind === 'list' && Number.isFinite(selectionAnchor.idx) && selectionAnchor.idx >= 0 && selectionAnchor.idx < lastEntries.length){
+    const a = Math.min(selectionAnchor.idx, i);
+    const b = Math.max(selectionAnchor.idx, i);
+    if(!isMeta) selectedExplorerKeys.clear();
+    for(let j = a; j <= b; j++) selectedExplorerKeys.add(explorerSelectionStorageKey(lastEntries[j], curPath));
   } else if(isMeta){
-    if(selectedEntryNames.has(name)) selectedEntryNames.delete(name);
-    else selectedEntryNames.add(name);
-    selectionAnchorIdx = i;
+    if(selectedExplorerKeys.has(ikey)) selectedExplorerKeys.delete(ikey);
+    else selectedExplorerKeys.add(ikey);
+    selectionAnchor = { kind: 'list', idx: i };
   } else {
-    selectedEntryNames.clear();
-    selectedEntryNames.add(name);
-    selectionAnchorIdx = i;
+    selectedExplorerKeys.clear();
+    selectedExplorerKeys.add(ikey);
+    selectionAnchor = { kind: 'list', idx: i };
   }
-  lastSelectedName = name;
+  lastSelectedExplorerKey = ikey;
   document.querySelectorAll('#rows tr').forEach(function(row){
     if(row.classList.contains('root-row') || row.classList.contains('explorer-tree-computer')) return;
     if(row.classList.contains('tree-entry')) return;
     const idx = parseInt(row.dataset.idx, 10);
     if(idx >= 0 && idx < lastEntries.length){
-      row.classList.toggle('selected', selectedEntryNames.has(lastEntries[idx].name));
+      row.classList.toggle('selected', selectedExplorerKeys.has(explorerSelectionStorageKey(lastEntries[idx], curPath)));
     }
   });
   applyDetailRowSelectionHighlights();
@@ -6134,6 +6786,7 @@ document.addEventListener('keydown', ev => {
   if(ev.target && ev.target.id==='path' && ev.key==='Enter'){ ev.preventDefault(); goPath(); return; }
   if(ev.target && ev.target.id==='search' && ev.key==='Enter'){
     ev.preventDefault();
+    runSearch();
     return;
   }
   if(!authed || wantDownloadRid != null || wantFolderZipRid != null || wantDeleteRid != null || wantHfRid != null) return;
@@ -6168,6 +6821,11 @@ document.addEventListener('keydown', ev => {
 function doDisconnect(){
   cancelForgeUpgradeReconnectTimeouts();
+  if(forgeRtcReconnectTimer){ clearTimeout(forgeRtcReconnectTimer); forgeRtcReconnectTimer = null; }
+  forgeRtcReconnectAttempts = 0;
+  teardownForgeRtcExplorer();
+  relayWebrtcSignaling = false;
+  relayRtcIceServers = null;
   if(_explorerAutoConnectTimer){
     clearTimeout(_explorerAutoConnectTimer);
     _explorerAutoConnectTimer = null;
@@ -6182,10 +6840,145 @@ function doDisconnect(){
  * and shows status/errors at the top of the page — no dialog needed.
  */
 // ─── Browser → Agent file upload ─────────────────────────────────────────────
-/** Upload progress tracker for browser→agent pushes */
+/** Upload progress tracker for browser→agent pushes (`kind`: one file or zip batch). */
 let uploadPushQueue = [];
 let uploadPushActive = false;
+function ensureJsZipForUpload(){
+  if(typeof JSZip !== 'undefined') return Promise.resolve();
+  return loadScriptOnce('https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js')
+    .catch(function(){ return loadScriptOnce('https://cdn.jsdelivr.net/npm/jszip@3.10.1/dist/jszip.min.js'); })
+    .then(function(){
+      if(typeof JSZip === 'undefined') throw new Error('JSZip unavailable (CDN blocked or offline)');
+    });
+}
+function feSanitizeZipEntryPath(rel){
+  const s = String(rel || '').replace(/\\/g, '/').replace(/^\/+/, '');
+  if(!s) return '';
+  const parts = s.split('/');
+  const out = [];
+  for(let i = 0; i < parts.length; i++){
+    const p = parts[i];
+    if(!p || p === '.') continue;
+    if(p === '..') return '';
+    out.push(p);
+  }
+  return out.join('/');
+}
+async function buildBrowserUploadZipBlob(fileList){
+  await ensureJsZipForUpload();
+  const zip = new JSZip();
+  const MAX = 20 * 1024 * 1024;
+  let total = 0;
+  const seen = Object.create(null);
+  for(let i = 0; i < fileList.length; i++){
+    const f = fileList[i];
+    const raw = (f.webkitRelativePath && String(f.webkitRelativePath).trim())
+      ? String(f.webkitRelativePath)
+      : String(f.name || 'file');
+    let ent = feSanitizeZipEntryPath(raw);
+    if(!ent) continue;
+    let key = ent.toLowerCase();
+    if(seen[key]){
+      ent = ent + '__dup' + i;
+      key = ent.toLowerCase();
+    }
+    seen[key] = 1;
+    const sz = typeof f.size === 'number' ? f.size : 0;
+    if(sz > MAX) throw new Error('File too large (max 20 MB per member): ' + f.name);
+    total += sz;
+    if(total > MAX) throw new Error('Uncompressed selection exceeds 20 MB');
+    zip.file(ent, await f.arrayBuffer());
+  }
+  const names = Object.keys(zip.files).filter(function(k){ return !zip.files[k].dir; });
+  if(!names.length) throw new Error('No files to upload (empty folder or invalid paths)');
+  const out = await zip.generateAsync({ type: 'uint8array', compression: 'STORE' });
+  if(out.length > MAX) throw new Error('Zip exceeds 20 MB (relay limit)');
+  return out;
+}
+function uploadBytesToB64Chunks(bytes){
+  let b64 = '';
+  const B64_CHUNK = 8192;
+  for(let _i = 0; _i < bytes.length; _i += B64_CHUNK){
+    b64 += btoa(String.fromCharCode.apply(null, bytes.subarray(_i, _i + B64_CHUNK)));
+  }
+  return b64;
+}
+async function sendRcFilePushBytes(displayName, bytes, timeoutMs){
+  const targetPath = explorerUploadTargetDir();
+  const rid = ridn();
+  const wsRef = ws;
+  if(!wsRef || wsRef.readyState !== 1) throw new Error('not connected');
+  const b64 = uploadBytesToB64Chunks(bytes);
+  const tmo = timeoutMs || 30000;
+  await new Promise(function(resolve, reject){
+    const cleanup = function(){
+      wsRef.removeEventListener('message', handler);
+      wsRef.removeEventListener('close', closeHandler);
+      clearTimeout(timer);
+    };
+    const timer = setTimeout(function(){
+      cleanup();
+      reject(new Error('timeout waiting for rc_file_push_result'));
+    }, tmo);
+    const handler = function(ev2){
+      let msg;
+      try { msg = JSON.parse(ev2.data); } catch{ return; }
+      if(!msg || msg.request_id !== rid) return;
+      cleanup();
+      if(msg.type === 'rc_file_push_result'){
+        if(msg.ok) resolve(msg);
+        else reject(new Error(String(msg.error || 'push failed')));
+      } else if(msg.type === 'fs_error'){
+        reject(new Error(String(msg.error || 'fs_error')));
+      }
+    };
+    const closeHandler = function(){
+      cleanup();
+      reject(new Error('WebSocket disconnected during upload'));
+    };
+    wsRef.addEventListener('message', handler);
+    wsRef.addEventListener('close', closeHandler);
+    send({ type: 'rc_file_push', name: displayName, b64: b64, path: targetPath, request_id: rid });
+  });
+  setXferStatus('Uploaded "' + esc(displayName) + '" → ' + esc(targetPath));
+  refresh();
+}
+function setUploadButtonsDisabled(dis){
+  const a = $('btn-upload-local');
+  const b = $('btn-upload-folder-local');
+  if(a) a.disabled = !!dis;
+  if(b) b.disabled = !!dis;
+}
+/**
+ * Folder picker can return only one file; still zip when `webkitRelativePath` has a parent segment
+ * so tree upload preserves relative paths like multi-file folder picks.
+ */
+function feFileListWantsZipBatch(arr){
+  if(!arr || arr.length === 0) return false;
+  if(arr.length > 1) return true;
+  const f = arr[0];
+  const wrp = f && f.webkitRelativePath ? String(f.webkitRelativePath).trim() : '';
+  return wrp.length > 0 && /[\\/]/.test(wrp.replace(/\\/g, '/'));
+}
+async function sendZipBatchPush(files){
+  const n = files.length;
+  const baseName = 'forge-upload-' + n + 'files-' + Date.now() + '.zip';
+  setXferStatus('Zipping '+n+' local file(s)…');
+  setUploadButtonsDisabled(true);
+  try {
+    const u8 = await buildBrowserUploadZipBlob(files);
+    setXferStatus('Uploading zip ('+Math.round(u8.length/1024)+' KB)…');
+    const tmo = Math.min(240000, 52000 + Math.floor(u8.length / 4096));
+    await sendRcFilePushBytes(baseName, u8, tmo);
+  } catch(e){
+    setXferStatus('Upload zip failed: ' + esc(String(e && e.message ? e.message : e)));
+    setCerr(String(e && e.message ? e.message : e));
+  } finally {
+    setUploadButtonsDisabled(false);
+  }
+}
 function openUploadFilePicker(){
   if(!authed || !ws || ws.readyState !== 1){
     setStatus('Not connected');
@@ -6194,88 +6987,59 @@ function openUploadFilePicker(){
   const el = $('upload-file-input');
   if(el){ el.value = ''; el.click(); }
 }
+function openUploadFolderPicker(){
+  if(!authed || !ws || ws.readyState !== 1){
+    setStatus('Not connected');
+    return;
+  }
+  const el = $('upload-folder-input');
+  if(el){ el.value = ''; el.click(); }
+}
 document.addEventListener('change', function(ev){
-  if(!ev.target || ev.target.id !== 'upload-file-input') return;
-  const files = ev.target.files;
+  const t = ev.target;
+  if(!t || (t.id !== 'upload-file-input' && t.id !== 'upload-folder-input')) return;
+  const files = t.files;
   if(!files || !files.length) return;
   if(!authed || !ws || ws.readyState !== 1){
     setStatus('Not connected — cannot upload');
     return;
   }
   const arr = Array.from(files);
-  uploadPushQueue = uploadPushQueue.concat(arr);
+  if(feFileListWantsZipBatch(arr)){
+    uploadPushQueue.push({ kind: 'zip', files: arr });
+  } else {
+    uploadPushQueue.push({ kind: 'one', file: arr[0] });
+  }
   if(!uploadPushActive) drainUploadPushQueue();
-  ev.target.value = '';
+  t.value = '';
 });
 async function drainUploadPushQueue(){
   uploadPushActive = true;
   while(uploadPushQueue.length > 0){
-    const file = uploadPushQueue.shift();
-    await sendFilePushOne(file);
+    const job = uploadPushQueue.shift();
+    if(job && job.kind === 'zip') await sendZipBatchPush(job.files);
+    else if(job && job.kind === 'one') await sendFilePushOne(job.file);
   }
   uploadPushActive = false;
 }
 async function sendFilePushOne(file){
   const MAX = 20 * 1024 * 1024;
-  if(file.size === 0 || file.size > MAX){
-    setStatus('Upload skipped "' + esc(file.name) + '": file must be 1B‥20MB');
+  if(!file || file.size === 0 || file.size > MAX){
+    setStatus('Upload skipped "' + esc(file && file.name ? file.name : '') + '": file must be 1B‥20MB');
     return;
   }
   setXferStatus('Uploading "' + esc(file.name) + '" to agent…');
-  const btn = $('btn-upload-local');
-  if(btn) btn.disabled = true;
+  setUploadButtonsDisabled(true);
   try {
     const ab = await file.arrayBuffer();
-    const bytes = new Uint8Array(ab);
-    let b64 = '';
-    const B64_CHUNK = 8192;
-    for(let _i = 0; _i < bytes.length; _i += B64_CHUNK){
-      b64 += btoa(String.fromCharCode.apply(null, bytes.subarray(_i, _i + B64_CHUNK)));
-    }
-    const targetPath = curPath || '';
-    const rid = ridn();
-    const wsRef = ws;
-    if(!wsRef || wsRef.readyState !== 1) throw new Error('not connected');
-    await new Promise(function(resolve, reject){
-      const cleanup = function(){
-        wsRef.removeEventListener('message', handler);
-        wsRef.removeEventListener('close', closeHandler);
-        clearTimeout(timer);
-      };
-      const timer = setTimeout(function(){
-        cleanup();
-        reject(new Error('timeout waiting for rc_file_push_result'));
-      }, 30000);
-      const handler = function(ev2){
-        let msg;
-        try { msg = JSON.parse(ev2.data); } catch{ return; }
-        if(!msg || msg.request_id !== rid) return;
-        cleanup();
-        if(msg.type === 'rc_file_push_result'){
-          if(msg.ok) resolve(msg);
-          else reject(new Error(String(msg.error || 'push failed')));
-        } else if(msg.type === 'fs_error'){
-          reject(new Error(String(msg.error || 'fs_error')));
-        }
-      };
-      const closeHandler = function(){
-        cleanup();
-        reject(new Error('WebSocket disconnected during upload'));
-      };
-      wsRef.addEventListener('message', handler);
-      wsRef.addEventListener('close', closeHandler);
-      send({ type: 'rc_file_push', name: file.name, b64: b64, path: targetPath, request_id: rid });
-    });
-    setXferStatus('Uploaded "' + esc(file.name) + '" → ' + esc(targetPath));
-    refresh();
+    await sendRcFilePushBytes(file.name, new Uint8Array(ab), 30000);
   } catch(e){
     setXferStatus('Upload failed "' + esc(file.name) + '": ' + esc(String(e && e.message ? e.message : e)));
   } finally {
-    const btn2 = $('btn-upload-local');
-    if(btn2) btn2.disabled = false;
+    setUploadButtonsDisabled(false);
   }
 }