@rajat-rastogi/maestro 0.5.6 → 0.7.0

package/app/out/main/main.js

@@ -503,6 +503,15 @@ function registerSessionsIpc(sessionManager2) {
   electron.ipcMain.handle("sessions:resize", async (_e, id, cols, rows) => {
     sessionManager2.resize(id, cols, rows);
   });
+  electron.ipcMain.handle("sessions:savedList", async () => {
+    return sessionManager2.listSaved();
+  });
+  electron.ipcMain.handle("sessions:savedResume", async (_e, ids, resumeAI) => {
+    return sessionManager2.resumeSaved(ids, resumeAI);
+  });
+  electron.ipcMain.handle("sessions:savedDismiss", async () => {
+    sessionManager2.dismissSaved();
+  });
 }
 const execAsync$2 = util.promisify(child_process.exec);
 class AgentConnectionPool {
@@ -580,6 +589,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 +717,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 +725,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);
@@ -1157,11 +1193,20 @@ class LocalPtyAdapter {
     } catch {
     }
   }
-  autoLaunch(provider) {
+  autoLaunch(provider, skipPermissions, resumeAI) {
     if (provider === "claude") {
-      setTimeout(() => this.write("claude\r"), 800);
+      const flags = [
+        resumeAI ? "--continue" : "",
+        skipPermissions ? "--dangerously-skip-permissions" : ""
+      ].filter(Boolean).join(" ");
+      setTimeout(() => this.write(`claude${flags ? " " + flags : ""}\r`), 800);
     } else if (provider === "copilot") {
-      setTimeout(() => this.write("copilot --output-format json\r"), 800);
+      const flags = [
+        "--output-format json",
+        resumeAI ? "--continue" : "",
+        skipPermissions ? "--yolo" : ""
+      ].filter(Boolean).join(" ");
+      setTimeout(() => this.write(`copilot ${flags}\r`), 800);
     }
   }
 }
@@ -1356,11 +1401,20 @@ class SshPtyAdapter {
     this.sshClient = null;
     this.devtunnelProc = null;
   }
-  autoLaunch(provider) {
+  autoLaunch(provider, skipPermissions, resumeAI) {
     if (provider === "claude") {
-      setTimeout(() => this.write("claude\r"), 1200);
+      const flags = [
+        resumeAI ? "--continue" : "",
+        skipPermissions ? "--dangerously-skip-permissions" : ""
+      ].filter(Boolean).join(" ");
+      setTimeout(() => this.write(`claude${flags ? " " + flags : ""}\r`), 1200);
     } else if (provider === "copilot") {
-      setTimeout(() => this.write("copilot --output-format json\r"), 1200);
+      const flags = [
+        "--output-format json",
+        resumeAI ? "--continue" : "",
+        skipPermissions ? "--yolo" : ""
+      ].filter(Boolean).join(" ");
+      setTimeout(() => this.write(`copilot ${flags}\r`), 1200);
     }
   }
 }
@@ -1373,7 +1427,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 +1447,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 +1470,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,21 +1537,35 @@ 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) {
+  autoLaunch(provider, skipPermissions, resumeAI) {
     if (provider === "claude") {
-      setTimeout(() => this.write("claude\r"), 600);
+      const flags = [
+        resumeAI ? "--continue" : "",
+        skipPermissions ? "--dangerously-skip-permissions" : ""
+      ].filter(Boolean).join(" ");
+      setTimeout(() => this.write(`claude${flags ? " " + flags : ""}\r`), 600);
     } else if (provider === "copilot") {
-      setTimeout(() => this.write("copilot --output-format json\r"), 600);
+      const flags = [
+        "--output-format json",
+        resumeAI ? "--continue" : "",
+        skipPermissions ? "--yolo" : ""
+      ].filter(Boolean).join(" ");
+      setTimeout(() => this.write(`copilot ${flags}\r`), 600);
     }
   }
 }
