sisyphi 1.1.31 → 1.1.33

package/README.md

@@ -160,6 +160,7 @@ Key bindings — navigate mode:
 | `e` | Edit context file |
 | `S` | Session info |
 | `F` | Filter / search |
+| `D` | Toggle DANGEROUS mode for the selected session (auto-accepts the default for every ask) |
 | `c` | Open companion overlay |
 | `/` | Search sessions |
 | `q` | Quit |

package/deploy/shared/cloud-init.yaml.tpl

@@ -96,6 +96,9 @@ runcmd:
   # 6. Sisyphus install (root → /usr/bin/sisyphusd symlink).
   - npm i -g sisyphi@${sisyphus_version}
 
+  # 6b. Claude Code CLI (sisyphus drives it for agent sessions).
+  - npm i -g @anthropic-ai/claude-code
+
   # 7. Daemon as systemd user service.
   - sudo -u sisyphus XDG_RUNTIME_DIR=/run/user/$(id -u sisyphus) systemctl --user daemon-reload
   - sudo -u sisyphus XDG_RUNTIME_DIR=/run/user/$(id -u sisyphus) systemctl --user enable --now sisyphusd

package/dist/cli.js

@@ -36,6 +36,12 @@ function projectDir(cwd) {
 function projectConfigPath(cwd) {
   return join(projectDir(cwd), "config.json");
 }
+function projectAgentPluginDir(cwd) {
+  return join(projectDir(cwd), "agent-plugin");
+}
+function userAgentPluginDir() {
+  return join(globalDir(), "agent-plugin");
+}
 function sessionsDir(cwd) {
   return join(projectDir(cwd), "sessions");
 }
@@ -2320,6 +2326,11 @@ function getTmuxSessionInfo() {
 function shellQuote(s) {
   return `'${s.replace(/'/g, "'\\''")}'`;
 }
+function shellQuoteHomePath(path) {
+  if (path === "~") return "~";
+  if (path.startsWith("~/")) return `~/${shellQuote(path.slice(2))}`;
+  return shellQuote(path);
+}
 function validateRepoName(repo) {
   return !repo.includes("/") && !repo.includes("\\") && !repo.includes("..");
 }
@@ -3277,13 +3288,79 @@ function emitHistoryEvent(sessionId, event, data) {
   }
 }
 
+// src/daemon/state.ts
+init_atomic();
+init_paths();
+import { copyFileSync, cpSync, existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync11, readdirSync as readdirSync2, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
+import { join as join10 } from "path";
+
+// src/shared/gitignore.ts
+import { existsSync as existsSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync5 } from "fs";
+import { join as join9 } from "path";
+
+// src/shared/types.ts
+var ORCHESTRATOR_ASKED_BY = "orchestrator";
+
+// src/daemon/state.ts
+function withSessionLock(sessionId, fn) {
+  return withLock(sessionId, fn);
+}
+function getSession(cwd, sessionId) {
+  const content = readFileSync11(statePath(cwd, sessionId), "utf-8");
+  const session2 = JSON.parse(content);
+  if (session2.activeMs == null) session2.activeMs = 0;
+  if (session2.userBlockedMs == null) session2.userBlockedMs = 0;
+  for (const agent2 of session2.agents) {
+    if (!agent2.repo) agent2.repo = ".";
+    if (agent2.activeMs == null) agent2.activeMs = 0;
+    if (agent2.orphaned == null) agent2.orphaned = false;
+  }
+  if (session2.orphaned == null) session2.orphaned = false;
+  for (const cycle of session2.orchestratorCycles) {
+    if (cycle.activeMs == null) cycle.activeMs = 0;
+    if (cycle.userBlockedMs == null) cycle.userBlockedMs = 0;
+  }
+  return session2;
+}
+function saveSession(session2) {
+  atomicWrite(statePath(session2.cwd, session2.id), JSON.stringify(session2, null, 2));
+}
+function isSessionDangerous(cwd, sessionId) {
+  try {
+    return getSession(cwd, sessionId).dangerousMode === true;
+  } catch {
+    return false;
+  }
+}
+async function incrementUserBlockedMs(cwd, sessionId, deltaMs, askedAt, askedBy) {
+  if (deltaMs <= 0) return;
+  return withSessionLock(sessionId, () => {
+    const session2 = getSession(cwd, sessionId);
+    session2.userBlockedMs = (session2.userBlockedMs ?? 0) + deltaMs;
+    if (askedAt) {
+      const askedAtMs = new Date(askedAt).getTime();
+      const cycle = session2.orchestratorCycles.find((c2) => {
+        const startMs = new Date(c2.timestamp).getTime();
+        const endMs = c2.completedAt ? new Date(c2.completedAt).getTime() : Infinity;
+        return startMs <= askedAtMs && askedAtMs < endMs;
+      });
+      if (cycle) cycle.userBlockedMs = (cycle.userBlockedMs ?? 0) + deltaMs;
+    }
+    if (askedBy && askedBy !== ORCHESTRATOR_ASKED_BY) {
+      const agent2 = session2.agents.slice().reverse().find((a) => a.id === askedBy);
+      if (agent2) agent2.userBlockedMs = (agent2.userBlockedMs ?? 0) + deltaMs;
+    }
+    saveSession(session2);
+  });
+}
+
 // src/daemon/ask-store.ts
 init_atomic();
 
 // src/daemon/notify.ts
 import { spawn, execFile } from "child_process";
-import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync4, existsSync as existsSync6 } from "fs";
-import { join as join9 } from "path";
+import { writeFileSync as writeFileSync7, mkdirSync as mkdirSync5, existsSync as existsSync8 } from "fs";
+import { join as join11 } from "path";
 import { homedir as homedir6 } from "os";
 var TMUX_SOCKET = `/tmp/tmux-${process.getuid?.() ?? 0}/default`;
 var SWITCH_SCRIPT = [
@@ -3326,24 +3403,24 @@ var SWITCH_SCRIPT = [
   ""
 ].join("\n");
 function ensureSwitchScript() {
-  const dir = join9(homedir6(), ".sisyphus");
-  const scriptPath2 = join9(dir, "notify-switch.sh");
+  const dir = join11(homedir6(), ".sisyphus");
+  const scriptPath2 = join11(dir, "notify-switch.sh");
   try {
-    mkdirSync4(dir, { recursive: true });
-    writeFileSync5(scriptPath2, SWITCH_SCRIPT, { mode: 493 });
+    mkdirSync5(dir, { recursive: true });
+    writeFileSync7(scriptPath2, SWITCH_SCRIPT, { mode: 493 });
   } catch {
   }
 }
 var notifyProcess = null;
 function getNotifyBinary() {
-  return join9(homedir6(), ".sisyphus", "SisyphusNotify.app", "Contents", "MacOS", "sisyphus-notify");
+  return join11(homedir6(), ".sisyphus", "SisyphusNotify.app", "Contents", "MacOS", "sisyphus-notify");
 }
 function ensureNotifyProcess() {
   if (notifyProcess && !notifyProcess.killed && notifyProcess.stdin?.writable) {
     return notifyProcess;
   }
   const binary = getNotifyBinary();
-  if (!existsSync6(binary)) {
+  if (!existsSync8(binary)) {
     return null;
   }
   notifyProcess = spawn(binary, [], {
@@ -3399,65 +3476,6 @@ function sendTerminalNotification(titleOrOpts, message, tmuxSession, level) {
   });
 }
 
-// src/daemon/state.ts
-init_atomic();
-init_paths();
-import { copyFileSync, cpSync, existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync11, readdirSync as readdirSync2, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
-import { join as join11 } from "path";
-
-// src/shared/gitignore.ts
-import { existsSync as existsSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "fs";
-import { join as join10 } from "path";
-
-// src/shared/types.ts
-var ORCHESTRATOR_ASKED_BY = "orchestrator";
-
-// src/daemon/state.ts
-function withSessionLock(sessionId, fn) {
-  return withLock(sessionId, fn);
-}
-function getSession(cwd, sessionId) {
-  const content = readFileSync11(statePath(cwd, sessionId), "utf-8");
-  const session2 = JSON.parse(content);
-  if (session2.activeMs == null) session2.activeMs = 0;
-  if (session2.userBlockedMs == null) session2.userBlockedMs = 0;
-  for (const agent2 of session2.agents) {
-    if (!agent2.repo) agent2.repo = ".";
-    if (agent2.activeMs == null) agent2.activeMs = 0;
-    if (agent2.orphaned == null) agent2.orphaned = false;
-  }
-  if (session2.orphaned == null) session2.orphaned = false;
-  for (const cycle of session2.orchestratorCycles) {
-    if (cycle.activeMs == null) cycle.activeMs = 0;
-    if (cycle.userBlockedMs == null) cycle.userBlockedMs = 0;
-  }
-  return session2;
-}
-function saveSession(session2) {
-  atomicWrite(statePath(session2.cwd, session2.id), JSON.stringify(session2, null, 2));
-}
-async function incrementUserBlockedMs(cwd, sessionId, deltaMs, askedAt, askedBy) {
-  if (deltaMs <= 0) return;
-  return withSessionLock(sessionId, () => {
-    const session2 = getSession(cwd, sessionId);
-    session2.userBlockedMs = (session2.userBlockedMs ?? 0) + deltaMs;
-    if (askedAt) {
-      const askedAtMs = new Date(askedAt).getTime();
-      const cycle = session2.orchestratorCycles.find((c2) => {
-        const startMs = new Date(c2.timestamp).getTime();
-        const endMs = c2.completedAt ? new Date(c2.completedAt).getTime() : Infinity;
-        return startMs <= askedAtMs && askedAtMs < endMs;
-      });
-      if (cycle) cycle.userBlockedMs = (cycle.userBlockedMs ?? 0) + deltaMs;
-    }
-    if (askedBy && askedBy !== ORCHESTRATOR_ASKED_BY) {
-      const agent2 = session2.agents.slice().reverse().find((a) => a.id === askedBy);
-      if (agent2) agent2.userBlockedMs = (agent2.userBlockedMs ?? 0) + deltaMs;
-    }
-    saveSession(session2);
-  });
-}
-
 // src/daemon/ask-store.ts
 var ACTIONABLE_KINDS = /* @__PURE__ */ new Set([
   "validation",
@@ -3511,6 +3529,21 @@ function createAsk(cwd, sessionId, params) {
 }
 function writeDecisions(cwd, sessionId, askId, deck) {
   atomicWrite(askDecisionsPath(cwd, sessionId, askId), JSON.stringify(deck, null, 2));
+  void maybeAutoResolveAsk(cwd, sessionId, askId, deck);
+}
+function readDecisions(cwd, sessionId, askId) {
+  const p = askDecisionsPath(cwd, sessionId, askId);
+  try {
+    return JSON.parse(readFileSync12(p, { encoding: "utf-8" }));
+  } catch (_e) {
+    return null;
+  }
+}
+function writeOutput(cwd, sessionId, askId, responses, completedAt) {
+  atomicWrite(askOutputPath(cwd, sessionId, askId), JSON.stringify({
+    responses,
+    completedAt: completedAt ?? (/* @__PURE__ */ new Date()).toISOString()
+  }, null, 2));
 }
 function readMeta(cwd, sessionId, askId) {
   const p = askMetaPath(cwd, sessionId, askId);
@@ -3530,6 +3563,40 @@ async function updateMeta(cwd, sessionId, askId, patch) {
     return next;
   });
 }
+function buildAutoResponses(deck) {
+  const out = [];
+  for (const interaction of deck.interactions) {
+    const first = interaction.options[0];
+    if (!first) continue;
+    out.push({ id: interaction.id, selectedOptionId: first.id });
+  }
+  return out;
+}
+async function autoResolveAsk(cwd, sessionId, askId, deck) {
+  try {
+    if (existsSync9(askOutputPath(cwd, sessionId, askId))) return false;
+    const d = deck ?? readDecisions(cwd, sessionId, askId);
+    if (!d) return false;
+    const responses = buildAutoResponses(d);
+    if (responses.length === 0) return false;
+    writeOutput(cwd, sessionId, askId, responses);
+    await updateMeta(cwd, sessionId, askId, {
+      status: "answered",
+      completedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    return true;
+  } catch (err) {
+    console.warn(`[sisyphus] dangerous-mode auto-resolve failed for ask ${askId}:`, err instanceof Error ? err.message : err);
+    return false;
+  }
+}
+async function maybeAutoResolveAsk(cwd, sessionId, askId, deck) {
+  try {
+    if (!isSessionDangerous(cwd, sessionId)) return;
+    await autoResolveAsk(cwd, sessionId, askId, deck);
+  } catch {
+  }
+}
 
 // src/cli/commands/ask.ts
 init_paths();
@@ -4230,6 +4297,7 @@ import { existsSync as existsSync12 } from "fs";
 import { join as join14, resolve as resolve5 } from "path";
 
 // src/daemon/frontmatter.ts
+init_paths();
 import { readFileSync as readFileSync16, existsSync as existsSync11, readdirSync as readdirSync5 } from "fs";
 import { homedir as homedir7 } from "os";
 import { join as join13, basename as basename4 } from "path";
@@ -4290,6 +4358,8 @@ function discoverAgentTypes(pluginDir, cwd) {
       }
     }
   }
+  scanDir(join13(projectAgentPluginDir(cwd), "agents"), null, "project-sis");
+  scanDir(join13(userAgentPluginDir(), "agents"), null, "user-sis");
   scanDir(join13(cwd, ".claude", "agents"), null, "project");
   scanDir(join13(homedir7(), ".claude", "agents"), null, "user");
   scanDir(join13(pluginDir, "agents"), "sisyphus", "bundled");
@@ -10296,7 +10366,7 @@ function ensureGroveInstalled(provider) {
   }
 }
 function ensureGroveRegistered(provider, repo, instancePath) {
-  const cmd = `grove register --update --name ${shellQuote(repo)} ${shellQuote(instancePath)}`;
+  const cmd = `grove register --update --name ${shellQuote(repo)} ${shellQuoteHomePath(instancePath)}`;
   const result = runOnBox(provider, cmd);
   if (result.exitCode !== 0) {
     throw new Error(`Failed to register grove project ${repo}: ${result.stderr || result.stdout}`);
@@ -10382,7 +10452,7 @@ function packageManagerInstallCmd(pm) {
 init_paths();
 function readSidecar(provider, repo) {
   const path = boxCloudSidecarPath(repo);
-  const result = runOnBox(provider, `cat ${shellQuote(path)} 2>/dev/null`);
+  const result = runOnBox(provider, `cat ${shellQuoteHomePath(path)} 2>/dev/null`);
   if (result.exitCode !== 0 || !result.stdout.trim()) return null;
   try {
     const parsed = JSON.parse(result.stdout);
@@ -10396,8 +10466,8 @@ function writeSidecar(provider, repo, data) {
   const path = boxCloudSidecarPath(repo);
   const json = JSON.stringify(data, null, 2);
   const cmd = [
-    `mkdir -p ${shellQuote(dir)}`,
-    `cat > ${shellQuote(path)} <<'SISYPHUS_CLOUD_SIDECAR_EOF'`,
+    `mkdir -p ${shellQuoteHomePath(dir)}`,
+    `cat > ${shellQuoteHomePath(path)} <<'SISYPHUS_CLOUD_SIDECAR_EOF'`,
     json,
     "SISYPHUS_CLOUD_SIDECAR_EOF"
   ].join("\n");
@@ -10438,14 +10508,14 @@ Pass --name <slug> to disambiguate, or --fresh to overwrite.`
     }
     console.log(`\u2192 wiping ${remoteDir} and cloning ${localOrigin} on box...`);
     const cloneCmd = [
-      `rm -rf ${shellQuote(remoteDir)}`,
-      `mkdir -p ${shellQuote("~/projects")}`,
-      `git clone ${shellQuote(localOrigin)} ${shellQuote(remoteDir)}`
+      `rm -rf ${shellQuoteHomePath(remoteDir)}`,
+      `mkdir -p ${shellQuoteHomePath("~/projects")}`,
+      `git clone ${shellQuote(localOrigin)} ${shellQuoteHomePath(remoteDir)}`
     ].join(" && ");
     const code = await runOnBoxStreaming(provider, cloneCmd);
     if (code !== 0) throw new Error(`fresh clone failed (exit ${code})`);
   } else {
-    const mkdir = runOnBox(provider, `mkdir -p ${shellQuote(remoteDir)}`);
+    const mkdir = runOnBox(provider, `mkdir -p ${shellQuoteHomePath(remoteDir)}`);
     if (mkdir.exitCode !== 0) {
       throw new Error(`Failed to mkdir on box: ${mkdir.stderr}`);
     }
@@ -10483,7 +10553,7 @@ async function cloudInstall(provider, repo) {
     return;
   }
   console.log(`\u2192 ${pm} install in ${remoteDir} on box...`);
-  const remoteCmd = `cd ${shellQuote(remoteDir)} && ${cmd}`;
+  const remoteCmd = `cd ${shellQuoteHomePath(remoteDir)} && ${cmd}`;
   const code = await runOnBoxStreaming(provider, remoteCmd);
   if (code !== 0) throw new Error(`${pm} install failed (exit ${code})`);
   const existing = readSidecar(provider, repo);
@@ -10499,7 +10569,7 @@ async function cloudInstall(provider, repo) {
 }
 async function cloudSession(provider, repo) {
   const remoteDir = boxRepoPath(repo);
-  const cmd = `sis admin home-init ${shellQuote(repo)} ${shellQuote(remoteDir)}`;
+  const cmd = `sis admin home-init ${shellQuote(repo)} ${shellQuoteHomePath(remoteDir)}`;
   console.log(`\u2192 initializing tmux home session "${repo}" on box...`);
   const result = runOnBox(provider, cmd);
   if (result.exitCode !== 0) {
@@ -10523,6 +10593,19 @@ Use a fresh terminal, or run from outside tmux:
   });
   child.on("exit", (code) => process.exit(code === null ? 1 : code));
 }
+function cloudClaudeLogin(provider) {
+  const target = effectiveSshTarget(provider);
+  const remote = [
+    "command -v claude >/dev/null 2>&1",
+    "|| sudo npm i -g @anthropic-ai/claude-code",
+    "&& claude auth login"
+  ].join(" ");
+  const child = spawn4("ssh", ["-t", target, remote], {
+    stdio: "inherit",
+    env: EXEC_ENV
+  });
+  child.on("exit", (code) => process.exit(code === null ? 1 : code));
+}
 async function cloudStart(provider, repo, opts) {
   await cloudSync(provider, repo, { fresh: opts.fresh, yes: opts.yes });
   await cloudInstall(provider, repo);
@@ -10605,6 +10688,10 @@ function registerCloud(program2) {
     const { provider, repo } = resolve11(raw);
     await cloudStart(provider, repo, { fresh: raw.fresh === true, yes: raw.yes === true });
   });
+  cloud.command("claude-login").description("Run `claude auth login` on the box (device-code flow; paste the URL into your local browser).").option("--provider <name>", "Cloud provider.").action((raw) => {
+    const provider = pickProvider(raw.provider);
+    cloudClaudeLogin(provider);
+  });
   cloud.command("status").description("Print box-side status for this repo (planted, session running, last sync/install).").option("--name <repo>", "Override the repo name.").option("--provider <name>", "Cloud provider.").action((raw) => {
     const { provider, repo } = resolve11(raw);
     cloudStatus(provider, repo);