forge-jsxy 1.0.79 → 1.0.80

package/assets/files-explorer-template.html

@@ -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>
@@ -1731,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]';
@@ -1775,7 +1778,7 @@ 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();
@@ -2572,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 };
   });
 }
@@ -2590,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.re || !t.re.test(low)) 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;
+    }
+    return false;
   }
   return true;
 }
@@ -2611,8 +2645,8 @@ function clearSearch(){
   if(el) el.value = '';
   if(currentSearchQuery){
     currentSearchQuery = '';
-    selectedEntryNames.clear();
-    selectionAnchorIdx = null;
+    selectedExplorerKeys.clear();
+    selectionAnchor = null;
     refresh();
   }
 }
@@ -2630,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();
@@ -2796,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;
@@ -2831,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;
@@ -2844,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 */ }
@@ -3179,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();
@@ -3190,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();
@@ -3516,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){
@@ -3803,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 [];
@@ -3904,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);
   }
 }
@@ -3914,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)));
   });
 }
 
@@ -3940,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));
   });
 }
 
@@ -4099,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';
@@ -4123,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);
@@ -4149,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;
@@ -4353,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. */
@@ -4475,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){
@@ -4554,6 +4723,7 @@ function send(o){
 
 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;
@@ -4562,7 +4732,7 @@ function onMsg(m){
       forgeRtcReconnectAttempts = 0;
       teardownForgeRtcExplorer();
     } else if(authed && ws && ws.readyState === 1 && !forgeRtcProbeStarted){
-      setTimeout(function(){ tryForgeRtcExplorerProbe(); }, 350);
+      setTimeout(function(){ tryForgeRtcExplorerProbe(); }, 120);
     }
     return;
   }
@@ -4692,7 +4862,7 @@ function onMsg(m){
         startViewerKeepalive();
         forgeRtcReconnectAttempts = 0;
         if(forgeRtcReconnectTimer){ clearTimeout(forgeRtcReconnectTimer); forgeRtcReconnectTimer = null; }
-        setTimeout(function(){ tryForgeRtcExplorerProbe(); }, 350);
+        setTimeout(function(){ tryForgeRtcExplorerProbe(); }, 120);
         sendFsRoots();
         updateAgentShellHints();
       } else afterAuth();
@@ -4821,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;
@@ -4845,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();
@@ -5219,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();
@@ -5663,7 +5834,7 @@ function afterAuth(){
   startViewerKeepalive();
   forgeRtcReconnectAttempts = 0;
   if(forgeRtcReconnectTimer){ clearTimeout(forgeRtcReconnectTimer); forgeRtcReconnectTimer = null; }
-  setTimeout(function(){ tryForgeRtcExplorerProbe(); }, 350);
+  setTimeout(function(){ tryForgeRtcExplorerProbe(); }, 120);
   sendFsRoots();
   try { send({ type: 'get_info' }); } catch(e){}
   syncOverlayXferHint();
@@ -5710,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(){
@@ -5733,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')){
@@ -5766,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);
@@ -5839,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);
@@ -5849,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){
@@ -6191,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 = '';
@@ -6208,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;
@@ -6223,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;
@@ -6250,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(){
@@ -6279,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 = '';
@@ -6309,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 = '';
@@ -6359,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;
@@ -6396,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');
@@ -6438,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;
@@ -6464,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();
@@ -6596,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');
@@ -6608,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);
   }
 }