@ravshansbox/pi-next-issue 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ravshansbox/pi-next-issue",
-  "version": "1.0.6",
+  "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/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,7 +46,7 @@ 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>;
@@ -294,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');
           }