agentplane 0.3.10 → 0.3.11

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

@@ -6,24 +6,20 @@ import { exitCodeForError } from "../../../../cli/exit-codes.js";
 import { unknownEntityMessage, workflowModeMessage } from "../../../../cli/output.js";
 import { CliError } from "../../../../shared/errors.js";
 import { ensureGitClean } from "../../../guard/index.js";
-import { gitDiffNames, gitShowFile, toGitPath } from "../../../shared/git-diff.js";
+import { gitDiffNames } from "../../../shared/git-diff.js";
 import { gitBranchExists, gitCurrentBranch, gitRevParse } from "../../../shared/git-ops.js";
-import { loadBackendTask, loadCommandContext, } from "../../../shared/task-backend.js";
+import { findWorktreeForBranch } from "../../../shared/git-worktree.js";
+import { loadCommandContext, loadTaskFromContext, resolveTaskBranchFromContext, } from "../../../shared/task-backend.js";
 import { ensurePlanApprovedIfRequired, ensureVerificationSatisfiedIfRequired, } from "../../../task/shared.js";
-import { resolvePrPaths } from "../../internal/pr-paths.js";
-import { readAndValidatePrArtifacts } from "../artifacts.js";
+import { readPrArtifact, resolvePrPaths } from "../../internal/pr-paths.js";
+import { ensurePrArtifactsSynced } from "../../internal/sync.js";
+import { readAndValidatePrArtifacts, ensureCommittedPrArtifactsOnBranch } from "../artifacts.js";
 import { computeVerifyState } from "../verify.js";
