9router 0.3.33 → 0.3.35

package/app/src/mitm/dns/dnsConfig.js

@@ -15,6 +15,47 @@ const HOSTS_FILE = IS_WIN
   ? path.join(process.env.SystemRoot || "C:\\Windows", "System32", "drivers", "etc", "hosts")
   : "/etc/hosts";
 
+/**
+ * Execute elevated PowerShell script on Windows via Start-Process -Verb RunAs.
+ * Only UAC consent dialog appears, no CMD/PS window popup.
+ */
+function executeElevatedPowerShell(psScriptPath, timeoutMs = 30000) {
+  const flagFile = path.join(os.tmpdir(), `ps_done_${Date.now()}.flag`);
+  const psSQ = (s) => s.replace(/'/g, "''");
+  
+  let psContent = fs.readFileSync(psScriptPath, "utf8");
+  psContent += `\nSet-Content -Path '${psSQ(flagFile)}' -Value 'done' -Encoding UTF8\n`;
+  fs.writeFileSync(psScriptPath, psContent, "utf8");
+
+  const outerCmd = `Start-Process powershell -ArgumentList '-NoProfile','-ExecutionPolicy','Bypass','-WindowStyle','Hidden','-File','${psSQ(psScriptPath)}' -Verb RunAs -WindowStyle Hidden`;
+
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const settle = (fn, arg) => { if (!settled) { settled = true; fn(arg); } };
+
+    exec(
+      `powershell -NoProfile -NonInteractive -WindowStyle Hidden -Command "${outerCmd}"`,
+      { windowsHide: true },
+      () => {}
+    );
+
+    const deadline = Date.now() + timeoutMs;
+    const poll = () => {
+      if (settled) return;
+      if (fs.existsSync(flagFile)) {
+        try { fs.unlinkSync(flagFile); fs.unlinkSync(psScriptPath); } catch { /* ignore */ }
+        return settle(resolve);
+      }
+      if (Date.now() > deadline) {
+        try { fs.unlinkSync(psScriptPath); } catch { /* ignore */ }
+        return settle(reject, new Error("Timed out waiting for UAC confirmation"));
+      }
+      setTimeout(poll, 500);
+    };
+    setTimeout(poll, 300);
+  });
+}
+
 /**
  * Execute command with sudo password via stdin (macOS/Linux only)
  */
