@neriros/ralphy 2.7.9 → 2.8.1

package/dist/cli/index.js

@@ -50549,7 +50549,7 @@ var require_axios = __commonJS((exports, module) => {
 
 // apps/cli/src/index.ts
 import { resolve, join as join17, dirname as dirname4 } from "path";
-import { exists, mkdir as mkdir3 } from "fs/promises";
+import { exists, mkdir as mkdir3, rm } from "fs/promises";
 
 // node_modules/.bun/ink@5.2.1+1f88f629f0141b18/node_modules/ink/build/render.js
 import { Stream } from "stream";
@@ -56117,7 +56117,7 @@ function log(msg) {
 }
 
 // apps/cli/src/cli.ts
-var VALID_MODES = new Set(["task", "list", "status", "init", "agent"]);
+var VALID_MODES = new Set(["task", "list", "status", "init", "agent", "clean"]);
 var VALID_MODELS = new Set(["haiku", "sonnet", "opus"]);
 var HELP_TEXT = [
   "Usage: ralph <command> [options]",
@@ -56128,6 +56128,7 @@ var HELP_TEXT = [
   "  status                  Show detailed change status",
   "  init                    Initialize OpenSpec in current directory",
   "  agent                   Poll Linear for new tasks and run loops concurrently",
+  "  clean                   Remove worktree, branch, openspec change, and task state for --name",
   "",
   "Options:",
   "  --name <name>           Change name (required for most commands)",
@@ -60611,54 +60612,70 @@ function countTaskItems(content) {
   const unchecked = (content.match(/^- \[ \]/gm) ?? []).length;
   return { checked, unchecked };
 }
-function buildRows(statesDir) {
+function buildRows(statesDir, projectRoot) {
   const storage = getStorage();
-  const entries = storage.list(statesDir);
   const rows = [];
-  for (const entry of entries) {
-    const raw = storage.read(join3(statesDir, entry, ".ralph-state.json"));
-    if (raw === null)
-      continue;
-    let state;
-    try {
-      state = JSON.parse(raw);
-    } catch {
-      continue;
+  const seenNames = new Set;
+  const sources = [{ dir: statesDir, label: "main" }];
+  if (projectRoot) {
+    const worktreesRoot = join3(projectRoot, ".ralph", "worktrees");
+    for (const wt of storage.list(worktreesRoot)) {
+      sources.push({
+        dir: join3(worktreesRoot, wt, ".ralph", "tasks"),
+        label: `wt:${wt}`
+      });
     }
-    if (String(state.status ?? "") === "completed")
-      continue;
-    const promptRaw = String(state.prompt ?? "");
-    const firstLine = promptRaw.split(`
+  }
+  for (const { dir, label } of sources) {
+    for (const entry of storage.list(dir)) {
+      if (seenNames.has(entry))
+        continue;
+      const raw = storage.read(join3(dir, entry, ".ralph-state.json"));
+      if (raw === null)
+        continue;
+      let state;
+      try {
+        state = JSON.parse(raw);
+      } catch {
+        continue;
+      }
+      if (String(state.status ?? "") === "completed")
+        continue;
+      const promptRaw = String(state.prompt ?? "");
+      const firstLine = promptRaw.split(`
 `).find((l) => l.trim() !== "") ?? "";
-    let progress = "\u2014";
-    let progressStyled = true;
-    const tasksContent = storage.read(join3(statesDir, entry, "tasks.md"));
-    if (tasksContent !== null) {
-      const { checked, unchecked } = countTaskItems(tasksContent);
-      const total = checked + unchecked;
-      if (total > 0) {
-        progress = `${checked}/${total}`;
-        progressStyled = false;
-      }
-    }
-    rows.push({
-      name: String(state.name ?? entry),
-      phase: String(state.status ?? "active"),
-      status: String(state.status ?? "unknown"),
-      iters: String(state.iteration ?? 0),
-      progress,
-      progressStyled,
-      prompt: firstLine.replace(/^#+\s*/, "").trim().slice(0, 60)
-    });
+      let progress = "\u2014";
+      let progressStyled = true;
+      const tasksContent = storage.read(join3(dir, entry, "tasks.md"));
+      if (tasksContent !== null) {
+        const { checked, unchecked } = countTaskItems(tasksContent);
+        const total = checked + unchecked;
+        if (total > 0) {
+          progress = `${checked}/${total}`;
+          progressStyled = false;
+        }
+      }
+      seenNames.add(entry);
+      rows.push({
+        name: String(state.name ?? entry),
+        phase: String(state.status ?? "active"),
+        status: String(state.status ?? "unknown"),
+        iters: String(state.iteration ?? 0),
+        progress,
+        progressStyled,
+        prompt: firstLine.replace(/^#+\s*/, "").trim().slice(0, 60),
+        source: label
+      });
+    }
   }
   return rows;
 }
-function TaskList({ statesDir }) {
+function TaskList({ statesDir, projectRoot }) {
   const { exit } = use_app_default();
   import_react22.useEffect(() => {
     exit();
   }, [exit]);
-  const rows = buildRows(statesDir);
+  const rows = buildRows(statesDir, projectRoot);
   if (rows.length === 0) {
     return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
       flexDirection: "column",
@@ -60681,9 +60698,10 @@ function TaskList({ statesDir }) {
     phase: Math.max(5, ...rows.map((r) => r.phase.length)),
     status: Math.max(6, ...rows.map((r) => r.status.length)),
     iters: 5,
-    progress: 8
+    progress: 8,
+    source: Math.max(6, ...rows.map((r) => r.source.length))
   };
-  const ruleWidth = cols.name + cols.phase + cols.status + cols.iters + cols.progress + 60 + 10;
+  const ruleWidth = cols.name + cols.phase + cols.status + cols.iters + cols.progress + cols.source + 60 + 12;
   return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
@@ -60717,6 +60735,11 @@ function TaskList({ statesDir }) {
             children: "Progress".padEnd(cols.progress)
           }, undefined, false, undefined, this),
           "  ",
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            bold: true,
+            children: "Source".padEnd(cols.source)
+          }, undefined, false, undefined, this),
+          "  ",
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             bold: true,
             children: "Description"
@@ -60745,6 +60768,11 @@ function TaskList({ statesDir }) {
             children: row.progress.padStart(cols.progress)
           }, undefined, false, undefined, this) : row.progress.padStart(cols.progress),
           "  ",
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            dimColor: true,
+            children: row.source.padEnd(cols.source)
+          }, undefined, false, undefined, this),
+          "  ",
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
             dimColor: true,
             children: row.prompt
@@ -69758,7 +69786,13 @@ async function addLabelToIssue(apiKey, issueId, labelId) {
 import { join as join10 } from "path";
 var AgentStateSchema = exports_external.object({
   processedIssueIds: exports_external.array(exports_external.string()).default([]),
-  lastPollAt: exports_external.string().nullable().default(null)
+  startedIssueIds: exports_external.array(exports_external.string()).default([]),
+  failedIssueIds: exports_external.array(exports_external.string()).default([]),
+  lastPollAt: exports_external.string().nullable().default(null),
+  changeMeta: exports_external.record(exports_external.string(), exports_external.object({
+    issueId: exports_external.string(),
+    identifier: exports_external.string()
+  })).default({})
 });
 function statePath(projectRoot) {
   return join10(projectRoot, ".ralph", "agent-state.json");
@@ -69944,12 +69978,15 @@ class AgentCoordinator {
     }
     const state = this.state;
     const seen = new Set(state.processedIssueIds);
+    const failed = new Set(state.failedIssueIds);
     const queued = new Set(this.queue.map((i) => i.id));
     const active = new Set(this.workers.map((w) => w.issueId));
     let added = 0;
     for (const issue of issues) {
       if (seen.has(issue.id))
         continue;
+      if (failed.has(issue.id))
+        continue;
       if (queued.has(issue.id))
         continue;
       if (active.has(issue.id))
@@ -70040,6 +70077,10 @@ class AgentCoordinator {
         this.state.processedIssueIds.push(issue.id);
         this.deps.saveState(this.state);
       }
+      if (!ok && this.state && !this.state.failedIssueIds.includes(issue.id)) {
+        this.state.failedIssueIds.push(issue.id);
+        this.deps.saveState(this.state);
+      }
       this.notifyExited(issue, changeName, code);
       this.deps.onWorkersChanged();
       this.spawnNext();
@@ -70049,9 +70090,14 @@ class AgentCoordinator {
     const updater = this.deps.updater;
     if (!updater)
       return;
-    if (this.opts.postComments !== false) {
+    const alreadyStarted = this.state?.startedIssueIds.includes(issue.id) ?? false;
+    if (this.opts.postComments !== false && !alreadyStarted) {
       try {
         await updater.postComment(issue, `\uD83E\uDD16 Ralph started working on this issue. Tracking change: \`${changeName}\``);
+        if (this.state && !this.state.startedIssueIds.includes(issue.id)) {
+          this.state.startedIssueIds.push(issue.id);
+          await this.deps.saveState(this.state);
+        }
       } catch (err) {
         this.deps.onLog(`! Linear comment failed for ${issue.identifier}: ${err.message}`, "red");
       }
@@ -70066,7 +70112,9 @@ class AgentCoordinator {
       return;
     const ok = code === 0;
     if (this.opts.postComments !== false) {
-      const body = ok ? `\u2705 Ralph completed work on this issue. Change: \`${changeName}\`` : `\u2717 Ralph exited with code ${code} on this issue. Change: \`${changeName}\``;
+      const body = ok ? `\u2705 Ralph completed work on this issue. Change: \`${changeName}\`` : `\u2717 Ralph exited with code ${code} on this issue. Change: \`${changeName}\`
+
+` + `This issue has been quarantined and will not be auto-resumed on the next poll. ` + `Inspect the worktree at \`.ralph/worktrees/${changeName}\`, fix the underlying ` + `failure (e.g. lint/typecheck), then run \`ralph clean --name ${changeName}\` to ` + `clear the quarantine and let the next poll re-pick the issue.`;
       try {
         await updater.postComment(issue, body);
       } catch (err) {
@@ -70299,7 +70347,10 @@ var bunCmdRunner = {
     const stderr = await new Response(proc.stderr).text();
     const code = await proc.exited;
     if (code !== 0) {
-      const err = new Error(`command \`${cmd[0]}\` failed`);
+      const firstStderrLine = stderr.trim().split(`
+`)[0] ?? "";
+      const summary = firstStderrLine ? `: ${firstStderrLine}` : "";
+      const err = new Error(`\`${cmd.join(" ")}\` exited ${code}${summary}`);
       err.stderr = stderr;
       err.code = code;
       throw err;
@@ -70312,11 +70363,28 @@ function nextId() {
   lineCounter += 1;
   return `${Date.now()}-${lineCounter}`;
 }
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+function fmtElapsed(ms) {
+  const s = Math.floor(ms / 1000);
+  if (s < 60)
+    return `${s}s`;
+  const m = Math.floor(s / 60);
+  const rem = s % 60;
+  if (m < 60)
+    return `${m}m${rem.toString().padStart(2, "0")}s`;
+  const h = Math.floor(m / 60);
+  return `${h}h${(m % 60).toString().padStart(2, "0")}m`;
+}
 function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
   const { exit } = use_app_default();
   const [logs, setLogs] = import_react57.useState([]);
   const [, setTick] = import_react57.useState(0);
+  const [clock, setClock] = import_react57.useState(0);
   const coordRef = import_react57.useRef(null);
+  const workerMetaRef = import_react57.useRef(new Map);
+  const nextPollAtRef = import_react57.useRef(0);
+  const pollIntervalRef = import_react57.useRef(0);
+  const [pollStatus, setPollStatus] = import_react57.useState({ state: "idle", lastFound: null, lastAdded: null, lastAt: null, filterDesc: "" });
   function appendLog(text, color) {
     setLogs((prev) => [...prev, { id: nextId(), text, color }]);
   }
@@ -70329,6 +70397,7 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
       appendLog(`agent mode \u2014 config: ${cfgPath}`, "gray");
       const concurrency = args.concurrency || cfg.concurrency;
       const pollInterval = args.pollInterval || cfg.pollIntervalSeconds;
+      pollIntervalRef.current = pollInterval;
       appendLog(`concurrency=${concurrency} pollInterval=${pollInterval}s`, "gray");
       const apiKey = process.env["LINEAR_API_KEY"];
       if (!apiKey) {
@@ -70402,6 +70471,13 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
           issueByChange.set(changeName, issue);
           if (workerBranch)
             branchByChange.set(changeName, workerBranch);
+          try {
+            const s = await readAgentState(projectRoot);
+            s.changeMeta[changeName] = { issueId: issue.id, identifier: issue.identifier };
+            await writeAgentState(projectRoot, s);
+          } catch (err) {
+            appendLog(`! failed to record agent meta for ${changeName}: ${err.message}`, "yellow");
+          }
           if (cfg.setupScript) {
             await runScript("setup", cfg.setupScript, workerCwd);
           }
@@ -70447,8 +70523,14 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
             stderr: "ignore",
             stdin: "ignore"
           });
+          workerMetaRef.current.set(changeName, {
+            startedAt: Date.now(),
+            statesDir: statesDirByChange.get(changeName) ?? statesDir,
+            iter: 0
+          });
           const wantPr = args.createPr || cfg.createPrOnSuccess;
           const CI_FAILED_EXIT = 70;
+          const PR_FAILED_EXIT = 71;
           const wrapped = proc.exited.then(async (code) => {
             if (cfg.teardownScript) {
               try {
@@ -70462,6 +70544,7 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
               const prIssue = issueByChange.get(changeName);
               if (!branch || !prIssue) {
                 appendLog(`! createPr requested but no worktree branch is tracked for ${changeName} (use --worktree)`, "yellow");
+                effectiveCode = PR_FAILED_EXIT;
               } else {
                 try {
                   const pr = await createPullRequest({ cwd: cwd2, branch, issue: prIssue, base: cfg.prBaseBranch }, bunCmdRunner);
@@ -70521,7 +70604,10 @@ ${stamped}
                     }
                   }
                 } catch (err) {
-                  appendLog(`! PR create failed for ${changeName}: ${err.message}`, "red");
+                  const e = err;
+                  const detail = e.stderr?.trim() || e.message;
+                  appendLog(`! PR create failed for ${changeName}: ${detail}`, "red");
+                  effectiveCode = PR_FAILED_EXIT;
                 }
               }
             }
@@ -70539,6 +70625,7 @@ ${stamped}
             statesDirByChange.delete(changeName);
             branchByChange.delete(changeName);
             issueByChange.delete(changeName);
+            workerMetaRef.current.delete(changeName);
             return effectiveCode;
           });
           return { exited: wrapped, kill: () => proc.kill() };
@@ -70591,15 +70678,25 @@ ${stamped}
       });
       coordRef.current = coord2;
       await coord2.init();
+      const filterDesc = `team=${filter2.team ?? "*"}, assignee=${filter2.assignee ?? "*"}, statuses=${filter2.statuses?.length ? filter2.statuses.join(",") : "open"}${filter2.labels?.length ? `, labels=${filter2.labels.join(",")}` : ""}`;
       const tick = async () => {
         if (cancelled)
           return;
-        const filterDesc = `team=${filter2.team ?? "*"}, assignee=${filter2.assignee ?? "*"}, statuses=${filter2.statuses?.length ? filter2.statuses.join(",") : "open"}${filter2.labels?.length ? `, labels=${filter2.labels.join(",")}` : ""}`;
-        appendLog(`\u2026 polling Linear (${filterDesc})`);
+        setPollStatus((p) => ({ ...p, state: "polling", filterDesc }));
         const { found, added } = await coord2.pollOnce();
-        appendLog(`  found ${found} open, ${added} new (queue=${coord2.queuedCount})`);
         if (cancelled)
           return;
+        if (added > 0) {
+          appendLog(`  ${added} new issue${added === 1 ? "" : "s"} queued (found ${found} open)`);
+        }
+        setPollStatus({
+          state: "idle",
+          lastFound: found,
+          lastAdded: added,
+          lastAt: Date.now(),
+          filterDesc
+        });
+        nextPollAtRef.current = Date.now() + pollInterval * 1000;
         pollTimer = setTimeout(tick, pollInterval * 1000);
       };
       tick();
@@ -70624,7 +70721,34 @@ ${stamped}
       process.off("SIGTERM", onSig);
     };
   }, []);
+  import_react57.useEffect(() => {
+    let cancelled = false;
+    const interval = setInterval(() => {
+      if (cancelled)
+        return;
+      (async () => {
+        for (const [changeName, meta] of workerMetaRef.current) {
+          try {
+            const file = Bun.file(join14(meta.statesDir, changeName, ".ralph-state.json"));
+            if (await file.exists()) {
+              const json = await file.json();
+              meta.iter = json.iteration ?? meta.iter;
+            }
+          } catch {}
+        }
+        if (!cancelled)
+          setClock((c) => c + 1);
+      })();
+    }, 1000);
+    return () => {
+      cancelled = true;
+      clearInterval(interval);
+    };
+  }, []);
   const coord = coordRef.current;
+  const spinnerFrame = SPINNER_FRAMES[clock % SPINNER_FRAMES.length];
+  const now2 = Date.now();
+  const secsToNextPoll = nextPollAtRef.current ? Math.max(0, Math.ceil((nextPollAtRef.current - now2) / 1000)) : null;
   return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
@@ -70644,23 +70768,41 @@ ${stamped}
           /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
             dimColor: true,
             children: [
+              spinnerFrame,
+              " ",
+              pollStatus.state === "polling" ? `polling Linear (${pollStatus.filterDesc})` : pollStatus.lastAt !== null ? `last poll: ${pollStatus.lastFound} open, ${pollStatus.lastAdded} new${secsToNextPoll !== null ? ` \xB7 next in ${secsToNextPoll}s` : ""}` : "starting\u2026"
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              "  ",
               "workers active: ",
               coord?.activeCount ?? 0,
               " \xB7 queued: ",
               coord?.queuedCount ?? 0
             ]
           }, undefined, true, undefined, this),
-          coord?.activeWorkers.map((w) => /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
-            color: "cyan",
-            children: [
-              "  ",
-              "\u25CF ",
-              w.issueIdentifier,
-              " (",
-              w.changeName,
-              ")"
-            ]
-          }, w.changeName, true, undefined, this))
+          coord?.activeWorkers.map((w) => {
+            const meta = workerMetaRef.current.get(w.changeName);
+            const elapsed = meta ? fmtElapsed(now2 - meta.startedAt) : "\u2013";
+            const iter = meta?.iter ?? 0;
+            return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+              color: "cyan",
+              children: [
+                "  ",
+                spinnerFrame,
+                " ",
+                w.issueIdentifier,
+                " (",
+                w.changeName,
+                ") \xB7 iter ",
+                iter,
+                " \xB7 ",
+                elapsed
+              ]
+            }, w.changeName, true, undefined, this);
+          })
         ]
       }, undefined, true, undefined, this)
     ]
