agentplane 0.3.11 → 0.3.12

package/dist/commands/pr/integrate/cmd.js

@@ -1,5 +1,6 @@
 import path from "node:path";
 import { mapBackendError } from "../../../cli/error-map.js";
+import { exitCodeForError } from "../../../cli/exit-codes.js";
 import { createCliEmitter } from "../../../cli/output.js";
 import { CliError } from "../../../shared/errors.js";
 import { cleanupIntegratedBranch } from "./internal/cleanup.js";
@@ -8,6 +9,7 @@ import { execFileAsync, gitEnv } from "../../shared/git.js";
 import { gitRevParse } from "../../shared/git-ops.js";
 import { finalizeIntegrate } from "./internal/finalize.js";
 import { runMergeCommit, runRebaseFastForward, runSquashMerge } from "./internal/merge.js";
+import { maybeRunPreIntegrateBootstrap } from "./internal/pre-integrate-bootstrap.js";
 import { maybeRunPostIntegrateBootstrap } from "./internal/post-integrate-bootstrap.js";
 import { prepareIntegrate } from "./internal/prepare.js";
 import { resolveWorktreeForIntegrate } from "./internal/worktree.js";
@@ -26,7 +28,7 @@ export async function cmdIntegrate(opts) {
             base: opts.base,
             runVerify: opts.runVerify,
         });
-        const { resolved, loadedConfig, task, prDir, metaPath, diffstatPath, verifyLogPath, metaSource, branch, base, verifyLogText, } = prepared;
+        const { resolved, loadedConfig, task, prDir, metaPath, diffstatPath, verifyLogPath, metaSource, branch, base, verifyLogText, protectedBaseRequiresPrMerge, } = prepared;
         const verifyCommands = prepared.verifyCommands;
         let alreadyVerifiedSha = prepared.alreadyVerifiedSha;
         let shouldRunVerify = prepared.shouldRunVerify;
@@ -34,10 +36,21 @@ export async function cmdIntegrate(opts) {
         const changedPaths = prepared.changedPaths;
         if (opts.dryRun) {
             if (!opts.quiet) {
-                output.success("integrate dry-run", task.id, `base=${base} branch=${branch} verify=${shouldRunVerify ? "yes" : "no"}`);
+                output.success("integrate dry-run", task.id, `base=${base} branch=${branch} verify=${shouldRunVerify ? "yes" : "no"} route=${protectedBaseRequiresPrMerge ? "github-pr" : "local"}`);
             }
             return 0;
         }
+        if (protectedBaseRequiresPrMerge) {
+            const prHint = typeof metaSource.pr_number === "number" && metaSource.pr_number > 0
+                ? `GitHub PR #${metaSource.pr_number}`
+                : `the GitHub PR for branch ${branch}`;
+            throw new CliError({
+                exitCode: exitCodeForError("E_GIT"),
+                code: "E_GIT",
+                message: `Base branch ${base} requires GitHub pull-request merges; integrate will not mutate it locally. ` +
+                    `Merge ${prHint} on GitHub, let Task Hosted Close finish the closure tail, then pull ${base}.`,
+            });
+        }
         const wt = await resolveWorktreeForIntegrate({
             gitRoot: resolved.gitRoot,
             worktreesDirRel: loadedConfig.paths.worktrees_dir,
@@ -66,6 +79,18 @@ export async function cmdIntegrate(opts) {
                 taskId: task.id,
             })));
         }
+        const preBootstrapResult = await maybeRunPreIntegrateBootstrap({
+            gitRoot: resolved.gitRoot,
+            changedPaths,
+        });
+        if (preBootstrapResult.status === "failed") {
+            throw new CliError({
+                exitCode: 8,
+                code: "E_RUNTIME",
+                message: "Unable to prepare the base worktree for integrate: automatic repo-local runtime refresh " +
+                    `failed (${preBootstrapResult.error}). Run \`bun run framework:dev:bootstrap\` in ${resolved.gitRoot} and retry integrate.`,
+            });
+        }
         const baseShaBeforeMerge = await gitRevParse(resolved.gitRoot, [base]);
         const headBeforeMerge = await gitRevParse(resolved.gitRoot, ["HEAD"]);
         let mergeHash = "";

