@henryqw/pi-pr 6.2.6 → 6.2.7

package/README.md

@@ -82,5 +82,5 @@ In-progress feedback sweeps keep private recovery under `<agent-dir>/config/pi-p
 - `/pr` does not open a browser, run `/done` or `/sweep`, enable auto-merge, or use a merge queue. It only starts workflows when explicitly invoked.
 - Pushes use a saved exact remote OID lease and revalidate the destination. Concurrent updates block publication instead of being overwritten. Creation does not change the base branch, and a configured push target does not change upstream settings.
 - Direct merge requires a clean, safe local Git state and fresh matching head; it always squashes. GitHub repository policy may still reject it. No branch or worktree is deleted.
-- A Git operation in progress blocks direct merge. An unverified conflict rebase needs manual recovery; a verified rebase can resume through `/pr`. Branches with merge commits since the fork point require manual rebase resolution.
+- A Git operation in progress blocks direct merge. An unverified conflict rebase needs manual recovery; a verified rebase can resume through `/pr`. Rebasing leaves other local branch refs unchanged, even with `rebase.updateRefs=true`. Branches with merge commits since the fork point require manual rebase resolution.
 - Only authenticated GitHub.com and GitHub Enterprise repositories are supported. Resolve ambiguous remotes, unrelated local changes, or GitHub blockers before retrying `/pr`.

package/extensions/pr-update-branch.ts

@@ -257,7 +257,7 @@ export class PullRequestBranchUpdater {
 			if (mergeCommits) throw new Error("Branch update cannot rebase a branch with merge commits; preserve its resolutions manually");
 			await this.freshAuthority(this.authority.head.oid, true);
 			await this.writeRecovery("pending", null);
-			const result = await this.exec("git", ["-c", "core.editor=true", "-c", "rebase.backend=merge", "rebase", "--no-autostash", "--onto", this.authority.base.oid, mergeBase], this.execOptions());
+			const result = await this.exec("git", ["-c", "core.editor=true", "-c", "rebase.backend=merge", "-c", "rebase.updateRefs=false", "rebase", "--no-autostash", "--onto", this.authority.base.oid, mergeBase], this.execOptions());
 			if (result.killed) throw new Error("git rebase was killed; its outcome is unknown");
 			if (result.code === 0) return await this.verifyRebase();
 			try {
@@ -289,7 +289,7 @@ export class PullRequestBranchUpdater {
 			await runChecked(this.exec, "git", ["--literal-pathspecs", "add", "--", ...paths], this.execOptions());
 			const unmerged = parseNulPaths((await runChecked(this.exec, "git", ["diff", "--name-only", "-z", "--diff-filter=U"], this.execOptions())).stdout, "Unmerged paths");
 			if (unmerged.length) throw new Error(`Conflict paths remain unresolved: ${unmerged.join(", ")}`);
-			const result = await this.exec("git", ["-c", "core.editor=true", "rebase", "--continue"], this.execOptions());
+			const result = await this.exec("git", ["-c", "core.editor=true", "-c", "rebase.updateRefs=false", "rebase", "--continue"], this.execOptions());
 			if (result.killed) throw new Error("git rebase continuation was killed; its outcome is unknown");
 			if (result.code === 0) return await this.verifyRebase();
 			return await this.captureConflict();

package/extensions/pr.ts

@@ -432,6 +432,8 @@ export default function pullRequestExtension(
 			selected.controller.signal.throwIfAborted();
 			if (worktree !== selected.worktree) throw new Error("PR workflow worktree is wrong or stale");
 			selected.usedSinceSettlement = true;
+			// Drained follow-ups need not emit before_agent_start; this run has been consumed.
+			selected.queuedPrompt = undefined;
 			return toolResult(await action(selected as Extract<WorkflowContext, { route: Route }>));
 		} finally {
 			signal?.removeEventListener("abort", abortRun);
@@ -783,7 +785,8 @@ export default function pullRequestExtension(
 
 	pi.on("agent_before_settle", async (event, ctx) => {
 		const selected = workflowContext;
-		if (event.outcome !== "completed" || !event.context.canContinue || !selected?.completed ||
+		// Pi evaluates continuation again after this handler queues the next workflow.
+		if (event.outcome !== "completed" || !selected?.completed ||
 			selected.queuedPrompt || selected.sessionGeneration !== sessionGeneration) return;
 		const invocation = [...activeInvocations].find(([, phase]) => phase === "workflow" || phase === "create-workflow")?.[0];
 		if (invocation === undefined) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "6.2.6",
+  "version": "6.2.7",
   "description": "Run /pr to safely discover or link the current pull request, then create, update, address feedback, fix CI, or merge when ready.",
   "keywords": [
     "pi-package",