@ravshansbox/pi-next-issue 1.0.6 → 1.0.8

package/README.md

@@ -16,7 +16,7 @@ Run these in pi, inside a git repository:
 - `/next-issue stop` stops the run. The issue keeps its saved state, and the next run resumes it.
 - `/next-issue status` shows where the run is.
 
-The footer shows the issue, the stage, the number of tool calls and the time spent on the issue, for example `next-issue #12 · review 1/3 · 37 tools · 4m12s`. A line above the editor shows the last tool call. A note appears when an issue is merged or needs a human.
+The footer shows the issue, the stage, the number of tool calls and the time spent on the issue, for example `next-issue #12 · review 1/3 · 37 tools · 4m12s`. A line above the editor shows the last tool call. In the terminal, both use the dim colour of the theme, like the rest of the footer. A note appears when an issue is merged or needs a human.
 
 The run does not belong to a session: it goes on after `/new`, `/resume`, a fork or a reload, and the new session shows it. It stops when you quit pi.
 

package/index.ts

@@ -68,6 +68,7 @@ const launchFromRepo: Launch = async (cwd) => {
 export function createExtension(launch: Launch) {
   return (pi: ExtensionAPI) => {
     let ui: ExtensionContext['ui'] | undefined;
+    let coloured = false;
     let timer: ReturnType<typeof setInterval> | undefined;
     let unsubscribe: (() => void) | undefined;
     let handled = 0;
@@ -79,9 +80,11 @@ export function createExtension(launch: Launch) {
         return;
       }
       const progress = runner.progress;
-      ui.setStatus(STATUS_KEY, formatStatus(progress, Date.now()));
+      const theme = ui.theme;
+      const dim = (text: string) => (coloured ? theme.fg('dim', text) : text);
+      ui.setStatus(STATUS_KEY, dim(formatStatus(progress, Date.now())));
       const active = progress.status === 'running' && progress.lastTool !== undefined;
-      ui.setWidget(STATUS_KEY, active ? [`↳ ${progress.lastTool}`] : undefined);
+      ui.setWidget(STATUS_KEY, active ? [dim(`↳ ${progress.lastTool}`)] : undefined);
     };
 
     const onChange = (progress: Progress) => {
@@ -128,6 +131,7 @@ export function createExtension(launch: Launch) {
         return;
       }
       ui = ctx.ui;
+      coloured = ctx.mode === 'tui';
       timer ??= setInterval(render, 1000);
       timer.unref?.();
       const runner = holder().runner;
@@ -174,6 +178,7 @@ export function createExtension(launch: Launch) {
           holder().runner = runner;
           if (ctx.hasUI) {
             ui = ctx.ui;
+            coloured = ctx.mode === 'tui';
             follow(runner);
           }
           void runner.run();

package/package.json

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