package/dist/commands/pr/integrate/internal/cleanup.d.ts

@@ -1,12 +1,2 @@
-export type IntegrateCleanupResult = {
-    removedBranch: boolean;
-    removedWorktree: boolean;
-    worktreePath: string | null;
-    skippedReason: "outside_repo" | "current_worktree" | null;
-};
-export declare function cleanupIntegratedBranch(opts: {
-    gitRoot: string;
-    branch: string;
-    worktreePathHint?: string | null;
-}): Promise<IntegrateCleanupResult>;
+export { cleanupMergedLocalBranch as cleanupIntegratedBranch, type MergedBranchCleanupResult as IntegrateCleanupResult, } from "../../../shared/merged-branch-cleanup.js";
 //# sourceMappingURL=cleanup.d.ts.map

package/dist/commands/pr/integrate/internal/cleanup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/cleanup.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,EAAE,cAAc,GAAG,kBAAkB,GAAG,IAAI,CAAC;CAC3D,CAAC;AAEF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA4ClC"}
+{"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,IAAI,uBAAuB,EACnD,KAAK,yBAAyB,IAAI,sBAAsB,GACzD,MAAM,0CAA0C,CAAC"}

package/dist/commands/pr/integrate/internal/cleanup.js

@@ -1,46 +1 @@
-import { execFileAsync, gitEnv } from "../../../shared/git.js";
-import { gitBranchExists } from "../../../shared/git-ops.js";
-import { findWorktreeForBranch } from "../../../shared/git-worktree.js";
-import { isPathWithin, resolvePathFallback } from "../../../shared/path.js";
-export async function cleanupIntegratedBranch(opts) {
-    const repoRoot = await resolvePathFallback(opts.gitRoot);
-    const discoveredWorktree = await findWorktreeForBranch(opts.gitRoot, opts.branch);
-    const rawWorktreePath = discoveredWorktree ?? opts.worktreePathHint ?? null;
-    const worktreePath = rawWorktreePath ? await resolvePathFallback(rawWorktreePath) : null;
-    if (worktreePath) {
-        if (!isPathWithin(repoRoot, worktreePath)) {
-            return {
-                removedBranch: false,
-                removedWorktree: false,
-                worktreePath,
-                skippedReason: "outside_repo",
-            };
-        }
-        if (worktreePath === repoRoot) {
-            return {
-                removedBranch: false,
-                removedWorktree: false,
-                worktreePath,
-                skippedReason: "current_worktree",
-            };
-        }
-        await execFileAsync("git", ["worktree", "remove", "--force", worktreePath], {
-            cwd: opts.gitRoot,
-            env: gitEnv(),
-        });
-    }
-    let removedBranch = false;
-    if (await gitBranchExists(opts.gitRoot, opts.branch)) {
-        await execFileAsync("git", ["branch", "-D", opts.branch], {
-            cwd: opts.gitRoot,
-            env: gitEnv(),
-        });
-        removedBranch = true;
-    }
-    return {
-        removedBranch,
-        removedWorktree: Boolean(worktreePath),
-        worktreePath,
-        skippedReason: null,
-    };
-}
+export { cleanupMergedLocalBranch as cleanupIntegratedBranch, } from "../../../shared/merged-branch-cleanup.js";

package/dist/commands/pr/integrate/internal/finalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"finalize.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/finalize.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAiBrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAUtE,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAC;IACpB,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,aAAa,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;IAEzB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwGhB"}
+{"version":3,"file":"finalize.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/finalize.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAiBrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAUtE,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAC;IACpB,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,aAAa,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;IAEzB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2GhB"}

package/dist/commands/pr/integrate/internal/finalize.js

