agentplane 0.3.10 → 0.3.12

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

@@ -1,6 +1,6 @@
-import { mkdir, readFile } from "node:fs/promises";
+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";
@@ -8,19 +8,260 @@ import { workflowModeMessage } from "../../../cli/output.js";
 import { CliError } from "../../../shared/errors.js";
 import { writeJsonStableIfChanged, writeTextIfChanged } from "../../../shared/write-if-changed.js";
 import { execFileAsync, gitEnv } from "../../shared/git.js";
-import { gitCurrentBranch } from "../../shared/git-ops.js";
+import { gitDiffStat } from "../../shared/git-diff.js";
+import { gitBranchUpstream, gitCurrentBranch } from "../../shared/git-ops.js";
 import { parseTaskIdFromBranch } from "../../shared/git-worktree.js";
-import { buildOpenedPrMeta, buildUpdatedPrMeta, parsePrMeta, } from "../../shared/pr-meta.js";
+import { isTransientGhTransportError, normalizeGhTransportError, withGhTransportRetry, } from "../../shared/gh-transport.js";
+import { INCIDENTS_POLICY_PATH } from "../../incidents/shared.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";
 import { buildGithubPrTitle, renderGithubPrBody, renderPrAutoSummary, renderPrReviewDocument, } from "./review-template.js";
 function nowIso() {
     return new Date().toISOString();
 }
