sisyphi 0.1.18 → 0.1.21

package/dist/daemon.js

@@ -21,7 +21,7 @@ import {
 } from "./chunk-LTAW6OWS.js";
 
 // src/daemon/index.ts
-import { mkdirSync as mkdirSync5, readFileSync as readFileSync9, writeFileSync as writeFileSync6, unlinkSync as unlinkSync3, existsSync as existsSync6 } from "fs";
+import { mkdirSync as mkdirSync5, readFileSync as readFileSync9, writeFileSync as writeFileSync6, unlinkSync as unlinkSync3, existsSync as existsSync7 } from "fs";
 import { execSync as execSync4 } from "child_process";
 import { setTimeout as sleep } from "timers/promises";
 
@@ -46,12 +46,12 @@ function loadConfig(cwd) {
 
 // src/daemon/server.ts
 import { createServer } from "net";
-import { unlinkSync, existsSync as existsSync5, writeFileSync as writeFileSync4, readFileSync as readFileSync7, mkdirSync as mkdirSync4 } from "fs";
+import { unlinkSync, existsSync as existsSync6, writeFileSync as writeFileSync4, readFileSync as readFileSync7, mkdirSync as mkdirSync4 } from "fs";
 import { join as join4 } from "path";
 
 // src/daemon/session-manager.ts
 import { v4 as uuidv4 } from "uuid";
-import { existsSync as existsSync4, readdirSync as readdirSync4, rmSync as rmSync2 } from "fs";
+import { existsSync as existsSync5, readdirSync as readdirSync4, rmSync as rmSync2 } from "fs";
 
 // src/daemon/state.ts
 import { randomUUID } from "crypto";
@@ -95,7 +95,7 @@ function atomicWrite(filePath, data) {
   writeFileSync(tmpPath, data, "utf-8");
   renameSync(tmpPath, filePath);
 }
-function createSession(id, task, cwd) {
+function createSession(id, task, cwd, context) {
   const dir = sessionDir(cwd, id);
   mkdirSync(dir, { recursive: true });
   mkdirSync(contextDir(cwd, id), { recursive: true });
@@ -106,6 +106,7 @@ function createSession(id, task, cwd) {
   const session = {
     id,
     task,
+    ...context ? { context } : {},
     cwd,
     status: "active",
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -203,13 +204,10 @@ async function completeOrchestratorCycle(cwd, sessionId, nextPrompt) {
 }
 
 // src/daemon/orchestrator.ts
-import { existsSync, readdirSync, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync, readdirSync, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
 import { resolve } from "path";
 
 // src/daemon/colors.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { homedir } from "os";
-import { join as join2 } from "path";
 var ORCHESTRATOR_COLOR = "yellow";
 var AGENT_PALETTE = ["blue", "green", "magenta", "cyan", "red", "white"];
 var TMUX_COLOR_MAP = {
@@ -229,56 +227,6 @@ function getNextColor(sessionId) {
 function resetColors(sessionId) {
   sessionColorIndex.delete(sessionId);
 }
-function extractFrontmatterColor(content) {
-  const match = content.match(/^---\n([\s\S]*?)\n---/);
-  if (!match) return null;
-  const colorMatch = match[1].match(/^color:\s*(.+)$/m);
-  return colorMatch ? colorMatch[1].trim() : null;
-}
-function findPluginInstallPath(namespace) {
-  try {
-    const registryPath2 = join2(homedir(), ".claude", "plugins", "installed_plugins.json");
-    const registry = JSON.parse(readFileSync3(registryPath2, "utf-8"));
-    for (const key of Object.keys(registry)) {
-      if (key.startsWith(`${namespace}@`)) {
-        return registry[key].installPath ?? null;
-      }
-    }
-  } catch {
-  }
-  return null;
-}
-function resolveAgentTypeColor(agentType, pluginDir, cwd) {
-  if (!agentType) return null;
-  let namespace;
-  let name;
-  if (agentType.includes(":")) {
-    [namespace, name] = agentType.split(":", 2);
-  } else {
-    name = agentType;
-  }
-  const searchPaths = [];
-  if (namespace) {
-    searchPaths.push(join2(pluginDir, "agents", `${name}.md`));
-    const installPath = findPluginInstallPath(namespace);
-    if (installPath) {
-      searchPaths.push(join2(installPath, "agents", `${name}.md`));
-    }
-  } else {
-    searchPaths.push(join2(cwd, ".claude", "agents", `${name}.md`));
-    searchPaths.push(join2(homedir(), ".claude", "agents", `${name}.md`));
-    searchPaths.push(join2(pluginDir, "agents", `${name}.md`));
-  }
-  for (const path of searchPaths) {
-    try {
-      const content = readFileSync3(path, "utf-8");
-      const color = extractFrontmatterColor(content);
-      if (color) return normalizeTmuxColor(color);
-    } catch {
-    }
-  }
-  return null;
-}
 
 // src/daemon/tmux.ts
 import { execSync } from "child_process";
@@ -296,9 +244,13 @@ function execSafe(cmd) {
     return null;
   }
 }
-function createPane(windowTarget, cwd) {
+function createPane(windowTarget, cwd, position = "right") {
   const cwdFlag = cwd ? ` -c ${shellQuote(cwd)}` : "";
-  const paneId = exec(`tmux split-window -h -t "${windowTarget}"${cwdFlag} -P -F "#{pane_id}"`);
+  const panes = listPanes(windowTarget);
+  const target = position === "left" ? panes[0]?.paneId : panes[panes.length - 1]?.paneId;
+  const targetFlag = target ? ` -t "${target}"` : ` -t "${windowTarget}"`;
+  const beforeFlag = position === "left" ? "b" : "";
+  const paneId = exec(`tmux split-window -h${beforeFlag}${targetFlag}${cwdFlag} -P -F "#{pane_id}"`);
   execSafe(`tmux select-layout -t "${windowTarget}" even-horizontal`);
   return paneId;
 }
@@ -381,10 +333,10 @@ function setOrchestratorPaneId(sessionId, paneId) {
 function loadOrchestratorPrompt(cwd) {
   const projectPath = projectOrchestratorPromptPath(cwd);
   if (existsSync(projectPath)) {
-    return readFileSync4(projectPath, "utf-8");
+    return readFileSync3(projectPath, "utf-8");
   }
   const bundledPath = resolve(import.meta.dirname, "../templates/orchestrator.md");
-  return readFileSync4(bundledPath, "utf-8");
+  return readFileSync3(bundledPath, "utf-8");
 }
 function formatStateForOrchestrator(session) {
   const shortId = session.id.slice(0, 8);
@@ -436,11 +388,15 @@ function formatStateForOrchestrator(session) {
 ${wtLines}`;
   }
   const worktreeHint = existsSync(worktreeConfigPath(session.cwd)) ? "Worktree config active (`.sisyphus/worktree.json`). Use `--worktree` flag with `sisyphus spawn` to isolate agents in their own worktrees. Recommended for feature work, especially with potential file overlap." : "No worktree configuration found. If this session involves parallel work where agents may edit overlapping files, use the `git-management` skill to set up `.sisyphus/worktree.json` and enable worktree isolation.";
+  const contextSection = session.context ? `
+## Background Context
+${session.context}
+` : "";
   return `<state>
 session: ${shortId} (cycle ${cycleNum})
 task: ${session.task}
 status: ${session.status}
-
+${contextSection}
 ## Plan
 ${planRef}
 
@@ -494,8 +450,8 @@ Review the current session and delegate the next cycle of work.`;
   writeFileSync2(userPromptFilePath, userPrompt, "utf-8");
   const pluginPath = resolve(import.meta.dirname, "../templates/orchestrator-plugin");
   const settingsPath = resolve(import.meta.dirname, "../templates/orchestrator-settings.json");
-  const claudeCmd = `claude --dangerously-skip-permissions --agent-name Sisyphus --agent-id orchestrator --team-name sisyphus-${sessionId.slice(0, 8)} --settings "${settingsPath}" --plugin-dir "${pluginPath}" --append-system-prompt "$(cat '${promptFilePath}')" "$(cat '${userPromptFilePath}')"`;
-  const paneId = createPane(windowId, cwd);
+  const claudeCmd = `claude --dangerously-skip-permissions --settings "${settingsPath}" --plugin-dir "${pluginPath}" --append-system-prompt "$(cat '${promptFilePath}')" "$(cat '${userPromptFilePath}')"`;
+  const paneId = createPane(windowId, cwd, "left");
   sessionOrchestratorPane.set(sessionId, paneId);
   registerPane(paneId, sessionId, "orchestrator");
   setPaneTitle(paneId, `Sisyphus`);
@@ -546,13 +502,13 @@ function cleanupSessionMaps(sessionId) {
 }
 
 // src/daemon/agent.ts
-import { readFileSync as readFileSync6, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, readdirSync as readdirSync3, existsSync as existsSync3 } from "fs";
+import { readFileSync as readFileSync6, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, readdirSync as readdirSync3, existsSync as existsSync4 } from "fs";
 import { resolve as resolve2 } from "path";
 
 // src/daemon/worktree.ts
 import { execSync as execSync2 } from "child_process";
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync5, readdirSync as readdirSync2, rmSync } from "fs";
-import { dirname as dirname2, join as join3 } from "path";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync4, readdirSync as readdirSync2, rmSync } from "fs";
+import { dirname as dirname2, join as join2 } from "path";
 var EXEC_ENV2 = {
   ...process.env,
   PATH: `/opt/homebrew/bin:/usr/local/bin:${process.env["PATH"] ?? "/usr/bin:/bin"}`
@@ -572,7 +528,7 @@ function shellQuote2(s) {
 }
 function loadWorktreeConfig(cwd) {
   try {
-    const content = readFileSync5(worktreeConfigPath(cwd), "utf-8");
+    const content = readFileSync4(worktreeConfigPath(cwd), "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
@@ -580,7 +536,7 @@ function loadWorktreeConfig(cwd) {
 }
 function createWorktreeShell(cwd, sessionId, agentId) {
   const branchName = `sisyphus/${sessionId.slice(0, 8)}/${agentId}`;
-  const worktreePath = join3(worktreeBaseDir(cwd), sessionId.slice(0, 8), agentId);
+  const worktreePath = join2(worktreeBaseDir(cwd), sessionId.slice(0, 8), agentId);
   mkdirSync2(dirname2(worktreePath), { recursive: true });
   execSafe2(`git -C ${shellQuote2(cwd)} worktree prune`);
   if (existsSync2(worktreePath)) {
@@ -594,16 +550,16 @@ function createWorktreeShell(cwd, sessionId, agentId) {
 function bootstrapWorktree(cwd, worktreePath, config) {
   if (config.copy) {
     for (const entry of config.copy) {
-      const dest = join3(worktreePath, entry);
+      const dest = join2(worktreePath, entry);
       mkdirSync2(dirname2(dest), { recursive: true });
-      execSafe2(`cp -r ${shellQuote2(join3(cwd, entry))} ${shellQuote2(dest)}`);
+      execSafe2(`cp -r ${shellQuote2(join2(cwd, entry))} ${shellQuote2(dest)}`);
     }
   }
   if (config.clone) {
     for (const entry of config.clone) {
-      const dest = join3(worktreePath, entry);
+      const dest = join2(worktreePath, entry);
       mkdirSync2(dirname2(dest), { recursive: true });
-      const src = shellQuote2(join3(cwd, entry));
+      const src = shellQuote2(join2(cwd, entry));
       const dstQ = shellQuote2(dest);
       if (execSafe2(`cp -Rc ${src} ${dstQ}`) === null) {
         execSafe2(`cp -r ${src} ${dstQ}`);
@@ -612,9 +568,9 @@ function bootstrapWorktree(cwd, worktreePath, config) {
   }
   if (config.symlink) {
     for (const entry of config.symlink) {
-      const dest = join3(worktreePath, entry);
+      const dest = join2(worktreePath, entry);
       mkdirSync2(dirname2(dest), { recursive: true });
-      execSafe2(`ln -s ${shellQuote2(join3(cwd, entry))} ${shellQuote2(dest)}`);
+      execSafe2(`ln -s ${shellQuote2(join2(cwd, entry))} ${shellQuote2(dest)}`);
     }
   }
   if (config.init) {
@@ -697,6 +653,93 @@ function countWorktreeAgents(agents) {
   return agents.filter((a) => a.worktreePath && a.status === "running").length;
 }
 
+// src/daemon/frontmatter.ts
+import { readFileSync as readFileSync5, existsSync as existsSync3 } from "fs";
+import { homedir } from "os";
+import { join as join3 } from "path";
+function detectProvider(model) {
+  if (!model) return "anthropic";
+  if (/^(gpt-|codex-)/.test(model)) return "openai";
+  return "anthropic";
+}
+function parseAgentFrontmatter(content) {
+  const match = content.match(/^---\n([\s\S]*?)\n---/);
+  if (!match) return {};
+  const block = match[1];
+  const fm = {};
+  const str = (key) => {
+    const m = block.match(new RegExp(`^${key}:\\s*(.+)$`, "m"));
+    return m ? m[1].trim() : void 0;
+  };
+  fm.name = str("name");
+  fm.model = str("model");
+  fm.color = str("color");
+  fm.description = str("description");
+  fm.permissionMode = str("permissionMode");
+  const skillsMatch = block.match(/^skills:\s*\n((?:\s+-\s+.+\n?)*)/m);
+  if (skillsMatch) {
+    fm.skills = skillsMatch[1].split("\n").map((line) => line.replace(/^\s+-\s+/, "").trim()).filter(Boolean);
+  }
+  return fm;
+}
+function extractAgentBody(content) {
+  const match = content.match(/^---\n[\s\S]*?\n---\n?([\s\S]*)$/);
+  return match ? match[1].trim() : content.trim();
+}
+function findPluginInstallPath(namespace) {
+  try {
+    const registryPath2 = join3(homedir(), ".claude", "plugins", "installed_plugins.json");
+    const registry = JSON.parse(readFileSync5(registryPath2, "utf-8"));
+    for (const key of Object.keys(registry)) {
+      if (key.startsWith(`${namespace}@`)) {
+        return registry[key].installPath ?? null;
+      }
+    }
+  } catch {
+  }
+  return null;
+}
+function resolveAgentTypePath(agentType, pluginDir, cwd) {
+  if (!agentType) return null;
+  let namespace;
+  let name;
+  if (agentType.includes(":")) {
+    [namespace, name] = agentType.split(":", 2);
+  } else {
+    name = agentType;
+  }
+  const searchPaths = [];
+  if (namespace) {
+    searchPaths.push(join3(pluginDir, "agents", `${name}.md`));
+    const installPath = findPluginInstallPath(namespace);
+    if (installPath) {
+      searchPaths.push(join3(installPath, "agents", `${name}.md`));
+    }
+  } else {
+    searchPaths.push(join3(cwd, ".claude", "agents", `${name}.md`));
+    searchPaths.push(join3(homedir(), ".claude", "agents", `${name}.md`));
+    searchPaths.push(join3(pluginDir, "agents", `${name}.md`));
+  }
+  for (const path of searchPaths) {
+    if (existsSync3(path)) return path;
+  }
+  return null;
+}
+function resolveAgentConfig(agentType, pluginDir, cwd) {
+  const filePath = resolveAgentTypePath(agentType, pluginDir, cwd);
+  if (!filePath) return null;
+  try {
+    const content = readFileSync5(filePath, "utf-8");
+    return {
+      frontmatter: parseAgentFrontmatter(content),
+      body: extractAgentBody(content),
+      filePath
+    };
+  } catch {
+    return null;
+  }
+}
+
 // src/daemon/agent.ts
 var agentCounters = /* @__PURE__ */ new Map();
 function resetAgentCounterFromState(sessionId, agents) {
@@ -736,7 +779,9 @@ async function spawnAgent(opts) {
   agentCounters.set(sessionId, count);
   const agentId = `agent-${String(count).padStart(3, "0")}`;
   const pluginPath = resolve2(import.meta.dirname, "../templates/agent-plugin");
-  const color = resolveAgentTypeColor(agentType, pluginPath, cwd) ?? getNextColor(sessionId);
+  const agentConfig = resolveAgentConfig(agentType, pluginPath, cwd);
+  const provider = detectProvider(agentConfig?.frontmatter.model);
+  const color = (agentConfig?.frontmatter.color ? normalizeTmuxColor(agentConfig.frontmatter.color) : null) ?? getNextColor(sessionId);
   let paneCwd = cwd;
   let worktreePath;
   let branchName;
@@ -760,22 +805,37 @@ async function spawnAgent(opts) {
   const suffixFilePath = `${promptsDir(cwd, sessionId)}/${agentId}-system.md`;
   writeFileSync3(suffixFilePath, suffix, "utf-8");
   const bannerPath = resolve2(import.meta.dirname, "../templates/banner.txt");
-  const bannerCmd = existsSync3(bannerPath) ? `cat '${bannerPath}' &&` : "";
+  const bannerCmd = existsSync4(bannerPath) ? `cat '${bannerPath}' &&` : "";
   const envExports = [
     `export SISYPHUS_SESSION_ID='${sessionId}'`,
     `export SISYPHUS_AGENT_ID='${agentId}'`,
     ...worktreeContext ? [`export SISYPHUS_PORT_OFFSET='${worktreeContext.offset}'`] : []
   ].join(" && ");
-  const agentFlag = agentType && agentType !== "worker" ? ` --agent ${shellQuote3(agentType)}` : "";
-  const agentNameFlag = ` --agent-name ${shellQuote3(paneLabel)}`;
-  const teamFlag = ` --agent-id ${shellQuote3(agentId)} --team-name sisyphus-${sessionId.slice(0, 8)}`;
-  const claudeCmd = `claude --dangerously-skip-permissions --plugin-dir "${pluginPath}"${agentFlag}${agentNameFlag}${teamFlag} --append-system-prompt "$(cat '${suffixFilePath}')" ${shellQuote3(instruction)}`;
   const notifyCmd = `sisyphus notify pane-exited --pane-id ${paneId}`;
-  const fullCmd = `${bannerCmd} ${envExports} && ${claudeCmd}; ${notifyCmd}`;
+  let mainCmd;
+  if (provider === "openai") {
+    const codexPromptPath = `${promptsDir(cwd, sessionId)}/${agentId}-codex-prompt.md`;
+    const parts = [];
+    if (agentConfig?.body) {
+      parts.push(agentConfig.body);
+    }
+    parts.push(suffix);
+    parts.push(`## Task
+
+${instruction}`);
+    writeFileSync3(codexPromptPath, parts.join("\n\n"), "utf-8");
+    const model = agentConfig?.frontmatter.model ?? "codex-mini";
+    mainCmd = `codex -m ${shellQuote3(model)} --dangerously-bypass-approvals-and-sandbox "$(cat '${codexPromptPath}')"`;
+  } else {
+    const agentFlag = agentType && agentType !== "worker" ? ` --agent ${shellQuote3(agentType)}` : "";
+    mainCmd = `claude --dangerously-skip-permissions --plugin-dir "${pluginPath}"${agentFlag} --append-system-prompt "$(cat '${suffixFilePath}')" ${shellQuote3(instruction)}`;
+  }
+  const fullCmd = `${bannerCmd} ${envExports} && ${mainCmd}; ${notifyCmd}`;
   const agent = {
     id: agentId,
     name,
     agentType,
+    provider,
     color,
     instruction,
     status: "running",
@@ -970,9 +1030,9 @@ async function pollSession(sessionId, cwd, windowId) {
 }
 
 // src/daemon/session-manager.ts
-async function startSession(task, cwd, tmuxSession, windowId) {
+async function startSession(task, cwd, tmuxSession, windowId, context) {
   const sessionId = uuidv4();
-  const session = createSession(sessionId, task, cwd);
+  const session = createSession(sessionId, task, cwd, context);
   await updateSessionTmux(cwd, sessionId, tmuxSession, windowId);
   trackSession(sessionId, cwd, tmuxSession);
   await spawnOrchestrator(sessionId, cwd, windowId);
@@ -985,7 +1045,7 @@ var PRUNE_KEEP_DAYS = 7;
 function pruneOldSessions(cwd) {
   try {
     const dir = sessionsDir(cwd);
-    if (!existsSync4(dir)) return;
+    if (!existsSync5(dir)) return;
     const entries = readdirSync4(dir, { withFileTypes: true });
     const candidates = [];
     for (const entry of entries) {
@@ -1052,7 +1112,7 @@ function getSessionStatus(cwd, sessionId) {
 }
 function listSessions(cwd) {
   const dir = sessionsDir(cwd);
-  if (!existsSync4(dir)) return [];
+  if (!existsSync5(dir)) return [];
   const entries = readdirSync4(dir, { withFileTypes: true });
   const sessions = [];
   for (const entry of entries) {
@@ -1223,7 +1283,7 @@ function persistSessionRegistry() {
 }
 function loadSessionRegistry() {
   const p = registryPath();
-  if (!existsSync5(p)) return {};
+  if (!existsSync6(p)) return {};
   try {
     return JSON.parse(readFileSync7(p, "utf-8"));
   } catch {
@@ -1242,7 +1302,7 @@ async function handleRequest(req) {
   try {
     switch (req.type) {
       case "start": {
-        const session = await startSession(req.task, req.cwd, req.tmuxSession, req.tmuxWindow);
+        const session = await startSession(req.task, req.cwd, req.tmuxSession, req.tmuxWindow, req.context);
         registerSessionCwd(session.id, req.cwd);
         sessionTmuxMap.set(session.id, req.tmuxSession);
         sessionWindowMap2.set(session.id, req.tmuxWindow);
@@ -1319,7 +1379,7 @@ async function handleRequest(req) {
         let cwd = sessionCwdMap.get(req.sessionId);
         if (!cwd) {
           const stateFile = `${req.cwd}/.sisyphus/sessions/${req.sessionId}/state.json`;
-          if (existsSync5(stateFile)) {
+          if (existsSync6(stateFile)) {
             cwd = req.cwd;
             registerSessionCwd(req.sessionId, cwd);
           } else {
@@ -1370,7 +1430,7 @@ async function handleRequest(req) {
 function startServer() {
   return new Promise((resolve4, reject) => {
     const sock = socketPath();
-    if (existsSync5(sock)) {
+    if (existsSync6(sock)) {
       unlinkSync(sock);
     }
     server = createServer((conn) => {
@@ -1412,7 +1472,7 @@ function stopServer() {
     }
     server.close(() => {
       const sock = socketPath();
-      if (existsSync5(sock)) {
+      if (existsSync6(sock)) {
         unlinkSync(sock);
       }
       server = null;
@@ -1618,7 +1678,7 @@ async function recoverSessions() {
   let recovered = 0;
   for (const [sessionId, cwd] of entries) {
     const stateFile = statePath(cwd, sessionId);
-    if (!existsSync6(stateFile)) {
+    if (!existsSync7(stateFile)) {
       continue;
     }
     try {