@node9/proxy 2.3.0 → 2.4.0

package/dist/cli.js

@@ -9810,7 +9810,7 @@ function claudeDesktopConfigPath(homeDir2 = import_os14.default.homedir()) {
     return import_path17.default.join(homeDir2, ".config", "Claude", "claude_desktop_config.json");
   }
   if (process.platform === "win32") {
-    const appData = process.env.APPDATA ?? import_path17.default.join(homeDir2, "AppData", "Roaming");
+    const appData = process.env.APPDATA || import_path17.default.join(homeDir2, "AppData", "Roaming");
     return import_path17.default.join(appData, "Claude", "claude_desktop_config.json");
   }
   return null;
@@ -18303,7 +18303,7 @@ var init_ship = __esm({
 });
 
 // src/policy-snapshot/build.ts
-function buildPolicySnapshot(config, activeShields, overrides, mcpTools = {}, statusEntries = [], syncHealth) {
+function buildPolicySnapshot(config, activeShields, overrides, mcpTools = {}, statusEntries = [], syncHealth, identity) {
   const p = config.policy;
   const statusByKey = /* @__PURE__ */ new Map();
   for (const s of statusEntries) {
@@ -18372,7 +18372,9 @@ function buildPolicySnapshot(config, activeShields, overrides, mcpTools = {}, st
         lastError: syncHealth.lastError,
         consecutiveFailures: syncHealth.consecutiveFailures
       }
-    }
+    },
+    // Machine identity — heals legacy machineId-less keys on the SaaS side.
+    ...identity && { machineId: identity.machineId, platform: identity.platform }
   };
 }
 var MAX_RULES, MAX_EGRESS, MAX_MCP_SERVERS, MAX_MCP_TOOLS;
@@ -18748,6 +18750,34 @@ var init_ship2 = __esm({
   }
 });
 
