nightralph 0.0.16 → 0.0.17

package/README.md

@@ -214,6 +214,9 @@ This is expected to run for a long time, like overnight.
 
 ### Mac OS
 
+Use `caffeinate` to prevent your machine from sleeping. These examples will
+keep the machine awake, but the display can still go dark.
+
 #### Claude Opus 4.6
 
 ```sh
@@ -232,5 +235,8 @@ caffeinate -i npx nightralph claude -m claude-sonnet-5
 caffeinate -i npx nightralph pi -m openrouter/z-ai/glm-5.3-flash
 ```
 
-That command will prevent your machine from sleeping, but the display can still
-go dark.
+#### `codex` + Luna
+
+```sh
+caffeinate -i npx nightralph codex -m gpt-5.6-luna
+```

package/dist/index.js

@@ -507,8 +507,10 @@ async function mergeBranch(repoRoot, branch) {
       ["merge", branch, "--no-edit"],
       { cwd: repoRoot }
     );
-    return true;
-  } catch {
+    return { success: true };
+  } catch (err) {
+    const execErr = err;
+    const stderr = execErr.stderr || execErr.stdout;
     try {
       await execFileAsync3(
         "git",
@@ -517,7 +519,7 @@ async function mergeBranch(repoRoot, branch) {
       );
     } catch {
     }
-    return false;
+    return { success: false, stderr };
   }
 }
 __name(mergeBranch, "mergeBranch");
@@ -538,8 +540,10 @@ async function rebaseBranch(repoRoot, branch, onto, worktreePath) {
         ["rebase", onto],
         { cwd: worktreePath }
       );
-      return true;
-    } catch {
+      return { success: true };
+    } catch (err) {
+      const execErr = err;
+      const stderr = execErr.stderr || execErr.stdout;
       try {
         await execFileAsync3(
           "git",
@@ -548,7 +552,7 @@ async function rebaseBranch(repoRoot, branch, onto, worktreePath) {
         );
       } catch {
       }
-      return false;
+      return { success: false, stderr };
     }
   }
   try {
@@ -567,8 +571,9 @@ async function rebaseBranch(repoRoot, branch, onto, worktreePath) {
       ["checkout", onto],
       { cwd: repoRoot }
     );
-    return true;
-  } catch {
+    return { success: true };
+  } catch (err) {
+    const stderr = err.stderr;
     try {
       await execFileAsync3(
         "git",
@@ -585,7 +590,7 @@ async function rebaseBranch(repoRoot, branch, onto, worktreePath) {
       );
     } catch {
     }
-    return false;
+    return { success: false, stderr };
   }
 }
 __name(rebaseBranch, "rebaseBranch");
