agentplane 0.3.10 → 0.3.12

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

@@ -8,11 +8,13 @@ import { gitDiffStat } from "../../../shared/git-diff.js";
 import { appendVerifyLog, buildIntegratedPrMeta, parsePrMeta, } from "../../../shared/pr-meta.js";
 import { readCommitInfo } from "../../../task/shared.js";
 import { createTaskCloseCommit, writeFinishedTasks } from "../../../task/finish-shared.js";
+import { collectTaskIncidents, renderIncidentCollectionPlanOutcome, } from "../../../incidents/shared.js";
 function nowIso() {
     return new Date().toISOString();
 }
 export async function finalizeIntegrate(opts) {
     const output = createCliEmitter();
+    const taskAlreadyDone = String(opts.task.status || "TODO").toUpperCase() === "DONE";
     if (!(await fileExists(opts.prDir))) {
         throw new CliError({
             exitCode: 3,
@@ -52,20 +54,45 @@ export async function finalizeIntegrate(opts) {
                 : "skipped";
     const finishBody = `Verified: Integrated via ${opts.mergeStrategy}; verify=${verifyDesc}; pr=${path.relative(opts.gitRoot, opts.prDir)}.`;
     const resultSummary = `integrate: ${opts.mergeStrategy} ${opts.branch}`;
-    const taskCommitInfo = await readCommitInfo(opts.gitRoot, opts.mergeHash);
-    await writeFinishedTasks({
+    await collectTaskIncidents({
         ctx: opts.ctx,
-        loadedTasks: [{ taskId: opts.taskId, task: opts.task }],
-        metaTaskId: opts.taskId,
-        author: "INTEGRATOR",
-        body: finishBody,
-        force: false,
-        resultProvided: true,
-        resultSummary,
-        riskLevel: undefined,
-        breaking: false,
-        taskCommitInfo,
+        taskId: opts.taskId,
+        task: opts.task,
+        write: false,
     });
+    if (!taskAlreadyDone) {
+        const taskCommitInfo = await readCommitInfo(opts.gitRoot, opts.mergeHash);
+        await writeFinishedTasks({
+            ctx: opts.ctx,
+            loadedTasks: [{ taskId: opts.taskId, task: opts.task }],
+            metaTaskId: opts.taskId,
+            author: "INTEGRATOR",
+            body: finishBody,
+            force: false,
+            resultProvided: true,
+            resultSummary,
+            riskLevel: undefined,
+            breaking: false,
+            taskCommitInfo,
+        });
+    }
+    const collectedIncidents = await collectTaskIncidents({
+        ctx: opts.ctx,
+        taskId: opts.taskId,
+        task: opts.task,
+        write: true,
+    });
+    if (!opts.quiet) {
+        output.info(renderIncidentCollectionPlanOutcome(collectedIncidents.plan, {
+            wrote: collectedIncidents.wrote,
+            context: "finish",
+            promotedIds: collectedIncidents.plan.promotable.map((item) => item.entry.id),
+            registryPaths: collectedIncidents.registryPaths,
+        }));
+        if (taskAlreadyDone) {
+            output.info("task already DONE; integrating only missing PR metadata and close artifacts");
+        }
+    }
     await createTaskCloseCommit({
         ctx: opts.ctx,
         cwd: opts.cwd,
@@ -73,6 +100,10 @@ export async function finalizeIntegrate(opts) {
         taskId: opts.taskId,
         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/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/merge.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AA6HzD,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiFlB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CAkClB;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC,CA8DD"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/merge.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AA+JzD,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqFlB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6BlB;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC,CA8DD"}

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

@@ -8,6 +8,20 @@ import { gitRevParse } from "../../../shared/git-ops.js";
 import { buildGithubPrTitle } from "../../internal/review-template.js";
 import { computeVerifyState, runVerifyCommands } from "../verify.js";
 const noopPromise = () => Promise.resolve();
+function integrateCommitEnv(taskId) {
+    return {
+        ...gitEnv(),
+        AGENTPLANE_TASK_ID: taskId,
+        AGENTPLANE_ALLOW_BASE: "1",
+        AGENTPLANE_ALLOW_TASKS: "1",
+        AGENTPLANE_ALLOW_CONFIG: "1",
+        AGENTPLANE_DEV_ALLOW_STALE_DIST: "1",
+    };
+}
+function isTaskArtifactPath(filePath) {
+    const normalized = filePath.replaceAll("\\", "/");
+    return normalized.startsWith(".agentplane/tasks/") || normalized.startsWith("tasks/");
+}
 function fallbackIntegrateSummary(opts) {
     const suffix = extractTaskSuffix(opts.taskId);
     return buildGithubPrTitle({
@@ -34,6 +48,16 @@ async function listUntrackedTaskArtifacts(opts) {
         .map((line) => line.slice(3).trim())
         .filter(Boolean);
 }
+async function listCommitChangedPaths(opts) {
+    const { stdout } = await execFileAsync("git", ["show", "--name-only", "--format=", opts.revision], {
+        cwd: opts.gitRoot,
+        env: gitEnv(),
+    });
+    return stdout
+        .split("\n")
+        .map((line) => line.trim())
+        .filter(Boolean);
+}
 async function moveCollidingTaskArtifacts(opts) {
     const taskPrefix = `${opts.workflowDir.replaceAll("\\", "/")}/${opts.taskId}`;
     const candidatePaths = opts.changedPaths.filter((changedPath) => changedPath === taskPrefix || changedPath.startsWith(`${taskPrefix}/`));
@@ -133,16 +157,20 @@ export async function runSquashMerge(opts) {
         taskId: opts.taskId,
         genericTokens: opts.genericTokens,
     });
-    if (!subjectPolicy.ok) {
+    let shouldFallback = !subjectPolicy.ok;
+    if (!shouldFallback) {
+        const headPaths = await listCommitChangedPaths({
+            gitRoot: opts.gitRoot,
+            revision: opts.branch,
+        });
+        shouldFallback =
+            headPaths.length > 0 && headPaths.every((filePath) => isTaskArtifactPath(filePath));
+    }
+    if (shouldFallback) {
         const suffix = extractTaskSuffix(opts.taskId);
         subject = `🧩 ${suffix} integrate: ${fallbackIntegrateSummary(opts)}`;
     }
-    const env = {
-        ...process.env,
-        AGENTPLANE_TASK_ID: opts.taskId,
-        AGENTPLANE_ALLOW_BASE: "1",
-        AGENTPLANE_ALLOW_TASKS: "0",
-    };
+    const env = integrateCommitEnv(opts.taskId);
     try {
         await execFileAsync("git", ["commit", "-m", subject], {
             cwd: opts.gitRoot,
@@ -169,12 +197,7 @@ export async function runMergeCommit(opts) {
         taskId: opts.taskId,
         changedPaths: opts.changedPaths,
     });
-    const env = {
-        ...process.env,
-        AGENTPLANE_TASK_ID: opts.taskId,
-        AGENTPLANE_ALLOW_BASE: "1",
-        AGENTPLANE_ALLOW_TASKS: "0",
-    };
+    const env = integrateCommitEnv(opts.taskId);
     try {
         await execFileAsync("git", [
             "merge",

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"post-integrate-bootstrap.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/post-integrate-bootstrap.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,4BAA4B,GACpC;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;AAUxC,wBAAsB,8BAA8B,CAAC,IAAI,EAAE;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAcxC"}

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

@@ -0,0 +1,25 @@
+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);
+}
+export async function maybeRunPostIntegrateBootstrap(opts) {
+    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/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

@@ -1,12 +1,14 @@
-import { loadBackendTask, type CommandContext } from "../../../shared/task-backend.js";
+import type { TaskData } from "../../../../backends/task-backend.js";
+import { type CommandContext } from "../../../shared/task-backend.js";
 import { type PrMeta } from "../../../shared/pr-meta.js";
 export type PreparedIntegrate = {
     ctx: CommandContext;
     resolved: CommandContext["resolvedProject"];
     loadedConfig: CommandContext["config"];
-    task: Awaited<ReturnType<typeof loadBackendTask>>["task"];
+    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":"AAYA,OAAO,EACL,eAAe,EAEf,KAAK,cAAc,EACpB,MAAM,iCAAiC,CAAC;AAUzC,OAAO,EAAe,KAAK,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGtE,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,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAE1D,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,CAoL7B"}
+{"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

@@ -6,24 +6,21 @@ 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";
+import { requiresPullRequestMergePath } from "./github-protection.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 +30,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 +68,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 +92,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 +123,20 @@ 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 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)) {
@@ -117,33 +147,73 @@ 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,
+        tasksPath: loadedConfig.paths.tasks_path,
+        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,
+                tasksPath: loadedConfig.paths.tasks_path,
+                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,
@@ -155,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

@@ -0,0 +1,21 @@
+export type PrArtifactFreshness = {
+    reviewFresh: boolean;
+    verifyFresh: boolean;
+    verifySatisfied: boolean;
+    verifyLogSha: string | null;
+    effectiveVerifiedSha: string | null;
+};
+export declare function assessPrArtifactFreshness(opts: {
+    gitRoot: string;
+    workflowDir: string;
+    tasksPath?: 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,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"}