sisyphi 1.0.13 → 1.1.0

package/dist/{chunk-T7ETTIQK.js → chunk-M7LZ2ZHD.js}

@@ -5,35 +5,11 @@ import {
   sessionsDir,
   socketPath,
   statePath
-} from "./chunk-JXKUI4P6.js";
+} from "./chunk-REUQ4B45.js";
 
 // src/shared/utils.ts
 function computeActiveTimeMs(session) {
-  const now = Date.now();
-  const intervals = [];
-  for (const cycle of session.orchestratorCycles) {
-    const start = new Date(cycle.timestamp).getTime();
-    const end = cycle.completedAt ? new Date(cycle.completedAt).getTime() : now;
-    if (end > start) intervals.push([start, end]);
-  }
-  for (const agent of session.agents) {
-    const start = new Date(agent.spawnedAt).getTime();
-    const end = agent.completedAt ? new Date(agent.completedAt).getTime() : now;
-    if (end > start) intervals.push([start, end]);
-  }
-  if (intervals.length === 0) return 0;
-  intervals.sort((a, b) => a[0] - b[0]);
-  const merged = [intervals[0]];
-  for (let i = 1; i < intervals.length; i++) {
-    const last = merged[merged.length - 1];
-    const cur = intervals[i];
-    if (cur[0] <= last[1]) {
-      last[1] = Math.max(last[1], cur[1]);
-    } else {
-      merged.push(cur);
-    }
-  }
-  return merged.reduce((sum, [start, end]) => sum + (end - start), 0);
+  return session.activeMs;
 }
 
 // src/shared/format.ts
@@ -261,4 +237,4 @@ export {
   buildCompanionContext,
   buildSessionContext
 };
-//# sourceMappingURL=chunk-T7ETTIQK.js.map
+//# sourceMappingURL=chunk-M7LZ2ZHD.js.map

