@neriros/ralphy 2.16.3 → 2.16.5

package/dist/cli/index.js

@@ -35029,8 +35029,8 @@ import { readFileSync as readFileSync2 } from "fs";
 import { resolve } from "path";
 function getVersion() {
   try {
-    if ("2.16.3")
-      return "2.16.3";
+    if ("2.16.5")
+      return "2.16.5";
   } catch {}
   const dirsToTry = [];
   try {
@@ -60607,57 +60607,9 @@ ${pe.stderr ?? ""}`;
     }
   }
 }
-async function commitResidualChanges(ctx, maxAttempts) {
-  let hookFixAttempt = 0;
-  while (true) {
-    ctx.emit("committing", "git status");
-    let dirty = "";
-    try {
-      const status = await ctx.cmd.run(["git", "status", "--porcelain"], ctx.cwd);
-      dirty = status.stdout.trim();
-    } catch (err) {
-      ctx.log(`! git status failed for ${ctx.changeName}: ${err.message}`, "yellow");
-      break;
-    }
-    if (!dirty)
-      break;
-    try {
-      ctx.emit("committing", "git add -A");
-      await ctx.cmd.run(["git", "add", "-A"], ctx.cwd);
-      ctx.emit("committing", "git commit");
-      await ctx.cmd.run(["git", "commit", "-m", `chore(ralph): residual changes for ${ctx.changeName}`], ctx.cwd);
-      ctx.log(`  committed residual changes for ${ctx.changeName}`, "gray");
-      break;
-    } catch (err) {
-      const e = err;
-      const detail = e.stderr?.trim() || e.message;
-      const combined = `${e.stdout ?? ""}
-${e.stderr ?? ""}`;
-      if (/nothing to commit/i.test(combined) || /empty git commit/i.test(combined))
-        break;
-      if (hookFixAttempt >= maxAttempts) {
-        ctx.log(`! commit rejected for ${ctx.changeName} after ${hookFixAttempt} hook-fix attempts (host pre-commit hook still failing) \u2014 worktree preserved at ${ctx.cwd}`, "red");
-        ctx.log(`    detail: ${detail}`, "red");
-        return { gaveUp: true, hookFixAttempt };
-      }
-      hookFixAttempt += 1;
-      ctx.emit("commit-retry", `${hookFixAttempt}/${maxAttempts}`);
-      ctx.log(`! commit rejected for ${ctx.changeName} \u2014 prepending fix task and re-running loop (attempt ${hookFixAttempt}/${maxAttempts})`, "yellow");
-      ctx.log(`    detail: ${detail}`, "yellow");
-      const retryCode = await runWorkerWithFixTask(ctx, "Fix host pre-commit hook rejection", `Committing residual changes was rejected by the host repo's pre-commit hook. ` + `Fix the underlying problem, then the commit will be retried.
-
-` + combined.trim());
-      if (retryCode !== 0) {
-        ctx.log(`! worker re-run after commit rejection exited code ${retryCode} \u2014 giving up`, "red");
-        return { gaveUp: true, hookFixAttempt };
-      }
-    }
-  }
-  return { gaveUp: false, hookFixAttempt };
-}
-async function createPrWithRetry(ctx, issue, initialHookFixAttempt) {
+async function createPrWithRetry(ctx, issue) {
   const maxAttempts = ctx.cfg.maxCiFixAttempts;
-  let hookFixAttempt = initialHookFixAttempt;
+  let hookFixAttempt = 0;
   let nonFfRebaseAttempted = false;
   let pr = null;
   while (true) {
@@ -60693,12 +60645,16 @@ ${re.stderr ?? ""}`;
           ctx.emit("rebasing", "conflicts detected \u2014 aborting + queueing fix task");
           try {
             await ctx.cmd.run(["git", "rebase", "--abort"], ctx.cwd);
-          } catch {}
+          } catch (err2) {
+            ctx.log(`! git rebase --abort failed (worktree may already be clean): ${err2.message}`, "yellow");
+          }
           let conflictedFiles = "";
           try {
             const r = await ctx.cmd.run(["git", "diff", "--name-only", `HEAD..origin/${ctx.branch}`], ctx.cwd);
             conflictedFiles = r.stdout.trim();
-          } catch {}
+          } catch (err2) {
+            ctx.log(`! could not list conflicted files: ${err2.message}`, "yellow");
+          }
           if (hookFixAttempt >= maxAttempts) {
             ctx.log(`! merge conflict on rebase of ${ctx.branch} after ${hookFixAttempt} attempts \u2014 worktree preserved at ${ctx.cwd}`, "red");
             ctx.log(`    detail: ${reBlob.trim().split(`
@@ -60860,11 +60816,16 @@ async function runPostTask(input, deps) {
         emit,
         respawnWorker
       };
-      const { gaveUp: commitGaveUp, hookFixAttempt } = await commitResidualChanges(ctx, cfg.maxCiFixAttempts);
-      if (commitGaveUp) {
-        effectiveCode = PR_FAILED_EXIT;
-      } else {
-        const { pr, gaveUp: prGaveUp } = await createPrWithRetry(ctx, issue, hookFixAttempt);
+      try {
+        const status = await cmd.run(["git", "status", "--porcelain"], cwd2);
+        if (status.stdout.trim()) {
+          log2(`! ${changeName} has uncommitted changes after worker exit \u2014 the agent should commit everything before finishing. These changes will not be included in the PR.`, "yellow");
+        }
+      } catch (err) {
+        log2(`! git status check failed for ${changeName}: ${err.message}`, "yellow");
+      }
+      {
+        const { pr, gaveUp: prGaveUp } = await createPrWithRetry(ctx, issue);
         if (prGaveUp) {
           effectiveCode = PR_FAILED_EXIT;
         } else if (!pr) {
@@ -60887,7 +60848,9 @@ async function runPostTask(input, deps) {
     emit("teardown", cfg.teardownScript);
     try {
       await runScript("teardown", cfg.teardownScript, cwd2);
-    } catch {}
+    } catch (err) {
+      log2(`! teardown script threw: ${err.message}`, "yellow");
+    }
   }
   if (useWorktree && cwd2 !== projectRoot) {
     emit("cleanup", "checking worktree safety");
@@ -71886,6 +71849,8 @@ function buildTaskPrompt(state, taskDir) {
 
 `;
   prompt += `Run \`bunx openspec validate ${state.name}\` before committing.
+`;
+  prompt += `Commit all changed files yourself before finishing \u2014 stage files individually (e.g. \`git add path/to/file\`), never \`git add -A\` or \`git commit -am\`. Nothing is committed automatically after you exit.
 `;
   return prompt;
 }
@@ -72412,11 +72377,20 @@ var import_react57 = __toESM(require_react(), 1);
 init_cli();
 init_config();
 init_wire();
-var jsx_dev_runtime9 = __toESM(require_jsx_dev_runtime(), 1);
 import { join as join16, dirname as dirname4 } from "path";
 import { pathToFileURL } from "url";
 import { homedir as homedir3 } from "os";
 import { appendFile, mkdir as mkdir4 } from "fs/promises";
+
+// packages/core/src/progress.ts
+function countProgress(content) {
+  const checked = (content.match(/^- \[x\]/gm) ?? []).length;
+  const unchecked = (content.match(/^- \[ \]/gm) ?? []).length;
+  return { checked, unchecked, total: checked + unchecked };
+}
+
+// apps/cli/src/components/AgentMode.tsx
+var jsx_dev_runtime9 = __toESM(require_jsx_dev_runtime(), 1);
 var lineCounter = 0;
 function nextId() {
   lineCounter += 1;
@@ -72443,6 +72417,18 @@ function fmtElapsed(ms) {
 function trunc(s, max2) {
   return s.length > max2 ? s.slice(0, max2 - 1) + "\u2026" : s;
 }
+function calcProgressBar(checked, total, width) {
+  const countStr = `${checked}/${total}`;
+  const inner = width - 2;
+  if (inner < countStr.length + 2)
+    return null;
+  const leftSlot = Math.floor((inner - countStr.length) / 2);
+  const rightSlot = Math.max(0, inner - countStr.length - leftSlot);
+  const filled = total > 0 ? Math.round(checked / total * inner) : 0;
+  const filledLeft = Math.min(filled, leftSlot);
+  const filledRight = Math.max(0, Math.min(filled - leftSlot - countStr.length, rightSlot));
+  return { countStr, filledLeft, leftSlot, filledRight, rightSlot };
+}
 function prLabel(prUrl) {
   const m = prUrl.match(/\/pull\/(\d+)/);
   return m ? `#${m[1]}` : "PR";
@@ -72557,8 +72543,6 @@ function phaseColor(phase) {
       return "cyan";
     case "scaffolding":
       return "magenta";
-    case "committing":
-    case "commit-retry":
     case "pushing":
     case "push-retry":
     case "rebasing":
@@ -72583,8 +72567,6 @@ function workerBorderColor(phase) {
     case "working":
     case "scaffolding":
       return "cyan";
-    case "committing":
-    case "commit-retry":
     case "pushing":
     case "push-retry":
     case "rebasing":
@@ -72691,6 +72673,7 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
             phaseDetail: "",
             phaseStartedAt: Date.now(),
             currentTask: null,
+            taskProgress: null,
             prUrl: null,
             currentCmd: null,
             tail: []
@@ -72802,7 +72785,9 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
               const json = await file.json();
               meta.iter = json.iteration ?? meta.iter;
             }
-          } catch {}
+          } catch (err) {
+            console.error(`Failed to read state file for worker '${changeName}' (may not exist yet):`, err);
+          }
           if (meta.changeDir) {
             try {
               const tasksFile = Bun.file(join16(meta.changeDir, "tasks.md"));
@@ -72810,8 +72795,12 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
                 const text = await tasksFile.text();
                 const match = text.match(/^- \[ \] (.+)$/m);
                 meta.currentTask = match?.[1]?.trim() ?? null;
+                const { checked, total } = countProgress(text);
+                meta.taskProgress = total > 0 ? { checked, total } : null;
               }
-            } catch {}
+            } catch (err) {
+              console.error(`Failed to read tasks.md for worker '${changeName}' (may not exist yet):`, err);
+            }
           }
         }
         if (!cancelled)
@@ -73154,6 +73143,7 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
             const tail2 = meta?.tail ?? [];
             const prUrl = meta?.prUrl ?? null;
             const currentTask = meta?.currentTask ?? null;
+            const taskProgress = meta?.taskProgress ?? null;
             const pBadge = priorityBadge(w.issue.priority);
             const mBadge = modeBadge(w.mode);
             const pColor = phaseColor(phase);
@@ -73357,6 +73347,46 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
                     }, undefined, false, undefined, this)
                   ]
                 }, undefined, true, undefined, this),
