sisyphi 1.0.14 → 1.1.0

package/dist/tui.js

@@ -5,7 +5,7 @@ import {
   exec,
   execSafe,
   loadConfig
-} from "./chunk-MMA43N67.js";
+} from "./chunk-Z32YVDMY.js";
 import {
   buildSessionContext,
   computeActiveTimeMs,
@@ -13,7 +13,7 @@ import {
   rawSend,
   resolveReports,
   statusColor
-} from "./chunk-Q6VQOUN3.js";
+} from "./chunk-M7LZ2ZHD.js";
 import {
   shellQuote
 } from "./chunk-6G226ZK7.js";
@@ -23,8 +23,9 @@ import {
   goalPath,
   logsDir,
   roadmapPath,
-  sessionDir
-} from "./chunk-YGBGKMTF.js";
+  sessionDir,
+  strategyPath
+} from "./chunk-REUQ4B45.js";
 
 // src/tui/terminal.ts
 function emptyKey() {
@@ -311,6 +312,7 @@ function createAppState(cwd2) {
     notification: null,
     notificationTimer: null,
     showLogs: false,
+    showStrategy: false,
     inputText: "",
     inputCursorPos: 0,
     detailScroll,
@@ -318,6 +320,7 @@ function createAppState(cwd2) {
     sessions: [],
     selectedSession: null,
     planContent: "",
+    strategyContent: "",
     goalContent: "",
     logsContent: "",
     logsCycles: [],
@@ -544,6 +547,8 @@ function abbreviateMode(mode) {
   if (!mode) return "";
   if (mode === "implementation") return "impl";
   if (mode === "planning") return "plan";
+  if (mode === "strategy") return "strat";
+  if (mode === "validation") return "valid";
   return mode;
 }
 function ansiBold(text) {
@@ -564,22 +569,10 @@ function ansiColor(text, color, bold = false) {
 function modeColor(mode) {
   if (mode === "planning") return "blue";
   if (mode === "implementation") return "green";
+  if (mode === "strategy") return "yellow";
+  if (mode === "validation") return "magenta";
   return "cyan";
 }
-function mergeStatusDisplay(status) {
-  switch (status) {
-    case "merged":
-      return { icon: "\u2295", label: "merged", color: "green" };
-    case "pending":
-      return { icon: "\u25CC", label: "pending", color: "yellow" };
-    case "no-changes":
-      return { icon: "\u2205", label: "no changes", color: "gray" };
-    case "conflict":
-      return { icon: "\u26A0", label: "conflict", color: "red" };
-    default:
-      return null;
-  }
-}
 function wrapText(text, width) {
   const cleaned = cleanMarkdown(text);
   if (width <= 0) return cleaned.split("\n");
@@ -674,6 +667,7 @@ function buildTree(sessions, selectedSession, expanded, cwd2, polledContextFiles
         cycleNumber: cycle.cycle,
         timestamp: cycle.timestamp,
         completedAt: cycle.completedAt,
+        activeMs: cycle.activeMs,
         agentCount: allCycleAgents.length,
         mode: cycle.mode
       });
@@ -695,8 +689,8 @@ function buildTree(sessions, selectedSession, expanded, cwd2, polledContextFiles
           status: agent.status,
           spawnedAt: agent.spawnedAt,
           completedAt: agent.completedAt,
-          reportCount: agent.reports.length,
-          mergeStatus: agent.mergeStatus
+          activeMs: agent.activeMs,
+          reportCount: agent.reports.length
         });
         if (!agentExpanded || !hasReports) continue;
         for (let ri = 0; ri < agent.reports.length; ri++) {
@@ -1410,6 +1404,30 @@ function handleNavigateKey(input, key, state2, actions) {
     })();
     return;
   }
+  if (input === "o") {
+    if (!cursorNode) {
+      notify(state2, "No node selected");
+      return;
+    }
+    let claudeSessionId;
+    if (cursorNode.type === "agent" || cursorNode.type === "report") {
+      const agent = actions.getAgentForNode(cursorNode);
+      claudeSessionId = agent?.claudeSessionId ?? void 0;
+    } else if (cursorNode.type === "cycle" && session) {
+      const cycle = session.orchestratorCycles.find((c) => c.cycle === cursorNode.cycleNumber);
+      claudeSessionId = cycle?.claudeSessionId;
+    }
+    if (!claudeSessionId) {
+      notify(state2, "No Claude session ID available");
+      return;
+    }
+    try {
+      actions.openClaudeResumePopup(state2.cwd, claudeSessionId);
+    } catch {
+      notify(state2, "Failed to open Claude session");
+    }
+    return;
+  }
   if (input === "g") {
     if (!state2.selectedSessionId) {
       notify(state2, "No session selected");
@@ -1551,6 +1569,29 @@ function handleNavigateKey(input, key, state2, actions) {
     }
     return;
   }
+  if (input === "s") {
+    if (!state2.strategyContent) {
+      notify(state2, "No strategy for this session");
+      return;
+    }
+    state2.showStrategy = !state2.showStrategy;
+    requestRender();
+    return;
+  }
+  if (input === "S") {
+    if (!state2.selectedSessionId) {
+      notify(state2, "No session selected");
+      return;
+    }
+    const sp = strategyPath(state2.cwd, state2.selectedSessionId);
+    const editor = actions.resolveEditor();
+    try {
+      actions.openEditorPopup(state2.cwd, editor, sp);
+    } catch {
+      notify(state2, `Failed to open strategy in ${editor}`);
+    }
+    return;
+  }
   if (input === "t") {
     if (state2.showLogs) {
       if (state2.focusPane === "logs") state2.focusPane = "detail";
@@ -1831,6 +1872,14 @@ function openShellPopup(cwd2, command) {
 function openInFileManager(path) {
   execSync(`open ${shellQuote(path)}`, { stdio: "inherit", env: EXEC_ENV });
 }
+function openClaudeResumePopup(cwd2, claudeSessionId) {
+  const pathEnv = augmentedPath();
+  const cmd = `PATH=${shellQuote(pathEnv)} claude --resume ${shellQuote(claudeSessionId)}`;
+  execSync(
+    `tmux display-popup -E -w 90% -h 80% -d ${shellQuote(cwd2)} ${shellQuote(cmd)}`,
+    { stdio: "inherit", env: EXEC_ENV }
+  );
+}
 function openEditorPopup(cwd2, editor, filePath, size) {
   const { w = "90%", h = "90%" } = size ?? {};
   const editorBin = editor.split(/\s+/)[0].split("/").pop();
@@ -1902,7 +1951,7 @@ function renderNodeContent(node, maxWidth) {
     }
     case "cycle": {
       const isRunning = !node.completedAt;
-      const dur = node.completedAt ? formatDuration(node.timestamp, node.completedAt) : "running";
+      const dur = isRunning ? "running" : formatDuration(node.activeMs);
       const agents = `${node.agentCount} agent${node.agentCount !== 1 ? "s" : ""}`;
       const modeShort = abbreviateMode(node.mode);
       const mode = modeShort ? ` \xB7 ${modeShort}` : "";
@@ -1917,34 +1966,22 @@ function renderNodeContent(node, maxWidth) {
     case "agent": {
       const icon = agentStatusIcon(node.status);
       const color = statusColor(node.status);
-      const dur = formatDuration(node.spawnedAt, node.completedAt);
-      const durClr = durationColor(node.spawnedAt, node.completedAt) || void 0;
+      const dur = formatDuration(node.activeMs);
+      const durClr = durationColor(node.activeMs) || void 0;
       const dim = node.status === "completed";
       const displayName = agentDisplayName({
         name: node.name,
         id: node.agentId,
         agentType: node.agentType
       });
-      let suffix;
-      let suffixColor;
-      if (node.mergeStatus) {
-        const ms = node.mergeStatus === "pending" ? { icon: "\u2387", color: "yellow" } : mergeStatusDisplay(node.mergeStatus);
-        if (ms) {
-          suffix = ms.icon;
-          suffixColor = ms.color;
-        }
-      }
-      const suffixLen = suffix ? 2 : 0;
-      const maxLabel = Math.max(8, maxWidth - dur.length - suffixLen - 4);
+      const maxLabel = Math.max(8, maxWidth - dur.length - 4);
       return {
         icon,
         label: truncate(displayName, maxLabel),
         meta: dur,
         color,
         dim,
-        metaColor: durClr,
-        suffix,
-        suffixColor
+        metaColor: durClr
       };
     }
     case "report": {
@@ -2148,14 +2185,13 @@ function buildPlanLines(content, maxLines, width) {
   }
   return lines;
 }
-function buildSessionLines(session, planContent, goalContent, width, paneAlive) {
+function buildSessionLines(session, planContent, goalContent, width, paneAlive, strategyContent = "", showStrategy = false) {
   const lines = [];
   const contentWidth = width - 4;
   const agents = session.agents;
   const cycles = session.orchestratorCycles;
   const messages = session.messages;
   const isDead = session.status === "active" && !paneAlive;
-  const conflicts = agents.filter((a) => a.mergeStatus === "conflict");
   const goalText = goalContent ? cleanMarkdown(stripFrontmatter(goalContent).trim()) : session.task;
   goalText.split("\n").flatMap((l) => wrapText(l, contentWidth - 2)).forEach((line, i) => {
     lines.push(singleLine(`${i === 0 ? " " : "  "}${line}`, { bold: true }));
@@ -2189,28 +2225,34 @@ function buildSessionLines(session, planContent, goalContent, width, paneAlive)
       seg(" tmux window closed \u2014 [w] reopen  [R] resume", { color: "red" })
     ]);
   }
-  if (conflicts.length > 0) {
-    lines.push(
-      singleLine(
-        `  \u26A0 ${conflicts.length} merge conflict${conflicts.length > 1 ? "s" : ""}`,
-        { color: "red", bold: true }
-      )
-    );
-    lines.push(
-      singleLine(
-        "  resolve in worktree, then [x] restart agent",
-        { color: "red", dim: true }
-      )
-    );
-  }
   lines.push(singleLine(" "));
-  lines.push([seg("  \u258E \u25C8 PLAN", { color: "yellow", bold: true })]);
-  const planLines = buildPlanLines(planContent, 99999, width);
-  if (planLines.length === 0) {
-    lines.push(singleLine("    orchestrator will create one", { dim: true, italic: true }));
+  if (showStrategy && strategyContent) {
+    const stratHint = strategyContent ? "  [s] toggle plan" : "";
+    lines.push([
+      seg("  \u258E \u25C8 STRATEGY", { color: "yellow", bold: true }),
+      seg(stratHint, { dim: true })
+    ]);
+    const stratLines = buildPlanLines(strategyContent, 99999, width);
+    if (stratLines.length === 0) {
+      lines.push(singleLine("    (empty)", { dim: true, italic: true }));
+    } else {
+      for (const pl of stratLines) {
+        lines.push(singleLine(pl.text, { bold: pl.bold, dim: pl.dim, color: pl.color }));
+      }
+    }
   } else {
-    for (const pl of planLines) {
-      lines.push(singleLine(pl.text, { bold: pl.bold, dim: pl.dim, color: pl.color }));
+    const toggleHint = strategyContent ? "  [s] toggle strategy" : "";
+    lines.push([
+      seg("  \u258E \u25C8 PLAN", { color: "yellow", bold: true }),
+      seg(toggleHint, { dim: true })
+    ]);
+    const planLines = buildPlanLines(planContent, 99999, width);
+    if (planLines.length === 0) {
+      lines.push(singleLine("    orchestrator will create one", { dim: true, italic: true }));
+    } else {
+      for (const pl of planLines) {
+        lines.push(singleLine(pl.text, { bold: pl.bold, dim: pl.dim, color: pl.color }));
+      }
     }
   }
   if (session.status === "completed" && session.completionReport) {
@@ -2258,7 +2300,7 @@ function buildSessionLines(session, planContent, goalContent, width, paneAlive)
       const dot = isRunning ? "\u25CF" : "\u25CB";
       const dotColor = isRunning ? "green" : isNewest ? "white" : "gray";
       const rowDim = !isRunning && !isNewest && !isSecond;
-      const duration = isRunning ? "running" : formatDuration(cycle.timestamp, cycle.completedAt);
+      const duration = isRunning ? "running" : formatDuration(cycle.activeMs);
       const n = cycle.agentsSpawned.length;
       const startTime = formatTime(cycle.timestamp);
       const modeLabel = abbreviateMode(cycle.mode);
@@ -2314,7 +2356,7 @@ function buildCycleLines(cycle, agents, width) {
   const lines = [];
   const contentWidth = width - 4;
   const isRunning = !cycle.completedAt;
-  const dur = cycle.completedAt ? formatDuration(cycle.timestamp, cycle.completedAt) : "running";
+  const dur = isRunning ? "running" : formatDuration(cycle.activeMs);
   const cycleAgents = agents.filter((a) => cycle.agentsSpawned.includes(a.id));
   lines.push(singleLine(` Cycle ${cycle.cycle}`, { bold: true }));
   lines.push([
@@ -2327,6 +2369,9 @@ function buildCycleLines(cycle, agents, width) {
     `  ${formatTime(cycle.timestamp)}${cycle.completedAt ? ` \u2192 ${formatTime(cycle.completedAt)}` : ""}`,
     { dim: true }
   ));
+  if (cycle.claudeSessionId) {
+    lines.push(singleLine(`  Session: ${cycle.claudeSessionId}`, { dim: true }));
+  }
   lines.push(singleLine(" "));
   lines.push([seg("  \u258E \u229E AGENTS", { color: "green", bold: true })]);
   if (cycleAgents.length === 0) {
@@ -2337,8 +2382,8 @@ function buildCycleLines(cycle, agents, width) {
       const instrPreview = agent.instruction.split("\n")[0];
       const latestReport = agent.reports.length > 0 ? agent.reports[agent.reports.length - 1] : null;
       const reportSummary = latestReport !== null && agent.status === "completed" ? extractFirstSentence(latestReport.summary, contentWidth - 14) : null;
-      const agentDur = formatDuration(agent.spawnedAt, agent.completedAt);
-      const durClrRaw = durationColor(agent.spawnedAt, agent.completedAt);
+      const agentDur = formatDuration(agent.activeMs);
+      const durClrRaw = durationColor(agent.activeMs);
       const durClr = durClrRaw !== "" ? durClrRaw : void 0;
       const typeClrRaw = agentTypeColor(agent.agentType);
       const typeClr = typeClrRaw !== void 0 ? typeClrRaw : void 0;
@@ -2377,34 +2422,23 @@ function buildCycleLines(cycle, agents, width) {
 function buildAgentLines(agent, reportBlocks, width) {
   const lines = [];
   const contentWidth = width - 4;
-  const dur = formatDuration(agent.spawnedAt, agent.completedAt);
+  const dur = formatDuration(agent.activeMs);
   const icon = agentStatusIcon(agent.status);
   const color = statusColor(agent.status);
   const nameLabel = agentDisplayName(agent);
-  const maxMergeLines = 3;
   lines.push([
     seg(" "),
     seg(icon, { color }),
     seg(` ${agent.id} \xB7 ${nameLabel}`, { bold: true })
   ]);
-  const merge = agent.mergeStatus ? mergeStatusDisplay(agent.mergeStatus) : null;
   lines.push([
     seg("  "),
     seg(agent.status, { color }),
-    seg(` \xB7 ${dur} \xB7 ${agent.agentType}`, { dim: true }),
-    ...merge ? [seg(" \xB7 ", { dim: true }), seg(`${merge.icon} ${merge.label}`, { color: merge.color })] : agent.mergeStatus ? [seg(" \xB7 ", { dim: true }), seg(agent.mergeStatus, { dim: true })] : []
+    seg(` \xB7 ${dur} \xB7 ${agent.agentType}`, { dim: true })
   ]);
   if (agent.killedReason) {
     lines.push(singleLine(`  \u26A0 ${agent.killedReason}`, { color: "red" }));
   }
-  if (agent.mergeStatus === "conflict" && agent.mergeDetails) {
-    for (const ml of wrapText(agent.mergeDetails, contentWidth - 6).slice(0, maxMergeLines)) {
-      lines.push(singleLine(`  \u26A0 ${ml}`, { color: "red" }));
-    }
-  }
-  if (agent.mergeStatus === "conflict") {
-    lines.push(singleLine("  resolve conflicts in worktree dir, then restart", { color: "red", dim: true }));
-  }
   lines.push(singleLine(" "));
   lines.push(singleLine("  \u258E \u25B7 INSTRUCTION", { color: "white", bold: true }));
   for (const wl of wrapText(agent.instruction, contentWidth - 6)) {
@@ -2445,21 +2479,18 @@ function buildAgentLines(agent, reportBlocks, width) {
   if (agent.completedAt) {
     lines.push(singleLine(`    Completed: ${formatTime(agent.completedAt)}`, { dim: true }));
   }
+  if (agent.claudeSessionId) {
+    lines.push(singleLine(`    Session: ${agent.claudeSessionId}`, { dim: true }));
+  }
   if (agent.paneId) {
     lines.push(singleLine(`    Pane: ${agent.paneId}`, { dim: true }));
   }
-  if (agent.worktreePath) {
-    lines.push(singleLine(`    Worktree: ${agent.worktreePath}`, { dim: true }));
-  }
-  if (agent.branchName) {
-    lines.push(singleLine(`    Branch: ${agent.branchName}`, { dim: true }));
-  }
   return lines;
 }
 function buildReportViewLines(agent, reportBlocks, width) {
   const lines = [];
   const contentWidth = width - 6;
-  const dur = formatDuration(agent.spawnedAt, agent.completedAt);
+  const dur = formatDuration(agent.activeMs);
   const icon = agentStatusIcon(agent.status);
   const color = statusColor(agent.status);
   const totalReports = agent.reports.length;
@@ -2552,14 +2583,14 @@ function renderDetailContent(buf, rect, state2, detailCtx) {
   let borderColor = "gray";
   switch (cursorNode.type) {
     case "session": {
-      lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive);
+      lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive, state2.strategyContent, state2.showStrategy);
       break;
     }
     case "cycle": {
       const cycleNode = cursorNode;
       const cycle = session.orchestratorCycles.find((c) => c.cycle === cycleNode.cycleNumber);
       if (!cycle) {
-        lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive);
+        lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive, state2.strategyContent, state2.showStrategy);
       } else {
         lines = buildCycleLines(cycle, session.agents, rect.w);
       }
@@ -2569,7 +2600,7 @@ function renderDetailContent(buf, rect, state2, detailCtx) {
       const agentNode = cursorNode;
       const agent = agents.find((a) => a.id === agentNode.agentId);
       if (!agent) {
-        lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive);
+        lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive, state2.strategyContent, state2.showStrategy);
       } else {
         lines = buildAgentLines(agent, detailReportBlocks, rect.w);
       }
@@ -2579,7 +2610,7 @@ function renderDetailContent(buf, rect, state2, detailCtx) {
       const reportNode = cursorNode;
       const agent = agents.find((a) => a.id === reportNode.agentId);
       if (!agent) {
-        lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive);
+        lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive, state2.strategyContent, state2.showStrategy);
         break;
       }
       const reportIdx = reportNode.reportIndex;
@@ -2671,7 +2702,7 @@ function renderDetailContent(buf, rect, state2, detailCtx) {
       break;
     }
     default: {
-      lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive);
+      lines = buildSessionLines(session, state2.planContent, state2.goalContent, rect.w, state2.paneAlive, state2.strategyContent, state2.showStrategy);
       break;
     }
   }
@@ -2744,7 +2775,7 @@ function renderStatusLine(buf, y, state2, cursorNodeType) {
   } else if (mode !== "navigate") {
     content = D("[enter] send  [esc] cancel");
   } else if (focusPane === "logs" || focusPane === "detail") {
-    content = B("[jk/\u2191\u2193]") + D(" scroll  ") + B("[h/\u2190/tab]") + D(" back  ") + B("[t]") + D("oggle logs  ") + SEP + B("[m]") + D("sg  ") + B("[g]") + D("oal  ") + B("[n]") + D("ew  ") + B("[p]") + D("lan  ") + B("[w]") + D("indow  ") + B("[R]") + D("esume  ") + B("[q]") + D("uit");
+    content = B("[jk/\u2191\u2193]") + D(" scroll  ") + B("[h/\u2190/tab]") + D(" back  ") + B("[t]") + D("oggle logs  ") + SEP + B("[m]") + D("sg  ") + B("[g]") + D("oal  ") + B("[n]") + D("ew  ") + B("[p]") + D("lan  ") + B("[s]") + D("trat  ") + B("[w]") + D("indow  ") + B("[R]") + D("esume  ") + B("[q]") + D("uit");
   } else {
     let contextFilePart = "";
     if (cursorNodeType === "context-file") {
@@ -2821,8 +2852,10 @@ function renderHelpOverlay(buf, rows, cols) {
     helpRow("  R  resume session", "  C  continue session", innerWidth),
     helpRow("  b  rollback cycle", "  x  restart agent", innerWidth),
     helpRow("  r  re-run agent", "  g  edit goal", innerWidth),
-    helpRow("  p  open roadmap", "  w  go to window", innerWidth),
-    helpRow("  c  claude companion", "  q  quit", innerWidth),
+    helpRow("  p  open roadmap", "  s  toggle strategy", innerWidth),
+    helpRow("  S  edit strategy", "  w  go to window", innerWidth),
+    helpRow("  o  resume claude session", "  c  claude companion", innerWidth),
+    helpRow("  q  quit", "", innerWidth),
     " ".padEnd(innerWidth),
     helpRow("  space \u2192 y  copy submenu", "  space \u2192 d  delete session", innerWidth),
     helpRow("  space \u2192 j  jump to pane", "  space \u2192 k  kill", innerWidth),
@@ -2868,6 +2901,7 @@ function startApp(state2, cleanup2) {
     try {
       let selectedSession = null;
       let planContent = "";
+      let strategyContent = "";
       let goalContent = "";
       let logsContent = "";
       let logsCycles = [];
@@ -2911,6 +2945,13 @@ function startApp(state2, cleanup2) {
           }
         } catch {
         }
+        try {
+          const sp = strategyPath(state2.cwd, state2.selectedSessionId);
+          if (existsSync2(sp)) {
+            strategyContent = readFileSync2(sp, "utf-8");
+          }
+        } catch {
+        }
         try {
           const ld = logsDir(state2.cwd, state2.selectedSessionId);
           if (existsSync2(ld)) {
@@ -2942,6 +2983,7 @@ function startApp(state2, cleanup2) {
       state2.sessions = sessions;
       state2.selectedSession = selectedSession;
       state2.planContent = planContent;
+      state2.strategyContent = strategyContent;
       state2.goalContent = goalContent;
       state2.logsContent = logsContent;
       state2.logsCycles = logsCycles;
@@ -3088,6 +3130,7 @@ function startApp(state2, cleanup2) {
     openEditorPopup,
     editInPopup,
     openCompanionPane,
+    openClaudeResumePopup,
     selectWindow,
     selectPane,
     switchToSession,