sisyphi 1.1.37 → 1.1.38

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

@@ -67,7 +67,13 @@ write_files:
 runcmd:
   # 1. Base packages.
   - apt-get update
-  - DEBIAN_FRONTEND=noninteractive apt-get install -y curl git tmux fzf neovim build-essential ufw mosh ca-certificates gnupg
+  - DEBIAN_FRONTEND=noninteractive apt-get install -y curl git tmux fzf neovim build-essential ufw mosh ca-certificates gnupg pipx
+
+  # 1b. termrender — TUI markdown rendering. Without it the dashboard falls
+  # back to plain text. Install system-wide via pipx so the binary lands in
+  # /usr/local/bin and resolves on PATH for both interactive shells and
+  # systemd user services (same convention as the pbcopy/pbpaste shims).
+  - PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install termrender
 
   # 2. Node 22 via NodeSource. /usr/bin/node, /usr/bin/npm.
   - curl -fsSL https://deb.nodesource.com/setup_22.x | bash -

package/dist/cli.js

@@ -11744,7 +11744,7 @@ 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";
+import { existsSync as existsSync32, readFileSync as readFileSync34, writeFileSync as writeFileSync18 } from "fs";
 init_exec();
 init_paths();
 init_shell();
@@ -11877,7 +11877,7 @@ async function cloudReclaim(sessionId, opts) {
   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 });
+  await rsyncDown(target, `${remoteRepoDir}/`, `${cwd}/`, { withDelete: false, excludeSisyphus: true, update: true });
   for (const name of ["config.json", "orchestrator.md", "orchestrator-settings.json"]) {
     const remotePath = `${remoteRepoDir}/.sisyphus/${name}`;
     const localPath = join31(projectDir(cwd), name);
@@ -11885,6 +11885,11 @@ async function cloudReclaim(sessionId, opts) {
     if (probe.stdout.trim() !== "y") continue;
     await rsyncDown(target, remotePath, localPath, { withDelete: false });
   }
+  const localStatePath = statePath(cwd, sessionId);
+  const merged = JSON.parse(readFileSync34(localStatePath, "utf-8"));
+  merged.cwd = cwd;
+  merged.handoff = local.handoff;
+  writeFileSync18(localStatePath, JSON.stringify(merged, null, 2));
   const reclaimMessage = `Session reclaimed from cloud (${provider}:${repo}). Resuming locally.`;
   console.log(`\u2192 local sis resume`);
   const resumeResp = await sendRequest({
@@ -11941,6 +11946,8 @@ function rsyncDown(target, remotePath, localPath, opts) {
   return new Promise((resolve12, reject) => {
     const args2 = ["-avz"];
     if (opts.withDelete) args2.push("--delete");
+    if (opts.update) args2.push("--update");
+    if (opts.excludeSisyphus) args2.push("--exclude=.sisyphus/");
     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 });