@@ -101,6 +101,9 @@ export async function finalizeIntegrate(opts) {
         baseBranchOverride: opts.base,
         quiet: opts.quiet,
         allowPolicy: collectedIncidents.wrote,
+        // finalizeIntegrate already wrote the canonical MERGED task packet on the base checkout.
+        // Re-running branch-side PR artifact refresh here can regress pr/meta.json back to OPEN.
+        closeRefreshTaskArtifacts: false,
     });
     if (!opts.quiet) {
         output.success("integrate", opts.taskId, `merge=${opts.mergeHash.slice(0, 12)}`);

package/dist/commands/pr/integrate/internal/github-protection.d.ts

@@ -0,0 +1,5 @@
+export declare function requiresPullRequestMergePath(opts: {
+    gitRoot: string;
+    baseBranch: string;
+}): Promise<boolean>;
+//# sourceMappingURL=github-protection.d.ts.map

package/dist/commands/pr/integrate/internal/github-protection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"github-protection.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/github-protection.ts"],"names":[],"mappings":"AAMA,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,OAAO,CAAC,CAUnB"}

package/dist/commands/pr/integrate/internal/github-protection.js

@@ -0,0 +1,13 @@
+import { resolveDefaultGithubRepo, runGhApiJson } from "../../internal/gh-api.js";
+export async function requiresPullRequestMergePath(opts) {
+    try {
+        const repo = await resolveDefaultGithubRepo(opts.gitRoot);
+        const protection = await runGhApiJson(opts.gitRoot, [
+            `repos/${repo}/branches/${opts.baseBranch}/protection`,
+        ]);
+        return protection.required_pull_request_reviews !== undefined;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/commands/pr/integrate/internal/pre-integrate-bootstrap.d.ts

@@ -0,0 +1,15 @@
+export type PreIntegrateBootstrapResult = {
+    status: "not-needed";
+} | {
+    status: "skipped";
+} | {
+    status: "ran";
+} | {
+    status: "failed";
+    error: string;
+};
+export declare function maybeRunPreIntegrateBootstrap(opts: {
+    gitRoot: string;
+    changedPaths: string[];
+}): Promise<PreIntegrateBootstrapResult>;
+//# sourceMappingURL=pre-integrate-bootstrap.d.ts.map

package/dist/commands/pr/integrate/internal/pre-integrate-bootstrap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pre-integrate-bootstrap.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/pre-integrate-bootstrap.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,2BAA2B,GACnC;IAAE,MAAM,EAAE,YAAY,CAAA;CAAE,GACxB;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,KAAK,CAAA;CAAE,GACjB;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAkBxC,wBAAsB,6BAA6B,CAAC,IAAI,EAAE;IACxD,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAiBvC"}

package/dist/commands/pr/integrate/internal/pre-integrate-bootstrap.js

@@ -0,0 +1,35 @@
+import { existsSync } from "node:fs";
+import path from "node:path";
+import { execFileAsync } from "../../../shared/git.js";
+import { shouldAutoBootstrapAfterIntegrate } from "./bootstrap-guidance.js";
+function compactError(err) {
+    if (err instanceof Error) {
+        const text = err.message.trim();
+        return text.length > 0 ? text : err.name;
+    }
+    return String(err);
+}
+function baseRuntimeReady(gitRoot) {
+    return (existsSync(path.join(gitRoot, "node_modules")) &&
+        existsSync(path.join(gitRoot, "packages", "agentplane", "node_modules")) &&
+        existsSync(path.join(gitRoot, "packages", "agentplane", "dist", "cli.js")));
+}
+export async function maybeRunPreIntegrateBootstrap(opts) {
+    if (baseRuntimeReady(opts.gitRoot)) {
+        return { status: "not-needed" };
+    }
+    if (!shouldAutoBootstrapAfterIntegrate(opts)) {
+        return { status: "skipped" };
+    }
+    try {
+        await execFileAsync("bun", ["run", "framework:dev:bootstrap"], {
+            cwd: opts.gitRoot,
+            env: { ...process.env },
+            maxBuffer: 50 * 1024 * 1024,
+        });
+        return { status: "ran" };
+    }
+    catch (err) {
+        return { status: "failed", error: compactError(err) };
+    }
+}

package/dist/commands/pr/integrate/internal/prepare.d.ts

@@ -8,6 +8,7 @@ export type PreparedIntegrate = {
     task: TaskData;
     baseBranch: string;
     currentBranch: string;
+    protectedBaseRequiresPrMerge: boolean;
     prDir: string;
     metaPath: string;
     diffstatPath: string;

package/dist/commands/pr/integrate/internal/prepare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/prepare.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAUrE,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,iCAAiC,CAAC;AAWzC,OAAO,EAAgC,KAAK,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGvF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,cAAc,CAAC;IACpB,QAAQ,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC5C,YAAY,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,EAAE,QAAQ,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IAEtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IAEtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IAEb,aAAa,EAAE,MAAM,CAAC;IAEtB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;CACpB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAyO7B"}
+{"version":3,"file":"prepare.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/prepare.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAUrE,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,iCAAiC,CAAC;AAWzC,OAAO,EAAgC,KAAK,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAIvF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,cAAc,CAAC;IACpB,QAAQ,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC5C,YAAY,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,EAAE,QAAQ,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,4BAA4B,EAAE,OAAO,CAAC;IAEtC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IAEtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IAEb,aAAa,EAAE,MAAM,CAAC;IAEtB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;CACpB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAgP7B"}

package/dist/commands/pr/integrate/internal/prepare.js

@@ -17,6 +17,7 @@ import { readAndValidatePrArtifacts, ensureCommittedPrArtifactsOnBranch } from "
 import { computeVerifyState } from "../verify.js";
 import { parsePrMetaForwardCompatible } from "../../../shared/pr-meta.js";
 import { assessPrArtifactFreshness } from "../../internal/freshness.js";
+import { requiresPullRequestMergePath } from "./github-protection.js";
 export async function prepareIntegrate(opts) {
     const ctx = opts.ctx ??
         (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
@@ -132,6 +133,10 @@ export async function prepareIntegrate(opts) {
         preferBranchSnapshot: true,
         branchSnapshotBranch: branch,
     });
+    const protectedBaseRequiresPrMerge = await requiresPullRequestMergePath({
+        gitRoot: resolved.gitRoot,
+        baseBranch: base,
+    });
     const changedPaths = await gitDiffNames(resolved.gitRoot, base, branch);
     const tasksPath = loadedConfig.paths.tasks_path;
     if (changedPaths.includes(tasksPath)) {
@@ -145,6 +150,7 @@ export async function prepareIntegrate(opts) {
     let freshness = await assessPrArtifactFreshness({
         gitRoot: resolved.gitRoot,
         workflowDir: loadedConfig.paths.workflow_dir,
+        tasksPath: loadedConfig.paths.tasks_path,
         taskId: opts.taskId,
         branchHeadSha,
         metaHeadSha: metaSource.head_sha ?? null,
@@ -181,6 +187,7 @@ export async function prepareIntegrate(opts) {
             freshness = await assessPrArtifactFreshness({
                 gitRoot: resolved.gitRoot,
                 workflowDir: loadedConfig.paths.workflow_dir,
+                tasksPath: loadedConfig.paths.tasks_path,
                 taskId: opts.taskId,
                 branchHeadSha,
                 metaHeadSha: repairedMetaSource.head_sha ?? null,
@@ -218,6 +225,7 @@ export async function prepareIntegrate(opts) {
         task,
         baseBranch,
         currentBranch,
+        protectedBaseRequiresPrMerge,
         prDir,
         metaPath,
         diffstatPath,

package/dist/commands/pr/internal/auto-commit.d.ts

@@ -0,0 +1,7 @@
+import type { CommandContext } from "../../shared/task-backend.js";
+export declare function maybeAutoCommitTaskPrArtifacts(opts: {
+    ctx: CommandContext;
+    taskId: string;
+    branch: string;
+}): Promise<boolean>;
+//# sourceMappingURL=auto-commit.d.ts.map

package/dist/commands/pr/internal/auto-commit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-commit.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/auto-commit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AA6BnE,wBAAsB,8BAA8B,CAAC,IAAI,EAAE;IACzD,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,OAAO,CAAC,CA8CnB"}

package/dist/commands/pr/internal/auto-commit.js

@@ -0,0 +1,64 @@
+import path from "node:path";
+import { extractTaskSuffix } from "@agentplaneorg/core";
+import { buildGitCommitEnv } from "../../guard/impl/env.js";
+import { toGitPath } from "../../shared/git-diff.js";
+import { execFileAsync, gitEnv } from "../../shared/git.js";
+import { gitCurrentBranch } from "../../shared/git-ops.js";
+function taskPrDirPrefix(workflowDir, taskId) {
+    return `${toGitPath(path.join(workflowDir, taskId, "pr"))}/`;
+}
+function isTaskPrArtifactPath(opts) {
+    return toGitPath(opts.relPath).startsWith(taskPrDirPrefix(opts.workflowDir, opts.taskId));
+}
+async function readCachedPaths(gitRoot) {
+    const { stdout } = await execFileAsync("git", ["diff", "--cached", "--name-only", "--relative"], {
+        cwd: gitRoot,
+        env: gitEnv(),
+    });
+    return stdout
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0);
+}
+function taskPrArtifactRefreshMessage(taskId) {
+    return `📝 ${extractTaskSuffix(taskId)} task: refresh PR artifacts`;
+}
+export async function maybeAutoCommitTaskPrArtifacts(opts) {
+    if (opts.ctx.config.workflow_mode !== "branch_pr")
+        return false;
+    const branchText = await gitCurrentBranch(opts.ctx.resolvedProject.gitRoot);
+    const currentBranch = branchText.trim();
+    if (!currentBranch || currentBranch !== opts.branch.trim())
+        return false;
+    const changedPaths = await opts.ctx.git.statusChangedPaths();
+    const prArtifactPaths = changedPaths.filter((relPath) => isTaskPrArtifactPath({
+        workflowDir: opts.ctx.config.paths.workflow_dir,
+        taskId: opts.taskId,
+        relPath,
+    }));
+    if (prArtifactPaths.length === 0)
+        return false;
+    const cachedPaths = await readCachedPaths(opts.ctx.resolvedProject.gitRoot);
+    if (cachedPaths.some((relPath) => !isTaskPrArtifactPath({
+        workflowDir: opts.ctx.config.paths.workflow_dir,
+        taskId: opts.taskId,
+        relPath,
+    }))) {
+        return false;
+    }
+    await opts.ctx.git.stage(prArtifactPaths);
+    await opts.ctx.git.commit({
+        message: taskPrArtifactRefreshMessage(opts.taskId),
+        env: buildGitCommitEnv({
+            taskId: opts.taskId,
+            allowTasks: true,
+            allowBase: false,
+            allowPolicy: false,
+            allowConfig: false,
+            allowHooks: false,
+            allowCI: false,
+        }),
+    });
+    opts.ctx.git.invalidateStatus();
+    return true;
+}

package/dist/commands/pr/internal/freshness.d.ts

@@ -8,6 +8,7 @@ export type PrArtifactFreshness = {
 export declare function assessPrArtifactFreshness(opts: {
     gitRoot: string;
     workflowDir: string;
+    tasksPath?: string;
     taskId: string;
     branchHeadSha: string;
     metaHeadSha: unknown;

package/dist/commands/pr/internal/freshness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"freshness.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/freshness.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;CACzB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAgD/B"}
+{"version":3,"file":"freshness.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/freshness.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;CACzB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAkD/B"}

package/dist/commands/pr/internal/freshness.js

@@ -15,6 +15,7 @@ export async function assessPrArtifactFreshness(opts) {
         (await isTaskLocalOnlyAdvance({
             gitRoot: opts.gitRoot,
             workflowDir: opts.workflowDir,
+            tasksPath: opts.tasksPath,
             taskId: opts.taskId,
             fromRef: metaHeadSha,
             toRef: opts.branchHeadSha,
@@ -33,6 +34,7 @@ export async function assessPrArtifactFreshness(opts) {
             (await isTaskLocalOnlyAdvance({
                 gitRoot: opts.gitRoot,
                 workflowDir: opts.workflowDir,
+                tasksPath: opts.tasksPath,
                 taskId: opts.taskId,
                 fromRef: metaLastVerifiedSha,
                 toRef: opts.branchHeadSha,

package/dist/commands/pr/internal/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/sync.ts"],"names":[],"mappings":"AAqBA,OAAO,EAML,KAAK,MAAM,EACZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAsFtC,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,WAAW,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,iBAAiB,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC/D,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAyOF,KAAK,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC;AAmCpC,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/B,GAAG,IAAI,CAAC,CAmDR;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B,GAAG,OAAO,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC,CA6SD"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/sync.ts"],"names":[],"mappings":"AAqBA,OAAO,EAML,KAAK,MAAM,EACZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAoFtC,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,WAAW,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,iBAAiB,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC/D,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAySF,KAAK,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC;AAmCpC,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/B,GAAG,IAAI,CAAC,CAmDR;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B,GAAG,OAAO,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC,CA4TD"}

package/dist/commands/pr/internal/sync.js

@@ -1,6 +1,6 @@
 import { mkdir, readFile, rm } from "node:fs/promises";
 import path from "node:path";
-import { resolveBaseBranch } from "@agentplaneorg/core";
+import { extractTaskSuffix, resolveBaseBranch } from "@agentplaneorg/core";
 import { mapBackendError } from "../../../cli/error-map.js";
 import { exitCodeForError } from "../../../cli/exit-codes.js";
 import { fileExists } from "../../../cli/fs-utils.js";
@@ -9,13 +9,13 @@ import { CliError } from "../../../shared/errors.js";
 import { writeJsonStableIfChanged, writeTextIfChanged } from "../../../shared/write-if-changed.js";
 import { execFileAsync, gitEnv } from "../../shared/git.js";
 import { gitDiffStat } from "../../shared/git-diff.js";
-import { gitCurrentBranch } from "../../shared/git-ops.js";
+import { gitBranchUpstream, gitCurrentBranch } from "../../shared/git-ops.js";
 import { parseTaskIdFromBranch } from "../../shared/git-worktree.js";
 import { isTransientGhTransportError, normalizeGhTransportError, withGhTransportRetry, } from "../../shared/gh-transport.js";
 import { INCIDENTS_POLICY_PATH } from "../../incidents/shared.js";
-import { buildObservedGithubPrMeta, buildOpenedPrMeta, resolvePrArtifactHeadSha, buildUpdatedPrMeta, parsePrMeta, } from "../../shared/pr-meta.js";
-import { loadBackendTask, loadCommandContext, } from "../../shared/task-backend.js";
+import { buildObservedGithubPrMeta, buildOpenedPrMeta, buildUpdatedPrMeta, resolvePrArtifactHeadSha, parsePrMeta, } from "../../shared/pr-meta.js";
 import { isTaskLocalOnlyAdvance } from "../../shared/task-local-freshness.js";
+import { loadBackendTask, loadCommandContext, } from "../../shared/task-backend.js";
 import { resolvePrPaths } from "./pr-paths.js";
 import { readPrHandoffNotes } from "./note-store.js";
 import { ghEnv } from "./gh-api.js";
@@ -147,6 +147,36 @@ function formatGithubPrLink(prNumber, prUrl, verb) {
         ? `${verb} GitHub PR #${prNumber}: ${prUrl.trim()}`
         : `${verb} GitHub PR #${prNumber}`;
 }
+function shouldPersistObservedGithubPrMeta(observed) {
+    if (!observed)
+        return false;
+    return observed.status === "MERGED";
+}
+function taskPrArtifactRefreshMessage(taskId) {
+    return `📝 ${extractTaskSuffix(taskId)} task: refresh PR artifacts`;
+}
+async function resolveRenderableBranchHead(opts) {
+    const branchHeadSha = await resolveBranchHeadSha({
+        gitRoot: opts.gitRoot,
+        branch: opts.branch,
+    });
+    if (!branchHeadSha)
+        return { headSha: null, artifactRefresh: false };
+    try {
+        const { stdout: subjectStdout } = await execFileAsync("git", ["log", "-1", "--pretty=%s", branchHeadSha], {
+            cwd: opts.gitRoot,
+            env: gitEnv(),
+        });
+        const subject = subjectStdout.trim();
+        return {
+            headSha: branchHeadSha,
+            artifactRefresh: subject === taskPrArtifactRefreshMessage(opts.taskId),
+        };
+    }
+    catch {
+        return { headSha: branchHeadSha, artifactRefresh: false };
+    }
+}
 function formatUnpublishedRemoteHeadReason(branch) {
     return (`task branch ${branch} is not yet published on origin; push it with ` +
         `\`git push -u origin ${branch}\` and rerun \`agentplane pr open\``);
@@ -248,8 +278,12 @@ async function resolveBranchHeadSha(opts) {
     }
 }
 async function computePrDiffstat(opts) {
+    const diffBaseRef = await resolvePrDiffBaseRef({
+        gitRoot: opts.gitRoot,
+        baseBranch: opts.baseBranch,
+    });
     try {
-        return await gitDiffStat(opts.gitRoot, opts.baseBranch, opts.branch, {
+        return await gitDiffStat(opts.gitRoot, diffBaseRef, opts.branch, {
             excludePaths: [path.relative(opts.gitRoot, opts.prDir)],
         });
     }
@@ -259,6 +293,24 @@ async function computePrDiffstat(opts) {
         return "";
     }
 }
+async function resolvePrDiffBaseRef(opts) {
+    const upstreamRef = await gitBranchUpstream(opts.gitRoot, opts.baseBranch);
+    const candidate = upstreamRef?.trim() ?? "";
+    if (!candidate)
+        return opts.baseBranch;
+    try {
+        const { stdout } = await execFileAsync("git", ["rev-parse", "--verify", candidate], {
+            cwd: opts.gitRoot,
+            env: gitEnv(),
+        });
+        return stdout.trim() ? candidate : opts.baseBranch;
+    }
+    catch (err) {
+        if (!isUnknownRevisionError(err))
+            throw err;
+        return opts.baseBranch;
+    }
+}
 async function resolvePrSyncBranch(opts) {
     const explicitBranch = opts.branch?.trim() ?? "";
     if (explicitBranch) {
@@ -386,21 +438,28 @@ export async function syncPrArtifacts(opts) {
                 cliBaseOpt: null,
                 mode: config.workflow_mode,
             });
-            const headSha = await resolveBranchHeadSha({ gitRoot: resolved.gitRoot, branch });
+            const { headSha, artifactRefresh } = await resolveRenderableBranchHead({
+                gitRoot: resolved.gitRoot,
+                taskId: task.id,
+                branch,
+            });
             const preservePreviousHead = Boolean(existingMeta?.head_sha) &&
                 Boolean(headSha) &&
                 (await isTaskLocalOnlyAdvance({
                     gitRoot: resolved.gitRoot,
                     workflowDir: config.paths.workflow_dir,
+                    tasksPath: config.paths.tasks_path,
                     taskId: task.id,
                     fromRef: existingMeta?.head_sha ?? null,
                     toRef: headSha,
                 }));
-            const renderedHeadSha = resolvePrArtifactHeadSha({
-                previousHeadSha: existingMeta?.head_sha ?? null,
-                currentHeadSha: headSha,
-                preservePrevious: preservePreviousHead,
-            });
+            const renderedHeadSha = artifactRefresh
+                ? (existingMeta?.head_sha ?? undefined)
+                : resolvePrArtifactHeadSha({
+                    previousHeadSha: existingMeta?.head_sha ?? null,
+                    currentHeadSha: headSha,
+                    preservePrevious: preservePreviousHead,
+                });
             const preservedRenderUpdatedAt = existingMeta &&
                 (existingMeta.branch ?? null) === branch &&
                 (existingMeta.base ?? null) === (baseBranch ?? null) &&
@@ -418,7 +477,9 @@ export async function syncPrArtifacts(opts) {
                         prDir,
                     })
                     : "";
-                const renderedSummaryHeadSha = renderedHeadSha ?? headSha;
+                const renderedSummaryHeadSha = artifactRefresh
+                    ? renderedHeadSha
+                    : (renderedHeadSha ?? headSha);
                 let nextMeta = buildOpenedPrMeta({
                     taskId: task.id,
                     branch,
@@ -441,7 +502,7 @@ export async function syncPrArtifacts(opts) {
                     autoSummary: renderPrAutoSummary({
                         updatedAt: renderUpdatedAt,
                         branch,
-                        headSha: renderedSummaryHeadSha,
+                        headSha: renderedSummaryHeadSha ?? null,
                         diffstat,
                     }),
                 });
@@ -451,11 +512,13 @@ export async function syncPrArtifacts(opts) {
                     baseBranch,
                 });
                 if (observedGithubPr) {
-                    nextMeta = buildObservedGithubPrMeta({
-                        meta: nextMeta,
-                        observed: observedGithubPr,
-                        at: now,
-                    });
+                    if (shouldPersistObservedGithubPrMeta(observedGithubPr)) {
+                        nextMeta = buildObservedGithubPrMeta({
+                            meta: nextMeta,
+                            observed: observedGithubPr,
+                            at: now,
+                        });
+                    }
                     openOutcome = {
                         action: "linked-existing",
                         message: formatGithubPrLink(observedGithubPr.prNumber, observedGithubPr.prUrl, "linked to"),
@@ -476,11 +539,13 @@ export async function syncPrArtifacts(opts) {
                         body: githubBody,
                     });
                     if (createdGithubPr.observed) {
-                        nextMeta = buildObservedGithubPrMeta({
-                            meta: nextMeta,
-                            observed: createdGithubPr.observed,
-                            at: now,
-                        });
+                        if (shouldPersistObservedGithubPrMeta(createdGithubPr.observed)) {
+                            nextMeta = buildObservedGithubPrMeta({
+                                meta: nextMeta,
+                                observed: createdGithubPr.observed,
+                                at: now,
+                            });
+                        }
                         openOutcome = {
                             action: "created",
                             message: formatGithubPrLink(createdGithubPr.observed.prNumber, createdGithubPr.observed.prUrl, "created"),
@@ -496,7 +561,7 @@ export async function syncPrArtifacts(opts) {
                 const nextAutoSummary = renderPrAutoSummary({
                     updatedAt: renderUpdatedAt,
                     branch,
-                    headSha: renderedSummaryHeadSha,
+                    headSha: renderedSummaryHeadSha ?? null,
                     diffstat,
                 });
                 const nextReview = renderPrReviewDocument({
@@ -550,7 +615,7 @@ export async function syncPrArtifacts(opts) {
                 branch,
                 baseBranch,
             });
-            if (observedGithubPr) {
+            if (shouldPersistObservedGithubPrMeta(observedGithubPr)) {
                 nextMeta = buildObservedGithubPrMeta({
                     meta: nextMeta,
                     observed: observedGithubPr,
@@ -560,7 +625,9 @@ export async function syncPrArtifacts(opts) {
             const nextAutoSummary = renderPrAutoSummary({
                 updatedAt: nextMeta.updated_at,
                 branch,
-                headSha: nextMeta.head_sha ?? renderedHeadSha ?? headSha,
+                headSha: artifactRefresh
+                    ? (nextMeta.head_sha ?? renderedHeadSha ?? null)
+                    : (nextMeta.head_sha ?? renderedHeadSha ?? headSha ?? null),
                 diffstat,
             });
             const nextReview = renderPrReviewDocument({

package/dist/commands/pr/open.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/open.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAiBhE,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiClB"}
+{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/open.ts"],"names":[],"mappings":"AAMA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAkBpF,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2ClB"}