agentplane 0.3.9 → 0.3.11

package/dist/commands/pr/integrate/artifacts.d.ts

@@ -11,4 +11,11 @@ export declare function readAndValidatePrArtifacts(opts: {
 }): Promise<{
     verifyLogText: string | null;
 }>;
+export declare function ensureCommittedPrArtifactsOnBranch(opts: {
+    resolved: {
+        gitRoot: string;
+    };
+    prDir: string;
+    branch: string;
+}): Promise<void>;
 //# sourceMappingURL=artifacts.d.ts.map

package/dist/commands/pr/integrate/artifacts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/integrate/artifacts.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAWnE,wBAAsB,0BAA0B,CAAC,IAAI,EAAE;IACrD,GAAG,EAAE,cAAc,CAAC;IACpB,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,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IACV,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC,CA8CD"}
+{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/integrate/artifacts.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAYnE,wBAAsB,0BAA0B,CAAC,IAAI,EAAE;IACrD,GAAG,EAAE,cAAc,CAAC;IACpB,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,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IACV,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC,CAkDD;AAED,wBAAsB,kCAAkC,CAAC,IAAI,EAAE;IAC7D,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkEhB"}

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

@@ -1,7 +1,8 @@
 import path from "node:path";
 import { exitCodeForError } from "../../../cli/exit-codes.js";
 import { CliError } from "../../../shared/errors.js";
-import { readPrArtifact } from "../internal/pr-paths.js";
+import { readPrArtifact, readPrArtifactFromBranch } from "../internal/pr-paths.js";
+import { findWorktreeForBranch } from "../../shared/git-worktree.js";
 import { validateReviewContents } from "../internal/review-template.js";
 export async function readAndValidatePrArtifacts(opts) {
     const readPrArtifactTyped = readPrArtifact;
@@ -9,6 +10,7 @@ export async function readAndValidatePrArtifacts(opts) {
     const diffstatPath = path.join(prDir, "diffstat.txt");
     const verifyLogPath = path.join(prDir, "verify.log");
     const reviewPath = path.join(prDir, "review.md");
+    const worktreePath = await findWorktreeForBranch(opts.resolved.gitRoot, opts.branch);
     const errors = [];
     const relDiffstat = path.relative(opts.resolved.gitRoot, diffstatPath);
     const relVerifyLog = path.relative(opts.resolved.gitRoot, verifyLogPath);
@@ -18,6 +20,7 @@ export async function readAndValidatePrArtifacts(opts) {
         prDir,
         fileName: "diffstat.txt",
         branch: opts.branch,
+        worktreePath,
     });
     if (diffstatText === null)
         errors.push(`Missing ${relDiffstat}`);
@@ -26,6 +29,7 @@ export async function readAndValidatePrArtifacts(opts) {
         prDir,
         fileName: "verify.log",
         branch: opts.branch,
+        worktreePath,
     });
     if (verifyLogText === null)
         errors.push(`Missing ${relVerifyLog}`);
@@ -34,6 +38,7 @@ export async function readAndValidatePrArtifacts(opts) {
         prDir,
         fileName: "review.md",
         branch: opts.branch,
+        worktreePath,
     });
     if (reviewText === null)
         errors.push(`Missing ${relReview}`);
@@ -48,3 +53,63 @@ export async function readAndValidatePrArtifacts(opts) {
     }
     return { verifyLogText };
 }
+export async function ensureCommittedPrArtifactsOnBranch(opts) {
+    const readCommittedPrArtifact = readPrArtifactFromBranch;
+    const { prDir } = opts;
+    const diffstatPath = path.join(prDir, "diffstat.txt");
+    const verifyLogPath = path.join(prDir, "verify.log");
+    const reviewPath = path.join(prDir, "review.md");
+    const metaPath = path.join(prDir, "meta.json");
+    const errors = [];
+    const relMeta = path.relative(opts.resolved.gitRoot, metaPath);
+    const relDiffstat = path.relative(opts.resolved.gitRoot, diffstatPath);
+    const relVerifyLog = path.relative(opts.resolved.gitRoot, verifyLogPath);
+    const relReview = path.relative(opts.resolved.gitRoot, reviewPath);
+    const metaText = await readCommittedPrArtifact({
+        resolved: opts.resolved,
+        prDir,
+        fileName: "meta.json",
+        branch: opts.branch,
+    });
+    if (metaText === null)
+        errors.push(`Missing committed ${relMeta} on branch ${opts.branch}`);
+    const diffstatText = await readCommittedPrArtifact({
+        resolved: opts.resolved,
+        prDir,
+        fileName: "diffstat.txt",
+        branch: opts.branch,
+    });
+    if (diffstatText === null) {
+        errors.push(`Missing committed ${relDiffstat} on branch ${opts.branch}`);
+    }
+    const verifyLogText = await readCommittedPrArtifact({
+        resolved: opts.resolved,
+        prDir,
+        fileName: "verify.log",
+        branch: opts.branch,
+    });
+    if (verifyLogText === null) {
+        errors.push(`Missing committed ${relVerifyLog} on branch ${opts.branch}`);
+    }
+    const reviewText = await readCommittedPrArtifact({
+        resolved: opts.resolved,
+        prDir,
+        fileName: "review.md",
+        branch: opts.branch,
+    });
+    if (reviewText === null) {
+        errors.push(`Missing committed ${relReview} on branch ${opts.branch}`);
+    }
+    else {
+        validateReviewContents(reviewText, errors);
+    }
+    if (errors.length > 0) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_VALIDATION"),
+            code: "E_VALIDATION",
+            message: `Task branch ${opts.branch} is missing committed PR artifacts required for integrate.\n` +
+                `${errors.join("\n")}\n` +
+                "Commit the task README/PR artifacts on the task branch (for example via `agentplane pr open` + git add/commit) before rerunning integrate.",
+        });
+    }
+}

