@neriros/ralphy 2.20.3 → 2.21.0

package/README.md

@@ -245,7 +245,7 @@ Both scripts log failures but never block the loop. **`appendPrompt`** (or `--pr
 
 ### Dashboard and logs
 
-The terminal dashboard shows three always-visible panels: **RALPH AGENT** (engine/model, concurrency, poll interval, active limits, feature flags, Linear filter), **POLL STATUS + WORKERS** (last-poll bucket breakdown — `found N │ todo · resume · conflict · review · mention` (each colored when non-zero) plus `↺ Ns` next-poll countdown, active/queued worker totals), and **TASKS tab bar** (numbered worker tabs — `Tab` / `← →` / `1-9` to switch).
+The terminal dashboard shows three always-visible panels: **RALPH AGENT** (engine/model, concurrency, poll interval, active limits, feature flags, Linear filter), **POLL STATUS + WORKERS** (last-poll bucket breakdown — `todo · res · conf · rev · @` (each colored when non-zero) plus `↺ Ns` next-poll countdown, active/queued worker totals), and **TASKS tab bar** (numbered worker tabs — `Tab` / `← →` / `1-9` to switch).
 
 Each worker card shows: priority badge + identifier + title + mode badge, `↗ LINEAR`, `↗ PR`, `▶ TASK` (first unchecked task from `tasks.md`, refreshed every second), `PHASE` with color + elapsed time, `⏵ CMD` when a shell command is in flight, `LOG` path for `tail -f`, and `─ OUTPUT ─` with live stdout/stderr.
 

package/dist/cli/index.js

@@ -35029,8 +35029,8 @@ import { readFileSync as readFileSync2 } from "fs";
 import { resolve } from "path";
 function getVersion() {
   try {
-    if ("2.20.3")
-      return "2.20.3";
+    if ("2.21.0")
+      return "2.21.0";
   } catch {}
   const dirsToTry = [];
   try {
@@ -35361,6 +35361,7 @@ var init_cli = __esm(() => {
     "getInProgress",
     "getConflicted",
     "getReview",
+    "getAutoMerge",
     "setInProgress",
     "setDone",
     "setError",
@@ -35372,7 +35373,8 @@ var init_cli = __esm(() => {
     "getTodo",
     "getInProgress",
     "getConflicted",
-    "getReview"
+    "getReview",
+    "getAutoMerge"
   ]);
   HELP_TEXT = [
     `ralph v${VERSION}`,
@@ -35415,7 +35417,7 @@ var init_cli = __esm(() => {
     "                          --indicator getTodo:status:Todo",
     "                          --indicator setDone:label:shipped",
     "                          --indicator setDone:status:Done   (combined with above \u2192 multi-marker)",
-    "                          Keys: getTodo, getInProgress, getConflicted, getReview,",
+    "                          Keys: getTodo, getInProgress, getConflicted, getReview, getAutoMerge,",
     "                                setInProgress, setDone, setError, setConflicted,",
     "                                clearConflicted, clearReview",
     "                          Types: label, status",
@@ -59591,9 +59593,14 @@ var MarkerSchema, GetIndicatorSchema, SetIndicatorSchema, IndicatorsSchema, Ralp
   // Open a pull request after a task succeeds.
   "createPrOnSuccess": false,
 
-  // Base branch for pull requests.
+  // Base branch for pull requests. Override per-issue by labelling the
+  // Linear issue with "ralph:branch:<branch-name>".
   "prBaseBranch": "main",
 
+  // Merge strategy used when GitHub auto-merge is enabled (see getAutoMerge
+  // indicator below). One of "squash", "merge", "rebase".
+  "autoMergeStrategy": "squash",
+
   // Let the agent attempt to fix CI failures after a PR is created.
   "fixCiOnFailure": false,
 
@@ -59655,6 +59662,11 @@ var MarkerSchema, GetIndicatorSchema, SetIndicatorSchema, IndicatorsSchema, Ralp
       // and prepend a task that ingests the non-Ralph comments).
       // "getReview": { "filter": [{ "type": "label", "value": "ralph:review" }] },
 
+      // Issues opted in for auto-merge: when an issue matches, Ralph enables
+      // GitHub auto-merge ("gh pr merge --auto --<autoMergeStrategy>") right
+      // after opening the PR so the PR merges as soon as required checks pass.
+      // "getAutoMerge": { "filter": [{ "type": "label", "value": "ralph:auto-merge" }] },
+
       // Applied when Ralph picks up an issue.
       // "setInProgress": { "type": "label", "value": "ralph:in-progress" },
 
@@ -59694,6 +59706,7 @@ var init_config = __esm(() => {
     getInProgress: GetIndicatorSchema.optional(),
     getConflicted: GetIndicatorSchema.optional(),
     getReview: GetIndicatorSchema.optional(),
+    getAutoMerge: GetIndicatorSchema.optional(),
     setInProgress: SetIndicatorSchema.optional(),
     setDone: SetIndicatorSchema.optional(),
     setError: SetIndicatorSchema.optional(),
@@ -59736,6 +59749,7 @@ var init_config = __esm(() => {
     appendPrompt: exports_external.string().optional(),
     createPrOnSuccess: exports_external.boolean().default(false),
     prBaseBranch: exports_external.string().default("main"),
+    autoMergeStrategy: exports_external.enum(["squash", "merge", "rebase"]).default("squash"),
     fixCiOnFailure: exports_external.boolean().default(false),
     maxCiFixAttempts: exports_external.number().int().positive().default(5),
     ciPollIntervalSeconds: exports_external.number().int().positive().default(30),
@@ -60087,6 +60101,23 @@ async function addLabelToIssue(apiKey, issueId, labelId) {
     labelId
   });
 }
+function baseBranchFromLabels(labels) {
+  for (const label of labels) {
+    if (label.toLowerCase().startsWith(BRANCH_LABEL_PREFIX)) {
+      const value = label.slice(BRANCH_LABEL_PREFIX.length).trim();
+      if (value)
+        return value;
+    }
+  }
+  return;
+}
+function issueMatchesGetIndicator(issue, indicator) {
+  if (!indicator || indicator.filter.length === 0)
+    return false;
+  const labels = new Set(issue.labels.map((l) => l.toLowerCase()));
+  const stateName = issue.state.name.toLowerCase();
+  return indicator.filter.some((m) => m.type === "label" ? labels.has(m.value.toLowerCase()) : stateName === m.value.toLowerCase());
+}
 async function removeLabelFromIssue(apiKey, issueId, labelId) {
   const mutation = `mutation RemoveLabel($id: String!, $labelId: String!) {
     issueRemoveLabel(id: $id, labelId: $labelId) { success }
@@ -60096,7 +60127,7 @@ async function removeLabelFromIssue(apiKey, issueId, labelId) {
     labelId
   });
 }
