sisyphi 1.1.13 → 1.1.15

package/dist/daemon.js

@@ -1,14 +1,17 @@
 #!/usr/bin/env node
+import {
+  resolveRequiredPluginDirs
+} from "./chunk-UIVQXCWB.js";
 import {
   EXEC_ENV,
   exec,
   execEnv,
-  execSafe,
-  loadConfig
-} from "./chunk-CAJEBTUE.js";
+  execSafe
+} from "./chunk-6TIO23U3.js";
 import {
+  loadConfig,
   shellQuote
-} from "./chunk-6G226ZK7.js";
+} from "./chunk-IF55HPWX.js";
 import {
   contextDir,
   cycleLogPath,
@@ -873,8 +876,10 @@ ${instruction}`);
     const config = loadConfig(cwd);
     const effort = agentConfig?.frontmatter.effort ?? config.agentEffort ?? "medium";
     const pluginPath = createAgentPlugin(cwd, sessionId, agentId, agentType, agentConfig);
+    const requiredPluginDirs = resolveRequiredPluginDirs(cwd);
+    const extraPluginFlags = requiredPluginDirs.map((p) => `--plugin-dir "${p}"`).join(" ");
     const sessionIdFlag = claudeSessionId ? ` --session-id "${claudeSessionId}"` : "";
-    mainCmd = `claude --dangerously-skip-permissions --effort ${effort} --plugin-dir "${pluginPath}"${agentFlag}${sessionIdFlag} --name ${shellQuote(agentTitle)} --append-system-prompt "$(cat '${suffixFilePath}')" ${shellQuote(instruction)}`;
+    mainCmd = `claude --dangerously-skip-permissions --effort ${effort} --plugin-dir "${pluginPath}"${agentFlag}${sessionIdFlag}${extraPluginFlags ? ` ${extraPluginFlags}` : ""} --name ${shellQuote(agentTitle)} --append-system-prompt "$(cat '${suffixFilePath}')" ${shellQuote(instruction)}`;
   }
   const scriptPath = writeRunScript(promptsDir(cwd, sessionId), `${agentId}-run`, [
     "#!/usr/bin/env bash",
@@ -1083,6 +1088,9 @@ function allAgentsDone(session) {
   return running.length === 0 && session.agents.length > 0;
 }
 
+// src/daemon/respawn-guard.ts
+var respawningSessions = /* @__PURE__ */ new Set();
+
 // src/daemon/pane-monitor.ts
 var monitorInterval = null;
 var onAllAgentsDone = null;
@@ -1220,6 +1228,7 @@ async function pollSession(sessionId, cwd, windowId, increment) {
   if (session.status !== "active") return;
   const livePanes = listPanes(windowId);
   if (livePanes.length === 0) {
+    if (respawningSessions.has(sessionId)) return;
     const tracked = trackedSessions.get(sessionId);
     if (tracked && !sessionExists(tracked.tmuxSession)) {
       await flushTimers(sessionId);
@@ -1525,8 +1534,10 @@ ${continuationText}`;
   const settingsPath = resolve3(import.meta.dirname, "../templates/orchestrator-settings.json");
   const config = loadConfig(cwd);
   const effort = config.orchestratorEffort ?? "high";
+  const requiredPluginDirs = resolveRequiredPluginDirs(cwd);
+  const extraPluginFlags = requiredPluginDirs.map((p) => `--plugin-dir "${p}"`).join(" ");
   const claudeSessionId = randomUUID3();
-  const claudeCmd = `claude --dangerously-skip-permissions --disallowed-tools "Task,Agent" --effort ${effort} --session-id "${claudeSessionId}" --settings "${settingsPath}" --plugin-dir "${pluginPath}" --name "ssph:orch ${session.name ?? sessionId.slice(0, 8)} c${cycleNum}" --system-prompt "$(cat '${promptFilePath}')" "$(cat '${userPromptFilePath}')"`;
+  const claudeCmd = `claude --dangerously-skip-permissions --disallowed-tools "Task,Agent" --effort ${effort} --session-id "${claudeSessionId}" --settings "${settingsPath}" --plugin-dir "${pluginPath}"${extraPluginFlags ? ` ${extraPluginFlags}` : ""} --name "ssph:orch ${session.name ?? sessionId.slice(0, 8)} c${cycleNum}" --system-prompt "$(cat '${promptFilePath}')" "$(cat '${userPromptFilePath}')"`;
   const paneId = createPane(windowId, cwd, "left");
   sessionOrchestratorPane.set(sessionId, paneId);
   registerPane(paneId, sessionId, "orchestrator");
@@ -1818,7 +1829,10 @@ function onAllAgentsDone2(sessionId, cwd, windowId) {
     }
   }
   const session = getSession(cwd, sessionId);
