@gtrabanco/pi-web-github-pr-status 0.1.0 → 0.1.1

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project are documented here. The project follows [strict semantic versioning](./RELEASE-POLICY.md); the kind of the next release is registered in `package.json` (`nextRelease`) before `bun run publish` is executed.
 
+## 0.1.1 — 2026-09-08 (Patch release)
+
+- See commit history for details.
+
 ## 0.1.0 — initial development version
 
 - GitHub PR workspace label: PR number link, CI ball (green/orange/red/none), dirty-worktree marker, push/pull arrows.

package/dist/index.js

@@ -299,12 +299,15 @@ async function readAllProbeFiles(readFile) {
 var DEFAULT_SETTINGS = Object.freeze({
   showCI: true,
   refreshSeconds: 90,
+  adaptiveRefresh: true,
   merge: Object.freeze({
     enabled: true,
     method: "merge",
     requireCleanWorktree: true,
     requireCI: true,
-    deleteBranch: false
+    deleteBranch: false,
+    checkoutTarget: true,
+    deleteBranchAfterMerge: true
   })
 });
 var MERGE_METHODS = ["merge", "squash", "rebase"];
@@ -341,6 +344,8 @@ function mergeBooleans(raw, defaults, warnings, prefix) {
     requireCleanWorktree: pick("requireCleanWorktree"),
     requireCI: pick("requireCI"),
     deleteBranch: pick("deleteBranch"),
+    checkoutTarget: pick("checkoutTarget"),
+    deleteBranchAfterMerge: pick("deleteBranchAfterMerge"),
     method: normalizeMethod(raw.method, defaults.method, warnings)
   };
 }
