@rajat-rastogi/maestro 0.5.6 → 0.6.0

package/app/out/main/main.js

@@ -580,6 +580,29 @@ class AgentConnectionPool {
         entry.ready = true;
         entry.queue.forEach((cb) => cb(ws));
         entry.queue = [];
+        entry.heartbeat = setInterval(() => {
+          if (ws.readyState !== WebSocket.OPEN) return;
+          let gotPong = false;
+          const handler = (data) => {
+            try {
+              const msg = JSON.parse(data.toString());
+              if (msg.type === "pong") {
+                gotPong = true;
+                ws.removeListener("message", handler);
+              }
+            } catch {
+            }
+          };
+          ws.on("message", handler);
+          ws.send(JSON.stringify({ type: "ping" }));
+          setTimeout(() => {
+            ws.removeListener("message", handler);
+            if (!gotPong && ws.readyState === WebSocket.OPEN) {
+              console.log(`[AgentPool] heartbeat failed for "${tunnelId}" — zombie connection, closing`);
+              ws.terminate();
+            }
+          }, 1e4);
+        }, 6e4);
         resolve(ws);
       });
       ws.on("error", (err) => {
@@ -685,6 +708,7 @@ class AgentConnectionPool {
   teardown(tunnelId) {
     const entry = this.pool.get(tunnelId);
     if (entry) {
+      if (entry.heartbeat) clearInterval(entry.heartbeat);
       try {
         entry.ws?.close();
       } catch {
@@ -692,6 +716,9 @@ class AgentConnectionPool {
       this.pool.delete(tunnelId);
     }
   }
+  releaseOne(tunnelId) {
+    this.teardown(tunnelId);
+  }
   releaseAll() {
     for (const id of Array.from(this.pool.keys())) {
       this.teardown(id);
@@ -1373,7 +1400,11 @@ class AgentPtyAdapter {
   dataCallback = null;
   exitCallback = null;
   messageHandler = null;
+  dead = false;
   async connect(cwd, cols, rows) {
+    this.lastCwd = cwd;
+    this.lastCols = cols;
+    this.lastRows = rows;
     this.ws = await AgentConnectionPool.getInstance().getConnection(this.tunnelId);
     this.messageHandler = (raw) => {
       try {
@@ -1389,13 +1420,8 @@ class AgentPtyAdapter {
     };
     this.ws.on("message", this.messageHandler);
     this.ws.on("close", () => {
-      console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} WebSocket closed — connection lost`);
-      if (this.dataCallback) {
-        this.dataCallback("\r\n\x1B[1;31m[Maestro] Connection to remote agent lost. Close and recreate the terminal.\x1B[0m\r\n");
-      }
-      if (this.exitCallback) {
-        this.exitCallback(null);
-      }
+      console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} WebSocket closed`);
+      this.handleConnectionLost();
     });
     this.ws.on("error", (err) => {
       console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} WebSocket error: ${err.message}`);
@@ -1417,6 +1443,61 @@ class AgentPtyAdapter {
       this.ws.on("message", ackHandler);
     });
   }
+  reconnectAttempts = 0;
+  lastCwd = "";
+  lastCols = 120;
+  lastRows = 30;
+  async handleConnectionLost() {
+    if (this.dead) return;
+    if (this.reconnectAttempts < 3) {
+      this.reconnectAttempts++;
+      console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} reconnecting (attempt ${this.reconnectAttempts}/3)...`);
+      if (this.dataCallback) {
+        this.dataCallback(`\r
+\x1B[1;33m[Maestro] Connection lost — reconnecting (${this.reconnectAttempts}/3)...\x1B[0m\r
+`);
+      }
+      AgentConnectionPool.getInstance().releaseOne(this.tunnelId);
+      await new Promise((r) => setTimeout(r, 2e3 * this.reconnectAttempts));
+      try {
+        this.ws = await AgentConnectionPool.getInstance().getConnection(this.tunnelId);
+        if (this.messageHandler) {
+          this.ws.on("message", this.messageHandler);
+        }
+        this.ws.on("close", () => {
+          console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} WebSocket closed`);
+          this.handleConnectionLost();
+        });
+        this.ws.on("error", (err) => {
+          console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} WebSocket error: ${err.message}`);
+        });
+        this.ws.send(JSON.stringify({
+          type: "create",
+          id: this.sessionId,
+          shell: "powershell",
+          cwd: this.lastCwd,
+          cols: this.lastCols,
+          rows: this.lastRows
+        }));
+        this.reconnectAttempts = 0;
+        console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} reconnected successfully`);
+        if (this.dataCallback) {
+          this.dataCallback("\r\n\x1B[1;32m[Maestro] Reconnected to remote agent.\x1B[0m\r\n");
+        }
+        return;
+      } catch (err) {
+        console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} reconnect failed: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    }
+    this.dead = true;
+    console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} all reconnect attempts failed`);
+    if (this.dataCallback) {
+      this.dataCallback("\r\n\x1B[1;31m[Maestro] Connection to remote agent lost. Close and recreate the terminal.\x1B[0m\r\n");
+    }
+    if (this.exitCallback) {
+      this.exitCallback(null);
+    }
+  }
   onData(cb) {
     this.dataCallback = cb;
   }
@@ -1429,15 +1510,20 @@ class AgentPtyAdapter {
     }
   }
   resize(cols, rows) {
+    this.lastCols = cols;
+    this.lastRows = rows;
     if (this.ws?.readyState === WebSocket.OPEN) {
       this.ws.send(JSON.stringify({ type: "resize", id: this.sessionId, cols, rows }));
     }
   }
   kill() {
+    this.dead = true;
     if (this.ws && this.messageHandler) {
       this.ws.removeListener("message", this.messageHandler);
     }
-    this.ws?.send(JSON.stringify({ type: "destroy", id: this.sessionId }));
+    if (this.ws?.readyState === WebSocket.OPEN) {
+      this.ws.send(JSON.stringify({ type: "destroy", id: this.sessionId }));
+    }
   }
   autoLaunch(provider) {
     if (provider === "claude") {
@@ -1884,26 +1970,32 @@ class SessionManager {
     this.push("sessions:stateChanged", ev);
   }
 }
-const logDir = electron.app.getPath("userData");
-const logFile = path.join(logDir, "maestro-gui.log");
+let logStream = null;
 try {
-  if (fs__namespace.existsSync(logFile)) fs__namespace.renameSync(logFile, logFile + ".prev");
-} catch {
+  const logDir = electron.app.getPath("userData");
+  fs__namespace.mkdirSync(logDir, { recursive: true });
+  const logFile = path.join(logDir, "maestro-gui.log");
+  try {
+    if (fs__namespace.existsSync(logFile)) fs__namespace.renameSync(logFile, logFile + ".prev");
+  } catch {
+  }
+  logStream = fs__namespace.createWriteStream(logFile, { flags: "a" });
+  const origLog = console.log;
+  const origErr = console.error;
+  console.log = (...args) => {
+    const line = `${(/* @__PURE__ */ new Date()).toISOString()} ${args.map(String).join(" ")}`;
+    logStream?.write(line + "\n");
+    origLog(...args);
+  };
+  console.error = (...args) => {
+    const line = `${(/* @__PURE__ */ new Date()).toISOString()} ERROR ${args.map(String).join(" ")}`;
+    logStream?.write(line + "\n");
+    origErr(...args);
+  };
+  console.log(`[Maestro] Log file: ${logFile}`);
+} catch (err) {
+  console.error("[Maestro] Failed to set up log file:", err);
 }
-const logStream = fs__namespace.createWriteStream(logFile, { flags: "a" });
-const origLog = console.log;
-const origErr = console.error;
-console.log = (...args) => {
-  const line = `${(/* @__PURE__ */ new Date()).toISOString()} ${args.map(String).join(" ")}`;
-  logStream.write(line + "\n");
-  origLog(...args);
-};
-console.error = (...args) => {
-  const line = `${(/* @__PURE__ */ new Date()).toISOString()} ERROR ${args.map(String).join(" ")}`;
-  logStream.write(line + "\n");
-  origErr(...args);
-};
-console.log(`[Maestro] Log file: ${logFile}`);
 const startupArgs = process.argv.slice(2);
 let startupPlanFile = null;
 const pfIdx = startupArgs.indexOf("--plan-file");

package/dist/agent/install.js

@@ -129,6 +129,15 @@ wss.on('connection', (ws) => {
         ws.send(JSON.stringify({ type: 'pong' }));
         break;
       case 'create': {
+        // If session already exists (reconnect after connection drop), reattach to new WebSocket
+        if (sessions.has(msg.id)) {
+          const proc = sessions.get(msg.id);
+          proc.removeAllListeners('data');
+          proc.onData((data) => ws.send(JSON.stringify({ type: 'data', id: msg.id, data: Buffer.from(data).toString('base64') })));
+          ws.send(JSON.stringify({ type: 'created', id: msg.id }));
+          console.log('[agent] session reattached:', msg.id);
+          break;
+        }
         const proc = pty.spawn('powershell.exe', [], {
           name: 'xterm-256color', cols: msg.cols, rows: msg.rows, cwd: msg.cwd,
           env: { ...process.env },
@@ -167,7 +176,7 @@ wss.on('connection', (ws) => {
       }
     }
   });
-  ws.on('close', () => { console.log('[agent] client disconnected'); for (const [, proc] of sessions) proc.kill(); sessions.clear(); });
+  ws.on('close', () => { console.log('[agent] client disconnected — sessions kept alive for reconnect'); });
 });
 
 console.log(\`[agent] Maestro agent listening on ws://127.0.0.1:\${PORT}\`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rajat-rastogi/maestro",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "description": "Conduct your codebase — autonomous AI coding orchestrator",
   "type": "module",
   "main": "dist/main.js",