9router 0.3.48 → 0.3.49

package/app/src/mitm/{server copy.js → server2.js}

@@ -3,6 +3,50 @@ const fs = require("fs");
 const path = require("path");
 const dns = require("dns");
 const { promisify } = require("util");
+const Database = require("better-sqlite3");
+
+const CURSOR_GLOBAL_DB = path.join(
+  process.env.HOME,
+  "Library/Application Support/Cursor/User/globalStorage/state.vscdb"
+);
+
+// Read full conversation from Cursor global DB
+function readConversationFromDb(conversationId) {
+  try {
+    const db = new Database(CURSOR_GLOBAL_DB, { readonly: true, fileMustExist: true });
+    const stmt = db.prepare("SELECT value FROM cursorDiskKV WHERE key=?");
+
+    const row = stmt.get(`composerData:${conversationId}`);
+    if (!row) { db.close(); return null; }
+
+    const composer = JSON.parse(row.value);
+    const headers = composer.fullConversationHeadersOnly || [];
+    const name = composer.name || "";
+
+    const messages = [];
+    for (const h of headers) {
+      const brow = stmt.get(`bubbleId:${conversationId}:${h.bubbleId}`);
+      if (!brow) continue;
+      const bubble = JSON.parse(brow.value);
+      const role = h.type === 1 ? "user" : "assistant";
+      const text = (bubble.text || "").trim();
+      const ts = bubble.createdAt || null;
+
+      // Tool call bubble (no text but has toolFormerData)
+      const tool = bubble.toolFormerData && bubble.toolFormerData.name
+        ? { name: bubble.toolFormerData.name, args: bubble.toolFormerData.rawArgs || null, status: bubble.toolFormerData.status || null }
+        : null;
+
+      if (!text && !tool) continue;
+      messages.push({ role, text: text || null, tool, ts });
+    }
+
+    db.close();
+    return { name, totalMessages: headers.length, messages };
+  } catch (e) {
+    return { error: e.message };
+  }
+}
 
 const INTERNAL_REQUEST_HEADER = { name: "x-request-source", value: "local" };
 
