sisyphi 0.1.2 → 0.1.3

package/dist/{chunk-FWHTKXN5.js → chunk-N2BPQOO2.js}

@@ -2,7 +2,7 @@
 
 // src/shared/paths.ts
 import { homedir } from "os";
-import { join } from "path";
+import { basename, join } from "path";
 function globalDir() {
   return join(homedir(), ".sisyphus");
 }
@@ -42,9 +42,24 @@ function reportsDir(cwd, sessionId) {
 function reportFilePath(cwd, sessionId, agentId, suffix) {
   return join(reportsDir(cwd, sessionId), `${agentId}-${suffix}.md`);
 }
+function promptsDir(cwd, sessionId) {
+  return join(sessionDir(cwd, sessionId), "prompts");
+}
 function contextDir(cwd, sessionId) {
   return join(sessionDir(cwd, sessionId), "context");
 }
+function planPath(cwd, sessionId) {
+  return join(sessionDir(cwd, sessionId), "plan.md");
+}
+function logsPath(cwd, sessionId) {
+  return join(sessionDir(cwd, sessionId), "logs.md");
+}
+function worktreeConfigPath(cwd) {
+  return join(projectDir(cwd), "worktree.json");
+}
+function worktreeBaseDir(cwd) {
+  return join(cwd, "..", `${basename(cwd)}-sisyphus-wt`);
+}
 
 export {
   globalDir,
@@ -59,6 +74,11 @@ export {
   statePath,
   reportsDir,
   reportFilePath,
-  contextDir
+  promptsDir,
+  contextDir,
+  planPath,
+  logsPath,
+  worktreeConfigPath,
+  worktreeBaseDir
 };
-//# sourceMappingURL=chunk-FWHTKXN5.js.map
+//# sourceMappingURL=chunk-N2BPQOO2.js.map

package/dist/chunk-N2BPQOO2.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/shared/paths.ts"],"sourcesContent":["import { homedir } from 'node:os';\nimport { basename, join } from 'node:path';\n\nexport function globalDir(): string {\n  return join(homedir(), '.sisyphus');\n}\n\nexport function socketPath(): string {\n  return join(globalDir(), 'daemon.sock');\n}\n\nexport function globalConfigPath(): string {\n  return join(globalDir(), 'config.json');\n}\n\nexport function daemonLogPath(): string {\n  return join(globalDir(), 'daemon.log');\n}\n\nexport function daemonPidPath(): string {\n  return join(globalDir(), 'daemon.pid');\n}\n\nexport function projectDir(cwd: string): string {\n  return join(cwd, '.sisyphus');\n}\n\nexport function projectConfigPath(cwd: string): string {\n  return join(projectDir(cwd), 'config.json');\n}\n\nexport function projectOrchestratorPromptPath(cwd: string): string {\n  return join(projectDir(cwd), 'orchestrator.md');\n}\n\nexport function sessionsDir(cwd: string): string {\n  return join(projectDir(cwd), 'sessions');\n}\n\nexport function sessionDir(cwd: string, sessionId: string): string {\n  return join(sessionsDir(cwd), sessionId);\n}\n\nexport function statePath(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'state.json');\n}\n\nexport function reportsDir(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'reports');\n}\n\nexport function reportFilePath(cwd: string, sessionId: string, agentId: string, suffix: string): string {\n  return join(reportsDir(cwd, sessionId), `${agentId}-${suffix}.md`);\n}\n\nexport function promptsDir(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'prompts');\n}\n\nexport function contextDir(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'context');\n}\n\nexport function planPath(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'plan.md');\n}\n\nexport function logsPath(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'logs.md');\n}\n\nexport function worktreeConfigPath(cwd: string): string {\n  return join(projectDir(cwd), 'worktree.json');\n}\n\nexport function worktreeBaseDir(cwd: string): string {\n  return join(cwd, '..', `${basename(cwd)}-sisyphus-wt`);\n}\n"],"mappings":";;;AAAA,SAAS,eAAe;AACxB,SAAS,UAAU,YAAY;AAExB,SAAS,YAAoB;AAClC,SAAO,KAAK,QAAQ,GAAG,WAAW;AACpC;AAEO,SAAS,aAAqB;AACnC,SAAO,KAAK,UAAU,GAAG,aAAa;AACxC;AAEO,SAAS,mBAA2B;AACzC,SAAO,KAAK,UAAU,GAAG,aAAa;AACxC;AAEO,SAAS,gBAAwB;AACtC,SAAO,KAAK,UAAU,GAAG,YAAY;AACvC;AAEO,SAAS,gBAAwB;AACtC,SAAO,KAAK,UAAU,GAAG,YAAY;AACvC;AAEO,SAAS,WAAW,KAAqB;AAC9C,SAAO,KAAK,KAAK,WAAW;AAC9B;AAEO,SAAS,kBAAkB,KAAqB;AACrD,SAAO,KAAK,WAAW,GAAG,GAAG,aAAa;AAC5C;AAEO,SAAS,8BAA8B,KAAqB;AACjE,SAAO,KAAK,WAAW,GAAG,GAAG,iBAAiB;AAChD;AAEO,SAAS,YAAY,KAAqB;AAC/C,SAAO,KAAK,WAAW,GAAG,GAAG,UAAU;AACzC;AAEO,SAAS,WAAW,KAAa,WAA2B;AACjE,SAAO,KAAK,YAAY,GAAG,GAAG,SAAS;AACzC;AAEO,SAAS,UAAU,KAAa,WAA2B;AAChE,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,YAAY;AACtD;AAEO,SAAS,WAAW,KAAa,WAA2B;AACjE,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,SAAS;AACnD;AAEO,SAAS,eAAe,KAAa,WAAmB,SAAiB,QAAwB;AACtG,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,GAAG,OAAO,IAAI,MAAM,KAAK;AACnE;AAEO,SAAS,WAAW,KAAa,WAA2B;AACjE,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,SAAS;AACnD;AAEO,SAAS,WAAW,KAAa,WAA2B;AACjE,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,SAAS;AACnD;AAEO,SAAS,SAAS,KAAa,WAA2B;AAC/D,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,SAAS;AACnD;AAEO,SAAS,SAAS,KAAa,WAA2B;AAC/D,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,SAAS;AACnD;AAEO,SAAS,mBAAmB,KAAqB;AACtD,SAAO,KAAK,WAAW,GAAG,GAAG,eAAe;AAC9C;AAEO,SAAS,gBAAgB,KAAqB;AACnD,SAAO,KAAK,KAAK,MAAM,GAAG,SAAS,GAAG,CAAC,cAAc;AACvD;","names":[]}