package/dist/chunk-M7LZ2ZHD.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/shared/utils.ts","../src/shared/format.ts","../src/tui/lib/reports.ts","../src/tui/lib/context.ts","../src/shared/client.ts"],"sourcesContent":["import type { Session } from './types.js';\n\n/**\n * Return the tracked active time for a session.\n * Active time is accumulated by the daemon's pane monitor, excluding sleep/idle gaps.\n */\nexport function computeActiveTimeMs(session: Session): number {\n  return session.activeMs;\n}\n","/** Format milliseconds or ISO date range to human-readable duration */\nexport function formatDuration(startOrMs: string | number, endIso?: string | null): string {\n  let totalMs: number;\n  if (typeof startOrMs === 'number') {\n    totalMs = startOrMs;\n  } else {\n    const start = new Date(startOrMs).getTime();\n    const end = endIso ? new Date(endIso).getTime() : Date.now();\n    totalMs = end - start;\n  }\n  const totalSeconds = Math.floor(totalMs / 1000);\n  if (totalSeconds < 0) return '0s';\n  const hours = Math.floor(totalSeconds / 3600);\n  const minutes = Math.floor((totalSeconds % 3600) / 60);\n  const seconds = totalSeconds % 60;\n  if (hours > 0) return `${hours}h${minutes}m`;\n  if (minutes > 0) return `${minutes}m${seconds}s`;\n  return `${seconds}s`;\n}\n\n/** Map session/agent status to a color name */\nexport function statusColor(status: string): string {\n  switch (status) {\n    case 'active':\n    case 'running':\n      return 'green';\n    case 'completed':\n      return 'cyan';\n    case 'paused':\n      return 'yellow';\n    case 'killed':\n    case 'crashed':\n      return 'red';\n    case 'lost':\n      return 'gray';\n    default:\n      return 'white';\n  }\n}\n","import { readFileSync } from 'node:fs';\nimport type { AgentReport } from '../../shared/types.js';\n\nexport interface ReportBlock {\n  type: 'update' | 'final';\n  timestamp: string;\n  content: string;\n  summary: string;\n}\n\nfunction loadReportContent(report: AgentReport): string {\n  try {\n    return readFileSync(report.filePath, 'utf-8');\n  } catch {\n    return report.summary;\n  }\n}\n\nexport function resolveReports(reports: AgentReport[]): ReportBlock[] {\n  return [...reports].reverse().map((r) => ({\n    type: r.type as 'update' | 'final',\n    timestamp: r.timestamp,\n    content: loadReportContent(r),\n    summary: r.summary,\n  }));\n}\n","import { readFileSync, readdirSync } from 'node:fs';\nimport { goalPath, roadmapPath, sessionsDir, statePath } from '../../shared/paths.js';\nimport { resolveReports } from './reports.js';\nimport type { Session, AgentStatus } from '../../shared/types.js';\n\nfunction readFileSafe(filePath: string): string | null {\n  try {\n    return readFileSync(filePath, 'utf-8');\n  } catch {\n    return null;\n  }\n}\n\nfunction escapeXml(s: string): string {\n  return s\n    .replace(/&/g, '&amp;')\n    .replace(/</g, '&lt;')\n    .replace(/>/g, '&gt;')\n    .replace(/\"/g, '&quot;');\n}\n\nexport function buildCompanionContext(cwd: string): string {\n  let sessionDirs: string[];\n  try {\n    sessionDirs = readdirSync(sessionsDir(cwd));\n  } catch {\n    return '<sessions>No sessions found.</sessions>';\n  }\n\n  const now = Date.now();\n  const sevenDaysMs = 7 * 24 * 60 * 60 * 1000;\n  const sessionBlocks: string[] = [];\n\n  for (const sessionId of sessionDirs) {\n    const stateRaw = readFileSafe(statePath(cwd, sessionId));\n    if (!stateRaw) continue;\n\n    let session: Session;\n    try {\n      session = JSON.parse(stateRaw) as Session;\n    } catch {\n      continue;\n    }\n\n    // Skip completed sessions older than 7 days\n    if (session.status === 'completed' && session.completedAt) {\n      if (now - new Date(session.completedAt).getTime() > sevenDaysMs) continue;\n    }\n\n    const lines: string[] = [];\n    const nameAttr = session.name ? ` name=\"${escapeXml(session.name)}\"` : '';\n    lines.push(`  <session id=\"${escapeXml(session.id)}\"${nameAttr} status=\"${escapeXml(session.status)}\">`);\n    lines.push(`    <task>${escapeXml(session.task)}</task>`);\n    lines.push(`    <created>${escapeXml(session.createdAt)}</created>`);\n    lines.push(`    <cycles>${session.orchestratorCycles.length}</cycles>`);\n\n    if (session.status === 'completed') {\n      if (session.completionReport) {\n        const snippet = session.completionReport.slice(0, 300).replace(/\\n+/g, ' ').trim();\n        lines.push(`    <completion-report>${escapeXml(snippet)}${session.completionReport.length > 300 ? '…' : ''}</completion-report>`);\n      }\n    } else {\n      // Agent summary by status\n      if (session.agents.length > 0) {\n        const counts = new Map<AgentStatus, number>();\n        for (const agent of session.agents) {\n          counts.set(agent.status, (counts.get(agent.status) ?? 0) + 1);\n        }\n        const summary = [...counts.entries()].map(([status, n]) => `${n} ${status}`).join(', ');\n        lines.push(`    <agents>${escapeXml(summary)}</agents>`);\n      }\n\n      // Goal: first meaningful line\n      const goalContent = readFileSafe(goalPath(cwd, session.id));\n      if (goalContent) {\n        const firstLine = goalContent.split('\\n').map(l => l.trim()).find(l => l.length > 0 && !l.startsWith('#'));\n        if (firstLine) lines.push(`    <goal>${escapeXml(firstLine)}</goal>`);\n      }\n\n      // Roadmap unchecked todos (up to 5)\n      const roadmapContent = readFileSafe(roadmapPath(cwd, session.id));\n      if (roadmapContent) {\n        const todos = roadmapContent\n          .split('\\n')\n          .filter(l => l.includes('- [ ]'))\n          .slice(0, 5)\n          .map(l => l.trim());\n        if (todos.length > 0) {\n          lines.push('    <todos>');\n          for (const todo of todos) lines.push(`      ${escapeXml(todo)}`);\n          lines.push('    </todos>');\n        }\n      }\n    }\n\n    lines.push('  </session>');\n    sessionBlocks.push(lines.join('\\n'));\n  }\n\n  if (sessionBlocks.length === 0) {\n    return '<sessions>No sessions found.</sessions>';\n  }\n\n  return ['<sessions>', ...sessionBlocks, '</sessions>'].join('\\n');\n}\n\nexport function buildSessionContext(session: Session, cwd: string): string {\n  const goal = readFileSafe(goalPath(cwd, session.id));\n  const roadmap = readFileSafe(roadmapPath(cwd, session.id));\n\n  const agentsXml = session.agents.map((agent) => {\n    const reportBlocks = resolveReports(agent.reports);\n    // resolveReports returns newest-first; reverse to chronological for context\n    const reportsXml = [...reportBlocks].reverse().map((block) => {\n      return `      <report type=\"${block.type}\" time=\"${escapeXml(block.timestamp)}\">${escapeXml(block.content)}</report>`;\n    }).join('\\n');\n\n    return [\n      `    <agent id=\"${escapeXml(agent.id)}\" name=\"${escapeXml(agent.name)}\" type=\"${escapeXml(agent.agentType)}\" status=\"${escapeXml(agent.status)}\">`,\n      `      <instruction>${escapeXml(agent.instruction)}</instruction>`,\n      ...(reportsXml ? [reportsXml] : []),\n      `    </agent>`,\n    ].join('\\n');\n  }).join('\\n');\n\n  const cyclesXml = session.orchestratorCycles.map((cycle) => {\n    const agents = cycle.agentsSpawned.join(', ');\n    const mode = cycle.mode ? ` mode=\"${escapeXml(cycle.mode)}\"` : '';\n    return `    <cycle number=\"${cycle.cycle}\"${mode} agents=\"${escapeXml(agents)}\" />`;\n  }).join('\\n');\n\n  const lines: string[] = [\n    '<context>',\n    `<session id=\"${escapeXml(session.id)}\" status=\"${escapeXml(session.status)}\">`,\n    `  <task>${escapeXml(session.task)}</task>`,\n    `  <cwd>${escapeXml(session.cwd)}</cwd>`,\n  ];\n\n  if (goal) lines.push(`  <goal>${escapeXml(goal)}</goal>`);\n  if (roadmap) lines.push(`  <roadmap>${escapeXml(roadmap)}</roadmap>`);\n\n  if (session.agents.length > 0) {\n    lines.push('  <agents>');\n    lines.push(agentsXml);\n    lines.push('  </agents>');\n  }\n\n  if (session.orchestratorCycles.length > 0) {\n    lines.push('  <cycles>');\n    lines.push(cyclesXml);\n    lines.push('  </cycles>');\n  }\n\n  if (session.completionReport) {\n    lines.push(`  <completion-report>${escapeXml(session.completionReport)}</completion-report>`);\n  }\n\n  lines.push('</session>');\n  lines.push('</context>');\n\n  return lines.join('\\n');\n}\n","import { connect } from 'node:net';\nimport { socketPath } from './paths.js';\nimport type { Request, Response } from './protocol.js';\n\nexport function rawSend(request: Request, timeoutMs = 10_000): Promise<Response> {\n  const sock = socketPath();\n\n  return new Promise<Response>((resolve, reject) => {\n    const socket = connect(sock);\n    let data = '';\n\n    const timeout = setTimeout(() => {\n      socket.destroy();\n      reject(new Error(`Request timed out after ${(timeoutMs / 1000).toFixed(0)}s. The daemon may be overloaded.\\n  Check: sisyphus doctor\\n  Logs: tail -20 ~/.sisyphus/daemon.log`));\n    }, timeoutMs);\n\n    socket.on('connect', () => {\n      socket.write(JSON.stringify(request) + '\\n');\n    });\n\n    socket.on('data', (chunk) => {\n      data += chunk.toString();\n      const newlineIdx = data.indexOf('\\n');\n      if (newlineIdx !== -1) {\n        clearTimeout(timeout);\n        const line = data.slice(0, newlineIdx);\n        socket.destroy();\n        try {\n          resolve(JSON.parse(line) as Response);\n        } catch {\n          reject(new Error(`Invalid JSON response from daemon: ${line}`));\n        }\n      }\n    });\n\n    socket.on('error', (err) => {\n      clearTimeout(timeout);\n      reject(err);\n    });\n  });\n}\n"],"mappings":"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","names":["readFileSync","readFileSync"]}

