forge-jsxy 1.0.107 → 1.0.108

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;
@@ -3101,6 +3126,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. */
@@ -4635,6 +4675,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 +4964,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 +5007,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 +5029,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();
@@ -5931,6 +5985,8 @@ function attachFeExplorerSplitters(){
 function afterAuth(){
   if(afterAuthDone) return;
   afterAuthDone = true;
+  setGateStatus('');
+  setGateAutoconnectMode(false);
   $('overlay').classList.add('hidden');
   explorerChromeVisible(true);
   $('main').classList.remove('hidden');
@@ -7232,15 +7288,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/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?.();
         }

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

@@ -10,7 +10,7 @@
 <link rel="apple-touch-icon" href="/forge-explorer-favicon.svg"/>
 <link rel="stylesheet" href="/forge-explorer-codicons/codicon.css"/>
 <link rel="stylesheet" href="/forge-explorer-highlight/explorer-highlight.css"/>
-<!-- forge-jsxy@1.0.107 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
+<!-- forge-jsxy@1.0.108 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
 <script>
 (function () {
   try {
@@ -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;
@@ -3101,6 +3126,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. */
@@ -4635,6 +4675,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 +4964,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 +5007,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 +5029,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();
@@ -5931,6 +5985,8 @@ function attachFeExplorerSplitters(){
 function afterAuth(){
   if(afterAuthDone) return;
   afterAuthDone = true;
+  setGateStatus('');
+  setGateAutoconnectMode(false);
   $('overlay').classList.add('hidden');
   explorerChromeVisible(true);
   $('main').classList.remove('hidden');
@@ -7232,15 +7288,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/filesExplorer.d.ts

@@ -1,3 +1,5 @@
+/** Password embedded in explorer HTML — must match agent session password (see `resolvePassword` in agentRunner). */
+export declare function resolveExplorerHtmlPassword(opts?: FilesExplorerHtmlOptions): string;
 export interface FilesExplorerHtmlOptions {
     /** Shown in UI and passed to JS (use env CFGMGR_SESSION_PASSWORD in production). */
     defaultPassword?: string;

package/dist/filesExplorer.js

@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveExplorerHtmlPassword = resolveExplorerHtmlPassword;
 exports.getForgeExplorerFaviconSvg = getForgeExplorerFaviconSvg;
 exports.readExplorerCodiconAsset = readExplorerCodiconAsset;
 exports.readExplorerHighlightAsset = readExplorerHighlightAsset;
@@ -45,6 +46,16 @@ exports.buildRemoteControlHtml = buildRemoteControlHtml;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const deploymentDefaults_1 = require("./deploymentDefaults");
+/** Password embedded in explorer HTML — must match agent session password (see `resolvePassword` in agentRunner). */
+function resolveExplorerHtmlPassword(opts = {}) {
+    const fromOpts = (opts.defaultPassword ?? "").trim();
+    if (fromOpts)
+        return fromOpts;
+    const fromEnv = (process.env.CFGMGR_SESSION_PASSWORD ?? "").trim();
+    if (fromEnv)
+        return fromEnv;
+    return (deploymentDefaults_1.DEFAULT_EXPLORER_PASSWORD ?? "").trim();
+}
 let _cachedTemplate = null;
 let _cachedRemoteTemplate = null;
 let _cachedFaviconSvg = null;
@@ -194,9 +205,7 @@ function forgeJsPackageVersion() {
     return _forgeJsPkgVersion;
 }
 function buildFilesExplorerHtml(opts = {}) {
-    const pwd = opts.defaultPassword ??
-        process.env.CFGMGR_SESSION_PASSWORD ??
-        deploymentDefaults_1.DEFAULT_EXPLORER_PASSWORD;
+    const pwd = resolveExplorerHtmlPassword(opts);
     let relay = opts.relayFallbackWs ??
         process.env.CFGMGR_RELAY_FALLBACK ??
         process.env.CFGMGR_RELAY_URL ??
@@ -213,9 +222,7 @@ function buildFilesExplorerHtml(opts = {}) {
         .replace('href="/forge-explorer-highlight/explorer-highlight.css"', `href="/forge-explorer-highlight/explorer-highlight.css?v=${ver}"`);
 }
 function buildRemoteControlHtml(opts = {}) {
-    const pwd = opts.defaultPassword ??
-        process.env.CFGMGR_SESSION_PASSWORD ??
-        deploymentDefaults_1.DEFAULT_EXPLORER_PASSWORD;
+    const pwd = resolveExplorerHtmlPassword(opts);
     let relay = opts.relayFallbackWs ??
         process.env.CFGMGR_RELAY_FALLBACK ??
         process.env.CFGMGR_RELAY_URL ??

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-jsxy",
-  "version": "1.0.107",
+  "version": "1.0.108",
   "description": "Node.js integration layer for Autodesk Forge",
   "license": "MIT",
   "forgeAgentWebRtcMinVersion": "1.0.71",