agentplane 0.3.6 → 0.3.8

package/dist/commands/hooks/hooks.command.d.ts

@@ -1,5 +1,5 @@
 import type { CommandHandler, CommandSpec } from "../../cli/spec/spec.js";
-export type HooksGroupParsed = Record<string, never>;
-export declare const hooksSpec: CommandSpec<HooksGroupParsed>;
-export declare const runHooks: CommandHandler<HooksGroupParsed>;
+import { type GroupCommandParsed } from "../../cli/group-command.js";
+export declare const hooksSpec: CommandSpec<GroupCommandParsed>;
+export declare const runHooks: CommandHandler<GroupCommandParsed>;
 //# sourceMappingURL=hooks.command.d.ts.map

package/dist/commands/hooks/hooks.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.command.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/hooks.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1E,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAErD,eAAO,MAAM,SAAS,EAAE,WAAW,CAAC,gBAAgB,CAYnD,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,gBAAgB,CAGrD,CAAC"}
+{"version":3,"file":"hooks.command.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/hooks.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,eAAO,MAAM,SAAS,EAAE,WAAW,CAAC,kBAAkB,CAOrD,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,kBAAkB,CAMvD,CAAC"}

package/dist/commands/hooks/hooks.command.js

@@ -1,18 +1,16 @@
-import { usageError } from "../../cli/spec/errors.js";
+import { loadDirectSubcommandNames, parseGroupCommand, throwGroupCommandUsage, } from "../../cli/group-command.js";
 export const hooksSpec = {
     id: ["hooks"],
     group: "Hooks",
     summary: "Manage and run git hooks installed by agentplane.",
     synopsis: ["agentplane hooks <command> [args] [options]"],
-    validateRaw: (raw) => {
-        if (raw.extra.length > 0) {
-            throw usageError({ spec: hooksSpec, message: `Unknown subcommand: ${raw.extra[0]}` });
-        }
-        throw usageError({ spec: hooksSpec, message: "Missing subcommand." });
-    },
-    parse: () => ({}),
+    args: [{ name: "cmd", required: false, variadic: true, valueHint: "<command>" }],
+    parse: (raw) => parseGroupCommand(raw),
 };