@@ -99,18 +140,37 @@ async function addDNSEntry(tool, sudoPassword) {
   try {
     if (IS_WIN) {
       const hostsPath = HOSTS_FILE.replace(/'/g, "''");
-      const addLines = entriesToAdd.map(h =>
-        `$hc = Get-Content -Path '${hostsPath}' -Raw -ErrorAction SilentlyContinue; if ($hc -notmatch '${h}') { Add-Content -Path '${hostsPath}' -Value '127.0.0.1 ${h}' -Encoding UTF8 }`
-      ).join("; ");
-      const psScript = `${addLines}; ipconfig /flushdns | Out-Null`;
-      await new Promise((resolve, reject) => {
-        const escaped = psScript.replace(/"/g, '\\"');
-        exec(
-          `powershell -NonInteractive -WindowStyle Hidden -Command "Start-Process powershell -ArgumentList '-NonInteractive -WindowStyle Hidden -Command \\"${escaped}\\"' -Verb RunAs -Wait"`,
-          { windowsHide: true },
-          (error) => { if (error) reject(new Error(`Failed to add DNS: ${error.message}`)); else resolve(); }
-        );
-      });
+      
+      // Build PowerShell script with proper error handling
+      const scriptLines = [];
+      scriptLines.push(`$ErrorActionPreference = 'Stop'`);
+      scriptLines.push(`$hostsPath = '${hostsPath}'`);
+      scriptLines.push(`try {`);
+      scriptLines.push(`  $hostsContent = Get-Content -Path $hostsPath -Raw -ErrorAction SilentlyContinue`);
+      scriptLines.push(`  if (-not $hostsContent) { $hostsContent = '' }`);
+      
+      for (const host of entriesToAdd) {
+        // Escape special regex chars in hostname
+        const escapedHost = host.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        scriptLines.push(`  if ($hostsContent -notmatch '${escapedHost}') {`);
+        scriptLines.push(`    Add-Content -Path $hostsPath -Value '127.0.0.1 ${host}' -Encoding UTF8 -ErrorAction Stop`);
+        scriptLines.push(`    Write-Host "Added DNS entry: ${host}"`);
+        scriptLines.push(`  } else {`);
+        scriptLines.push(`    Write-Host "DNS entry already exists: ${host}"`);
+        scriptLines.push(`  }`);
+      }
+      
+      scriptLines.push(`  ipconfig /flushdns | Out-Null`);
+      scriptLines.push(`} catch {`);
+      scriptLines.push(`  Write-Error "Failed to add DNS: $_"`);
+      scriptLines.push(`  exit 1`);
+      scriptLines.push(`}`);
+      
+      const psScript = scriptLines.join("\n");
+      const tmpPs1 = path.join(os.tmpdir(), `mitm_dns_add_${Date.now()}.ps1`);
+      fs.writeFileSync(tmpPs1, psScript, "utf8");
+      
+      await executeElevatedPowerShell(tmpPs1, 30000);
     } else {
       await execWithPassword(`echo "${entries}" >> ${HOSTS_FILE}`, sudoPassword);
       await flushDNS(sudoPassword);
@@ -139,23 +199,35 @@ async function removeDNSEntry(tool, sudoPassword) {
     if (IS_WIN) {
       const content = fs.readFileSync(HOSTS_FILE, "utf8");
       const filtered = content.split(/\r?\n/).filter(l => !entriesToRemove.some(h => l.includes(h))).join("\r\n");
-      const tmpFile = path.join(os.tmpdir(), "hosts_filtered.tmp");
+      const tmpFile = path.join(os.tmpdir(), `hosts_filtered_${Date.now()}.tmp`);
       fs.writeFileSync(tmpFile, filtered, "utf8");
+      
       const tmpEsc = tmpFile.replace(/'/g, "''");
       const hostsEsc = HOSTS_FILE.replace(/'/g, "''");
-      const psScript = `Copy-Item -Path '${tmpEsc}' -Destination '${hostsEsc}' -Force; ipconfig /flushdns | Out-Null; Remove-Item '${tmpEsc}' -ErrorAction SilentlyContinue`;
-      await new Promise((resolve, reject) => {
-        const escaped = psScript.replace(/"/g, '\\"');
-        exec(
-          `powershell -NonInteractive -WindowStyle Hidden -Command "Start-Process powershell -ArgumentList '-NonInteractive -WindowStyle Hidden -Command \\"${escaped}\\"' -Verb RunAs -Wait"`,
-          { windowsHide: true },
-          (error) => {
-            try { fs.unlinkSync(tmpFile); } catch { /* ignore */ }
-            if (error) reject(new Error(`Failed to remove DNS: ${error.message}`));
-            else resolve();
-          }
-        );
-      });
+      
+      // Build PowerShell script with proper error handling
+      const scriptLines = [];
+      scriptLines.push(`$ErrorActionPreference = 'Stop'`);
+      scriptLines.push(`try {`);
+      scriptLines.push(`  Copy-Item -Path '${tmpEsc}' -Destination '${hostsEsc}' -Force -ErrorAction Stop`);
+      scriptLines.push(`  Write-Host "Hosts file updated successfully"`);
+      scriptLines.push(`  ipconfig /flushdns | Out-Null`);
+      scriptLines.push(`  Write-Host "DNS cache flushed"`);
+      scriptLines.push(`  Remove-Item '${tmpEsc}' -ErrorAction SilentlyContinue`);
+      scriptLines.push(`} catch {`);
+      scriptLines.push(`  Write-Error "Failed to remove DNS: $_"`);
+      scriptLines.push(`  Remove-Item '${tmpEsc}' -ErrorAction SilentlyContinue`);
+      scriptLines.push(`  exit 1`);
+      scriptLines.push(`}`);
+      
+      const psScript = scriptLines.join("\n");
+      const tmpPs1 = path.join(os.tmpdir(), `mitm_dns_remove_${Date.now()}.ps1`);
+      fs.writeFileSync(tmpPs1, psScript, "utf8");
+      
+      await executeElevatedPowerShell(tmpPs1, 30000);
+      
+      // Cleanup temp file if still exists
+      try { fs.unlinkSync(tmpFile); } catch { /* ignore */ }
     } else {
       for (const host of entriesToRemove) {
         const sedCmd = IS_MAC
@@ -191,6 +263,7 @@ module.exports = {
   removeDNSEntry,
   removeAllDNSEntries,
   execWithPassword,
+  executeElevatedPowerShell,
   checkDNSEntry,
   checkAllDNSStatus,
 };

package/app/src/mitm/manager.js

@@ -5,7 +5,7 @@ const os = require("os");
 const net = require("net");
 const https = require("https");
 const crypto = require("crypto");
-const { addDNSEntry, removeDNSEntry, removeAllDNSEntries, checkAllDNSStatus } = require("./dns/dnsConfig");
+const { addDNSEntry, removeDNSEntry, removeAllDNSEntries, checkAllDNSStatus, executeElevatedPowerShell, TOOL_HOSTS } = require("./dns/dnsConfig");
 
 const IS_WIN = process.platform === "win32";
 const { generateCert } = require("./cert/generate");
@@ -345,49 +345,23 @@ async function startServer(apiKey, sudoPassword) {
 
   // Step 2: Spawn server (Root CA already installed in Step 1.5)
   if (IS_WIN) {
-    const hostsFile = path.join(process.env.SystemRoot || "C:\\Windows", "System32", "drivers", "etc", "hosts");
-    const flagFile = path.join(os.tmpdir(), `mitm_ready_${Date.now()}.flag`);
     const psSQ = (s) => s.replace(/'/g, "''");
     const nodePs = psSQ(process.execPath);
     const serverPs = psSQ(SERVER_PATH);
-    const flagPs = psSQ(flagFile);
 
     const psScript = [
+      `$ErrorActionPreference = 'Stop'`,
       `$conn = Get-NetTCPConnection -LocalPort 443 -State Listen -ErrorAction SilentlyContinue | Select-Object -First 1`,
       `if ($conn -and $conn.OwningProcess -gt 4) { Stop-Process -Id $conn.OwningProcess -Force -ErrorAction SilentlyContinue }`,
       `Start-Sleep -Milliseconds 500`,
       `$nodeCmd = 'set ROUTER_API_KEY=${psSQ(apiKey)}&& set NODE_ENV=production&& "${nodePs}" "${serverPs}"'`,
       `Start-Process cmd -ArgumentList '/c',$nodeCmd -WindowStyle Hidden`,
       `Start-Sleep -Milliseconds 500`,
-      `Set-Content -Path '${flagPs}' -Value 'ready' -Encoding UTF8`,
     ].join("\n");
 
     const tmpPs1 = path.join(os.tmpdir(), `mitm_start_${Date.now()}.ps1`);
     fs.writeFileSync(tmpPs1, psScript, "utf8");
-    const vbs = [
-      `Set oShell = CreateObject("Shell.Application")`,
-      `Dim ps`,
-      `ps = Chr(34) & "powershell.exe" & Chr(34)`,
-      `Dim args`,
-      `args = "-NoProfile -ExecutionPolicy Bypass -File " & Chr(34) & "${tmpPs1}" & Chr(34)`,
-      `oShell.ShellExecute ps, args, "", "runas", 1`,
-    ].join("\r\n");
-    const tmpVbs = path.join(os.tmpdir(), `mitm_uac_${Date.now()}.vbs`);
-    fs.writeFileSync(tmpVbs, vbs, "utf8");
-    spawn("wscript.exe", [tmpVbs], { stdio: "ignore", windowsHide: false, detached: true }).unref();
-
-    await new Promise((resolve, reject) => {
-      const deadline = Date.now() + 90000;
-      const poll = () => {
-        if (fs.existsSync(flagFile)) {
-          try { fs.unlinkSync(flagFile); fs.unlinkSync(tmpPs1); fs.unlinkSync(tmpVbs); } catch { /* ignore */ }
-          return resolve();
-        }
-        if (Date.now() > deadline) return reject(new Error("Timed out waiting for UAC confirmation."));
-        setTimeout(poll, 500);
-      };
-      poll();
-    });
+    await executeElevatedPowerShell(tmpPs1, 90000);
 
     if (_updateSettings) await _updateSettings({ mitmCertInstalled: true }).catch(() => { });
   } else {
@@ -451,38 +425,27 @@ async function startServer(apiKey, sudoPassword) {
  * Stop MITM server — removes ALL tool DNS entries first, then kills server
  */
 async function stopServer(sudoPassword) {
-  // Remove all DNS entries first (before killing server)
-  console.log("[MITM] Removing all DNS entries before stopping server...");
-  await removeAllDNSEntries(sudoPassword);
+  console.log("[MITM] Stopping server...");
 
+  // Kill server process
   const proc = serverProcess;
-  if (proc && !proc.killed) {
-    console.log("Stopping MITM server...");
-    killProcess(proc.pid, false, sudoPassword);
-    await new Promise(resolve => setTimeout(resolve, 1000));
-    if (isProcessAlive(proc.pid)) killProcess(proc.pid, true, sudoPassword);
-    serverProcess = null;
-    serverPid = null;
-  } else {
-    try {
-      if (fs.existsSync(PID_FILE)) {
-        const savedPid = parseInt(fs.readFileSync(PID_FILE, "utf-8").trim(), 10);
-        if (savedPid && isProcessAlive(savedPid)) {
-          console.log(`Killing MITM server (PID: ${savedPid})...`);
-          killProcess(savedPid, false, sudoPassword);
-          await new Promise(resolve => setTimeout(resolve, 1000));
-          if (isProcessAlive(savedPid)) killProcess(savedPid, true, sudoPassword);
-        }
-      }
-    } catch { /* ignore */ }
-    serverProcess = null;
-    serverPid = null;
+  const pidToKill = proc && !proc.killed
+    ? proc.pid
+    : (() => { try { return parseInt(fs.readFileSync(PID_FILE, "utf-8").trim(), 10); } catch { return null; } })();
+
+  if (pidToKill && isProcessAlive(pidToKill)) {
+    console.log(`Killing MITM server (PID: ${pidToKill})...`);
+    killProcess(pidToKill, false, sudoPassword);
+    await new Promise(r => setTimeout(r, 1000));
+    if (isProcessAlive(pidToKill)) killProcess(pidToKill, true, sudoPassword);
   }
+  serverProcess = null;
+  serverPid = null;
 
   if (IS_WIN) {
+    // Single elevated script: clean DNS + flush — 1 UAC prompt only
     const hostsFile = path.join(process.env.SystemRoot || "C:\\Windows", "System32", "drivers", "etc", "hosts");
     const psSQ = (s) => s.replace(/'/g, "''");
-    const { TOOL_HOSTS } = require("./dns/dnsConfig");
     const allHosts = Object.values(TOOL_HOSTS).flat();
 
     let hostsContent = "";
@@ -490,41 +453,25 @@ async function stopServer(sudoPassword) {
     const filtered = hostsContent.split(/\r?\n/)
       .filter(l => !allHosts.some(h => l.includes(h)))
       .join("\r\n");
-    const tmpHosts = path.join(os.tmpdir(), "mitm_hosts_clean.tmp");
+    const tmpHosts = path.join(os.tmpdir(), `mitm_hosts_clean_${Date.now()}.tmp`);
     fs.writeFileSync(tmpHosts, filtered, "utf8");
 
-    const flagFile = path.join(os.tmpdir(), "mitm_stop_done.flag");
     const psScript = [
-      `Copy-Item -Path '${psSQ(tmpHosts)}' -Destination '${psSQ(hostsFile)}' -Force`,
-      `& ipconfig /flushdns | Out-Null`,
-      `Remove-Item '${psSQ(tmpHosts)}' -ErrorAction SilentlyContinue`,
-      `Set-Content -Path '${psSQ(flagFile)}' -Value 'done' -Encoding UTF8`,
+      `$ErrorActionPreference = 'Stop'`,
+      `try {`,
+      `  Copy-Item -Path '${psSQ(tmpHosts)}' -Destination '${psSQ(hostsFile)}' -Force -ErrorAction Stop`,
+      `  ipconfig /flushdns | Out-Null`,
+      `  Remove-Item '${psSQ(tmpHosts)}' -ErrorAction SilentlyContinue`,
+      `} catch {`,
+      `  Remove-Item '${psSQ(tmpHosts)}' -ErrorAction SilentlyContinue`,
+      `}`,
     ].join("\n");
-    const tmpPs1 = path.join(os.tmpdir(), "mitm_stop.ps1");
-    fs.writeFileSync(tmpPs1, psScript, "utf8");
 
-    const vbs = [
-      `Set oShell = CreateObject("Shell.Application")`,
-      `Dim args`,
-      `args = "-NoProfile -ExecutionPolicy Bypass -File " & Chr(34) & "${tmpPs1}" & Chr(34)`,
-      `oShell.ShellExecute "powershell.exe", args, "", "runas", 1`,
-    ].join("\r\n");
-    const tmpVbs = path.join(os.tmpdir(), "mitm_stop_uac.vbs");
-    fs.writeFileSync(tmpVbs, vbs, "utf8");
-    spawn("wscript.exe", [tmpVbs], { stdio: "ignore", windowsHide: false, detached: true }).unref();
-
-    await new Promise((resolve) => {
-      const deadline = Date.now() + 30000;
-      const poll = () => {
-        if (fs.existsSync(flagFile)) {
-          try { fs.unlinkSync(flagFile); fs.unlinkSync(tmpPs1); fs.unlinkSync(tmpVbs); } catch { /* ignore */ }
-          return resolve();
-        }
-        if (Date.now() > deadline) return resolve();
-        setTimeout(poll, 500);
-      };
-      poll();
-    });
+    const tmpPs1 = path.join(os.tmpdir(), `mitm_stop_${Date.now()}.ps1`);
+    fs.writeFileSync(tmpPs1, psScript, "utf8");
+    await executeElevatedPowerShell(tmpPs1, 30000);
+  } else {
+    await removeAllDNSEntries(sudoPassword);
   }
 
   try { fs.unlinkSync(PID_FILE); } catch { /* ignore */ }

package/cli.js

@@ -126,6 +126,7 @@ function killAllAppProcesses() {
           const output = execSync('tasklist /FO CSV /V 2>nul | findstr /I "node"', { 
             encoding: 'utf8',
             shell: true,
+            windowsHide: true,
             timeout: 5000
           });
           const lines = output.split('\n').filter(l => l.trim());
@@ -173,7 +174,7 @@ function killAllAppProcesses() {
         pids.forEach(pid => {
           try {
             if (platform === "win32") {
-              execSync(`taskkill /F /PID ${pid} 2>nul`, { stdio: 'ignore', shell: true, timeout: 3000 });
+              execSync(`taskkill /F /PID ${pid} 2>nul`, { stdio: 'ignore', shell: true, windowsHide: true, timeout: 3000 });
             } else {
               execSync(`kill -9 ${pid} 2>/dev/null`, { stdio: 'ignore', timeout: 3000 });
             }
@@ -205,13 +206,14 @@ function killProcessOnPort(port) {
         try {
           const output = execSync(`netstat -ano | findstr :${port}`, { 
             encoding: 'utf8', 
-            shell: true, 
+            shell: true,
+            windowsHide: true,
             timeout: 5000 
           }).trim();
           const lines = output.split('\n').filter(l => l.includes('LISTENING'));
           if (lines.length > 0) {
             pid = lines[0].trim().split(/\s+/).pop();
-            execSync(`taskkill /F /PID ${pid} 2>nul`, { stdio: 'ignore', shell: true, timeout: 3000 });
+            execSync(`taskkill /F /PID ${pid} 2>nul`, { stdio: 'ignore', shell: true, windowsHide: true, timeout: 3000 });
           }
         } catch (e) {
           // Port is free or error
@@ -315,23 +317,23 @@ function performUpdate() {
     let updateScript, scriptPath, shellCmd;
 
     if (platform === "win32") {
-      updateScript = `@echo off
-echo 📥 Installing new version...
-call npm cache clean --force >nul 2>&1
-call npm install -g ${pkg.name}@latest --prefer-online
-
-if %ERRORLEVEL% EQU 0 (
-  echo.
-  echo ✅ Update completed. Run "${pkg.name}" to start.
-) else (
-  echo.
-  echo ❌ Update failed. Try manually: npm install -g ${pkg.name}@latest
-)
-pause
+      // Use PowerShell with hidden window to avoid console flash
+      updateScript = `
+Write-Host "📥 Installing new version..."
+npm cache clean --force 2>$null
+npm install -g ${pkg.name}@latest --prefer-online 2>&1 | Out-Host
+if ($LASTEXITCODE -eq 0) {
+  Write-Host ""
+  Write-Host "✅ Update completed. Run '${pkg.name}' to start."
+} else {
+  Write-Host ""
+  Write-Host "❌ Update failed. Try manually: npm install -g ${pkg.name}@latest"
+}
+Read-Host "Press Enter to continue"
 `;
-      scriptPath = path.join(os.tmpdir(), `${APP_NAME}-update.bat`);
+      scriptPath = path.join(os.tmpdir(), `${APP_NAME}-update.ps1`);
       fs.writeFileSync(scriptPath, updateScript);
-      shellCmd = ["cmd.exe", ["/c", scriptPath]];
+      shellCmd = ["powershell.exe", ["-WindowStyle", "Normal", "-ExecutionPolicy", "Bypass", "-File", scriptPath]];
     } else {
       updateScript = `#!/bin/bash
 echo "📥 Installing new version..."
@@ -360,7 +362,8 @@ fi
 
     const child = spawn(shellCmd[0], shellCmd[1], {
       detached: true,
-      stdio: "inherit"
+      stdio: "inherit",
+      windowsHide: false  // Show update window intentionally for user feedback
     });
     child.unref();
     process.exit(0);
@@ -581,7 +584,7 @@ function startServer(latestVersion) {
           // Enable auto startup on OS boot
           try {
             const { enableAutoStart } = require("./src/cli/tray/autostart");
-            const enabled = enableAutoStart();
+            const enabled = enableAutoStart(__filename);
             if (enabled) {
               console.log("✅ Auto-start enabled (will run on OS boot)");
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "9router",
-  "version": "0.3.33",
+  "version": "0.3.35",
   "description": "9Router CLI - Start and manage 9Router server",
   "bin": {
     "9router": "./cli.js"

package/src/cli/tray/autostart.js

@@ -27,9 +27,10 @@ function getStartCommand() {
 
 /**
  * Enable auto startup on OS boot
+ * @param {string} cliPath - Optional path to cli.js (defaults to auto-detect)
  * @returns {boolean} success
  */
-function enableAutoStart() {
+function enableAutoStart(cliPath) {
   const platform = process.platform;
   
   // Skip on unsupported platforms
@@ -44,11 +45,11 @@ function enableAutoStart() {
   
   try {
     if (platform === "darwin") {
-      return enableMacOS();
+      return enableMacOS(cliPath);
     } else if (platform === "win32") {
-      return enableWindows();
+      return enableWindows(cliPath);
     } else if (platform === "linux") {
-      return enableLinux();
+      return enableLinux(cliPath);
     }
   } catch (err) {
     // Silent fail - autostart is optional
@@ -104,7 +105,7 @@ function isAutoStartEnabled() {
 
 // ============ macOS ============
 
-function enableMacOS() {
+function enableMacOS(cliPath) {
   const launchAgentsDir = path.join(os.homedir(), "Library", "LaunchAgents");
   const plistPath = path.join(launchAgentsDir, `${APP_LABEL}.plist`);
   
@@ -116,14 +117,20 @@ function enableMacOS() {
   // Get absolute paths for node and 9router script
   const nodePath = process.execPath;
   let routerScript;
-  try {
-    // Resolve the actual script path (not symlink)
-    const npmBin = execSync("npm bin -g", { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
-    const routerLink = path.join(npmBin, "9router");
-    routerScript = fs.realpathSync(routerLink);
-  } catch (e) {
-    // Fallback to common location
-    routerScript = "/usr/local/lib/node_modules/9router/cli.js";
+  
+  if (cliPath) {
+    // Use provided path (from running cli.js)
+    routerScript = path.resolve(cliPath);
+  } else {
+    // Fallback: try to resolve from npm bin
+    try {
+      const npmBin = execSync("npm bin -g", { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
+      const routerLink = path.join(npmBin, "9router");
+      routerScript = fs.realpathSync(routerLink);
+    } catch (e) {
+      // Last resort fallback
+      routerScript = "/usr/local/lib/node_modules/9router/cli.js";
+    }
   }
   
   // Determine user shell
@@ -179,7 +186,7 @@ function disableMacOS() {
 
 // ============ Windows ============
 
-function enableWindows() {
+function enableWindows(cliPath) {
   const startupDir = path.join(process.env.APPDATA, "Microsoft", "Windows", "Start Menu", "Programs", "Startup");
   const vbsPath = path.join(startupDir, `${APP_NAME}.vbs`);
   
@@ -191,20 +198,27 @@ function enableWindows() {
   // Get absolute paths
   const nodePath = process.execPath;
   let routerScript;
-  try {
-    const npmBin = execSync("npm bin -g", { encoding: "utf8", shell: true, stdio: ["ignore", "pipe", "ignore"] }).trim();
-    const routerLink = path.join(npmBin, "9router.cmd");
-    if (fs.existsSync(routerLink)) {
-      routerScript = routerLink;
-    } else {
-      // Try to resolve actual script
-      const routerJs = path.join(npmBin, "../lib/node_modules/9router/cli.js");
-      if (fs.existsSync(routerJs)) {
-        routerScript = routerJs;
+  
+  if (cliPath) {
+    // Use provided path (from running cli.js)
+    routerScript = path.resolve(cliPath);
+  } else {
+    // Fallback: try to resolve from npm bin
+    try {
+      const npmBin = execSync("npm bin -g", { encoding: "utf8", shell: true, stdio: ["ignore", "pipe", "ignore"] }).trim();
+      const routerLink = path.join(npmBin, "9router.cmd");
+      if (fs.existsSync(routerLink)) {
+        routerScript = routerLink;
+      } else {
+        // Try to resolve actual script
+        const routerJs = path.join(npmBin, "../lib/node_modules/9router/cli.js");
+        if (fs.existsSync(routerJs)) {
+          routerScript = routerJs;
+        }
       }
+    } catch (e) {
+      // Fallback
     }
-  } catch (e) {
-    // Fallback
   }
   
   // Create VBS script to run hidden (no console window)
@@ -242,7 +256,7 @@ function disableWindows() {
 
 // ============ Linux ============
 
-function enableLinux() {
+function enableLinux(cliPath) {
   const autostartDir = path.join(os.homedir(), ".config", "autostart");
   const desktopPath = path.join(autostartDir, `${APP_NAME}.desktop`);
   
@@ -258,15 +272,22 @@ function enableLinux() {
   // Get absolute paths
   const nodePath = process.execPath;
   let routerScript;
-  try {
-    const npmBin = execSync("npm bin -g", { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
-    const routerLink = path.join(npmBin, "9router");
-    if (fs.existsSync(routerLink)) {
-      routerScript = fs.realpathSync(routerLink);
+  
+  if (cliPath) {
+    // Use provided path (from running cli.js)
+    routerScript = path.resolve(cliPath);
+  } else {
+    // Fallback: try to resolve from npm bin
+    try {
+      const npmBin = execSync("npm bin -g", { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
+      const routerLink = path.join(npmBin, "9router");
+      if (fs.existsSync(routerLink)) {
+        routerScript = fs.realpathSync(routerLink);
+      }
+    } catch (e) {
+      // Last resort fallback
+      routerScript = "/usr/local/lib/node_modules/9router/cli.js";
     }
-  } catch (e) {
-    // Fallback
-    routerScript = "/usr/local/lib/node_modules/9router/cli.js";
   }
   
   const desktopContent = `[Desktop Entry]