-  if (session.status !== "active") return;
+  if (session.status !== "active") {
+    respawningSessions.delete(sessionId);
+    return;
+  }
   pendingRespawns.add(sessionId);
   orchestratorDone.delete(sessionId);
   const cycleNumber = session.orchestratorCycles.length;
@@ -1829,7 +1843,12 @@ function onAllAgentsDone2(sessionId, cwd, windowId) {
     pendingRespawns.delete(sessionId);
     try {
       const freshSession = getSession(cwd, sessionId);
-      if (freshSession.status !== "active") return;
+      if (freshSession.status === "paused" && respawningSessions.has(sessionId)) {
+        await updateSessionStatus(cwd, sessionId, "active");
+      } else if (freshSession.status !== "active") {
+        respawningSessions.delete(sessionId);
+        return;
+      }
       let activeWindowId = windowId;
       const tmuxName = freshSession.tmuxSessionName;
       const needsRecreation = tmuxName && (!sessionExists(tmuxName) || listPanes(activeWindowId).length === 0);
@@ -1844,6 +1863,7 @@ function onAllAgentsDone2(sessionId, cwd, windowId) {
         initialPaneId = created.initialPaneId;
         await updateSessionTmux(cwd, sessionId, tmuxName, activeWindowId);
         trackSession(sessionId, cwd, tmuxName);
+        registerSessionTmux(sessionId, tmuxName, activeWindowId);
       }
       await spawnOrchestrator(sessionId, cwd, activeWindowId);
       updateTrackedWindow(sessionId, activeWindowId);
@@ -1856,6 +1876,8 @@ function onAllAgentsDone2(sessionId, cwd, windowId) {
       selectLayout(activeWindowId);
     } catch (err) {
       console.error(`[sisyphus] Failed to respawn orchestrator for session ${sessionId}:`, err);
+    } finally {
+      respawningSessions.delete(sessionId);
     }
   });
 }
@@ -1895,6 +1917,7 @@ async function handleYield(sessionId, cwd, nextPrompt, mode) {
   if (pre.status === "paused") {
     await updateSessionStatus(cwd, sessionId, "active");
   }
+  respawningSessions.add(sessionId);
   await handleOrchestratorYield(sessionId, cwd, nextPrompt, mode);
   orchestratorDone.add(sessionId);
   const session = getSession(cwd, sessionId);
@@ -1903,7 +1926,11 @@ async function handleYield(sessionId, cwd, nextPrompt, mode) {
     const windowId = getWindowId(sessionId) ?? session.tmuxWindowId;
     if (windowId) {
       onAllAgentsDone2(sessionId, cwd, windowId);
+    } else {
+      respawningSessions.delete(sessionId);
     }
+  } else {
+    respawningSessions.delete(sessionId);
   }
 }
 async function handleComplete(sessionId, cwd, report) {
@@ -2023,6 +2050,7 @@ async function handlePaneExited(paneId, cwd, sessionId, role, agentId) {
   } else if (role === "orchestrator") {
     const sessionName = session.name ?? sessionId.slice(0, 8);
     sendTerminalNotification("Sisyphus", `Orchestrator exited without yielding (${sessionName})`);
+    respawningSessions.add(sessionId);
     const cycleActiveMs = flushCycleTimer(sessionId, session.orchestratorCycles.length);
     await completeOrchestratorCycle(cwd, sessionId, void 0, void 0, cycleActiveMs);
     orchestratorDone.add(sessionId);
@@ -2032,10 +2060,15 @@ async function handlePaneExited(paneId, cwd, sessionId, role, agentId) {
       if (windowId) {
         console.log(`[sisyphus] Orchestrator pane exited for session ${sessionId}, all agents done \u2014 triggering respawn`);
         onAllAgentsDone2(sessionId, cwd, windowId);
+      } else {
+        respawningSessions.delete(sessionId);
       }
     } else if (!hasRunningAgents) {
+      respawningSessions.delete(sessionId);
       await updateSessionStatus(cwd, sessionId, "paused");
       console.log(`[sisyphus] Session ${sessionId} paused: orchestrator pane exited with no agents`);
+    } else {
+      respawningSessions.delete(sessionId);
     }
   }
 }