package/dist/{chunk-JXKUI4P6.js → chunk-REUQ4B45.js}

@@ -1,33 +1,8 @@
 #!/usr/bin/env node
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 
 // src/shared/paths.ts
 import { homedir } from "os";
-import { basename, join } from "path";
+import { join } from "path";
 function globalDir() {
   return join(homedir(), ".sisyphus");
 }
@@ -85,6 +60,9 @@ function roadmapPath(cwd, sessionId) {
 function goalPath(cwd, sessionId) {
   return join(sessionDir(cwd, sessionId), "goal.md");
 }
+function strategyPath(cwd, sessionId) {
+  return join(sessionDir(cwd, sessionId), "strategy.md");
+}
 function logsDir(cwd, sessionId) {
   return join(sessionDir(cwd, sessionId), "logs");
 }
@@ -100,16 +78,8 @@ function snapshotsDir(cwd, sessionId) {
 function snapshotDir(cwd, sessionId, cycle) {
   return join(snapshotsDir(cwd, sessionId), `cycle-${cycle}`);
 }
-function worktreeConfigPath(cwd) {
-  return join(projectDir(cwd), "worktree.json");
-}
-function worktreeBaseDir(cwd) {
-  return join(cwd, "..", `${basename(cwd)}-sisyphus-wt`);
-}
 
 export {
-  __commonJS,
-  __toESM,
   globalDir,
   socketPath,
   globalConfigPath,
@@ -129,12 +99,11 @@ export {
   contextDir,
   roadmapPath,
   goalPath,
+  strategyPath,
   logsDir,
   cycleLogPath,
   legacyLogsPath,
   snapshotsDir,
-  snapshotDir,
-  worktreeConfigPath,
-  worktreeBaseDir
+  snapshotDir
 };
-//# sourceMappingURL=chunk-JXKUI4P6.js.map
+//# sourceMappingURL=chunk-REUQ4B45.js.map

package/dist/chunk-REUQ4B45.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/shared/paths.ts"],"sourcesContent":["import { homedir } from 'node:os';\nimport { 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 daemonUpdatingPath(): string {\n  return join(globalDir(), 'updating');\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 messagesDir(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'messages');\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 roadmapPath(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'roadmap.md');\n}\n\nexport function goalPath(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'goal.md');\n}\n\nexport function strategyPath(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'strategy.md');\n}\n\nexport function logsDir(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'logs');\n}\n\nexport function cycleLogPath(cwd: string, sessionId: string, cycle: number): string {\n  return join(logsDir(cwd, sessionId), `cycle-${String(cycle).padStart(3, '0')}.md`);\n}\n\n// Backwards compat for old sessions\nexport function legacyLogsPath(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'logs.md');\n}\n\nexport function snapshotsDir(cwd: string, sessionId: string): string {\n  return join(sessionDir(cwd, sessionId), 'snapshots');\n}\n\nexport function snapshotDir(cwd: string, sessionId: string, cycle: number): string {\n  return join(snapshotsDir(cwd, sessionId), `cycle-${cycle}`);\n}\n\n"],"mappings":";;;AAAA,SAAS,eAAe;AACxB,SAAS,YAAY;AAEd,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,qBAA6B;AAC3C,SAAO,KAAK,UAAU,GAAG,UAAU;AACrC;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,YAAY,KAAa,WAA2B;AAClE,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,UAAU;AACpD;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,YAAY,KAAa,WAA2B;AAClE,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,YAAY;AACtD;AAEO,SAAS,SAAS,KAAa,WAA2B;AAC/D,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,SAAS;AACnD;AAEO,SAAS,aAAa,KAAa,WAA2B;AACnE,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,aAAa;AACvD;AAEO,SAAS,QAAQ,KAAa,WAA2B;AAC9D,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,MAAM;AAChD;AAEO,SAAS,aAAa,KAAa,WAAmB,OAAuB;AAClF,SAAO,KAAK,QAAQ,KAAK,SAAS,GAAG,SAAS,OAAO,KAAK,EAAE,SAAS,GAAG,GAAG,CAAC,KAAK;AACnF;AAGO,SAAS,eAAe,KAAa,WAA2B;AACrE,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,SAAS;AACnD;AAEO,SAAS,aAAa,KAAa,WAA2B;AACnE,SAAO,KAAK,WAAW,KAAK,SAAS,GAAG,WAAW;AACrD;AAEO,SAAS,YAAY,KAAa,WAAmB,OAAuB;AACjF,SAAO,KAAK,aAAa,KAAK,SAAS,GAAG,SAAS,KAAK,EAAE;AAC5D;","names":[]}

package/dist/{chunk-LWWRGQWM.js → chunk-Z32YVDMY.js}

@@ -2,7 +2,7 @@
 import {
   globalConfigPath,
   projectConfigPath
-} from "./chunk-JXKUI4P6.js";
+} from "./chunk-REUQ4B45.js";
 
 // src/shared/config.ts
 import { readFileSync } from "fs";
