sisyphi 1.2.21 → 1.2.23

package/dist/daemon.js

@@ -1793,7 +1793,7 @@ function planSendKeys(state) {
   return { action: "send" };
 }
 function getPaneState(paneTarget) {
-  const out = execSafe(`tmux display-message -t ${t(paneTarget)} -p '#{pane_dead} #{pane_in_mode}'`, void 0, TMUX_TIMEOUT_MS);
+  const out = texecSafe(`tmux display-message -t ${t(paneTarget)} -p '#{pane_dead} #{pane_in_mode}'`, void 0, TMUX_TIMEOUT_MS);
   if (out === null) return { exists: false, dead: false, inMode: false };
   const [deadStr, modeStr] = out.split(" ");
   return { exists: true, dead: deadStr === "1", inMode: modeStr === "1" };
@@ -1804,8 +1804,8 @@ function createPane(windowTarget, cwd, position = "right") {
   const target = position === "left" ? panes[0]?.paneId : panes[panes.length - 1]?.paneId;
   const targetFlag = target ? ` -t ${t(target)}` : ` -t ${t(windowTarget)}`;
   const beforeFlag = position === "left" ? "b" : "";
-  const paneId = exec(`tmux split-window -h${beforeFlag}${targetFlag}${cwdFlag} -P -F "#{pane_id}"`);
-  execSafe(`tmux select-layout -t ${t(windowTarget)} even-horizontal`);
+  const paneId = texec(`tmux split-window -h${beforeFlag}${targetFlag}${cwdFlag} -P -F "#{pane_id}"`);
+  texecSafe(`tmux select-layout -t ${t(windowTarget)} even-horizontal`);
   return paneId;
 }
 function sendKeys(paneTarget, command) {
@@ -1813,16 +1813,16 @@ function sendKeys(paneTarget, command) {
   const { action } = planSendKeys(state);
   if (action === "abort") throw new PaneUnavailableError(paneTarget, state);
   if (action === "cancel-then-send") {
-    execSafe(`tmux send-keys -t ${t(paneTarget)} -X cancel`, void 0, TMUX_TIMEOUT_MS);
+    texecSafe(`tmux send-keys -t ${t(paneTarget)} -X cancel`, void 0, TMUX_TIMEOUT_MS);
   }
-  exec(`tmux send-keys -t ${t(paneTarget)} ${shellQuote(command)} Enter`, void 0, TMUX_TIMEOUT_MS);
+  texec(`tmux send-keys -t ${t(paneTarget)} ${shellQuote(command)} Enter`, void 0, TMUX_TIMEOUT_MS);
 }
 function pasteToPane(paneTarget, text, submit) {
   const state = getPaneState(paneTarget);
   const { action } = planSendKeys(state);
   if (action === "abort") throw new PaneUnavailableError(paneTarget, state);
   if (action === "cancel-then-send") {
-    execSafe(`tmux send-keys -t ${t(paneTarget)} -X cancel`, void 0, TMUX_TIMEOUT_MS);
+    texecSafe(`tmux send-keys -t ${t(paneTarget)} -X cancel`, void 0, TMUX_TIMEOUT_MS);
   }
   const bufName = `sisyphus-tell-${Math.random().toString(36).slice(2, 10)}`;
   execSync3(`tmux load-buffer -b ${shellQuote(bufName)} -`, {
@@ -1832,47 +1832,47 @@ function pasteToPane(paneTarget, text, submit) {
     stdio: ["pipe", "pipe", "pipe"]
   });
   try {
-    exec(`tmux paste-buffer -t ${t(paneTarget)} -b ${shellQuote(bufName)} -d`, void 0, TMUX_TIMEOUT_MS);
+    texec(`tmux paste-buffer -t ${t(paneTarget)} -b ${shellQuote(bufName)} -d`, void 0, TMUX_TIMEOUT_MS);
   } catch (err) {
-    execSafe(`tmux delete-buffer -b ${shellQuote(bufName)}`);
+    texecSafe(`tmux delete-buffer -b ${shellQuote(bufName)}`);
     throw err;
   }
   if (submit) {
-    exec(`tmux send-keys -t ${t(paneTarget)} Enter`, void 0, TMUX_TIMEOUT_MS);
+    texec(`tmux send-keys -t ${t(paneTarget)} Enter`, void 0, TMUX_TIMEOUT_MS);
   }
 }
 function killPane(paneTarget) {
-  execSafe(`tmux kill-pane -t ${t(paneTarget)}`);
+  texecSafe(`tmux kill-pane -t ${t(paneTarget)}`);
 }
 function killWindow(windowTarget) {
-  execSafe(`tmux kill-window -t ${t(windowTarget)}`);
+  texecSafe(`tmux kill-window -t ${t(windowTarget)}`);
 }
 function createSession2(sessionName, cwd) {
-  const sessionId = exec(`tmux new-session -d -s ${t(sessionName)} -n main -c ${shellQuote(cwd)} -P -F "#{session_id}"`);
-  const windowId = exec(`tmux display-message -t ${t(sessionId + ":main")} -p "#{window_id}"`);
-  const initialPaneId = exec(`tmux display-message -t ${t(sessionId + ":main")} -p "#{pane_id}"`);
+  const sessionId = texec(`tmux new-session -d -s ${t(sessionName)} -n main -c ${shellQuote(cwd)} -P -F "#{session_id}"`);
+  const windowId = texec(`tmux display-message -t ${t(sessionId + ":main")} -p "#{window_id}"`);
+  const initialPaneId = texec(`tmux display-message -t ${t(sessionId + ":main")} -p "#{pane_id}"`);
   configureSessionDefaults(sessionId, windowId);
   return { windowId, initialPaneId, sessionId };
 }
 function paneExists(paneTarget) {
-  return execSafe(`tmux display-message -t ${t(paneTarget)} -p "#{pane_id}"`) !== null;
+  return texecSafe(`tmux display-message -t ${t(paneTarget)} -p "#{pane_id}"`) !== null;
 }
 function getPanePid(paneTarget) {
-  const out = execSafe(`tmux display-message -t ${t(paneTarget)} -p "#{pane_pid}"`, void 0, TMUX_TIMEOUT_MS);
+  const out = texecSafe(`tmux display-message -t ${t(paneTarget)} -p "#{pane_pid}"`, void 0, TMUX_TIMEOUT_MS);
   if (!out) return null;
   const pid = parseInt(out.trim(), 10);
   return Number.isFinite(pid) ? pid : null;
 }
 function sessionExistsById(tmuxSessionId) {
-  return execSafe(`tmux has-session -t ${t(tmuxSessionId)}`) !== null;
+  return texecSafe(`tmux has-session -t ${t(tmuxSessionId)}`) !== null;
 }
 function sessionNameTaken(sessionName) {
-  const output = execSafe('tmux list-sessions -F "#{session_name}"');
+  const output = texecSafe('tmux list-sessions -F "#{session_name}"');
   if (!output) return false;
   return output.split("\n").some((line) => line === sessionName);
 }
 function resolveSessionId(sessionName) {
-  const output = execSafe('tmux list-sessions -F "#{session_id} #{session_name}"');
+  const output = texecSafe('tmux list-sessions -F "#{session_id} #{session_name}"');
   if (!output) return null;
   for (const line of output.split("\n").filter(Boolean)) {
     const { sessionId, name } = parseSessionLine(line);
@@ -1890,43 +1890,43 @@ function initSessionMeta(tmuxTarget, cwd, sisyphusSessionId) {
   setSessionOption(tmuxTarget, "@sisyphus_session_id", sisyphusSessionId);
 }
 function killSession(target) {
-  execSafe(`tmux kill-session -t ${t(target)}`);
+  texecSafe(`tmux kill-session -t ${t(target)}`);
 }
 function renameSession(target, newName) {
-  exec(`tmux rename-session -t ${t(target)} ${t(newName)}`);
+  texec(`tmux rename-session -t ${t(target)} ${t(newName)}`);
 }
 function setSessionOption(target, option, value) {
-  execSafe(`tmux set-option -t ${t(target)} ${option} ${shellQuote(value)}`);
+  texecSafe(`tmux set-option -t ${t(target)} ${option} ${shellQuote(value)}`);
 }
 function parseSessionLine(line) {
   const spaceIdx = line.indexOf(" ");
   return { sessionId: line.slice(0, spaceIdx), name: line.slice(spaceIdx + 1) };
 }
 function findHomeSession(cwd) {
-  const output = execSafe('tmux list-sessions -F "#{session_id} #{session_name}"');
+  const output = texecSafe('tmux list-sessions -F "#{session_id} #{session_name}"');
   if (!output) return null;
   const normalizedCwd = cwd.replace(/\/+$/, "");
   for (const line of output.split("\n").filter(Boolean)) {
     const { sessionId: sessId, name } = parseSessionLine(line);
     if (name.startsWith("ssyph_")) continue;
-    const val = execSafe(`tmux show-options -t ${t(sessId)} -v @sisyphus_cwd`);
+    const val = texecSafe(`tmux show-options -t ${t(sessId)} -v @sisyphus_cwd`);
     if (val?.trim() === normalizedCwd) return sessId;
   }
   return null;
 }
 function switchAttachedClients(sourceTarget, destTarget) {
-  if (execSafe(`tmux has-session -t ${t(destTarget)}`) === null) return;
-  const output = execSafe(`tmux list-clients -t ${t(sourceTarget)} -F "#{client_tty}"`);
+  if (texecSafe(`tmux has-session -t ${t(destTarget)}`) === null) return;
+  const output = texecSafe(`tmux list-clients -t ${t(sourceTarget)} -F "#{client_tty}"`);
   if (!output) return;
   for (const tty of output.split("\n").filter(Boolean)) {
-    execSafe(`tmux switch-client -c ${t(tty)} -t ${t(destTarget)}`);
+    texecSafe(`tmux switch-client -c ${t(tty)} -t ${t(destTarget)}`);
   }
 }
 function getFirstWindowId(sessionTarget) {
-  return execSafe(`tmux list-windows -t ${t(sessionTarget)} -F "#{window_id}" -f "#{==:#{window_index},0}"`)?.trim() || null;
+  return texecSafe(`tmux list-windows -t ${t(sessionTarget)} -F "#{window_id}" -f "#{==:#{window_index},0}"`)?.trim() || null;
 }
 function listPanes(windowTarget) {
-  const output = execSafe(`tmux list-panes -t ${t(windowTarget)} -F "#{pane_id} #{pane_pid}"`, void 0, TMUX_TIMEOUT_MS);
+  const output = texecSafe(`tmux list-panes -t ${t(windowTarget)} -F "#{pane_id} #{pane_pid}"`, void 0, TMUX_TIMEOUT_MS);
   if (!output) return [];
   return output.split("\n").filter(Boolean).map((line) => {
     const [paneId, panePid] = line.split(" ");
@@ -1934,7 +1934,7 @@ function listPanes(windowTarget) {
   });
 }
 function listAllPanesByWindow() {
-  const output = execSafe('tmux list-panes -a -F "#{window_id} #{pane_id} #{pane_pid}"', void 0, TMUX_TIMEOUT_MS);
+  const output = texecSafe('tmux list-panes -a -F "#{window_id} #{pane_id} #{pane_pid}"', void 0, TMUX_TIMEOUT_MS);
   const map = /* @__PURE__ */ new Map();
   if (!output) return map;
   for (const line of output.split("\n")) {
@@ -1948,17 +1948,17 @@ function listAllPanesByWindow() {
   return map;
 }
 function setPaneTitle(paneTarget, title) {
-  execSafe(`tmux select-pane -t ${t(paneTarget)} -T ${shellQuote(title)}`);
+  texecSafe(`tmux select-pane -t ${t(paneTarget)} -T ${shellQuote(title)}`);
 }
 function setPaneStyle(paneTarget, color, meta) {
   const gitBranch = `#(cd #{pane_current_path} && git branch --show-current 2>/dev/null)`;
   const branchSuffix = `#(cd #{pane_current_path} && git branch --show-current 2>/dev/null | grep -q . && echo ' |') ${gitBranch}`;
   const homePath = `#(echo '#{pane_current_path}' | sed "s|^$HOME|~|")`;
-  execSafe(`tmux set -p -t ${t(paneTarget)} @pane_role ${shellQuote(meta.role)}`);
-  execSafe(`tmux set -p -t ${t(paneTarget)} @pane_session ${shellQuote(meta.session)}`);
-  execSafe(`tmux set -p -t ${t(paneTarget)} @pane_cycle ${shellQuote(meta.cycle)}`);
+  texecSafe(`tmux set -p -t ${t(paneTarget)} @pane_role ${shellQuote(meta.role)}`);
+  texecSafe(`tmux set -p -t ${t(paneTarget)} @pane_session ${shellQuote(meta.session)}`);
+  texecSafe(`tmux set -p -t ${t(paneTarget)} @pane_cycle ${shellQuote(meta.cycle)}`);
   if (meta.mode) {
-    execSafe(`tmux set -p -t ${t(paneTarget)} @pane_mode ${shellQuote(meta.mode)}`);
+    texecSafe(`tmux set -p -t ${t(paneTarget)} @pane_mode ${shellQuote(meta.mode)}`);
   }
   const modeSegment = `#{?#{@pane_mode}, #[fg=${color}\\,italics]#{@pane_mode}#[default],}`;
   const fmt = [
@@ -1969,30 +1969,30 @@ function setPaneStyle(paneTarget, color, meta) {
     `  ${homePath}${branchSuffix}`,
     `#[default]`
   ].join("");
-  execSafe(`tmux set -p -t ${t(paneTarget)} pane-border-format ${shellQuote(fmt)}`);
+  texecSafe(`tmux set -p -t ${t(paneTarget)} pane-border-format ${shellQuote(fmt)}`);
 }
 function updatePaneMeta(paneTarget, updates) {
-  if (updates.role !== void 0) execSafe(`tmux set -p -t ${t(paneTarget)} @pane_role ${shellQuote(updates.role)}`);
-  if (updates.session !== void 0) execSafe(`tmux set -p -t ${t(paneTarget)} @pane_session ${shellQuote(updates.session)}`);
-  if (updates.cycle !== void 0) execSafe(`tmux set -p -t ${t(paneTarget)} @pane_cycle ${shellQuote(updates.cycle)}`);
-  if (updates.mode !== void 0) execSafe(`tmux set -p -t ${t(paneTarget)} @pane_mode ${shellQuote(updates.mode)}`);
+  if (updates.role !== void 0) texecSafe(`tmux set -p -t ${t(paneTarget)} @pane_role ${shellQuote(updates.role)}`);
+  if (updates.session !== void 0) texecSafe(`tmux set -p -t ${t(paneTarget)} @pane_session ${shellQuote(updates.session)}`);
+  if (updates.cycle !== void 0) texecSafe(`tmux set -p -t ${t(paneTarget)} @pane_cycle ${shellQuote(updates.cycle)}`);
+  if (updates.mode !== void 0) texecSafe(`tmux set -p -t ${t(paneTarget)} @pane_mode ${shellQuote(updates.mode)}`);
 }
 function selectLayout(windowTarget, layout = "even-horizontal") {
-  execSafe(`tmux select-layout -t ${t(windowTarget)} ${layout}`);
+  texecSafe(`tmux select-layout -t ${t(windowTarget)} ${layout}`);
 }
 function setWindowOption(windowTarget, option, value) {
-  execSafe(`tmux set-option -w -t ${t(windowTarget)} ${option} ${shellQuote(value)}`);
+  texecSafe(`tmux set-option -w -t ${t(windowTarget)} ${option} ${shellQuote(value)}`);
 }
 function getSessionOption(target, option) {
-  return execSafe(`tmux show-options -t ${t(target)} -v ${option}`);
+  return texecSafe(`tmux show-options -t ${t(target)} -v ${option}`);
 }
 function listAllSessions() {
-  const output = execSafe('tmux list-sessions -F "#{session_id} #{session_name}"');
+  const output = texecSafe('tmux list-sessions -F "#{session_id} #{session_name}"');
   if (!output) return [];
   return output.split("\n").filter(Boolean).map(parseSessionLine);
 }
 function listAllPanes() {
-  const output = execSafe('tmux list-panes -a -F "#{session_name} #{pane_id}"');
+  const output = texecSafe('tmux list-panes -a -F "#{session_name} #{pane_id}"');
   if (!output) return [];
   return output.split("\n").filter(Boolean).map((line) => {
     const spaceIdx = line.indexOf(" ");
@@ -2000,7 +2000,7 @@ function listAllPanes() {
   });
 }
 function listAllWindowsBySession() {
-  const output = execSafe('tmux list-windows -a -F "#{session_name}	#{window_index}	#{window_id}	#{window_name}"', void 0, TMUX_TIMEOUT_MS);
+  const output = texecSafe('tmux list-windows -a -F "#{session_name}	#{window_index}	#{window_id}	#{window_name}"', void 0, TMUX_TIMEOUT_MS);
   const map = /* @__PURE__ */ new Map();
   if (!output) return map;
   for (const line of output.split("\n")) {
@@ -2017,13 +2017,13 @@ function listAllWindowsBySession() {
   return map;
 }
 function configureSessionDefaults(sessionTarget, windowId) {
-  execSafe(`tmux set -w -t ${t(windowId)} pane-border-status top`);
-  execSafe(`tmux set -w -t ${t(windowId)} allow-rename off`);
-  execSafe(`tmux set -w -t ${t(windowId)} automatic-rename off`);
-  execSafe(`tmux set-hook -t ${t(sessionTarget)} after-kill-pane "select-layout even-horizontal"`);
-  execSafe(`tmux set-hook -t ${t(sessionTarget)} pane-exited "select-layout even-horizontal"`);
+  texecSafe(`tmux set -w -t ${t(windowId)} pane-border-status top`);
+  texecSafe(`tmux set -w -t ${t(windowId)} allow-rename off`);
+  texecSafe(`tmux set -w -t ${t(windowId)} automatic-rename off`);
+  texecSafe(`tmux set-hook -t ${t(sessionTarget)} after-kill-pane "select-layout even-horizontal"`);
+  texecSafe(`tmux set-hook -t ${t(sessionTarget)} pane-exited "select-layout even-horizontal"`);
 }
-var t, TMUX_TIMEOUT_MS, PaneUnavailableError;
+var t, TMUX_TIMEOUT_MS, texec, texecSafe, PaneUnavailableError;
 var init_tmux = __esm({
   "src/daemon/tmux.ts"() {
     "use strict";
@@ -2032,6 +2032,8 @@ var init_tmux = __esm({
     init_exec();
     t = (target) => shellQuote(target);
     TMUX_TIMEOUT_MS = 5e3;
+    texec = (cmd, cwd, timeoutMs = TMUX_TIMEOUT_MS) => exec(cmd, cwd, timeoutMs);
+    texecSafe = (cmd, cwd, timeoutMs = TMUX_TIMEOUT_MS) => execSafe(cmd, cwd, timeoutMs);
     PaneUnavailableError = class extends Error {
       constructor(paneTarget, state) {
         super(`pane ${paneTarget} unavailable (exists=${state.exists}, dead=${state.dead}, inMode=${state.inMode})`);