sisyphi 1.0.11 → 1.0.13

package/dist/cli.js

@@ -39,10 +39,17 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync, chmodSync, unlinkSy
 import { homedir } from "os";
 import { join } from "path";
 var DEFAULT_KEY = "M-s";
+var DEFAULT_HOME_KEY = "M-S";
 var SISYPHUS_CONF_MARKER = "# sisyphus-managed \u2014 do not edit";
 function cycleScriptPath() {
   return join(globalDir(), "bin", "sisyphus-cycle");
 }
+function homeScriptPath() {
+  return join(globalDir(), "bin", "sisyphus-home");
+}
+function killPaneScriptPath() {
+  return join(globalDir(), "bin", "sisyphus-kill-pane");
+}
 function sisyphusTmuxConfPath() {
   return join(globalDir(), "tmux.conf");
 }
@@ -72,12 +79,69 @@ for (( i=0; i<\${#sessions[@]}; i++ )); do
 done
 tmux switch-client -t "\${sessions[0]}"
 `;
+var HOME_SCRIPT = `#!/bin/bash
+# Jump to the home (non-sisyphus) session that has the dashboard window
+cwd=$(tmux show-option -v @sisyphus_cwd 2>/dev/null)
+[ -z "$cwd" ] && exit 0
+while IFS= read -r name; do
+  # Skip sisyphus agent/orchestrator sessions
+  case "$name" in sisyphus-*) continue ;; esac
+  scwd=$(tmux show-option -t "$name" -v @sisyphus_cwd 2>/dev/null)
+  if [ "$scwd" = "$cwd" ]; then
+    tmux switch-client -t "$name"
+    # Focus the dashboard window if it exists
+    tmux select-window -t "$name:sisyphus-dashboard" 2>/dev/null
+    exit 0
+  fi
+done < <(tmux list-sessions -F '#{session_name}')
+`;
+var KILL_PANE_SCRIPT = `#!/bin/bash
+# prefix-x override for sisyphus sessions.
+# If this is the last pane, switch to the home session before killing.
+session=$(tmux display-message -p '#{session_name}')
+pane_count=$(tmux list-panes -t "$session" -F '#{pane_id}' | wc -l | tr -d ' ')
+
+if [ "$pane_count" -le 1 ]; then
+  # Last pane \u2014 find home session, switch there, then kill sisyphus session
+  cwd=$(tmux show-option -t "$session" -v @sisyphus_cwd 2>/dev/null)
+  if [ -n "$cwd" ]; then
+    while IFS= read -r name; do
+      case "$name" in sisyphus-*) continue ;; esac
+      scwd=$(tmux show-option -t "$name" -v @sisyphus_cwd 2>/dev/null)
+      if [ "$scwd" = "$cwd" ]; then
+        tmux switch-client -t "$name"
+        tmux select-window -t "$name:sisyphus-dashboard" 2>/dev/null
+        tmux kill-session -t "$session"
+        exit 0
+      fi
+    done < <(tmux list-sessions -F '#{session_name}')
+  fi
+  # No home session found \u2014 just kill the pane
+  tmux kill-pane
+else
+  # Multiple panes \u2014 kill this one and rebalance
+  tmux kill-pane
+  tmux select-layout even-horizontal
+fi
+`;
 function installCycleScript() {
-  const scriptPath = cycleScriptPath();
   mkdirSync(join(globalDir(), "bin"), { recursive: true });
+  const scriptPath = cycleScriptPath();
   writeFileSync(scriptPath, CYCLE_SCRIPT, "utf8");
   chmodSync(scriptPath, 493);
 }
+function installHomeScript() {
+  mkdirSync(join(globalDir(), "bin"), { recursive: true });
+  const scriptPath = homeScriptPath();
+  writeFileSync(scriptPath, HOME_SCRIPT, "utf8");
+  chmodSync(scriptPath, 493);
+}
+function installKillPaneScript() {
+  mkdirSync(join(globalDir(), "bin"), { recursive: true });
+  const scriptPath = killPaneScriptPath();
+  writeFileSync(scriptPath, KILL_PANE_SCRIPT, "utf8");
+  chmodSync(scriptPath, 493);
+}
 function getExistingBinding(key) {
   try {
     const output = execSync("tmux list-keys", { stdio: ["pipe", "pipe", "pipe"] }).toString();
@@ -98,8 +162,10 @@ function getExistingBinding(key) {
 function isSisyphusBinding(binding) {
   return binding.includes("sisyphus");
 }
-function setupTmuxKeybind(key = DEFAULT_KEY) {
+function setupTmuxKeybind(key = DEFAULT_KEY, homeKey = DEFAULT_HOME_KEY) {
   installCycleScript();
+  installHomeScript();
+  installKillPaneScript();
   const existing = getExistingBinding(key);
   if (existing !== null && !isSisyphusBinding(existing)) {
     return {
@@ -108,10 +174,24 @@ function setupTmuxKeybind(key = DEFAULT_KEY) {
       existingBinding: existing
     };
   }
+  if (homeKey !== key) {
+    const existingHome = getExistingBinding(homeKey);
+    if (existingHome !== null && !isSisyphusBinding(existingHome)) {
+      return {
+        status: "conflict",
+        message: `Tmux key ${homeKey} is already bound to something else.`,
+        existingBinding: existingHome
+      };
+    }
+  }
   const confPath = sisyphusTmuxConfPath();
-  const bindingLine = `bind-key -T root ${key} run-shell ${cycleScriptPath()}`;
+  const cycleBinding = `bind-key -T root ${key} run-shell ${cycleScriptPath()}`;
+  const homeBinding = `bind-key -T root ${homeKey} run-shell ${homeScriptPath()}`;
+  const killPaneOverride = `bind-key -T prefix x if-shell "tmux display-message -p '#{session_name}' | grep -q '^sisyphus-'" "run-shell ${killPaneScriptPath()}" "kill-pane \\; select-layout even-horizontal"`;
   writeFileSync(confPath, `${SISYPHUS_CONF_MARKER}
-${bindingLine}
+${cycleBinding}
+${homeBinding}
+${killPaneOverride}
 `, "utf8");
   const userConf = userTmuxConfPath();
   const sourceLine = `source-file ${confPath}`;
@@ -128,12 +208,14 @@ ${bindingLine}
   }
   try {
     execSync(`tmux bind-key -T root ${key} run-shell ${cycleScriptPath()}`, { stdio: "pipe" });
+    execSync(`tmux bind-key -T root ${homeKey} run-shell ${homeScriptPath()}`, { stdio: "pipe" });
+    execSync(`tmux ${killPaneOverride}`, { stdio: "pipe" });
   } catch {
   }
   if (existing !== null && isSisyphusBinding(existing)) {
     return {
       status: "already-installed",
-      message: `Tmux keybinding ${key} already configured for sisyphus.`
+      message: `Tmux keybindings ${key} (cycle) and ${homeKey} (dashboard) already configured for sisyphus.`
     };
   }
   const persistNote = persistedToConf ? "" : `
@@ -141,7 +223,7 @@ Note: No tmux.conf found. Add this to your tmux config for persistence:
   source-file ${confPath}`;
   return {
     status: "installed",
-    message: `Tmux keybinding set: ${key} cycles sisyphus sessions${persistNote}`
+    message: `Tmux keybindings set: ${key} cycles sessions, ${homeKey} jumps to dashboard${persistNote}`
   };
 }
 function removeTmuxKeybind() {
@@ -158,9 +240,14 @@ function removeTmuxKeybind() {
   if (existsSync(confPath)) {
     unlinkSync(confPath);
   }
-  const scriptPath = cycleScriptPath();
-  if (existsSync(scriptPath)) {
-    unlinkSync(scriptPath);
+  try {
+    execSync("tmux bind-key -T prefix x kill-pane \\; select-layout even-horizontal", { stdio: "pipe" });
+  } catch {
+  }
+  for (const scriptPath of [cycleScriptPath(), homeScriptPath(), killPaneScriptPath()]) {
+    if (existsSync(scriptPath)) {
+      unlinkSync(scriptPath);
+    }
   }
 }