sisyphi 1.0.6 → 1.0.7

package/dist/daemon.js

@@ -509,6 +509,7 @@ function createSession2(sessionName, windowName, cwd) {
   exec(`tmux new-session -d -s "${sessionName}" -n "${windowName}" -c ${shellQuote(cwd)}`);
   const windowId = exec(`tmux display-message -t "${sessionName}:${windowName}" -p "#{window_id}"`);
   const initialPaneId = exec(`tmux display-message -t "${sessionName}:${windowName}" -p "#{pane_id}"`);
+  configureSessionDefaults(sessionName, windowId);
   return { windowId, initialPaneId };
 }
 function paneExists(paneTarget) {
@@ -535,7 +536,8 @@ function setPaneTitle(paneTarget, title) {
   execSafe(`tmux select-pane -t "${paneTarget}" -T ${shellQuote(title)}`);
 }
 function setPaneStyle(paneTarget, color) {
-  const fmt = `#[fg=${color},bold] #{pane_title} #[fg=${color}]#{pane_current_path} #[default]`;
+  const gitBranch = `#(cd #{pane_current_path} && git branch --show-current 2>/dev/null || echo 'n/a')`;
+  const fmt = `#[fg=${color},bold] #{pane_title} #[fg=${color}]#{pane_current_path} | ${gitBranch} #[default]`;
   execSafe(`tmux set -p -t "${paneTarget}" pane-border-format ${shellQuote(fmt)}`);
   execSafe(`tmux set -p -t "${paneTarget}" @pane_color "${color}"`);
   execSafe(`tmux set -w -t "${paneTarget}" pane-border-style "fg=#{?#{@pane_color},#{@pane_color},default}"`);
@@ -544,6 +546,13 @@ function setPaneStyle(paneTarget, color) {
 function selectLayout(windowTarget, layout = "even-horizontal") {
   execSafe(`tmux select-layout -t "${windowTarget}" ${layout}`);
 }
+function configureSessionDefaults(sessionName, windowId) {
+  execSafe(`tmux set -w -t "${windowId}" pane-border-status top`);
+  execSafe(`tmux set -w -t "${windowId}" allow-rename off`);
+  execSafe(`tmux set -w -t "${windowId}" automatic-rename off`);
+  execSafe(`tmux set-hook -t "${sessionName}" after-kill-pane "select-layout even-horizontal"`);
+  execSafe(`tmux set-hook -t "${sessionName}" pane-exited "select-layout even-horizontal"`);
+}
 
 // src/daemon/pane-registry.ts
 var paneMap = /* @__PURE__ */ new Map();
@@ -656,31 +665,18 @@ ${lines.join("\n")}
   const lastCycle = session.orchestratorCycles[session.orchestratorCycles.length - 1];
   if (lastCycle && lastCycle.agentsSpawned.length > 0) {
     const agentMap = new Map(session.agents.map((a) => [a.id, a]));
-    const agentBlocks = lastCycle.agentsSpawned.map((id) => {
+    const agentLines = lastCycle.agentsSpawned.map((id) => {
       const agent = agentMap.get(id);
-      if (!agent) return `<agent-${id} status="unknown">
-(no agent data)
-</agent-${id}>`;
+      if (!agent) return `- **${id}**: unknown (no agent data)`;
       const finalReport = agent.reports.find((r) => r.type === "final");
       const reportToUse = finalReport ?? agent.reports[agent.reports.length - 1];
-      let reportContent = "(no reports)";
-      if (reportToUse) {
-        try {
-          reportContent = readFileSync3(reportToUse.filePath, "utf-8");
-        } catch {
-          reportContent = `(could not read report: ${reportToUse.filePath})`;
-        }
-      }
-      return `<agent-${id} name="${agent.name}" status="${agent.status}">
-${reportContent}
-</agent-${id}>`;
+      const reportRef = reportToUse ? `@${reportToUse.filePath}` : "(no reports)";
+      return `- **${id}** (${agent.name}) [${agent.status}]: ${reportRef}`;
     }).join("\n");
     mostRecentCycleSection = `
 ### Most Recent Cycle
 
-<last-cycle>
-${agentBlocks}
-</last-cycle>
+${agentLines}
 `;
   }
   const roadmapRef = existsSync4(roadmapFile) ? `@${roadmapFile}` : "(empty)";
@@ -1057,9 +1053,30 @@ function createAgentPlugin(cwd, sessionId, agentId, agentType, agentConfig) {
     copyFileSync2(agentConfig.filePath, `${base}/agents/${shortName}.md`);
   }
   const srcHooks = resolve3(import.meta.dirname, "../templates/agent-plugin/hooks");
-  for (const f of ["hooks.json", "require-submit.sh", "intercept-send-message.sh"]) {
+  for (const f of ["require-submit.sh", "intercept-send-message.sh"]) {
     copyFileSync2(`${srcHooks}/${f}`, `${base}/hooks/${f}`);
   }
+  const hooksConfig = {
+    PreToolUse: [
+      { matcher: "SendMessage", hook: { type: "command", command: "bash hooks/intercept-send-message.sh" } }
+    ],
+    Stop: [
+      { hook: { type: "command", command: "bash hooks/require-submit.sh" } }
+    ]
+  };
+  const normalizedType = agentType?.replace(/^sisyphus:/, "") ?? "";
+  if (normalizedType === "plan") {
+    hooksConfig.UserPromptSubmit = [
+      { hook: { type: "command", command: "bash hooks/plan-user-prompt.sh" } }
+    ];
+    copyFileSync2(`${srcHooks}/plan-user-prompt.sh`, `${base}/hooks/plan-user-prompt.sh`);
+  } else if (normalizedType === "spec-draft") {
+    hooksConfig.UserPromptSubmit = [
+      { hook: { type: "command", command: "bash hooks/spec-user-prompt.sh" } }
+    ];
+    copyFileSync2(`${srcHooks}/spec-user-prompt.sh`, `${base}/hooks/spec-user-prompt.sh`);
+  }
+  writeFileSync4(`${base}/hooks/hooks.json`, JSON.stringify({ hooks: hooksConfig }, null, 2), "utf-8");
   return base;
 }
 function setupAgentPane(opts) {
@@ -1500,6 +1517,17 @@ function pruneOldSessions(cwd) {
     console.error("[sisyphus] Session pruning failed:", err);
   }
 }
+async function reopenWindow(sessionId, cwd) {
+  const session = getSession(cwd, sessionId);
+  const tmuxName = session.tmuxSessionName ?? `sisyphus-${session.name ?? sessionId.slice(0, 8)}`;
+  if (sessionExists(tmuxName) && session.tmuxWindowId) {
+    return { tmuxSessionName: tmuxName, tmuxWindowId: session.tmuxWindowId };
+  }
+  const created = createSession2(tmuxName, "main", cwd);
+  setSessionOption(tmuxName, "@sisyphus_cwd", cwd.replace(/\/+$/, ""));
+  await updateSessionTmux(cwd, sessionId, tmuxName, created.windowId);
+  return { tmuxSessionName: tmuxName, tmuxWindowId: created.windowId };
+}
 async function resumeSession(sessionId, cwd, message) {
   const session = getSession(cwd, sessionId);
   const tmuxName = session.tmuxSessionName ?? `sisyphus-${sessionId.slice(0, 8)}`;
@@ -2018,6 +2046,23 @@ async function handleRequest(req) {
         const result = await handleRollback(req.sessionId, tracking.cwd, req.toCycle);
         return { ok: true, data: result };
       }
+      case "reopen-window": {
+        let tracking = sessionTrackingMap.get(req.sessionId);
+        if (!tracking) {
+          const stateFile = `${req.cwd}/.sisyphus/sessions/${req.sessionId}/state.json`;
+          if (existsSync8(stateFile)) {
+            tracking = { cwd: req.cwd, messageCounter: 0 };
+            sessionTrackingMap.set(req.sessionId, tracking);
+            persistSessionRegistry();
+          } else {
+            return unknownSessionError(req.sessionId);
+          }
+        }
+        const result = await reopenWindow(req.sessionId, tracking.cwd);
+        tracking.tmuxSession = result.tmuxSessionName;
+        tracking.windowId = result.tmuxWindowId;
+        return { ok: true, data: result };
+      }
       case "delete": {
         const activeTracking = sessionTrackingMap.get(req.sessionId);
         if (activeTracking) {
@@ -2138,7 +2183,7 @@ function stopServer() {
 
 // src/daemon/updater.ts
 import { execSync as execSync3 } from "child_process";
-import { readFileSync as readFileSync7, writeFileSync as writeFileSync6, unlinkSync as unlinkSync2 } from "fs";
+import { readFileSync as readFileSync7, writeFileSync as writeFileSync6, unlinkSync as unlinkSync2, lstatSync } from "fs";
 import { resolve as resolve4 } from "path";
 import { get } from "https";
 function isNewer(latest, current) {
@@ -2228,8 +2273,19 @@ function clearUpdating() {
   } catch {
   }
 }
+function isLinkedInstall() {
+  try {
+    const nodeDir = resolve4(process.execPath, "..");
+    const globalPrefix = execSync3("npm prefix -g", { timeout: 5e3, encoding: "utf-8", env: { ...process.env, PATH: `${nodeDir}:${process.env.PATH ?? ""}` } }).trim();
+    const globalPkgDir = resolve4(globalPrefix, "lib", "node_modules", "sisyphi");
+    return lstatSync(globalPkgDir).isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
 async function checkAndApply() {
   clearUpdating();
+  if (isLinkedInstall()) return;
   try {
     const update = await checkForUpdate();
     if (!update) return;