@@ -369,10 +374,14 @@ function normalizeSettings(raw) {
   const showCI = coerceBoolean(source.showCI);
   if (showCI === undefined && source.showCI !== undefined)
     warnings.push("showCI: ignored invalid value");
+  const adaptiveRefresh = coerceBoolean(source.adaptiveRefresh);
+  if (adaptiveRefresh === undefined && source.adaptiveRefresh !== undefined)
+    warnings.push("adaptiveRefresh: ignored invalid value");
   const mergeSource = asObject(source.merge);
   const settings = {
     showCI: showCI ?? DEFAULT_SETTINGS.showCI,
     refreshSeconds: normalizeRefreshSeconds(source.refreshSeconds, DEFAULT_SETTINGS.refreshSeconds, warnings),
+    adaptiveRefresh: adaptiveRefresh ?? DEFAULT_SETTINGS.adaptiveRefresh,
     merge: mergeBooleans(mergeSource, DEFAULT_SETTINGS.merge, warnings, "merge.")
   };
   return { settings, warnings };
@@ -617,6 +626,20 @@ function buildCloseCommand(prNumber) {
   assertPrNumber(prNumber);
   return `gh pr close ${String(prNumber)} < /dev/null`;
 }
+function buildCheckoutTargetCommand(targetBranch) {
+  if (typeof targetBranch !== "string" || targetBranch.trim() === "") {
+    throw new Error("Invalid target branch name");
+  }
+  const safe = targetBranch.replace(/[^a-zA-Z0-9_./-]/g, "");
+  return `git checkout ${safe} && git pull origin ${safe}`;
+}
+function buildDeleteLocalBranchCommand(branchName) {
+  if (typeof branchName !== "string" || branchName.trim() === "") {
+    throw new Error("Invalid branch name");
+  }
+  const safe = branchName.replace(/[^a-zA-Z0-9_./-]/g, "");
+  return `git branch -d ${safe}`;
+}
 function explainCiState(ci) {
   switch (ci.state) {
     case "none":
@@ -653,7 +676,8 @@ class PrUiController {
       outcome: null,
       settingsOpen: false,
       draft: null,
-      lastInvalidate: 0
+      lastInvalidate: 0,
+      postMerge: null
     };
     this.states.set(key, created);
     return created;
@@ -681,7 +705,7 @@ class PrUiController {
     if (settings.refreshSeconds <= 0)
       return;
     const entry = statusCache.get(context);
-    const staleMs = settings.refreshSeconds * 1000;
+    const staleMs = this.effectiveRefreshMs(settings, entry?.status);
     if (entry === undefined) {
       this.probe(context);
       return;
@@ -689,6 +713,17 @@ class PrUiController {
     if (Date.now() - Math.max(entry.probedAt, entry.loadedAt) >= staleMs)
       this.probe(context);
   }
+  effectiveRefreshMs(settings, status) {
+    const baseMs = settings.refreshSeconds * 1000;
+    if (!settings.adaptiveRefresh || status === undefined)
+      return baseMs;
+    const ci = status.ci;
+    if (ci.state === "running")
+      return Math.min(baseMs, 20000);
+    if (ci.state === "failed")
+      return Math.min(baseMs, 45000);
+    return baseMs;
+  }
   invalidate(context) {
     const state = this.stateFor(context);
     const now = Date.now();
@@ -769,6 +804,7 @@ class PrUiController {
     state.confirm = null;
     state.busy = "merge";
     state.outcome = null;
+    state.postMerge = null;
     this.requestRender(state);
     try {
       const run = await runGuardedCommand(context, {
@@ -778,6 +814,11 @@ class PrUiController {
       });
       if (run.exitCode === 0) {
         state.outcome = { ok: true, message: `PR #${String(pr.number)} merged (${settings.merge.method}).` };
+        const targetBranch = pr.baseRefName;
+        const mergedBranch = pr.headRefName ?? status?.branch;
+        if (settings.merge.checkoutTarget && targetBranch !== undefined && mergedBranch !== undefined) {
+          state.postMerge = { targetBranch, mergedBranch };
+        }
       } else {
         state.outcome = { ok: false, message: `Merge failed (exit ${String(run.exitCode ?? "?")}). Check the terminal output.`, terminalId: run.terminalId };
       }
@@ -791,6 +832,71 @@ class PrUiController {
       this.requestRender(state);
     }
   }
+  async postMergeCheckout(context) {
+    const state = this.stateFor(context);
+    const pm = state.postMerge;
+    if (pm === null)
+      return;
+    state.busy = "post-merge";
+    state.outcome = null;
+    this.requestRender(state);
+    try {
+      const run = await runGuardedCommand(context, {
+        title: `Checkout ${pm.targetBranch}`,
+        command: buildCheckoutTargetCommand(pm.targetBranch),
+        op: "post-merge"
+      });
+      if (run.exitCode === 0) {
+        state.outcome = { ok: true, message: `Switched to ${pm.targetBranch} and pulled latest.` };
+        state.postMerge = null;
+      } else {
+        state.outcome = { ok: false, message: `Checkout failed (exit ${String(run.exitCode ?? "?")}).`, terminalId: run.terminalId };
+      }
+    } catch (error) {
+      state.outcome = { ok: false, message: errorMessage(error) };
+    } finally {
+      state.busy = null;
+      statusCache.probe(context, { force: true }).catch(() => {
+        return;
+      });
+      this.requestRender(state);
+    }
+  }
+  async postMergeDeleteBranch(context) {
+    const state = this.stateFor(context);
+    const pm = state.postMerge;
+    if (pm === null)
+      return;
+    state.busy = "post-merge";
+    state.outcome = null;
+    this.requestRender(state);
+    try {
+      const run = await runGuardedCommand(context, {
+        title: `Delete branch ${pm.mergedBranch}`,
+        command: buildDeleteLocalBranchCommand(pm.mergedBranch),
+        op: "post-merge"
+      });
+      if (run.exitCode === 0) {
+        state.outcome = { ok: true, message: `Branch ${pm.mergedBranch} deleted.` };
+        state.postMerge = null;
+      } else {
+        state.outcome = { ok: false, message: `Delete failed (exit ${String(run.exitCode ?? "?")}).`, terminalId: run.terminalId };
+      }
+    } catch (error) {
+      state.outcome = { ok: false, message: errorMessage(error) };
+    } finally {
+      state.busy = null;
+      statusCache.probe(context, { force: true }).catch(() => {
+        return;
+      });
+      this.requestRender(state);
+    }
+  }
+  dismissPostMerge(context) {
+    const state = this.stateFor(context);
+    state.postMerge = null;
+    this.requestRender(state);
+  }
   async runClose(context, status) {
     const state = this.stateFor(context);
     const pr = status?.pr;
@@ -985,7 +1091,8 @@ function renderBody(html, controller, context, state, settings, status, busy) {
     ${settings.showCI ? renderCiSection(html, status) : html`<p class="ghpr-muted">CI display is disabled in settings.</p>`}
     ${renderWorktreeSection(html, status)}
     ${renderOutcome(html, state)}
-    ${pr !== undefined && pr.state === "OPEN" ? renderActions(html, controller, context, state, mergeEvaluation, closeEvaluation, busy) : null}
+    ${state.postMerge !== null ? renderPostMerge(html, controller, context, state, busy) : null}
+    ${pr !== undefined && pr.state === "OPEN" && state.postMerge === null ? renderActions(html, controller, context, state, mergeEvaluation, closeEvaluation, busy) : null}
     ${renderSettings(html, controller, context, state, settings)}
   `;
 }
@@ -1078,6 +1185,48 @@ function renderOutcome(html, state) {
     </div>
   `;
 }
+function renderPostMerge(html, controller, context, state, busy) {
+  const pm = state.postMerge;
+  if (pm === null)
+    return null;
+  return html`
+    <section class="ghpr-actions ghpr-post-merge">
+      <p class="ghpr-post-merge-title">Merge complete! Next steps:</p>
+      <div class="ghpr-buttons">
+        <button
+          type="button"
+          class="ghpr-primary"
+          title="Checkout "${pm.targetBranch}" and pull latest changes"
+          ?disabled=${busy}
+          @click=${() => {
+    controller.postMergeCheckout(context);
+  }}
+        >
+          ${state.busy === "post-merge" ? "Working…" : `Checkout ${pm.targetBranch} + pull`}
+        </button>
+        <button
+          type="button"
+          title="Delete the merged branch "${pm.mergedBranch}" locally"
+          ?disabled=${busy}
+          @click=${() => {
+    controller.postMergeDeleteBranch(context);
+  }}
+        >
+          ${state.busy === "post-merge" ? "Working…" : `Delete branch ${pm.mergedBranch}`}
+        </button>
+        <button
+          type="button"
+          ?disabled=${busy}
+          @click=${() => {
+    controller.dismissPostMerge(context);
+  }}
+        >
+          Dismiss
+        </button>
+      </div>
+    </section>
+  `;
+}
 function renderActions(html, controller, context, state, mergeEvaluation, closeEvaluation, busy) {
   const mergeTitle = mergeEvaluation.canMerge ? mergeEvaluation.confirmations.length > 0 ? "Merge with confirmation" : "Merge this pull request" : mergeEvaluation.blockers.join(" · ");
   const confirm = state.confirm;
@@ -1170,8 +1319,23 @@ function renderSettings(html, controller, context, state, settings) {
       d.merge.deleteBranch = value;
     });
   }} /> Delete
-        branch after merge</label
+        branch after merge (remote)</label
       >
+      <label><input type="checkbox" ?checked=${draft.merge.checkoutTarget} @change=${(event) => {
+    updateCheckbox(context, controller, event, (d, value) => {
+      d.merge.checkoutTarget = value;
+    });
+  }} /> Offer checkout to target branch after merge</label>
+      <label><input type="checkbox" ?checked=${draft.merge.deleteBranchAfterMerge} @change=${(event) => {
+    updateCheckbox(context, controller, event, (d, value) => {
+      d.merge.deleteBranchAfterMerge = value;
+    });
+  }} /> Offer delete merged branch after merge</label>
+      <label><input type="checkbox" ?checked=${draft.adaptiveRefresh} @change=${(event) => {
+    updateCheckbox(context, controller, event, (d, value) => {
+      d.adaptiveRefresh = value;
+    });
+  }} /> Adaptive refresh (faster when CI is running)</label>
       <label>
         Merge method
         <select

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtrabanco/pi-web-github-pr-status",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "nextRelease": "patch",
   "description": "PI WEB plugin that surfaces GitHub pull request status (PR number, link, CI ball, worktree state) and one-click guarded merge/close without leaving the workspace.",
   "license": "MIT",