sisyphi 1.1.32 → 1.1.34

package/dist/templates/agent-plugin/hooks/CLAUDE.md

@@ -1,6 +1,7 @@
-- No static `hooks.json` — `src/daemon/agent.ts` generates it per-agent at spawn time. Script edits are invisible to running agents; **respawn required**.
-- `{type}-user-prompt.sh` naming does **not** auto-register. Must add to hardcoded `userPromptHooks` map in `src/daemon/agent.ts` or the script is never copied. Only `require-submit.sh`, `intercept-send-message.sh`, and `register-bg-task.sh` copy unconditionally. `userPromptHooks` only covers `UserPromptSubmit` — `plan-validate.sh` is the sole example of a PreToolUse hook, registered via a separate special-case block in `agent.ts`; new PreToolUse hooks for specific agent types need the same treatment.
-- `interactive: true` in agent frontmatter suppresses `require-submit.sh` from the Stop phase.
+- The bundled `hooks.json` here is the **manifest** — the daemon merges it with project (`.sisyphus/agent-plugin/hooks/hooks.json`) and user (`~/.sisyphus/agent-plugin/hooks/hooks.json`) layers at spawn time, then writes the merged result into the per-agent plugin dir. Script edits are invisible to running agents; **respawn required**.
+- New hooks register declaratively: add a manifest entry with `agentTypes: [...]` (or `["all"]`) and the script gets copied automatically. No `src/daemon/agent.ts` edits needed for new agent-type-specific hooks. The merge logic lives in `src/daemon/extensions.ts` (`mergeHookManifests`, `collectReferencedHookScripts`).
+- A bundled hook script is only copied into a spawned agent's plugin dir if the merged manifest references it for that agent type — scripts whose entries filter out (e.g. `plan-validate.sh` for a `review` agent) are skipped. Higher layers can suppress a bundled script by basename via `"disable": ["script.sh"]` at the manifest's top level.
+- `interactive: true` in agent frontmatter triggers `condition: "non-interactive"` filtering — entries with that condition (currently the bundled `require-submit.sh` Stop hook) are dropped from the merged manifest for interactive agents.
 - Scripts receive no `{{placeholder}}` substitution — placeholders appear as literal text, unlike `.md` templates.
 - Prompt hooks (`userPrompt`, `systemPrompt`) write raw text to stdout. Pre-tool hooks (e.g. `intercept-send-message.sh`) write `{"decision":"block","reason":"..."}` or exit 0 — wrong format silently does nothing.
 - Claude Code invokes hooks unconditionally, not only in sisyphus sessions. Guard: `if [ -z "$SISYPHUS_SESSION_ID" ]; then exit 0; fi`. Stop hooks also need `$SISYPHUS_AGENT_ID`.

package/dist/templates/agent-plugin/hooks/hooks.json

@@ -0,0 +1,51 @@
+{
+  "hooks": {
+    "PreToolUse": [
+      {
+        "matcher": "SendMessage",
+        "agentTypes": ["all"],
+        "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/intercept-send-message.sh" }]
+      },
+      {
+        "matcher": "Bash",
+        "agentTypes": ["all"],
+        "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/ask-background-guard.sh" }]
+      },
+      {
+        "matcher": "Bash",
+        "agentTypes": ["plan"],
+        "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/plan-validate.sh" }]
+      },
+      {
+        "matcher": "Write|Edit|MultiEdit",
+        "agentTypes": ["plan"],
+        "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/plan-write-path.sh" }]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "Task",
+        "agentTypes": ["all"],
+        "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/register-bg-task.sh" }]
+      }
+    ],
+    "Stop": [
+      {
+        "agentTypes": ["all"],
+        "condition": "non-interactive",
+        "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/require-submit.sh" }]
+      }
+    ],
+    "UserPromptSubmit": [
+      { "agentTypes": ["problem"], "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/problem-user-prompt.sh" }] },
+      { "agentTypes": ["plan"], "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/plan-user-prompt.sh" }] },
+      { "agentTypes": ["spec"], "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/spec-user-prompt.sh" }] },
+      { "agentTypes": ["review"], "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/review-user-prompt.sh" }] },
+      { "agentTypes": ["review-plan"], "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/review-plan-user-prompt.sh" }] },
+      { "agentTypes": ["debug"], "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/debug-user-prompt.sh" }] },
+      { "agentTypes": ["operator"], "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/operator-user-prompt.sh" }] },
+      { "agentTypes": ["test-spec"], "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/test-spec-user-prompt.sh" }] },
+      { "agentTypes": ["explore"], "hooks": [{ "type": "command", "command": "bash ${CLAUDE_PLUGIN_ROOT}/hooks/explore-user-prompt.sh" }] }
+    ]
+  }
+}

package/dist/tui.js