@@ -70811,7 +70953,8 @@ function App2({ args, statesDir, tasksDir, projectRoot }) {
   switch (args.mode) {
     case "list":
       return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(TaskList, {
-        statesDir
+        statesDir,
+        projectRoot
       }, undefined, false, undefined, this);
     case "agent":
       return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(AgentMode, {
@@ -70847,6 +70990,10 @@ function App2({ args, statesDir, tasksDir, projectRoot }) {
           children: "Initialized openspec directory"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this);
+    case "clean":
+      return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(ExitAfterRender, {
+        children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {}, undefined, false, undefined, this)
+      }, undefined, false, undefined, this);
     case "task": {
       if (!args.name) {
         return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(ErrorMessage, {
@@ -70930,6 +71077,77 @@ try {
       cwd: process.cwd()
     });
   }
+  if (args.mode === "clean") {
+    if (!args.name) {
+      process.stderr.write(`Error: --name is required for clean mode
+`);
+      process.exit(1);
+    }
+    const worktreeDir = join17(projectRoot, ".ralph", "worktrees", args.name);
+    const changeDir = join17(tasksDir, args.name);
+    const stateDir = join17(statesDir, args.name);
+    const branch = `ralph/${args.name}`;
+    const removed = [];
+    if (await exists(worktreeDir)) {
+      const proc = Bun.spawn({
+        cmd: ["git", "worktree", "remove", "--force", worktreeDir],
+        cwd: projectRoot,
+        stdout: "pipe",
+        stderr: "pipe"
+      });
+      const code = await proc.exited;
+      if (code !== 0) {
+        await rm(worktreeDir, { recursive: true, force: true });
+        await Bun.spawn({
+          cmd: ["git", "worktree", "prune"],
+          cwd: projectRoot,
+          stdout: "ignore",
+          stderr: "ignore"
+        }).exited;
+      }
+      removed.push(`worktree ${worktreeDir}`);
+    }
+    const branchProc = Bun.spawn({
+      cmd: ["git", "branch", "-D", branch],
+      cwd: projectRoot,
+      stdout: "ignore",
+      stderr: "ignore"
+    });
+    if (await branchProc.exited === 0)
+      removed.push(`branch ${branch}`);
+    if (await exists(changeDir)) {
+      await rm(changeDir, { recursive: true, force: true });
+      removed.push(`openspec change ${changeDir}`);
+    }
+    if (await exists(stateDir)) {
+      await rm(stateDir, { recursive: true, force: true });
+      removed.push(`task state ${stateDir}`);
+    }
+    try {
+      const agentState = await readAgentState(projectRoot);
+      const meta = agentState.changeMeta[args.name];
+      if (meta) {
+        agentState.processedIssueIds = agentState.processedIssueIds.filter((id) => id !== meta.issueId);
+        agentState.startedIssueIds = agentState.startedIssueIds.filter((id) => id !== meta.issueId);
+        agentState.failedIssueIds = agentState.failedIssueIds.filter((id) => id !== meta.issueId);
+        delete agentState.changeMeta[args.name];
+        await writeAgentState(projectRoot, agentState);
+        removed.push(`agent-state entry for ${meta.identifier} (${meta.issueId})`);
+      }
+    } catch {}
+    if (removed.length === 0) {
+      process.stdout.write(`Nothing to clean for '${args.name}'
+`);
+    } else {
+      process.stdout.write(`Cleaned '${args.name}':
+`);
+      for (const r of removed)
+        process.stdout.write(`  \u2713 removed ${r}
+`);
+    }
+    await shutdown();
+    process.exit(0);
+  }
   if (args.mode === "task" && args.name) {
     await mkdir3(join17(statesDir, args.name), { recursive: true });
     await mkdir3(join17(tasksDir, args.name), { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neriros/ralphy",
-  "version": "2.7.9",
+  "version": "2.8.1",
   "description": "An iterative AI task execution framework. Orchestrates multi-phase autonomous work using Claude or Codex engines.",
   "keywords": [
     "agent",