-import { parsePrMeta } from "../../../shared/pr-meta.js";
-import { isTaskLocalOnlyAdvance } from "../../../shared/task-local-freshness.js";
+import { parsePrMetaForwardCompatible } from "../../../shared/pr-meta.js";
+import { assessPrArtifactFreshness } from "../../internal/freshness.js";
 export async function prepareIntegrate(opts) {
     const ctx = opts.ctx ??
         (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
-    const { task } = await loadBackendTask({
-        ctx,
-        cwd: opts.cwd,
-        rootOverride: opts.rootOverride,
-        taskId: opts.taskId,
-    });
     const resolved = ctx.resolvedProject;
     const loadedConfig = ctx.config;
     if (loadedConfig.workflow_mode !== "branch_pr") {
@@ -33,8 +29,6 @@ export async function prepareIntegrate(opts) {
             message: workflowModeMessage(loadedConfig.workflow_mode, "branch_pr"),
         });
     }
-    ensurePlanApprovedIfRequired(task, loadedConfig);
-    ensureVerificationSatisfiedIfRequired(task, loadedConfig);
     await ensureGitClean({ cwd: opts.cwd, rootOverride: opts.rootOverride });
     if (opts.base?.trim().length === 0) {
         throw new CliError({
@@ -73,10 +67,16 @@ export async function prepareIntegrate(opts) {
     let meta = null;
     let branch = (opts.branch ?? "").trim();
     if (await fileExists(metaPath)) {
-        meta = parsePrMeta(await readFile(metaPath, "utf8"), task.id);
+        meta = parsePrMetaForwardCompatible(await readFile(metaPath, "utf8"), opts.taskId);
         if (!branch)
             branch = (meta.branch ?? "").trim();
     }
+    if (!branch) {
+        const inferredBranch = await resolveTaskBranchFromContext({ ctx, taskId: opts.taskId });
+        if (inferredBranch) {
+            branch = inferredBranch;
+        }
+    }
     if (!branch) {
         throw new CliError({
             exitCode: 2,
@@ -91,8 +91,27 @@ export async function prepareIntegrate(opts) {
             message: unknownEntityMessage("branch", branch),
         });
     }
-    const metaSource = meta ??
-        parsePrMeta(await gitShowFile(resolved.gitRoot, branch, toGitPath(path.relative(resolved.gitRoot, metaPath))), task.id);
+    await ensureCommittedPrArtifactsOnBranch({
+        resolved,
+        prDir,
+        branch,
+    });
+    const worktreePath = await findWorktreeForBranch(resolved.gitRoot, branch);
+    const metaText = await readPrArtifact({
+        resolved,
+        prDir,
+        fileName: "meta.json",
+        branch,
+        worktreePath,
+    });
+    if (!metaText) {
+        throw new CliError({
+            exitCode: 4,
+            code: "E_IO",
+            message: `PR artifacts missing: ${path.relative(resolved.gitRoot, metaPath)} (run \`agentplane pr open\`)`,
+        });
+    }
+    let metaSource = parsePrMetaForwardCompatible(metaText, opts.taskId);
     const baseCandidate = opts.base ?? metaSource.base ?? baseBranch;
     const base = typeof baseCandidate === "string" && baseCandidate.trim().length > 0
         ? baseCandidate.trim()
@@ -103,10 +122,16 @@ export async function prepareIntegrate(opts) {
         prDir,
         metaPath,
         branch,
-        taskId: task.id,
+        taskId: opts.taskId,
     });
     // readAndValidatePrArtifacts() throws if verify.log is missing; keep this non-null downstream.
-    const verifyLogText = verifyLogTextMaybe;
+    let verifyLogText = verifyLogTextMaybe;
+    const task = await loadTaskFromContext({
+        ctx,
+        taskId: opts.taskId,
+        preferBranchSnapshot: true,
+        branchSnapshotBranch: branch,
+    });
     const changedPaths = await gitDiffNames(resolved.gitRoot, base, branch);
     const tasksPath = loadedConfig.paths.tasks_path;
     if (changedPaths.includes(tasksPath)) {
@@ -117,33 +142,71 @@ export async function prepareIntegrate(opts) {
         });
     }
     const branchHeadSha = await gitRevParse(resolved.gitRoot, [branch]);
-    const reviewFresh = (metaSource.head_sha ?? null) === branchHeadSha ||
-        (await isTaskLocalOnlyAdvance({
-            gitRoot: resolved.gitRoot,
-            workflowDir: loadedConfig.paths.workflow_dir,
-            taskId: task.id,
-            fromRef: metaSource.head_sha ?? null,
-            toRef: branchHeadSha,
-        }));
-    if (!reviewFresh) {
+    let freshness = await assessPrArtifactFreshness({
+        gitRoot: resolved.gitRoot,
+        workflowDir: loadedConfig.paths.workflow_dir,
+        taskId: opts.taskId,
+        branchHeadSha,
+        metaHeadSha: metaSource.head_sha ?? null,
+        metaLastVerifiedSha: metaSource.last_verified_sha ?? null,
+        metaVerifyStatus: metaSource.verify?.status ?? null,
+        taskVerificationState: task.verification?.state ?? null,
+        verifyLogText,
+        requiresVerify: Boolean(task.verify && task.verify.length > 0),
+    });
+    if (!freshness.reviewFresh && worktreePath) {
+        await ensurePrArtifactsSynced({
+            cwd: worktreePath,
+            taskId: opts.taskId,
+            branch,
+        });
+        const repairedMetaText = await readPrArtifact({
+            resolved,
+            prDir,
+            fileName: "meta.json",
+            branch,
+            worktreePath,
+        });
+        if (repairedMetaText) {
+            const repairedMetaSource = parsePrMetaForwardCompatible(repairedMetaText, opts.taskId);
+            const repairedArtifacts = await readAndValidatePrArtifacts({
+                ctx,
+                resolved,
+                prDir,
+                metaPath,
+                branch,
+                taskId: opts.taskId,
+            });
+            verifyLogText = repairedArtifacts.verifyLogText ?? verifyLogText;
+            freshness = await assessPrArtifactFreshness({
+                gitRoot: resolved.gitRoot,
+                workflowDir: loadedConfig.paths.workflow_dir,
+                taskId: opts.taskId,
+                branchHeadSha,
+                metaHeadSha: repairedMetaSource.head_sha ?? null,
+                metaLastVerifiedSha: repairedMetaSource.last_verified_sha ?? null,
+                metaVerifyStatus: repairedMetaSource.verify?.status ?? null,
+                taskVerificationState: task.verification?.state ?? null,
+                verifyLogText,
+                requiresVerify: Boolean(task.verify && task.verify.length > 0),
+            });
+            meta = repairedMetaSource;
+            metaSource = repairedMetaSource;
+        }
+    }
+    if (!freshness.reviewFresh) {
         throw new CliError({
             exitCode: exitCodeForError("E_VALIDATION"),
             code: "E_VALIDATION",
-            message: `PR artifacts stale for ${task.id}: meta.head_sha=${metaSource.head_sha ?? "<missing>"} ` +
+            message: `PR artifacts stale for ${opts.taskId}: meta.head_sha=${metaSource.head_sha ?? "<missing>"} ` +
                 `current_head=${branchHeadSha} (refresh the task branch artifacts before integrate)`,
         });
     }
-    const verifyFresh = (metaSource.last_verified_sha ?? null) === branchHeadSha ||
-        (await isTaskLocalOnlyAdvance({
-            gitRoot: resolved.gitRoot,
-            workflowDir: loadedConfig.paths.workflow_dir,
-            taskId: task.id,
-            fromRef: metaSource.last_verified_sha ?? null,
-            toRef: branchHeadSha,
-        }));
+    ensurePlanApprovedIfRequired(task, loadedConfig);
+    ensureVerificationSatisfiedIfRequired(task, loadedConfig);
     const initialVerifyState = computeVerifyState({
         rawVerify: task.verify,
-        metaLastVerifiedSha: verifyFresh ? branchHeadSha : (metaSource?.last_verified_sha ?? null),
+        metaLastVerifiedSha: freshness.effectiveVerifiedSha,
         verifyLogText,
         branchHeadSha,
         runVerify: opts.runVerify,

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

@@ -0,0 +1,20 @@
+export type PrArtifactFreshness = {
+    reviewFresh: boolean;
+    verifyFresh: boolean;
+    verifySatisfied: boolean;
+    verifyLogSha: string | null;
+    effectiveVerifiedSha: string | null;
+};
+export declare function assessPrArtifactFreshness(opts: {
+    gitRoot: string;
+    workflowDir: string;
+    taskId: string;
+    branchHeadSha: string;
+    metaHeadSha: unknown;
+    metaLastVerifiedSha: unknown;
+    metaVerifyStatus: unknown;
+    taskVerificationState: unknown;
+    verifyLogText: string | null;
+    requiresVerify: boolean;
+}): Promise<PrArtifactFreshness>;
+//# sourceMappingURL=freshness.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,50 @@
+import { extractLastVerifiedSha } from "../../shared/pr-meta.js";
+import { isTaskLocalOnlyAdvance } from "../../shared/task-local-freshness.js";
+function normalizeSha(value) {
+    if (typeof value !== "string")
+        return null;
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : null;
+}
+export async function assessPrArtifactFreshness(opts) {
+    const metaHeadSha = normalizeSha(opts.metaHeadSha);
+    const metaLastVerifiedSha = normalizeSha(opts.metaLastVerifiedSha);
+    const verifyLogSha = normalizeSha(extractLastVerifiedSha(opts.verifyLogText ?? ""));
+    const metaVerifyPassed = opts.metaVerifyStatus === "pass";
+    const reviewFresh = metaHeadSha === opts.branchHeadSha ||
+        (await isTaskLocalOnlyAdvance({
+            gitRoot: opts.gitRoot,
+            workflowDir: opts.workflowDir,
+            taskId: opts.taskId,
+            fromRef: metaHeadSha,
+            toRef: opts.branchHeadSha,
+        }));
+    if (!opts.requiresVerify) {
+        return {
+            reviewFresh,
+            verifyFresh: true,
+            verifySatisfied: true,
+            verifyLogSha,
+            effectiveVerifiedSha: null,
+        };
+    }
+    const verifiedFromMeta = metaVerifyPassed &&
+        (metaLastVerifiedSha === opts.branchHeadSha ||
+            (await isTaskLocalOnlyAdvance({
+                gitRoot: opts.gitRoot,
+                workflowDir: opts.workflowDir,
+                taskId: opts.taskId,
+                fromRef: metaLastVerifiedSha,
+                toRef: opts.branchHeadSha,
+            })));
+    const verifiedFromLog = verifyLogSha === opts.branchHeadSha;
+    const verifiedFromTaskState = opts.taskVerificationState === "ok" && reviewFresh && metaLastVerifiedSha === null;
+    const verifySatisfied = verifiedFromMeta || verifiedFromLog || verifiedFromTaskState;
+    return {
+        reviewFresh,
+        verifyFresh: verifySatisfied,
+        verifySatisfied,
+        verifyLogSha,
+        effectiveVerifiedSha: verifySatisfied ? opts.branchHeadSha : metaLastVerifiedSha,
+    };
+}

package/dist/commands/pr/internal/gh-api.d.ts

@@ -0,0 +1,6 @@
+export declare function ghEnv(): NodeJS.ProcessEnv;
+export declare function resolveDefaultGithubRepo(cwd: string): Promise<string>;
+export declare function runGhApiJson<T>(cwd: string, args: string[]): Promise<T>;
+export declare function runGhApiNoOutput(cwd: string, args: string[]): Promise<void>;
+export declare function isGhNotFound(err: unknown): boolean;
+//# sourceMappingURL=gh-api.d.ts.map

package/dist/commands/pr/internal/gh-api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gh-api.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/gh-api.ts"],"names":[],"mappings":"AAqBA,wBAAgB,KAAK,IAAI,MAAM,CAAC,UAAU,CAiBzC;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAe3E;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAa7E;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAYjF;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAElD"}

package/dist/commands/pr/internal/gh-api.js

@@ -0,0 +1,80 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { exitCodeForError } from "../../../cli/exit-codes.js";
+import { CliError } from "../../../shared/errors.js";
+import { isDotEnvLoadedKey } from "../../../shared/env.js";
+import { gitEnv } from "../../shared/git.js";
+import { normalizeGhTransportError, withGhTransportRetry } from "../../shared/gh-transport.js";
+const execFileAsyncRaw = promisify(execFile);
+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;
+}
+export function ghEnv() {
+    const env = gitEnv();
+    // Preserve explicit shell/CI auth, but do not let repo-local `.env` tokens override
+    // a valid gh keyring session for nested CLI invocations.
+    if (isDotEnvLoadedKey("GH_TOKEN"))
+        delete env.GH_TOKEN;
+    if (isDotEnvLoadedKey("GITHUB_TOKEN"))
+        delete env.GITHUB_TOKEN;
+    if (typeof process.env.GH_TOKEN === "string" && !isDotEnvLoadedKey("GH_TOKEN")) {
+        env.GH_TOKEN = process.env.GH_TOKEN;
+    }
+    if (typeof process.env.GITHUB_TOKEN === "string" && !isDotEnvLoadedKey("GITHUB_TOKEN")) {
+        env.GITHUB_TOKEN = process.env.GITHUB_TOKEN;
+    }
+    if (typeof process.env.GH_CONFIG_DIR === "string")
+        env.GH_CONFIG_DIR = process.env.GH_CONFIG_DIR;
+    if (typeof process.env.XDG_CONFIG_HOME === "string")
+        env.XDG_CONFIG_HOME = process.env.XDG_CONFIG_HOME;
+    if (typeof process.env.HOME === "string")
+        env.HOME = process.env.HOME;
+    return env;
+}
+export async function resolveDefaultGithubRepo(cwd) {
+    const { stdout } = await execFileAsyncRaw("git", ["remote", "get-url", "origin"], {
+        cwd,
+        env: gitEnv(),
+        maxBuffer: 10 * 1024 * 1024,
+    });
+    const repo = parseGithubRepoFromRemoteUrl(stdout);
+    if (!repo) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_VALIDATION"),
+            code: "E_VALIDATION",
+            message: "Could not derive GitHub owner/repo from git remote origin.",
+        });
+    }
+    return repo;
+}
+export async function runGhApiJson(cwd, args) {
+    const { stdout } = await withGhTransportRetry(() => execFileAsyncRaw("gh", ["api", ...args], {
+        cwd,
+        env: ghEnv(),
+        maxBuffer: 10 * 1024 * 1024,
+    }), {
+        label: `running gh api ${args[0] ?? ""}`,
+    });
+    return JSON.parse(stdout);
+}
+export async function runGhApiNoOutput(cwd, args) {
+    await withGhTransportRetry(() => execFileAsyncRaw("gh", ["api", ...args], {
+        cwd,
+        env: ghEnv(),
+        maxBuffer: 10 * 1024 * 1024,
+    }), {
+        label: `running gh api ${args[0] ?? ""}`,
+    });
+}
+export function isGhNotFound(err) {
+    return /\b404\b/.test(normalizeGhTransportError(err));
+}

package/dist/commands/pr/internal/pr-paths.d.ts

@@ -28,5 +28,15 @@ export declare function readPrArtifact(opts: {
     prDir: string;
     fileName: string;
     branch: string;
+    worktreePath?: string | null;
+}): Promise<string | null>;
+export declare function readPrArtifactFromBranch(opts: {
+    resolved: {
+        gitRoot: string;
+    };
+    prDir: string;
+    fileName: string;
+    branch: string;
+    worktreePath?: string | null;
 }): Promise<string | null>;
 //# sourceMappingURL=pr-paths.d.ts.map

package/dist/commands/pr/internal/pr-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pr-paths.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/pr-paths.ts"],"names":[],"mappings":"AAGA,OAAO,EAA8B,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,eAAe,CAAC,CAuB3B;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAWzB"}
+{"version":3,"file":"pr-paths.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/pr-paths.ts"],"names":[],"mappings":"AAGA,OAAO,EAA8B,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,eAAe,CAAC,CAuB3B;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMzB;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiBzB"}

package/dist/commands/pr/internal/pr-paths.js

@@ -31,6 +31,16 @@ export async function readPrArtifact(opts) {
     if (await fileExists(filePath)) {
         return await readFile(filePath, "utf8");
     }
+    return await readPrArtifactFromBranch(opts);
+}
+export async function readPrArtifactFromBranch(opts) {
+    const filePath = path.join(opts.prDir, opts.fileName);
+    if (opts.worktreePath) {
+        const worktreeFilePath = path.join(opts.worktreePath, path.relative(opts.resolved.gitRoot, filePath));
+        if (await fileExists(worktreeFilePath)) {
+            return await readFile(worktreeFilePath, "utf8");
+        }
+    }
     const rel = toGitPath(path.relative(opts.resolved.gitRoot, filePath));
     try {
         return await gitShowFile(opts.resolved.gitRoot, opts.branch, rel);

package/dist/commands/pr/internal/review-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"review-template.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/review-template.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AA4GrD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAKzD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAeT;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAS5E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKnE;AAMD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAOrE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,CAgBpF;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAgBT;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,IAAI,EAAE,QAAQ,CAAC;IACf,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAST;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAiB7E;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAcjF"}
+{"version":3,"file":"review-template.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/internal/review-template.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAoJrD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAKzD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAeT;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAS5E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKnE;AAMD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAOrE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,CAgBpF;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAgBT;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,IAAI,EAAE,QAAQ,CAAC;IACf,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAST;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAiB7E;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAajF"}

package/dist/commands/pr/internal/review-template.js

@@ -65,7 +65,7 @@ function renderRiskSummary(task) {
         rollbackPlan,
     ].join("\n");
 }
-function renderSharedPrSections(opts) {
+function renderReviewSections(opts) {
     return [
         SUMMARY_SECTION,
         "",
@@ -89,6 +89,40 @@ function renderSharedPrSections(opts) {
         "",
     ];
 }
+function renderGithubVerificationSummary(task) {
+    const state = task.verification?.state ?? "pending";
+    const note = typeof task.verification?.note === "string" ? task.verification.note.trim() : "";
+    const statusLine = state === "ok"
+        ? note || "Recorded as passed."
+        : state === "needs_rework"
+            ? note || "Recorded as needs rework."
+            : note || "Not recorded yet.";
+    return [
+        `- State: ${state}`,
+        `- Note: ${statusLine}`,
+        "- Full verification checklist lives in local review.md.",
+    ].join("\n");
+}
+function renderGithubBodySections(opts) {
+    return [
+        SUMMARY_SECTION,
+        "",
+        sectionText(opts.task, "Summary", opts.task.title.trim() || "- Not recorded."),
+        "",
+        SCOPE_SECTION,
+        "",
+        sectionText(opts.task, "Scope", "- Not recorded."),
+        "",
+        VERIFICATION_SECTION,
+        "",
+        renderGithubVerificationSummary(opts.task),
+        "",
+        HANDOFF_NOTES_MARKER,
+        "",
+        ...renderPrHandoffNotes(opts.handoffNotes),
+        "",
+    ];
+}
 export function buildGithubPrTitle(task) {
     const suffix = extractTaskSuffix(task.id);
     const scope = informativeTags(task).slice(0, 2).join("/");
@@ -160,7 +194,7 @@ export function renderPrReviewDocument(opts) {
         `Created: ${opts.createdAt || "UNKNOWN"}`,
         `Branch: ${opts.branch || "UNKNOWN"}`,
         "",
-        ...renderSharedPrSections({
+        ...renderReviewSections({
             task: opts.task,
             handoffNotes: opts.handoffNotes ?? [],
         }),
@@ -172,7 +206,7 @@ export function renderPrReviewDocument(opts) {
 }
 export function renderGithubPrBody(opts) {
     return [
-        ...renderSharedPrSections({
+        ...renderGithubBodySections({
             task: opts.task,
             handoffNotes: opts.handoffNotes ?? [],
         }),
@@ -204,7 +238,6 @@ export function validateGithubPrBodyContents(body, errors) {
         SUMMARY_SECTION,
         SCOPE_SECTION,
         VERIFICATION_SECTION,
-        RISKS_SECTION,
         HANDOFF_NOTES_MARKER,
     ];
     for (const section of requiredSections) {

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

@@ -1,4 +1,10 @@
+import { type PrMeta } from "../../shared/pr-meta.js";
 import { type CommandContext } from "../../shared/task-backend.js";
+export type PrRemoteMode = "auto" | "sync-only";
+export type PrOpenOutcome = {
+    action: "linked-existing" | "created" | "sync-only" | "staged";
+    message: string;
+};
 type PrSyncMode = "open" | "update";
 export declare function ensurePrArtifactsSynced(opts: {
     ctx?: CommandContext;
@@ -22,11 +28,14 @@ export declare function syncPrArtifacts(opts: {
     mode: PrSyncMode;
     author?: string;
     branch?: string;
+    remoteMode?: PrRemoteMode;
 }): Promise<{
+    meta: PrMeta;
     prDir: string;
     resolved: {
         gitRoot: string;
     };
+    openOutcome?: PrOpenOutcome;
 }>;
 export {};
 //# sourceMappingURL=sync.d.ts.map

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":"AAoBA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAoCtC,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,CA8CR;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;CACjB,GAAG,OAAO,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/B,CAAC,CAkLD"}
+{"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"}