@sifxprime/krouter 0.5.146 → 0.5.148

package/app/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sifxprime/krouter",
-  "version": "0.5.146",
+  "version": "0.5.148",
   "description": "kRouter (Kodelyth Router) CLI — Kodelyth AI Infrastructure",
   "homepage": "https://github.com/sifxprime/krouter",
   "repository": {

package/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "krouter-app",
-  "version": "0.5.146",
+  "version": "0.5.148",
   "description": "kRouter (Kodelyth Router) web dashboard — Kodelyth AI Infrastructure",
   "private": true,
   "scripts": {

package/app/src/lib/db/backup.js

@@ -0,0 +1,35 @@
+import fs from "node:fs";
+import path from "node:path";
+import { BACKUPS_DIR, ensureDirs } from "./paths.js";
+import { timestampSlug, getAppVersion } from "./version.js";
+
+const KEEP_BACKUPS = 5;
+
+export function makeBackupDir(label) {
+  ensureDirs();
+  const ver = getAppVersion();
+  const slug = `${label}-${ver}-${timestampSlug()}`;
+  const dir = path.join(BACKUPS_DIR, slug);
+  fs.mkdirSync(dir, { recursive: true });
+  return dir;
+}
+
+export function backupFile(srcPath, destDir, destName = null) {
+  if (!fs.existsSync(srcPath)) return null;
+  const name = destName || path.basename(srcPath);
+  const dest = path.join(destDir, name);
+  fs.copyFileSync(srcPath, dest);
+  return dest;
+}
+
+export function pruneOldBackups() {
+  if (!fs.existsSync(BACKUPS_DIR)) return;
+  const entries = fs.readdirSync(BACKUPS_DIR, { withFileTypes: true })
+    .filter((e) => e.isDirectory())
+    .map((e) => ({ name: e.name, full: path.join(BACKUPS_DIR, e.name), mtime: fs.statSync(path.join(BACKUPS_DIR, e.name)).mtimeMs }))
+    .sort((a, b) => b.mtime - a.mtime);
+
+  for (const old of entries.slice(KEEP_BACKUPS)) {
+    try { fs.rmSync(old.full, { recursive: true, force: true }); } catch {}
+  }
+}

package/cli.js

@@ -50,10 +50,24 @@ const args = process.argv.slice(2);
 // Self-heal SQLite runtime deps (sql.js + better-sqlite3) into ~/.krouter/runtime
 // so the server can resolve them via NODE_PATH. Best-effort — sql.js is required,
 // better-sqlite3 is optional. Logs to stderr only on failure.
-try { ensureSqliteRuntime({ silent: true }); } catch {}
-
-// Self-heal tray runtime (systray for macOS/Linux only). Windows skipped.
-try { ensureTrayRuntime({ silent: true }); } catch {}
+//
+// This runs before the argument parser, so `--version` and `--help` used to pay for
+// it too: on a machine where the runtime is missing it shells out to a blocking
+// `npm install` whose spawnSync timeout is 180s, printing nothing the whole time.
+// Asking a program its version should never reach the network.
+//
+// KROUTER_SKIP_RUNTIME_HEAL=1 opts out entirely, for an air-gapped or CI machine where
+// reaching npm is either impossible or unwanted. The server still starts; it just uses
+// whatever runtime is already present instead of trying to repair it.
+const RUNTIME_FREE_ARGS = new Set(["--version", "-v", "--help", "-h"]);
+const skipRuntimeHeal =
+  process.env.KROUTER_SKIP_RUNTIME_HEAL === "1" ||
+  process.env.KROUTER_SKIP_RUNTIME_HEAL === "true";
+if (!skipRuntimeHeal && !args.some((a) => RUNTIME_FREE_ARGS.has(a))) {
+  try { ensureSqliteRuntime({ silent: true }); } catch {}
+  // Self-heal tray runtime (systray for macOS/Linux only). Windows skipped.
+  try { ensureTrayRuntime({ silent: true }); } catch {}
+}
 
 // Sweep autostart entries whose binary path no longer exists on disk (e.g. the
 // user uninstalled the global kRouter then reinstalled to a different path).
@@ -79,57 +93,14 @@ const PROCESS_IDENTIFIERS = ['krouter'];
 // fixed in 0.5.51. Safe to re-run — only touches rows that actually
 // have something to lift.
 if (args[0] === "backfill-tokens") {
-  const candidates = [
-    path.join(process.env.HOME || "", ".krouter", "db", "data.sqlite"),
-    process.env.APPDATA ? path.join(process.env.APPDATA, "krouter", "db", "data.sqlite") : null,
-  ].filter(Boolean);
-  const dbPath = candidates.find(p => fs.existsSync(p));
-  if (!dbPath) {
-    console.error("No krouter database found at:", candidates.join(" or "));
-    process.exit(1);
-  }
-  console.log("DB:", dbPath);
-  const rows = JSON.parse(execSync(
-    `sqlite3 -json "${dbPath}" "SELECT id, data FROM requestDetails WHERE json_extract(data,'$.tokens.prompt_tokens')=0 AND (json_extract(data,'$.providerResponse.response.usageMetadata.promptTokenCount') IS NOT NULL OR json_extract(data,'$.providerResponse.usageMetadata.promptTokenCount') IS NOT NULL)"`,
-    { encoding: "utf8", maxBuffer: 512 * 1024 * 1024 }
-  ) || "[]");
-  console.log(`Candidates with extractable tokens: ${rows.length}`);
-  let updated = 0;
-  // 0.5.53 — stream UPDATEs through stdin so SQLite parses each statement
-  // itself. Avoids the JSON-in-shell-quoted-SQL mangling that swallowed
-  // every row silently on the first attempt.
-  const tmpScript = path.join(os.tmpdir(), `krouter-backfill-${Date.now()}.sql`);
-  const sqlLines = ["BEGIN;"];
-  for (const row of rows) {
-    try {
-      const d = JSON.parse(row.data);
-      const um = d.providerResponse?.response?.usageMetadata || d.providerResponse?.usageMetadata;
-      if (!um) continue;
-      const promptTokens = um.promptTokenCount || 0;
-      const completionTokens = um.candidatesTokenCount || 0;
-      const reasoningTokens = um.thoughtsTokenCount;
-      if (promptTokens === 0 && completionTokens === 0) continue;
-      d.tokens = { ...(d.tokens || {}), prompt_tokens: promptTokens, completion_tokens: completionTokens };
-      if (reasoningTokens !== undefined) d.tokens.reasoning_tokens = reasoningTokens;
-      const escapedData = JSON.stringify(d).replace(/'/g, "''");
-      const escapedId = String(row.id).replace(/'/g, "''");
-      sqlLines.push(`UPDATE requestDetails SET data='${escapedData}' WHERE id='${escapedId}';`);
-      updated++;
-    } catch (e) {
-      console.error(`  row ${row.id} skipped: ${e.message}`);
-    }
-  }
-  sqlLines.push("COMMIT;");
-  fs.writeFileSync(tmpScript, sqlLines.join("\n"));
-  try {
-    execSync(`sqlite3 "${dbPath}" < "${tmpScript}"`, { stdio: ["ignore", "pipe", "pipe"] });
-    console.log(`Backfilled ${updated} rows. Usage page totals will now reflect real token spend.`);
-  } catch (e) {
-    console.error(`Failed to apply: ${e.message?.split("\n")?.[0] || e}`);
-    console.error(`SQL script left at ${tmpScript} for inspection.`);
-    process.exit(2);
-  }
-  try { fs.unlinkSync(tmpScript); } catch { /* ignore */ }
+  // Kept so any script that calls it keeps working, but it no longer does the work
+  // itself. It used to shell out to the `sqlite3` CLI, which is not present on a
+  // stock Windows install, so it exited with a raw Node stack there. The same
+  // backfill now runs unconditionally at every server start via
+  // autoBackfillTokensIfNeeded() in src/shared/services/initializeApp.js, in pure JS
+  // through the app's own DB adapter — no external binary, no shell quoting.
+  console.log("Token backfill now runs automatically every time kRouter starts.");
+  console.log("Nothing to do here — start kRouter normally and it will be applied.");
   process.exit(0);
 }
 
@@ -141,23 +112,49 @@ let skipUpdate = false;
 let showLog = false;
 let trayMode = false;
 
+// `--flag=value` is the other half of the convention people expect; it used to fall
+// through every branch and be dropped in silence, so `--port=3000` started the server
+// on the default port instead.
+function splitInlineValue(arg) {
+  const eq = arg.indexOf("=");
+  if (!arg.startsWith("-") || eq < 0) return null;
+  return { flag: arg.slice(0, eq), value: arg.slice(eq + 1) };
+}
+
 for (let i = 0; i < args.length; i++) {
-  if (args[i] === "--port" || args[i] === "-p") {
-    port = parseInt(args[i + 1], 10) || DEFAULT_PORT;
-    i++;
-  } else if (args[i] === "--host" || args[i] === "-H") {
-    host = args[i + 1] || DEFAULT_HOST;
-    i++;
-  } else if (args[i] === "--no-browser" || args[i] === "-n") {
+  const inline = splitInlineValue(args[i]);
+  const arg = inline ? inline.flag : args[i];
+  // Reading a value consumes the next argv entry only when it was not inlined.
+  const takeValue = () => (inline ? inline.value : args[++i]);
+
+  if (arg === "--port" || arg === "-p") {
+    const raw = takeValue();
+    // parseInt used to accept "3000abc" as 3000 and turn a typo, an empty value or a
+    // missing one into DEFAULT_PORT — which is then force-freed by killProcessOnPort.
+    // Silently starting on a different port than asked is worse than refusing.
+    const parsed = Number(raw);
+    if (raw === undefined || raw === "" || !Number.isInteger(parsed) || parsed < 1 || parsed > 65535) {
+      console.error(`Invalid --port value: ${raw === undefined || raw === "" ? "(missing)" : raw}. Expected an integer between 1 and 65535.`);
+      process.exit(2);
+    }
+    port = parsed;
+  } else if (arg === "--host" || arg === "-H") {
+    const raw = takeValue();
+    if (!raw) {
+      console.error("Invalid --host value: (missing). Expected a hostname or IP, e.g. 127.0.0.1.");
+      process.exit(2);
+    }
+    host = raw;
+  } else if (arg === "--no-browser" || arg === "-n") {
     noBrowser = true;
-  } else if (args[i] === "--log" || args[i] === "-l") {
+  } else if (arg === "--log" || arg === "-l") {
     showLog = true;
-  } else if (args[i] === "--skip-update") {
+  } else if (arg === "--skip-update") {
     skipUpdate = true;
-  } else if (args[i] === "--tray" || args[i] === "-t") {
+  } else if (arg === "--tray" || arg === "-t") {
     trayMode = true;
     process.env.TRAY_MODE = "1";
-  } else if (args[i] === "--help" || args[i] === "-h") {
+  } else if (arg === "--help" || arg === "-h") {
     console.log(`
 Usage: ${APP_NAME} [options]
 
@@ -172,9 +169,16 @@ Options:
   -v, --version       Show version
 `);
     process.exit(0);
-  } else if (args[i] === "--version" || args[i] === "-v") {
+  } else if (arg === "--version" || arg === "-v") {
     console.log(pkg.version);
     process.exit(0);
+  } else {
+    // No terminal branch existed, so anything unrecognised was dropped without a
+    // word: `krouter --prot 3000` or `krouter start` ran on the default port and
+    // looked like it had worked.
+    console.error(`Unknown option: ${args[i]}`);
+    console.error(`Run \`${APP_NAME} --help\` to see the available options.`);
+    process.exit(2);
   }
 }
 
@@ -278,58 +282,92 @@ function killAllAppProcesses(appPort) {
       if (platform === "win32") {
         // Windows: use WMI to get full CommandLine (tasklist /V doesn't include it)
         try {
-          const psCmd = `powershell -NonInteractive -WindowStyle Hidden -Command "Get-WmiObject Win32_Process -Filter 'Name=\\"node.exe\\"' | Select-Object ProcessId,CommandLine | ConvertTo-Csv -NoTypeInformation"`;
+          // Same ancestry rule as the POSIX branch below: a bare "next-server" match
+          // would take down every Next server on the machine, our own being
+          // indistinguishable from anyone else's by command line.
+          const psCmd = `powershell -NonInteractive -WindowStyle Hidden -Command "Get-WmiObject Win32_Process -Filter 'Name=\\"node.exe\\"' | Select-Object ProcessId,ParentProcessId,CommandLine | ConvertTo-Csv -NoTypeInformation"`;
           const output = execSync(psCmd, {
             encoding: "utf8",
             windowsHide: true,
             timeout: 5000
           });
-          const lines = output.split("\n").slice(1).filter(l => l.trim());
-          lines.forEach(line => {
-            // Whitelist: real node process running krouter cli.js, or next-server.
-            // Avoids killing editors/grep/strace/cursor that just incidentally match the name.
-            const cmd = line.toLowerCase();
-            const hasAppName = cmd.includes("krouter");
-            const hasAppPath = cmd.includes("cli.js") || cmd.includes("\\krouter") || cmd.includes("/krouter");
-            const isAppProcess =
-              (cmd.includes("node") && hasAppName && hasAppPath)
-              || cmd.includes("next-server");
-            if (isAppProcess) {
-              const match = line.match(/^"(\d+)"/);
-              if (match && match[1] && match[1] !== process.pid.toString()) {
-                pids.push(match[1]);
-              }
+          const rows = output.split("\n").slice(1).filter(l => l.trim()).map(line => {
+            const m = line.match(/^"(\d+)","(\d+)",(.*)$/);
+            return m ? { pid: m[1], ppid: m[2], cmd: (m[3] || "").toLowerCase() } : null;
+          }).filter(Boolean);
+
+          // Same rule as the POSIX branch: the invoked script, not any mention of it.
+          const isCliInvocation = (cmd) =>
+            /(^|[\s"'])[^\s"']*[\/\\]krouter[\/\\]cli\.js(\s|$|["'])/i.test(cmd) ||
+            /(^|[\s"'])[^\s"']*[\/\\]\.bin[\/\\]krouter(\s|$|["'])/i.test(cmd);
+          const roots = new Set(rows.filter(r => isCliInvocation(r.cmd)).map(r => r.pid));
+          const byParent = new Map();
+          for (const r of rows) {
+            if (!byParent.has(r.ppid)) byParent.set(r.ppid, []);
+            byParent.get(r.ppid).push(r.pid);
+          }
+          const doomed = new Set(roots);
+          const queue = [...roots];
+          while (queue.length) {
+            for (const child of byParent.get(queue.shift()) || []) {
+              if (!doomed.has(child)) { doomed.add(child); queue.push(child); }
             }
-          });
+          }
+          for (const pid of doomed) {
+            if (pid !== process.pid.toString()) pids.push(pid);
+          }
         } catch (e) {
           // No processes found or error - continue
         }
       } else {
-        // macOS/Linux: use ps to find all matching processes
+        // macOS/Linux. Identify our own processes by ancestry, never by name.
+        //
+        // Next renames its server process to a bare "next-server (v16.3.1)" -- no path,
+        // no project, nothing tying it to an app. Matching that string killed every
+        // Next server on the machine, so starting kRouter SIGKILLed a developer's
+        // unrelated dev server. The whitelist above it could not help: our own server
+        // matches by that string and nothing else, so the two are indistinguishable
+        // from the command line alone. Ancestry is the only thing that separates them.
         try {
-          const output = execSync('ps aux 2>/dev/null', {
+          const output = execSync('ps -Ao pid,ppid,command 2>/dev/null', {
             encoding: 'utf8',
             timeout: 5000
           });
-          const lines = output.split('\n');
-
-          lines.forEach(line => {
-            // Whitelist: real node process running krouter cli.js, or next-server.
-            // Avoids killing grep/strace/editors/cursor that incidentally match the name.
-            const cmd = line.toLowerCase();
-            const hasAppName = cmd.includes("krouter");
-            const hasAppPath = cmd.includes("cli.js") || cmd.includes("/krouter");
-            const isAppProcess =
-              (cmd.includes("node") && hasAppName && hasAppPath)
-              || cmd.includes("next-server");
-            if (isAppProcess) {
-              const parts = line.trim().split(/\s+/);
-              const pid = parts[1];
-              if (pid && !isNaN(pid) && pid !== process.pid.toString()) {
-                pids.push(pid);
-              }
+          const rows = output.split('\n').slice(1)
+            .map(l => l.trim().match(/^(\d+)\s+(\d+)\s+(.*)$/))
+            .filter(Boolean)
+            .map(m => ({ pid: m[1], ppid: m[2], cmd: m[3].toLowerCase() }));
+
+          // Roots: node processes whose *invoked script* is this CLI. Testing for
+          // "krouter" anywhere in the command line would promote any process that
+          // merely mentions the app -- a grep, an editor, a script taking the path as
+          // an argument -- into a root, and every descendant of a root is killed.
+          // Match the argv[1] path instead.
+          const isCliInvocation = (cmd) =>
+            /(^|[\s"'])[^\s"']*[\/\\]krouter[\/\\]cli\.js(\s|$|["'])/i.test(cmd) ||
+            /(^|[\s"'])[^\s"']*[\/\\]\.bin[\/\\]krouter(\s|$|["'])/i.test(cmd);
+          const roots = new Set(
+            rows.filter(r => r.cmd.includes("node") && isCliInvocation(r.cmd)).map(r => r.pid)
+          );
+
+          // Everything descended from a root, however deep. Next spawns its server as
+          // a child, so this reaches it without ever matching on "next-server".
+          const byParent = new Map();
+          for (const r of rows) {
+            if (!byParent.has(r.ppid)) byParent.set(r.ppid, []);
+            byParent.get(r.ppid).push(r.pid);
+          }
+          const doomed = new Set(roots);
+          const queue = [...roots];
+          while (queue.length) {
+            for (const child of byParent.get(queue.shift()) || []) {
+              if (!doomed.has(child)) { doomed.add(child); queue.push(child); }
             }
-          });
+          }
+
+          for (const pid of doomed) {
+            if (pid !== process.pid.toString()) pids.push(pid);
+          }
         } catch (e) {
           // No processes found or error - continue
         }
@@ -408,6 +446,42 @@ function killProxyByPidFile() {
   } catch { }
 }
 
+// Is this PID one of our own server processes?
+//
+// killProcessOnPort used to kill-9 whatever `lsof -ti:PORT` returned, with no check on
+// what it was. `krouter --port 3000` destroyed the user's own app on 3000 and
+// `--port 5432` took out their Postgres, silently and before anything was printed.
+//
+// An orphaned kRouter server is the hard case: its parent CLI is gone, so ancestry
+// cannot reach it, and Next has renamed it to a bare "next-server (vX)", so the command
+// line says nothing either. spawnServer pins cwd to standaloneDir, and that survives
+// both — it is the one durable marker of "this install's server".
+function isOwnServerPid(pid) {
+  try {
+    const mine = fs.realpathSync(standaloneDir);
+    if (process.platform === "linux") {
+      return fs.realpathSync(`/proc/${pid}/cwd`) === mine;
+    }
+    if (process.platform === "darwin") {
+      const out = execSync(`lsof -a -p ${pid} -d cwd -Fn 2>/dev/null`, {
+        encoding: "utf8", timeout: 3000, stdio: ["pipe", "pipe", "ignore"],
+      });
+      const line = out.split("\n").find((l) => l.startsWith("n"));
+      return !!line && fs.realpathSync(line.slice(1).trim()) === mine;
+    }
+    if (process.platform === "win32") {
+      // No cheap cwd read on Windows. Fall back to the executable path, which for our
+      // server points inside the package directory.
+      const out = execSync(
+        `powershell -NonInteractive -WindowStyle Hidden -Command "(Get-Process -Id ${pid} -ErrorAction SilentlyContinue).Path"`,
+        { encoding: "utf8", windowsHide: true, timeout: 4000 }
+      ).trim();
+      return !!out && out.toLowerCase().includes("krouter");
+    }
+  } catch { /* process gone, or no permission to inspect it — treat as not ours */ }
+  return false;
+}
+
 // Kill ALL processes listening on the given port. Returns true if any were killed.
 // Previous version: on Windows only killed the first PID from netstat, missing
 // parent/child pairs (next-server has a watcher + worker). Now sweeps all PIDs.
@@ -417,6 +491,7 @@ function killProcessOnPort(port) {
     try {
       const platform = process.platform;
       const pidsToKill = new Set();
+      const foreign = [];
 
       if (platform === "win32") {
         try {
@@ -428,7 +503,9 @@ function killProcessOnPort(port) {
           }).trim();
           output.split('\n').filter(l => l.includes('LISTENING')).forEach(line => {
             const pid = line.trim().split(/\s+/).pop();
-            if (pid && /^\d+$/.test(pid) && pid !== String(process.pid)) pidsToKill.add(pid);
+            if (!pid || !/^\d+$/.test(pid) || pid === String(process.pid)) return;
+            if (isOwnServerPid(pid)) pidsToKill.add(pid);
+            else foreign.push(pid);
           });
           for (const pid of pidsToKill) {
             try {
@@ -447,7 +524,11 @@ function killProcessOnPort(port) {
             stdio: ['pipe', 'pipe', 'ignore']
           }).trim();
           pidOutput.split('\n').filter(Boolean).forEach(pid => {
-            if (pid !== String(process.pid)) pidsToKill.add(pid);
+            if (pid === String(process.pid)) return;
+            // Only ever kill our own server. Anything else holding the port is the
+            // user's — say so and let them choose the port, rather than killing it.
+            if (isOwnServerPid(pid)) pidsToKill.add(pid);
+            else foreign.push(pid);
           });
           for (const pid of pidsToKill) {
             try {
@@ -460,6 +541,26 @@ function killProcessOnPort(port) {
         }
       }
 
+      // Something that is not ours is holding the port. Say so and name it, instead
+      // of failing to start with no explanation -- the caller only learns "port busy".
+      if (foreign.length) {
+        const described = foreign.map((pid) => {
+          try {
+            const name = platform === "win32"
+              ? execSync(`powershell -NonInteractive -WindowStyle Hidden -Command "(Get-Process -Id ${pid} -ErrorAction SilentlyContinue).ProcessName"`,
+                  { encoding: "utf8", windowsHide: true, timeout: 4000 }).trim()
+              : execSync(`ps -p ${pid} -o comm= 2>/dev/null`, { encoding: "utf8", timeout: 3000 }).trim();
+            return name ? `${name} (pid ${pid})` : `pid ${pid}`;
+          } catch { return `pid ${pid}`; }
+        });
+        console.error(`\n⚠️  Port ${port} is held by ${described.join(", ")} — not kRouter.`);
+        console.error(`   Refusing to kill it. Start kRouter on another port, e.g. --port ${port + 1}.\n`);
+        // Exit rather than fall through: we deliberately did not free the port, so
+        // every subsequent bind attempt fails. The retry path treats EADDRINUSE as
+        // transient and would spin here forever.
+        process.exit(1);
+      }
+
       // Wait for kernel to release the socket (Windows is slow here, give it 1s).
       // Then verify the port is actually free — if not, surface the result so
       // the caller can decide whether to retry or fail-fast.
@@ -648,6 +749,10 @@ function startServer(latestVersion) {
     const lanIp = getLanIp();
     if (lanIp) {
       console.log(`\x1b[33m⚠ Network-exposed: reachable at http://${lanIp}:${port} (bound 0.0.0.0). Use --host 127.0.0.1 for local-only.\x1b[0m`);
+      // Remote callers already need an API key for /v1/* and a login for the
+      // dashboard, so the exposure is bounded. Say so, rather than leaving the
+      // reader to guess whether their provider quota is reachable.
+      console.log(`\x1b[33m  Remote callers still need an API key for /v1/* and a login for the dashboard.\x1b[0m`);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sifxprime/krouter",
-  "version": "0.5.146",
+  "version": "0.5.148",
   "description": "kRouter (Kodelyth Router) CLI — Kodelyth AI Infrastructure",
   "homepage": "https://github.com/sifxprime/krouter",
   "repository": {

package/src/cli/tray/tray.ps1

@@ -48,26 +48,50 @@ function Set-Tooltip($text) {
   $script:notifyIcon.Text = $text
 }
 
-# Background reader thread polls stdin via timer on UI thread
+# stdin is polled from a System.Windows.Forms.Timer, whose Tick runs on the very
+# thread Application::Run() pumps. The previous loop guarded on [Console]::In.Peek(),
+# which does not return -1 on an open-but-idle pipe -- it blocks until the next byte
+# arrives. So the first tick after the startup burst never returned, the message pump
+# stopped, and the tray icon appeared but ignored every click: no menu, no Quit.
+#
+# [Console]::In is a SyncTextReader whose ReadLineAsync() is synchronous too, so it
+# cannot be used either. Read the raw handle through our own StreamReader and poll a
+# genuinely async task, so the Tick handler always returns immediately.
+$script:stdin   = New-Object System.IO.StreamReader([Console]::OpenStandardInput(), [System.Text.Encoding]::UTF8)
+$script:pending = $null
+
 $script:timer = New-Object System.Windows.Forms.Timer
 $script:timer.Interval = 100
 $script:timer.Add_Tick({
   try {
-    while ([Console]::In.Peek() -ne -1) {
-      $line = [Console]::In.ReadLine()
-      if ([string]::IsNullOrWhiteSpace($line)) { continue }
-      $cmd = $line | ConvertFrom-Json
-      switch ($cmd.action) {
-        "add-item"    { Add-MenuItem $cmd.index $cmd.title $cmd.enabled }
-        "update-item" { Update-MenuItem $cmd.index $cmd.title $cmd.enabled }
-        "set-tooltip" { Set-Tooltip $cmd.text }
-        "ready"       { Write-Event @{ type = "ready" } }
-        "kill"        {
-          $script:notifyIcon.Visible = $false
-          $script:notifyIcon.Dispose()
-          [System.Windows.Forms.Application]::Exit()
+    if ($null -eq $script:pending) { $script:pending = $script:stdin.ReadLineAsync() }
+    while ($script:pending.IsCompleted) {
+      $line = $script:pending.Result
+      $script:pending = $null
+      if ($null -eq $line) {
+        # EOF: the Node parent is gone. Exit instead of lingering as a dead icon the
+        # user can only clear through Task Manager.
+        $script:notifyIcon.Visible = $false
+        $script:notifyIcon.Dispose()
+        [System.Windows.Forms.Application]::Exit()
+        return
+      }
+      if (-not [string]::IsNullOrWhiteSpace($line)) {
+        $cmd = $line | ConvertFrom-Json
+        switch ($cmd.action) {
+          "add-item"    { Add-MenuItem $cmd.index $cmd.title $cmd.enabled }
+          "update-item" { Update-MenuItem $cmd.index $cmd.title $cmd.enabled }
+          "set-tooltip" { Set-Tooltip $cmd.text }
+          "ready"       { Write-Event @{ type = "ready" } }
+          "kill"        {
+            $script:notifyIcon.Visible = $false
+            $script:notifyIcon.Dispose()
+            [System.Windows.Forms.Application]::Exit()
+            return
+          }
         }
       }
+      $script:pending = $script:stdin.ReadLineAsync()
     }
   } catch {
     Write-Event @{ type = "error"; message = $_.Exception.Message }

package/src/cli/utils/input.js

@@ -157,7 +157,19 @@ async function selectMenu(title, items, defaultIndex = 0, subtitle = "", headerC
       if (key.name === "down") return move(1);
       if (key.name === "return") { cleanup(); resolve(selectedIndex); return; }
       if (key.name === "escape") { cleanup(); resolve(-1); return; }
-      if (key.ctrl && key.name === "c") { cleanup(); process.exit(0); }
+      if (key.ctrl && key.name === "c") {
+        cleanup();
+        // Raw mode clears termios ISIG, so Ctrl-C arrives here as an ordinary
+        // keypress rather than as SIGINT. Exiting straight from here skipped
+        // cli.js's SIGINT handler -- the only thing that kills the detached server
+        // child, the privileged MITM process and any tunnel -- so quitting from the
+        // menu left all three running with no UI left to stop them. Restore cooked
+        // mode and re-raise the signal so that handler actually runs.
+        try { process.stdin.setRawMode(false); } catch {}
+        rawPrimed = false;
+        process.kill(process.pid, "SIGINT");
+        return;
+      }
     };
 
     process.stdin.on("keypress", onKeypress);

package/app/.next-cli-build/server/chunks/4055.js

@@ -1,9 +0,0 @@
-"use strict";exports.id=4055,exports.ids=[4055],exports.modules={4055:(a,b,c)=>{c.d(b,{runMigrationOnce:()=>w});var d=c(73024),e=c.n(d),f=c(76760),g=c.n(f),h=c(7841),i=c(76040);let j=[{version:1,name:"initial",up(a){for(let[b,c]of Object.entries(i.CG))for(let d of(a.exec((0,i.zE)(b,c)),c.indexes||[]))a.exec(d)}}].sort((a,b)=>a.version-b.version);var k=c(91117);let l=null;function m(){if(l)return l;try{let a=g().join(process.cwd(),"package.json");l=JSON.parse(e().readFileSync(a,"utf-8")).version||"0.0.0"}catch{l="0.0.0"}return l}function n(a){(0,h.Jh)();let b=m(),c=`${a}-${b}-${function(a=new Date){let b=a=>String(a).padStart(2,"0");return`${a.getFullYear()}${b(a.getMonth()+1)}${b(a.getDate())}-${b(a.getHours())}${b(a.getMinutes())}${b(a.getSeconds())}`}()}`,d=g().join(h.KQ,c);return e().mkdirSync(d,{recursive:!0}),d}function o(a,b,c=null){if(!e().existsSync(a))return null;let d=c||g().basename(a),f=g().join(b,d);return e().copyFileSync(a,f),f}function p(){if(e().existsSync(h.KQ))for(let a of e().readdirSync(h.KQ,{withFileTypes:!0}).filter(a=>a.isDirectory()).map(a=>({name:a.name,full:g().join(h.KQ,a.name),mtime:e().statSync(g().join(h.KQ,a.name)).mtimeMs})).sort((a,b)=>b.mtime-a.mtime).slice(5))try{e().rmSync(a.full,{recursive:!0,force:!0})}catch{}}var q=c(33323);let r=g().join(h.HG,".migrated-from-json"),s=new WeakSet;class t extends Error{constructor(a,b){super(a),this.name="MigrationAborted",this.droppedRows=b}}function u(a,b,c,d,e){let f=[];for(let a of c)try{d(a)}catch(b){f.push({...e(a),reason:b.message})}let g=a.get(`SELECT COUNT(*) as c FROM ${b}`)?.c??0;if(g!==c.length)throw console.warn(`[DB][migrate] ${b} row-count mismatch: expected ${c.length}, got ${g}. Dropped:`,f),new t(`${b} row-count mismatch: expected ${c.length}, got ${g}`,f)}function v(a){if(!e().existsSync(a))return null;try{return JSON.parse(e().readFileSync(a,"utf-8"))}catch{return null}}async function w(a){if(s.has(a))return;s.add(a);let b=function(a){try{let b=a.get("SELECT COUNT(*) as c FROM _meta");return!b||0===b.c}catch{return!0}}(a),c=function(a){a.exec((0,i.zE)("_meta",i.CG._meta));let b=parseInt((0,k.dy)(a,"schemaVersion","0"),10)||0;if(b>=(j.length?j[j.length-1].version:0))return{applied:0,from:b,to:b};let c=j.filter(a=>a.version>b),d=b;for(let b of c)a.transaction(()=>{b.up(a),(0,k.np)(a,"schemaVersion",b.version)}),d=b.version,console.log(`[DB][migrate] applied #${b.version} ${b.name}`);return{applied:c.length,from:b,to:d}}(a);for(let[b,c]of Object.entries(i.CG)){a.exec((0,i.zE)(b,c));let d=new Set(a.all(`PRAGMA table_info(${b})`).map(a=>a.name));for(let[e,f]of Object.entries(c.columns))if(!d.has(e)){let c=f.replace(/PRIMARY KEY( AUTOINCREMENT)?/i,"").replace(/UNIQUE/i,"").trim();try{a.exec(`ALTER TABLE ${b} ADD COLUMN ${e} ${c}`),console.log(`[DB][sync] +column ${b}.${e}`)}catch(a){console.warn(`[DB][sync] add column ${b}.${e} failed: ${a.message}`)}}for(let b of c.indexes||[])try{a.exec(b)}catch{}}let d=e().existsSync(r),f=v(h.Or.main),g=v(h.Or.usage),l=v(h.Or.disabled),w=v(h.Or.details);if(b&&(f||g||l||w)&&!d){let b=Date.now(),c=n("migrate-from-json");for(let a of Object.values(h.Or))o(a,c);try{a.transaction(()=>{if(f&&"object"==typeof f){for(let[b,c]of(f.settings&&a.run("INSERT INTO settings(id, data) VALUES(1, ?) ON CONFLICT(id) DO UPDATE SET data = excluded.data",[(0,q.s)(f.settings)]),u(a,"providerConnections",f.providerConnections||[],b=>{let{id:c,provider:d,authType:e,name:f,email:g,priority:h,isActive:i,createdAt:j,updatedAt:k,...l}=b;a.run("INSERT OR REPLACE INTO providerConnections(id, provider, authType, name, email, priority, isActive, data, createdAt, updatedAt) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",[c,d,e||"oauth",f||null,g||null,h||null,+(!1!==i),(0,q.s)(l),j||new Date().toISOString(),k||new Date().toISOString()])},a=>({id:a.id??null,provider:a.provider??null,name:a.name??null})),u(a,"providerNodes",f.providerNodes||[],b=>{let{id:c,type:d,name:e,createdAt:f,updatedAt:g,...h}=b;a.run("INSERT OR REPLACE INTO providerNodes(id, type, name, data, createdAt, updatedAt) VALUES(?, ?, ?, ?, ?, ?)",[c,d||null,e||null,(0,q.s)(h),f||new Date().toISOString(),g||new Date().toISOString()])},a=>({id:a.id??null,type:a.type??null,name:a.name??null})),u(a,"proxyPools",f.proxyPools||[],b=>{let{id:c,isActive:d,testStatus:e,createdAt:f,updatedAt:g,...h}=b;a.run("INSERT OR REPLACE INTO proxyPools(id, isActive, testStatus, data, createdAt, updatedAt) VALUES(?, ?, ?, ?, ?, ?)",[c,+(!1!==d),e||"unknown",(0,q.s)(h),f||new Date().toISOString(),g||new Date().toISOString()])},a=>({id:a.id??null})),u(a,"apiKeys",f.apiKeys||[],b=>{a.run("INSERT OR REPLACE INTO apiKeys(id, key, name, machineId, isActive, createdAt) VALUES(?, ?, ?, ?, ?, ?)",[b.id,b.key,b.name||null,b.machineId||null,+(!1!==b.isActive),b.createdAt||new Date().toISOString()])},a=>({id:a.id??null,name:a.name??null})),u(a,"combos",f.combos||[],b=>{a.run("INSERT OR REPLACE INTO combos(id, name, kind, models, createdAt, updatedAt) VALUES(?, ?, ?, ?, ?, ?)",[b.id,b.name,b.kind||null,(0,q.s)(b.models||[]),b.createdAt||new Date().toISOString(),b.updatedAt||new Date().toISOString()])},a=>({id:a.id??null,name:a.name??null})),Object.entries(f.modelAliases||{})))a.run("INSERT OR REPLACE INTO kv(scope, key, value) VALUES('modelAliases', ?, ?)",[b,(0,q.s)(c)]);for(let b of f.customModels||[]){let c=`${b.providerAlias}|${b.id}|${b.type||"llm"}`;a.run("INSERT OR REPLACE INTO kv(scope, key, value) VALUES('customModels', ?, ?)",[c,(0,q.s)(b)])}for(let[b,c]of Object.entries(f.mitmAlias||{}))a.run("INSERT OR REPLACE INTO kv(scope, key, value) VALUES('mitmAlias', ?, ?)",[b,(0,q.s)(c||{})]);for(let[b,c]of Object.entries(f.pricing||{}))a.run("INSERT OR REPLACE INTO kv(scope, key, value) VALUES('pricing', ?, ?)",[b,(0,q.s)(c||{})])}if(g&&"object"==typeof g){for(let b of g.history||[]){let c=b.tokens||{};a.run("INSERT INTO usageHistory(timestamp, provider, model, connectionId, apiKey, endpoint, promptTokens, completionTokens, cost, status, tokens, meta) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",[b.timestamp||new Date().toISOString(),b.provider||null,b.model||null,b.connectionId||null,b.apiKey||null,b.endpoint||null,c.prompt_tokens||c.input_tokens||0,c.completion_tokens||c.output_tokens||0,b.cost||0,b.status||"ok",(0,q.s)(c),(0,q.s)({})])}for(let[b,c]of Object.entries(g.dailySummary||{}))a.run("INSERT OR REPLACE INTO usageDaily(dateKey, data) VALUES(?, ?)",[b,(0,q.s)(c)]);"number"==typeof g.totalRequestsLifetime&&(0,k.np)(a,"totalRequestsLifetime",g.totalRequestsLifetime)}if(l&&"object"==typeof l.disabled)for(let[b,c]of Object.entries(l.disabled))a.run("INSERT OR REPLACE INTO kv(scope, key, value) VALUES('disabledModels', ?, ?)",[b,(0,q.s)(c||[])]);if(w&&Array.isArray(w.records))for(let b of w.records)a.run("INSERT OR REPLACE INTO requestDetails(id, timestamp, provider, model, connectionId, status, data) VALUES(?, ?, ?, ?, ?, ?, ?)",[b.id,b.timestamp||new Date().toISOString(),b.provider||null,b.model||null,b.connectionId||null,b.status||null,(0,q.s)(b)]);(0,k.np)(a,"appVersion",m()),(0,k.np)(a,"migratedAt",new Date().toISOString())})}catch(a){if(a instanceof t)return void console.error(`[DB][migrate] aborted: ${a.message} | legacy JSON kept | backup: ${c}`);throw a}try{e().writeFileSync(r,new Date().toISOString())}catch{}p(),console.log(`[DB][migrate] JSON → SQLite in ${Date.now()-b}ms | legacy JSON kept at DATA_DIR | backup: ${c}`);return}if(b)return void(0,k.np)(a,"appVersion",m());let x=(0,k.dy)(a,"appVersion",null),y=m();if(x&&x!==y){let b=n(`upgrade-${x}-to-${y}`);try{o(h.AL,b)}catch{}(0,k.np)(a,"appVersion",y),p(),console.log(`[DB][migrate] App ${x} → ${y} | schema ${c.from} → ${c.to} | backup: ${b}`)}else if(c.applied>0){let a=n(`schema-${c.from}-to-${c.to}`);try{o(h.AL,a)}catch{}p()}}},76040:(a,b,c)=>{c.d(b,{CG:()=>e,oG:()=>d,zE:()=>f});let d=`
-PRAGMA journal_mode = WAL;
-PRAGMA synchronous = NORMAL;
-PRAGMA temp_store = MEMORY;
-PRAGMA mmap_size = 30000000;
-PRAGMA cache_size = -64000;
-PRAGMA foreign_keys = ON;
-PRAGMA busy_timeout = 5000;
-`,e={_meta:{columns:{key:"TEXT PRIMARY KEY",value:"TEXT NOT NULL"}},settings:{columns:{id:"INTEGER PRIMARY KEY CHECK (id = 1)",data:"TEXT NOT NULL"}},providerConnections:{columns:{id:"TEXT PRIMARY KEY",provider:"TEXT NOT NULL",authType:"TEXT NOT NULL",name:"TEXT",email:"TEXT",priority:"INTEGER",isActive:"INTEGER DEFAULT 1",data:"TEXT NOT NULL",createdAt:"TEXT NOT NULL",updatedAt:"TEXT NOT NULL"},indexes:["CREATE INDEX IF NOT EXISTS idx_pc_provider ON providerConnections(provider)","CREATE INDEX IF NOT EXISTS idx_pc_provider_active ON providerConnections(provider, isActive)","CREATE INDEX IF NOT EXISTS idx_pc_priority ON providerConnections(provider, priority)"]},providerNodes:{columns:{id:"TEXT PRIMARY KEY",type:"TEXT",name:"TEXT",data:"TEXT NOT NULL",createdAt:"TEXT NOT NULL",updatedAt:"TEXT NOT NULL"},indexes:["CREATE INDEX IF NOT EXISTS idx_pn_type ON providerNodes(type)"]},proxyPools:{columns:{id:"TEXT PRIMARY KEY",isActive:"INTEGER DEFAULT 1",testStatus:"TEXT",data:"TEXT NOT NULL",createdAt:"TEXT NOT NULL",updatedAt:"TEXT NOT NULL"},indexes:["CREATE INDEX IF NOT EXISTS idx_pp_active ON proxyPools(isActive)","CREATE INDEX IF NOT EXISTS idx_pp_status ON proxyPools(testStatus)"]},apiKeys:{columns:{id:"TEXT PRIMARY KEY",key:"TEXT UNIQUE NOT NULL",name:"TEXT",machineId:"TEXT",isActive:"INTEGER DEFAULT 1",createdAt:"TEXT NOT NULL"},indexes:["CREATE INDEX IF NOT EXISTS idx_ak_key ON apiKeys(key)"]},combos:{columns:{id:"TEXT PRIMARY KEY",name:"TEXT UNIQUE NOT NULL",kind:"TEXT",models:"TEXT NOT NULL",createdAt:"TEXT NOT NULL",updatedAt:"TEXT NOT NULL"},indexes:["CREATE INDEX IF NOT EXISTS idx_combo_name ON combos(name)"]},kv:{columns:{scope:"TEXT NOT NULL",key:"TEXT NOT NULL",value:"TEXT NOT NULL"},primaryKey:"PRIMARY KEY (scope, key)",indexes:["CREATE INDEX IF NOT EXISTS idx_kv_scope ON kv(scope)"]},usageHistory:{columns:{id:"INTEGER PRIMARY KEY AUTOINCREMENT",timestamp:"TEXT NOT NULL",provider:"TEXT",model:"TEXT",connectionId:"TEXT",apiKey:"TEXT",endpoint:"TEXT",promptTokens:"INTEGER DEFAULT 0",completionTokens:"INTEGER DEFAULT 0",cost:"REAL DEFAULT 0",status:"TEXT",tokens:"TEXT",meta:"TEXT"},indexes:["CREATE INDEX IF NOT EXISTS idx_uh_ts ON usageHistory(timestamp DESC)","CREATE INDEX IF NOT EXISTS idx_uh_provider ON usageHistory(provider)","CREATE INDEX IF NOT EXISTS idx_uh_model ON usageHistory(model)","CREATE INDEX IF NOT EXISTS idx_uh_conn ON usageHistory(connectionId)"]},usageDaily:{columns:{dateKey:"TEXT PRIMARY KEY",data:"TEXT NOT NULL"}},requestDetails:{columns:{id:"TEXT PRIMARY KEY",timestamp:"TEXT NOT NULL",provider:"TEXT",model:"TEXT",connectionId:"TEXT",status:"TEXT",data:"TEXT NOT NULL"},indexes:["CREATE INDEX IF NOT EXISTS idx_rd_ts ON requestDetails(timestamp DESC)","CREATE INDEX IF NOT EXISTS idx_rd_provider ON requestDetails(provider)","CREATE INDEX IF NOT EXISTS idx_rd_model ON requestDetails(model)","CREATE INDEX IF NOT EXISTS idx_rd_conn ON requestDetails(connectionId)"]}};function f(a,b){let c=Object.entries(b.columns).map(([a,b])=>`${a} ${b}`);return b.primaryKey&&c.push(b.primaryKey),`CREATE TABLE IF NOT EXISTS ${a} (${c.join(", ")})`}}};