@@ -1746,9 +1868,65 @@ class SessionManager {
   entries = /* @__PURE__ */ new Map();
   machineManager;
   push;
+  savedPath;
+  savedSessions = [];
   constructor(machineManager2, push) {
     this.machineManager = machineManager2;
     this.push = push;
+    this.savedPath = path__namespace.join(electron.app.getPath("userData"), "saved-sessions.json");
+    this.loadSaved();
+  }
+  loadSaved() {
+    try {
+      const data = fs__namespace.readFileSync(this.savedPath, "utf8");
+      this.savedSessions = JSON.parse(data);
+      console.log(`[SessionManager] Loaded ${this.savedSessions.length} saved sessions`);
+    } catch {
+      this.savedSessions = [];
+    }
+  }
+  saveToDisk() {
+    try {
+      fs__namespace.writeFileSync(this.savedPath, JSON.stringify(this.savedSessions, null, 2), "utf8");
+    } catch (err) {
+      console.error("[SessionManager] Failed to save sessions:", err);
+    }
+  }
+  listSaved() {
+    return this.savedSessions;
+  }
+  dismissSaved() {
+    this.savedSessions = [];
+    this.saveToDisk();
+  }
+  async resumeSaved(ids, resumeAI) {
+    const resumed = [];
+    const skipped = [];
+    for (const saved of this.savedSessions.filter((s) => ids.includes(s.id))) {
+      const machine = this.machineManager.getById(saved.machineId);
+      if (saved.machineId !== "local" && (!machine || machine.status === "offline")) {
+        skipped.push(saved.name);
+        continue;
+      }
+      try {
+        const session = await this.create({
+          name: saved.name,
+          machineId: saved.machineId,
+          provider: saved.provider,
+          workingDirectory: saved.workingDirectory,
+          tags: saved.tags,
+          skipPermissions: saved.skipPermissions,
+          resumeAI: resumeAI && saved.provider !== "none"
+        });
+        resumed.push(session);
+      } catch (err) {
+        console.error(`[SessionManager] Failed to resume "${saved.name}":`, err);
+        skipped.push(saved.name);
+      }
+    }
+    this.savedSessions = [];
+    this.saveToDisk();
+    return { resumed, skipped };
   }
   list() {
     return Array.from(this.entries.values()).map((e) => ({
@@ -1827,8 +2005,20 @@ class SessionManager {
     });
     monitor.start();
     if (opts.provider !== "none") {
-      adapter.autoLaunch(opts.provider);
-    }
+      adapter.autoLaunch(opts.provider, opts.skipPermissions, opts.resumeAI);
+    }
+    this.savedSessions = this.savedSessions.filter((s) => s.id !== session.id);
+    this.savedSessions.push({
+      id: session.id,
+      name: session.name,
+      machineId: session.machineId,
+      provider: session.provider,
+      workingDirectory: session.workingDirectory,
+      tags: session.tags,
+      skipPermissions: opts.skipPermissions,
+      savedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    this.saveToDisk();
     return { ...session };
   }
   destroy(id) {
@@ -1837,6 +2027,8 @@ class SessionManager {
     entry.monitor.stop();
     entry.adapter.kill();
     this.entries.delete(id);
+    this.savedSessions = this.savedSessions.filter((s) => s.id !== id);
+    this.saveToDisk();
   }
   rename(id, name) {
     const entry = this.entries.get(id);
@@ -1884,26 +2076,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");
@@ -1977,6 +2175,15 @@ electron.app.whenReady().then(() => {
   electron.ipcMain.handle("app:getStartupArgs", () => ({
     planFile: startupPlanFile
   }));
+  electron.ipcMain.handle("app:getVersion", () => {
+    try {
+      const pkgPath = path.join(__dirname, "..", "..", "..", "package.json");
+      const pkg = JSON.parse(fs__namespace.readFileSync(pkgPath, "utf8"));
+      return pkg.version ?? "unknown";
+    } catch {
+      return electron.app.getVersion();
+    }
+  });
   createWindow();
   electron.app.on("activate", () => {
     if (electron.BrowserWindow.getAllWindows().length === 0) {

package/app/out/preload/preload.js

@@ -55,6 +55,7 @@ electron.contextBridge.exposeInMainWorld("maestro", {
   },
   // Read startup args passed from CLI
   getStartupArgs: () => electron.ipcRenderer.invoke("app:getStartupArgs"),
+  getVersion: () => electron.ipcRenderer.invoke("app:getVersion"),
   // Machine management
   machines: {
     list: () => electron.ipcRenderer.invoke("machines:list"),
@@ -84,6 +85,9 @@ electron.contextBridge.exposeInMainWorld("maestro", {
     acknowledge: (id) => electron.ipcRenderer.invoke("sessions:acknowledge", id),
     sendInput: (id, data) => electron.ipcRenderer.invoke("sessions:sendInput", id, data),
     resize: (id, cols, rows) => electron.ipcRenderer.invoke("sessions:resize", id, cols, rows),
+    savedList: () => electron.ipcRenderer.invoke("sessions:savedList"),
+    savedResume: (ids, resumeAI) => electron.ipcRenderer.invoke("sessions:savedResume", ids, resumeAI),
+    savedDismiss: () => electron.ipcRenderer.invoke("sessions:savedDismiss"),
     onData: (cb) => {
       const handler = (_, ev) => cb(ev);
       electron.ipcRenderer.on("sessions:data", handler);