@@ -27,6 +71,8 @@ const CURSOR_JSONL = path.join(CURSOR_LOG_DIR, "cursor_messages.jsonl");
 const CURSOR_ENDPOINTS = [
   "/agent.v1.AgentService/RunPoll",
   "/aiserver.v1.BidiService/BidiAppend",
+  "/agent.v1.AgentService/Run",
+  "/agent.v1.AgentService/RunSSE",
 ];
 
 /**
@@ -265,29 +311,67 @@ function decodeBidiAppend(buf) {
   return result;
 }
 
-// AgentClientMessage oneof: f1=AgentRunRequest, f4=ConversationAction, f7=ClientHeartbeat
+// AgentClientMessage oneof: f1=AgentRunRequest, f2=ExecClientMessage, f3=KvClientMessage, f4=ConversationAction, f5=ExecClientControlMessage, f6=InteractionResponse, f7=ClientHeartbeat
 function decodeAgentClientMsg(buf) {
   const fields = protoWalkFields(buf);
   for (const f of fields) {
-    if (!f.data) continue;
-    if (f.field === 1) return { type: "AgentRunRequest", ...decodeAgentRunRequest(f.data) };
-    if (f.field === 4) return { type: "ConversationAction", ...decodeConversationAction(f.data) };
+    // f7=ClientHeartbeat: wire-type 2 but empty (len=0), data is Buffer(0)
     if (f.field === 7) return { type: "ClientHeartbeat" };
-    if (f.field === 2) return { type: "ExecClientMessage" };
+    if (f.data === undefined || f.data === null) continue;
+    if (f.field === 1 && f.data.length > 0) return { type: "AgentRunRequest", ...decodeAgentRunRequest(f.data) };
+    if (f.field === 2 && f.data.length > 0) return { type: "ExecClientMessage", ...decodeExecClientMessage(f.data) };
+    if (f.field === 3) return { type: "KvClientMessage" };
+    if (f.field === 4 && f.data.length > 0) return { type: "ConversationAction", ...decodeConversationAction(f.data) };
+    if (f.field === 5) return { type: "ExecClientControlMessage" };
+    if (f.field === 6) return { type: "InteractionResponse" };
   }
   return { type: "unknown" };
 }
 
-// AgentRunRequest: f1=conversation_state, f2=action, f3=model_details, f5=conversation_id
+// AgentRunRequest: f1=conversation_state, f2=action, f3=model_details, f4=mcp_tools, f5=conversation_id, f6=mcp_file_system_options, f7=skill_options
 function decodeAgentRunRequest(buf) {
   const fields = protoWalkFields(buf);
   const result = {};
 
   for (const f of fields) {
+    if (f.field === 1 && f.data) result.state = decodeConversationState(f.data);
+    if (f.field === 2 && f.data) result.action = decodeConversationAction(f.data);
     if (f.field === 3 && f.data) result.model = decodeModelDetails(f.data);
+    if (f.field === 4 && f.data) result.mcpTools = decodeMcpTools(f.data);
     if (f.field === 5 && f.data) result.conversationId = protoStr(f.data);
-    if (f.field === 2 && f.data) result.action = decodeConversationAction(f.data);
-    if (f.field === 1 && f.data) result.state = decodeConversationState(f.data);
+  }
+  return result;
+}
+
+// McpTools: f1=repeated McpDescriptor (f1=serverName, f2=repeated tools)
+function decodeMcpTools(buf) {
+  const fields = protoWalkFields(buf);
+  const descriptors = [];
+  for (const f of fields) {
+    if (f.field === 1 && f.data) {
+      const inner = protoWalkFields(f.data);
+      const name = inner.find(x => x.field === 1 && x.data);
+      const tools = inner.filter(x => x.field === 2 && x.data).map(t => {
+        const tf = protoWalkFields(t.data);
+        const tname = tf.find(x => x.field === 1 && x.data);
+        return tname ? protoStr(tname.data) : null;
+      }).filter(Boolean);
+      descriptors.push({ server: name ? protoStr(name.data) : null, tools });
+    }
+  }
+  return descriptors;
+}
+
+// ExecClientMessage: f1=id(uint32), f2=shellResult, f3=writeResult, etc.
+function decodeExecClientMessage(buf) {
+  const fields = protoWalkFields(buf);
+  const result = { id: null, execId: null, resultType: "unknown" };
+  for (const f of fields) {
+    if (f.field === 1 && f.value !== undefined) result.id = f.value;
+    if (f.field === 15 && f.data) result.execId = protoStr(f.data);
+    // Detect result type by field number (oneof)
+    const resultTypes = { 2: "shellResult", 3: "writeResult", 4: "deleteResult", 5: "grepResult", 7: "readResult", 8: "lsResult", 9: "diagnosticsResult", 10: "requestContextResult", 11: "mcpResult", 14: "shellStream", 16: "backgroundShellSpawnResult" };
+    if (f.data && resultTypes[f.field]) result.resultType = resultTypes[f.field];
   }
   return result;
 }
@@ -307,15 +391,19 @@ function decodeModelDetails(buf) {
   return result;
 }
 
-// ConversationAction: f1 → f1 → f1=text, f2=uuid, f8=lexical_json
-//                    f1 → f2 → repeated f2=turns, f7=selected_context, f23=system_prompt
+// ConversationAction: f1=StartChatAction → f1=userMsg{f1=text,f2=uuid,f8=lexical}, f2=history{f2=contextFiles,f7=tools}
 function decodeConversationAction(buf) {
   const result = {};
   const topFields = protoWalkFields(buf);
 
-  // action.f1 wrapper
-  const f1 = topFields.find(f => f.field === 1 && f.data);
-  if (!f1) return result;
+  // action.f1 = StartChatAction wrapper
+  const f1 = topFields.find(f => f.field === 1 && f.data && f.data.length > 0);
+  if (!f1) {
+    // No StartChatAction — show which fields are present for debugging
+    const presentFields = topFields.map(f => `f${f.field}`);
+    if (presentFields.length > 0) result._fields = presentFields;
+    return result;
+  }
   const f1Fields = protoWalkFields(f1.data);
 
   // ── User message: action.f1.f1 ──────────────────────────────
@@ -422,61 +510,126 @@ function protoTreeToObj(buf, depth = 0) {
     }
   }
   return result;
-
-  return result;
 }
 
-// ConversationStateStructure: f1=root_prompt_messages_json(bytes[]), f8=turns(bytes[])
+// ConversationStateStructure: f1=root_prompt_messages_json(encrypted bytes), f3=todos, f8=turns, f10=mode
 function decodeConversationState(buf) {
   const fields = protoWalkFields(buf);
-  const messages = [], turns = [];
+  const turns = [], todos = [];
+  let mode = null, messageCount = 0;
   for (const f of fields) {
+    if (f.field === 10 && f.value !== undefined) {
+      const modes = ["unspecified", "agent", "ask", "plan", "debug", "triage"];
+      mode = modes[f.value] || `mode_${f.value}`;
+    }
     if (!f.data) continue;
     if (f.field === 1) {
-      // root_prompt_messages_json — each is a bytes field containing JSON string
-      const s = protoStr(f.data);
-      if (s) { try { messages.push(JSON.parse(s)); } catch { messages.push(s.substring(0, 500)); } }
+      // Encrypted bytes — just count, cannot decode
+      messageCount++;
     } else if (f.field === 8) {
-      // turns — bytes, try get readable strings
+      // f8 = repeated bytes (ConversationTurn OR encrypted blob)
+      // Encrypted turns: binary blobs that don't parse as valid proto strings
+      if (f.data.length === 32) continue; // 32-byte encrypted blob
       const inner = protoWalkFields(f.data);
-      const strs = inner.filter(x => x.data && protoStr(x.data)).map(x => protoStr(x.data)).filter(s => s.length > 5);
-      if (strs.length) turns.push(strs.slice(0, 5));
+      const strs = inner.filter(x => x.data).map(x => protoStr(x.data)).filter(s => s && s.length > 3);
+      if (strs.length) turns.push(strs.slice(0, 3));
+    } else if (f.field === 3) {
+      // f3 = repeated bytes (TodoItem OR encrypted blob)
+      // Encrypted: 32-byte binary (shows as 64-char hex in protoStr-reject path)
+      // TodoItem: f1=id(str), f2=content(str), f3=status(varint)
+      if (f.data.length === 32) {
+        // 32 bytes = encrypted blob, skip
+        continue;
+      }
+      const inner = protoWalkFields(f.data);
+      const id = inner.find(x => x.field === 1 && x.data);
+      const content = inner.find(x => x.field === 2 && x.data);
+      const status = inner.find(x => x.field === 3 && x.value !== undefined);
+      const idStr = id ? protoStr(id.data) : null;
+      const contentStr = content ? protoStr(content.data) : null;
+      // If neither id nor content is readable string, it's encrypted
+      if (!idStr && !contentStr) continue;
+      const statusMap = ["unspecified", "pending", "in_progress", "completed", "cancelled"];
+      todos.push({
+        id: idStr,
+        content: contentStr,
+        status: status ? (statusMap[status.value] || `status_${status.value}`) : null,
+      });
     }
   }
-  return { messages: messages.slice(0, 10), turns: turns.slice(0, 5) };
+  return { mode, messageCount, turns: turns.slice(0, 5), todos: todos.slice(0, 20) };
 }
 
 // ── Save per-chat JSON file ────────────────────────────────────
 function saveCursorLogFull(url, headers, buf) {
   try {
-    if (!url.includes("BidiAppend") || buf.length < 2 || buf[0] !== 0x1f || buf[1] !== 0x8b) return;
+    if (buf.length < 5) return;
 
-    const decompressed = zlib.gunzipSync(buf);
+    const isBidiAppend = url.includes("BidiAppend");
+    const isRunPoll = url.includes("RunPoll");
+    if (!isBidiAppend && !isRunPoll) return;
 
+    // Decompress if gzip, otherwise use raw
+    let raw;
+    const isGzip = buf[0] === 0x1f && buf[1] === 0x8b;
+    if (isGzip) {
+      raw = zlib.gunzipSync(buf);
+    } else {
+      // Try strip Connect-RPC envelope if present (flag byte + 4-byte length)
+      raw = (buf[0] === 0x00 || buf[0] === 0x01) ? buf.slice(5) : buf;
+    }
 
-    const decoded = decodeBidiAppend(decompressed);
+    const endpoint = isBidiAppend ? "BidiAppend" : "RunPoll";
+    let decoded = {};
+    let userMessage = null;
 
-    const action = decoded?.agentMsg?.action || {};
-    const userMessage = action.textFull || action.text || null;
+    if (isBidiAppend) {
+      decoded = decodeBidiAppend(raw);
+      const action = decoded?.agentMsg?.action || {};
+      userMessage = action.textFull || action.text || null;
+    } else {
+      // RunPoll: BidiPollRequest — f1=requestId{f1=uuid}, f2=startRequest
+      const fields = protoWalkFields(raw);
+      for (const f of fields) {
+        if (f.field === 1 && f.data) {
+          const inner = protoWalkFields(f.data);
+          const id = inner.find(x => x.field === 1 && x.data);
+          decoded.requestId = id ? protoStr(id.data) : null;
+        }
+        if (f.field === 2) decoded.startRequest = f.value === 1;
+      }
+    }
+
+    // Fetch conversation history from local Cursor DB when AgentRunRequest detected
+    const conversationId = decoded?.agentMsg?.conversationId || null;
+    let conversation = null;
+    if (conversationId && decoded?.agentMsg?.type === "AgentRunRequest") {
+      conversation = readConversationFromDb(conversationId);
+    }
 
     const ts = new Date().toISOString().replace(/[:.]/g, "-");
-    const base = path.join(CURSOR_LOG_DIR, ts);
+    const base = path.join(CURSOR_LOG_DIR, `${ts}_${endpoint}`);
 
     // _chat.json — structured decoded
     fs.writeFileSync(`${base}_chat.json`, JSON.stringify({
       ts: new Date().toISOString(),
-      version: headers["x-cursor-client-version"],
-      sizeGzip: buf.length,
-      sizeRaw: decompressed.length,
+      endpoint,
+      version: headers["x-cursor-client-version"] || null,
+      encoding: isGzip ? "gzip" : "raw",
+      sizeIn: buf.length,
+      sizeRaw: raw.length,
       userMessage,
       decoded,
+      conversation,
     }, null, 2));
 
     // _decoded.json — full proto tree, no filtering
-    const tree = protoTreeToObj(decompressed);
+    const tree = protoTreeToObj(raw);
     fs.writeFileSync(`${base}_decoded.json`, JSON.stringify(tree, null, 2));
 
-    console.log(`[CURSOR] ${ts}_chat.json | type=${decoded?.agentMsg?.type} | msg=${userMessage || "(none)"}`);
+    const agentType = decoded?.agentMsg?.type || decoded?.requestId || "(none)";
+    const convName = conversation?.name ? ` | conv="${conversation.name}" (${conversation.totalMessages} msgs)` : "";
+    console.log(`[CURSOR] ${endpoint} | type=${agentType} | msg=${userMessage || "(none)"}${convName} | ${isGzip ? "gzip" : "raw"} ${buf.length}B`);
   } catch (e) {
     console.error(`[CURSOR] decode error: ${e.message}`);
   }

package/cli.js

@@ -123,17 +123,17 @@ function killAllAppProcesses() {
       if (platform === "win32") {
         // Windows: use tasklist + findstr (works on all Windows versions)
         try {
-          const output = execSync('tasklist /FO CSV /V 2>nul | findstr /I "node"', { 
+          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());
-          
+
           lines.forEach(line => {
-            const isAppProcess = line.toLowerCase().includes("9router") || 
-                                 line.toLowerCase().includes("next-server");
+            const isAppProcess = line.toLowerCase().includes("9router") ||
+              line.toLowerCase().includes("next-server");
             if (isAppProcess) {
               // CSV format: "name","pid",...
               const match = line.match(/"node\.exe","(\d+)"/i);
@@ -148,12 +148,12 @@ function killAllAppProcesses() {
       } else {
         // macOS/Linux: use ps to find all matching processes
         try {
-          const output = execSync('ps aux 2>/dev/null', { 
+          const output = execSync('ps aux 2>/dev/null', {
             encoding: 'utf8',
             timeout: 5000
           });
           const lines = output.split('\n');
-          
+
           lines.forEach(line => {
             const isAppProcess = line.includes("9router") || line.includes("next-server");
             if (isAppProcess) {
@@ -182,7 +182,7 @@ function killAllAppProcesses() {
             // Process already dead or can't kill - continue
           }
         });
-        
+
         // Wait for processes to fully terminate
         setTimeout(() => resolve(), 1000);
       } else {
@@ -204,11 +204,11 @@ function killProcessOnPort(port) {
 
       if (platform === "win32") {
         try {
-          const output = execSync(`netstat -ano | findstr :${port}`, { 
-            encoding: 'utf8', 
+          const output = execSync(`netstat -ano | findstr :${port}`, {
+            encoding: 'utf8',
             shell: true,
             windowsHide: true,
-            timeout: 5000 
+            timeout: 5000
           }).trim();
           const lines = output.split('\n').filter(l => l.includes('LISTENING'));
           if (lines.length > 0) {
@@ -221,9 +221,9 @@ function killProcessOnPort(port) {
       } else {
         // macOS/Linux
         try {
-          const pidOutput = execSync(`lsof -ti:${port}`, { 
-            encoding: 'utf8', 
-            stdio: ['pipe', 'pipe', 'ignore'] 
+          const pidOutput = execSync(`lsof -ti:${port}`, {
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore']
           }).trim();
           if (pidOutput) {
             pid = pidOutput.split('\n')[0];
@@ -250,12 +250,12 @@ function isRestrictedEnvironment() {
   if (process.env.CODESPACES === "true" || process.env.GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN) {
     return "GitHub Codespaces";
   }
-  
+
   // Check for Docker
   if (fs.existsSync("/.dockerenv") || (fs.existsSync("/proc/1/cgroup") && fs.readFileSync("/proc/1/cgroup", "utf8").includes("docker"))) {
     return "Docker";
   }
-  
+
   return null;
 }
 
@@ -380,7 +380,7 @@ fi
 function openBrowser(url) {
   const platform = process.platform;
   let cmd;
-  
+
   if (platform === "darwin") {
     cmd = `open "${url}"`;
   } else if (platform === "win32") {
@@ -388,7 +388,7 @@ function openBrowser(url) {
   } else {
     cmd = `xdg-open "${url}"`;
   }
-  
+
   exec(cmd, (err) => {
     if (err) {
       console.log(`Open browser manually: ${url}`);
@@ -420,11 +420,11 @@ async function showInterfaceMenu(latestVersion) {
   const { selectMenu } = require("./src/cli/utils/input");
   const { clearScreen } = require("./src/cli/utils/display");
   const { getEndpoint } = require("./src/cli/utils/endpoint");
-  
+
   clearScreen();
-  
+
   const displayHost = host === DEFAULT_HOST ? "localhost" : host;
-  
+
   // Detect tunnel/local mode for server URL display
   let serverUrl;
   try {
@@ -433,26 +433,26 @@ async function showInterfaceMenu(latestVersion) {
   } catch (e) {
     serverUrl = `http://${displayHost}:${port}`;
   }
-  
+
   const subtitle = `🚀 Server: \x1b[32m${serverUrl}\x1b[0m`;
-  
+
   const menuItems = [];
-  
+
   if (latestVersion) {
     menuItems.push({ label: `Update to v${latestVersion} (current: v${pkg.version})`, icon: "⬆" });
   }
-  
+
   menuItems.push(
     { label: "Web UI (Open in Browser)", icon: "🌐" },
     { label: "Terminal UI (Interactive CLI)", icon: "💻" },
     { label: "Hide to Tray (Background)", icon: "🔔" },
     { label: "Exit", icon: "🚪" }
   );
-  
+
   const selected = await selectMenu(`Choose Interface (v${pkg.version})`, menuItems, 0, subtitle);
-  
+
   const offset = latestVersion ? 1 : 0;
-  
+
   if (latestVersion && selected === 0) return "update";
   if (selected === offset) return "web";
   if (selected === offset + 1) return "terminal";
@@ -460,20 +460,31 @@ async function showInterfaceMenu(latestVersion) {
   return "exit";
 }
 
+const MAX_RESTARTS = 5;
+const RESTART_RESET_MS = 30000; // Reset counter if alive > 30s
+
 function startServer(latestVersion) {
   const displayHost = host === DEFAULT_HOST ? "localhost" : host;
   const url = `http://${displayHost}:${port}/dashboard`;
 
-  const server = spawn(RUNTIME, [serverPath], {
-    cwd: standaloneDir,
-    stdio: showLog ? "inherit" : "ignore",
-    detached: true,
-    env: {
-      ...process.env,
-      PORT: port.toString(),
-      HOSTNAME: host
-    }
-  });
+  let restartCount = 0;
+  let serverStartTime = Date.now();
+
+  function spawnServer() {
+    serverStartTime = Date.now();
+    return spawn(RUNTIME, [serverPath], {
+      cwd: standaloneDir,
+      stdio: showLog ? "inherit" : "ignore",
+      detached: true,
+      env: {
+        ...process.env,
+        PORT: port.toString(),
+        HOSTNAME: host
+      }
+    });
+  }
+
+  let server = spawnServer();
 
   // Cleanup function - force kill server process
   let isCleaningUp = false;
@@ -485,14 +496,14 @@ function startServer(latestVersion) {
       try {
         const { killTray } = require("./src/cli/tray/tray");
         killTray();
-      } catch (e) {}
+      } catch (e) { }
       // Kill server process directly
       if (server.pid) {
         process.kill(server.pid, "SIGKILL");
       }
       // Also try to kill process group
       process.kill(-server.pid, "SIGKILL");
-    } catch (e) {}
+    } catch (e) { }
   }
 
   // Suppress all errors during shutdown (systray lib throws JSON parse errors)
@@ -546,13 +557,13 @@ function startServer(latestVersion) {
   if (trayMode) {
     console.log(`\n🚀 ${pkg.name} v${pkg.version}`);
     console.log(`Server: http://${displayHost}:${port}`);
-    
+
     setTimeout(() => {
       initTrayIcon();
       console.log("\n💡 Router is now running in system tray. Close this terminal if you want.");
       console.log("   Right-click tray icon to open dashboard or quit.\n");
     }, 2000);
-    
+
     return;
   }
 
@@ -560,11 +571,11 @@ function startServer(latestVersion) {
   setTimeout(async () => {
     // Start tray icon alongside TUI
     initTrayIcon();
-    
+
     try {
       while (true) {
         const choice = await showInterfaceMenu(latestVersion);
-        
+
         if (choice === "update") {
           cleanup();
           performUpdate();
@@ -583,7 +594,7 @@ function startServer(latestVersion) {
           // Hide to tray - spawn detached background process
           const { clearScreen } = require("./src/cli/utils/display");
           clearScreen();
-          
+
           // Enable auto startup on OS boot
           try {
             const { enableAutoStart } = require("./src/cli/tray/autostart");
@@ -591,8 +602,8 @@ function startServer(latestVersion) {
             if (enabled) {
               console.log("✅ Auto-start enabled (will run on OS boot)");
             }
-          } catch (e) {}
-          
+          } catch (e) { }
+
           // Spawn new detached process with --tray flag
           const bgProcess = spawn(process.execPath, [__filename, "--tray", "--skip-update", "-p", port.toString()], {
             detached: true,
@@ -600,13 +611,13 @@ function startServer(latestVersion) {
             env: { ...process.env }
           });
           bgProcess.unref();
-          
+
           console.log(`\n🔔 9Router is now running in background (PID: ${bgProcess.pid})`);
           console.log(`   Server: http://${displayHost}:${port}`);
           console.log(`\n💡 You can close this terminal. Right-click tray icon to:`);
           console.log(`   • Open Dashboard`);
           console.log(`   • Quit\n`);
-          
+
           // Exit current process - background process takes over
           cleanup();
           process.exit(0);
@@ -624,13 +635,43 @@ function startServer(latestVersion) {
     }
   }, 3000);
 
-  server.on("error", (err) => {
-    console.error("Failed to start server:", err.message);
-    cleanup();
-    process.exit(1);
-  });
+  function attachServerEvents() {
+    server.on("error", (err) => {
+      console.error("Failed to start server:", err.message);
+      if (!isShuttingDown) tryRestart();
+      else { cleanup(); process.exit(1); }
+    });
 
-  server.on("close", (code) => {
-    process.exit(code || 0);
-  });
+    server.on("close", (code) => {
+      if (isShuttingDown || code === 0) {
+        process.exit(code || 0);
+        return;
+      }
+      tryRestart(code);
+    });
+  }
+
+  function tryRestart(code) {
+    const aliveMs = Date.now() - serverStartTime;
+    // Reset counter if last run was stable
+    if (aliveMs >= RESTART_RESET_MS) restartCount = 0;
+
+    if (restartCount >= MAX_RESTARTS) {
+      console.error(`\n❌ Server crashed ${MAX_RESTARTS} times. Giving up.`);
+      cleanup();
+      process.exit(1);
+      return;
+    }
+
+    restartCount++;
+    const delay = Math.min(1000 * restartCount, 10000);
+    console.error(`\n⚠️  Server exited (code=${code ?? "unknown"}). Restarting in ${delay / 1000}s... (${restartCount}/${MAX_RESTARTS})`);
+
+    setTimeout(() => {
+      server = spawnServer();
+      attachServerEvents();
+    }, delay);
+  }
+
+  attachServerEvents();
 }

package/package.json

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