@@ -619,13 +624,16 @@ async function mergeWave(opts) {
       conflicted: false
     };
     if (i === 0) {
-      const success = await mergeBranch(
+      const result = await mergeBranch(
         repoRoot,
         branch
       );
-      mergingResult.merged = success;
-      mergingResult.conflicted = !success;
-      if (!success) {
+      mergingResult.merged = result.success;
+      mergingResult.conflicted = !result.success;
+      if (!result.success) {
+        mergingResult.stderr = result.stderr;
+      }
+      if (!result.success) {
         if (strategy === "stop") {
           stoppedAt = mergingResult;
           merged.push(mergingResult);
@@ -635,14 +643,15 @@ async function mergeWave(opts) {
         continue;
       }
     } else {
-      const rebaseSuccess = await rebaseBranch(
+      const rebaseResult = await rebaseBranch(
         repoRoot,
         branch,
         baseBranch,
         worktreePath
       );
-      if (!rebaseSuccess) {
+      if (!rebaseResult.success) {
         mergingResult.conflicted = true;
+        mergingResult.stderr = rebaseResult.stderr;
         if (strategy === "stop") {
           stoppedAt = mergingResult;
           merged.push(mergingResult);
@@ -652,13 +661,16 @@ async function mergeWave(opts) {
           continue;
         }
       }
-      const mergeSuccess = await mergeBranch(
+      const mergeResult = await mergeBranch(
         repoRoot,
         branch
       );
-      mergingResult.merged = mergeSuccess;
-      mergingResult.conflicted = !mergeSuccess;
-      if (!mergeSuccess) {
+      mergingResult.merged = mergeResult.success;
+      mergingResult.conflicted = !mergeResult.success;
+      if (!mergeResult.success) {
+        mergingResult.stderr = mergeResult.stderr;
+      }
+      if (!mergeResult.success) {
         if (strategy === "stop") {
           stoppedAt = mergingResult;
           merged.push(mergingResult);
@@ -1089,6 +1101,29 @@ function renderPrompt(specBody, ticket) {
   ].join("\n");
 }
 __name(renderPrompt, "renderPrompt");
+function renderMergePrompt(specBody, ticket) {
+  return [
+    "---- SPEC CONTEXT ----",
+    specBody,
+    "",
+    "---- TICKET ----",
+    ticket.filename,
+    ticket.body,
+    "",
+    "---- AGENT INSTRUCTIONS ----",
+    "You are an autonomous coding agent resolving a merge conflict.",
+    "",
+    "Another agent already implemented this ticket on a feature branch. The branch was then merged with the base branch, but conflicts arose. The working tree may contain conflict markers that need resolution.",
+    "",
+    "Your task:",
+    "1. Find and resolve all conflict markers (<<<<<<< / ======= / >>>>>>>).",
+    "2. Make sure the code compiles and tests pass.",
+    "3. Commit the resolved files.",
+    "",
+    "Do NOT re-implement the ticket from scratch."
+  ].join("\n");
+}
+__name(renderMergePrompt, "renderMergePrompt");
 function listTickets(tickets) {
   console.log("\nTickets:");
   for (const t of tickets) {
@@ -1498,7 +1533,10 @@ async function respawnAndRetryMerge(opts) {
   } else {
     console.log(msg1);
   }
-  const prompt = renderPrompt(opts.specBody, opts.ticket);
+  const prompt = renderMergePrompt(
+    opts.specBody,
+    opts.ticket
+  );
   const logPath = join3(
     opts.logsDir,
     opts.ticket.filename.replace(/\.md$/, ".respawn.log")
@@ -1526,19 +1564,27 @@ async function respawnAndRetryMerge(opts) {
     }
     return false;
   }
-  const merged = await mergeBranch(
+  const mergeResult = await mergeBranch(
     opts.repoRoot,
     opts.branch
   );
-  if (!merged) {
+  if (!mergeResult.success) {
     const msg3 = `  ${opts.ticket.filename}: merge still conflicted after respawn`;
     if (opts.onLine) {
       opts.onLine(msg3);
     } else {
       console.log(msg3);
     }
+    if (mergeResult.stderr) {
+      const stderrMsg = `  git: ${mergeResult.stderr.trim()}`;
+      if (opts.onLine) {
+        opts.onLine(stderrMsg);
+      } else {
+        console.log(stderrMsg);
+      }
+    }
   }
-  return merged;
+  return mergeResult.success;
 }
 __name(respawnAndRetryMerge, "respawnAndRetryMerge");
 function runProgress(tickets) {
@@ -1559,6 +1605,10 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, di
     const ready = findReadyTickets(tickets);
     if (ready.length === 0) break;
     waveNum++;
+    const readyNums = new Set(ready.map((t) => t.num));
+    const remaining2 = tickets.filter(
+      (t) => t.status === "ready-for-agent" && !readyNums.has(t.num)
+    );
     d.startWave(
       waveNum,
       totalWaves,
@@ -1566,7 +1616,11 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, di
         num: t.num,
         filename: t.filename
       })),
-      runProgress(tickets)
+      runProgress(tickets),
+      remaining2.map((t) => ({
+        num: t.num,
+        filename: t.filename
+      }))
     );
     const results = await Promise.allSettled(
       ready.map(async (t) => {
@@ -1639,6 +1693,11 @@ async function runWavesIsolated(opts) {
   const repoRoot = getRepoRoot();
   const repoName = getRepoName();
   const baseBranch = getCurrentBranch();
+  if (isDirty(repoRoot)) {
+    throw new Error(
+      "Working tree is dirty; commit or stash changes before running"
+    );
+  }
   const progressPath = join3(
     dirname(opts.logsDir),
     "progress.md"
@@ -1659,6 +1718,10 @@ async function runWavesIsolated(opts) {
     const ready = findReadyTickets(opts.tickets);
     if (ready.length === 0) break;
     waveNum++;
+    const readyNums = new Set(ready.map((t) => t.num));
+    const remaining2 = opts.tickets.filter(
+      (t) => t.status === "ready-for-agent" && !readyNums.has(t.num)
+    );
     d.startWave(
       waveNum,
       totalWaves,
@@ -1666,7 +1729,11 @@ async function runWavesIsolated(opts) {
         num: t.num,
         filename: t.filename
       })),
-      runProgress(opts.tickets)
+      runProgress(opts.tickets),
+      remaining2.map((t) => ({
+        num: t.num,
+        filename: t.filename
+      }))
     );
     const worktreeSettled = await Promise.allSettled(
       ready.map((t) => createWorktree({
@@ -1879,6 +1946,22 @@ async function runWavesIsolated(opts) {
             d.log(
               `  ${ticket.filename}: merge failed, staying ready-for-agent`
             );
+            if (branchResult.stderr) {
+              d.log(
+                "  git: " + branchResult.stderr.trim()
+              );
+            }
+            checkTicket(progress, ticket.num, {
+              branch: branchResult.branch,
+              exitCode: 0,
+              done: false
+            });
+            writeProgress(progressPath, progress);
+            await commitProgress(
+              repoRoot,
+              progressPath,
+              `nightralph: ${ticket.filename} merge failed`
+            );
           }
         }
       }