nightralph 0.0.22 → 0.0.23

package/dist/index.js

@@ -296,7 +296,7 @@ function createWorktree(opts) {
   return result;
 }
 __name(createWorktree, "createWorktree");
-async function removeWorktree(worktreePath, opts) {
+async function removeWorktreeNow(worktreePath, opts) {
   const args = [
     "-C",
     worktreePath,
@@ -307,6 +307,15 @@ async function removeWorktree(worktreePath, opts) {
   args.push(worktreePath);
   await execFileAsync("git", args);
 }
+__name(removeWorktreeNow, "removeWorktreeNow");
+function removeWorktree(worktreePath, opts) {
+  const result = worktreeQueue.then(
+    () => removeWorktreeNow(worktreePath, opts)
+  );
+  worktreeQueue = result.catch(() => {
+  });
+  return result;
+}
 __name(removeWorktree, "removeWorktree");
 function hasNewCommits(repoRoot, base, branch) {
   const stdout = execFileSync(
@@ -1025,6 +1034,9 @@ function runTestCmd(opts) {
       stdio: ["ignore", "pipe", "pipe"],
       detached: true
     });
+    if (child.pid !== void 0 && opts.registry) {
+      opts.registry.add(child.pid);
+    }
     const chunks = [];
     child.stdout.on("data", (d) => chunks.push(String(d)));
     child.stderr.on("data", (d) => chunks.push(String(d)));
@@ -1043,6 +1055,9 @@ function runTestCmd(opts) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
+      if (child.pid !== void 0 && opts.registry) {
+        opts.registry.delete(child.pid);
+      }
       chunks.push(String(err));
       resolve({
         exitCode: 1,
@@ -1053,6 +1068,9 @@ function runTestCmd(opts) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
+      if (child.pid !== void 0 && opts.registry) {
+        opts.registry.delete(child.pid);
+      }
       resolve({
         exitCode: code ?? 1,
         output: chunks.join("")
@@ -1243,6 +1261,7 @@ function renderMergePrompt(specBody, ticket) {
     "3. Commit the resolved files.",
     "",
     "Do NOT re-implement the ticket from scratch.",
+    "Do NOT read or modify files outside your current directory (the worktree).",
     "Do NOT run git push."
   ].join("\n");
 }
@@ -1624,6 +1643,7 @@ function spawnAgent(opts) {
     __name(finish, "finish");
     proc.on("exit", (code) => {
       graceTimer = setTimeout(() => {
+        killProcessGroup(proc.pid);
         proc.stdout.destroy();
         proc.stderr.destroy();
         finish(code ?? 1);
@@ -1734,7 +1754,7 @@ Test command: ${opts.testCmd ?? "(none)"}`
     `Retries:      ${opts.retries ?? DEFAULT_RETRIES}`
   );
   console.log(
-    `Retry delay:  ${opts.retryDelay ?? DEFAULT_RETRY_DELAY}s`
+    `Retry delay:  ${opts.retryDelay ?? 0}s`
   );
   console.log(
     `
@@ -1747,7 +1767,8 @@ async function runTestGate(opts) {
   const result = await runTestCmd({
     cmd: opts.testCmd,
     cwd: opts.worktreePath,
-    timeout: opts.timeout
+    timeout: opts.timeout,
+    registry: opts.registry
   });
   const testLogPath = attemptLogPath(
     opts.logsDir,
@@ -1823,7 +1844,8 @@ async function respawnAndRetryMerge(opts) {
       worktreePath: opts.worktreePath,
       timeout: opts.timeout,
       logsDir: opts.logsDir,
-      log
+      log,
+      registry: runningAgents
     });
     if (!passed) {
       log(
@@ -1939,7 +1961,12 @@ async function runTicketAttempt(opts) {
     opts.baseBranch,
     worktree.branchName
   )) {
-    return { kind: "no-commits" };
+    await removeWorktreeQuietly(worktree.worktreePath, d);
+    return {
+      kind: "no-commits",
+      worktreePath: worktree.worktreePath,
+      branchName: worktree.branchName
+    };
   }
   if (opts.testCmd) {
     const passed = await runTestGate({
@@ -1949,7 +1976,8 @@ async function runTicketAttempt(opts) {
       timeout: opts.timeout,
       logsDir: opts.logsDir,
       attempt: opts.attempt,
-      log: /* @__PURE__ */ __name((msg) => d.log(msg), "log")
+      log: /* @__PURE__ */ __name((msg) => d.log(msg), "log"),
+      registry: runningAgents
     });
     if (!passed) {
       await removeWorktreeQuietly(
@@ -1978,7 +2006,11 @@ async function runTicketAttempts(opts) {
   const maxAttempts = opts.retries + 1;
   const isPi = basename2(opts.agentCmd) === "pi";
   let thinking = opts.thinking;
-  let outcome = { kind: "no-commits" };
+  let outcome = {
+    kind: "no-commits",
+    worktreePath: "",
+    branchName: ""
+  };
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     if (attempt === 1) {
       d.log(`  Starting ${ticket.filename}`);
@@ -2239,6 +2271,18 @@ async function runWavesIsolated(opts) {
         d.log(
           `  ${ticket.filename}: failed to create worktree: ${formatErrorMessage(outcome.error)}`
         );
+        checkTicket(progress, ticket.num, {
+          branch: "",
+          exitCode: -1,
+          done: false
+        });
+        await saveProgress(
+          repoRoot,
+          progressPath,
+          progress,
+          `nightralph: ${ticket.filename} worktree error`,
+          d
+        );
         continue;
       }
       if (outcome.kind === "error") {
@@ -2247,6 +2291,18 @@ async function runWavesIsolated(opts) {
         d.log(
           `  ${ticket.filename}: attempt error: ` + formatErrorMessage(outcome.error)
         );
+        checkTicket(progress, ticket.num, {
+          branch: outcome.branchName ?? "",
+          exitCode: -1,
+          done: false
+        });
+        await saveProgress(
+          repoRoot,
+          progressPath,
+          progress,
+          `nightralph: ${ticket.filename} error`,
+          d
+        );
         continue;
       }
       if (outcome.kind === "no-commits") {
@@ -2255,6 +2311,18 @@ async function runWavesIsolated(opts) {
         d.log(
           `  ${ticket.filename}: agent exited 0 but made no changes; leaving ticket ready-for-agent`
         );
+        checkTicket(progress, ticket.num, {
+          branch: outcome.branchName,
+          exitCode: 0,
+          done: false
+        });
+        await saveProgress(
+          repoRoot,
+          progressPath,
+          progress,
+          `nightralph: ${ticket.filename} no commits`,
+          d
+        );
         continue;
       }
       if (outcome.kind === "failed") {