-var LINEAR_API = "https://api.linear.app/graphql";
+var LINEAR_API = "https://api.linear.app/graphql", BRANCH_LABEL_PREFIX = "ralph:branch:";
 
 // apps/cli/src/agent/coordinator.ts
 class AgentCoordinator {
@@ -60842,6 +60873,7 @@ ${pe.stderr ?? ""}`;
   }
 }
 async function createPrWithRetry(ctx, issue) {
+  const base2 = ctx.base;
   const maxAttempts = ctx.cfg.maxCiFixAttempts;
   let hookFixAttempt = 0;
   let nonFfRebaseAttempted = false;
@@ -60849,7 +60881,7 @@ async function createPrWithRetry(ctx, issue) {
   while (true) {
     try {
       ctx.emit("pr-create", "git push + gh pr create");
-      pr = await createPullRequest({ cwd: ctx.cwd, branch: ctx.branch, issue, base: ctx.cfg.prBaseBranch }, ctx.cmd);
+      pr = await createPullRequest({ cwd: ctx.cwd, branch: ctx.branch, issue, base: base2 }, ctx.cmd);
       return { pr, gaveUp: false };
     } catch (err) {
       const e = err;
@@ -60961,10 +60993,10 @@ async function fixConflictsAndCiLoop(ctx, prUrl, wantFixCi, checkPrConflict) {
         ctx.emit("conflict-fix-inner", `attempt ${outerAttempt}/${maxOuterAttempts}`);
         ctx.log(`  merge conflicts on PR (attempt ${outerAttempt}/${maxOuterAttempts}) \u2014 spawning resolution task`, "yellow");
         const conflictCode = await runWorkerWithFixTask(ctx, "Resolve PR merge conflicts", [
-          `The PR ${prUrl} has merge conflicts with \`${ctx.cfg.prBaseBranch}\`.`,
+          `The PR ${prUrl} has merge conflicts with \`${ctx.base}\`.`,
           "",
           "Steps:",
-          `1. \`git fetch origin ${ctx.cfg.prBaseBranch}\` then rebase or merge \`${ctx.cfg.prBaseBranch}\` into the current branch.`,
+          `1. \`git fetch origin ${ctx.base}\` then rebase or merge \`${ctx.base}\` into the current branch.`,
           "2. Resolve conflicts in the files git lists.",
           "3. Stage and commit the resolution."
         ].join(`
@@ -61016,16 +61048,32 @@ async function fixConflictsAndCiLoop(ctx, prUrl, wantFixCi, checkPrConflict) {
   return 0;
 }
 async function runPrPhase(input, deps) {
-  const { changeName, cwd: cwd2, branch, changeDir, stateFilePath, issue, wantFixCi, cfg } = input;
+  const {
+    changeName,
+    cwd: cwd2,
+    branch,
+    changeDir,
+    stateFilePath,
+    issue,
+    wantFixCi,
+    wantAutoMerge,
+    cfg
+  } = input;
   const { cmd, log: log2, emit, respawnWorker, registerPr, checkPrConflict } = deps;
   if (!branch || !issue) {
     log2(`! createPr requested but no worktree branch is tracked for ${changeName} (use --worktree)`, "yellow");
     return PR_FAILED_EXIT;
   }
+  const labelBase = baseBranchFromLabels(issue.labels);
+  const base2 = labelBase ?? cfg.prBaseBranch;
+  if (labelBase && labelBase !== cfg.prBaseBranch) {
+    log2(`  base branch override from label: ${labelBase}`, "gray");
+  }
   const ctx = {
     changeName,
     cwd: cwd2,
     branch,
+    base: base2,
     changeDir,
     stateFilePath,
     cfg,
@@ -61046,11 +61094,21 @@ async function runPrPhase(input, deps) {
   if (prGaveUp)
     return PR_FAILED_EXIT;
   if (!pr) {
-    log2(`  no commits ahead of ${cfg.prBaseBranch} \u2014 skipping PR`, "gray");
+    log2(`  no commits ahead of ${base2} \u2014 skipping PR`, "gray");
     return 0;
   }
   log2(`  ${pr.created ? "opened" : "found existing"} PR: ${pr.url}`, "green");
   registerPr?.(changeName, pr.url);
+  if (wantAutoMerge) {
+    try {
+      await cmd.run(["gh", "pr", "merge", pr.url, "--auto", `--${cfg.autoMergeStrategy}`], cwd2);
+      log2(`  enabled auto-merge (${cfg.autoMergeStrategy}) on ${pr.url}`, "green");
+      emit("auto-merge-enabled", cfg.autoMergeStrategy);
+    } catch (err) {
+      const e = err;
+      log2(`! failed to enable auto-merge on ${pr.url}: ${e.stderr?.trim() || e.message}`, "yellow");
+    }
+  }
   return fixConflictsAndCiLoop(ctx, pr.url, wantFixCi, checkPrConflict);
 }
 async function runWorktreeCleanupPhase(input, deps) {
@@ -61112,6 +61170,7 @@ async function runPostTask(input, deps) {
     useWorktree,
     wantPr,
     wantFixCi,
+    wantAutoMerge,
     cfg,
     respawnWorker
   } = input;
@@ -61120,7 +61179,17 @@ async function runPostTask(input, deps) {
     log2(`  skipping PR phase for ${changeName} (worker exited with code ${effectiveCode})`, "gray");
   }
   if (effectiveCode === 0 && wantPr) {
-    effectiveCode = await runPrPhase({ changeName, cwd: cwd2, branch, changeDir, stateFilePath, issue, wantFixCi, cfg }, {
+    effectiveCode = await runPrPhase({
+      changeName,
+      cwd: cwd2,
+      branch,
+      changeDir,
+      stateFilePath,
+      issue,
+      wantFixCi,
+      wantAutoMerge,
+      cfg
+    }, {
       cmd,
       log: log2,
       emit,
@@ -61646,6 +61715,8 @@ PR: ${prUrl}` : ""
     const tracedCmd = onWorkerCmd ? traceCmdRunner(cmdRunner, (cmd) => onWorkerCmd(changeName, cmd, "start"), (cmd, ms, ok) => onWorkerCmd(changeName, cmd, "end", ms, ok)) : cmdRunner;
     const wantPr = args.createPr || cfg.createPrOnSuccess;
     const wantFixCi = args.fixCi || cfg.fixCiOnFailure;
+    const issueForChange = issueByChange.get(changeName);
+    const wantAutoMerge = issueForChange ? issueMatchesGetIndicator(issueForChange, indicators.getAutoMerge) : false;
     const wrapped = handle.exited.then(async (code) => {
       const workerLayout = projectLayout(cwd2);
       const effectiveCode = await runPostTask({
@@ -61660,9 +61731,11 @@ PR: ${prUrl}` : ""
         useWorktree,
         wantPr,
         wantFixCi,
+        wantAutoMerge,
         cfg: {
           teardownScript: cfg.teardownScript ?? null,
           prBaseBranch: cfg.prBaseBranch,
+          autoMergeStrategy: cfg.autoMergeStrategy,
           maxCiFixAttempts: cfg.maxCiFixAttempts,
           ciPollIntervalSeconds: cfg.ciPollIntervalSeconds,
           cleanupWorktreeOnSuccess: cfg.cleanupWorktreeOnSuccess,
@@ -73223,6 +73296,8 @@ function phaseColor(phase) {
     case "ci-poll":
     case "ci-fix":
       return "blue";
+    case "auto-merge-enabled":
+      return "green";
     case "teardown":
     case "cleanup":
       return "gray";
@@ -73659,18 +73734,6 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
                     }, undefined, false, undefined, this),
                     pollStatus.lastAt !== null && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(jsx_dev_runtime9.Fragment, {
                       children: [
-                        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
-                          dimColor: true,
-                          children: "\u2502"
-                        }, undefined, false, undefined, this),
-                        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
-                          dimColor: true,
-                          children: "found"
-                        }, undefined, false, undefined, this),
-                        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
-                          color: "white",
-                          children: pollStatus.lastFound
-                        }, undefined, false, undefined, this),
                         pollStatus.lastBuckets && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(jsx_dev_runtime9.Fragment, {
                           children: [
                             /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
@@ -73691,7 +73754,7 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
                             }, undefined, false, undefined, this),
                             /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                               dimColor: true,
-                              children: "resume"
+                              children: "res"
                             }, undefined, false, undefined, this),
                             /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                               color: pollStatus.lastBuckets.inProgress > 0 ? "cyan" : "white",
@@ -73703,7 +73766,7 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
                             }, undefined, false, undefined, this),
                             /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                               dimColor: true,
-                              children: "conflict"
+                              children: "conf"
                             }, undefined, false, undefined, this),
                             /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                               color: pollStatus.lastBuckets.conflicted > 0 ? "red" : "white",
@@ -73715,7 +73778,7 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
                             }, undefined, false, undefined, this),
                             /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                               dimColor: true,
-                              children: "review"
+                              children: "rev"
                             }, undefined, false, undefined, this),
                             /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                               color: pollStatus.lastBuckets.review > 0 ? "yellow" : "white",
@@ -73727,7 +73790,7 @@ function AgentMode({ args, projectRoot, statesDir, tasksDir }) {
                             }, undefined, false, undefined, this),
                             /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                               dimColor: true,
-                              children: "mention"
+                              children: "@"
                             }, undefined, false, undefined, this),
                             /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
                               color: pollStatus.lastBuckets.mentions > 0 ? "magenta" : "white",

package/package.json

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