@@ -84,4 +84,4 @@ export {
   exec,
   execSafe
 };
-//# sourceMappingURL=chunk-LWWRGQWM.js.map
+//# sourceMappingURL=chunk-Z32YVDMY.js.map

package/dist/chunk-Z32YVDMY.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/shared/config.ts","../src/shared/env.ts","../src/shared/exec.ts"],"sourcesContent":["import { readFileSync } from 'node:fs';\nimport { globalConfigPath, projectConfigPath } from './paths.js';\n\nexport type EffortLevel = 'low' | 'medium' | 'high' | 'max';\n\nexport interface Config {\n  model?: string;\n  tmuxSession?: string;\n  orchestratorPrompt?: string;\n  pollIntervalMs?: number;\n  autoUpdate?: boolean;\n  orchestratorEffort?: EffortLevel;\n  agentEffort?: EffortLevel;\n  editor?: string;\n  repos?: string[];\n}\n\nconst DEFAULT_CONFIG: Config = {\n  pollIntervalMs: 5000,\n  orchestratorEffort: 'high',\n  agentEffort: 'medium',\n};\n\nfunction readJsonFile(filePath: string): Partial<Config> {\n  try {\n    const content = readFileSync(filePath, 'utf-8');\n    return JSON.parse(content) as Partial<Config>;\n  } catch {\n    return {};\n  }\n}\n\nexport function loadConfig(cwd: string): Config {\n  const global = readJsonFile(globalConfigPath());\n  const project = readJsonFile(projectConfigPath(cwd));\n  return { ...DEFAULT_CONFIG, ...global, ...project };\n}\n","/**\n * Build a PATH string that includes common binary directories\n * across package managers and platforms.\n *\n * Prepends known directories that exist on the system to the current PATH.\n * This ensures tmux commands can find binaries installed by Homebrew,\n * MacPorts, nix, and other package managers.\n */\nexport function augmentedPath(): string {\n  const rawPath = process.env['PATH'];\n  const basePath = rawPath !== undefined && rawPath.length > 0 ? rawPath : '/usr/bin:/bin';\n\n  // Common binary directories across platforms/package managers.\n  // Only prepend ones that aren't already in PATH.\n  const candidates = [\n    '/opt/homebrew/bin',              // Homebrew (Apple Silicon macOS)\n    '/opt/homebrew/sbin',             // Homebrew sbin\n    '/usr/local/bin',                 // Homebrew (Intel macOS), manual installs\n    '/usr/local/sbin',                // Manual installs\n    '/opt/local/bin',                 // MacPorts\n    '/opt/local/sbin',                // MacPorts\n    '/home/linuxbrew/.linuxbrew/bin', // Linuxbrew\n  ];\n\n  // Check for nix profile paths\n  const nixProfile = process.env['NIX_PROFILES'];\n  if (nixProfile) {\n    for (const p of nixProfile.split(' ').reverse()) {\n      candidates.push(`${p}/bin`);\n    }\n  }\n\n  const existing = new Set(basePath.split(':'));\n  const prepend = candidates.filter(dir => !existing.has(dir));\n\n  return prepend.length > 0 ? `${prepend.join(':')}:${basePath}` : basePath;\n}\n\n/**\n * Environment variables for child processes that need access to\n * user-installed binaries (tmux, git, claude, etc.).\n */\nexport function execEnv(): Record<string, string | undefined> {\n  return {\n    ...process.env,\n    PATH: augmentedPath(),\n  };\n}\n","import { execSync } from 'node:child_process';\nimport { execEnv } from './env.js';\n\nexport const EXEC_ENV = execEnv();\n\nexport function exec(cmd: string, cwd?: string): string {\n  return execSync(cmd, { encoding: 'utf-8', env: EXEC_ENV, cwd }).trim();\n}\n\nexport function execSafe(cmd: string, cwd?: string): string | null {\n  try {\n    return execSync(cmd, { encoding: 'utf-8', env: EXEC_ENV, cwd, stdio: ['pipe', 'pipe', 'pipe'] }).trim();\n  } catch { return null; }\n}\n"],"mappings":";;;;;;;AAAA,SAAS,oBAAoB;AAiB7B,IAAM,iBAAyB;AAAA,EAC7B,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,aAAa;AACf;AAEA,SAAS,aAAa,UAAmC;AACvD,MAAI;AACF,UAAM,UAAU,aAAa,UAAU,OAAO;AAC9C,WAAO,KAAK,MAAM,OAAO;AAAA,EAC3B,QAAQ;AACN,WAAO,CAAC;AAAA,EACV;AACF;AAEO,SAAS,WAAW,KAAqB;AAC9C,QAAM,SAAS,aAAa,iBAAiB,CAAC;AAC9C,QAAM,UAAU,aAAa,kBAAkB,GAAG,CAAC;AACnD,SAAO,EAAE,GAAG,gBAAgB,GAAG,QAAQ,GAAG,QAAQ;AACpD;;;AC5BO,SAAS,gBAAwB;AACtC,QAAM,UAAU,QAAQ,IAAI,MAAM;AAClC,QAAM,WAAW,YAAY,UAAa,QAAQ,SAAS,IAAI,UAAU;AAIzE,QAAM,aAAa;AAAA,IACjB;AAAA;AAAA,IACA;AAAA;AAAA,IACA;AAAA;AAAA,IACA;AAAA;AAAA,IACA;AAAA;AAAA,IACA;AAAA;AAAA,IACA;AAAA;AAAA,EACF;AAGA,QAAM,aAAa,QAAQ,IAAI,cAAc;AAC7C,MAAI,YAAY;AACd,eAAW,KAAK,WAAW,MAAM,GAAG,EAAE,QAAQ,GAAG;AAC/C,iBAAW,KAAK,GAAG,CAAC,MAAM;AAAA,IAC5B;AAAA,EACF;AAEA,QAAM,WAAW,IAAI,IAAI,SAAS,MAAM,GAAG,CAAC;AAC5C,QAAM,UAAU,WAAW,OAAO,SAAO,CAAC,SAAS,IAAI,GAAG,CAAC;AAE3D,SAAO,QAAQ,SAAS,IAAI,GAAG,QAAQ,KAAK,GAAG,CAAC,IAAI,QAAQ,KAAK;AACnE;AAMO,SAAS,UAA8C;AAC5D,SAAO;AAAA,IACL,GAAG,QAAQ;AAAA,IACX,MAAM,cAAc;AAAA,EACtB;AACF;;;AC/CA,SAAS,gBAAgB;AAGlB,IAAM,WAAW,QAAQ;AAEzB,SAAS,KAAK,KAAa,KAAsB;AACtD,SAAO,SAAS,KAAK,EAAE,UAAU,SAAS,KAAK,UAAU,IAAI,CAAC,EAAE,KAAK;AACvE;AAEO,SAAS,SAAS,KAAa,KAA6B;AACjE,MAAI;AACF,WAAO,SAAS,KAAK,EAAE,UAAU,SAAS,KAAK,UAAU,KAAK,OAAO,CAAC,QAAQ,QAAQ,MAAM,EAAE,CAAC,EAAE,KAAK;AAAA,EACxG,QAAQ;AAAE,WAAO;AAAA,EAAM;AACzB;","names":[]}

package/dist/cli.js

@@ -5,7 +5,7 @@ import {
   formatDuration,
   rawSend,
   statusColor
-} from "./chunk-T7ETTIQK.js";
+} from "./chunk-M7LZ2ZHD.js";
 import {
   shellQuote
 } from "./chunk-6G226ZK7.js";