+async function readTextIfExists(filePath) {
+    try {
+        return await readFile(filePath, "utf8");
+    }
+    catch (err) {
+        const code = err?.code;
+        if (code === "ENOENT")
+            return null;
+        throw err;
+    }
+}
+async function restoreIncidentRegistryIfNeeded(opts) {
+    const incidentsPath = path.join(opts.gitRoot, INCIDENTS_POLICY_PATH);
+    const nextText = await readTextIfExists(incidentsPath);
+    if (nextText === opts.previousText)
+        return;
+    if (opts.previousText === null) {
+        await rm(incidentsPath, { force: true });
+        return;
+    }
+    await writeTextIfChanged(incidentsPath, opts.previousText);
+}
 function isUnknownRevisionError(err) {
     const message = err instanceof Error ? err.message : String(err);
-    return /unknown revision or path not in the working tree/i.test(message);
+    return (/unknown revision or path not in the working tree/i.test(message) ||
+        /bad revision/i.test(message) ||
+        /ambiguous argument/i.test(message));
+}
+function parseGithubRepoFromRemoteUrl(remoteUrl) {
+    const trimmed = remoteUrl.trim();
+    if (!trimmed)
+        return null;
+    const httpsMatch = /^https?:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?\/?$/.exec(trimmed);
+    if (httpsMatch)
+        return `${httpsMatch[1]}/${httpsMatch[2]}`;
+    const sshMatch = /^git@github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/.exec(trimmed);
+    if (sshMatch)
+        return `${sshMatch[1]}/${sshMatch[2]}`;
+    return null;
+}
+async function resolveGithubRepoFromOrigin(gitRoot) {
+    try {
+        const { stdout } = await execFileAsync("git", ["remote", "get-url", "origin"], {
+            cwd: gitRoot,
+            env: gitEnv(),
+        });
+        return parseGithubRepoFromRemoteUrl(stdout);
+    }
+    catch {
+        return null;
+    }
+}
+function normalizeObservedGithubPr(record) {
+    const number = Number(record.number);
+    if (!Number.isInteger(number) || number <= 0)
+        return null;
+    const state = record.state?.trim().toLowerCase() ?? "";
+    const mergedAt = record.merged_at?.trim() ?? null;
+    const status = mergedAt && mergedAt.length > 0
+        ? "MERGED"
+        : state === "open"
+            ? "OPEN"
+            : state === "closed"
+                ? "CLOSED"
+                : null;
+    if (!status)
+        return null;
+    const prUrl = record.html_url?.trim() ?? null;
+    const mergeCommit = record.merge_commit_sha?.trim() ?? null;
+    const base = record.base?.ref?.trim() ?? null;
+    const headSha = record.head?.sha?.trim() ?? null;
+    return {
+        prNumber: number,
+        prUrl,
+        status,
+        mergedAt,
+        mergeCommit,
+        base,
+        headSha,
+    };
+}
+async function tryLookupExistingGithubPrByBranch(opts) {
+    const repo = await resolveGithubRepoFromOrigin(opts.gitRoot);
+    if (!repo)
+        return null;
+    const owner = repo.split("/")[0]?.trim() ?? "";
+    if (!owner)
+        return null;
+    const query = new URLSearchParams({ state: "all", head: `${owner}:${opts.branch}` });
+    const baseBranch = opts.baseBranch?.trim() ?? "";
+    if (baseBranch)
+        query.set("base", baseBranch);
+    const endpoint = `repos/${repo}/pulls?${query.toString()}`;
+    try {
+        const { stdout } = await withGhTransportRetry(() => execFileAsync("gh", ["api", endpoint], {
+            cwd: opts.gitRoot,
+            env: ghEnv(),
+            maxBuffer: 10 * 1024 * 1024,
+        }), { label: `running gh api ${endpoint}` });
+        const parsed = JSON.parse(stdout);
+        if (!Array.isArray(parsed) || parsed.length === 0)
+            return null;
+        for (const record of parsed) {
+            const observed = normalizeObservedGithubPr(record);
+            if (observed)
+                return observed;
+        }
+        return null;
+    }
+    catch (err) {
+        const code = err?.code;
+        if (code === "ENOENT")
+            return null;
+        const message = normalizeGhTransportError(err);
+        if (message.trim().length > 0)
+            return null;
+        return null;
+    }
+}
+function formatGithubPrLink(prNumber, prUrl, verb) {
+    return prUrl?.trim()
+        ? `${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\``);
+}
+function isMissingRemoteHeadCreateError(err) {
+    const text = normalizeGhTransportError(err);
+    if (!/\b422\b/i.test(text))
+        return false;
+    return (/head sha/i.test(text) ||
+        /head ref/i.test(text) ||
+        /head.*must be a branch/i.test(text) ||
+        /head.*not found/i.test(text) ||
+        /field["']?\s*:\s*["']head["']/i.test(text) ||
+        /field\s+head\b/i.test(text) ||
+        /no commits between/i.test(text));
+}
+function summarizeGithubPrCreateFailure(err) {
+    const text = normalizeGhTransportError(err);
+    if (err?.code === "ENOENT") {
+        return "gh CLI is unavailable";
+    }
+    if (/authentication required/i.test(text) ||
+        /not logged into github/i.test(text) ||
+        /bad credentials/i.test(text) ||
+        /permission denied/i.test(text) ||
+        /\b401\b/i.test(text) ||
+        /\b403\b/i.test(text)) {
+        return "GitHub auth or permissions unavailable";
+    }
+    if (isTransientGhTransportError(err)) {
+        return "GitHub transport failed; retry `agentplane pr open`";
+    }
+    return "GitHub PR creation failed";
+}
+async function tryCreateGithubPr(opts) {
+    const repo = await resolveGithubRepoFromOrigin(opts.gitRoot);
+    if (!repo) {
+        return {
+            observed: null,
+            stagedReason: "GitHub origin repo unavailable",
+        };
+    }
+    const baseBranch = opts.baseBranch?.trim() ?? "";
+    if (!baseBranch) {
+        return {
+            observed: null,
+            stagedReason: "base branch unresolved",
+        };
+    }
+    try {
+        const { stdout } = await withGhTransportRetry(() => execFileAsync("gh", [
+            "api",
+            `repos/${repo}/pulls`,
+            "-X",
+            "POST",
+            "-f",
+            `title=${opts.title}`,
+            "-f",
+            `body=${opts.body}`,
+            "-f",
+            `head=${opts.branch}`,
+            "-f",
+            `base=${baseBranch}`,
+        ], {
+            cwd: opts.gitRoot,
+            env: ghEnv(),
+            maxBuffer: 10 * 1024 * 1024,
+        }), { label: `running gh api repos/${repo}/pulls` });
+        return {
+            observed: normalizeObservedGithubPr(JSON.parse(stdout)),
+            stagedReason: null,
+        };
+    }
+    catch (err) {
+        if (isMissingRemoteHeadCreateError(err)) {
+            return {
+                observed: null,
+                stagedReason: formatUnpublishedRemoteHeadReason(opts.branch),
+            };
+        }
+        return {
+            observed: null,
+            stagedReason: summarizeGithubPrCreateFailure(err),
+        };
+    }
 }
 async function resolveBranchHeadSha(opts) {
     try {
@@ -36,6 +277,40 @@ async function resolveBranchHeadSha(opts) {
         return null;
     }
 }
+async function computePrDiffstat(opts) {
+    const diffBaseRef = await resolvePrDiffBaseRef({
+        gitRoot: opts.gitRoot,
+        baseBranch: opts.baseBranch,
+    });
+    try {
+        return await gitDiffStat(opts.gitRoot, diffBaseRef, opts.branch, {
+            excludePaths: [path.relative(opts.gitRoot, opts.prDir)],
+        });
+    }
+    catch (err) {
+        if (!isUnknownRevisionError(err))
+            throw err;
+        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) {
@@ -57,7 +332,7 @@ async function resolvePrSyncBranch(opts) {
 export async function ensurePrArtifactsSynced(opts) {
     const ctx = opts.ctx ??
         (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
-    const { resolved, config, metaPath } = await resolvePrPaths({ ...opts, ctx });
+    const { resolved, config, prDir, metaPath } = await resolvePrPaths({ ...opts, ctx });
     if (config.workflow_mode !== "branch_pr")
         return null;
     const resolvedBranch = await resolvePrSyncBranch({
@@ -82,13 +357,18 @@ export async function ensurePrArtifactsSynced(opts) {
     if (resolvedBranch.source === "current" && baseBranch && branch === baseBranch) {
         return null;
     }
-    await syncPrArtifacts({
-        ...opts,
-        ctx,
-        mode: "open",
-        author: opts.author,
-        branch,
-    });
+    const reviewPath = path.join(prDir, "review.md");
+    const artifactsExist = (await fileExists(metaPath)) && (await fileExists(reviewPath));
+    if (!artifactsExist) {
+        await syncPrArtifacts({
+            ...opts,
+            ctx,
+            mode: "open",
+            author: opts.author,
+            branch,
+            remoteMode: "sync-only",
+        });
+    }
     const result = await syncPrArtifacts({
         ...opts,
         ctx,
@@ -108,73 +388,250 @@ export async function syncPrArtifacts(opts) {
             taskId: opts.taskId,
         });
         const { resolved, config, prDir, metaPath, diffstatPath, notesPath, verifyLogPath, reviewPath, githubTitlePath, githubBodyPath, } = await resolvePrPaths({ ...opts, ctx });
-        if (config.workflow_mode !== "branch_pr") {
-            throw new CliError({
-                exitCode: exitCodeForError("E_USAGE"),
-                code: "E_USAGE",
-                message: workflowModeMessage(config.workflow_mode, "branch_pr"),
-            });
-        }
-        const resolvedBranch = await resolvePrSyncBranch({
-            resolved,
-            metaPath,
-            taskId: task.id,
-            branch: opts.branch,
-        });
-        const branch = resolvedBranch.branch?.trim() ?? "";
-        if (!branch) {
-            throw new CliError({
-                exitCode: exitCodeForError("E_USAGE"),
-                code: "E_USAGE",
-                message: "Branch could not be resolved (use --branch).",
+        const incidentsTextBefore = await readTextIfExists(path.join(resolved.gitRoot, INCIDENTS_POLICY_PATH));
+        try {
+            if (config.workflow_mode !== "branch_pr") {
+                throw new CliError({
+                    exitCode: exitCodeForError("E_USAGE"),
+                    code: "E_USAGE",
+                    message: workflowModeMessage(config.workflow_mode, "branch_pr"),
+                });
+            }
+            const resolvedBranch = await resolvePrSyncBranch({
+                resolved,
+                metaPath,
+                taskId: task.id,
+                branch: opts.branch,
             });
-        }
-        const metaExists = await fileExists(metaPath);
-        const reviewExists = await fileExists(reviewPath);
-        if (opts.mode === "update" && (!metaExists || !reviewExists)) {
-            const missing = [];
-            if (!metaExists)
-                missing.push(path.relative(resolved.gitRoot, metaPath));
-            if (!reviewExists)
-                missing.push(path.relative(resolved.gitRoot, reviewPath));
-            throw new CliError({
-                exitCode: exitCodeForError("E_VALIDATION"),
-                code: "E_VALIDATION",
-                message: `PR artifacts missing: ${missing.join(", ")} (run \`agentplane pr open\`)`,
+            const branch = resolvedBranch.branch?.trim() ?? "";
+            if (!branch) {
+                throw new CliError({
+                    exitCode: exitCodeForError("E_USAGE"),
+                    code: "E_USAGE",
+                    message: "Branch could not be resolved (use --branch).",
+                });
+            }
+            const metaExists = await fileExists(metaPath);
+            const reviewExists = await fileExists(reviewPath);
+            if (opts.mode === "update" && (!metaExists || !reviewExists)) {
+                const missing = [];
+                if (!metaExists)
+                    missing.push(path.relative(resolved.gitRoot, metaPath));
+                if (!reviewExists)
+                    missing.push(path.relative(resolved.gitRoot, reviewPath));
+                throw new CliError({
+                    exitCode: exitCodeForError("E_VALIDATION"),
+                    code: "E_VALIDATION",
+                    message: `PR artifacts missing: ${missing.join(", ")} (run \`agentplane pr open\`)`,
+                });
+            }
+            await mkdir(prDir, { recursive: true });
+            const existingMeta = metaExists && (await fileExists(metaPath))
+                ? parsePrMeta(await readFile(metaPath, "utf8"), task.id)
+                : null;
+            const handoffNotes = await readPrHandoffNotes(notesPath);
+            const now = nowIso();
+            const createdAt = existingMeta?.created_at ?? now;
+            const baseBranch = await resolveBaseBranch({
+                cwd: opts.cwd,
+                rootOverride: opts.rootOverride ?? null,
+                cliBaseOpt: null,
+                mode: config.workflow_mode,
             });
-        }
-        await mkdir(prDir, { recursive: true });
-        const existingMeta = metaExists && (await fileExists(metaPath))
-            ? parsePrMeta(await readFile(metaPath, "utf8"), task.id)
-            : null;
-        const handoffNotes = await readPrHandoffNotes(notesPath);
-        const now = nowIso();
-        const createdAt = existingMeta?.created_at ?? now;
-        const baseBranch = await resolveBaseBranch({
-            cwd: opts.cwd,
-            rootOverride: opts.rootOverride ?? null,
-            cliBaseOpt: null,
-            mode: config.workflow_mode,
-        });
-        const headSha = await resolveBranchHeadSha({ gitRoot: resolved.gitRoot, branch });
-        if (opts.mode === "open") {
-            const nextMeta = buildOpenedPrMeta({
+            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 = 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) &&
+                (existingMeta.head_sha ?? null) === (renderedHeadSha ?? null)
+                ? existingMeta.updated_at
+                : null;
+            const renderUpdatedAt = preservedRenderUpdatedAt ?? now;
+            if (opts.mode === "open") {
+                const remoteMode = opts.remoteMode ?? "auto";
+                const diffstat = baseBranch
+                    ? await computePrDiffstat({
+                        gitRoot: resolved.gitRoot,
+                        baseBranch,
+                        branch,
+                        prDir,
+                    })
+                    : "";
+                const renderedSummaryHeadSha = artifactRefresh
+                    ? renderedHeadSha
+                    : (renderedHeadSha ?? headSha);
+                let nextMeta = buildOpenedPrMeta({
+                    taskId: task.id,
+                    branch,
+                    at: now,
+                    previousMeta: existingMeta,
+                    base: baseBranch,
+                    headSha: renderedHeadSha,
+                });
+                const linkedExistingOutcome = typeof nextMeta.pr_number === "number" && nextMeta.pr_number > 0
+                    ? {
+                        action: "linked-existing",
+                        message: formatGithubPrLink(nextMeta.pr_number, nextMeta.pr_url ?? null, "linked to"),
+                    }
+                    : null;
+                let openOutcome;
+                const githubTitle = buildGithubPrTitle(task);
+                const githubBody = renderGithubPrBody({
+                    task,
+                    handoffNotes,
+                    autoSummary: renderPrAutoSummary({
+                        updatedAt: renderUpdatedAt,
+                        branch,
+                        headSha: renderedSummaryHeadSha ?? null,
+                        diffstat,
+                    }),
+                });
+                const observedGithubPr = await tryLookupExistingGithubPrByBranch({
+                    gitRoot: resolved.gitRoot,
+                    branch,
+                    baseBranch,
+                });
+                if (observedGithubPr) {
+                    if (shouldPersistObservedGithubPrMeta(observedGithubPr)) {
+                        nextMeta = buildObservedGithubPrMeta({
+                            meta: nextMeta,
+                            observed: observedGithubPr,
+                            at: now,
+                        });
+                    }
+                    openOutcome = {
+                        action: "linked-existing",
+                        message: formatGithubPrLink(observedGithubPr.prNumber, observedGithubPr.prUrl, "linked to"),
+                    };
+                }
+                else if (remoteMode === "sync-only") {
+                    openOutcome = linkedExistingOutcome ?? {
+                        action: "sync-only",
+                        message: "local PR artifacts synced; remote PR creation skipped (--sync-only)",
+                    };
+                }
+                else {
+                    const createdGithubPr = await tryCreateGithubPr({
+                        gitRoot: resolved.gitRoot,
+                        branch,
+                        baseBranch,
+                        title: githubTitle,
+                        body: githubBody,
+                    });
+                    if (createdGithubPr.observed) {
+                        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"),
+                        };
+                    }
+                    else {
+                        openOutcome = linkedExistingOutcome ?? {
+                            action: "staged",
+                            message: `local PR artifacts synced; remote PR creation staged (${createdGithubPr.stagedReason ?? "remote creation unavailable"})`,
+                        };
+                    }
+                }
+                const nextAutoSummary = renderPrAutoSummary({
+                    updatedAt: renderUpdatedAt,
+                    branch,
+                    headSha: renderedSummaryHeadSha ?? null,
+                    diffstat,
+                });
+                const nextReview = renderPrReviewDocument({
+                    task,
+                    author: opts.author,
+                    createdAt,
+                    branch,
+                    handoffNotes,
+                    autoSummary: nextAutoSummary,
+                });
+                const nextGithubBody = renderGithubPrBody({
+                    task,
+                    handoffNotes,
+                    autoSummary: nextAutoSummary,
+                });
+                await writeJsonStableIfChanged(metaPath, nextMeta);
+                await writeTextIfChanged(diffstatPath, diffstat ? `${diffstat}\n` : "");
+                if (!(await fileExists(notesPath))) {
+                    await writeTextIfChanged(notesPath, "");
+                }
+                if (!(await fileExists(verifyLogPath))) {
+                    await writeTextIfChanged(verifyLogPath, "");
+                }
+                await writeTextIfChanged(reviewPath, nextReview);
+                await writeTextIfChanged(githubTitlePath, `${githubTitle}\n`);
+                await writeTextIfChanged(githubBodyPath, nextGithubBody);
+                return { meta: nextMeta, prDir, resolved, openOutcome };
+            }
+            if (!baseBranch) {
+                throw new CliError({
+                    exitCode: exitCodeForError("E_USAGE"),
+                    code: "E_USAGE",
+                    message: "Base branch could not be resolved (use `agentplane branch base set`).",
+                });
+            }
+            const diffstat = await computePrDiffstat({
+                gitRoot: resolved.gitRoot,
+                baseBranch,
+                branch,
+                prDir,
+            });
+            let nextMeta = buildUpdatedPrMeta({
+                meta: existingMeta,
+                branch,
                 at: now,
-                previousMeta: existingMeta,
                 base: baseBranch,
-                headSha,
+                headSha: renderedHeadSha,
             });
+            const observedGithubPr = await tryLookupExistingGithubPrByBranch({
+                gitRoot: resolved.gitRoot,
+                branch,
+                baseBranch,
+            });
+            if (shouldPersistObservedGithubPrMeta(observedGithubPr)) {
+                nextMeta = buildObservedGithubPrMeta({
+                    meta: nextMeta,
+                    observed: observedGithubPr,
+                    at: now,
+                });
+            }
             const nextAutoSummary = renderPrAutoSummary({
                 updatedAt: nextMeta.updated_at,
                 branch,
-                headSha,
-                diffstat: "",
+                headSha: artifactRefresh
+                    ? (nextMeta.head_sha ?? renderedHeadSha ?? null)
+                    : (nextMeta.head_sha ?? renderedHeadSha ?? headSha ?? null),
+                diffstat,
             });
             const nextReview = renderPrReviewDocument({
                 task,
-                author: opts.author,
                 createdAt,
                 branch,
                 handoffNotes,
@@ -186,69 +643,19 @@ export async function syncPrArtifacts(opts) {
                 handoffNotes,
                 autoSummary: nextAutoSummary,
             });
-            await writeJsonStableIfChanged(metaPath, nextMeta);
-            if (!(await fileExists(diffstatPath))) {
-                await writeTextIfChanged(diffstatPath, "");
-            }
-            if (!(await fileExists(notesPath))) {
-                await writeTextIfChanged(notesPath, "");
-            }
-            if (!(await fileExists(verifyLogPath))) {
-                await writeTextIfChanged(verifyLogPath, "");
-            }
+            await writeTextIfChanged(diffstatPath, diffstat ? `${diffstat}\n` : "");
             await writeTextIfChanged(reviewPath, nextReview);
             await writeTextIfChanged(githubTitlePath, `${githubTitle}\n`);
             await writeTextIfChanged(githubBodyPath, githubBody);
-            return { prDir, resolved };
+            await writeJsonStableIfChanged(metaPath, nextMeta);
+            return { meta: nextMeta, prDir, resolved };
         }
-        if (!baseBranch) {
-            throw new CliError({
-                exitCode: exitCodeForError("E_USAGE"),
-                code: "E_USAGE",
-                message: "Base branch could not be resolved (use `agentplane branch base set`).",
+        finally {
+            await restoreIncidentRegistryIfNeeded({
+                gitRoot: resolved.gitRoot,
+                previousText: incidentsTextBefore,
             });
         }
-        let diffstat = "";
-        try {
-            const { stdout: diffStatOut } = await execFileAsync("git", ["diff", "--stat", `${baseBranch}...${branch}`], { cwd: resolved.gitRoot, env: gitEnv() });
-            diffstat = diffStatOut.trimEnd();
-        }
-        catch (err) {
-            if (!isUnknownRevisionError(err))
-                throw err;
-        }
-        const nextMeta = buildUpdatedPrMeta({
-            meta: existingMeta,
-            branch,
-            at: now,
-            base: baseBranch,
-            headSha,
-        });
-        const nextAutoSummary = renderPrAutoSummary({
-            updatedAt: nextMeta.updated_at,
-            branch,
-            headSha,
-            diffstat,
-        });
-        const nextReview = renderPrReviewDocument({
-            task,
-            createdAt,
-            branch,
-            handoffNotes,
-            autoSummary: nextAutoSummary,
-        });
-        const githubTitle = buildGithubPrTitle(task);
-        const githubBody = renderGithubPrBody({
-            task,
-            handoffNotes,
-            autoSummary: nextAutoSummary,
-        });
-        await writeTextIfChanged(diffstatPath, diffstat ? `${diffstat}\n` : "");
-        await writeTextIfChanged(reviewPath, nextReview);
-        await writeTextIfChanged(githubTitlePath, `${githubTitle}\n`);
-        await writeTextIfChanged(githubBodyPath, githubBody);
-        await writeJsonStableIfChanged(metaPath, nextMeta);
-        return { prDir, resolved };
     }
     catch (err) {
         if (err instanceof CliError)