sisyphi 1.1.36 → 1.1.37

package/dist/cli.js

@@ -668,8 +668,8 @@ var init_creds = __esm({
 
 // src/cli/index.ts
 import { Command } from "commander";
-import { existsSync as existsSync33, mkdirSync as mkdirSync17, readFileSync as readFileSync35 } from "fs";
-import { dirname as dirname13, join as join31 } from "path";
+import { existsSync as existsSync34, mkdirSync as mkdirSync17, readFileSync as readFileSync36 } from "fs";
+import { dirname as dirname13, join as join32 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 
 // src/cli/commands/start.ts
@@ -2628,7 +2628,7 @@ function rawSend2(request, timeoutMs = 1e4) {
   return rawSend(request, timeoutMs);
 }
 async function sendRequest(request, timeoutMs) {
-  const sleep2 = (ms) => new Promise((resolve12) => setTimeout(resolve12, ms));
+  const sleep3 = (ms) => new Promise((resolve12) => setTimeout(resolve12, ms));
   const MAX_ATTEMPTS = 5;
   const RETRY_DELAY_MS = 2e3;
   let installedDaemon = false;
@@ -2650,7 +2650,7 @@ async function sendRequest(request, timeoutMs) {
       } else {
         process.stderr.write(`Daemon not ready, retrying (${attempt}/${MAX_ATTEMPTS - 1})...
 `);
-        await sleep2(RETRY_DELAY_MS);
+        await sleep3(RETRY_DELAY_MS);
       }
     }
   }
@@ -3102,6 +3102,21 @@ ${BOLD}Session: ${session2.id}${RESET}`);
     console.log(`  Last activity: ${formatDuration(Date.now() - lastActivity.getTime())} ago`);
   }
   console.log(`  Orchestrator cycles: ${session2.orchestratorCycles.length}`);
+  if (session2.handoff) {
+    const h = session2.handoff;
+    if (h.lastError) {
+      console.log(`  Handoff: ${COLOR_CODES.red}error${RESET} \u2014 ${h.lastError}`);
+    } else if (h.reclaimedAt) {
+      const where = h.target ? `${h.target.provider}:${h.target.repo}` : "cloud";
+      console.log(`  Handoff: reclaimed from ${where} at ${h.reclaimedAt}`);
+    } else if (h.sentAt && h.target) {
+      console.log(`  Handoff: running on ${h.target.provider}:${h.target.repo} since ${h.sentAt}`);
+    } else if (h.target) {
+      console.log(`  Handoff: queued \u2192 ${h.target.provider}:${h.target.repo} (since ${h.queuedAt})`);
+    } else {
+      console.log(`  Handoff: quiesce queued (since ${h.queuedAt})`);
+    }
+  }
   const runningAgents = session2.agents.filter((a) => a.status === "running");
   if (runningAgents.length > 0) {
     console.log(`
@@ -3219,6 +3234,24 @@ var STATUS_COLORS = {
 var RESET2 = "\x1B[0m";
 var BOLD2 = "\x1B[1m";
 var DIM2 = "\x1B[2m";
+var CLOUD = "\x1B[35m";
+var RED = "\x1B[31m";
+function handoffAnnotation(h) {
+  if (!h) return "";
+  if (h.lastError) {
+    return `  ${RED}handoff error: ${h.lastError}${RESET2}`;
+  }
+  if (h.reclaimedAt) {
+    return `  ${DIM2}(reclaimed)${RESET2}`;
+  }
+  if (h.sentAt && h.target) {
+    return `  ${CLOUD}\u2192 ${h.target.provider}:${h.target.repo}${RESET2}`;
+  }
+  if (h.target) {
+    return `  ${CLOUD}handoff queued \u2192 ${h.target.provider}:${h.target.repo}${RESET2}`;
+  }
+  return `  ${CLOUD}quiesce queued${RESET2}`;
+}
 function truncateTask(task, max) {
   if (task.length <= max) return task;
   return task.slice(0, max - 1) + "\u2026";
@@ -3248,7 +3281,8 @@ function registerList(program2) {
         const task = truncateTask(s.task, 60);
         const label = s.name ? `${s.name} ${DIM2}(${s.id.slice(0, 8)})${RESET2}` : s.id;
         const cwdLabel = opts.all && s.cwd ? `  ${DIM2}${basename3(s.cwd)}${RESET2}` : "";
-        console.log(`  ${BOLD2}${label}${RESET2}  ${status}  ${agents}  ${task}${cwdLabel}`);
+        const handoffLabel = handoffAnnotation(s.handoff);
+        console.log(`  ${BOLD2}${label}${RESET2}  ${status}  ${agents}  ${task}${cwdLabel}${handoffLabel}`);
       }
       if (filtered && totalCount && totalCount > sessions.length) {
         const otherCount = totalCount - sessions.length;
@@ -3877,6 +3911,7 @@ var ACTIONABLE_KINDS = /* @__PURE__ */ new Set([
   "error"
 ]);
 var HEARTBEAT_ASKED_BY = "system:heartbeat";
+var ORPHAN_ASKED_BY = "system:orphan-handler";
 function maybeNotifyOnAskCreated(cwd, sessionId, meta) {
   if (process.env.NODE_ENV === "test" || process.env.SISYPHUS_DISABLE_NOTIFY === "1") return;
   const isActionable = meta.kind !== void 0 && ACTIONABLE_KINDS.has(meta.kind);
@@ -3986,6 +4021,7 @@ async function autoResolveAsk(cwd, sessionId, askId, deck) {
 async function maybeAutoResolveAsk(cwd, sessionId, askId, deck) {
   try {
     if (!isSessionDangerous(cwd, sessionId)) return;
+    if (deck.source?.askedBy === ORPHAN_ASKED_BY) return;
     await autoResolveAsk(cwd, sessionId, askId, deck);
   } catch {
   }
@@ -6216,6 +6252,30 @@ function setSessionCwd(name, cwd) {
   );
 }
 
+// src/cli/commands/quiesce.ts
+function registerQuiesce(parent) {
+  parent.command("quiesce <session-id>").description("Pause a session at the next quiesce point (or now with --force). No cloud push.").option("--force", "Interrupt running orchestrator/agents immediately.").action(async (sessionId, opts) => {
+    const cwd = process.env["SISYPHUS_CWD"] ?? process.cwd();
+    const request = {
+      type: "admin-quiesce",
+      sessionId,
+      cwd,
+      force: opts.force === true
+    };
+    const response = await sendRequest(request);
+    if (!response.ok) {
+      console.error(`Error: ${response.error}`);
+      process.exit(1);
+    }
+    const data = response.data;
+    if (data?.force) {
+      console.log(`Session ${sessionId} quiescing now (--force).`);
+    } else {
+      console.log(`Session ${sessionId} will pause at next quiesce point.`);
+    }
+  });
+}
+
 // src/cli/commands/doctor.ts
 init_paths();
 import { execSync as execSync14 } from "child_process";
@@ -11421,30 +11481,31 @@ init_exec();
 import { spawnSync as spawnSync5 } from "child_process";
 import { existsSync as existsSync31 } from "fs";
 import { basename as basename6, join as join30 } from "path";
-function captureGit(args2) {
+function captureGit(args2, cwd) {
   const result = spawnSync5("git", args2, {
     encoding: "utf-8",
-    env: EXEC_ENV
+    env: EXEC_ENV,
+    cwd: cwd ?? process.cwd()
   });
   if (typeof result.stdout !== "string") {
     throw new Error("Internal: git spawn did not capture stdout as string");
   }
   return { stdout: result.stdout.trim(), ok: result.status === 0 };
 }
-function inferRepoName() {
-  const { stdout, ok } = captureGit(["rev-parse", "--show-toplevel"]);
+function inferRepoName(cwd) {
+  const { stdout, ok } = captureGit(["rev-parse", "--show-toplevel"], cwd);
   if (ok && stdout) return basename6(stdout);
-  return basename6(process.cwd());
+  return basename6(cwd ?? process.cwd());
 }
-function getOriginUrl() {
-  const { stdout, ok } = captureGit(["remote", "get-url", "origin"]);
+function getOriginUrl(cwd) {
+  const { stdout, ok } = captureGit(["remote", "get-url", "origin"], cwd);
   if (!ok) return null;
   return stdout.length > 0 ? stdout : null;
 }
-function getRepoToplevel() {
-  const { stdout, ok } = captureGit(["rev-parse", "--show-toplevel"]);
+function getRepoToplevel(cwd) {
+  const { stdout, ok } = captureGit(["rev-parse", "--show-toplevel"], cwd);
   if (ok && stdout) return stdout;
-  return process.cwd();
+  return cwd ?? process.cwd();
 }
 var DEFAULT_EXCLUDES = [
   ".sisyphus/",
@@ -11523,10 +11584,10 @@ function writeSidecar(provider, repo, data) {
 }
 
 // src/cli/cloud/runner.ts
-async function cloudSync(provider, repo, opts) {
+async function cloudSync(provider, repo, opts, cwd) {
   const target = effectiveSshTarget(provider);
   const remoteDir = boxRepoPath(repo);
-  const localOrigin = getOriginUrl();
+  const localOrigin = getOriginUrl(cwd);
   ensureGroveInstalled(provider);
   const existing = readSidecar(provider, repo);
   if (existing && existing.originUrl && localOrigin && existing.originUrl !== localOrigin) {
@@ -11564,7 +11625,7 @@ Pass --name <slug> to disambiguate, or --fresh to overwrite.`
     if (mkdir.exitCode !== 0) {
       throw new Error(`Failed to mkdir on box: ${mkdir.stderr}`);
     }
-    const toplevel = getRepoToplevel();
+    const toplevel = getRepoToplevel(cwd);
     const args2 = buildRsyncArgs(toplevel, `${target}:${remoteDir}/`);
     console.log(`\u2192 rsync ${toplevel}/ \u2192 ${target}:${remoteDir}/`);
     const code = await runRsync(args2);
@@ -11588,9 +11649,9 @@ function runRsync(args2) {
     child.on("exit", (code) => resolve12(code === null ? 1 : code));
   });
 }
-async function cloudInstall(provider, repo) {
+async function cloudInstall(provider, repo, cwd) {
   const remoteDir = boxRepoPath(repo);
-  const toplevel = getRepoToplevel();
+  const toplevel = getRepoToplevel(cwd);
   const pm = detectPackageManager(toplevel);
   const cmd = packageManagerInstallCmd(pm);
   if (!cmd) {
@@ -11603,7 +11664,7 @@ async function cloudInstall(provider, repo) {
   if (code !== 0) throw new Error(`${pm} install failed (exit ${code})`);
   const existing = readSidecar(provider, repo);
   const sidecar = {
-    originUrl: existing && existing.originUrl !== void 0 ? existing.originUrl : getOriginUrl(),
+    originUrl: existing && existing.originUrl !== void 0 ? existing.originUrl : getOriginUrl(cwd),
     localHostname: existing ? existing.localHostname : hostname(),
     lastSync: existing?.lastSync,
     lastInstall: (/* @__PURE__ */ new Date()).toISOString(),
@@ -11681,6 +11742,13 @@ function cloudStatus(provider, repo) {
   }
 }
 
+// src/cli/cloud/handoff.ts
+import { spawn as spawn5 } from "child_process";
+import { existsSync as existsSync32, readFileSync as readFileSync34 } from "fs";
+init_exec();
+init_paths();
+init_shell();
+
 // src/cli/deploy/provider-pick.ts
 init_creds();
 function pickProvider(explicit) {
@@ -11702,6 +11770,188 @@ function pickProvider(explicit) {
   );
 }
 
+// src/cli/cloud/handoff.ts
+import { join as join31 } from "path";
+async function cloudHandoff(sessionId, opts) {
+  const cwd = process.env["SISYPHUS_CWD"] ?? process.cwd();
+  const request = {
+    type: "cloud-handoff",
+    sessionId,
+    cwd,
+    provider: opts.provider,
+    repo: opts.repo,
+    force: opts.force
+  };
+  const response = await sendRequest(request);
+  if (!response.ok) {
+    console.error(`Error: ${response.error}`);
+    process.exit(1);
+  }
+  const data = response.data;
+  const where = `${data?.provider ?? opts.provider}:${data?.repo ?? opts.repo}`;
+  if (data?.force) {
+    console.log(`Forcing handoff of ${sessionId} \u2192 ${where} (interrupting in-flight work).`);
+  } else {
+    console.log(`Handoff of ${sessionId} \u2192 ${where} queued; will fire at next quiesce point.`);
+  }
+  if (!opts.wait) {
+    if (!opts.force) {
+      console.log(`Tip: run \`sis cloud handoff ${sessionId} --cancel\` to cancel before quiesce.`);
+    }
+    return;
+  }
+  console.log("Waiting for handoff to complete...");
+  await waitForSentOrError(cwd, sessionId);
+}
+async function cloudHandoffCancel(sessionId) {
+  const cwd = process.env["SISYPHUS_CWD"] ?? process.cwd();
+  const response = await sendRequest({ type: "cloud-handoff-cancel", sessionId, cwd });
+  if (!response.ok) {
+    console.error(`Error: ${response.error}`);
+    process.exit(1);
+  }
+  console.log(`Handoff for ${sessionId} cancelled.`);
+}
+async function waitForSentOrError(cwd, sessionId) {
+  const POLL_INTERVAL_MS = 2e3;
+  const MAX_WAIT_MS = 30 * 60 * 1e3;
+  const start = Date.now();
+  const path = statePath(cwd, sessionId);
+  while (Date.now() - start < MAX_WAIT_MS) {
+    await sleep2(POLL_INTERVAL_MS);
+    if (!existsSync32(path)) continue;
+    let session2;
+    try {
+      session2 = JSON.parse(readFileSync34(path, "utf-8"));
+    } catch (err) {
+      void err;
+      continue;
+    }
+    if (session2.handoff?.lastError) {
+      console.error(`Handoff failed: ${session2.handoff.lastError}`);
+      process.exit(1);
+    }
+    if (session2.handoff?.sentAt) {
+      const where = session2.handoff.target ? `${session2.handoff.target.provider}:${session2.handoff.target.repo}` : "cloud";
+      console.log(`Handoff complete \u2192 ${where} at ${session2.handoff.sentAt}.`);
+      return;
+    }
+  }
+  console.error(`Timed out waiting for handoff after ${Math.round(MAX_WAIT_MS / 6e4)}m.`);
+  process.exit(1);
+}
+function sleep2(ms) {
+  return new Promise((resolve12) => setTimeout(resolve12, ms));
+}
+async function cloudReclaim(sessionId, opts) {
+  const cwd = process.env["SISYPHUS_CWD"] ?? process.cwd();
+  const local = readLocalSession(cwd, sessionId);
+  if (!local.handoff?.sentAt) {
+    console.error(`Session ${sessionId} is not on cloud (no handoff.sentAt). Nothing to reclaim.`);
+    process.exit(1);
+  }
+  if (local.handoff.reclaimedAt) {
+    console.error(`Session ${sessionId} was already reclaimed at ${local.handoff.reclaimedAt}.`);
+    process.exit(1);
+  }
+  if (!local.handoff.target) {
+    console.error(`Session ${sessionId} has handoff.sentAt but no target \u2014 corrupted state.`);
+    process.exit(1);
+  }
+  const provider = pickProvider(opts.providerOverride ?? local.handoff.target.provider);
+  const repo = local.handoff.target.repo;
+  const target = effectiveSshTarget(provider);
+  const remoteSessionDir = `${boxRepoPath(repo)}/.sisyphus/sessions/${sessionId}`;
+  const remoteRepoDir = boxRepoPath(repo);
+  console.log(`Reclaiming ${sessionId} from ${provider}:${repo}...`);
+  const quiesceBase = opts.force ? `sis admin quiesce ${shellQuote(sessionId)} --force` : `sis admin quiesce ${shellQuote(sessionId)}`;
+  const quiesceCmd = `cd ${shellQuoteHomePath(remoteRepoDir)} && ${quiesceBase}`;
+  console.log(`\u2192 ssh box: ${quiesceCmd}`);
+  const quiesceCode = await runOnBoxStreaming(provider, quiesceCmd);
+  if (quiesceCode !== 0) {
+    console.error(`Box-side quiesce failed (exit ${quiesceCode}).`);
+    process.exit(1);
+  }
+  console.log(`\u2192 waiting for box-side session to reach paused...`);
+  await waitForBoxPaused(provider, remoteSessionDir);
+  console.log(`\u2192 rsync session state down`);
+  await rsyncDown(target, `${remoteSessionDir}/`, `${sessionDir(cwd, sessionId)}/`, { withDelete: true });
+  console.log(`\u2192 rsync working tree down`);
+  await rsyncDown(target, `${remoteRepoDir}/`, `${cwd}/`, { withDelete: false });
+  for (const name of ["config.json", "orchestrator.md", "orchestrator-settings.json"]) {
+    const remotePath = `${remoteRepoDir}/.sisyphus/${name}`;
+    const localPath = join31(projectDir(cwd), name);
+    const probe = runOnBox(provider, `test -f ${shellQuote(remotePath.replace(/^~\//, ""))} && echo y || echo n`);
+    if (probe.stdout.trim() !== "y") continue;
+    await rsyncDown(target, remotePath, localPath, { withDelete: false });
+  }
+  const reclaimMessage = `Session reclaimed from cloud (${provider}:${repo}). Resuming locally.`;
+  console.log(`\u2192 local sis resume`);
+  const resumeResp = await sendRequest({
+    type: "resume",
+    sessionId,
+    cwd,
+    message: reclaimMessage
+  });
+  if (!resumeResp.ok) {
+    console.error(`Local resume failed: ${resumeResp.error}`);
+    process.exit(1);
+  }
+  const killCmd = `cd ${shellQuoteHomePath(remoteRepoDir)} && sis session kill ${shellQuote(sessionId)}`;
+  console.log(`\u2192 ssh box: ${killCmd}`);
+  const killResult = runOnBox(provider, killCmd);
+  if (killResult.exitCode !== 0) {
+    console.warn(`Warning: box-side kill exited ${killResult.exitCode}: ${killResult.stderr.trim()}`);
+  }
+  const finalizeResp = await sendRequest({ type: "cloud-reclaim-finalize", sessionId, cwd });
+  if (!finalizeResp.ok) {
+    console.warn(`Warning: failed to finalize reclaim state: ${finalizeResp.error}`);
+  }
+  console.log(`\u2713 ${sessionId} reclaimed; orchestrator respawning locally.`);
+}
+function readLocalSession(cwd, sessionId) {
+  const path = statePath(cwd, sessionId);
+  if (!existsSync32(path)) {
+    console.error(`No local state.json for ${sessionId} at ${path}.`);
+    process.exit(1);
+  }
+  return JSON.parse(readFileSync34(path, "utf-8"));
+}
+async function waitForBoxPaused(provider, remoteSessionDir) {
+  const POLL_INTERVAL_MS = 2e3;
+  const MAX_WAIT_MS = 30 * 60 * 1e3;
+  const start = Date.now();
+  const cmd = `cat ${shellQuote(remoteSessionDir.replace(/^~\//, ""))}/state.json 2>/dev/null | head -c 200000`;
+  while (Date.now() - start < MAX_WAIT_MS) {
+    const r = runOnBox(provider, cmd);
+    if (r.exitCode === 0 && r.stdout.trim()) {
+      try {
+        const s = JSON.parse(r.stdout);
+        if (s.status === "paused") return;
+      } catch (err) {
+        console.warn(`Could not parse box-side state.json yet: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    }
+    await sleep2(POLL_INTERVAL_MS);
+  }
+  console.error(`Timed out waiting for box-side session to pause.`);
+  process.exit(1);
+}
+function rsyncDown(target, remotePath, localPath, opts) {
+  return new Promise((resolve12, reject) => {
+    const args2 = ["-avz"];
+    if (opts.withDelete) args2.push("--delete");
+    args2.push("--exclude=.terraform/", "--exclude=node_modules/", "--exclude=dist/", "--exclude=.next/", "--exclude=.turbo/", "--exclude=coverage/", "--exclude=tmp/", "--exclude=.git/lfs/", "--exclude=.DS_Store");
+    args2.push("-e", "ssh", `${target}:${remotePath}`, localPath);
+    const child = spawn5("rsync", args2, { stdio: "inherit", env: EXEC_ENV });
+    child.on("error", reject);
+    child.on("exit", (code) => {
+      if (code === 0) resolve12();
+      else reject(new Error(`rsync exited ${code} for ${remotePath}`));
+    });
+  });
+}
+
 // src/cli/commands/cloud.ts
 init_shell();
 function resolve11(raw) {
@@ -11742,6 +11992,21 @@ function registerCloud(program2) {
     const { provider, repo } = resolve11(raw);
     cloudStatus(provider, repo);
   });
+  cloud.command("handoff <session-id>").description("Hand off a live session to the cloud box. Queues at next quiesce; --force interrupts now.").option("--provider <name>", "Cloud provider (default: auto-pick).").option("--name <repo>", "Override the repo name on the box.").option("--force", "Interrupt in-flight orchestrator/agents now instead of queueing.").option("--cancel", "Cancel a queued handoff before it fires.").option("--wait", "Block until the handoff completes (or fails).").action(async (sessionId, raw) => {
+    if (raw.cancel) {
+      await cloudHandoffCancel(sessionId);
+      return;
+    }
+    const provider = pickProvider(raw.provider);
+    const repo = raw.name ? raw.name : inferRepoName();
+    if (!validateRepoName(repo)) {
+      throw new Error(`Invalid --name "${repo}": must not contain '/' '\\' or '..'.`);
+    }
+    await cloudHandoff(sessionId, { provider, repo, force: raw.force === true, wait: raw.wait === true });
+  });
+  cloud.command("reclaim <session-id>").description("Pull a handed-off session back from the cloud box and resume locally.").option("--provider <name>", "Override the cloud provider (default: read from session.handoff).").option("--force", "Force the box-side session to stop now instead of waiting for quiesce.").action(async (sessionId, raw) => {
+    await cloudReclaim(sessionId, { providerOverride: raw.provider, force: raw.force === true });
+  });
 }
 
 // src/cli/commands/notify.ts
@@ -11759,7 +12024,7 @@ function attachNotify(diagnostic2) {
 // src/cli/commands/tmux-sessions.ts
 init_paths();
 import { execSync as execSync18 } from "child_process";
-import { readFileSync as readFileSync34, existsSync as existsSync32 } from "fs";
+import { readFileSync as readFileSync35, existsSync as existsSync33 } from "fs";
 var DOT_MAP = {
   "orchestrator:processing": { icon: "\u25CF", color: "#d4ad6a" },
   "orchestrator:idle": { icon: "\u25CF", color: "#d47766" },
@@ -11770,9 +12035,9 @@ var DOT_MAP = {
 };
 function readManifest() {
   const p = sessionsManifestPath();
-  if (!existsSync32(p)) return null;
+  if (!existsSync33(p)) return null;
   try {
-    return JSON.parse(readFileSync34(p, "utf-8"));
+    return JSON.parse(readFileSync35(p, "utf-8"));
   } catch {
     return null;
   }
@@ -11818,7 +12083,7 @@ if (nodeVersion < 22) {
 var program = new Command();
 program.name("sis").description("tmux-integrated orchestration daemon for Claude Code").version(
   JSON.parse(
-    readFileSync35(join31(dirname13(fileURLToPath5(import.meta.url)), "..", "package.json"), "utf-8")
+    readFileSync36(join32(dirname13(fileURLToPath5(import.meta.url)), "..", "package.json"), "utf-8")
   ).version
 );
 program.configureHelp({
@@ -11863,6 +12128,7 @@ registerSetupKeybind(admin);
 registerCheckKeybinds(admin);
 registerCheckStatusbar(admin);
 registerHomeInit(admin);
+registerQuiesce(admin);
 registerDoctor(admin);
 registerInit(admin);
 registerUninstall(admin);
@@ -11892,7 +12158,7 @@ Run 'sis admin getting-started' for a complete usage guide.
 var args = process.argv.slice(2);
 var firstArg = args[0];
 var skipWelcome = ["admin", "help", "--help", "-h", "--version", "-V"];
-if (!existsSync33(globalDir()) && firstArg && !skipWelcome.includes(firstArg)) {
+if (!existsSync34(globalDir()) && firstArg && !skipWelcome.includes(firstArg)) {
   mkdirSync17(globalDir(), { recursive: true });
   console.log("");
   console.log("  Welcome to Sisyphus. Run 'sis admin setup' to get started.");