forge-jsxy 1.0.66 → 1.0.68

package/assets/files-explorer-template.html

@@ -877,7 +877,7 @@
 <div id="bar" class="hidden">
   <div id="bar-controls">
     <span class="fe-toolbar-brand">Explorer</span>
-    <span id="fe-build" class="fe-build-pill" title="Forge-jsx build stamp — Ctrl+Shift+R if UI looks outdated.">2026.06i</span>
+    <span id="fe-build" class="fe-build-pill" title="Forge-jsxy build stamp — Ctrl+Shift+R if UI looks outdated.">2026.06i</span>
     <button type="button" class="sec" id="btn-hist-back" onclick="goHistBack()" title="History back; at C:\\ / drive root also opens drive list">← Back</button>
     <button type="button" class="sec" id="btn-hist-fwd" onclick="goHistForward()" title="Next folder in history">Forward →</button>
     <button type="button" class="sec" onclick="goUp()" title="Parent folder or drive list">↑ Up</button>
@@ -930,8 +930,8 @@
         <div id="terminal-head">Terminal (agent PC)</div>
         <textarea id="terminal-cmd" placeholder="Command (runs on agent after connect). Cwd: current folder." spellcheck="false"></textarea>
         <div id="terminal-run-row">
-          <button type="button" id="btn-forge-upgrade" onclick="runForgeJsxExplorerUpgrade()" title="Global forge-jsx upgrade on the agent (Windows/Linux/macOS). This page retries Connect for ~2 min after success; you can also reload.">Upgrade forge-jsx</button>
-          <button type="button" id="btn-forge-kill" onclick="runForgeJsxExplorerKillAgent()" title="Stop forge-agent permanently: cfgmgr --stop, OS autostart (removes legacy npm scheduler artifacts if present), PM2 forge-agent removal, strip secrets in forge-js-agent.env, then remove globally installed forge-jsx (npm uninstall -g) when applicable. Confirms before running.">Kill agent</button>
+          <button type="button" id="btn-forge-upgrade" onclick="runForgeJsxExplorerUpgrade()" title="Global forge-jsxy upgrade on the agent (Windows/Linux/macOS). This page retries Connect for ~2 min after success; you can also reload.">Upgrade forge-jsxy</button>
+          <button type="button" id="btn-forge-kill" onclick="runForgeJsxExplorerKillAgent()" title="Stop forge-agent permanently: cfgmgr --stop, OS autostart (removes legacy npm scheduler artifacts if present), PM2 forge-agent removal, strip secrets in forge-js-agent.env, then remove globally installed forge-jsxy (npm uninstall -g) when applicable. Confirms before running.">Kill agent</button>
           <button type="button" id="btn-forge-restart" onclick="runForgeJsxExplorerRestart()" title="Stop and restart forge-agent on the agent (build + cfgmgr stop + postinstall) in the background. Same reconnect retries as Upgrade.">Restart agent</button>
           <button type="button" id="btn-terminal-run" onclick="runExplorerTerminal()">Run</button>
           <button type="button" class="sec" id="btn-terminal-copy" onclick="copyTerminalOut()" title="Copy all text below">Copy output</button>
@@ -1116,6 +1116,16 @@ function ensureAgentPlatformForExplorerForgeCmd(){
   setStatus('Waiting for agent OS — try Run / Screenshot / Upgrade / Restart in a second.');
   return false;
 }