package/dist/cli.js

@@ -3,14 +3,11 @@ import {
   daemonLogPath,
   globalDir,
   socketPath
-} from "./chunk-FWHTKXN5.js";
+} from "./chunk-N2BPQOO2.js";
 
 // src/cli/index.ts
 import { Command } from "commander";
 
-// src/cli/commands/start.ts
-import { execSync as execSync2 } from "child_process";
-
 // src/cli/client.ts
 import { connect as connect2 } from "net";
 
@@ -163,41 +160,59 @@ function rawSend(request) {
   });
 }
 async function sendRequest(request) {
-  try {
-    return await rawSend(request);
-  } catch (err) {
-    const code = err.code;
-    if (code === "ENOENT" || code === "ECONNREFUSED") {
-      if (process.platform !== "darwin") {
-        throw new Error(
-          `Sisyphus daemon is not running.
-  Start it manually: sisyphusd &
-  Or check logs at: ~/.sisyphus/daemon.log`
-        );
+  const sleep2 = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
+  const MAX_ATTEMPTS = 5;
+  const RETRY_DELAY_MS = 2e3;
+  let installedDaemon = false;
+  let lastErr;
+  for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+    try {
+      return await rawSend(request);
+    } catch (err) {
+      lastErr = err;
+      const code = err.code;
+      if (code !== "ENOENT" && code !== "ECONNREFUSED") {
+        throw err;
+      }
+      if (attempt === MAX_ATTEMPTS) break;
+      if (process.platform === "darwin" && !installedDaemon) {
+        installedDaemon = true;
+        await ensureDaemonInstalled();
+        await waitForDaemon(5e3);
+      } else {
+        process.stderr.write(`Daemon not ready, retrying (${attempt}/${MAX_ATTEMPTS - 1})...
+`);
+        await sleep2(RETRY_DELAY_MS);
       }
-      await ensureDaemonInstalled();
-      await waitForDaemon(5e3);
-      return rawSend(request);
     }
-    throw err;
   }
+  if (process.platform !== "darwin") {
+    throw new Error(
+      `Sisyphus daemon is not running.
+  Start it manually: sisyphusd &
+  Or check logs at: ~/.sisyphus/daemon.log`
+    );
+  }
+  throw lastErr;
 }
 
-// src/cli/commands/start.ts
-function getTmuxSession() {
-  try {
-    return execSync2('tmux display-message -p "#{session_name}"', { encoding: "utf8" }).trim();
-  } catch {
-    throw new Error("Not running inside tmux");
+// src/cli/tmux.ts
+import { execSync as execSync2 } from "child_process";
+function assertTmux() {
+  if (!process.env.TMUX) {
+    throw new Error("Not running inside a tmux pane. Sisyphus requires tmux.");
   }
 }
+function getTmuxSession() {
+  assertTmux();
+  return execSync2('tmux display-message -p "#{session_name}"', { encoding: "utf8" }).trim();
+}
 function getTmuxWindow() {
-  try {
-    return execSync2('tmux display-message -p "#{window_id}"', { encoding: "utf8" }).trim();
-  } catch {
-    throw new Error("Not running inside tmux");
-  }
+  assertTmux();
+  return execSync2('tmux display-message -p "#{window_id}"', { encoding: "utf8" }).trim();
 }
+
+// src/cli/commands/start.ts
 function registerStart(program2) {
   program2.command("start").description("Start a new sisyphus session").argument("<task>", "Task description for the orchestrator").action(async (task) => {
     const tmuxSession = getTmuxSession();
@@ -219,7 +234,8 @@ function registerStart(program2) {
 
 // src/cli/commands/spawn.ts
 function registerSpawn(program2) {
-  program2.command("spawn").description("Spawn a new agent (orchestrator only)").option("--agent-type <type>", "Agent role label (default: worker)", "worker").requiredOption("--name <name>", "Agent name").requiredOption("--instruction <instruction>", "Task instruction for the agent").action(async (opts) => {
+  program2.command("spawn").description("Spawn a new agent (orchestrator only)").option("--agent-type <type>", "Agent role label (default: worker)", "worker").requiredOption("--name <name>", "Agent name").requiredOption("--instruction <instruction>", "Task instruction for the agent").option("--worktree", "Spawn agent in an isolated git worktree").action(async (opts) => {
+    assertTmux();
     const sessionId = process.env.SISYPHUS_SESSION_ID;
     if (!sessionId) {
       console.error("Error: SISYPHUS_SESSION_ID environment variable not set");
@@ -230,7 +246,8 @@ function registerSpawn(program2) {
       sessionId,
       agentType: opts.agentType,
       name: opts.name,
-      instruction: opts.instruction
+      instruction: opts.instruction,
+      ...opts.worktree ? { worktree: true } : {}
     };
     const response = await sendRequest(request);
     if (response.ok) {
@@ -262,6 +279,7 @@ function readStdin() {
 // src/cli/commands/submit.ts
 function registerSubmit(program2) {
   program2.command("submit").description("Submit work report and exit (agent only)").option("--report <report>", "Work report (or pipe via stdin)").action(async (opts) => {
+    assertTmux();
     const sessionId = process.env.SISYPHUS_SESSION_ID;
     const agentId = process.env.SISYPHUS_AGENT_ID;
     if (!sessionId || !agentId) {
@@ -288,6 +306,7 @@ function registerSubmit(program2) {
 // src/cli/commands/yield.ts
 function registerYield(program2) {
   program2.command("yield").description("Yield control back to daemon (orchestrator only)").option("--prompt <text>", "Instructions for the next orchestrator cycle (or pipe via stdin)").action(async (opts) => {
+    assertTmux();
     const sessionId = process.env.SISYPHUS_SESSION_ID;
     if (!sessionId) {
       console.error("Error: SISYPHUS_SESSION_ID environment variable not set");
@@ -308,6 +327,7 @@ function registerYield(program2) {
 // src/cli/commands/complete.ts
 function registerComplete(program2) {
   program2.command("complete").description("Mark session as completed (orchestrator only)").requiredOption("--report <report>", "Final completion report").action(async (opts) => {
+    assertTmux();
     const sessionId = process.env.SISYPHUS_SESSION_ID;
     if (!sessionId) {
       console.error("Error: SISYPHUS_SESSION_ID environment variable not set");
@@ -317,7 +337,6 @@ function registerComplete(program2) {
     const response = await sendRequest(request);
     if (response.ok) {
       console.log("Session completed.");
-      console.log("All panes will close.");
     } else {
       console.error(`Error: ${response.error}`);
       process.exit(1);
@@ -339,16 +358,8 @@ var STATUS_COLORS = {
   // red
   crashed: "\x1B[31m",
   // red
-  lost: "\x1B[90m",
+  lost: "\x1B[90m"
   // gray
-  draft: "\x1B[2m",
-  // dim
-  pending: "\x1B[90m",
-  // gray
-  in_progress: "\x1B[33m",
-  // yellow
-  done: "\x1B[32m"
-  // green
 };
 var RESET = "\x1B[0m";
 var BOLD = "\x1B[1m";
@@ -390,10 +401,6 @@ function formatAgent(agent) {
   }
   return line;
 }
-function formatTask(task) {
-  const status = colorize(task.status, task.status);
-  return `    ${task.id}: ${task.description} [${status}]`;
-}
 function formatCycle(cycle) {
   const duration = cycle.completedAt ? ` ${DIM}(${formatDuration(cycle.timestamp, cycle.completedAt)})${RESET}` : ` ${DIM}(running)${RESET}`;
   const agents = cycle.agentsSpawned.length > 0 ? ` \u2014 agents: ${cycle.agentsSpawned.join(", ")}` : "";
@@ -417,13 +424,6 @@ ${BOLD}Session: ${session.id}${RESET}`);
       console.log(formatCycle(cycle));
     }
   }
-  if (session.tasks.length > 0) {
-    console.log(`
-  ${BOLD}Tasks:${RESET}`);
-    for (const task of session.tasks) {
-      console.log(formatTask(task));
-    }
-  }
   if (session.agents.length > 0) {
     console.log(`
   ${BOLD}Agents:${RESET}`);
@@ -451,112 +451,50 @@ function registerStatus(program2) {
   });
 }
 
-// src/cli/commands/tasks.ts
-function getSessionId() {
-  const sessionId = process.env.SISYPHUS_SESSION_ID;
-  if (!sessionId) {
-    console.error("Error: SISYPHUS_SESSION_ID environment variable not set");
-    process.exit(1);
-  }
-  return sessionId;
-}
-var STATUS_COLORS2 = {
-  draft: "\x1B[2m",
-  // dim
-  pending: "\x1B[90m",
-  // gray
-  in_progress: "\x1B[33m",
-  // yellow
-  done: "\x1B[32m"
-  // green
-};
-var RESET2 = "\x1B[0m";
-function registerTasks(program2) {
-  const tasks = program2.command("tasks").description("Manage session tasks");
-  tasks.command("add").description("Add a new task").argument("[description]", "Task description (or pipe via stdin)").option("--status <status>", "Initial status (draft|pending)", "pending").action(async (descriptionArg, opts) => {
-    const description = descriptionArg ?? await readStdin();
-    if (!description) {
-      console.error("Error: provide a description argument or pipe via stdin");
-      process.exit(1);
-    }
-    const sessionId = getSessionId();
-    const request = { type: "tasks_add", sessionId, description, status: opts.status !== "pending" ? opts.status : void 0 };
-    const response = await sendRequest(request);
-    if (response.ok) {
-      const taskId = response.data?.taskId;
-      console.log(`Task added: ${taskId} [${opts.status}]`);
-    } else {
-      console.error(`Error: ${response.error}`);
-      if (response.error?.includes("Unknown session")) console.error("Hint: run `sisyphus list` to see active sessions.");
-      process.exit(1);
-    }
-  });
-  tasks.command("update").description("Update a task").argument("<task-id>", "Task ID (e.g. t1)").option("--status <status>", "New status (draft|pending|in_progress|done)").option("--description <description>", "New description").action(async (taskId, opts) => {
-    if (!opts.status && !opts.description) {
-      console.error("Error: provide --status and/or --description");
-      process.exit(1);
-    }
-    const sessionId = getSessionId();
-    const request = { type: "tasks_update", sessionId, taskId, status: opts.status, description: opts.description };
-    const response = await sendRequest(request);
-    if (response.ok) {
-      const parts = [];
-      if (opts.status) parts.push(`status \u2192 ${opts.status}`);
-      if (opts.description) parts.push(`description updated`);
-      console.log(`Task ${taskId}: ${parts.join(", ")}`);
-    } else {
-      console.error(`Error: ${response.error}`);
-      if (response.error?.includes("not found")) console.error("Hint: run `sisyphus tasks list` to see current tasks.");
-      if (response.error?.includes("Unknown session")) console.error("Hint: run `sisyphus list` to see active sessions.");
-      process.exit(1);
-    }
-  });
-  tasks.command("list").description("List all tasks").action(async () => {
-    const sessionId = getSessionId();
-    const request = { type: "tasks_list", sessionId };
-    const response = await sendRequest(request);
-    if (response.ok) {
-      const taskList = response.data?.tasks ?? [];
-      if (taskList.length === 0) {
-        console.log("No tasks");
-        return;
-      }
-      for (const task of taskList) {
-        const color = STATUS_COLORS2[task.status] ?? "";
-        console.log(`  ${task.id}: ${task.description} [${color}${task.status}${RESET2}]`);
-      }
-    } else {
-      console.error(`Error: ${response.error}`);
-      if (response.error?.includes("Unknown session")) console.error("Hint: run `sisyphus list` to see active sessions.");
-      process.exit(1);
-    }
-  });
-}
-
 // src/cli/commands/list.ts
-var STATUS_COLORS3 = {
+import { basename } from "path";
+var STATUS_COLORS2 = {
   active: "\x1B[32m",
   paused: "\x1B[33m",
   completed: "\x1B[36m"
 };
-var RESET3 = "\x1B[0m";
+var RESET2 = "\x1B[0m";
 var BOLD2 = "\x1B[1m";
 var DIM2 = "\x1B[2m";
+function truncateTask(task, max) {
+  if (task.length <= max) return task;
+  return task.slice(0, max - 1) + "\u2026";
+}
 function registerList(program2) {
-  program2.command("list").description("List all sessions").action(async () => {
-    const request = { type: "list" };
+  program2.command("list").description("List sessions (defaults to current project)").option("-a, --all", "Show sessions from all projects").action(async (opts) => {
+    const cwd = process.cwd();
+    const request = { type: "list", cwd, all: opts.all };
     const response = await sendRequest(request);
     if (response.ok) {
       const sessions = response.data?.sessions ?? [];
+      const totalCount = response.data?.totalCount;
+      const filtered = response.data?.filtered;
       if (sessions.length === 0) {
-        console.log("No sessions");
+        if (filtered && totalCount && totalCount > 0) {
+          console.log(`No sessions in this project. ${totalCount} session(s) in other projects.`);
+          console.log(`${DIM2}Run ${RESET2}sisyphus list --all${DIM2} to show all.${RESET2}`);
+        } else {
+          console.log("No sessions");
+        }
         return;
       }
       for (const s of sessions) {
-        const color = STATUS_COLORS3[s.status] ?? "";
-        const status = `${color}${s.status}${RESET3}`;
-        const agents = `${DIM2}${s.agentCount} agent(s)${RESET3}`;
-        console.log(`  ${BOLD2}${s.id}${RESET3}  ${status}  ${agents}  ${s.task}`);
+        const color = STATUS_COLORS2[s.status] ?? "";
+        const status = `${color}${s.status}${RESET2}`;
+        const agents = `${DIM2}${s.agentCount} agent(s)${RESET2}`;
+        const task = truncateTask(s.task, 60);
+        const cwdLabel = opts.all && s.cwd ? `  ${DIM2}${basename(s.cwd)}${RESET2}` : "";
+        console.log(`  ${BOLD2}${s.id}${RESET2}  ${status}  ${agents}  ${task}${cwdLabel}`);
+      }
+      if (filtered && totalCount && totalCount > sessions.length) {
+        const otherCount = totalCount - sessions.length;
+        console.log(`
+${DIM2}${otherCount} more session(s) in other projects. Run ${RESET2}sisyphus list --all${DIM2} to show all.${RESET2}`);
       }
     } else {
       console.error(`Error: ${response.error}`);
@@ -568,6 +506,7 @@ function registerList(program2) {
 // src/cli/commands/report.ts
 function registerReport(program2) {
   program2.command("report").description("Send a progress report without exiting (agent only)").option("--message <message>", "Progress report content").action(async (opts) => {
+    assertTmux();
     const sessionId = process.env.SISYPHUS_SESSION_ID;
     const agentId = process.env.SISYPHUS_AGENT_ID;
     if (!sessionId || !agentId) {
@@ -591,25 +530,10 @@ function registerReport(program2) {
 }
 
 // src/cli/commands/resume.ts
-import { execSync as execSync3 } from "child_process";
-function getTmuxSession2() {
-  try {
-    return execSync3('tmux display-message -p "#{session_name}"', { encoding: "utf8" }).trim();
-  } catch {
-    throw new Error("Not running inside tmux");
-  }
-}
-function getTmuxWindow2() {
-  try {
-    return execSync3('tmux display-message -p "#{window_id}"', { encoding: "utf8" }).trim();
-  } catch {
-    throw new Error("Not running inside tmux");
-  }
-}
 function registerResume(program2) {
   program2.command("resume").description("Resume a paused session").argument("<session-id>", "Session ID to resume").argument("[message]", "Additional instructions for the orchestrator").action(async (sessionId, message) => {
-    const tmuxSession = getTmuxSession2();
-    const tmuxWindow = getTmuxWindow2();
+    const tmuxSession = getTmuxSession();
+    const tmuxWindow = getTmuxWindow();
     const cwd = process.cwd();
     const request = { type: "resume", sessionId, cwd, tmuxSession, tmuxWindow, message };
     const response = await sendRequest(request);
@@ -678,7 +602,6 @@ registerReport(program);
 registerYield(program);
 registerComplete(program);
 registerStatus(program);
-registerTasks(program);
 registerList(program);
 registerResume(program);
 registerKill(program);