@ravshansbox/pi-next-issue 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ravshansbox/pi-next-issue",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Pi extension that works through GitHub issues in the background",
   "license": "MIT",
   "type": "module",

package/src/git.ts

@@ -81,8 +81,8 @@ export async function push(cwd: string, remote: string, branch: string): Promise
   await must('git', ['push', '-u', remote, `HEAD:refs/heads/${branch}`], { cwd });
 }
 
-export async function discard(cwd: string): Promise<void> {
-  await must('git', ['reset', '--hard', '@{upstream}'], { cwd });
+export async function discard(cwd: string, remote: string, branch: string): Promise<void> {
+  await must('git', ['reset', '--hard', `${remote}/${branch}`], { cwd });
   await must('git', ['clean', '-fd'], { cwd });
 }
 

package/src/github.ts

@@ -1,6 +1,6 @@
 import { setTimeout as sleep } from 'node:timers/promises';
 import { must, run } from './exec.ts';
-import { LABELS, STOP_LABELS, type ChecksResult, type Issue } from './runner.ts';
+import { LABELS, STOP_LABELS, type ChecksResult, type Issue, type MergeResult } from './runner.ts';
 
 export type Repo = { root: string; slug: string };
 
@@ -247,25 +247,31 @@ export async function merge(
   pr: number,
   timeoutMs: number,
   signal: AbortSignal,
-): Promise<boolean> {
+): Promise<MergeResult> {
   const before = await gh(repo, ['pr', 'view', String(pr), '--json', 'state', '--jq', '.state']);
   if (before === 'MERGED') {
-    return true;
+    return { merged: true };
   }
   const result = await run('gh', ['pr', 'merge', String(pr), '--squash', '--repo', repo.slug], {
     cwd: repo.root,
   });
   if (result.code !== 0) {
-    return false;
+    return {
+      merged: false,
+      reason: result.stderr.trim().slice(-2000) || `gh pr merge failed with code ${result.code}`,
+    };
   }
   const deadline = Date.now() + timeoutMs;
   for (;;) {
     const state = await gh(repo, ['pr', 'view', String(pr), '--json', 'state', '--jq', '.state']);
     if (state === 'MERGED') {
-      return true;
+      return { merged: true };
     }
-    if (state === 'CLOSED' || Date.now() >= deadline) {
-      return false;
+    if (state === 'CLOSED') {
+      return { merged: false, reason: 'the pull request was closed' };
+    }
+    if (Date.now() >= deadline) {
+      return { merged: false, reason: 'the merge did not finish in time' };
     }
     await sleep(Math.min(POLL_MS, deadline - Date.now()), undefined, { signal });
   }

package/src/ports.ts

@@ -17,7 +17,7 @@ export async function createPorts(root: string, config: Config): Promise<Ports>
     worktree: (issue, branch) => git.worktree(root, config.remote, base, issue, branch),
     commit: (cwd, message) => git.commit(cwd, message),
     push: (cwd, branch) => git.push(cwd, config.remote, branch),
-    discard: (cwd) => git.discard(cwd),
+    discard: (cwd, branch) => git.discard(cwd, config.remote, branch),
     diff: (cwd) => git.diff(cwd, config.remote, base),
     openPr: (branch, title, body) => github.openPr(repo, branch, base, title, body),
     checks: async (pr, cwd, signal) =>

package/src/runner.ts

@@ -46,13 +46,13 @@ export type Ports = {
   worktree(issue: number, branch: string): Promise<string>;
   commit(cwd: string, message: string): Promise<boolean>;
   push(cwd: string, branch: string): Promise<void>;
-  discard(cwd: string): Promise<void>;
+  discard(cwd: string, branch: string): Promise<void>;
   diff(cwd: string): Promise<string>;
   openPr(branch: string, title: string, body: string): Promise<number>;
   checks(pr: number, cwd: string, signal: AbortSignal): Promise<ChecksResult>;
   failedLogs(pr: number): Promise<string>;
   commentOnPr(pr: number, body: string): Promise<void>;
-  merge(pr: number, signal: AbortSignal): Promise<boolean>;
+  merge(pr: number, signal: AbortSignal): Promise<MergeResult>;
   cleanup(issue: number, branch: string, cwd: string): Promise<void>;
   work(task: AgentTask): Promise<string>;
   review(task: AgentTask): Promise<Verdict | undefined>;
@@ -64,6 +64,8 @@ export type Ports = {
   unlock(): Promise<void>;
 };
 
+export type MergeResult = { merged: true } | { merged: false; reason: string };
+
 export type Outcome = 'merged' | 'needs-human';
 
 export type Status = 'idle' | 'running' | 'stopping' | 'finished' | 'stopped' | 'failed';
@@ -292,7 +294,7 @@ export class Runner {
             cwd,
             reviewPrompt(issue, comments, diff, state.earlier),
           );
-          await ports.discard(cwd);
+          await ports.discard(cwd, state.branch);
           if (verdict === undefined) {
             return needsHuman('the reviewer gave no verdict');
           }
@@ -330,8 +332,9 @@ export class Runner {
         }
         case 'merge': {
           this.stage('merge');
-          if (!(await ports.merge(pr(), this.controller.signal))) {
-            return needsHuman(`pull request #${pr()} could not be merged`);
+          const result = await ports.merge(pr(), this.controller.signal);
+          if (!result.merged) {
+            return needsHuman(`pull request #${pr()} could not be merged: ${result.reason}`);
           }
           await ports.setLabel(number, LABELS.done, [LABELS.inProgress]);
           await ports.cleanup(number, state.branch, cwd);