package/dist/commands/pr/integrate/cmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/integrate/cmd.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAQnE,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,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,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgMlB"}
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/integrate/cmd.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AASnE,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,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,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAkNlB"}

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

@@ -3,10 +3,12 @@ import { mapBackendError } from "../../../cli/error-map.js";
 import { createCliEmitter } from "../../../cli/output.js";
 import { CliError } from "../../../shared/errors.js";
 import { cleanupIntegratedBranch } from "./internal/cleanup.js";
+import { renderPostIntegrateBootstrapFailureGuidance, renderPostIntegrateBootstrapGuidance, shouldRecommendPostIntegrateBootstrap, } from "./internal/bootstrap-guidance.js";
 import { execFileAsync, gitEnv } from "../../shared/git.js";
 import { gitRevParse } from "../../shared/git-ops.js";
 import { finalizeIntegrate } from "./internal/finalize.js";
 import { runMergeCommit, runRebaseFastForward, runSquashMerge } from "./internal/merge.js";
+import { maybeRunPostIntegrateBootstrap } from "./internal/post-integrate-bootstrap.js";
 import { prepareIntegrate } from "./internal/prepare.js";
 import { resolveWorktreeForIntegrate } from "./internal/worktree.js";
 import { runVerifyCommands } from "./verify.js";
@@ -74,6 +76,8 @@ export async function cmdIntegrate(opts) {
                 branch,
                 headBeforeMerge,
                 taskId: task.id,
+                taskTitle: task.title,
+                taskTags: task.tags,
                 workflowDir: loadedConfig.paths.workflow_dir,
                 changedPaths,
                 genericTokens: loadedConfig.commit.generic_tokens,
@@ -84,6 +88,8 @@ export async function cmdIntegrate(opts) {
                 gitRoot: resolved.gitRoot,
                 branch,
                 taskId: task.id,
+                taskTitle: task.title,
+                taskTags: task.tags,
                 workflowDir: loadedConfig.paths.workflow_dir,
                 changedPaths,
             });
@@ -155,6 +161,20 @@ export async function cmdIntegrate(opts) {
             tempWorktreePath = null;
             createdTempWorktree = false;
         }
