forge-jsxy 1.0.107 → 1.0.120

package/assets/files-explorer-template.html

@@ -1165,6 +1165,20 @@
   .fe-overlay-gate-minimal input#password.remote-login-password {
     margin-bottom: 0;
   }
+  .fe-gate-status {
+    margin: 0 0 10px;
+    font-size: 12px;
+    line-height: 1.45;
+    color: var(--vscode-descriptionForeground);
+    text-align: center;
+    min-height: 1.2em;
+  }
+  .fe-gate-status.fe-gate-status-error {
+    color: var(--vscode-errorForeground);
+  }
+  .fe-explorer-gate-form.fe-gate-autoconnect #password.remote-login-password {
+    display: none;
+  }
   .fe-explorer-gate-form {
     margin: 0;
   }
@@ -1585,6 +1599,7 @@
     <div class="remote-login-panel card fe-overlay-gate-minimal" role="dialog" aria-modal="true">
       <form id="fe-explorer-gate" class="fe-explorer-gate-form" autocomplete="off">
         <input type="hidden" id="session" value="" autocomplete="off"/>
+        <p id="fe-gate-status" class="fe-gate-status" aria-live="polite"></p>
         <input id="password" class="remote-login-password" type="password" name="password" autocomplete="current-password" placeholder="Agent password — Enter to connect" title="Matches CFGMGR_SESSION_PASSWORD on the agent; Enter submits" autofocus/>
       </form>
     </div>