@@ -16,11 +16,11 @@ import {
   globalDir,
   roadmapPath,
   socketPath
-} from "./chunk-JXKUI4P6.js";
+} from "./chunk-REUQ4B45.js";
 
 // src/cli/index.ts
 import { Command } from "commander";
-import { existsSync as existsSync5, mkdirSync as mkdirSync4 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4 } from "fs";
 
 // src/cli/commands/start.ts
 import { execSync as execSync5 } from "child_process";
@@ -576,6 +576,10 @@ Control:`);
   });
 }
 
+// src/cli/commands/spawn.ts
+import { existsSync as existsSync3 } from "fs";
+import { join as join4 } from "path";
+
 // src/cli/stdin.ts
 function readStdin() {
   if (process.stdin.isTTY) return Promise.resolve(null);
@@ -592,11 +596,11 @@ function readStdin() {
 
 // src/cli/commands/spawn.ts
 function registerSpawn(program2) {
-  program2.command("spawn").description("Spawn a new agent (orchestrator only)").argument("[instruction]", "Task instruction for the agent").option("--agent-type <type>", "Agent role label (default: worker)", "worker").requiredOption("--name <name>", "Agent name").option("--instruction <instruction>", "Task instruction for the agent (or pipe via stdin)").option("--worktree", "Spawn agent in an isolated git worktree").action(async (positionalInstruction, opts) => {
+  program2.command("spawn").description("Spawn a new agent (orchestrator only)").argument("[instruction]", "Task instruction for the agent").option("--agent-type <type>", "Agent role label (default: worker)", "worker").requiredOption("--name <name>", "Agent name").option("--instruction <instruction>", "Task instruction for the agent (or pipe via stdin)").option("--repo <name>", "Repo subdirectory to use for this agent").option("--session <sessionId>", "Session ID (defaults to SISYPHUS_SESSION_ID env var)").action(async (positionalInstruction, opts) => {
     assertTmux();
-    const sessionId = process.env.SISYPHUS_SESSION_ID;
+    const sessionId = opts.session ?? process.env.SISYPHUS_SESSION_ID;
     if (!sessionId) {
-      console.error("Error: SISYPHUS_SESSION_ID environment variable not set");
+      console.error("Error: provide --session or set SISYPHUS_SESSION_ID environment variable");
       process.exit(1);
     }
     const instruction = opts.instruction ?? positionalInstruction ?? await readStdin();
@@ -604,13 +608,25 @@ function registerSpawn(program2) {
       console.error("Error: --instruction is required (or pipe via stdin)");
       process.exit(1);
     }
+    const sisyphusCwd = process.env["SISYPHUS_CWD"] ?? process.cwd();
+    if (opts.repo && (opts.repo.includes("/") || opts.repo.includes("..") || opts.repo.includes("\\"))) {
+      console.error("Error: --repo must be a directory name, not a path");
+      process.exit(1);
+    }
+    if (opts.repo && opts.repo !== ".") {
+      const repoPath = join4(sisyphusCwd, opts.repo);
+      if (!existsSync3(repoPath)) {
+        console.error(`Error: repo directory does not exist: ${repoPath}`);
+        process.exit(1);
+      }
+    }
     const request = {
       type: "spawn",
       sessionId,
       agentType: opts.agentType,
       name: opts.name,
       instruction,
-      ...opts.worktree ? { worktree: true } : {}
+      ...opts.repo ? { repo: opts.repo } : {}
     };
     const response = await sendRequest(request);
     if (response.ok) {
@@ -645,18 +661,18 @@ function getUncommittedChanges() {
   }
 }
 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) => {
+  program2.command("submit").description("Submit work report and exit (agent only)").option("--report <report>", "Work report (or pipe via stdin)").option("--session <sessionId>", "Session ID (defaults to SISYPHUS_SESSION_ID env var)").action(async (opts) => {
     assertTmux();
-    const sessionId = process.env.SISYPHUS_SESSION_ID;
+    const sessionId = opts.session ?? process.env.SISYPHUS_SESSION_ID;
     const agentId = process.env.SISYPHUS_AGENT_ID;
     if (!sessionId || !agentId) {
-      console.error("Error: SISYPHUS_SESSION_ID and SISYPHUS_AGENT_ID environment variables must be set");
+      console.error("Error: provide --session or set SISYPHUS_SESSION_ID (and SISYPHUS_AGENT_ID) environment variables");
       process.exit(1);
     }
     if (isInWorktree()) {
       const changes = getUncommittedChanges();
       if (changes) {
-        console.error("Error: uncommitted changes in worktree. Your branch is merged automatically after submit \u2014 uncommitted work will be lost.");
+        console.error("Error: uncommitted changes in worktree. Commit your changes before submitting.");
         console.error('\nCommit first:\n  git add -A && git commit -m "description of changes"\n');
         console.error("Or discard:\n  git checkout -- .\n");
         console.error("Uncommitted changes:");
@@ -683,11 +699,11 @@ 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)").option("--mode <mode>", "System prompt mode for next cycle (planning, implementation)").action(async (opts) => {
+  program2.command("yield").description("Yield control back to daemon (orchestrator only)").option("--prompt <text>", "Instructions for the next orchestrator cycle (or pipe via stdin)").option("--mode <mode>", "System prompt mode for next cycle (planning, implementation, validation)").option("--session <sessionId>", "Session ID (defaults to SISYPHUS_SESSION_ID env var)").action(async (opts) => {
     assertTmux();
-    const sessionId = process.env.SISYPHUS_SESSION_ID;
+    const sessionId = opts.session ?? process.env.SISYPHUS_SESSION_ID;
     if (!sessionId) {
-      console.error("Error: SISYPHUS_SESSION_ID environment variable not set");
+      console.error("Error: provide --session or set SISYPHUS_SESSION_ID environment variable");
       process.exit(1);
     }
     const nextPrompt = opts.prompt ?? await readStdin() ?? void 0;
@@ -704,11 +720,11 @@ 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) => {
+  program2.command("complete").description("Mark session as completed (orchestrator only)").requiredOption("--report <report>", "Final completion report").option("--session <sessionId>", "Session ID (defaults to SISYPHUS_SESSION_ID env var)").action(async (opts) => {
     assertTmux();
-    const sessionId = process.env.SISYPHUS_SESSION_ID;
+    const sessionId = opts.session ?? process.env.SISYPHUS_SESSION_ID;
     if (!sessionId) {
-      console.error("Error: SISYPHUS_SESSION_ID environment variable not set");
+      console.error("Error: provide --session or set SISYPHUS_SESSION_ID environment variable");
       process.exit(1);
     }
     const request = { type: "complete", sessionId, report: opts.report };
@@ -716,9 +732,8 @@ function registerComplete(program2) {
     if (response.ok) {
       console.log("Session completed.");
       console.log(`
