sisyphi 1.2.0 → 1.2.2

package/dist/cli.js

@@ -2779,6 +2779,7 @@ function readStdin(opts = {}) {
 }
 
 // src/cli/tmux.ts
+init_shell();
 import { execSync as execSync4 } from "child_process";
 function isTmuxInstalled() {
   try {
@@ -2799,6 +2800,16 @@ function getTmuxSessionInfo() {
   const pipeIdx = out.indexOf("|");
   return { id: out.slice(0, pipeIdx), name: out.slice(pipeIdx + 1) };
 }
+function getCurrentTmuxSessionHome(sessionId) {
+  try {
+    return execSync4(
+      `tmux show-options -t ${shellQuote(sessionId)} -v @sisyphus_cwd`,
+      { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
+    ).trim();
+  } catch {
+    return "";
+  }
+}
 
 // src/cli/commands/start.ts
 init_shell();
@@ -2872,7 +2883,7 @@ function attachToTmuxSession(sessionName) {
   }
 }
 function registerStart(program2) {
-  program2.command("start").description("Start a new sisyphus session").argument("[task]", "Task description for the orchestrator (omit when using --stdin)").option("-c, --context <context>", "Background context for the orchestrator").option("-n, --name <name>", "Human-readable name for the session").option("--effort <tier>", "Pipeline effort tier (low|medium|high|xhigh)").option("--no-tmux-check", "Skip the tmux session check").option("--stdin", "Read the task description from stdin (avoids shell escaping for long prompts)").option("--context-stdin", "Read the context from stdin (mutually exclusive with --stdin)").action(async (taskArg, opts) => {
+  program2.command("start").description("Start a new sisyphus session").argument("[task]", "Task description for the orchestrator (omit when using --stdin)").option("-c, --context <context>", "Background context for the orchestrator").option("-n, --name <name>", "Human-readable name for the session").option("--effort <tier>", "Pipeline effort tier (low|medium|high|xhigh)").option("--no-tmux-check", "Skip the tmux session check").option("--stdin", "Read the task description from stdin (avoids shell escaping for long prompts)").option("--context-stdin", "Read the context from stdin (mutually exclusive with --stdin)").option("--force", "Proceed even when invocation cwd differs from the current tmux session's home (linking will be inconsistent)").action(async (taskArg, opts) => {
     const cwd = process.env["SISYPHUS_CWD"] ?? process.cwd();
     if (opts.stdin && opts.contextStdin) {
       console.error("Error: --stdin and --context-stdin cannot be combined; pipe one and pass the other on argv");
@@ -2927,6 +2938,24 @@ function registerStart(program2) {
       console.error("  Install: brew install tmux (macOS) or apt install tmux (Linux)");
       process.exit(1);
     }
+    if (process.env["TMUX"] && opts.force !== true) {
+      const info = getTmuxSessionInfo();
+      const existingHome = getCurrentTmuxSessionHome(info.id);
+      const normalizedCwd = cwd.replace(/\/+$/, "");
+      if (existingHome && existingHome !== normalizedCwd) {
+        console.error("Error: cwd mismatch with current tmux session.");
+        console.error(`  Session "${info.name}" is homed at: ${existingHome}`);
+        console.error(`  This invocation's cwd:              ${normalizedCwd}`);
+        console.error("");
+        console.error("Running `cd <dir> && sis start` from inside a tmux session homed elsewhere");
+        console.error("breaks dashboard/session linking (C-s h, alt+s cycle, scratch resolver).");
+        console.error("Usually you want to operate in the parent project, not the cd'd subdir.");
+        console.error("");
+        console.error(`Verify with the user: start a session for ${existingHome} or ${normalizedCwd}?`);
+        console.error("To proceed anyway: sis start --force ...");
+        process.exit(1);
+      }
+    }
     const effort = opts.effort;
     const request = { type: "start", task, context, cwd, name: opts.name, ...effort !== void 0 ? { effort } : {} };
     const response = await sendRequest(request);
@@ -5287,7 +5316,7 @@ function registerAgentRestart(program2) {
 
 // src/cli/commands/yield.ts
 function registerYield(program2) {
-  program2.command("yield").description("Yield control back to daemon (orchestrator only)").option("--prompt <text>", "Short orienting nudge for the next cycle (or pipe via stdin) \u2014 name what just happened; leave tactical decisions to the fresh read of the reports").option("--stdin", "Force-read prompt from stdin (avoids shell escaping for long prompts)").option("--mode <mode>", "System prompt mode for next cycle (discovery, planning, implementation, validation, completion)").option("--session <sessionId>", "Session ID (defaults to SISYPHUS_SESSION_ID env var)").action(async (opts) => {
+  program2.command("yield").description("Yield control back to daemon (orchestrator only)").option("--prompt <text>", "Short orienting nudge for the next cycle (or pipe via stdin) \u2014 name what just happened; leave tactical decisions to the fresh read of the reports").option("--stdin", "Force-read prompt from stdin (avoids shell escaping for long prompts)").requiredOption("--mode <mode>", "System prompt mode for next cycle (discovery, planning, implementation, validation, completion). Required \u2014 pass the current mode to stay in it.").option("--session <sessionId>", "Session ID (defaults to SISYPHUS_SESSION_ID env var)").action(async (opts) => {
     assertTmux();
     const sessionId = opts.session ?? process.env.SISYPHUS_SESSION_ID;
     if (!sessionId) {