@@ -736,6 +736,35 @@ var init_atomic = __esm({
   }
 });
 
+// src/shared/gitignore.ts
+import { existsSync as existsSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "fs";
+import { join as join8 } from "path";
+var init_gitignore = __esm({
+  "src/shared/gitignore.ts"() {
+    "use strict";
+  }
+});
+
+// src/shared/types.ts
+var init_types = __esm({
+  "src/shared/types.ts"() {
+    "use strict";
+  }
+});
+
+// src/daemon/state.ts
+import { copyFileSync, cpSync, existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync7, readdirSync as readdirSync3, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
+import { join as join9 } from "path";
+var init_state = __esm({
+  "src/daemon/state.ts"() {
+    "use strict";
+    init_atomic();
+    init_paths();
+    init_gitignore();
+    init_types();
+  }
+});
+
 // src/shared/shell.ts
 function shellQuote(s) {
   return `'${s.replace(/'/g, "'\\''")}'`;
@@ -748,8 +777,8 @@ var init_shell = __esm({
 
 // src/daemon/notify.ts
 import { spawn, execFile as execFile2 } from "child_process";
-import { writeFileSync as writeFileSync6, mkdirSync as mkdirSync5, existsSync as existsSync4 } from "fs";
-import { join as join8 } from "path";
+import { writeFileSync as writeFileSync8, mkdirSync as mkdirSync6, existsSync as existsSync6 } from "fs";
+import { join as join10 } from "path";
 import { homedir as homedir3 } from "os";
 var TMUX_SOCKET, SWITCH_SCRIPT;
 var init_notify = __esm({
@@ -799,35 +828,6 @@ var init_notify = __esm({
   }
 });
 
-// src/shared/gitignore.ts
-import { existsSync as existsSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync7 } from "fs";
-import { join as join9 } from "path";
-var init_gitignore = __esm({
-  "src/shared/gitignore.ts"() {
-    "use strict";
-  }
-});
-
-// src/shared/types.ts
-var init_types = __esm({
-  "src/shared/types.ts"() {
-    "use strict";
-  }
-});
-
-// src/daemon/state.ts
-import { copyFileSync, cpSync, existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync7, readdirSync as readdirSync3, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync8 } from "fs";
-import { join as join10 } from "path";
-var init_state = __esm({
-  "src/daemon/state.ts"() {
-    "use strict";
-    init_atomic();
-    init_paths();
-    init_gitignore();
-    init_types();
-  }
-});
-
 // src/daemon/ask-store.ts
 import { existsSync as existsSync7, mkdirSync as mkdirSync7, readFileSync as readFileSync8, readdirSync as readdirSync4 } from "fs";
 function readDecisions(cwd2, sessionId2, askId2) {
@@ -878,6 +878,7 @@ var init_ask_store = __esm({
     init_paths();
     init_config();
     init_history();
+    init_state();
     init_atomic();
     init_notify();
     init_state();
@@ -4114,7 +4115,7 @@ function findLatestReport(cwd2, sessionId2) {
     return null;
   }
 }
-function goToSessionWindow(state2, actions) {
+async function goToSessionWindow(state2, actions) {
   const session = state2.selectedSession;
   if (!session || !state2.selectedSessionId) {
     notify(state2, "No session selected");
@@ -4126,6 +4127,21 @@ function goToSessionWindow(state2, actions) {
     actions.selectWindow(session.tmuxWindowId);
     return;
   }
+  if (session.status !== "completed") {
+    const sessionId2 = state2.selectedSessionId;
+    const res = await actions.send({ type: "reconnect", sessionId: sessionId2, cwd: state2.cwd });
+    if (res.ok) {
+      const data = res.data ?? {};
+      const tmuxName = data["tmuxSessionName"] ?? session.tmuxSessionName;
+      const tmuxWin = data["tmuxWindowId"];
+      const tmuxId = data["tmuxSessionId"];
+      const switchTarget = tmuxId ?? tmuxName;
+      if (switchTarget) actions.switchToSession(switchTarget);
+      if (tmuxWin) actions.selectWindow(tmuxWin);
+      notify(state2, `Reconnected ${tmuxName ?? sessionId2}`);
+      return;
+    }
+  }
   const lastCycle = session.orchestratorCycles[session.orchestratorCycles.length - 1];
   const claudeSessionId = lastCycle?.claudeSessionId;
   if (!claudeSessionId) {
@@ -4719,7 +4735,7 @@ function handleLeaderAction(action, state2, actions) {
       break;
     }
     case "go-to-window": {
-      goToSessionWindow(state2, actions);
+      void goToSessionWindow(state2, actions);
       break;
     }
     case "clone-session": {
@@ -5088,7 +5104,7 @@ function handleNavigateKey(input, key, state2, actions) {
     return;
   }
   if (input === "w") {
-    goToSessionWindow(state2, actions);
+    void goToSessionWindow(state2, actions);
     return;
   }
   if (input === "o") {
@@ -5277,6 +5293,35 @@ function handleNavigateKey(input, key, state2, actions) {
     requestRender();
     return;
   }
+  if (input === "D") {
+    const sessionId2 = state2.selectedSessionId;
+    const session2 = state2.selectedSession;
+    if (!sessionId2 || !session2) {
+      notify(state2, "No session selected");
+      return;
+    }
+    const next = !(session2.dangerousMode === true);
+    session2.dangerousMode = next;
+    requestRender();
+    void (async () => {
+      try {
+        const res = await actions.send({ type: "set-dangerous-mode", sessionId: sessionId2, enabled: next });
+        if (!res.ok) {
+          if (state2.selectedSession === session2) session2.dangerousMode = !next;
+          notify(state2, `Dangerous mode toggle failed: ${res.error}`);
+          requestRender();
+          return;
+        }
+        const flushed = res.data?.["flushed"] ?? 0;
+        notify(state2, next ? flushed > 0 ? `DANGEROUS mode ON \u2014 ${flushed} pending ask(s) auto-resolved` : "DANGEROUS mode ON" : "DANGEROUS mode OFF");
+      } catch (err) {
+        if (state2.selectedSession === session2) session2.dangerousMode = !next;
+        notify(state2, `Dangerous mode toggle failed: ${err.message}`);
+        requestRender();
+      }
+    })();
+    return;
+  }
   if (input === "/") {
     state2.mode = "search";
     state2.searchText = "";
@@ -5470,17 +5515,30 @@ function listAllWindowIds() {
     return /* @__PURE__ */ new Set();
   }
 }
-function registerDashboardWindow() {
+function registerDashboardWindow(cwd2) {
   const wid = getWindowId();
   const pane = process.env["TMUX_PANE"];
+  let sessionTarget = null;
   if (pane) {
-    const session = execSafe(`tmux display-message -t ${shellQuote(pane)} -p "#{session_id}"`);
-    if (session) {
-      execSafe(`tmux set-option -t ${shellQuote(session)} @sisyphus_dashboard ${wid}`);
-      return;
+    sessionTarget = execSafe(`tmux display-message -t ${shellQuote(pane)} -p "#{session_id}"`)?.trim() || null;
+  }
+  if (sessionTarget) {
+    execSafe(`tmux set-option -t ${shellQuote(sessionTarget)} @sisyphus_dashboard ${wid}`);
+  } else {
+    execSafe(`tmux set-option @sisyphus_dashboard ${wid}`);
+  }
+  if (cwd2) {
+    const normalizedCwd = cwd2.replace(/\/+$/, "");
+    const target = sessionTarget;
+    const existing = target ? execSafe(`tmux show-options -t ${shellQuote(target)} -v @sisyphus_cwd`)?.trim() : execSafe(`tmux show-options -v @sisyphus_cwd`)?.trim();
+    if (!existing) {
+      if (target) {
+        execSafe(`tmux set-option -t ${shellQuote(target)} @sisyphus_cwd ${shellQuote(normalizedCwd)}`);
+      } else {
+        execSafe(`tmux set-option @sisyphus_cwd ${shellQuote(normalizedCwd)}`);
+      }
     }
   }
-  execSafe(`tmux set-option @sisyphus_dashboard ${wid}`);
 }
 var companionPaneId = null;
 function setupCompanionPlugin() {
@@ -8073,6 +8131,7 @@ init_render();
 var B = ansiBold;
 var D = ansiDim;
 var SEP = D("\u2502 ");
+var DANGER_BADGE = "\x1B[1;41;97m DANGEROUS \x1B[0m";
 function renderStatusLine(buf, y, state2, cursorNodeType) {
   const { mode, focusPane, notification, error } = state2;
   if (mode === "report-detail") return;
@@ -8110,6 +8169,9 @@ function renderStatusLine(buf, y, state2, cursorNodeType) {
     }
     content = contextFilePart + B("[enter]") + D(" select  ") + B("[m]") + D("essage  ") + B("[n]") + D("ew  ") + B("[w]") + D(" tmux  ") + SEP + B("[q]") + D("uit");
   }
+  if (state2.selectedSession?.dangerousMode === true) {
+    content = `${DANGER_BADGE} ${content}`;
+  }
   writeClipped(buf, 1, y, content, buf.width - 2);
 }
 
@@ -8797,7 +8859,7 @@ if (askId && sessionId) {
   await runSingleAsk2({ cwd, sessionId, askId });
   process.exit(0);
 }
-registerDashboardWindow();
+registerDashboardWindow(cwd);
 var cleanup = setupTerminal();
 var state = createAppState(cwd);
 startApp(state, cleanup);