-Follow up:`);
-      console.log(`  sisyphus continue                                # reactivate and keep working`);
-      console.log(`  sisyphus resume ${sessionId} "new instructions"   # respawn orchestrator externally`);
+To keep working in this session:`);
+      console.log(`  sisyphus continue   # reactivate session and clear roadmap for new work`);
     } else {
       console.error(`Error: ${response.error}`);
       process.exit(1);
@@ -728,17 +743,19 @@ Follow up:`);
 
 // src/cli/commands/continue.ts
 function registerContinue(program2) {
-  program2.command("continue").description("Clear roadmap and continue working on a completed session (stays in current cycle)").addHelpText("after", "\n  Use `continue` when a session completed but you want to add more work.\n  Use `resume` when you want to restart with specific new instructions.\n").action(async () => {
+  program2.command("continue").description("Clear roadmap and continue working on a completed session (stays in current cycle)").addHelpText("after", "\n  Use `continue` when a session completed but you want to add more work.\n  Use `resume` when you want to restart with specific new instructions.\n").option("--session <sessionId>", "Session ID (defaults to SISYPHUS_SESSION_ID env var)").action(async (opts) => {
     assertTmux();
-    const sessionId = process.env.SISYPHUS_SESSION_ID;
+    const sessionId = opts.session ?? process.env.SISYPHUS_SESSION_ID;
     if (!sessionId) {
-      console.error("Error: SISYPHUS_SESSION_ID environment variable not set");
+      console.error("Error: provide --session or set SISYPHUS_SESSION_ID environment variable");
       process.exit(1);
     }
     const request = { type: "continue", sessionId };
     const response = await sendRequest(request);
     if (response.ok) {
-      console.log("Session reactivated. Plan cleared.");
+      console.log("Session reactivated. Roadmap cleared.");
+      console.log("\nThe previous roadmap has been wiped \u2014 you are starting fresh.");
+      console.log("Consider writing a new roadmap before spawning agents.");
     } else {
       console.error(`Error: ${response.error}`);
       process.exit(1);
@@ -787,7 +804,7 @@ function formatAgent(agent) {
   const status = colorize(agent.status, agent.status);
   const name = `${BOLD}${agent.name}${RESET}`;
   const type = `${DIM}(${agent.agentType})${RESET}`;
-  const duration = formatDuration(agent.spawnedAt, agent.completedAt);
+  const duration = formatDuration(agent.activeMs);
   let line = `    ${agent.id} ${name} ${type} \u2014 ${status} ${DIM}(${duration})${RESET}`;
   if (agent.reports.length > 0) {
     for (const r of agent.reports) {
@@ -805,9 +822,9 @@ function formatAgent(agent) {
 function formatCycle(cycle, phase) {
   let duration;
   if (cycle.completedAt) {
-    duration = ` ${DIM}(${formatDuration(cycle.timestamp, cycle.completedAt)})${RESET}`;
+    duration = ` ${DIM}(${formatDuration(cycle.activeMs)})${RESET}`;
   } else {
-    const elapsed = formatDuration(cycle.timestamp, null);
+    const elapsed = formatDuration(cycle.activeMs);
     duration = ` ${DIM}(running, ${elapsed})${RESET}`;
   }
   const agents = cycle.agentsSpawned.length > 0 ? ` \u2014 agents: ${cycle.agentsSpawned.join(", ")}` : "";
@@ -865,7 +882,7 @@ ${BOLD}Active agents (${runningAgents.length}):${RESET}`);
     for (const agent of runningAgents) {
       const name = `${BOLD}${agent.name}${RESET}`;
       const type = `${DIM}(${agent.agentType})${RESET}`;
-      const duration = formatDuration(agent.spawnedAt, null);
+      const duration = formatDuration(agent.activeMs);
       console.log(`  ${agent.id}  ${name}  ${type}  running ${duration}`);
     }
   }
