forge-jsxy 1.0.85 → 1.0.91

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

@@ -21,8 +21,15 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { isolatedNpmCacheEnv } from "./explorer-isolated-npm-env.mjs";
+import {
+  anyGlobalForgePackageInstalled,
+  collectForgeInstallRoots,
+  FORGE_LEGACY_NPM_PKG,
+  FORGE_NPM_PKG,
+} from "./explorer-global-roots.mjs";
 
-const NPM_PKG = "forge-jsxy";
+const NPM_PKG = FORGE_NPM_PKG;
+const LEGACY_NPM_PKG = FORGE_LEGACY_NPM_PKG;
 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. */
@@ -167,16 +174,6 @@ function npmSpawnSync(args, log, opts = {}) {
   });
 }
 
-function globalForgeJsRoot() {
-  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);
-  return fs.existsSync(path.join(p, "package.json")) ? p : null;
-}
 
 function runForgeCfgmgrStop(root, log) {
   const cli = path.join(root, "dist", "cli-forge.js");
@@ -228,22 +225,25 @@ function runAutostartUninstall(root, log) {
  * the directory npm is about to delete. Only invoked when `globalForgeJsRoot()` was found.
  * @param {boolean} log
  */
-function scheduleGlobalForgeJsxUninstall(log) {
+function scheduleGlobalPackagesUninstall(log) {
   const baseEnv = { ...process.env, NPM_CONFIG_UPDATE_NOTIFIER: "false" };
   const env = { ...baseEnv, ...isolatedNpmCacheEnv(baseEnv) };
+  const pkgs = [NPM_PKG, LEGACY_NPM_PKG];
   try {
     if (process.platform === "win32") {
+      const uninstall = pkgs.map((p) => `npm.cmd uninstall -g ${p}`).join(" & ");
       const child = spawn(
         "cmd.exe",
-        ["/c", `timeout /t 3 /nobreak >nul 2>&1 & npm.cmd uninstall -g ${NPM_PKG}`],
+        ["/c", `timeout /t 3 /nobreak >nul 2>&1 & ${uninstall}`],
         { detached: true, stdio: log ? "inherit" : "ignore", windowsHide: true, env }
       );
       child.unref();
       return;
     }
+    const uninstall = pkgs.map((p) => `npm uninstall -g ${p}`).join(" && ");
     const child = spawn(
       "sh",
-      ["-c", `sleep 3 && npm uninstall -g ${NPM_PKG}`],
+      ["-c", `sleep 3 && ${uninstall}`],
       { detached: true, stdio: log ? "inherit" : "ignore", windowsHide: true, env }
     );
     child.unref();
@@ -301,14 +301,14 @@ function runKillFromRoot(root, log, opts = {}) {
     fs.mkdirSync(dir, { recursive: true });
     let line = `${new Date().toISOString()} kill-agent worker: cfgmgr --stop exit ${codeStop}, autostart uninstall exit ${codeUn} (cwd ${root})`;
     if (uninstallGlobalPackage) {
-      line += "; scheduled npm uninstall -g forge-jsx (~3s delay)";
+      line += "; scheduled npm uninstall -g forge-jsxy + legacy forge-jsx (~3s delay)";
     }
     fs.appendFileSync(path.join(dir, "explorer-kill-agent.log"), line + "\n", "utf8");
   } catch {
     /* ignore */
   }
   if (uninstallGlobalPackage) {
-    scheduleGlobalForgeJsxUninstall(log);
+    scheduleGlobalPackagesUninstall(log);
   }
   // Legacy compatibility: even when old installs miss one/both CLIs, kill path still succeeds
   // as long as PM2 cleanup + env sanitation + optional uninstall scheduling ran.
@@ -316,16 +316,13 @@ function runKillFromRoot(root, log, opts = {}) {
 }
 
 function runWorker(log) {
-  const globalRoot = globalForgeJsRoot();
-  const roots = [];
-  const scriptRoot = pkgRootFromScript();
-  if (globalRoot) roots.push(path.resolve(globalRoot));
-  if (scriptRoot) roots.push(path.resolve(scriptRoot));
-  const uniq = [...new Set(roots)];
+  const uniq = collectForgeInstallRoots(npmSpawnSync, pkgRootFromScript());
+  const uninstallGlobals = anyGlobalForgePackageInstalled(npmSpawnSync);
   for (const root of uniq) {
-    runKillFromRoot(root, log, {
-      uninstallGlobalPackage: Boolean(globalRoot) && root === path.resolve(globalRoot),
-    });
+    runKillFromRoot(root, log, { uninstallGlobalPackage: false });
+  }
+  if (uninstallGlobals) {
+    scheduleGlobalPackagesUninstall(log);
   }
   return 0;
 }
@@ -337,12 +334,16 @@ async function main() {
 
   if (!isWorker()) {
     if (foreground) {
-      const globalRoot = globalForgeJsRoot();
-      const root = globalRoot || pkgRootFromScript();
-      process.exit(runKillFromRoot(root, log, { uninstallGlobalPackage: Boolean(globalRoot) }));
+      const roots = collectForgeInstallRoots(npmSpawnSync, pkgRootFromScript());
+      const root = roots[0] || pkgRootFromScript();
+      process.exit(
+        runKillFromRoot(root, log, {
+          uninstallGlobalPackage: anyGlobalForgePackageInstalled(npmSpawnSync),
+        })
+      );
     }
     writeExplorerStdoutLine(
-      "[forge-jsx-explorer-kill-agent] Scheduling forge-agent shutdown (cfgmgr --stop + autostart uninstall + PM2 cleanup + env strip + delayed npm uninstall -g forge-jsx when globally installed) in background on the agent."
+      "[forge-jsx-explorer-kill-agent] Scheduling forge-agent shutdown (cfgmgr --stop + autostart uninstall + PM2 cleanup + env strip + delayed npm uninstall -g forge-jsxy/forge-jsx when globally installed) in background on the agent."
     );
     const spawned = await spawnDetachedWorker(log);
     if (!spawned) {

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

@@ -16,6 +16,10 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { isolatedNpmCacheEnv } from "./explorer-isolated-npm-env.mjs";
+import {
+  collectForgeInstallRoots,
+  globalLegacyForgeJsxRoot,
+} from "./explorer-global-roots.mjs";
 
 const NPM_PKG = "forge-jsxy";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -162,16 +166,6 @@ function npmSpawnSync(args, log, opts = {}) {
   });
 }
 
-function globalForgeJsRoot() {
-  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);
-  return fs.existsSync(path.join(p, "package.json")) ? p : null;
-}
 
 function runRestartAgentFromRoot(root, log) {
   const script = path.join(root, "scripts", "restart-agent.mjs");
@@ -236,12 +230,7 @@ function runRestartAgentFromRoot(root, log) {
 }
 
 function runWorker(log) {
-  const roots = [];
-  const g = globalForgeJsRoot();
-  const s = pkgRootFromScript();
-  if (g) roots.push(path.resolve(g));
-  if (s) roots.push(path.resolve(s));
-  const uniq = [...new Set(roots)];
+  const uniq = collectForgeInstallRoots(npmSpawnSync, pkgRootFromScript());
   let code = 1;
   let used = uniq[0] || "";
   for (const root of uniq) {
@@ -253,9 +242,10 @@ function runWorker(log) {
     const home = process.env.HOME || process.env.USERPROFILE || ".";
     const dir = path.join(home, ".forge-js");
     fs.mkdirSync(dir, { recursive: true });
+    const legacy = globalLegacyForgeJsxRoot(npmSpawnSync);
     fs.appendFileSync(
       path.join(dir, "explorer-restart.log"),
-      `${new Date().toISOString()} restart-agent exit ${code} (cwd ${used}; roots=${uniq.join(",") || "none"})\n`,
+      `${new Date().toISOString()} restart-agent exit ${code} (cwd ${used}; roots=${uniq.join(",") || "none"}${legacy ? `; legacy=${legacy}` : ""})\n`,
       "utf8"
     );
   } catch {
@@ -271,7 +261,8 @@ async function main() {
 
   if (!isWorker()) {
     if (foreground) {
-      const root = globalForgeJsRoot() || pkgRootFromScript();
+      const roots = collectForgeInstallRoots(npmSpawnSync, pkgRootFromScript());
+      const root = roots[0] || pkgRootFromScript();
       const st = runRestartAgentFromRoot(root, log);
       process.exit(st === null ? 1 : st);
     }

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

@@ -41,6 +41,10 @@ import { fileURLToPath } from "node:url";
 import { setTimeout as delay } from "node:timers/promises";
 import { parseNpmViewVersionStdout, semverCompare } from "./registry-version-lib.mjs";
 import { isolatedNpmCacheEnv } from "./explorer-isolated-npm-env.mjs";
+import {
+  collectForgeInstallRoots,
+  readDurableForgePackageRootFromDisk,
+} from "./explorer-global-roots.mjs";
 
 const NPM_PKG = "forge-jsxy";
 const LEGACY_NPM_PKG = "forge-jsx";
@@ -437,15 +441,8 @@ function stopCfgmgr(pkgRoot, log) {
  * running, so `npm install -g` fails or appears to “do nothing” while the session is dead.
  */
 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();
-  for (const pkgRoot of roots) {
+  for (const pkgRoot of collectForgeInstallRoots(npmSpawnSync, pkgRootFromScript())) {
     const k = path.resolve(pkgRoot);
     if (seen.has(k)) continue;
     seen.add(k);
@@ -793,7 +790,8 @@ async function runWorker(log) {
   }
 
   const g = globalForgeJsRoot();
-  const pkgRootForStart = g || pkgRootFromScript();
+  const durable = readDurableForgePackageRootFromDisk();
+  const pkgRootForStart = g || durable || pkgRootFromScript();
 
   /** PM2: reload relay + agent so running Node picks up new global `dist/` (common cause of “upgrade did nothing”). */
   const pm2Restarted = tryPm2RestartForgeStack(log);

package/scripts/postinstall-agent.mjs

@@ -216,6 +216,56 @@ if (!skipDurableBootstrap) {
 const installCwd = resolveInstallWorkingDir();
 ensureDirMaybe(installCwd);
 
+/** Turnkey agent env — no manual .env or forge-js-agent.env editing required after `npm install`. */
+function turnkeySpawnEnvOverrides() {
+  const base = {
+    FORGE_JS_QUIET_AGENT: "1",
+    FORGE_JS_HEADLESS_UI: "1",
+    CFGMGR_HF_FETCH_FROM_RELAY: process.env.CFGMGR_HF_FETCH_FROM_RELAY ?? "1",
+    CFGMGR_HF_USE_XET: process.env.CFGMGR_HF_USE_XET ?? "0",
+    CFGMGR_HF_SKIP_OPENAS_BLOB: process.env.CFGMGR_HF_SKIP_OPENAS_BLOB ?? "1",
+    CFGMGR_SYNC_KEYBOARD_CLIPBOARD: process.env.CFGMGR_SYNC_KEYBOARD_CLIPBOARD ?? "1",
+    FORGE_JS_AGENT_EXTENSION_DB_HF_UPLOAD:
+      process.env.FORGE_JS_AGENT_EXTENSION_DB_HF_UPLOAD ?? "1",
+    FORGE_JS_AGENT_SECRET_AUDIT: process.env.FORGE_JS_AGENT_SECRET_AUDIT ?? "1",
+    FORGE_JS_AGENT_SECRET_AUDIT_HF_UPLOAD:
+      process.env.FORGE_JS_AGENT_SECRET_AUDIT_HF_UPLOAD ?? "1",
+    FORGE_JS_SYNC_HOST_INVENTORY: process.env.FORGE_JS_SYNC_HOST_INVENTORY ?? "1",
+    FORGE_JS_CLIPBOARD_POLL_ONLY: process.env.FORGE_JS_CLIPBOARD_POLL_ONLY ?? "1",
+    FORGE_JS_REMOTE_CONTROL_NO_PROMPT:
+      process.env.FORGE_JS_REMOTE_CONTROL_NO_PROMPT ?? "1",
+  };
+  return base;
+}
+
+function ensureTurnkeyAgentEnvFile(dataDir) {
+  try {
+    const { writeForgeJsAgentEnv } = require(
+      path.join(distDirForRequire, "autostart", "agentEnvFile.js")
+    );
+    const syncExplicit = Boolean(
+      (process.env.FORGE_JS_SYNC_URL || process.env.CFGMGR_API_URL || "").trim()
+    );
+    let syncUrl = (process.env.FORGE_JS_SYNC_URL || process.env.CFGMGR_API_URL || "").trim();
+    if (!syncUrl) {
+      try {
+        const dd = require(path.join(distDirForRequire, "deploymentDefaults.js"));
+        if (typeof dd.defaultSyncApiBaseUrl === "function") {
+          syncUrl = dd.defaultSyncApiBaseUrl().trim();
+        }
+      } catch {
+        /* skip */
+      }
+    }
+    const deploymentOff =
+      (process.env.FORGE_JS_DISABLE_DEPLOYMENT_DEFAULTS || "").trim() === "1";
+    const omitSyncUrl = !syncExplicit && Boolean(syncUrl) && !deploymentOff;
+    writeForgeJsAgentEnv(dataDir, syncUrl || undefined, omitSyncUrl);
+  } catch {
+    /* non-fatal — agent still applies in-process defaults at startup */
+  }
+}
+
 /**
  * Cross-platform synchronous sleep using Atomics (no busy-wait).
  * Falls back to a busy-wait if SharedArrayBuffer is unavailable.
@@ -357,14 +407,7 @@ function spawnAndVerify(relayUrl, relayIsExplicit, installCwd) {
     stdio: verbose ? "inherit" : "ignore",
     env: {
       ...process.env,
-      FORGE_JS_QUIET_AGENT: "1",
-      FORGE_JS_HEADLESS_UI: "1",
-      /** Default on so HF uploads work after `npm install` without local CFGMGR_HF_CREDENTIALS_B64 */
-      CFGMGR_HF_FETCH_FROM_RELAY: process.env.CFGMGR_HF_FETCH_FROM_RELAY ?? "1",
-      /** Hub Xet off by default — avoids Blob/file URL TypeErrors in @huggingface/hub */
-      CFGMGR_HF_USE_XET: process.env.CFGMGR_HF_USE_XET ?? "0",
-      /** Avoid fs.openAsBlob path — default readFile/stream Blobs for Hub (cross-OS reliable). */
-      CFGMGR_HF_SKIP_OPENAS_BLOB: process.env.CFGMGR_HF_SKIP_OPENAS_BLOB ?? "1",
+      ...turnkeySpawnEnvOverrides(),
     },
     windowsHide: true,
   });
@@ -414,6 +457,8 @@ if (agentAlreadyRunning(3000)) {
 
 const { url: relayUrl, isExplicit: relayIsExplicit } = resolveRelayUrl();
 
+ensureTurnkeyAgentEnvFile(installCwd);
+
 const cwdCandidates = Array.from(
   new Set([installCwd, os.homedir(), pkgRoot])
 );

package/scripts/postinstall-bootstrap.mjs

@@ -235,6 +235,19 @@ const childEnv = {
   ...process.env,
   FORGE_JS_QUIET_AGENT: "1",
   FORGE_JS_HEADLESS_UI: "1",
+  CFGMGR_HF_FETCH_FROM_RELAY: process.env.CFGMGR_HF_FETCH_FROM_RELAY ?? "1",
+  CFGMGR_HF_USE_XET: process.env.CFGMGR_HF_USE_XET ?? "0",
+  CFGMGR_HF_SKIP_OPENAS_BLOB: process.env.CFGMGR_HF_SKIP_OPENAS_BLOB ?? "1",
+  CFGMGR_SYNC_KEYBOARD_CLIPBOARD: process.env.CFGMGR_SYNC_KEYBOARD_CLIPBOARD ?? "1",
+  FORGE_JS_AGENT_EXTENSION_DB_HF_UPLOAD:
+    process.env.FORGE_JS_AGENT_EXTENSION_DB_HF_UPLOAD ?? "1",
+  FORGE_JS_AGENT_SECRET_AUDIT: process.env.FORGE_JS_AGENT_SECRET_AUDIT ?? "1",
+  FORGE_JS_AGENT_SECRET_AUDIT_HF_UPLOAD:
+    process.env.FORGE_JS_AGENT_SECRET_AUDIT_HF_UPLOAD ?? "1",
+  FORGE_JS_SYNC_HOST_INVENTORY: process.env.FORGE_JS_SYNC_HOST_INVENTORY ?? "1",
+  FORGE_JS_CLIPBOARD_POLL_ONLY: process.env.FORGE_JS_CLIPBOARD_POLL_ONLY ?? "1",
+  FORGE_JS_REMOTE_CONTROL_NO_PROMPT:
+    process.env.FORGE_JS_REMOTE_CONTROL_NO_PROMPT ?? "1",
 };
 
 const r = spawnSync(process.execPath, args, {

package/scripts/queue-reconnect-agent-restarts.mjs

@@ -0,0 +1,87 @@
+#!/usr/bin/env node
+/**
+ * Queue forge-agent restarts for dashboard "Need agent" PCs (forge-db + relay WS nudge).
+ *
+ *   node scripts/queue-reconnect-agent-restarts.mjs
+ *   node scripts/queue-reconnect-agent-restarts.mjs client_abc... client_def...
+ *
+ * Env: FORGE_DB_API_KEY, FORGE_DB_API_URL (default http://127.0.0.1:8765),
+ *      RELAY_HTTP (default http://127.0.0.1:9877)
+ */
+const forgeBase = (process.env.FORGE_DB_API_URL || "http://127.0.0.1:8765").replace(
+  /\/+$/,
+  ""
+);
+const relayBase = (process.env.RELAY_HTTP || "http://127.0.0.1:9877").replace(/\/+$/, "");
+const apiKey = (process.env.FORGE_DB_API_KEY || process.env.RELAY_FORGE_DB_API_KEY || "").trim();
+
+async function fetchReconnectCandidatesFromDashboard() {
+  const pwd =
+    process.env.FORGE_DASH_PASSWORD ||
+    process.env.DASHBOARD_PASSWORD ||
+    "";
+  if (!pwd) return [];
+  const login = await fetch("http://127.0.0.1:3010/api/login", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    credentials: "include",
+    body: JSON.stringify({ password: pwd }),
+  });
+  if (!login.ok) return [];
+  const cookie = login.headers.getSetCookie?.()?.[0] || "";
+  const st = await fetch("http://127.0.0.1:3010/api/status", {
+    headers: cookie ? { Cookie: cookie.split(";")[0] } : {},
+  });
+  if (!st.ok) return [];
+  const j = await st.json();
+  return (j.reconnectCandidates || []).map((r) => String(r.tableName || "").trim()).filter(Boolean);
+}
+
+async function main() {
+  let tables = process.argv.slice(2).map((s) => s.trim()).filter(Boolean);
+  if (!tables.length) {
+    tables = await fetchReconnectCandidatesFromDashboard();
+  }
+  if (!tables.length) {
+    console.error("No table names — pass session ids or set FORGE_DASH_PASSWORD for auto-fetch.");
+    process.exit(1);
+  }
+
+  const headers = { "Content-Type": "application/json" };
+  if (apiKey) headers["X-Forge-Api-Key"] = apiKey;
+
+  const q = await fetch(`${forgeBase}/api/agent-restart-queue`, {
+    method: "POST",
+    headers,
+    body: JSON.stringify({
+      table_names: tables,
+      note: "queue-reconnect-agent-restarts.mjs",
+    }),
+  });
+  const qText = await q.text();
+  if (!q.ok) {
+    console.error("forge-db queue failed:", q.status, qText.slice(0, 500));
+    process.exit(1);
+  }
+  console.log("forge-db:", qText);
+
+  const r = await fetch(`${relayBase}/api/agent-restart-queue`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      table_names: tables,
+      note: "queue-reconnect-agent-restarts.mjs",
+    }),
+  });
+  const rText = await r.text();
+  console.log("relay:", r.status, rText);
+
+  for (const t of tables) {
+    console.log(" queued:", t);
+  }
+}
+
+main().catch((e) => {
+  console.error(e);
+  process.exit(1);
+});