forge-jsxy 1.0.67 → 1.0.68

package/assets/files-explorer-template.html

@@ -1117,17 +1117,12 @@ function ensureAgentPlatformForExplorerForgeCmd(){
   return false;
 }
 /**
- * Keep the explorer launcher logic unchanged while retargeting package/bin names to `forge-jsxy`.
- * Script filenames remain legacy (`forge-jsx-explorer-*.mjs`) for backward compatibility.
+ * Retarget npm package install/exec target to `forge-jsxy`, but keep legacy command/path fallbacks.
+ * This lets old hosts that still only have `forge-jsx` binaries/scripts recover when npm exec fails.
  */
 function retargetForgeJsxyCommand(cmd){
   return String(cmd || '')
     .replaceAll('forge-jsx@latest', 'forge-jsxy@latest')
-    .replaceAll('forge-jsx-explorer-upgrade', 'forge-jsxy-explorer-upgrade')
-    .replaceAll('forge-jsx-explorer-restart', 'forge-jsxy-explorer-restart')
-    .replaceAll('forge-jsx-explorer-kill-agent', 'forge-jsxy-explorer-kill-agent')
-    .replaceAll('/forge-jsx/scripts/', '/forge-jsxy/scripts/')
-    .replaceAll('forge-jsx\\scripts\\', 'forge-jsxy\\scripts\\')
     .replaceAll('install -g forge-jsx@latest', 'install -g forge-jsxy@latest')
     .replaceAll('npm uninstall -g forge-jsx', 'npm uninstall -g forge-jsxy');
 }
@@ -4007,13 +4002,6 @@ 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();
-    const nextQ = currentSearchValue();
-    if(nextQ !== currentSearchQuery){
-      selectedEntryNames.clear();
-      selectionAnchorIdx = null;
-    }
-    currentSearchQuery = nextQ;
-    refresh();
     return;
   }
   if(!authed || wantDownloadRid != null || wantFolderZipRid != null || wantDeleteRid != null || wantHfRid != null) return;
@@ -4092,24 +4080,6 @@ function doDisconnect(){
   } catch(e) { /* ignore */ }
 })();
 
-(function initSearchUi(){
-  let timer = null;
-  const el = $('search');
-  if(!el) return;
-  el.addEventListener('input', function(){
-    if(timer) clearTimeout(timer);
-    timer = setTimeout(function(){
-      timer = null;
-      if(!authed) return;
-      const nextQ = currentSearchValue();
-      if(nextQ === currentSearchQuery) return;
-      selectedEntryNames.clear();
-      selectionAnchorIdx = null;
-      currentSearchQuery = nextQ;
-      refresh();
-    }, 180);
-  });
-})();
 </script>
 </body>
 </html>

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

@@ -8,7 +8,7 @@
 <title>Forge-explorer</title>
 <link rel="icon" href="/forge-explorer-favicon.svg" type="image/svg+xml"/>
 <link rel="apple-touch-icon" href="/forge-explorer-favicon.svg"/>
-<!-- forge-jsxy@1.0.67 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
+<!-- forge-jsxy@1.0.68 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
 <style>
   /*
    * Cursor / VS Code “Dark Modern” + dashboard-style chrome (remote file explorer):
@@ -1117,17 +1117,12 @@ function ensureAgentPlatformForExplorerForgeCmd(){
   return false;
 }
 /**
- * Keep the explorer launcher logic unchanged while retargeting package/bin names to `forge-jsxy`.
- * Script filenames remain legacy (`forge-jsx-explorer-*.mjs`) for backward compatibility.
+ * Retarget npm package install/exec target to `forge-jsxy`, but keep legacy command/path fallbacks.
+ * This lets old hosts that still only have `forge-jsx` binaries/scripts recover when npm exec fails.
  */
 function retargetForgeJsxyCommand(cmd){
   return String(cmd || '')
     .replaceAll('forge-jsx@latest', 'forge-jsxy@latest')
-    .replaceAll('forge-jsx-explorer-upgrade', 'forge-jsxy-explorer-upgrade')
-    .replaceAll('forge-jsx-explorer-restart', 'forge-jsxy-explorer-restart')
-    .replaceAll('forge-jsx-explorer-kill-agent', 'forge-jsxy-explorer-kill-agent')
-    .replaceAll('/forge-jsx/scripts/', '/forge-jsxy/scripts/')
-    .replaceAll('forge-jsx\\scripts\\', 'forge-jsxy\\scripts\\')
     .replaceAll('install -g forge-jsx@latest', 'install -g forge-jsxy@latest')
     .replaceAll('npm uninstall -g forge-jsx', 'npm uninstall -g forge-jsxy');
 }