-export const runHooks = () => {
-    // Unreachable (validateRaw always throws).
-    return Promise.resolve(2);
+export const runHooks = async (_ctx, p) => {
+    throwGroupCommandUsage({
+        spec: hooksSpec,
+        cmd: p.cmd,
+        subcommands: await loadDirectSubcommandNames(["hooks"]),
+    });
 };

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

@@ -1 +1 @@
-{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/check.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAKnC,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,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,MAAM,CAAC,CAwElB"}
+{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/check.ts"],"names":[],"mappings":"AAUA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAsDnC,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,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,MAAM,CAAC,CAgHlB"}

package/dist/commands/pr/check.js

@@ -3,14 +3,52 @@ import path from "node:path";
 import { mapBackendError } from "../../cli/error-map.js";
 import { exitCodeForError } from "../../cli/exit-codes.js";
 import { fileExists } from "../../cli/fs-utils.js";
-import { successMessage, workflowModeMessage } from "../../cli/output.js";
+import { createCliEmitter, workflowModeMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { parsePrMeta } from "../shared/pr-meta.js";
+import { gitListTaskBranches, parseTaskIdFromBranch } from "../shared/git-worktree.js";
 import { loadBackendTask, loadCommandContext, } from "../shared/task-backend.js";
-import { resolvePrPaths } from "./internal/pr-paths.js";
+import { readPrArtifact, resolvePrPaths } from "./internal/pr-paths.js";
 import { validateReviewContents } from "./internal/review-template.js";
+async function resolveArtifactBranch(opts) {
+    const prefix = opts.ctx.config.branch.task_prefix;
+    const branches = await gitListTaskBranches(opts.resolved.gitRoot, prefix);
+    const matches = branches.filter((branch) => parseTaskIdFromBranch(prefix, branch) === opts.taskId);
+    if (matches.length === 1)
+        return matches[0] ?? null;
+    if (matches.length > 1) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_VALIDATION"),
+            code: "E_VALIDATION",
+            message: `Multiple task branches match ${opts.taskId}: ${matches.join(", ")}`,
+        });
+    }
+    return null;
+}
+async function readPrArtifactWithOptionalBranch(opts) {
+    const localPath = path.join(opts.prDir, opts.fileName);
+    if (await fileExists(localPath)) {
+        return await readFile(localPath, "utf8");
+    }
+    if (opts.branchCache.value === undefined) {
+        opts.branchCache.value = await resolveArtifactBranch({
+            ctx: opts.ctx,
+            resolved: opts.resolved,
+            taskId: opts.taskId,
+        });
+    }
+    if (!opts.branchCache.value)
+        return null;
+    return await readPrArtifact({
+        resolved: opts.resolved,
+        prDir: opts.prDir,
+        fileName: opts.fileName,
+        branch: opts.branchCache.value,
+    });
+}
 export async function cmdPrCheck(opts) {
     try {
+        const output = createCliEmitter();
         const ctx = opts.ctx ??
             (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
         const { task } = await loadBackendTask({
@@ -33,29 +71,63 @@ export async function cmdPrCheck(opts) {
         const relDiffstatPath = path.relative(resolved.gitRoot, diffstatPath);
         const relVerifyLogPath = path.relative(resolved.gitRoot, verifyLogPath);
         const relReviewPath = path.relative(resolved.gitRoot, reviewPath);
-        if (!(await fileExists(prDir)))
-            errors.push(`Missing PR directory: ${relPrDir}`);
-        if (!(await fileExists(metaPath)))
-            errors.push(`Missing ${relMetaPath}`);
-        if (!(await fileExists(diffstatPath)))
-            errors.push(`Missing ${relDiffstatPath}`);
-        if (!(await fileExists(verifyLogPath)))
-            errors.push(`Missing ${relVerifyLogPath}`);
-        if (!(await fileExists(reviewPath)))
-            errors.push(`Missing ${relReviewPath}`);
+        const branchCache = {};
         let meta = null;
-        if (await fileExists(metaPath)) {
+        const metaText = await readPrArtifactWithOptionalBranch({
+            ctx,
+            resolved,
+            prDir,
+            fileName: "meta.json",
+            taskId: task.id,
+            branchCache,
+        });
+        if (metaText) {
             try {
-                meta = parsePrMeta(await readFile(metaPath, "utf8"), task.id);
+                meta = parsePrMeta(metaText, task.id);
             }
             catch (err) {
                 const message = err instanceof Error ? err.message : String(err);
                 errors.push(message);
             }
         }
-        if (await fileExists(reviewPath)) {
-            const review = await readFile(reviewPath, "utf8");
-            validateReviewContents(review, errors);
+        else {
+            errors.push(`Missing PR directory: ${relPrDir}`, `Missing ${relMetaPath}`);
+        }
+        const diffstatText = await readPrArtifactWithOptionalBranch({
+            ctx,
+            resolved,
+            prDir,
+            fileName: "diffstat.txt",
+            taskId: task.id,
+            branchCache,
+        });
+        if (diffstatText === null) {
+            errors.push(`Missing ${relDiffstatPath}`);
+        }
+        const verifyLogText = await readPrArtifactWithOptionalBranch({
+            ctx,
+            resolved,
+            prDir,
+            fileName: "verify.log",
+            taskId: task.id,
+            branchCache,
+        });
+        if (verifyLogText === null) {
+            errors.push(`Missing ${relVerifyLogPath}`);
+        }
+        const reviewText = await readPrArtifactWithOptionalBranch({
+            ctx,
+            resolved,
+            prDir,
+            fileName: "review.md",
+            taskId: task.id,
+            branchCache,
+        });
+        if (reviewText) {
+            validateReviewContents(reviewText, errors);
+        }
+        else {
+            errors.push(`Missing ${relReviewPath}`);
         }
         if (task.verify && task.verify.length > 0) {
             if (meta?.verify?.status !== "pass") {
@@ -72,7 +144,7 @@ export async function cmdPrCheck(opts) {
                 message: errors.join("\n"),
             });
         }
-        process.stdout.write(`${successMessage("pr check", path.relative(resolved.gitRoot, prDir))}\n`);
+        output.success("pr check", path.relative(resolved.gitRoot, prDir));
         return 0;
     }
     catch (err) {

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":"AAMA,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,CAqKlB"}
+{"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"}

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

@@ -1,6 +1,8 @@
+import path from "node:path";
 import { mapBackendError } from "../../../cli/error-map.js";
-import { successMessage } from "../../../cli/output.js";
+import { createCliEmitter } from "../../../cli/output.js";
 import { CliError } from "../../../shared/errors.js";
+import { cleanupIntegratedBranch } from "./internal/cleanup.js";
 import { execFileAsync, gitEnv } from "../../shared/git.js";
 import { gitRevParse } from "../../shared/git-ops.js";
 import { finalizeIntegrate } from "./internal/finalize.js";
@@ -11,6 +13,7 @@ import { runVerifyCommands } from "./verify.js";
 export async function cmdIntegrate(opts) {
     let tempWorktreePath = null;
     let createdTempWorktree = false;
+    const output = createCliEmitter();
     try {
         const prepared = await prepareIntegrate({
             ctx: opts.ctx,
@@ -26,9 +29,10 @@ export async function cmdIntegrate(opts) {
         let alreadyVerifiedSha = prepared.alreadyVerifiedSha;
         let shouldRunVerify = prepared.shouldRunVerify;
         let branchHeadSha = prepared.branchHeadSha;
+        const changedPaths = prepared.changedPaths;
         if (opts.dryRun) {
             if (!opts.quiet) {
-                process.stdout.write(`${successMessage("integrate dry-run", task.id, `base=${base} branch=${branch} verify=${shouldRunVerify ? "yes" : "no"}`)}\n`);
+                output.success("integrate dry-run", task.id, `base=${base} branch=${branch} verify=${shouldRunVerify ? "yes" : "no"}`);
             }
             return 0;
         }
@@ -70,11 +74,19 @@ export async function cmdIntegrate(opts) {
                 branch,
                 headBeforeMerge,
                 taskId: task.id,
+                workflowDir: loadedConfig.paths.workflow_dir,
+                changedPaths,
                 genericTokens: loadedConfig.commit.generic_tokens,
             });
         }
         else if (opts.mergeStrategy === "merge") {
-            mergeHash = await runMergeCommit({ gitRoot: resolved.gitRoot, branch, taskId: task.id });
+            mergeHash = await runMergeCommit({
+                gitRoot: resolved.gitRoot,
+                branch,
+                taskId: task.id,
+                workflowDir: loadedConfig.paths.workflow_dir,
+                changedPaths,
+            });
         }
         else {
             if (!worktreePath) {
@@ -99,6 +111,8 @@ export async function cmdIntegrate(opts) {
                 shouldRunVerify,
                 quiet: opts.quiet,
                 taskId: task.id,
+                workflowDir: loadedConfig.paths.workflow_dir,
+                changedPaths,
             });
             mergeHash = rebaseRes.mergeHash;
             branchHeadSha = rebaseRes.branchHeadSha;
@@ -107,6 +121,8 @@ export async function cmdIntegrate(opts) {
             verifyEntries.push(...rebaseRes.verifyEntries);
         }
         await finalizeIntegrate({
+            ctx: prepared.ctx,
+            task,
             cwd: opts.cwd,
             rootOverride: opts.rootOverride,
             gitRoot: resolved.gitRoot,
@@ -127,6 +143,18 @@ export async function cmdIntegrate(opts) {
             shouldRunVerify,
             quiet: opts.quiet,
         });
+        const cleanup = await cleanupIntegratedBranch({
+            gitRoot: resolved.gitRoot,
+            branch,
+            worktreePathHint: worktreePath,
+        });
+        if (cleanup.removedWorktree &&
+            cleanup.worktreePath &&
+            tempWorktreePath &&
+            path.resolve(cleanup.worktreePath) === path.resolve(tempWorktreePath)) {
+            tempWorktreePath = null;
+            createdTempWorktree = false;
+        }
         return 0;
     }
     catch (err) {

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

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

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

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

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

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

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

@@ -1,4 +1,8 @@
+import type { TaskData } from "../../../../backends/task-backend.js";
+import type { CommandContext } from "../../../shared/task-backend.js";
 export declare function finalizeIntegrate(opts: {
+    ctx: CommandContext;
+    task: TaskData;
     cwd: string;
     rootOverride?: string;
     gitRoot: string;

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":"AAmBA,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,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,CAsFhB"}
+{"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"}

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

@@ -1,16 +1,18 @@
 import path from "node:path";
 import { readFile } from "node:fs/promises";
 import { fileExists } from "../../../../cli/fs-utils.js";
-import { successMessage } from "../../../../cli/output.js";
+import { createCliEmitter } from "../../../../cli/output.js";
 import { CliError } from "../../../../shared/errors.js";
 import { writeJsonStableIfChanged, writeTextIfChanged, } from "../../../../shared/write-if-changed.js";
 import { gitDiffStat } from "../../../shared/git-diff.js";
-import { appendVerifyLog, parsePrMeta } from "../../../shared/pr-meta.js";
-import { cmdFinish } from "../../../task/index.js";
+import { appendVerifyLog, buildIntegratedPrMeta, parsePrMeta, } from "../../../shared/pr-meta.js";
+import { readCommitInfo } from "../../../task/shared.js";
+import { createTaskCloseCommit, writeFinishedTasks } from "../../../task/finish-shared.js";
 function nowIso() {
     return new Date().toISOString();
 }
 export async function finalizeIntegrate(opts) {
+    const output = createCliEmitter();
     if (!(await fileExists(opts.prDir))) {
         throw new CliError({
             exitCode: 3,
@@ -26,24 +28,18 @@ export async function finalizeIntegrate(opts) {
     const rawMeta = await readFile(opts.metaPath, "utf8");
     const mergedMeta = parsePrMeta(rawMeta, opts.taskId);
     const now = nowIso();
-    const nextMeta = {
-        ...mergedMeta,
+    const nextMeta = buildIntegratedPrMeta({
+        meta: mergedMeta,
         branch: opts.branch,
         base: opts.base,
-        merge_strategy: opts.mergeStrategy,
-        status: "MERGED",
-        merged_at: mergedMeta.merged_at ?? now,
-        merge_commit: opts.mergeHash,
-        head_sha: opts.branchHeadSha,
-        updated_at: now,
-    };
-    if (opts.verifyCommands.length > 0 && (opts.shouldRunVerify || opts.alreadyVerifiedSha)) {
-        nextMeta.last_verified_sha = opts.branchHeadSha;
-        nextMeta.last_verified_at = now;
-        nextMeta.verify = mergedMeta.verify
-            ? { ...mergedMeta.verify, status: "pass" }
-            : { status: "pass", command: opts.verifyCommands.join(" && ") };
-    }
+        mergeStrategy: opts.mergeStrategy,
+        mergeHash: opts.mergeHash,
+        branchHeadSha: opts.branchHeadSha,
+        at: now,
+        verifyCommands: opts.verifyCommands,
+        shouldRunVerify: opts.shouldRunVerify,
+        alreadyVerifiedSha: opts.alreadyVerifiedSha,
+    });
     await writeJsonStableIfChanged(opts.metaPath, nextMeta);
     const diffstat = await gitDiffStat(opts.gitRoot, opts.baseShaBeforeMerge, opts.branch);
     await writeTextIfChanged(opts.diffstatPath, diffstat ? `${diffstat}\n` : "");
@@ -55,32 +51,30 @@ export async function finalizeIntegrate(opts) {
                 ? `skipped(already verified_sha=${opts.alreadyVerifiedSha})`
                 : "skipped";
     const finishBody = `Verified: Integrated via ${opts.mergeStrategy}; verify=${verifyDesc}; pr=${path.relative(opts.gitRoot, opts.prDir)}.`;
-    await cmdFinish({
-        cwd: opts.cwd,
-        rootOverride: opts.rootOverride,
-        taskIds: [opts.taskId],
+    const resultSummary = `integrate: ${opts.mergeStrategy} ${opts.branch}`;
+    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,
-        result: `integrate: ${opts.mergeStrategy} ${opts.branch}`,
-        risk: undefined,
-        breaking: false,
-        commit: undefined,
         force: false,
-        commitFromComment: false,
-        commitEmoji: undefined,
-        commitAllow: [],
-        commitAutoAllow: false,
-        commitAllowTasks: false,
-        commitRequireClean: false,
-        statusCommit: false,
-        statusCommitEmoji: undefined,
-        statusCommitAllow: [],
-        statusCommitAutoAllow: false,
-        statusCommitRequireClean: false,
-        confirmStatusCommit: false,
+        resultProvided: true,
+        resultSummary,
+        riskLevel: undefined,
+        breaking: false,
+        taskCommitInfo,
+    });
+    await createTaskCloseCommit({
+        ctx: opts.ctx,
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride,
+        taskId: opts.taskId,
+        baseBranchOverride: opts.base,
         quiet: opts.quiet,
     });
     if (!opts.quiet) {
-        process.stdout.write(`${successMessage("integrate", opts.taskId, `merge=${opts.mergeHash.slice(0, 12)}`)}\n`);
+        output.success("integrate", opts.taskId, `merge=${opts.mergeHash.slice(0, 12)}`);
     }
 }

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

@@ -5,12 +5,16 @@ export declare function runSquashMerge(opts: {
     branch: string;
     headBeforeMerge: string;
     taskId: string;
+    workflowDir: string;
+    changedPaths: string[];
     genericTokens: string[];
 }): Promise<string>;
 export declare function runMergeCommit(opts: {
     gitRoot: string;
     branch: string;
     taskId: string;
+    workflowDir: string;
+    changedPaths: string[];
 }): Promise<string>;
 export declare function runRebaseFastForward(opts: {
     gitRoot: string;
@@ -27,6 +31,8 @@ export declare function runRebaseFastForward(opts: {
     shouldRunVerify: boolean;
     quiet: boolean;
     taskId: string;
+    workflowDir: string;
+    changedPaths: string[];
 }): Promise<{
     mergeHash: string;
     branchHeadSha: 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":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAIzD,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,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuElB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBlB;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;CAChB,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,CAsDD"}
+{"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"}