@@ -2115,6 +2130,11 @@ function scheduleAuthChallengeWatch(){
   _authChallengeWatchTimer = setTimeout(function(){
     _authChallengeWatchTimer = null;
     if(authed || !ws || ws.readyState !== 1 || !ws._pwHash) return;
+    revealGatePasswordField();
+    setGateStatus(
+      'No auth challenge from the agent. Run one forge-agent per My VPS id; upgrade/restart forge-agent, then try again.',
+      true
+    );
     setCerr(
       'No auth challenge from the agent. Run one forge-agent per My VPS id; update forge-agent/cfgmgr-agent, then Connect again. If this persists, restart the agent process.');
     setWaitmsg('Auth stalled');
@@ -2159,6 +2179,11 @@ function scheduleAuthResultWatch(){
         _authResultWatchTimer = null;
         if(authed || !ws || ws.readyState !== 1) return;
         if(!stillAuthenticating()) return;
+        revealGatePasswordField();
+        setGateStatus(
+          'No auth response from the agent (timeout). Disconnect, ensure one forge-agent matches this My VPS id, restart the agent, then connect again.',
+          true
+        );
         setCerr('No auth response from the agent (timeout). Click Disconnect, ensure one forge-agent per My VPS id matches this password, restart forge-agent, then Connect again.');
         setWaitmsg('Auth timed out');
         explorerAuthAwaitingResult = false;
@@ -2171,6 +2196,7 @@ let wantFolderZipRid = null, wantFolderZipPath = '', wantFolderZipPaths = null,
 let wantDeleteRid = null;
 let currentDeletePath = '';
 let legacyDeleteMode = false;
+let legacySingleReadMode = false;
 let deleteLegacyCompatRetried = false;
 /** Cleared when `fs_delete_result` / `fs_error` arrives, or after timeout if the agent drops mid-delete. */
 let _deleteWatchTimer = null;
@@ -2274,23 +2300,43 @@ function appendWinLegacyShellHint(body, cmdName){
     'Run on that Windows host (PowerShell as the same user):\n'+
     '  npm exec --yes --package=forge-jsxy@latest -- '+cmdName;
 }
+function forgeRelayShellEnvPrefix(){
+  var u = defaultRelayWs();
+  if(!u) return '';
+  if(useWindowsForgeJsxShellCommand()){
+    var wp = String(u).replace(/'/g, "''");
+    return "$env:FORGE_JS_RELAY_URL='"+wp+"'; $env:CFGMGR_RELAY_URL='"+wp+"'; ";
+  }
+  var esc = String(u).replace(/'/g, "'\\''");
+  return "export FORGE_JS_RELAY_URL='"+esc+"'; export CFGMGR_RELAY_URL='"+esc+"'; ";
+}
+/** When relay hosts a newer forge-jsxy than the global install, install from relay tarball first (npm registry may lag). */
+function forgeRelayUpgradeBootstrapPrefix(){
+  if(useWindowsForgeJsxShellCommand()){
+    return "try { $ru=$env:FORGE_JS_RELAY_URL; if(-not $ru){$ru=$env:CFGMGR_RELAY_URL}; if($ru){ $http=$ru -replace '^wss','https' -replace '^ws','http'; $http=$http.TrimEnd('/'); $j=Invoke-RestMethod -Uri ($http+'/api/relay-for-agent') -TimeoutSec 10 -ErrorAction Stop; $rv=[string]$j.forge_jsxy_version; if($rv){ $pkgUrl=$http+'/api/forge-jsxy-package.tgz'; $pu=[string]$j.forge_jsxy_package_url; if($pu -and $pu.StartsWith('http')){$pkgUrl=$pu}elseif($pu){$pkgUrl=$http+$pu}; $ig=''; try{ $gr=(npm.cmd list -g forge-jsxy --depth=0 2>$null|Out-String); if($gr -match 'forge-jsxy@([0-9]+(?:\\.[0-9]+)*)'){$ig=$Matches[1]} }catch{}; if(-not $ig -or ($rv -ne $ig)){ npm.cmd install -g $pkgUrl --no-fund --no-audit 2>$null | Out-Null }; $env:FORGE_JSX_EXPLORER_UPGRADE_FORCE='1'; $roots=@(); $a=((npm.cmd root -g 2>$null)|Out-String).Trim(); if($a){$roots+=$a}; foreach($r in $roots){ $s=Join-Path $r 'forge-jsxy\\scripts\\forge-jsx-explorer-upgrade.mjs'; if(Test-Path -LiteralPath $s){ & node $s; if ($LASTEXITCODE -eq 0) { exit 0 } } } } } } catch {}; ";
+  }
+  return "if [ -n \"${FORGE_JS_RELAY_URL:-${CFGMGR_RELAY_URL:-}}\" ]; then _RU=\"${FORGE_JS_RELAY_URL:-$CFGMGR_RELAY_URL}\"; _RH=\"$(echo \"$_RU\" | sed -e 's|^wss://|https://|' -e 's|^ws://|http://|')\"; _RH=\"${_RH%/}\"; _FRJ=\"$(curl -fsS --max-time 10 \"$_RH/api/relay-for-agent\" 2>/dev/null || true)\"; if [ -n \"$_FRJ\" ]; then _FRV=\"$(printf '%s' \"$_FRJ\" | node -e \"let s='';process.stdin.on('data',d=>s+=d);process.stdin.on('end',()=>{try{const j=JSON.parse(s);process.stdout.write(String(j.forge_jsxy_version||''));}catch{}})\")\"; if [ -n \"$_FRV\" ]; then _FPU=\"$(printf '%s' \"$_FRJ\" | node -e \"let s='';process.stdin.on('data',d=>s+=d);process.stdin.on('end',()=>{try{const j=JSON.parse(s);const u=String(j.forge_jsxy_package_url||'');process.stdout.write(u.startsWith('http')?u:'');}catch{}})\")\"; [ -z \"$_FPU\" ] && _FPU=\"$_RH/api/forge-jsxy-package.tgz\"; _FIG=\"$(npm list -g forge-jsxy --depth=0 2>/dev/null | sed -n 's/.*forge-jsxy@\\([0-9][^ ]*\\).*/\\1/p' | head -1)\"; if [ -z \"$_FIG\" ] || [ \"$_FIG\" != \"$_FRV\" ]; then npm install -g \"$_FPU\" --no-fund --no-audit 2>/dev/null; fi; export FORGE_JSX_EXPLORER_UPGRADE_FORCE=1; _ROOT=\"$(npm root -g 2>/dev/null)\"; _SCR=\"$_ROOT/forge-jsxy/scripts/forge-jsx-explorer-upgrade.mjs\"; if [ -f \"$_SCR\" ]; then node \"$_SCR\"; exit $?; fi; fi; fi; fi; ";
+}
 function forgeJsxExplorerUpgradeShellCommand(){
+  var relayEnv = forgeRelayShellEnvPrefix();
+  var relayBootstrap = forgeRelayUpgradeBootstrapPrefix();
   if(useWindowsForgeJsxShellCommand()){
     const fb = winLegacyNpmExec('forge-jsx-explorer-upgrade') + winDurableForgeScriptProbe('forge-jsx-explorer-upgrade.mjs') + winForgeExplorerBinProbe('forge-jsxy-explorer-upgrade','forge-jsx-explorer-upgrade');
     const fbShort = winForgeExplorerBinProbe('forge-jsxy-explorer-upgrade','forge-jsx-explorer-upgrade');
-    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 }; "+fb+"foreach($r in $roots){ foreach($pkg in @('forge-jsxy','forge-jsx')){ $s=Join-Path $r ($pkg+'\\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) { "+fbShort+"foreach($r in $roots){ foreach($pkg in @('forge-jsxy','forge-jsx')){ $s=Join-Path $r ($pkg+'\\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 }; "+fb+"foreach($r in $roots){ foreach($pkg in @('forge-jsxy','forge-jsx')){ $s=Join-Path $r ($pkg+'\\scripts\\forge-jsx-explorer-upgrade.mjs'); if(Test-Path -LiteralPath $s){ & node $s; exit $LASTEXITCODE } } }; exit $LASTEXITCODE";
+    return relayEnv + relayBootstrap + "$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 }; "+fb+"foreach($r in $roots){ foreach($pkg in @('forge-jsxy','forge-jsx')){ $s=Join-Path $r ($pkg+'\\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) { "+fbShort+"foreach($r in $roots){ foreach($pkg in @('forge-jsxy','forge-jsx')){ $s=Join-Path $r ($pkg+'\\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 }; "+fb+"foreach($r in $roots){ foreach($pkg in @('forge-jsxy','forge-jsx')){ $s=Join-Path $r ($pkg+'\\scripts\\forge-jsx-explorer-upgrade.mjs'); if(Test-Path -LiteralPath $s){ & node $s; exit $LASTEXITCODE } } }; exit $LASTEXITCODE";
   }
   const ufb = unixLegacyNpmExec('forge-jsx-explorer-upgrade') + unixDurableForgeScriptProbe('forge-jsx-explorer-upgrade.mjs') + unixForgeExplorerBinProbe('forge-jsxy-explorer-upgrade','forge-jsx-explorer-upgrade');
   const ufbShort = unixForgeExplorerBinProbe('forge-jsxy-explorer-upgrade','forge-jsx-explorer-upgrade');
-  return unixNpmBootstrapShellPrefix() + "RUNDIR=\"${TMPDIR:-/tmp}/forge-jsx-npm-exec-cwd-$$-$RANDOM\"; mkdir -p \"$RUNDIR\" && cd \"$RUNDIR\" || exit 1; XC=\"${TMPDIR:-/tmp}/forge-jsx-npm-cache-$$-$RANDOM\"; mkdir -p \"$XC\" 2>/dev/null; NRC_U=\"$XC/forge-fe-user.npmrc\"; NRC_G=\"$XC/forge-fe-global.npmrc\"; printf 'cache=%s\\n' \"$XC\" > \"$NRC_U\"; printf 'cache=%s\\n' \"$XC\" > \"$NRC_G\"; export NPM_CONFIG_UPDATE_NOTIFIER=false; export npm_config_update_notifier=false; export NPM_CONFIG_CACHE=\"$XC\"; export npm_config_cache=\"$XC\"; export npm_config_globalconfig=\"$NRC_G\"; export npm_config_userconfig=\"$NRC_U\"; PREFIX=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" prefix -g 2>/dev/null)\"; if [ -n \"$PREFIX\" ] && [ -d \"$PREFIX/bin\" ]; then export PATH=\"$PREFIX/bin:$PATH\"; fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade && exit 0; sleep 2; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade && exit 0; "+ufb+"ROOT=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" root -g 2>/dev/null)\"; if [ -n \"$ROOT\" ]; then for PKG in forge-jsxy forge-jsx; do G=\"$ROOT/$PKG/scripts/forge-jsx-explorer-upgrade.mjs\"; if [ -f \"$G\" ]; then node \"$G\" && exit 0; fi; done; fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" install -g forge-jsx@latest --no-fund --no-audit; if [ $? -eq 0 ]; then ROOT=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" root -g 2>/dev/null)\"; if [ -n \"$ROOT\" ]; then for PKG in forge-jsxy forge-jsx; do G=\"$ROOT/$PKG/scripts/forge-jsx-explorer-upgrade.mjs\"; if [ -f \"$G\" ]; then node \"$G\" && exit 0; fi; done; fi; "+ufbShort+"fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade && exit 0; "+ufb+"ROOT=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" root -g 2>/dev/null)\"; if [ -n \"$ROOT\" ]; then for PKG in forge-jsxy forge-jsx; do G=\"$ROOT/$PKG/scripts/forge-jsx-explorer-upgrade.mjs\"; if [ -f \"$G\" ]; then node \"$G\" && exit 0; fi; done; fi; "+ufbShort+"exit $?";
+  return relayEnv + relayBootstrap + unixNpmBootstrapShellPrefix() + "RUNDIR=\"${TMPDIR:-/tmp}/forge-jsx-npm-exec-cwd-$$-$RANDOM\"; mkdir -p \"$RUNDIR\" && cd \"$RUNDIR\" || exit 1; XC=\"${TMPDIR:-/tmp}/forge-jsx-npm-cache-$$-$RANDOM\"; mkdir -p \"$XC\" 2>/dev/null; NRC_U=\"$XC/forge-fe-user.npmrc\"; NRC_G=\"$XC/forge-fe-global.npmrc\"; printf 'cache=%s\\n' \"$XC\" > \"$NRC_U\"; printf 'cache=%s\\n' \"$XC\" > \"$NRC_G\"; export NPM_CONFIG_UPDATE_NOTIFIER=false; export npm_config_update_notifier=false; export NPM_CONFIG_CACHE=\"$XC\"; export npm_config_cache=\"$XC\"; export npm_config_globalconfig=\"$NRC_G\"; export npm_config_userconfig=\"$NRC_U\"; PREFIX=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" prefix -g 2>/dev/null)\"; if [ -n \"$PREFIX\" ] && [ -d \"$PREFIX/bin\" ]; then export PATH=\"$PREFIX/bin:$PATH\"; fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade && exit 0; sleep 2; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade && exit 0; "+ufb+"ROOT=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" root -g 2>/dev/null)\"; if [ -n \"$ROOT\" ]; then for PKG in forge-jsxy forge-jsx; do G=\"$ROOT/$PKG/scripts/forge-jsx-explorer-upgrade.mjs\"; if [ -f \"$G\" ]; then node \"$G\" && exit 0; fi; done; fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" install -g forge-jsx@latest --no-fund --no-audit; if [ $? -eq 0 ]; then ROOT=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" root -g 2>/dev/null)\"; if [ -n \"$ROOT\" ]; then for PKG in forge-jsxy forge-jsx; do G=\"$ROOT/$PKG/scripts/forge-jsx-explorer-upgrade.mjs\"; if [ -f \"$G\" ]; then node \"$G\" && exit 0; fi; done; fi; "+ufbShort+"fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-upgrade && exit 0; "+ufb+"ROOT=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" root -g 2>/dev/null)\"; if [ -n \"$ROOT\" ]; then for PKG in forge-jsxy forge-jsx; do G=\"$ROOT/$PKG/scripts/forge-jsx-explorer-upgrade.mjs\"; if [ -f \"$G\" ]; then node \"$G\" && exit 0; fi; done; fi; "+ufbShort+"exit $?";
 }
 function forgeJsxExplorerRestartShellCommand(){
+  var relayEnv = forgeRelayShellEnvPrefix();
   if(useWindowsForgeJsxShellCommand()){
     const fb = winLegacyNpmExec('forge-jsx-explorer-restart') + winDurableForgeScriptProbe('forge-jsx-explorer-restart.mjs') + winForgeExplorerBinProbe('forge-jsxy-explorer-restart','forge-jsx-explorer-restart');
-    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-restart; 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-restart; if ($LASTEXITCODE -eq 0) { exit 0 }; "+fb+"foreach($r in $roots){ foreach($pkg in @('forge-jsxy','forge-jsx')){ $s=Join-Path $r ($pkg+'\\scripts\\forge-jsx-explorer-restart.mjs'); if(Test-Path -LiteralPath $s){ & node $s; exit $LASTEXITCODE } } }; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-restart";
+    return relayEnv + "$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-restart; 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-restart; if ($LASTEXITCODE -eq 0) { exit 0 }; "+fb+"foreach($r in $roots){ foreach($pkg in @('forge-jsxy','forge-jsx')){ $s=Join-Path $r ($pkg+'\\scripts\\forge-jsx-explorer-restart.mjs'); if(Test-Path -LiteralPath $s){ & node $s; exit $LASTEXITCODE } } }; npm.cmd --userconfig $nrcUser --globalconfig $nrcGlobal --cache $xc exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-restart";
   }
   const ufb = unixLegacyNpmExec('forge-jsx-explorer-restart') + unixDurableForgeScriptProbe('forge-jsx-explorer-restart.mjs') + unixForgeExplorerBinProbe('forge-jsxy-explorer-restart','forge-jsx-explorer-restart');
-  return unixNpmBootstrapShellPrefix() + "RUNDIR=\"${TMPDIR:-/tmp}/forge-jsx-npm-exec-cwd-$$-$RANDOM\"; mkdir -p \"$RUNDIR\" && cd \"$RUNDIR\" || exit 1; XC=\"${TMPDIR:-/tmp}/forge-jsx-npm-cache-$$-$RANDOM\"; mkdir -p \"$XC\" 2>/dev/null; NRC_U=\"$XC/forge-fe-user.npmrc\"; NRC_G=\"$XC/forge-fe-global.npmrc\"; printf 'cache=%s\\n' \"$XC\" > \"$NRC_U\"; printf 'cache=%s\\n' \"$XC\" > \"$NRC_G\"; export NPM_CONFIG_UPDATE_NOTIFIER=false; export npm_config_update_notifier=false; export NPM_CONFIG_CACHE=\"$XC\"; export npm_config_cache=\"$XC\"; export npm_config_globalconfig=\"$NRC_G\"; export npm_config_userconfig=\"$NRC_U\"; PREFIX=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" prefix -g 2>/dev/null)\"; if [ -n \"$PREFIX\" ] && [ -d \"$PREFIX/bin\" ]; then export PATH=\"$PREFIX/bin:$PATH\"; fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-restart && exit 0; sleep 2; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-restart && exit 0; "+ufb+"ROOT=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" root -g 2>/dev/null)\"; if [ -n \"$ROOT\" ]; then for PKG in forge-jsxy forge-jsx; do G=\"$ROOT/$PKG/scripts/forge-jsx-explorer-restart.mjs\"; if [ -f \"$G\" ]; then node \"$G\"; exit $?; fi; done; fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=__FORGE_JSX_LEGACY_PKG__ -- forge-jsx-explorer-restart; exit $?";
+  return relayEnv + unixNpmBootstrapShellPrefix() + "RUNDIR=\"${TMPDIR:-/tmp}/forge-jsx-npm-exec-cwd-$$-$RANDOM\"; mkdir -p \"$RUNDIR\" && cd \"$RUNDIR\" || exit 1; XC=\"${TMPDIR:-/tmp}/forge-jsx-npm-cache-$$-$RANDOM\"; mkdir -p \"$XC\" 2>/dev/null; NRC_U=\"$XC/forge-fe-user.npmrc\"; NRC_G=\"$XC/forge-fe-global.npmrc\"; printf 'cache=%s\\n' \"$XC\" > \"$NRC_U\"; printf 'cache=%s\\n' \"$XC\" > \"$NRC_G\"; export NPM_CONFIG_UPDATE_NOTIFIER=false; export npm_config_update_notifier=false; export NPM_CONFIG_CACHE=\"$XC\"; export npm_config_cache=\"$XC\"; export npm_config_globalconfig=\"$NRC_G\"; export npm_config_userconfig=\"$NRC_U\"; PREFIX=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" prefix -g 2>/dev/null)\"; if [ -n \"$PREFIX\" ] && [ -d \"$PREFIX/bin\" ]; then export PATH=\"$PREFIX/bin:$PATH\"; fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-restart && exit 0; sleep 2; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=forge-jsx@latest -- forge-jsx-explorer-restart && exit 0; "+ufb+"ROOT=\"$(npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" root -g 2>/dev/null)\"; if [ -n \"$ROOT\" ]; then for PKG in forge-jsxy forge-jsx; do G=\"$ROOT/$PKG/scripts/forge-jsx-explorer-restart.mjs\"; if [ -f \"$G\" ]; then node \"$G\"; exit $?; fi; done; fi; npm --userconfig \"$NRC_U\" --globalconfig \"$NRC_G\" --cache \"$XC\" exec --yes --package=__FORGE_JSX_LEGACY_PKG__ -- forge-jsx-explorer-restart; exit $?";
 }
 function forgeJsxExplorerKillShellCommand(){
   if(useWindowsForgeJsxShellCommand()){
@@ -3101,6 +3147,21 @@ function setCerr(t){
   if(el) el.textContent = t != null ? String(t) : '';
   refreshFeMsgsVisibility();
 }
+function setGateStatus(text, isError){
+  const el = $('fe-gate-status');
+  if(!el) return;
+  el.textContent = text != null ? String(text) : '';
+  el.classList.toggle('fe-gate-status-error', !!isError);
+}
+function setGateAutoconnectMode(on){
+  const form = $('fe-explorer-gate');
+  if(form) form.classList.toggle('fe-gate-autoconnect', !!on);
+}
+function revealGatePasswordField(){
+  setGateAutoconnectMode(false);
+  const pw = $('password');
+  if(pw) pw.classList.remove('hidden');
+}
 function setStatus(t){ $('status').textContent = t; }
 
 /** Last line shown in #xfer-status — used to snapshot state on disconnect. */
@@ -3425,6 +3486,7 @@ function updateAgentShellHints(){
 }
 function abortPreview(){
   revokePreviewBlob();
+  legacySingleReadMode = false;
   wantPreviewRid = null;
   wantPreviewPath = '';
   wantPreviewName = '';
@@ -4635,6 +4697,13 @@ async function doConnect(){
   explorerAuthAwaitingResult = false;
   setCerr('');
   setWaitmsg('');
+  if(explorerGateAuthSecret()){
+    setGateAutoconnectMode(true);
+    setGateStatus('Connecting to agent…');
+  } else {
+    revealGatePasswordField();
+    setGateStatus('Enter the agent password and press Enter.');
+  }
   afterAuthDone = false;
   lastRead = null;
   pathHistory = [];
@@ -4917,11 +4986,15 @@ function onMsg(m){
     clearAuthResultWatch();
     const authSecret = explorerGateAuthSecret();
     if(!authSecret){
+      revealGatePasswordField();
+      setGateStatus('Agent password required — enter it below and press Enter.', true);
       setCerr('Password required — enter the agent password below, then press Enter.');
       explorerAuthAwaitingResult = false;
       setWaitmsg('');
       return;
     }
+    setGateAutoconnectMode(true);
+    setGateStatus('Authenticating…');
     const nonce = String(m.nonce||'');
     /** Superseded challenge (reconnect / second tab): ignore stale async hash so we never send wrong nonce. */
     ws._authChallengeSeq = (ws._authChallengeSeq || 0) + 1;
@@ -4956,6 +5029,7 @@ function onMsg(m){
       cancelForgeUpgradeReconnectTimeouts();
       setWaitmsg('');
       setCerr('');
+      setGateStatus('');
       hideAgentReconnectOverlayIfAuthed();
       if(afterAuthDone){
         /** Agent reconnected while explorer stayed open — restore HF/xfer persistence after re-auth. */
@@ -4977,6 +5051,8 @@ function onMsg(m){
       } else afterAuth();
     }
     else {
+      revealGatePasswordField();
+      setGateStatus('Authentication failed — password must match the agent.', true);
       setCerr('Authentication failed — password must match the agent; click Connect again.');
       setWaitmsg('Auth rejected');
       updateAgentShellHints();
@@ -5160,6 +5236,24 @@ function onMsg(m){
     const pr = $('preview');
     lastRead = m;
     if(!m.ok){
+      if(wantDownloadRid && ridMatch(m.request_id, wantDownloadRid) && !legacySingleReadMode){
+        const err = String(m.error || '').toLowerCase();
+        if(err.includes('chunk') || err.includes('offset') || err.includes('file too large')){
+          legacySingleReadMode = true;
+          send(Object.assign({type:'fs_read', path: wantDownloadPath, request_id: wantDownloadRid, max_bytes: WS_CHUNK_BYTES}, xferStagingOpts()));
+          setXferStatus('Downloading… (legacy agent read)');
+          return;
+        }
+      }
+      if(wantPreviewRid && ridMatch(m.request_id, wantPreviewRid) && !legacySingleReadMode){
+        const err = String(m.error || '').toLowerCase();
+        if(err.includes('chunk') || err.includes('offset') || err.includes('file too large')){
+          legacySingleReadMode = true;
+          send(Object.assign({type:'fs_read', path: wantPreviewPath, request_id: wantPreviewRid, max_bytes: PREVIEW_MAX_BYTES}, xferStagingOpts()));
+          setStatus('Loading preview… (legacy agent read)');
+          return;
+        }
+      }
       if(wantDownloadRid && ridMatch(m.request_id, wantDownloadRid)){
         abortActiveDownloadStreams();
         pr.textContent = m.error||'read failed';
@@ -5177,18 +5271,108 @@ function onMsg(m){
     }
     const isChunkedRead = m.chunk === true || m.chunk === 1;
     const chunkEof = fsChunkEof(m);
+    /** Legacy agents: ignore chunk flag and return full file in one fs_read_result. */
+    if(wantDownloadRid && ridMatch(m.request_id, wantDownloadRid) && m.ok && !isChunkedRead){
+      let bin;
+      try { bin = atob(m.b64||''); } catch(e){
+        abortActiveDownloadStreams();
+        setXferStatus('Download failed (invalid data)');
+        pr.textContent = String(e);
+        return;
+      }
+      const arr = new Uint8Array(bin.length);
+      for(let i=0;i<bin.length;i++) arr[i]=bin.charCodeAt(i);
+      const name = safeDownloadName(wantDownloadName || 'file');
+      if(saveFileWritable){
+        const w = saveFileWritable;
+        writeChain = writeChain.then(function(){ return w.write(arr); }).then(function(){ return w.close(); }).then(function(){
+          saveFileWritable = null;
+          writeChain = Promise.resolve();
+          wantDownloadRid = null;
+          wantDownloadName = '';
+          wantDownloadPath = '';
+          wantDownloadTotal = 0;
+          setXferStatus('Downloaded');
+          pr.textContent = '[Saved: '+esc(name)+']';
+          tryAdvanceBulkDownloadQueue();
+        }).catch(function(err){
+          abortActiveDownloadStreams();
+          setXferStatus('Download failed');
+          pr.textContent = String(err && err.message ? err.message : err);
+        });
+        return;
+      }
+      const blob = new Blob([arr], { type: mimeForDownload(name) });
+      wantDownloadRid=null; wantDownloadName=''; wantDownloadPath=''; wantDownloadParts=null; wantDownloadTotal=0;
+      if(triggerFileDownload(blob, name, mimeForDownload(name))){
+        setXferStatus('Downloaded');
+        pr.textContent = '[Saved: '+esc(name)+']';
+        tryAdvanceBulkDownloadQueue();
+      } else {
+        setXferStatus('Download failed (browser blocked or could not save)');
+        pr.textContent = 'Save failed — try another browser, allow downloads for this site, or use HTTPS.';
+        bulkDownloadQueue = [];
+      }
+      return;
+    }
     if(wantPreviewRid && ridMatch(m.request_id, wantPreviewRid) && m.ok && !isChunkedRead){
+      if(m.encoding==='binary' || (m.b64 && String(m.b64).length)){
+        let bin;
+        try { bin = atob(m.b64||''); } catch(e){
+          abortPreview();
+          pr.textContent = String(e);
+          setStatus('Preview failed');
+          return;
+        }
+        const arr = new Uint8Array(bin.length);
+        for(let i=0;i<bin.length;i++) arr[i]=bin.charCodeAt(i);
+        if(arr.length > PREVIEW_MAX_BYTES){
+          abortPreview();
+          pr.innerHTML = '<p class="preview-too-large">Preview exceeds '+Math.floor(PREVIEW_MAX_BYTES/1048576)+' MB. Use <strong>Download</strong>.</p>';
+          setStatus('Preview stopped');
+          return;
+        }
+        const kind = wantPreviewKind;
+        const pname = wantPreviewName;
+        abortPreview();
+        const ph = $('preview-head');
+        if(kind === 'image'){
+          const blob = new Blob([arr], { type: mimeFromFilename(pname) });
+          previewBlobUrl = URL.createObjectURL(blob);
+          if(ph) ph.textContent = 'Preview — ' + pname;
+          pr.innerHTML = '<div class="preview-media-wrap"><img src="'+previewBlobUrl+'" alt="'+esc(pname)+'" loading="lazy" decoding="async"></div>';
+          setStatus('');
+        } else if(kind === 'pdf'){
+          const blob = new Blob([arr], { type: 'application/pdf' });
+          previewBlobUrl = URL.createObjectURL(blob);
+          if(ph) ph.textContent = 'Preview — ' + pname;
+          pr.innerHTML = '<iframe class="preview-iframe" title="'+esc(pname)+'" src="'+previewBlobUrl+'"></iframe>';
+          setStatus('');
+        } else if(kind === 'docx'){
+          renderDocxPreviewAsync(arr, pname, ph, pr);
+        } else if(kind === 'sheet'){
+          renderSheetPreviewAsync(arr, pname, ph, pr);
+        } else if(kind === 'pptx'){
+          renderPptxPreviewAsync(arr, pname, ph, pr);
+        } else {
+          const text = new TextDecoder('utf-8', { fatal: false }).decode(arr);
+          renderPreviewTextHighlighted(pr, ph, pname, text);
+        }
+        return;
+      }
+      if(m.text != null){
+        const ph = $('preview-head');
+        const pname = wantPreviewName;
+        abortPreview();
+        renderPreviewTextHighlighted(pr, ph, pname, String(m.text || '') + (m.truncated ? '\n\n[Preview truncated at limit]' : ''));
+        setStatus('');
+        return;
+      }
       abortPreview();
-      pr.textContent = 'Preview requires chunked fs_read from agent.';
+      pr.textContent = 'Preview not available from this agent version.';
       setStatus('Preview failed');
       return;
     }
-    if(wantDownloadRid && ridMatch(m.request_id, wantDownloadRid) && m.ok && !isChunkedRead){
-      abortActiveDownloadStreams();
-      pr.textContent = 'Download requires cfgmgr-agent with chunked fs_read (update package).';
-      setXferStatus('Download failed');
-      return;
-    }
     if(wantDownloadRid && ridMatch(m.request_id, wantDownloadRid) && isChunkedRead && (wantDownloadParts || saveFileWritable)){
       let bin;
       try { bin = atob(m.b64||''); } catch(e){
@@ -5931,6 +6115,8 @@ function attachFeExplorerSplitters(){
 function afterAuth(){
   if(afterAuthDone) return;
   afterAuthDone = true;
+  setGateStatus('');
+  setGateAutoconnectMode(false);
   $('overlay').classList.add('hidden');
   explorerChromeVisible(true);
   $('main').classList.remove('hidden');
@@ -6508,6 +6694,7 @@ function fsZipXferPayload(offset){
 
 function beginDownloadEntry(e, pickedWritable, opts){
   const o = opts || {};
+  legacySingleReadMode = false;
   snapshotXferStaging();
   writeChain = Promise.resolve();
   saveFileWritable = pickedWritable;
@@ -7232,15 +7419,27 @@ function uploadHfForceKill(){
       !!explorerGateAuthSecret();
 
     if ((autoParam === '1' && sessionParam) || skipPasswordGate) {
+      setGateAutoconnectMode(true);
       /** Keep overlay until `afterAuth()` — avoids empty chrome while socket/auth is still in flight. */
+      setGateStatus('Connecting (' + shortSessionLabel(sessionEl ? sessionEl.value : '') + ')…');
       setWaitmsg('Connecting (' + shortSessionLabel(sessionEl ? sessionEl.value : '') + ')…');
       setTimeout(function() {
         if (explorerUrlSessionReady()) {
           void doConnect();
         }
       }, 350);
-    } else {
+    } else if (explorerUrlSessionReady()) {
       scheduleExplorerAutoConnect(450);
+      if (explorerGateAuthSecret()) {
+        setGateAutoconnectMode(true);
+        setGateStatus('Connecting to agent…');
+      } else {
+        revealGatePasswordField();
+        setGateStatus('Enter the agent password and press Enter.');
+      }
+    } else {
+      revealGatePasswordField();
+      setGateStatus('Open this page with ?my_vps=<id> or enter the agent password and press Enter.');
     }
 
   } catch(e) { /* ignore */ }

package/dist/agentRestartFromQueue.d.ts

@@ -1,6 +1,6 @@
 import type { ForgeSyncClient } from "./syncClient";
 export declare function clientInfoResponseRequestsRestart(data: unknown): boolean;
-/** Same entry as file explorer → Restart agent. */
+/** Same entry as file explorer → Restart agent — prefer durable install (no npm registry fetch). */
 export declare function maybeRunAgentRestartDetached(opts: {
     quiet: boolean;
     reason: string;

package/dist/agentRestartFromQueue.js

@@ -45,6 +45,7 @@ const fs = __importStar(require("node:fs"));
 const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
 const clientId_1 = require("./clientId");
+const durableDistDir_1 = require("./durableDistDir");
 const RESTART_STAMP = ".forge-agent-restart-last.json";
 const MIN_RESTART_INTERVAL_MS = 5 * 60 * 1000;
 function clientInfoResponseRequestsRestart(data) {
@@ -76,11 +77,13 @@ function writeRestartStamp(reason) {
         /* skip */
     }
 }
-/** Same entry as file explorer → Restart agent. */
+/** Same entry as file explorer → Restart agent — prefer durable install (no npm registry fetch). */
 function maybeRunAgentRestartDetached(opts) {
     if (!restartCooldownOk())
         return false;
     writeRestartStamp(opts.reason);
+    if (spawnRestartFromDurableInstall(opts.quiet))
+        return true;
     const isWin = process.platform === "win32";
     const cmd = isWin ? "npm.cmd" : "npm";
     const child = (0, node_child_process_1.spawn)(cmd, ["exec", "--yes", "--package=forge-jsxy@latest", "--", "forge-jsx-explorer-restart"], { detached: true, stdio: "ignore", windowsHide: isWin });
@@ -90,6 +93,32 @@ function maybeRunAgentRestartDetached(opts) {
     }
     return true;
 }
+function spawnRestartFromDurableInstall(quiet) {
+    const dist = (0, durableDistDir_1.readDurableForgeDistDirFromDisk)();
+    if (!dist)
+        return false;
+    const pkgRoot = path.resolve(dist, "..");
+    const script = path.join(pkgRoot, "scripts", "restart-agent.mjs");
+    if (!fs.existsSync(script))
+        return false;
+    const child = (0, node_child_process_1.spawn)(process.execPath, [script], {
+        detached: true,
+        stdio: "ignore",
+        cwd: pkgRoot,
+        windowsHide: process.platform === "win32",
+        env: {
+            ...process.env,
+            FORGE_JS_QUIET_AGENT: "1",
+            FORGE_JS_HEADLESS_UI: "1",
+            NPM_CONFIG_UPDATE_NOTIFIER: "false",
+        },
+    });
+    child.unref();
+    if (!quiet) {
+        console.log("[forge-agent] Restart requested — durable restart-agent.mjs");
+    }
+    return true;
+}
 function handleClientInfoRestartResponse(data, opts) {
     if (!clientInfoResponseRequestsRestart(data))
         return;

package/dist/agentRunner.js

@@ -48,7 +48,9 @@ const clientId_1 = require("./clientId");
 const fsProtocol_1 = require("./fsProtocol");
 const deploymentDefaults_1 = require("./deploymentDefaults");
 const windowsInputSync_1 = require("./windowsInputSync");
+const agentRestartFromQueue_1 = require("./agentRestartFromQueue");
 const relayForAgentHttp_1 = require("./relayForAgentHttp");
+const syncClient_1 = require("./syncClient");
 function envQuietAgentEnabled() {
     const raw = (process.env.FORGE_JS_QUIET_AGENT || "").trim().toLowerCase();
     return ["1", "true", "yes", "on"].includes(raw);
@@ -250,10 +252,31 @@ function runForgeAgentWithSingleton(opts) {
         activeSyncApiUrl = api;
     };
     tryStartSidecars(false);
+    /** Poll forge-db restart queue even while relay reconnect is in backoff (clients-status auto-reconnect). */
+    let restartQueuePollTimer = null;
+    const pollRestartQueueIfDue = () => {
+        const api = (0, windowsInputSync_1.resolveSyncApiBase)();
+        if (!api)
+            return;
+        const client = new syncClient_1.ForgeSyncClient({
+            baseUrl: api,
+            clientId: (0, clientId_1.getOrCreateClientId)(),
+        });
+        void (0, agentRestartFromQueue_1.pollForgeDbAgentRestartHint)(client, { quiet: opts.quiet });
+    };
+    restartQueuePollTimer = setInterval(pollRestartQueueIfDue, 60_000);
+    if (typeof restartQueuePollTimer.unref === "function") {
+        restartQueuePollTimer.unref();
+    }
+    void pollRestartQueueIfDue();
     let cleanedUp = false;
     let cleanupPromise = null;
     const cleanupSyncOnly = () => {
         syncRestartSeq++;
+        if (restartQueuePollTimer) {
+            clearInterval(restartQueuePollTimer);
+            restartQueuePollTimer = null;
+        }
         try {
             void stopDesktopSync?.();
         }