+                taskProgress && (() => {
+                  const bar = calcProgressBar(taskProgress.checked, taskProgress.total, termWidth - 4);
+                  if (!bar)
+                    return null;
+                  const { countStr, filledLeft, leftSlot, filledRight, rightSlot } = bar;
+                  return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+                    marginTop: 0,
+                    children: [
+                      /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                        dimColor: true,
+                        children: "["
+                      }, undefined, false, undefined, this),
+                      /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                        color: "green",
+                        children: "\u2588".repeat(filledLeft)
+                      }, undefined, false, undefined, this),
+                      /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                        dimColor: true,
+                        children: "\u2591".repeat(leftSlot - filledLeft)
+                      }, undefined, false, undefined, this),
+                      /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                        color: "white",
+                        bold: true,
+                        children: countStr
+                      }, undefined, false, undefined, this),
+                      /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                        color: "green",
+                        children: "\u2588".repeat(filledRight)
+                      }, undefined, false, undefined, this),
+                      /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                        dimColor: true,
+                        children: "\u2591".repeat(rightSlot - filledRight)
+                      }, undefined, false, undefined, this),
+                      /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                        dimColor: true,
+                        children: "]"
+                      }, undefined, false, undefined, this)
+                    ]
+                  }, undefined, true, undefined, this);
+                })(),
                 currentTask && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
                   gap: 1,
                   marginTop: 0,

package/package.json

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