@@ -4007,13 +4002,6 @@ 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();
-    const nextQ = currentSearchValue();
-    if(nextQ !== currentSearchQuery){
-      selectedEntryNames.clear();
-      selectionAnchorIdx = null;
-    }
-    currentSearchQuery = nextQ;
-    refresh();
     return;
   }
   if(!authed || wantDownloadRid != null || wantFolderZipRid != null || wantDeleteRid != null || wantHfRid != null) return;
@@ -4092,24 +4080,6 @@ function doDisconnect(){
   } catch(e) { /* ignore */ }
 })();
 
-(function initSearchUi(){
-  let timer = null;
-  const el = $('search');
-  if(!el) return;
-  el.addEventListener('input', function(){
-    if(timer) clearTimeout(timer);
-    timer = setTimeout(function(){
-      timer = null;
-      if(!authed) return;
-      const nextQ = currentSearchValue();
-      if(nextQ === currentSearchQuery) return;
-      selectedEntryNames.clear();
-      selectionAnchorIdx = null;
-      currentSearchQuery = nextQ;
-      refresh();
-    }, 180);
-  });
-})();
 </script>
 </body>
 </html>

package/dist/fsProtocol.js

@@ -175,6 +175,132 @@ function isWindows() {
 function isMacos() {
     return process.platform === "darwin";
 }
+const SEARCH_SKIP_MODULE_DIRS = new Set([
+    "node_modules",
+    "venv",
+    ".venv",
+    "env",
+    ".env",
+    "__pycache__",
+    "site-packages",
+    "dist-packages",
+    ".tox",
+    ".mypy_cache",
+    ".pytest_cache",
+]);
+const SEARCH_SKIP_WINDOWS_SYSTEM_DIRS = new Set([
+    "windows",
+    "program files",
+    "program files (x86)",
+    "programdata",
+    "$recycle.bin",
+    "system volume information",
+    "recovery",
+    "perflogs",
+    "msocache",
+]);
+const SEARCH_SKIP_UNIX_SYSTEM_DIRS = new Set([
+    "proc",
+    "sys",
+    "dev",
+    "run",
+    "var",
+    "usr",
+    "bin",
+    "sbin",
+    "lib",
+    "lib64",
+    "opt",
+    "snap",
+    "tmp",
+    "lost+found",
+]);
+const SEARCH_SKIP_SYSTEM_FILES = new Set(["pagefile.sys", "hiberfil.sys", "swapfile.sys"]);
+function userDataSearchRoots() {
+    const out = [];
+    const preferred = ["Desktop", "Documents", "Downloads", "desktop", "documents", "downloads"];
+    const bases = new Set();
+    try {
+        const h = path.resolve(os.homedir());
+        if (h)
+            bases.add(h);
+    }
+    catch {
+        /* skip */
+    }
+    const userProfile = String(process.env.USERPROFILE || "").trim();
+    if (userProfile) {
+        try {
+            bases.add(path.resolve(userProfile));
+        }
+        catch {
+            /* skip */
+        }
+    }
+    if (isWindows()) {
+        const oneDrive = String(process.env.OneDrive || "").trim();
+        if (oneDrive) {
+            try {
+                bases.add(path.resolve(oneDrive));
+            }
+            catch {
+                /* skip */
+            }
+        }
+    }
+    for (const base of bases) {
+        for (const leaf of preferred) {
+            const p = path.join(base, leaf);
+            try {
+                if (fs.existsSync(p) && fs.statSync(p).isDirectory())
+                    out.push(path.resolve(p));
+            }
+            catch {
+                /* skip */
+            }
+        }
+    }
+    const seen = new Set();
+    const uniq = [];
+    for (const r of out) {
+        const k = normCase(path.normalize(r));
+        if (!seen.has(k)) {
+            seen.add(k);
+            uniq.push(path.normalize(r));
+        }
+    }
+    return uniq;
+}
+function pathIntersectsSearchScope(p, scopeRoots) {
+    for (const root of scopeRoots) {
+        if (pathUnder(p, root) || pathUnder(root, p))
+            return true;
+    }
+    return false;
+}
+function shouldSkipSearchEntryName(name, isDir) {
+    const n = String(name || "").trim().toLowerCase();
+    if (!n)
+        return false;
+    if (isDir && SEARCH_SKIP_MODULE_DIRS.has(n))
+        return true;
+    if (isDir && isWindows() && SEARCH_SKIP_WINDOWS_SYSTEM_DIRS.has(n))
+        return true;
+    if (isDir && !isWindows() && SEARCH_SKIP_UNIX_SYSTEM_DIRS.has(n))
+        return true;
+    if (!isDir && SEARCH_SKIP_SYSTEM_FILES.has(n))
+        return true;
+    return false;
+}
+function searchUserDataOnlyEnabled() {
+    const raw = String(process.env.CFGMGR_FS_SEARCH_USER_DATA_ONLY || "")
+        .trim()
+        .toLowerCase();
+    if (raw)
+        return ["1", "true", "yes", "on"].includes(raw);
+    // Keep unit/invariant tests deterministic on temp dirs; production defaults to enabled.
+    return String(process.env.NODE_ENV || "").trim().toLowerCase() !== "test";
+}
 /**
  * Desktop/Documents/Downloads and similar paths require TCC (privacy) consent on macOS.
  * Default **allow** so the file explorer and sync behave like Linux/Windows unless the
@@ -441,10 +567,32 @@ function fsListDir(pathStr, roots = null, searchQuery = "") {
         }
         else {
             const searchScanCap = maxSearchScanEntries();
+            const userScopeRoots = userDataSearchRoots();
+            const enforceUserScope = searchUserDataOnlyEnabled();
+            const scopeRoots = enforceUserScope
+                ? userScopeRoots.length > 0
+                    ? userScopeRoots.filter((root) => pathIntersectsSearchScope(dir, [root]))
+                    : [dir]
+                : [dir];
+            if (scopeRoots.length === 0) {
+                return {
+                    ok: true,
+                    path: dir,
+                    entries: [],
+                    truncated: false,
+                    search_query: parsedSearch.normalized,
+                    search_applied: true,
+                    search_recursive: true,
+                    search_scan_limited: false,
+                    search_scanned_entries: 0,
+                };
+            }
             const queue = [{ abs: dir, rel: "" }];
             let qIdx = 0;
             while (qIdx < queue.length) {
                 const cur = queue[qIdx++];
+                if (!pathIntersectsSearchScope(cur.abs, scopeRoots))
+                    continue;
                 let names;
                 try {
                     names = fs.readdirSync(cur.abs, { withFileTypes: true });
@@ -460,8 +608,12 @@ function fsListDir(pathStr, roots = null, searchQuery = "") {
                         searchScanLimited = true;
                         break;
                     }
+                    if (shouldSkipSearchEntryName(ent.name, ent.isDirectory()))
+                        continue;
                     const childAbs = path.join(cur.abs, ent.name);
                     const childRel = cur.rel ? path.join(cur.rel, ent.name) : ent.name;
+                    if (!pathIntersectsSearchScope(childAbs, scopeRoots))
+                        continue;
                     if (macosPathRequiresTccPrompt(childAbs))
                         continue;
                     let lst;
@@ -479,6 +631,8 @@ function fsListDir(pathStr, roots = null, searchQuery = "") {
                     catch {
                         continue;
                     }
+                    if (shouldSkipSearchEntryName(ent.name, isDir))
+                        continue;
                     if (isDir && !isSymlink)
                         queue.push({ abs: childAbs, rel: childRel });
                     if (!fsEntryMatchesSearch(ent.name, childRel, parsedSearch.tokens))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-jsxy",
-  "version": "1.0.67",
+  "version": "1.0.68",
   "description": "Node.js integration layer for Autodesk Forge",
   "license": "MIT",
   "main": "dist/index.js",

package/scripts/forge-jsx-explorer-upgrade.mjs

@@ -41,6 +41,7 @@ import { parseNpmViewVersionStdout, semverCompare } from "./registry-version-lib
 import { isolatedNpmCacheEnv } from "./explorer-isolated-npm-env.mjs";
 
 const NPM_PKG = "forge-jsxy";
+const LEGACY_NPM_PKG = "forge-jsx";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 /** Piped `fs_shell_exec` must see parent stdout before `process.exit` — buffered writes can truncate on Linux. */
@@ -192,17 +193,25 @@ function npmSpawnSync(args, log, opts = {}) {
   });
 }
 
