@rajat-rastogi/maestro 0.6.0 → 0.7.1

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,8 +589,12 @@ class AgentConnectionPool {
         entry.ready = true;
         entry.queue.forEach((cb) => cb(ws));
         entry.queue = [];
+        console.log(`[AgentPool] heartbeat started for "${tunnelId}" (60s interval)`);
         entry.heartbeat = setInterval(() => {
-          if (ws.readyState !== WebSocket.OPEN) return;
+          if (ws.readyState !== WebSocket.OPEN) {
+            console.log(`[AgentPool] heartbeat skip for "${tunnelId}" — ws not open (state: ${ws.readyState})`);
+            return;
+          }
           let gotPong = false;
           const handler = (data) => {
             try {
@@ -1184,11 +1197,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);
     }
   }
 }
@@ -1383,11 +1405,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);
     }
   }
 }
@@ -1449,16 +1480,15 @@ class AgentPtyAdapter {
   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)...`);
+    for (let attempt = 1; attempt <= 3; attempt++) {
+      console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} reconnecting (attempt ${attempt}/3)...`);
       if (this.dataCallback) {
         this.dataCallback(`\r
-\x1B[1;33m[Maestro] Connection lost — reconnecting (${this.reconnectAttempts}/3)...\x1B[0m\r
+\x1B[1;33m[Maestro] Connection lost — reconnecting (${attempt}/3)...\x1B[0m\r
 `);
       }
       AgentConnectionPool.getInstance().releaseOne(this.tunnelId);
-      await new Promise((r) => setTimeout(r, 2e3 * this.reconnectAttempts));
+      await new Promise((r) => setTimeout(r, 2e3 * attempt));
       try {
         this.ws = await AgentConnectionPool.getInstance().getConnection(this.tunnelId);
         if (this.messageHandler) {
@@ -1479,14 +1509,13 @@ class AgentPtyAdapter {
           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)}`);
+        console.log(`[AgentPty] ${this.sessionId.slice(0, 8)} reconnect attempt ${attempt} failed: ${err instanceof Error ? err.message : String(err)}`);
       }
     }
     this.dead = true;
@@ -1525,11 +1554,20 @@ class AgentPtyAdapter {
       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);
     }
   }
 }
@@ -1584,7 +1622,7 @@ class StateMonitor {
       if (this.copilotReady && data.length >= 20) {
         if (data.includes("Enter to select")) {
           this.emitState("permission", "heuristic", '"Enter to select" — input required');
-        } else if (data.includes("Esc to cancel") || data.includes("Esc to stop")) {
+        } else if ((data.includes("Esc to cancel") || data.includes("Esc to stop")) && !this.lastEmittedState?.startsWith("permission")) {
           this.emitState("working", "heuristic", '"Esc to cancel/stop" — copilot working');
         } else if (data.includes("for shortcuts") || data.includes("Describe a task") || data.includes("to get started")) {
           this.emitState("waiting", "heuristic", "copilot prompt detected — at prompt");
@@ -1832,9 +1870,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) => ({
@@ -1913,8 +2007,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) {
@@ -1923,6 +2029,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);
@@ -2069,6 +2177,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);