+        if (shouldRecommendPostIntegrateBootstrap(changedPaths)) {
+            const bootstrapResult = await maybeRunPostIntegrateBootstrap({
+                gitRoot: resolved.gitRoot,
+                changedPaths,
+            });
+            if (!opts.quiet) {
+                if (bootstrapResult.status === "skipped") {
+                    output.warn(renderPostIntegrateBootstrapGuidance());
+                }
+                else if (bootstrapResult.status === "failed") {
+                    output.warn(renderPostIntegrateBootstrapFailureGuidance(bootstrapResult.error));
+                }
+            }
+        }
         return 0;
     }
     catch (err) {

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

@@ -0,0 +1,8 @@
+export declare function shouldRecommendPostIntegrateBootstrap(changedPaths: string[]): boolean;
+export declare function shouldAutoBootstrapAfterIntegrate(opts: {
+    changedPaths: string[];
+    gitRoot: string;
+}): boolean;
+export declare function renderPostIntegrateBootstrapGuidance(): string;
+export declare function renderPostIntegrateBootstrapFailureGuidance(reason: string): string;
+//# sourceMappingURL=bootstrap-guidance.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"bootstrap-guidance.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/bootstrap-guidance.ts"],"names":[],"mappings":"AA4CA,wBAAgB,qCAAqC,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAErF;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CASV;AAED,wBAAgB,oCAAoC,IAAI,MAAM,CAK7D;AAED,wBAAgB,2CAA2C,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKlF"}

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

@@ -0,0 +1,59 @@
+import { existsSync } from "node:fs";
+import path from "node:path";
+import { isRuntimeRelevantWatchedFile } from "../../../../../bin/runtime-watch.js";
+const WATCHED_RUNTIME_PACKAGES = [
+    {
+        packageRoot: "packages/agentplane",
+        watchedPaths: [
+            "src",
+            "bin/agentplane.js",
+            "bin/dist-guard.js",
+            "bin/runtime-context.js",
+            "bin/stale-dist-policy.js",
+        ],
+    },
+    {
+        packageRoot: "packages/core",
+        watchedPaths: ["src"],
+    },
+];
+function normalizeRepoPath(filePath) {
+    return filePath.replaceAll("\\", "/");
+}
+function isWatchedRuntimeSourcePath(filePath) {
+    const normalized = normalizeRepoPath(filePath);
+    for (const watchedPackage of WATCHED_RUNTIME_PACKAGES) {
+        for (const watchedPath of watchedPackage.watchedPaths) {
+            if (watchedPath === "src") {
+                const sourcePrefix = `${watchedPackage.packageRoot}/src/`;
+                if (!normalized.startsWith(sourcePrefix))
+                    continue;
+                const packageRelativePath = normalized.slice(watchedPackage.packageRoot.length + 1);
+                return isRuntimeRelevantWatchedFile(packageRelativePath);
+            }
+            if (normalized === `${watchedPackage.packageRoot}/${watchedPath}`) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+export function shouldRecommendPostIntegrateBootstrap(changedPaths) {
+    return changedPaths.some((changedPath) => isWatchedRuntimeSourcePath(changedPath));
+}
+export function shouldAutoBootstrapAfterIntegrate(opts) {
+    if (!shouldRecommendPostIntegrateBootstrap(opts.changedPaths)) {
+        return false;
+    }
+    return (existsSync(path.join(opts.gitRoot, "package.json")) &&
+        existsSync(path.join(opts.gitRoot, "packages", "agentplane", "package.json")) &&
+        existsSync(path.join(opts.gitRoot, "scripts", "bootstrap-framework-dev.mjs")));
+}
+export function renderPostIntegrateBootstrapGuidance() {
+    return ("This merge changed watched runtime sources. Run `bun run framework:dev:bootstrap` " +
+        "before the next command so the repo-local build stays current.");
+}
+export function renderPostIntegrateBootstrapFailureGuidance(reason) {
+    return ("This merge changed watched runtime sources and the automatic repo-local runtime refresh " +
+        `failed (${reason}). Run \`bun run framework:dev:bootstrap\` manually before the next command.`);
+}

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

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

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,7 @@ export async function finalizeIntegrate(opts) {
         taskId: opts.taskId,
         baseBranchOverride: opts.base,
         quiet: opts.quiet,
+        allowPolicy: collectedIncidents.wrote,
     });
     if (!opts.quiet) {
         output.success("integrate", opts.taskId, `merge=${opts.mergeHash.slice(0, 12)}`);

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

@@ -5,6 +5,8 @@ export declare function runSquashMerge(opts: {
     branch: string;
     headBeforeMerge: string;
     taskId: string;
+    taskTitle: string;
+    taskTags: string[];
     workflowDir: string;
     changedPaths: string[];
     genericTokens: string[];
@@ -13,6 +15,8 @@ export declare function runMergeCommit(opts: {
     gitRoot: string;
     branch: string;
     taskId: string;
+    taskTitle: string;
+    taskTags: string[];
     workflowDir: string;
     changedPaths: string[];
 }): Promise<string>;

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;AAyGzD,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,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,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;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

@@ -5,8 +5,37 @@ import { exitCodeForError } from "../../../../cli/exit-codes.js";
 import { CliError } from "../../../../shared/errors.js";
 import { execFileAsync, gitEnv } from "../../../shared/git.js";
 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({
+        id: opts.taskId,
+        title: opts.taskTitle,
+        tags: opts.taskTags,
+        description: "",
+        status: "TODO",
+        priority: "med",
+        owner: "UNKNOWN",
+        depends_on: [],
+        verify: [],
+    }).replace(new RegExp(String.raw ` \(${suffix}\)$`, "u"), "");
+}
 async function listUntrackedTaskArtifacts(opts) {
     const { stdout } = await execFileAsync("git", ["status", "--short", "--untracked-files=all", "--", opts.taskPrefix], {
         cwd: opts.gitRoot,
@@ -19,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}/`));
@@ -118,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: squash ${opts.branch}`;
+        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,
@@ -154,14 +197,15 @@ 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", "--no-ff", opts.branch, "-m", `🔀 ${suffix} integrate: merge ${opts.branch}`], { cwd: opts.gitRoot, env });
+        await execFileAsync("git", [
+            "merge",
+            "--no-ff",
+            opts.branch,
+            "-m",
+            `🔀 ${suffix} integrate: ${fallbackIntegrateSummary(opts)}`,
+        ], { cwd: opts.gitRoot, env });
     }
     catch (err) {
         await execFileAsync("git", ["merge", "--abort"], { cwd: opts.gitRoot, env: gitEnv() });

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/prepare.d.ts

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