+// src/machine-id.ts
+function getMachineId(homeDir2 = os34.homedir()) {
+  const file = path37.join(homeDir2, ".node9", "machine-id");
+  try {
+    const existing = fs38.readFileSync(file, "utf-8").trim();
+    if (UUID_RE.test(existing)) return existing;
+  } catch {
+  }
+  const id = crypto5.randomUUID();
+  try {
+    fs38.mkdirSync(path37.dirname(file), { recursive: true });
+    fs38.writeFileSync(file, id + "\n", { mode: 384 });
+  } catch {
+  }
+  return id;
+}
+var crypto5, fs38, os34, path37, UUID_RE;
+var init_machine_id = __esm({
+  "src/machine-id.ts"() {
+    "use strict";
+    crypto5 = __toESM(require("crypto"));
+    fs38 = __toESM(require("fs"));
+    os34 = __toESM(require("os"));
+    path37 = __toESM(require("path"));
+    UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
+  }
+});
+
 // src/daemon/sync.ts
 function emptySignals3() {
   return {
@@ -19199,7 +19229,10 @@ async function pushPolicySnapshot(creds) {
       resolveMcpStatus(),
       // fleet-ship Step 2: ship this machine's sync health so the dashboard can
       // show "sync failing" badges. readSyncHealth is local (same module, no circular).
-      readSyncHealth()
+      readSyncHealth(),
+      // Machine identity — heals legacy machineId-less keys on the SaaS side
+      // (login-v2 duplicate-key fix). getMachineId mints on first need.
+      { machineId: getMachineId(), platform: process.platform }
     );
     await shipPolicySnapshot(body, creds);
   } catch {
@@ -19223,7 +19256,8 @@ async function runPolicyPush() {
       // resolve ${VAR} placeholders — so this push reflects THIS process's env
       // (daemon here, user shell in runPolicyPush); see the P2 design's two-env note.
       resolveMcpStatus(),
-      readSyncHealth()
+      readSyncHealth(),
+      { machineId: getMachineId(), platform: process.platform }
     );
     const sent = await shipPolicySnapshot(body, creds);
     return sent ? { ok: true } : { ok: false, reason: "Push failed (network or server error)" };
@@ -19408,6 +19442,7 @@ var init_sync = __esm({
     init_scan_watermark();
     init_state2();
     init_audit();
+    init_machine_id();
     FINDING_TO_SIGNAL3 = {
       dlp: "dlpFindings",
       pii: "piiFindings",
@@ -21561,74 +21596,36 @@ function uninstallSystemd() {
 function isSystemdInstalled() {
   return import_fs43.default.existsSync(SYSTEMD_UNIT);
 }
+function windowsStartupDir(homeDir2 = import_os39.default.homedir()) {
+  const appData = process.env.APPDATA || import_path42.default.join(homeDir2, "AppData", "Roaming");
+  return import_path42.default.join(appData, "Microsoft", "Windows", "Start Menu", "Programs", "Startup");
+}
 function windowsLauncherVbs(nodePath, scriptPath) {
   for (const p of [nodePath, scriptPath]) {
     if (p.includes('"')) throw new Error(`Illegal quote in path: ${p}`);
   }
   return [
-    "' Auto-generated by node9 \u2014 starts the approval daemon with no console window.",
-    "' Recreated on every `node9 daemon install`; safe to delete (uninstall does).",
+    "' Auto-generated by node9 - starts the approval daemon with no console window.",
+    "' Recreated by `node9 daemon install`; removed by `node9 daemon uninstall`.",
     'Set sh = CreateObject("Wscript.Shell")',
     'sh.Environment("PROCESS")("NODE9_AUTO_STARTED") = "1"',
     `sh.Run """${nodePath}"" ""${scriptPath}"" daemon", 0, False`,
     ""
   ].join("\r\n");
 }
-function schtasksCreateArgs(launcherPath) {
-  return [
-    "/Create",
-    "/TN",
-    SCHTASKS_TASK,
-    "/TR",
-    `wscript.exe //B "${launcherPath}"`,
-    "/SC",
-    "ONLOGON",
-    "/F"
-  ];
-}
-function installSchtasks(binaryPath) {
-  const launcher = WIN_LAUNCHER();
-  const dir = import_path42.default.dirname(launcher);
+function installWindowsStartup(binaryPath) {
+  const target = WIN_LAUNCHER();
+  const dir = import_path42.default.dirname(target);
   if (!import_fs43.default.existsSync(dir)) import_fs43.default.mkdirSync(dir, { recursive: true });
-  import_fs43.default.writeFileSync(launcher, windowsLauncherVbs(process.execPath, binaryPath), "utf-8");
-  const create = (0, import_child_process3.spawnSync)("schtasks", schtasksCreateArgs(launcher), {
-    encoding: "utf8",
-    timeout: 1e4
-  });
-  if (create.status !== 0) {
-    throw new Error(
-      `schtasks /Create failed: ${create.stderr || create.stdout || "unknown error"}`
-    );
-  }
-  (0, import_child_process3.spawnSync)("schtasks", ["/Run", "/TN", SCHTASKS_TASK], { encoding: "utf8", timeout: 1e4 });
+  import_fs43.default.writeFileSync(target, windowsLauncherVbs(process.execPath, binaryPath), "utf-8");
+  (0, import_child_process3.spawnSync)("wscript.exe", ["//B", target], { encoding: "utf8", timeout: 1e4 });
 }
-function uninstallSchtasks() {
-  (0, import_child_process3.spawnSync)("schtasks", ["/Delete", "/TN", SCHTASKS_TASK, "/F"], {
-    encoding: "utf8",
-    timeout: 1e4
-  });
-  const launcher = WIN_LAUNCHER();
-  if (import_fs43.default.existsSync(launcher)) {
-    try {
-      import_fs43.default.unlinkSync(launcher);
-    } catch {
-    }
-  }
+function uninstallWindowsStartup() {
+  const target = WIN_LAUNCHER();
+  if (import_fs43.default.existsSync(target)) import_fs43.default.unlinkSync(target);
 }
-function isSchtasksInstalled() {
-  const r = (0, import_child_process3.spawnSync)("schtasks", ["/Query", "/TN", SCHTASKS_TASK], {
-    encoding: "utf8",
-    timeout: 5e3
-  });
-  return r.status === 0;
-}
-function isSchtasksEnabled() {
-  const r = (0, import_child_process3.spawnSync)("schtasks", ["/Query", "/TN", SCHTASKS_TASK, "/XML"], {
-    encoding: "utf8",
-    timeout: 5e3
-  });
-  if (r.status !== 0) return false;
-  return !/<Enabled>\s*false\s*<\/Enabled>/i.test(r.stdout ?? "");
+function isWindowsStartupInstalled() {
+  return import_fs43.default.existsSync(WIN_LAUNCHER());
 }
 function stopRunningDaemon() {
   const pidFile = import_path42.default.join(import_os39.default.homedir(), ".node9", "daemon.pid");
@@ -21688,9 +21685,9 @@ function installDaemonService() {
       return { ok: true, platform: "systemd", alreadyInstalled };
     }
     if (process.platform === "win32") {
-      const alreadyInstalled = isSchtasksInstalled();
-      installSchtasks(binary);
-      return { ok: true, platform: "schtasks", alreadyInstalled };
+      const alreadyInstalled = isWindowsStartupInstalled();
+      installWindowsStartup(binary);
+      return { ok: true, platform: "startup-folder", alreadyInstalled };
     }
     return {
       ok: false,
@@ -21714,8 +21711,8 @@ function uninstallDaemonService() {
       return { ok: true, platform: "systemd", alreadyInstalled: false };
     }
     if (process.platform === "win32") {
-      uninstallSchtasks();
-      return { ok: true, platform: "schtasks", alreadyInstalled: false };
+      uninstallWindowsStartup();
+      return { ok: true, platform: "startup-folder", alreadyInstalled: false };
     }
     return {
       ok: false,
@@ -21731,7 +21728,7 @@ function uninstallDaemonService() {
 function isDaemonServiceInstalled() {
   if (process.platform === "darwin") return isLaunchdInstalled();
   if (process.platform === "linux") return isSystemdInstalled();
-  if (process.platform === "win32") return isSchtasksInstalled();
+  if (process.platform === "win32") return isWindowsStartupInstalled();
   return false;
 }
 function autostartRepairDecision(opts) {
@@ -21752,11 +21749,7 @@ function enableDaemonServiceQuiet() {
       return r.status === 0;
     }
     if (process.platform === "win32") {
-      const r = (0, import_child_process3.spawnSync)("schtasks", ["/Change", "/TN", SCHTASKS_TASK, "/ENABLE"], {
-        encoding: "utf8",
-        timeout: 5e3
-      });
-      return r.status === 0;
+      return isWindowsStartupInstalled();
     }
     return process.platform === "darwin";
   } catch {
@@ -21812,13 +21805,13 @@ function isDaemonServiceEnabled() {
       return r.status === 0;
     }
     if (process.platform === "win32") {
-      return isSchtasksEnabled();
+      return isWindowsStartupInstalled();
     }
   } catch {
   }
   return false;
 }
-var import_fs43, import_path42, import_os39, import_child_process3, LAUNCHD_LABEL, LAUNCHD_PLIST, SYSTEMD_UNIT_DIR, SYSTEMD_UNIT, SCHTASKS_TASK, WIN_LAUNCHER;
+var import_fs43, import_path42, import_os39, import_child_process3, LAUNCHD_LABEL, LAUNCHD_PLIST, SYSTEMD_UNIT_DIR, SYSTEMD_UNIT, STARTUP_FILE, WIN_LAUNCHER;
 var init_service = __esm({
   "src/daemon/service.ts"() {
     "use strict";
@@ -21830,8 +21823,8 @@ var init_service = __esm({
     LAUNCHD_PLIST = import_path42.default.join(import_os39.default.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
     SYSTEMD_UNIT_DIR = import_path42.default.join(import_os39.default.homedir(), ".config", "systemd", "user");
     SYSTEMD_UNIT = import_path42.default.join(SYSTEMD_UNIT_DIR, "node9-daemon.service");
-    SCHTASKS_TASK = "Node9Daemon";
-    WIN_LAUNCHER = () => import_path42.default.join(import_os39.default.homedir(), ".node9", "daemon-launcher.vbs");
+    STARTUP_FILE = "node9-daemon.vbs";
+    WIN_LAUNCHER = () => import_path42.default.join(windowsStartupDir(), STARTUP_FILE);
   }
 });
 
@@ -48424,27 +48417,8 @@ function resolveCloudEndpoint(pathSuffix, override) {
   return PROD_BASE + pathSuffix;
 }
 
-// src/machine-id.ts
-var crypto7 = __toESM(require("crypto"));
-var fs47 = __toESM(require("fs"));
-var os42 = __toESM(require("os"));
-var path45 = __toESM(require("path"));
-var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
-function getMachineId(homeDir2 = os42.homedir()) {
-  const file = path45.join(homeDir2, ".node9", "machine-id");
-  try {
-    const existing = fs47.readFileSync(file, "utf-8").trim();
-    if (UUID_RE.test(existing)) return existing;
-  } catch {
-  }
-  const id = crypto7.randomUUID();
-  try {
-    fs47.mkdirSync(path45.dirname(file), { recursive: true });
-    fs47.writeFileSync(file, id + "\n", { mode: 384 });
-  } catch {
-  }
-  return id;
-}
+// src/auth/device-login.ts
+init_machine_id();
 
 // src/utils/open-browser.ts
 var import_child_process6 = require("child_process");