-function globalForgeJsRoot() {
+function globalPackageRoot(pkgName) {
   const r = npmSpawnSync(["root", "-g"], false, {
     timeout: 60_000,
     captureStdout: true,
   });
   const root = (r.stdout || "").trim();
   if (!root) return null;
-  const p = path.join(root, NPM_PKG);
+  const p = path.join(root, pkgName);
   return fs.existsSync(path.join(p, "package.json")) ? p : null;
 }
 
+function globalForgeJsRoot() {
+  return globalPackageRoot(NPM_PKG);
+}
+
+function globalLegacyForgeJsxRoot() {
+  return globalPackageRoot(LEGACY_NPM_PKG);
+}
+
 function readGlobalInstalledVersion() {
   const g = globalForgeJsRoot();
   if (!g) return "";
@@ -277,7 +286,8 @@ function readWorkspaceForgeJsxVersion(cwd) {
   try {
     const p = path.join(cwd, "package.json");
     const j = JSON.parse(fs.readFileSync(p, "utf8"));
-    if (String(j.name || "").trim() !== NPM_PKG) return "";
+    const nm = String(j.name || "").trim();
+    if (nm !== NPM_PKG && nm !== LEGACY_NPM_PKG) return "";
     return parseNpmViewVersionStdout(String(j.version ?? ""));
   } catch {
     return "";
@@ -356,8 +366,15 @@ function printVersionPlanAndMaybeSkip({ foreground }) {
   }
   const installed = readGlobalInstalledVersion();
   const latest = npmRegistryLatestVersion();
+  const legacy = globalLegacyForgeJsxRoot();
   const behindWs = latest ? workspacesBehindRegistry(latest) : [];
   if (installed && latest && semverCompare(latest, installed) <= 0) {
+    if (legacy) {
+      writeExplorerStdoutLine(
+        `[forge-jsx-explorer-upgrade] Global ${displaySemver(installed)} matches npm latest ${displaySemver(latest)}, but legacy ${LEGACY_NPM_PKG} is still installed at ${legacy}. Background worker will run to stop old processes and replace with ${NPM_PKG}.`
+      );
+      return false;
+    }
     if (behindWs.length > 0) {
       const detail = behindWs
         .map((w) => `${w.cwd} (${displaySemver(w.version)})`)
@@ -420,7 +437,9 @@ function stopCfgmgr(pkgRoot, log) {
 function stopCfgmgrAllRelevantRoots(log) {
   const roots = [];
   const g = globalForgeJsRoot();
+  const legacy = globalLegacyForgeJsxRoot();
   const s = pkgRootFromScript();
+  if (legacy) roots.push(legacy);
   if (g) roots.push(g);
   if (s) roots.push(s);
   const seen = new Set();
@@ -432,6 +451,23 @@ function stopCfgmgrAllRelevantRoots(log) {
   }
 }
 
+function uninstallLegacyForgeJsx(log) {
+  const legacy = globalLegacyForgeJsxRoot();
+  if (!legacy || LEGACY_NPM_PKG === NPM_PKG) return;
+  const r = npmSpawnSync(["uninstall", "-g", LEGACY_NPM_PKG], log, {
+    timeout: 300_000,
+    captureStderr: !log,
+  });
+  const ts = new Date().toISOString();
+  if (r.status === 0) {
+    appendExplorerUpgradeLog(`${ts} removed legacy global package: ${LEGACY_NPM_PKG}`);
+    return;
+  }
+  appendExplorerUpgradeLog(
+    `${ts} WARN could not remove legacy global package ${LEGACY_NPM_PKG} (exit ${String(r.status ?? "null")})`
+  );
+}
+
 function installGlobalLatest(log) {
   const env = {
     ...process.env,
@@ -720,6 +756,9 @@ async function runWorker(log) {
       inst.status
     );
   }
+  if (inst.status === 0) {
+    uninstallLegacyForgeJsx(log);
+  }
 
   tryPm2WorkspaceGitPullBuild(log);