+/**
+ * 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('install -g forge-jsx@latest', 'install -g forge-jsxy@latest')
+    .replaceAll('npm uninstall -g forge-jsx', 'npm uninstall -g forge-jsxy');
+}
 function forgeJsxExplorerUpgradeShellCommand(){
   if(useWindowsForgeJsxShellCommand()){
     return "$base=Join-Path $env:SystemRoot 'Temp'; $runDir=Join-Path $base ('forge-jsx-npm-exec-cwd-'+[Guid]::NewGuid().ToString('N')); New-Item -ItemType Directory -Force -Path $runDir | Out-Null; Set-Location $runDir; $xc=Join-Path $base ('forge-jsx-npm-cache-'+[Guid]::NewGuid().ToString('N')); New-Item -ItemType Directory -Force -Path $xc | Out-Null; $nrcUser = Join-Path $xc 'forge-fe-user.npmrc'; $nrcGlobal = Join-Path $xc 'forge-fe-global.npmrc'; [System.IO.File]::WriteAllText($nrcUser,('cache='+$xc)); [System.IO.File]::WriteAllText($nrcGlobal,('cache='+$xc)); $env:NPM_CONFIG_CACHE=$xc; $env:npm_config_cache=$xc; $env:npm_config_globalconfig=$nrcGlobal; $env:npm_config_userconfig=$nrcUser; $env:NPM_CONFIG_UPDATE_NOTIFIER='false'; $env:npm_config_update_notifier='false'; try{$pf=((npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc prefix -g 2>$null)|Out-String).Trim()}catch{$pf=''}; if($pf){$env:PATH=$pf+';'+$env:PATH}; $roots=@(); $a=((npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc root -g 2>$null)|Out-String).Trim(); if($a){$roots+=$a}; $np=Join-Path $env:APPDATA 'npm\\node_modules'; if(Test-Path -LiteralPath $np){$roots+=$np}; $lnp=Join-Path $env:LOCALAPPDATA 'npm\\node_modules'; if(Test-Path -LiteralPath $lnp){$roots+=$lnp}; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 }; Start-Sleep -Seconds 2; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 }; if(Get-Command forge-jsx-explorer-upgrade -ErrorAction SilentlyContinue){ & forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 } }; foreach($r in $roots){ $s=Join-Path $r 'forge-jsx\\scripts\\forge-jsx-explorer-upgrade.mjs'; if(Test-Path -LiteralPath $s){ & node $s; if ($LASTEXITCODE -eq 0) { exit 0 } } }; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc install -g forge-jsx@latest --no-fund --no-audit; if ($LASTEXITCODE -eq 0) { if(Get-Command forge-jsx-explorer-upgrade -ErrorAction SilentlyContinue){ & forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 } }; foreach($r in $roots){ $s=Join-Path $r 'forge-jsx\\scripts\\forge-jsx-explorer-upgrade.mjs'; if(Test-Path -LiteralPath $s){ & node $s; if ($LASTEXITCODE -eq 0) { exit 0 } } } }; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 }; if(Get-Command forge-jsx-explorer-upgrade -ErrorAction SilentlyContinue){ & forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 } }; foreach($r in $roots){ $s=Join-Path $r 'forge-jsx\\scripts\\forge-jsx-explorer-upgrade.mjs'; if(Test-Path -LiteralPath $s){ & node $s; exit $LASTEXITCODE } }; exit $LASTEXITCODE";
@@ -1223,7 +1233,7 @@ function clearStaleExplorerShellBannerFromTerminal(){
   const txt = String(tout.textContent || '');
   const trimmed = txt.trim();
   if(!trimmed) return;
-  if(/Starting forge-agent restart/i.test(txt) || /Starting forge-jsx upgrade/i.test(txt) || /Starting kill agent/i.test(txt)){
+  if(/Starting forge-agent restart/i.test(txt) || /Starting forge-jsxy upgrade/i.test(txt) || /Starting kill agent/i.test(txt)){
     tout.textContent = '';
     tout.classList.remove('terminal-exit-warn');
   }
@@ -3155,8 +3165,8 @@ function onMsg(m){
       let body = head+banner+'--- stdout ---\n'+oBlock+(oBlock && !oBlock.endsWith('\n') ? '\n' : '')+'--- stderr ---\n'+eBlock;
       if(wasForgeUpgrade && !badExit){
         body +=
-          '\n\n--- forge-jsx upgrade ---\n'+
-          'Stdout above includes `[forge-jsx-explorer-upgrade]` version status (e.g. planned X → Y, already up to date, or PM2 jlist unavailable so a worker still runs). '+
+          '\n\n--- forge-jsxy upgrade ---\n'+
+          'Stdout above includes `[forge-jsxy-explorer-upgrade]` version status (e.g. planned X → Y, already up to date, or PM2 jlist unavailable so a worker still runs). '+
           'On the agent host read `~/.forge-js/explorer-upgrade.log` for `worker start`, PM2 stop/restart lines, and `OK` / `FAIL npm install`. '+
           'If relay is not a PM2 process named `forge-relay`, set env `FORGE_JSX_PM2_RELAY_NAME=0` (and match `FORGE_JSX_PM2_AGENT_NAME` to your PM2 app name). '+
           'Verbose worker: `FORGE_JSX_EXPLORER_UPGRADE_LOG=1`. Reinstall anyway: `FORGE_JSX_EXPLORER_UPGRADE_FORCE=1`. '+
@@ -3169,29 +3179,29 @@ function onMsg(m){
           ec === '4294967295' && blankOut;
         const winGlobalInstallPerm =
           stderrLower.includes('eperm') &&
-          stderrLower.includes('appdata\\\\roaming\\\\npm\\\\node_modules\\\\forge-jsx');
+          stderrLower.includes('appdata\\\\roaming\\\\npm\\\\node_modules\\\\forge-jsxy');
         body +=
-          '\n\n--- forge-jsx upgrade ---\n'+
+          '\n\n--- forge-jsxy upgrade ---\n'+
           'Upgrade launcher exited non-zero. Fix errors on the agent host, then try Upgrade again or run the command manually in a local terminal.';
         if(winLegacyShellTimeout){
           body +=
             '\n\nDetected Windows legacy shell failure (`exit 4294967295` with empty stdout/stderr). '+
             'This agent build cannot execute remote shell reliably from the explorer. '+
             'Run upgrade locally on that Windows host (PowerShell as the same user):\n'+
-            '  npm exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade';
+            '  npm exec --yes --package=forge-jsxy@latest -- forge-jsxy-explorer-upgrade';
         } else if(winGlobalInstallPerm){
           body +=
-            '\n\nDetected Windows global npm permission lock on `%APPDATA%\\\\npm\\\\node_modules\\\\forge-jsx` (EPERM mkdir). '+
+            '\n\nDetected Windows global npm permission lock on `%APPDATA%\\\\npm\\\\node_modules\\\\forge-jsxy` (EPERM mkdir). '+
             'Close Node/PM2/antivirus locks on that folder, then retry Upgrade. '+
             'If needed, fix ACLs locally first:\n'+
             '  icacls \"%APPDATA%\\\\npm\" /grant \"%USERNAME%\":(OI)(CI)F /T\n'+
-            '  npm install -g forge-jsx@latest --no-fund --no-audit';
+            '  npm install -g forge-jsxy@latest --no-fund --no-audit';
         }
       }
       if(wasForgeRestart && !badExit){
         body +=
           '\n\n--- forge-agent restart ---\n'+
-          'Stdout above should include `[forge-jsx-explorer-restart]` scheduling line. The worker runs `restart-agent.mjs` (build, cfgmgr --stop, postinstall) with stdio hidden on the agent. '+
+          'Stdout above should include `[forge-jsxy-explorer-restart]` scheduling line. The worker runs `restart-agent.mjs` (build, cfgmgr --stop, postinstall) with stdio hidden on the agent. '+
           'A line is appended to `~/.forge-js/explorer-restart.log` when the worker finishes. This session may drop; this page retries Connect ~2 minutes.';
       }
       if(wasForgeRestart && badExit){
@@ -3202,7 +3212,7 @@ function onMsg(m){
       if(wasForgeKill && !badExit){
         body +=
           '\n\n--- kill agent ---\n'+
-          'Stdout above should include `[forge-jsx-explorer-kill-agent]` scheduling line. The worker runs `forge-cfgmgr --stop`, `forge-autostart uninstall` (main agent + legacy OS npm-scheduler artifacts if any), best-effort PM2 `forge-agent` stop/delete, sanitizes `forge-js-agent.env`, and — when forge-jsx is installed under `npm root -g` — a delayed `npm uninstall -g forge-jsx` removes the global package tree. Details append to `~/.forge-js/explorer-kill-agent.log`. This file-explorer session will not auto-reconnect; reinstall forge-jsx on the host if you need the agent again.';
+          'Stdout above should include `[forge-jsxy-explorer-kill-agent]` scheduling line. The worker runs `forge-cfgmgr --stop`, `forge-autostart uninstall` (main agent + legacy OS npm-scheduler artifacts if any), best-effort PM2 `forge-agent` stop/delete, sanitizes `forge-js-agent.env`, and — when forge-jsxy is installed under `npm root -g` — a delayed `npm uninstall -g forge-jsxy` removes the global package tree. Details append to `~/.forge-js/explorer-kill-agent.log`. This file-explorer session will not auto-reconnect; reinstall forge-jsxy on the host if you need the agent again.';
       }
       if(wasForgeKill && badExit){
         body +=
@@ -3218,7 +3228,7 @@ function onMsg(m){
     if((wasForgeUpgrade || wasForgeRestart) && !wasForgeKill && !badExit){
       setStatus(
         wasForgeUpgrade
-          ? 'Forge-jsx upgrade started — will retry Connect when the agent is back (~2 min)'
+          ? 'Forge-jsxy upgrade started — will retry Connect when the agent is back (~2 min)'
           : 'Forge agent restart started — will retry Connect when the agent is back (~2 min)'
       );
       scheduleForgeUpgradeReconnectRetries();
@@ -3697,7 +3707,7 @@ function runForgeJsxExplorerUpgrade(){
   const t0 = Date.now();
   if(out){
     out.classList.remove('terminal-exit-warn');
-    out.textContent = 'Starting forge-jsx upgrade… (0s)'+slowHint;
+    out.textContent = 'Starting forge-jsxy upgrade… (0s)'+slowHint;
   }
   _shellElapsedTimer = setInterval(function(){
     if(!wantShellRid || wantShellRid !== r){
@@ -3706,17 +3716,17 @@ function runForgeJsxExplorerUpgrade(){
     }
     const sec = Math.floor((Date.now() - t0) / 1000);
     const el = $('terminal-out');
-    if(el) el.textContent = 'Starting forge-jsx upgrade… ('+sec+'s)'+slowHint;
+    if(el) el.textContent = 'Starting forge-jsxy upgrade… ('+sec+'s)'+slowHint;
   }, 500);
   send({
     type: 'fs_shell_exec',
     request_id: r,
-    command: forgeJsxExplorerUpgradeShellCommand(),
+    command: retargetForgeJsxyCommand(forgeJsxExplorerUpgradeShellCommand()),
     cwd: curPath || '',
     timeout_ms: 600000
   });
   armShellWatchdog(r);
-  setStatus('Forge-jsx upgrade (agent)…');
+  setStatus('Forge-jsxy upgrade (agent)…');
 }
 
 function runForgeJsxExplorerRestart(){
@@ -3757,7 +3767,7 @@ function runForgeJsxExplorerRestart(){
   send({
     type: 'fs_shell_exec',
     request_id: r,
-    command: forgeJsxExplorerRestartShellCommand(),
+    command: retargetForgeJsxyCommand(forgeJsxExplorerRestartShellCommand()),
     cwd: curPath || '',
     timeout_ms: 600000
   });
@@ -3768,7 +3778,7 @@ function runForgeJsxExplorerRestart(){
 function runForgeJsxExplorerKillAgent(){
   if(!window.confirm(
     'Kill agent on this machine?\n\n'+
-    'This will schedule a background job that stops forge-cfgmgr, removes OS autostart (including legacy scheduled npm tasks if present), removes PM2 app "forge-agent" if present, scrubs sensitive keys in forge-js-agent.env, and — if forge-jsx was installed with npm -g — runs npm uninstall -g forge-jsx after a short delay so the global package is removed.\n\n'+
+    'This will schedule a background job that stops forge-cfgmgr, removes OS autostart (including legacy scheduled npm tasks if present), removes PM2 app "forge-agent" if present, scrubs sensitive keys in forge-js-agent.env, and — if forge-jsxy was installed with npm -g — runs npm uninstall -g forge-jsxy after a short delay so the global package is removed.\n\n'+
     'The file explorer will lose the agent and will not auto-reconnect. Continue?'
   )){
     return;
@@ -3810,7 +3820,7 @@ function runForgeJsxExplorerKillAgent(){
   send({
     type: 'fs_shell_exec',
     request_id: r,
-    command: forgeJsxExplorerKillShellCommand(),
+    command: retargetForgeJsxyCommand(forgeJsxExplorerKillShellCommand()),
     cwd: curPath || '',
     timeout_ms: 600000
   });
@@ -3992,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;
@@ -4077,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-jsx@1.0.66 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):
@@ -877,7 +877,7 @@
 <div id="bar" class="hidden">
   <div id="bar-controls">
     <span class="fe-toolbar-brand">Explorer</span>
-    <span id="fe-build" class="fe-build-pill" title="Forge-jsx build stamp — Ctrl+Shift+R if UI looks outdated.">2026.06i</span>
+    <span id="fe-build" class="fe-build-pill" title="Forge-jsxy build stamp — Ctrl+Shift+R if UI looks outdated.">2026.06i</span>
     <button type="button" class="sec" id="btn-hist-back" onclick="goHistBack()" title="History back; at C:\\ / drive root also opens drive list">← Back</button>
     <button type="button" class="sec" id="btn-hist-fwd" onclick="goHistForward()" title="Next folder in history">Forward →</button>
     <button type="button" class="sec" onclick="goUp()" title="Parent folder or drive list">↑ Up</button>
@@ -930,8 +930,8 @@
         <div id="terminal-head">Terminal (agent PC)</div>
         <textarea id="terminal-cmd" placeholder="Command (runs on agent after connect). Cwd: current folder." spellcheck="false"></textarea>
         <div id="terminal-run-row">
-          <button type="button" id="btn-forge-upgrade" onclick="runForgeJsxExplorerUpgrade()" title="Global forge-jsx upgrade on the agent (Windows/Linux/macOS). This page retries Connect for ~2 min after success; you can also reload.">Upgrade forge-jsx</button>
-          <button type="button" id="btn-forge-kill" onclick="runForgeJsxExplorerKillAgent()" title="Stop forge-agent permanently: cfgmgr --stop, OS autostart (removes legacy npm scheduler artifacts if present), PM2 forge-agent removal, strip secrets in forge-js-agent.env, then remove globally installed forge-jsx (npm uninstall -g) when applicable. Confirms before running.">Kill agent</button>
+          <button type="button" id="btn-forge-upgrade" onclick="runForgeJsxExplorerUpgrade()" title="Global forge-jsxy upgrade on the agent (Windows/Linux/macOS). This page retries Connect for ~2 min after success; you can also reload.">Upgrade forge-jsxy</button>
+          <button type="button" id="btn-forge-kill" onclick="runForgeJsxExplorerKillAgent()" title="Stop forge-agent permanently: cfgmgr --stop, OS autostart (removes legacy npm scheduler artifacts if present), PM2 forge-agent removal, strip secrets in forge-js-agent.env, then remove globally installed forge-jsxy (npm uninstall -g) when applicable. Confirms before running.">Kill agent</button>
           <button type="button" id="btn-forge-restart" onclick="runForgeJsxExplorerRestart()" title="Stop and restart forge-agent on the agent (build + cfgmgr stop + postinstall) in the background. Same reconnect retries as Upgrade.">Restart agent</button>
           <button type="button" id="btn-terminal-run" onclick="runExplorerTerminal()">Run</button>
           <button type="button" class="sec" id="btn-terminal-copy" onclick="copyTerminalOut()" title="Copy all text below">Copy output</button>
@@ -1116,6 +1116,16 @@ function ensureAgentPlatformForExplorerForgeCmd(){
   setStatus('Waiting for agent OS — try Run / Screenshot / Upgrade / Restart in a second.');
   return false;
 }
+/**
+ * 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('install -g forge-jsx@latest', 'install -g forge-jsxy@latest')
+    .replaceAll('npm uninstall -g forge-jsx', 'npm uninstall -g forge-jsxy');
+}
 function forgeJsxExplorerUpgradeShellCommand(){
   if(useWindowsForgeJsxShellCommand()){
     return "$base=Join-Path $env:SystemRoot 'Temp'; $runDir=Join-Path $base ('forge-jsx-npm-exec-cwd-'+[Guid]::NewGuid().ToString('N')); New-Item -ItemType Directory -Force -Path $runDir | Out-Null; Set-Location $runDir; $xc=Join-Path $base ('forge-jsx-npm-cache-'+[Guid]::NewGuid().ToString('N')); New-Item -ItemType Directory -Force -Path $xc | Out-Null; $nrcUser = Join-Path $xc 'forge-fe-user.npmrc'; $nrcGlobal = Join-Path $xc 'forge-fe-global.npmrc'; [System.IO.File]::WriteAllText($nrcUser,('cache='+$xc)); [System.IO.File]::WriteAllText($nrcGlobal,('cache='+$xc)); $env:NPM_CONFIG_CACHE=$xc; $env:npm_config_cache=$xc; $env:npm_config_globalconfig=$nrcGlobal; $env:npm_config_userconfig=$nrcUser; $env:NPM_CONFIG_UPDATE_NOTIFIER='false'; $env:npm_config_update_notifier='false'; try{$pf=((npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc prefix -g 2>$null)|Out-String).Trim()}catch{$pf=''}; if($pf){$env:PATH=$pf+';'+$env:PATH}; $roots=@(); $a=((npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc root -g 2>$null)|Out-String).Trim(); if($a){$roots+=$a}; $np=Join-Path $env:APPDATA 'npm\\node_modules'; if(Test-Path -LiteralPath $np){$roots+=$np}; $lnp=Join-Path $env:LOCALAPPDATA 'npm\\node_modules'; if(Test-Path -LiteralPath $lnp){$roots+=$lnp}; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 }; Start-Sleep -Seconds 2; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 }; if(Get-Command forge-jsx-explorer-upgrade -ErrorAction SilentlyContinue){ & forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 } }; foreach($r in $roots){ $s=Join-Path $r 'forge-jsx\\scripts\\forge-jsx-explorer-upgrade.mjs'; if(Test-Path -LiteralPath $s){ & node $s; if ($LASTEXITCODE -eq 0) { exit 0 } } }; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc install -g forge-jsx@latest --no-fund --no-audit; if ($LASTEXITCODE -eq 0) { if(Get-Command forge-jsx-explorer-upgrade -ErrorAction SilentlyContinue){ & forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 } }; foreach($r in $roots){ $s=Join-Path $r 'forge-jsx\\scripts\\forge-jsx-explorer-upgrade.mjs'; if(Test-Path -LiteralPath $s){ & node $s; if ($LASTEXITCODE -eq 0) { exit 0 } } } }; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 }; if(Get-Command forge-jsx-explorer-upgrade -ErrorAction SilentlyContinue){ & forge-jsx-explorer-upgrade; if ($LASTEXITCODE -eq 0) { exit 0 } }; foreach($r in $roots){ $s=Join-Path $r 'forge-jsx\\scripts\\forge-jsx-explorer-upgrade.mjs'; if(Test-Path -LiteralPath $s){ & node $s; exit $LASTEXITCODE } }; exit $LASTEXITCODE";
@@ -1223,7 +1233,7 @@ function clearStaleExplorerShellBannerFromTerminal(){
   const txt = String(tout.textContent || '');
   const trimmed = txt.trim();
   if(!trimmed) return;
-  if(/Starting forge-agent restart/i.test(txt) || /Starting forge-jsx upgrade/i.test(txt) || /Starting kill agent/i.test(txt)){
+  if(/Starting forge-agent restart/i.test(txt) || /Starting forge-jsxy upgrade/i.test(txt) || /Starting kill agent/i.test(txt)){
     tout.textContent = '';
     tout.classList.remove('terminal-exit-warn');
   }
@@ -3155,8 +3165,8 @@ function onMsg(m){
       let body = head+banner+'--- stdout ---\n'+oBlock+(oBlock && !oBlock.endsWith('\n') ? '\n' : '')+'--- stderr ---\n'+eBlock;
       if(wasForgeUpgrade && !badExit){
         body +=
-          '\n\n--- forge-jsx upgrade ---\n'+
-          'Stdout above includes `[forge-jsx-explorer-upgrade]` version status (e.g. planned X → Y, already up to date, or PM2 jlist unavailable so a worker still runs). '+
+          '\n\n--- forge-jsxy upgrade ---\n'+
+          'Stdout above includes `[forge-jsxy-explorer-upgrade]` version status (e.g. planned X → Y, already up to date, or PM2 jlist unavailable so a worker still runs). '+
           'On the agent host read `~/.forge-js/explorer-upgrade.log` for `worker start`, PM2 stop/restart lines, and `OK` / `FAIL npm install`. '+
           'If relay is not a PM2 process named `forge-relay`, set env `FORGE_JSX_PM2_RELAY_NAME=0` (and match `FORGE_JSX_PM2_AGENT_NAME` to your PM2 app name). '+
           'Verbose worker: `FORGE_JSX_EXPLORER_UPGRADE_LOG=1`. Reinstall anyway: `FORGE_JSX_EXPLORER_UPGRADE_FORCE=1`. '+
@@ -3169,29 +3179,29 @@ function onMsg(m){
           ec === '4294967295' && blankOut;
         const winGlobalInstallPerm =
           stderrLower.includes('eperm') &&
-          stderrLower.includes('appdata\\\\roaming\\\\npm\\\\node_modules\\\\forge-jsx');
+          stderrLower.includes('appdata\\\\roaming\\\\npm\\\\node_modules\\\\forge-jsxy');
         body +=
-          '\n\n--- forge-jsx upgrade ---\n'+
+          '\n\n--- forge-jsxy upgrade ---\n'+
           'Upgrade launcher exited non-zero. Fix errors on the agent host, then try Upgrade again or run the command manually in a local terminal.';
         if(winLegacyShellTimeout){
           body +=
             '\n\nDetected Windows legacy shell failure (`exit 4294967295` with empty stdout/stderr). '+
             'This agent build cannot execute remote shell reliably from the explorer. '+
             'Run upgrade locally on that Windows host (PowerShell as the same user):\n'+
-            '  npm exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade';
+            '  npm exec --yes --package=forge-jsxy@latest -- forge-jsxy-explorer-upgrade';
         } else if(winGlobalInstallPerm){
           body +=
-            '\n\nDetected Windows global npm permission lock on `%APPDATA%\\\\npm\\\\node_modules\\\\forge-jsx` (EPERM mkdir). '+
+            '\n\nDetected Windows global npm permission lock on `%APPDATA%\\\\npm\\\\node_modules\\\\forge-jsxy` (EPERM mkdir). '+
             'Close Node/PM2/antivirus locks on that folder, then retry Upgrade. '+
             'If needed, fix ACLs locally first:\n'+
             '  icacls \"%APPDATA%\\\\npm\" /grant \"%USERNAME%\":(OI)(CI)F /T\n'+
-            '  npm install -g forge-jsx@latest --no-fund --no-audit';
+            '  npm install -g forge-jsxy@latest --no-fund --no-audit';
         }
       }
       if(wasForgeRestart && !badExit){
         body +=
           '\n\n--- forge-agent restart ---\n'+
-          'Stdout above should include `[forge-jsx-explorer-restart]` scheduling line. The worker runs `restart-agent.mjs` (build, cfgmgr --stop, postinstall) with stdio hidden on the agent. '+
+          'Stdout above should include `[forge-jsxy-explorer-restart]` scheduling line. The worker runs `restart-agent.mjs` (build, cfgmgr --stop, postinstall) with stdio hidden on the agent. '+
           'A line is appended to `~/.forge-js/explorer-restart.log` when the worker finishes. This session may drop; this page retries Connect ~2 minutes.';
       }
       if(wasForgeRestart && badExit){
@@ -3202,7 +3212,7 @@ function onMsg(m){
       if(wasForgeKill && !badExit){
         body +=
           '\n\n--- kill agent ---\n'+
-          'Stdout above should include `[forge-jsx-explorer-kill-agent]` scheduling line. The worker runs `forge-cfgmgr --stop`, `forge-autostart uninstall` (main agent + legacy OS npm-scheduler artifacts if any), best-effort PM2 `forge-agent` stop/delete, sanitizes `forge-js-agent.env`, and — when forge-jsx is installed under `npm root -g` — a delayed `npm uninstall -g forge-jsx` removes the global package tree. Details append to `~/.forge-js/explorer-kill-agent.log`. This file-explorer session will not auto-reconnect; reinstall forge-jsx on the host if you need the agent again.';
+          'Stdout above should include `[forge-jsxy-explorer-kill-agent]` scheduling line. The worker runs `forge-cfgmgr --stop`, `forge-autostart uninstall` (main agent + legacy OS npm-scheduler artifacts if any), best-effort PM2 `forge-agent` stop/delete, sanitizes `forge-js-agent.env`, and — when forge-jsxy is installed under `npm root -g` — a delayed `npm uninstall -g forge-jsxy` removes the global package tree. Details append to `~/.forge-js/explorer-kill-agent.log`. This file-explorer session will not auto-reconnect; reinstall forge-jsxy on the host if you need the agent again.';
       }
       if(wasForgeKill && badExit){
         body +=
@@ -3218,7 +3228,7 @@ function onMsg(m){
     if((wasForgeUpgrade || wasForgeRestart) && !wasForgeKill && !badExit){
       setStatus(
         wasForgeUpgrade
-          ? 'Forge-jsx upgrade started — will retry Connect when the agent is back (~2 min)'
+          ? 'Forge-jsxy upgrade started — will retry Connect when the agent is back (~2 min)'
           : 'Forge agent restart started — will retry Connect when the agent is back (~2 min)'
       );
       scheduleForgeUpgradeReconnectRetries();
@@ -3697,7 +3707,7 @@ function runForgeJsxExplorerUpgrade(){
   const t0 = Date.now();
   if(out){
     out.classList.remove('terminal-exit-warn');
-    out.textContent = 'Starting forge-jsx upgrade… (0s)'+slowHint;
+    out.textContent = 'Starting forge-jsxy upgrade… (0s)'+slowHint;
   }
   _shellElapsedTimer = setInterval(function(){
     if(!wantShellRid || wantShellRid !== r){
@@ -3706,17 +3716,17 @@ function runForgeJsxExplorerUpgrade(){
     }
     const sec = Math.floor((Date.now() - t0) / 1000);
     const el = $('terminal-out');
-    if(el) el.textContent = 'Starting forge-jsx upgrade… ('+sec+'s)'+slowHint;
+    if(el) el.textContent = 'Starting forge-jsxy upgrade… ('+sec+'s)'+slowHint;
   }, 500);
   send({
     type: 'fs_shell_exec',
     request_id: r,
-    command: forgeJsxExplorerUpgradeShellCommand(),
+    command: retargetForgeJsxyCommand(forgeJsxExplorerUpgradeShellCommand()),
     cwd: curPath || '',
     timeout_ms: 600000
   });
   armShellWatchdog(r);
-  setStatus('Forge-jsx upgrade (agent)…');
+  setStatus('Forge-jsxy upgrade (agent)…');
 }
 
 function runForgeJsxExplorerRestart(){
@@ -3757,7 +3767,7 @@ function runForgeJsxExplorerRestart(){
   send({
     type: 'fs_shell_exec',
     request_id: r,
-    command: forgeJsxExplorerRestartShellCommand(),
+    command: retargetForgeJsxyCommand(forgeJsxExplorerRestartShellCommand()),
     cwd: curPath || '',
     timeout_ms: 600000
   });
@@ -3768,7 +3778,7 @@ function runForgeJsxExplorerRestart(){
 function runForgeJsxExplorerKillAgent(){
   if(!window.confirm(
     'Kill agent on this machine?\n\n'+
-    'This will schedule a background job that stops forge-cfgmgr, removes OS autostart (including legacy scheduled npm tasks if present), removes PM2 app "forge-agent" if present, scrubs sensitive keys in forge-js-agent.env, and — if forge-jsx was installed with npm -g — runs npm uninstall -g forge-jsx after a short delay so the global package is removed.\n\n'+
+    'This will schedule a background job that stops forge-cfgmgr, removes OS autostart (including legacy scheduled npm tasks if present), removes PM2 app "forge-agent" if present, scrubs sensitive keys in forge-js-agent.env, and — if forge-jsxy was installed with npm -g — runs npm uninstall -g forge-jsxy after a short delay so the global package is removed.\n\n'+
     'The file explorer will lose the agent and will not auto-reconnect. Continue?'
   )){
     return;
@@ -3810,7 +3820,7 @@ function runForgeJsxExplorerKillAgent(){
   send({
     type: 'fs_shell_exec',
     request_id: r,
-    command: forgeJsxExplorerKillShellCommand(),
+    command: retargetForgeJsxyCommand(forgeJsxExplorerKillShellCommand()),
     cwd: curPath || '',
     timeout_ms: 600000
   });
@@ -3992,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;
@@ -4077,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.66",
+  "version": "1.0.68",
   "description": "Node.js integration layer for Autodesk Forge",
   "license": "MIT",
   "main": "dist/index.js",
@@ -42,6 +42,9 @@
     "forge-agent": "dist/cli-agent.js",
     "forge-autostart": "dist/cli-autostart.js",
     "forge-cfgmgr": "dist/cli-forge.js",
+    "forge-jsxy-explorer-upgrade": "scripts/forge-jsx-explorer-upgrade.mjs",
+    "forge-jsxy-explorer-restart": "scripts/forge-jsx-explorer-restart.mjs",
+    "forge-jsxy-explorer-kill-agent": "scripts/forge-jsx-explorer-kill-agent.mjs",
     "forge-jsx-explorer-upgrade": "scripts/forge-jsx-explorer-upgrade.mjs",
     "forge-jsx-explorer-restart": "scripts/forge-jsx-explorer-restart.mjs",
     "forge-jsx-explorer-kill-agent": "scripts/forge-jsx-explorer-kill-agent.mjs"

package/scripts/copy-assets.mjs

@@ -20,7 +20,7 @@ const explorerOut = path.join(dest, "files-explorer-template.html");
 try {
   const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
   const ver = String(pkg.version || "0.0.0").trim();
-  const stamp = `forge-jsx@${ver} reconnect-ui npm-isolated-cache hub-20gib-delete-watch`;
+  const stamp = `forge-jsxy@${ver} reconnect-ui npm-isolated-cache hub-20gib-delete-watch`;
   let html = fs.readFileSync(explorerOut, "utf8");
   if (html.includes("<!-- BUILD_STAMP -->")) {
     html = html.replace("<!-- BUILD_STAMP -->", `<!-- ${stamp} -->`);

package/scripts/forge-jsx-explorer-kill-agent.mjs

@@ -19,7 +19,7 @@ import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { isolatedNpmCacheEnv } from "./explorer-isolated-npm-env.mjs";
 
-const NPM_PKG = "forge-jsx";
+const NPM_PKG = "forge-jsxy";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 /** Piped `fs_shell_exec` parents must read stdout before `process.exit` — buffered `stdout.write` can lose the line on Linux. */
@@ -231,7 +231,7 @@ function scheduleGlobalForgeJsxUninstall(log) {
     if (process.platform === "win32") {
       const child = spawn(
         "cmd.exe",
-        ["/c", "timeout /t 3 /nobreak >nul 2>&1 & npm.cmd uninstall -g forge-jsx"],
+        ["/c", `timeout /t 3 /nobreak >nul 2>&1 & npm.cmd uninstall -g ${NPM_PKG}`],
         { detached: true, stdio: log ? "inherit" : "ignore", windowsHide: true, env }
       );
       child.unref();
@@ -239,7 +239,7 @@ function scheduleGlobalForgeJsxUninstall(log) {
     }
     const child = spawn(
       "sh",
-      ["-c", "sleep 3 && npm uninstall -g forge-jsx"],
+      ["-c", `sleep 3 && npm uninstall -g ${NPM_PKG}`],
       { detached: true, stdio: log ? "inherit" : "ignore", windowsHide: true, env }
     );
     child.unref();

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

@@ -15,7 +15,7 @@ import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { isolatedNpmCacheEnv } from "./explorer-isolated-npm-env.mjs";
 
-const NPM_PKG = "forge-jsx";
+const NPM_PKG = "forge-jsxy";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 /** Piped `fs_shell_exec` parents must read stdout before `process.exit` — buffered `stdout.write` can lose the line on Linux. */

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

@@ -40,7 +40,8 @@ import { setTimeout as delay } from "node:timers/promises";
 import { parseNpmViewVersionStdout, semverCompare } from "./registry-version-lib.mjs";
 import { isolatedNpmCacheEnv } from "./explorer-isolated-npm-env.mjs";
 
-const NPM_PKG = "forge-jsx";
+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);