@@ -929,8 +946,8 @@ function truncateTask(task, max) {
   return task.slice(0, max - 1) + "\u2026";
 }
 function registerList(program2) {
-  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();
+  program2.command("list").description("List sessions (defaults to current project)").option("-a, --all", "Show sessions from all projects").option("--cwd <path>", "Project directory to list sessions for (overrides SISYPHUS_CWD)").action(async (opts) => {
+    const cwd = opts.cwd ?? process.env["SISYPHUS_CWD"] ?? process.cwd();
     const request = { type: "list", cwd, all: opts.all };
     const response = await sendRequest(request);
     if (response.ok) {
@@ -951,8 +968,9 @@ function registerList(program2) {
         const status = `${color}${s.status}${RESET2}`;
         const agents = `${DIM2}${s.agentCount} agent(s)${RESET2}`;
         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}${basename(s.cwd)}${RESET2}` : "";
-        console.log(`  ${BOLD2}${s.id}${RESET2}  ${status}  ${agents}  ${task}${cwdLabel}`);
+        console.log(`  ${BOLD2}${label}${RESET2}  ${status}  ${agents}  ${task}${cwdLabel}`);
       }
       if (filtered && totalCount && totalCount > sessions.length) {
         const otherCount = totalCount - sessions.length;
@@ -968,12 +986,12 @@ ${DIM2}${otherCount} more session(s) in other projects. Run ${RESET2}sisyphus li
 
 // 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) => {
+  program2.command("report").description("Send a progress report without exiting (agent only)").option("--message <message>", "Progress report content").option("--session <sessionId>", "Session ID (defaults to SISYPHUS_SESSION_ID env var)").action(async (opts) => {
     assertTmux();
-    const sessionId = process.env.SISYPHUS_SESSION_ID;
+    const sessionId = opts.session ?? process.env.SISYPHUS_SESSION_ID;
     const agentId = process.env.SISYPHUS_AGENT_ID;
     if (!sessionId || !agentId) {
-      console.error("Error: SISYPHUS_SESSION_ID and SISYPHUS_AGENT_ID environment variables must be set");
+      console.error("Error: provide --session or set SISYPHUS_SESSION_ID (and SISYPHUS_AGENT_ID) environment variables");
       process.exit(1);
     }
     const content = opts.message ?? await readStdin();
@@ -995,7 +1013,7 @@ function registerReport(program2) {
 // src/cli/commands/resume.ts
 function registerResume(program2) {
   program2.command("resume").description("Respawn orchestrator with new instructions (for paused/completed sessions)").addHelpText("after", "\n  Use `resume` to restart a paused or completed session with new instructions.\n  Use `continue` to keep working on a completed session without new instructions.\n").argument("<session-id>", "Session ID to resume").argument("[message]", "Additional instructions for the orchestrator").action(async (sessionId, message) => {
-    const cwd = process.cwd();
+    const cwd = process.env["SISYPHUS_CWD"] ?? process.cwd();
     const request = { type: "resume", sessionId, cwd, message };
     const response = await sendRequest(request);
     if (response.ok) {
@@ -1114,7 +1132,8 @@ function registerRollback(program2) {
       console.error("Error: cycle must be a positive integer");
       process.exit(1);
     }
-    const request = { type: "rollback", sessionId, cwd: process.cwd(), toCycle };
+    const cwd = process.env["SISYPHUS_CWD"] ?? process.cwd();
+    const request = { type: "rollback", sessionId, cwd, toCycle };
     const response = await sendRequest(request);
     if (response.ok) {
       const data = response.data;
@@ -1173,7 +1192,7 @@ function registerSetupKeybind(program2) {
 
 // src/cli/commands/doctor.ts
 import { execSync as execSync7 } from "child_process";
-import { existsSync as existsSync3, statSync } from "fs";
+import { existsSync as existsSync4, statSync } from "fs";
 function checkNodeVersion() {
   const major = parseInt(process.versions.node.split(".")[0], 10);
   if (major < 22) {
@@ -1230,7 +1249,7 @@ function checkDaemonInstalled() {
     };
   }
   const pid = daemonPidPath();
-  if (existsSync3(pid)) {
+  if (existsSync4(pid)) {
     return { name: "Daemon setup", status: "ok", detail: `PID file found at ${pid}` };
   }
   return {
@@ -1242,7 +1261,7 @@ function checkDaemonInstalled() {
 }
 function checkDaemonRunning() {
   const pid = daemonPidPath();
-  if (!existsSync3(pid)) {
+  if (!existsSync4(pid)) {
     const fix = process.platform === "darwin" ? "launchctl load -w ~/Library/LaunchAgents/com.sisyphus.daemon.plist" : "sisyphusd & \u2014 or check if the process is running";
     return {
       name: "Daemon process",
@@ -1280,7 +1299,7 @@ function checkTmux() {
 }
 function checkCycleScript() {
   const path = cycleScriptPath();
-  if (!existsSync3(path)) {
+  if (!existsSync4(path)) {
     return {
       name: "Cycle script",
       status: "fail",
@@ -1305,7 +1324,7 @@ function checkCycleScript() {
 function checkTmuxKeybind() {
   const existing = getExistingBinding(DEFAULT_KEY);
   if (existing === null) {
-    if (existsSync3(sisyphusTmuxConfPath())) {
+    if (existsSync4(sisyphusTmuxConfPath())) {
       return {
         name: `Tmux keybind (${DEFAULT_KEY})`,
         status: "warn",
@@ -1331,7 +1350,7 @@ function checkTmuxKeybind() {
 }
 function checkGlobalDir() {
   const dir = globalDir();
-  if (existsSync3(dir)) {
+  if (existsSync4(dir)) {
     return { name: "Data directory", status: "ok", detail: dir };
   }
   return { name: "Data directory", status: "warn", detail: `${dir} does not exist (created on first use)` };
@@ -1427,11 +1446,11 @@ function registerGettingStarted(program2) {
       "  mode, it's too small for sisyphus.",
       "",
       "  Good tasks:",
-      '    \u2022 "Implement this feature" @path/to/spec.md',
+      '    \u2022 "Implement this feature" @path/to/requirements.md',
       '    \u2022 "Do a deep dive on all SEO/AEO optimizations and',
       '       systematically apply them across the site"',
       "    \u2022 Large-scale refactors spanning dozens of files",
-      "    \u2022 Full feature builds from a written spec",
+      "    \u2022 Full feature builds from written requirements",
       "",
       "  Too small for sisyphus:",
       '    \u2022 "Add these 3 UI components to the page"',
@@ -1442,9 +1461,9 @@ function registerGettingStarted(program2) {
       "  tasks work great because the orchestrator will plan the approach.",
       "  What matters is SCALE, not specificity.",
       "",
-      "  For best results, write a spec and reference it directly:",
+      "  For best results, write requirements and reference them directly:",
       "",
-      '    sisyphus start "Implement this @path/to/spec.md"',
+      '    sisyphus start "Implement this @path/to/requirements.md"',
       "",
       "  \u2500\u2500\u2500 How It Works \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
       "",
@@ -1481,7 +1500,7 @@ function registerGettingStarted(program2) {
       "",
       "  Start & monitor:",
       '    sisyphus start "task"               Start a session',
-      '    sisyphus start "task @spec.md"      Start referencing a spec',
+      '    sisyphus start "task @requirements.md" Start referencing requirements',
       "    sisyphus status [id]                Show session status",
       "    sisyphus list                       List all sessions",
       "    sisyphus dashboard                  Open TUI dashboard",
@@ -1506,8 +1525,8 @@ function registerGettingStarted(program2) {
 }
 
 // src/cli/commands/init.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3 } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3 } from "fs";
+import { join as join5 } from "path";
 var DEFAULT_CONFIG = {};
 var ORCHESTRATOR_TEMPLATE = `# Custom Orchestrator Prompt
 
@@ -1518,9 +1537,9 @@ var ORCHESTRATOR_TEMPLATE = `# Custom Orchestrator Prompt
 function registerInit(program2) {
   program2.command("init").description("Initialize sisyphus configuration for this project").option("--orchestrator", "Also create a custom orchestrator prompt template").action((opts) => {
     const cwd = process.cwd();
-    const sisDir = join4(cwd, ".sisyphus");
-    const configPath = join4(sisDir, "config.json");
-    if (existsSync4(configPath)) {
+    const sisDir = join5(cwd, ".sisyphus");
+    const configPath = join5(sisDir, "config.json");
+    if (existsSync5(configPath)) {
       console.log(`Already initialized: ${configPath}`);
       return;
     }
@@ -1528,8 +1547,8 @@ function registerInit(program2) {
     writeFileSync3(configPath, JSON.stringify(DEFAULT_CONFIG, null, 2) + "\n", "utf-8");
     console.log(`Created ${configPath}`);
     if (opts.orchestrator) {
-      const orchPath = join4(sisDir, "orchestrator.md");
-      if (!existsSync4(orchPath)) {
+      const orchPath = join5(sisDir, "orchestrator.md");
+      if (!existsSync5(orchPath)) {
         writeFileSync3(orchPath, ORCHESTRATOR_TEMPLATE, "utf-8");
         console.log(`Created ${orchPath}`);
       }
@@ -1580,7 +1599,7 @@ registerInit(program);
 program.addHelpText("after", `
 Examples:
   $ sisyphus start "Implement auth system"     Start a new session
-  $ sisyphus start "Build @spec.md" -n auth    Start with a name and spec reference
+  $ sisyphus start "Build @requirements.md" -n auth    Start with a name and requirements reference
   $ sisyphus status                            Check current sessions
   $ sisyphus dashboard                         Open the TUI
   $ sisyphus doctor                            Verify installation
@@ -1590,7 +1609,7 @@ Run 'sisyphus getting-started' for a complete usage guide.
 var args = process.argv.slice(2);
 var firstArg = args[0];
 var skipWelcome = ["doctor", "getting-started", "help", "--help", "-h", "init", "uninstall", "--version", "-V"];
-if (!existsSync5(globalDir()) && firstArg && !skipWelcome.includes(firstArg)) {
+if (!existsSync6(globalDir()) && firstArg && !skipWelcome.includes(firstArg)) {
   mkdirSync4(globalDir(), { recursive: true });
   console.log("");
   console.log("  Welcome to Sisyphus \u2014 multi-agent orchestration for Claude Code.");