@neriros/ralphy 3.8.10 → 3.8.13

package/README.md

@@ -2,13 +2,57 @@
 
 [![npm version](https://img.shields.io/npm/v/@neriros/ralphy.svg)](https://www.npmjs.com/package/@neriros/ralphy)
 [![npm downloads](https://img.shields.io/npm/dm/@neriros/ralphy.svg)](https://www.npmjs.com/package/@neriros/ralphy)
-[![license](https://img.shields.io/npm/l/@neriros/ralphy.svg)](https://github.com/NeriRos/ralphy/blob/main/LICENSE)
+[![license](https://img.shields.io/npm/l/@neriros/ralphy.svg)](https://github.com/rosneri/ralphy/blob/main/LICENSE)
 [![Bun](https://img.shields.io/badge/runtime-Bun-fbf0df.svg)](https://bun.sh)
 
 An iterative AI task execution framework. Ralphy runs Claude or Codex in a checklist-driven loop with state on disk, cost safeguards, and a long-lived **agent** that polls Linear, opens PRs, and iterates with reviewers.
 
 > 📘 Full reference — Linear indicators, lifecycle, PR/CI flow, CLI flags, MCP — lives in **[GUIDE.md](./GUIDE.md)**.
 
+## Features
+
+**Loop**
+
+- **Checklist-driven** — one unchecked task per iteration; state persists on disk so any run can be resumed.
+- **Engine choice** — Claude (haiku / sonnet / opus) or Codex, swappable per task.
+- **Safeguards** — `--max-iterations`, `--max-cost`, `--max-runtime`, `--max-failures` cap any runaway run.
+- **OpenSpec layout** — `proposal.md` (steering) + `design.md` + `tasks.md` + `specs/` per change.
+
+**Agent mode (Linear-driven)**
+
+- **Linear polling** — picks up Todo tickets, resumes In Progress, re-runs reviewer-flagged Done.
+- **Indicators** — declarative `WORKFLOW.md` map for "which labels/statuses to watch and apply" at each lifecycle event.
+- **Worktrees** — every task runs in its own `git worktree` so concurrent workers can't stomp on each other.
+- **Confirmation gate** — optional human approval step between `tasks` and `implement`; revise via `@ralphy revise: <why>`.
+- **Self-review phase** — once tasks are checked off, an in-process reviewer can append more work for another round.
+- **Tmux session management** — `ralphy agent` re-execs into a managed tmux session so detaching the terminal doesn't kill the loop.
+- **Pre-existing error check** — pauses pickups when the trunk is red so the agent doesn't chase failures it didn't cause.
+
+**PR + CI**
+
+- **Auto PR open** — push branch and `gh pr create` on clean exit; idempotent (surfaces existing PR if open).
+- **Auto-merge opt-in** — `getAutoMerge` triggers `gh pr merge --auto --squash|merge|rebase` right after PR creation.
+- **Stacked PRs** — `--stack-prs` opens against a blocker's head branch when a `blocked_by` Linear relation has exactly one open PR.
+- **CI fix loop** — on red CI, pulls failed logs, appends to steering, re-spawns until green or `maxCiFixAttempts` hit.
+- **Conflict re-fix** — `gh pr view`–driven; on `mergeable: CONFLICTING` enqueues a conflict-resolution task automatically.
+
+**Reviewer interaction**
+
+- **`@ralphy` mentions** — Linear comments _and_ GitHub PR comments trigger a fresh review run with the mention as the prompt.
+- **Code-review iteration** — unresolved review-thread comments queue a digest; Ralph agrees-and-fixes (resolving the thread) or disagrees-and-replies.
+- **Sticky task comment** — `tasks.md` mirrors into a single Linear comment that updates in place; a one-shot "📋 Plan" comment summarises proposal + design when planning completes.
+
+**Observability**
+
+- **Ink dashboard** — engine/model, poll-bucket breakdown, per-worker cards with live phase, command-in-flight, and stdout tail.
+- **Structured JSON event stream** — `--json-output` for CI; `--json-log-file` mirrors the same stream to disk.
+- **Per-worker logs** — `~/.ralph/agent-mode.log` (global) + `.ralph/logs/<change>.log` (per-task) + per-change `LOG.jsonl`.
+
+**Extensibility**
+
+- **MCP server** — exposes `ralph_list_changes` / `get_change` / `create_change` / `append_steering` / `stop` to Claude-side agents (auto-wired on per-project install).
+- **`WORKFLOW.md` template body** — Jinja-style prompt rendered per iteration, so project-specific rules / boundaries / labels flow into every task automatically.
+
 ## How it works
 
 ```mermaid

package/dist/mcp/index.js

@@ -24066,6 +24066,7 @@ var StateSchema = exports_external.object({
   model: exports_external.string().default("opus"),
   manualTest: exports_external.boolean().default(false),
   createPr: exports_external.boolean().default(false),
+  prDraft: exports_external.boolean().default(false),
   validateOnComplete: exports_external.boolean().default(false),
   usage: UsageSchema.default({}),
   history: exports_external.array(HistoryEntrySchema).default([]),
@@ -24183,6 +24184,7 @@ function buildInitialState(options) {
     model: options.model ?? "opus",
     manualTest: options.manualTest ?? false,
     createPr: options.createPr ?? false,
+    prDraft: options.prDraft ?? false,
     createdAt: now,
     lastModified: now,
     metadata: { branch }
@@ -25120,8 +25122,6 @@ class OpenSpecChangeStore {
       } catch {}
     }
     const changesDir = join4("openspec", "changes");
-    if (!await Bun.file(changesDir).exists())
-      return [];
     try {
       const entries = await readdir(changesDir, { withFileTypes: true });
       return entries.filter((entry) => entry.isDirectory() && entry.name !== "archive").map((entry) => entry.name);

package/dist/shell/index.js

@@ -18928,8 +18928,8 @@ import { readFileSync } from "fs";
 import { resolve } from "path";
 function getVersion() {
   try {
-    if ("3.8.10")
-      return "3.8.10";
+    if ("3.8.13")
+      return "3.8.13";
   } catch {}
   const dirsToTry = [];
   try {
@@ -19302,6 +19302,7 @@ var init_posthog = __esm(() => {
     "agent_conflict_promoted",
     "agent_conflict_detected",
     "agent_ci_failed_detected",
+    "agent_pr_tracker_bailed",
     "agent_prepare_failed",
     "agent_worker_spawned",
     "agent_worker_exited",
@@ -59875,8 +59876,6 @@ class OpenSpecChangeStore {
       } catch {}
     }
     const changesDir = join7("openspec", "changes");
-    if (!await Bun.file(changesDir).exists())
-      return [];
     try {
       const entries = await readdir(changesDir, { withFileTypes: true });
       return entries.filter((entry) => entry.isDirectory() && entry.name !== "archive").map((entry) => entry.name);
@@ -64364,6 +64363,7 @@ var init_types2 = __esm(() => {
     model: exports_external.string().default("opus"),
     manualTest: exports_external.boolean().default(false),
     createPr: exports_external.boolean().default(false),
+    prDraft: exports_external.boolean().default(false),
     validateOnComplete: exports_external.boolean().default(false),
     usage: UsageSchema.default({}),
     history: exports_external.array(HistoryEntrySchema).default([]),
@@ -64503,6 +64503,7 @@ function buildInitialState(options) {
     model: options.model ?? "opus",
     manualTest: options.manualTest ?? false,
     createPr: options.createPr ?? false,
+    prDraft: options.prDraft ?? false,
     createdAt: now2,
     lastModified: now2,
     metadata: { branch }
@@ -71298,7 +71299,8 @@ When all tasks are complete and all files are committed, push your branch and op
 `;
     prompt += `  git push -u origin HEAD
 `;
-    prompt += `  gh pr create --title "${state.name}" --body "Summary of changes for ${state.name}"
+    const draftFlag = state.prDraft ? " --draft" : "";
+    prompt += `  gh pr create${draftFlag} --title "${state.name}" --body "Summary of changes for ${state.name}"
 `;
     prompt += `Use the change name as the PR title and write a concise summary of the implementation in the body.
 `;
@@ -93558,6 +93560,7 @@ var init_schema2 = __esm(() => {
     teardownScript: exports_external2.string().optional(),
     appendPrompt: exports_external2.string().optional(),
     createPrOnSuccess: exports_external2.boolean().default(false),
+    prDraft: exports_external2.boolean().default(false),
     prBaseBranch: exports_external2.string().default("main"),
     stackPrsOnDependencies: exports_external2.boolean().default(false),
     autoMergeStrategy: exports_external2.enum(["squash", "merge", "rebase"]).default("squash"),
@@ -93645,6 +93648,15 @@ var init_schema2 = __esm(() => {
       label: "ralph:pre-existing-error",
       outputCharLimit: 4000
     }),
+    prTracker: exports_external2.object({
+      enabled: exports_external2.boolean().default(true),
+      maxRecoveryAttempts: exports_external2.number().int().positive().default(3),
+      advanceMergedToDone: exports_external2.boolean().default(false)
+    }).strict().default({
+      enabled: true,
+      maxRecoveryAttempts: 3,
+      advanceMergedToDone: false
+    }),
     openspec: exports_external2.object({
       reviewPhase: exports_external2.object({
         enabled: exports_external2.boolean().default(false),
@@ -94692,6 +94704,12 @@ async function parseAgentArgs(argv) {
       case "--no-tmux":
         result2.noTmux = true;
         break;
+      case "--no-pr-tracker":
+        result2.prTrackerEnabled = false;
+        break;
+      case "--pr-tracker":
+        result2.prTrackerEnabled = true;
+        break;
       default:
         if (VALID_MODES2.has(arg)) {
           result2.mode = arg;
@@ -94701,6 +94719,12 @@ async function parseAgentArgs(argv) {
         break;
     }
   }
+  if (result2.fixCi && !result2.createPr) {
+    throw new Error("--fix-ci requires --create-pr");
+  }
+  if (result2.stackPrs && !result2.createPr) {
+    throw new Error("--stack-prs requires --create-pr");
+  }
   return result2;
 }
 var VALID_MODES2, INDICATOR_KEYS, GET_KEYS, HELP_TEXT2;
@@ -94769,6 +94793,7 @@ var init_cli2 = __esm(() => {
     "  --code-review           Watch open tracked PRs for unresolved review comments",
     "  --max-tickets <n>       Stop picking up new issues after N have been started (0 = unlimited)",
     "  --no-tmux               Disable tmux session management; run agent in the foreground directly",
+    "  --no-pr-tracker         Disable RLF-173 pr-tracker bail / recovery counter for this run",
     "  --json-output           Emit JSONL to stdout instead of the Ink dashboard (for scripting/CI)",
     "                          (auto-enabled when stdin is not a TTY, e.g. pipes / nohup / CI)",
     "  --json-log-file <path>  Mirror JSONL events to a file (works alongside TUI or --json-output)",
@@ -96399,9 +96424,18 @@ class AgentCoordinator {
         counts.conflicted += 1;
       else if (pr.status === "ci_failed")
         counts.ciFailed += 1;
+      if (pr.status === "mergeable" && this.opts.prTracker) {
+        try {
+          await this.opts.prTracker.clear(issue2.identifier);
+        } catch (err) {
+          this.deps.onLog(`! pr-tracker clear failed for ${issue2.identifier}: ${err.message}`, "yellow");
+        }
+      }
       if (pr.status === "conflicted") {
         if (this.conflictNotified.has(issue2.id))
           continue;
+        if (await this.prTrackerBail(issue2, pr.url, "conflicting"))
+          continue;
         emitCapture(this.bus, "agent_conflict_detected", { issue_identifier: issue2.identifier });
         this.conflictNotified.add(issue2.id);
         this.deps.onLog(`  ${issue2.identifier}: PR ${pr.url} conflicting \u2014 queued (conflict-fix)`, "yellow");
@@ -96422,6 +96456,8 @@ class AgentCoordinator {
       if (pr.status === "ci_failed") {
         if (this.ciFailedNotified.has(issue2.id))
           continue;
+        if (await this.prTrackerBail(issue2, pr.url, "ci_failed"))
+          continue;
         emitCapture(this.bus, "agent_ci_failed_detected", { issue_identifier: issue2.identifier });
         this.ciFailedNotified.add(issue2.id);
         this.deps.onLog(`  ${issue2.identifier}: PR ${pr.url} CI failing \u2014 queued (ci-fix)`, "yellow");
@@ -96441,6 +96477,44 @@ class AgentCoordinator {
     }
     return counts;
   }
+  async prTrackerBail(issue2, prUrl, reason) {
+    const tracker = this.opts.prTracker;
+    if (!tracker)
+      return false;
+    let decision;
+    try {
+      decision = await tracker.recordFailure(issue2.identifier, reason);
+    } catch (err) {
+      this.deps.onLog(`! pr-tracker record failed for ${issue2.identifier}: ${err.message}`, "yellow");
+      return false;
+    }
+    if (decision.kind === "demote")
+      return false;
+    if (decision.firstBail) {
+      this.deps.onLog(`  ${issue2.identifier}: pr-tracker bailing after ${decision.attempts} recovery attempts (${reason}) \u2014 applying setError`, "red");
+      emitCapture(this.bus, "agent_pr_tracker_bailed", {
+        issue_identifier: issue2.identifier,
+        reason,
+        attempts: decision.attempts
+      });
+      if (this.opts.setError) {
+        try {
+          await this.deps.applyIndicator(issue2, this.opts.setError);
+        } catch (err) {
+          this.deps.onLog(`! Linear setError failed for ${issue2.identifier}: ${err.message}`, "yellow");
+        }
+      }
+      if (this.opts.postComments !== false) {
+        const human = reason === "conflicting" ? "merge conflicts" : "failing CI";
+        try {
+          await this.deps.postComment(issue2, `\u274C Ralph gave up auto-recovering this PR (${prUrl}) after ${decision.attempts} attempts \u2014 last failure: ${human}. The \`ralph:error\` label has been applied; clear it (or merge the PR) once a human has looked at it.`);
+        } catch (err) {
+          this.deps.onLog(`! Linear bail comment failed for ${issue2.identifier}: ${err.message}`, "yellow");
+        }
+      }
+    }
+    return true;
+  }
   spawnNext() {
     if (this.stopped)
       return;
@@ -98204,17 +98278,20 @@ function createPrepareHelpers(input) {
       `The PR for this change has merge conflicts with \`${cfg.prBaseBranch}\`.`,
       "",
       "Steps:",
-      `1. \`git fetch origin ${cfg.prBaseBranch}\` then rebase or merge \`${cfg.prBaseBranch}\` into the current branch.`,
+      `1. \`git fetch origin ${cfg.prBaseBranch}\` then merge \`${cfg.prBaseBranch}\` into the current branch (\`git merge origin/${cfg.prBaseBranch}\`). Do NOT rebase.`,
       "2. Resolve conflicts in the files git lists.",
-      "3. Stage and commit the resolution.",
-      `4. Push the resolved branch with \`git push --force-with-lease origin ${branchRef}\`.`,
+      "3. Stage and commit the resolution as a new merge commit. Do NOT amend existing commits.",
+      `4. Push the resolved branch with \`git push origin ${branchRef}\`. Never force-push.`,
       `   The post-task harness will NOT push for you in conflict-fix mode \u2014 you own the push.`,
       `   If the push is rejected, inspect the rejection output and react inline before retrying:`,
-      `     - **stale lease / non-fast-forward** (\`stale info\`, someone else pushed to \`${branchRef}\`):`,
-      `       \`git fetch origin ${branchRef}\` then rebase/merge their changes in, re-resolve any new`,
-      `       conflicts, and retry the push.`,
+      `     - **non-fast-forward** (someone else pushed to \`${branchRef}\`):`,
+      `       \`git fetch origin ${branchRef}\` then \`git merge origin/${branchRef}\` to bring their`,
+      `       changes in as a new merge commit, re-resolve any new conflicts, and retry the push.`,
+      `       Do NOT rebase and do NOT \`--force\` / \`--force-with-lease\` \u2014 work on the remote must`,
+      `       never be overwritten.`,
       `     - **pre-push hook failure** (lint, typecheck, tests): fix the underlying problem locally,`,
-      `       \`git add\` + \`git commit --amend\` (or a new fixup commit), then retry the push.`,
+      `       \`git add\` + \`git commit\` as a new commit (NEVER \`--amend\` an existing commit),`,
+      `       then retry the push.`,
       `     - **ref-update policy rejection** (branch protection, required reviews): log the rejection`,
       `       message and stop \u2014 this requires human intervention; do not force past it.`,
       `   Only stop after exhausting the in-context fix. The push must succeed before this iteration ends.`,
@@ -98247,7 +98324,8 @@ PR: ${prUrl}` : ""
       `2. Fix the underlying failures in the worktree (tests, lint, typecheck, build).`,
       `3. Stage and commit the fixes.`,
       `4. Push with \`git push origin ${ciBranchRef}\`. If the push is rejected as`,
-      `   non-fast-forward, \`git fetch origin ${ciBranchRef}\` then rebase before retrying.`,
+      `   non-fast-forward, \`git fetch origin ${ciBranchRef}\` then \`git merge origin/${ciBranchRef}\``,
+      `   before retrying. Do NOT rebase, do NOT amend, and never force-push.`,
       `5. Wait for CI to re-run; if checks are still red, repeat from step 1.`,
       `   Stop only when CI is green or when the failure is clearly outside the change's scope`,
       `   (flaky infra, external service down) \u2014 in that case, log the rejection and exit.`,
@@ -99171,7 +99249,10 @@ async function createPullRequest(input, runner) {
     return { url: existingUrl, created: false };
   const title = defaultTitle(input.issue);
   const body = defaultBody(input.issue, input.branch);
-  const created = await runner.run(["gh", "pr", "create", "--base", base2, "--title", title, "--body", body], input.cwd);
+  const createArgs = ["gh", "pr", "create", "--base", base2, "--title", title, "--body", body];
+  if (input.draft)
+    createArgs.push("--draft");
+  const created = await runner.run(createArgs, input.cwd);
   const url2 = created.stdout.trim().split(`
 `).pop() ?? "";
   return { url: url2, created: true };
@@ -99326,9 +99407,37 @@ async function runWorkerWithFixTask(ctx, heading, body) {
     return 1;
   }
   await reactivateState(ctx.stateFilePath, ctx.log, ctx.changeName);
-  return ctx.respawnWorker();
+  let preHead = "";
+  try {
+    const r = await ctx.cmd.run(["git", "rev-parse", "HEAD"], ctx.cwd);
+    preHead = r.stdout.trim();
+  } catch (err) {
+    ctx.log(`! could not snapshot HEAD before fix task: ${err.message}`, "yellow");
+  }
+  const code = await ctx.respawnWorker();
+  if (preHead) {
+    try {
+      const r = await ctx.cmd.run(["git", "rev-parse", "HEAD"], ctx.cwd);
+      const postHead = r.stdout.trim();
+      if (postHead !== preHead) {
+        let isAncestor = true;
+        try {
+          await ctx.cmd.run(["git", "merge-base", "--is-ancestor", preHead, postHead], ctx.cwd);
+        } catch {
+          isAncestor = false;
+        }
+        if (!isAncestor) {
+          ctx.log(`! fix worker for "${heading}" rewrote history \u2014 pre=${preHead.slice(0, 8)} ` + `is not an ancestor of post=${postHead.slice(0, 8)}. Aborting and preserving ` + `worktree at ${ctx.cwd}.`, "red");
+          return 1;
+        }
+      }
+    } catch (err) {
+      ctx.log(`! could not verify append-only history after fix task: ${err.message}`, "yellow");
+    }
+  }
+  return code;
 }
-async function pushWithLeases(ctx) {
+async function pushBranchSafely(ctx) {
   try {
     ctx.emit("pushing", "after conflict resolution");
     await ctx.cmd.run(["git", "push", "origin", ctx.branch], ctx.cwd);
@@ -99342,10 +99451,12 @@ ${pe.stderr ?? ""}`;
       return false;
     }
     try {
-      await ctx.cmd.run(["git", "push", "--force-with-lease", "origin", ctx.branch], ctx.cwd);
+      await ctx.cmd.run(["git", "fetch", "origin", ctx.branch], ctx.cwd);
+      await ctx.cmd.run(["git", "merge", "--no-edit", `origin/${ctx.branch}`], ctx.cwd);
+      await ctx.cmd.run(["git", "push", "origin", ctx.branch], ctx.cwd);
       return true;
-    } catch (forceErr) {
-      ctx.log(`! force-push after conflict fix failed: ${forceErr.message}`, "red");
+    } catch (retryErr) {
+      ctx.log(`! push after merging origin/${ctx.branch} failed: ${retryErr.message}`, "red");
       return false;
     }
   }
@@ -99364,7 +99475,8 @@ async function createPrWithRetry(ctx, issue2) {
         branch: ctx.branch,
         issue: issue2,
         base: base2,
-        metaOnlyFiles: ctx.cfg.metaOnlyFiles ?? []
+        metaOnlyFiles: ctx.cfg.metaOnlyFiles ?? [],
+        draft: ctx.cfg.prDraft ?? false
       }, ctx.cmd);
       return { pr: pr2, gaveUp: false };
     } catch (err) {
@@ -99377,26 +99489,26 @@ ${e.stderr ?? ""}`;
       const pushRejected = isHookReject || /failed to push some refs/i.test(combined);
       if (isNonFastForward && !nonFfRebaseAttempted) {
         nonFfRebaseAttempted = true;
-        ctx.emit("rebasing", `git pull --rebase origin ${ctx.branch}`);
-        ctx.log(`  non-fast-forward push for ${ctx.changeName} \u2014 rebasing onto origin/${ctx.branch}`, "yellow");
+        ctx.emit("merging", `git pull --no-rebase origin ${ctx.branch}`);
+        ctx.log(`  non-fast-forward push for ${ctx.changeName} \u2014 merging origin/${ctx.branch} into the branch`, "yellow");
         try {
           await ctx.cmd.run(["git", "fetch", "origin", ctx.branch], ctx.cwd);
-          await ctx.cmd.run(["git", "pull", "--rebase", "origin", ctx.branch], ctx.cwd);
+          await ctx.cmd.run(["git", "pull", "--no-rebase", "--autostash", "--no-edit", "origin", ctx.branch], ctx.cwd);
           continue;
-        } catch (rebaseErr) {
-          const re = rebaseErr;
+        } catch (mergeErr) {
+          const re = mergeErr;
           const reBlob = `${re.stdout ?? ""}
 ${re.stderr ?? ""}`;
-          const isConflict = /CONFLICT|Merge conflict|could not apply|both modified/i.test(reBlob);
+          const isConflict = /CONFLICT|Merge conflict|both modified/i.test(reBlob);
           if (!isConflict) {
-            ctx.log(`! rebase failed for ${ctx.changeName}: ${rebaseErr.message} \u2014 giving up`, "red");
+            ctx.log(`! merge failed for ${ctx.changeName}: ${mergeErr.message} \u2014 giving up`, "red");
             return { pr: null, gaveUp: true };
           }
-          ctx.emit("rebasing", "conflicts detected \u2014 aborting + queueing fix task");
+          ctx.emit("merging", "conflicts detected \u2014 aborting + queueing fix task");
           try {
-            await ctx.cmd.run(["git", "rebase", "--abort"], ctx.cwd);
+            await ctx.cmd.run(["git", "merge", "--abort"], ctx.cwd);
           } catch (err2) {
-            ctx.log(`! git rebase --abort failed (worktree may already be clean): ${err2.message}`, "yellow");
+            ctx.log(`! git merge --abort failed (worktree may already be clean): ${err2.message}`, "yellow");
           }
           let conflictedFiles = "";
           try {
@@ -99406,23 +99518,23 @@ ${re.stderr ?? ""}`;
             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(`! merge conflict merging origin/${ctx.branch} after ${hookFixAttempt} attempts \u2014 worktree preserved at ${ctx.cwd}`, "red");
             ctx.log(`    detail: ${reBlob.trim().split(`
 `).slice(0, 8).join(`
 `)}`, "red");
             return { pr: null, gaveUp: true };
           }
           hookFixAttempt += 1;
-          ctx.emit("rebasing", `conflict-fix ${hookFixAttempt}/${maxAttempts}`);
-          ctx.log(`! merge conflict rebasing ${ctx.branch} \u2014 prepending fix task and re-running loop (attempt ${hookFixAttempt}/${maxAttempts})`, "yellow");
-          const retryCode2 = await runWorkerWithFixTask(ctx, "Resolve merge conflict with origin/" + ctx.branch, `Push to origin/${ctx.branch} was rejected as non-fast-forward, and rebasing ` + `onto origin/${ctx.branch} produced merge conflicts.
+          ctx.emit("merging", `conflict-fix ${hookFixAttempt}/${maxAttempts}`);
+          ctx.log(`! merge conflict merging origin/${ctx.branch} \u2014 prepending fix task and re-running loop (attempt ${hookFixAttempt}/${maxAttempts})`, "yellow");
+          const retryCode2 = await runWorkerWithFixTask(ctx, "Resolve merge conflict with origin/" + ctx.branch, `Push to origin/${ctx.branch} was rejected as non-fast-forward, and merging ` + `origin/${ctx.branch} into the branch produced merge conflicts.
 
-` + `Run \`git fetch origin ${ctx.branch}\` and \`git rebase origin/${ctx.branch}\`, ` + `resolve every conflict, \`git add\` the resolved files, and finish with ` + `\`git rebase --continue\`. The push will be retried after this loop ` + `iteration finishes.
+` + `Run \`git fetch origin ${ctx.branch}\` and \`git merge origin/${ctx.branch}\`, ` + `resolve every conflict, \`git add\` the resolved files, and finish with ` + `\`git commit\` (or \`git merge --continue\`). Do NOT rebase and do NOT ` + `amend existing commits \u2014 only add new commits. The push will be retried ` + `after this loop iteration finishes.
 
 ` + (conflictedFiles ? `Files that differ between your branch and origin/${ctx.branch}:
 ${conflictedFiles}
 
-` : "") + `Rebase output:
+` : "") + `Merge output:
 ${reBlob.trim()}`);
           if (retryCode2 !== 0) {
             ctx.log(`! worker re-run after merge conflict exited code ${retryCode2} \u2014 giving up`, "red");
@@ -99447,6 +99559,8 @@ ${reBlob.trim()}`);
       ctx.log(`    detail: ${detail}`, "yellow");
       const retryCode = await runWorkerWithFixTask(ctx, "Fix push rejection", `Push to origin/${ctx.branch} was rejected. Fix the underlying problem ` + `(e.g. failing pre-push hook checks), then the push will be retried.
 
+` + `Do NOT delete, revert, amend, rebase, reorder, or squash existing commits. ` + `Only add new commits or edit working-tree files. If a pre-push check (test, ` + `lint, typecheck, etc.) fails on the change you just made, fix the test or ` + `the code under test \u2014 do not remove the change to silence the failure.
+
 ` + combined.trim());
       if (retryCode !== 0) {
         ctx.log(`! worker re-run after push rejection exited code ${retryCode} \u2014 giving up`, "red");
@@ -99480,16 +99594,16 @@ async function fixConflictsAndCiLoop(ctx, prUrl, wantFixCi, checkPrConflict) {
           `The PR ${prUrl} has merge conflicts with \`${ctx.base}\`.`,
           "",
           "Steps:",
-          `1. \`git fetch origin ${ctx.base}\` then rebase or merge \`${ctx.base}\` into the current branch.`,
+          `1. \`git fetch origin ${ctx.base}\` then merge \`${ctx.base}\` into the current branch (\`git merge origin/${ctx.base}\`). Do NOT rebase and do NOT amend existing commits.`,
           "2. Resolve conflicts in the files git lists.",
-          "3. Stage and commit the resolution."
+          "3. Stage and commit the resolution as a new merge commit."
         ].join(`
 `));
         if (conflictCode !== 0) {
           ctx.log(`! conflict resolution worker exited code ${conflictCode} \u2014 giving up`, "red");
           return PR_FAILED_EXIT;
         }
-        const pushed = await pushWithLeases(ctx);
+        const pushed = await pushBranchSafely(ctx);
         if (!pushed)
           return PR_FAILED_EXIT;
         continue;
@@ -99693,7 +99807,8 @@ ${indented}${suffix}`, "yellow");
   log2(`  ${pr2.created ? "opened" : "found existing"} PR: ${prUrl}`, "green");
   registerPr?.(changeName, prUrl);
   let manualMergePending = false;
-  if (wantAutoMerge) {
+  const prReadyNeeded = cfg.prDraft === true;
+  if (!prReadyNeeded && wantAutoMerge) {
     const fallbackEnabled = cfg.manualMergeWhenAutoMergeDisabled !== false;
     const repoAllowsAutoMerge = await detectRepoAutoMergeAllowed(prUrl, cmd, cwd2, log2);
     if (repoAllowsAutoMerge === false && fallbackEnabled) {
@@ -99714,10 +99829,23 @@ ${indented}${suffix}`, "yellow");
         }
       }
     }
+  } else if (prReadyNeeded && wantAutoMerge) {
+    manualMergePending = true;
   }
   const ciResult = await fixConflictsAndCiLoop(ctx, prUrl, wantFixCi, checkPrConflict);
   if (ciResult !== 0)
     return ciResult;
+  if (prReadyNeeded) {
+    emit2("pr-ready");
+    try {
+      await cmd.run(["gh", "pr", "ready", prUrl], cwd2);
+      log2(`  converted ${prUrl} from draft to ready`, "green");
+    } catch (err) {
+      const e = err;
+      log2(`! gh pr ready failed for ${prUrl}: ${e.stderr?.trim() || e.message}`, "yellow");
+      manualMergePending = false;
+    }
+  }
   if (manualMergePending) {
     try {
       await cmd.run(["gh", "pr", "merge", prUrl, `--${cfg.autoMergeStrategy}`], cwd2);
@@ -100203,6 +100331,7 @@ function createSpawnWorker(input) {
           neverTouch: cfg.boundaries.never_touch,
           metaOnlyFiles: cfg.boundaries.meta_only_files,
           manualMergeWhenAutoMergeDisabled: cfg.manualMergeWhenAutoMergeDisabled,
+          prDraft: cfg.prDraft,
           validateCommands: [cfg.commands.test, cfg.commands.lint, cfg.commands.typecheck].filter((c) => Boolean(c))
         },
         respawnWorker: respawn
@@ -253151,8 +253280,105 @@ var init_comment_sync2 = __esm(() => {
   init_linear();
 });
 
-// apps/agent/src/agent/wire.ts
+// apps/agent/src/features/pr-tracker/state.ts
 import { join as join33 } from "path";
+async function readState2(projectRoot) {
+  const path = join33(projectRoot, PR_TRACKER_STATE_RELPATH);
+  const file2 = Bun.file(path);
+  if (!await file2.exists())
+    return {};
+  try {
+    const raw = await file2.text();
+    const parsed = JSON.parse(raw);
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      return parsed;
+    }
+    return {};
+  } catch {
+    return {};
+  }
+}
+async function writeState2(projectRoot, state) {
+  const path = join33(projectRoot, PR_TRACKER_STATE_RELPATH);
+  await Bun.write(path, JSON.stringify(state, null, 2));
+}
+var PR_TRACKER_STATE_RELPATH = ".ralph/pr-tracker-state.json";
+var init_state3 = () => {};
+
+// apps/agent/src/features/pr-tracker/tracker.ts
+class PrTracker {
+  opts;
+  state = {};
+  loaded = false;
+  now;
+  constructor(opts) {
+    this.opts = opts;
+    this.now = opts.now ?? (() => new Date);
+  }
+  async load() {
+    if (this.loaded)
+      return;
+    this.state = await readState2(this.opts.projectRoot);
+    this.loaded = true;
+  }
+  snapshot() {
+    return JSON.parse(JSON.stringify(this.state));
+  }
+  isBailed(identifier) {
+    return this.state[identifier]?.bailed === true;
+  }
+  getAttempts(identifier) {
+    return this.state[identifier]?.attempts ?? 0;
+  }
+  async recordFailure(identifier, reason) {
+    await this.load();
+    const nowIso = this.now().toISOString();
+    const existing = this.state[identifier];
+    if (existing?.bailed) {
+      existing.lastReason = reason;
+      await this.flush();
+      return { kind: "bail", attempts: existing.attempts, firstBail: false };
+    }
+    const attempts = (existing?.attempts ?? 0) + 1;
+    const entry = {
+      attempts,
+      firstFailedAt: existing?.firstFailedAt ?? nowIso,
+      lastDemotedAt: nowIso,
+      lastReason: reason
+    };
+    if (attempts >= this.opts.maxRecoveryAttempts) {
+      entry.bailed = true;
+      this.state[identifier] = entry;
+      await this.flush();
+      return { kind: "bail", attempts, firstBail: true };
+    }
+    this.state[identifier] = entry;
+    await this.flush();
+    return { kind: "demote", attempts };
+  }
+  async clear(identifier) {
+    await this.load();
+    if (!(identifier in this.state))
+      return;
+    delete this.state[identifier];
+    await this.flush();
+  }
+  async flush() {
+    await writeState2(this.opts.projectRoot, this.state);
+  }
+}
+var init_tracker = __esm(() => {
+  init_state3();
+});
+
+// apps/agent/src/features/pr-tracker/index.ts
+var init_pr_tracker = __esm(() => {
+  init_tracker();
+  init_state3();
+});
+
+// apps/agent/src/agent/wire.ts
+import { join as join34 } from "path";
 function buildAgentCoordinator(input) {
   const {
     args,
@@ -253171,7 +253397,7 @@ function buildAgentCoordinator(input) {
     onWorkerCmd,
     onAwaitingTicket
   } = input;
-  const logsDir = join33(projectRoot, ".ralph", "logs");
+  const logsDir = join34(projectRoot, ".ralph", "logs");
   const bus = createBus();
   subscribeAgentDiag(bus, onLog);
   const diag = (area, message, color) => {
@@ -253325,6 +253551,11 @@ function buildAgentCoordinator(input) {
       now: () => new Date
     };
   }
+  const prTrackerEnabled = args.prTrackerEnabled === undefined ? cfg.prTracker.enabled : args.prTrackerEnabled;
+  const prTracker = prTrackerEnabled ? new PrTracker({
+    projectRoot,
+    maxRecoveryAttempts: cfg.prTracker.maxRecoveryAttempts
+  }) : null;
   const commentSync = createCommentSyncHooks({
     apiKey,
     cfg,
@@ -253339,7 +253570,7 @@ function buildAgentCoordinator(input) {
       pollContext = new PollContext;
     },
     fetchTodo: () => resolvers.fetchByGet(indicators.getTodo, excludeFromTodo),
-    fetchInProgress: () => resolvers.fetchByGet(indicators.getInProgress, []),
+    fetchInProgress: () => resolvers.fetchByGet(indicators.getInProgress, unionMarkers(indicators.setError)),
     fetchReview: () => resolvers.fetchByGet(indicators.getReview, excludeFromReview),
     fetchMentions,
     fetchDoneCandidates: () => fetchDoneCandidatesWith(apiKey, team, assignee, indicators),
@@ -253378,7 +253609,8 @@ function buildAgentCoordinator(input) {
     ...indicators.getAutoMerge !== undefined ? { getAutoMerge: indicators.getAutoMerge } : {},
     postComments: cfg.linear.postComments,
     commentEveryIterations: cfg.linear.updateEveryIterations,
-    ...args.maxTickets > 0 ? { maxTickets: args.maxTickets } : {}
+    ...args.maxTickets > 0 ? { maxTickets: args.maxTickets } : {},
+    ...prTracker ? { prTracker } : {}
   });
   coordRef.current = coord;
   const filterDesc = describeIndicators(indicators, team, assignee);
@@ -253422,6 +253654,7 @@ var init_wire = __esm(() => {
   init_worker();
   init_baseline();
   init_comment_sync2();
+  init_pr_tracker();
 });
 
 // apps/agent/src/agent/json-log/json-log-file.ts
@@ -253676,7 +253909,7 @@ var init_output_utils = __esm(() => {
 });
 
 // apps/agent/src/agent/state/worker-state-poll.ts
-import { join as join34 } from "path";
+import { join as join35 } from "path";
 function parseSubtasks(tasksMd) {
   const out = [];
   let skipSection = false;
@@ -253709,7 +253942,7 @@ function initialWorkerSnapshot() {
 async function readWorkerSnapshot(input) {
   const next = { ...input.prev };
   try {
-    const file2 = Bun.file(join34(input.statesDir, input.changeName, ".ralph-state.json"));
+    const file2 = Bun.file(join35(input.statesDir, input.changeName, ".ralph-state.json"));
     if (await file2.exists()) {
       const json2 = await file2.json();
       next.iter = json2.iteration ?? next.iter;
@@ -253718,10 +253951,10 @@ async function readWorkerSnapshot(input) {
   } catch {}
   if (input.changeDir) {
     try {
-      const tasksFile = Bun.file(join34(input.changeDir, "tasks.md"));
-      const proposalFile = Bun.file(join34(input.changeDir, "proposal.md"));
-      const designFile = Bun.file(join34(input.changeDir, "design.md"));
-      const reviewFindingsFile = Bun.file(join34(input.changeDir, "review-findings.md"));
+      const tasksFile = Bun.file(join35(input.changeDir, "tasks.md"));
+      const proposalFile = Bun.file(join35(input.changeDir, "proposal.md"));
+      const designFile = Bun.file(join35(input.changeDir, "design.md"));
+      const reviewFindingsFile = Bun.file(join35(input.changeDir, "review-findings.md"));
       const [tasksText, proposalText, designText, reviewFindingsText] = await Promise.all([
         tasksFile.exists().then((ok) => ok ? tasksFile.text() : null),
         proposalFile.exists().then((ok) => ok ? proposalFile.text() : null),
@@ -253784,7 +254017,7 @@ var init_worker_state_poll = __esm(() => {
 });
 
 // apps/agent/src/components/AgentMode.tsx
-import { join as join35 } from "path";
+import { join as join36 } from "path";
 async function appendSteeringImpl(changeDir, message) {
   await runWithContext(createDefaultContext(), async () => {
     appendSteeringMessage(changeDir, message);
@@ -253801,6 +254034,16 @@ function orderSubtasksForCappedDisplay(subtasks) {
     (s.done ? done : pending).push(s);
   return [...pending, ...done];
 }
+function pickLatestGatedTicket(tickets) {
+  if (tickets.size === 0)
+    return { top: null, moreCount: 0 };
+  const sorted = Array.from(tickets.entries()).sort(([, a], [, b2]) => {
+    const aTime = a.since ? new Date(a.since).getTime() : 0;
+    const bTime = b2.since ? new Date(b2.since).getTime() : 0;
+    return bTime - aTime;
+  });
+  return { top: sorted[0], moreCount: sorted.length - 1 };
+}
 function fmtCmd(argv) {
   const joined = argv.join(" ");
   return joined.length > CMD_DISPLAY_MAX ? joined.slice(0, CMD_DISPLAY_MAX - 1) + "\u2026" : joined;
@@ -254795,7 +255038,11 @@ function AgentMode({
               })
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          Array.from(gatedTicketsRef.current.entries()).map(([changeName, g2]) => {
+          (() => {
+            const { top, moreCount } = pickLatestGatedTicket(gatedTicketsRef.current);
+            if (!top)
+              return null;
+            const [changeName, g2] = top;
             const askedAgo = g2.since ? fmtElapsed(now2 - Date.parse(g2.since)) : "just now";
             const cardLabelWidth = g2.issueIdentifier.length + 2;
             const cardLabelNode = /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(jsx_dev_runtime10.Fragment, {
@@ -254815,63 +255062,71 @@ function AgentMode({
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this);
-            return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(LabeledBox, {
-              labelNode: cardLabelNode,
-              labelVisualWidth: cardLabelWidth,
-              borderColor: "yellow",
-              paddingX: 1,
-              gap: 2,
-              width: termWidth,
+            return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(jsx_dev_runtime10.Fragment, {
               children: [
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  color: "yellow",
-                  bold: true,
-                  children: "[GATE]"
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  color: "yellow",
-                  children: "Awaiting confirmation"
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  dimColor: true,
-                  children: "\xB7"
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  dimColor: true,
-                  children: "round"
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  color: "white",
-                  bold: true,
-                  children: g2.round
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  dimColor: true,
-                  children: "\xB7"
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  dimColor: true,
-                  children: "asked"
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  color: "white",
-                  children: askedAgo
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  dimColor: true,
-                  children: "ago"
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-                  dimColor: true,
-                  children: "\u2502"
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(LabeledBox, {
+                  labelNode: cardLabelNode,
+                  labelVisualWidth: cardLabelWidth,
+                  borderColor: "yellow",
+                  paddingX: 1,
+                  gap: 2,
+                  width: termWidth,
+                  children: [
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      color: "yellow",
+                      bold: true,
+                      children: "[GATE]"
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      color: "yellow",
+                      children: "Awaiting confirmation"
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      dimColor: true,
+                      children: "\xB7"
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      dimColor: true,
+                      children: "round"
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      color: "white",
+                      bold: true,
+                      children: g2.round
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      dimColor: true,
+                      children: "\xB7"
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      dimColor: true,
+                      children: "asked"
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      color: "white",
+                      children: askedAgo
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      dimColor: true,
+                      children: "ago"
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      dimColor: true,
+                      children: "\u2502"
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                      dimColor: true,
+                      children: trunc(g2.issueTitle, Math.max(20, termWidth - 70))
+                    }, undefined, false, undefined, this)
+                  ]
+                }, `gated-${changeName}`, true, undefined, this),
+                moreCount > 0 && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   dimColor: true,
-                  children: trunc(g2.issueTitle, Math.max(20, termWidth - 70))
+                  children: `  +${moreCount} more awaiting confirmation`
                 }, undefined, false, undefined, this)
               ]
-            }, `gated-${changeName}`, true, undefined, this);
-          }),
+            }, undefined, true, undefined, this);
+          })(),
           coord?.activeWorkers.map((w2, idx) => {
             const isFocused = idx === safeFocusedIdx;
             const meta3 = workerMetaRef.current.get(w2.changeName);
@@ -255245,7 +255500,7 @@ function AgentMode({
                     },
                     onSubmit: async (message) => {
                       try {
-                        await appendSteering2(join35(tasksDir, w2.changeName), message);
+                        await appendSteering2(join36(tasksDir, w2.changeName), message);
                         fileEmit({ type: "steering_submitted", changeName: w2.changeName, message });
                       } catch (err) {
                         const text = err.message;
@@ -255493,7 +255748,7 @@ var exports_list = {};
 __export(exports_list, {
   runList: () => runList
 });
-import { join as join36 } from "path";
+import { join as join37 } from "path";
 function countTaskItems(content) {
   const checked = (content.match(/^- \[x\]/gm) ?? []).length;
   const unchecked = (content.match(/^- \[ \]/gm) ?? []).length;
@@ -255506,13 +255761,13 @@ function buildLocalRows(statesDir, projectRoot) {
   const sources = [{ dir: statesDir, label: "main" }];
   const worktreesRoot = worktreesDir2(projectRoot);
   for (const wt of storage.list(worktreesRoot)) {
-    sources.push({ dir: join36(worktreesRoot, wt, ".ralph", "tasks"), label: `wt:${wt}` });
+    sources.push({ dir: join37(worktreesRoot, wt, ".ralph", "tasks"), label: `wt:${wt}` });
   }
   for (const { dir, label } of sources) {
     for (const entry of storage.list(dir)) {
       if (seen.has(entry))
         continue;
-      const raw = storage.read(join36(dir, entry, ".ralph-state.json"));
+      const raw = storage.read(join37(dir, entry, ".ralph-state.json"));
       if (raw === null)
         continue;
       let state;
@@ -255527,7 +255782,7 @@ function buildLocalRows(statesDir, projectRoot) {
       const firstLine = promptRaw.split(`
 `).find((l3) => l3.trim() !== "") ?? "";
       let progress = "\u2014";
-      const tasksContent = storage.read(join36(dir, entry, "tasks.md"));
+      const tasksContent = storage.read(join37(dir, entry, "tasks.md"));
       if (tasksContent !== null) {
         const { checked, unchecked } = countTaskItems(tasksContent);
         const total = checked + unchecked;
@@ -255939,7 +256194,7 @@ var exports_json_runner = {};
 __export(exports_json_runner, {
   runAgentJson: () => runAgentJson
 });
-import { join as join37 } from "path";
+import { join as join38 } from "path";
 import { mkdir as mkdir13 } from "fs/promises";
 import { homedir as homedir6 } from "os";
 function makeEmit(fileSink) {
@@ -255961,7 +256216,7 @@ async function runAgentJson({
   tasksDir,
   runPreflight: runPreflight2 = runPreflight
 }) {
-  await mkdir13(join37(homedir6(), ".ralph"), { recursive: true }).catch(() => {
+  await mkdir13(join38(homedir6(), ".ralph"), { recursive: true }).catch(() => {
     return;
   });
   const fileSink = createJsonLogFileSink(args.jsonLogFile);
@@ -256169,7 +256424,7 @@ __export(exports_src2, {
   main: () => main2
 });
 import { mkdir as mkdir14 } from "fs/promises";
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 async function main2(argv) {
   if (argv.includes("--help") || argv.includes("-h")) {
     printAgentHelp();
@@ -256220,7 +256475,7 @@ async function main2(argv) {
   }
   await mkdir14(statesDir, { recursive: true });
   await mkdir14(tasksDir, { recursive: true });
-  await mkdir14(join38(projectRoot, ".ralph"), { recursive: true });
+  await mkdir14(join39(projectRoot, ".ralph"), { recursive: true });
   if (shouldFallbackToJsonOutput(args, process.stdin.isTTY)) {
     process.stderr.write(`agent: stdin is not a TTY \u2014 falling back to --json-output mode.
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neriros/ralphy",
-  "version": "3.8.10",
+  "version": "3.8.13",
   "description": "An iterative AI task execution framework. Orchestrates multi-phase autonomous work using Claude or Codex engines.",
   "keywords": [
     "agent",
@@ -15,7 +15,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/NeriRos/ralphy.git"
+    "url": "https://github.com/rosneri/ralphy.git"
   },
   "bin": {
     "ralphy": "./dist/shell/index.js",
@@ -95,7 +95,8 @@
     "@babel/plugin-transform-modules-systemjs": "^7.29.4",
     "axios": "^1.15.1",
     "fast-uri": "^3.1.2",
-    "minimatch": "^10.2.3"
+    "minimatch": "^10.2.3",
+    "tmp": "^0.2.6"
   },
   "engines": {
     "bun": ">=1.0.0"