agentplane 0.3.7 → 0.3.9

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"}

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

@@ -1,10 +1,82 @@
+import { mkdir, rename, rm } from "node:fs/promises";
+import path from "node:path";
 import { extractTaskSuffix, validateCommitSubject } from "@agentplaneorg/core";
 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 { computeVerifyState, runVerifyCommands } from "../verify.js";
+const noopPromise = () => Promise.resolve();
+async function listUntrackedTaskArtifacts(opts) {
+    const { stdout } = await execFileAsync("git", ["status", "--short", "--untracked-files=all", "--", opts.taskPrefix], {
+        cwd: opts.gitRoot,
+        env: gitEnv(),
+    });
+    return stdout
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line.startsWith("?? "))
+        .map((line) => line.slice(3).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}/`));
+    if (candidatePaths.length === 0) {
+        return {
+            moved: [],
+            restore: noopPromise,
+            cleanup: noopPromise,
+        };
+    }
+    const untrackedPaths = await listUntrackedTaskArtifacts({
+        gitRoot: opts.gitRoot,
+        taskPrefix,
+    });
+    const collidingPaths = untrackedPaths.filter((untrackedPath) => candidatePaths.includes(untrackedPath));
+    if (collidingPaths.length === 0) {
+        return {
+            moved: [],
+            restore: noopPromise,
+            cleanup: noopPromise,
+        };
+    }
+    const backupRoot = path.join(opts.gitRoot, ".agentplane", "tmp", "integrate-backups", `${opts.taskId}-${Date.now()}`);
+    const backupParent = path.dirname(backupRoot);
+    const backupGrandparent = path.dirname(backupParent);
+    const moved = [];
+    for (const relativePath of collidingPaths) {
+        const sourcePath = path.join(opts.gitRoot, relativePath);
+        const backupPath = path.join(backupRoot, relativePath);
+        await mkdir(path.dirname(backupPath), { recursive: true });
+        await rename(sourcePath, backupPath);
+        moved.push({ relativePath, backupPath });
+    }
+    return {
+        moved,
+        restore: async () => {
+            for (const entry of moved.toReversed()) {
+                await mkdir(path.dirname(path.join(opts.gitRoot, entry.relativePath)), { recursive: true });
+                await rename(entry.backupPath, path.join(opts.gitRoot, entry.relativePath));
+            }
+            await rm(backupRoot, { recursive: true, force: true }).catch(() => null);
+            await rm(backupParent).catch(() => null);
+            await rm(backupGrandparent).catch(() => null);
+        },
+        cleanup: async () => {
+            await rm(backupRoot, { recursive: true, force: true }).catch(() => null);
+            await rm(backupParent).catch(() => null);
+            await rm(backupGrandparent).catch(() => null);
+        },
+    };
+}
 export async function runSquashMerge(opts) {
+    const movedArtifacts = await moveCollidingTaskArtifacts({
+        gitRoot: opts.gitRoot,
+        workflowDir: opts.workflowDir,
+        taskId: opts.taskId,
+        changedPaths: opts.changedPaths,
+    });
     try {
         await execFileAsync("git", ["merge", "--squash", opts.branch], {
             cwd: opts.gitRoot,
@@ -16,6 +88,7 @@ export async function runSquashMerge(opts) {
             cwd: opts.gitRoot,
             env: gitEnv(),
         });
+        await movedArtifacts.restore();
         const message = err instanceof Error ? err.message : "git merge --squash failed";
         throw new CliError({ exitCode: exitCodeForError("E_GIT"), code: "E_GIT", message });
     }
@@ -28,6 +101,7 @@ export async function runSquashMerge(opts) {
             cwd: opts.gitRoot,
             env: gitEnv(),
         });
+        await movedArtifacts.restore();
         throw new CliError({
             exitCode: exitCodeForError("E_USAGE"),
             code: "E_USAGE",
@@ -65,13 +139,21 @@ export async function runSquashMerge(opts) {
             cwd: opts.gitRoot,
             env: gitEnv(),
         });
+        await movedArtifacts.restore();
         const message = err instanceof Error ? err.message : "git commit failed";
         throw new CliError({ exitCode: exitCodeForError("E_GIT"), code: "E_GIT", message });
     }
+    await movedArtifacts.cleanup();
     return await gitRevParse(opts.gitRoot, ["HEAD"]);
 }
 export async function runMergeCommit(opts) {
     const suffix = extractTaskSuffix(opts.taskId);
+    const movedArtifacts = await moveCollidingTaskArtifacts({
+        gitRoot: opts.gitRoot,
+        workflowDir: opts.workflowDir,
+        taskId: opts.taskId,
+        changedPaths: opts.changedPaths,
+    });
     const env = {
         ...process.env,
         AGENTPLANE_TASK_ID: opts.taskId,
@@ -83,9 +165,11 @@ export async function runMergeCommit(opts) {
     }
     catch (err) {
         await execFileAsync("git", ["merge", "--abort"], { cwd: opts.gitRoot, env: gitEnv() });
+        await movedArtifacts.restore();
         const message = err instanceof Error ? err.message : "git merge failed";
         throw new CliError({ exitCode: exitCodeForError("E_GIT"), code: "E_GIT", message });
     }
+    await movedArtifacts.cleanup();
     return await gitRevParse(opts.gitRoot, ["HEAD"]);
 }
 export async function runRebaseFastForward(opts) {
@@ -119,6 +203,12 @@ export async function runRebaseFastForward(opts) {
             taskId: opts.taskId,
         })));
     }
+    const movedArtifacts = await moveCollidingTaskArtifacts({
+        gitRoot: opts.gitRoot,
+        workflowDir: opts.workflowDir,
+        taskId: opts.taskId,
+        changedPaths: opts.changedPaths,
+    });
     try {
         await execFileAsync("git", ["merge", "--ff-only", opts.branch], {
             cwd: opts.gitRoot,
@@ -130,10 +220,12 @@ export async function runRebaseFastForward(opts) {
             cwd: opts.gitRoot,
             env: gitEnv(),
         }).catch(() => null);
+        await movedArtifacts.restore();
         const message = err instanceof Error ? err.message : "git merge --ff-only failed";
         throw new CliError({ exitCode: exitCodeForError("E_GIT"), code: "E_GIT", message });
     }
     const mergeHash = await gitRevParse(opts.gitRoot, ["HEAD"]);
     branchHeadSha = await gitRevParse(opts.gitRoot, [opts.branch]);
+    await movedArtifacts.cleanup();
     return { mergeHash, branchHeadSha, verifyEntries, alreadyVerifiedSha, shouldRunVerify };
 }

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

@@ -17,6 +17,7 @@ export type PreparedIntegrate = {
     base: string;
     verifyLogText: string;
     branchHeadSha: string;
+    changedPaths: string[];
     verifyCommands: string[];
     alreadyVerifiedSha: string | null;
     shouldRunVerify: boolean;

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,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,CAwJ7B"}
+{"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"}

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

@@ -140,6 +140,7 @@ export async function prepareIntegrate(opts) {
         base,
         verifyLogText,
         branchHeadSha,
+        changedPaths,
         verifyCommands: initialVerifyState.verifyCommands,
         alreadyVerifiedSha: initialVerifyState.alreadyVerifiedSha,
         shouldRunVerify: initialVerifyState.shouldRunVerify,

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

@@ -1 +1 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/integrate/verify.ts"],"names":[],"mappings":"AAcA,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,SAAS,EAAE,OAAO,CAAC;IACnB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;CACpB,GAAG;IACF,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAgBA;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CAgCjD"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/integrate/verify.ts"],"names":[],"mappings":"AAeA,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,SAAS,EAAE,OAAO,CAAC;IACnB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;CACpB,GAAG;IACF,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAgBA;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CAgCjD"}

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

@@ -1,7 +1,8 @@
 import { extractLastVerifiedSha, runShellCommand } from "../../shared/pr-meta.js";
-import { successMessage } from "../../../cli/output.js";
+import { createCliEmitter } from "../../../cli/output.js";
 import { exitCodeForError } from "../../../cli/exit-codes.js";
 import { CliError } from "../../../shared/errors.js";
+const output = createCliEmitter();
 function normalizeVerifyCommands(rawVerify) {
     return Array.isArray(rawVerify)
         ? rawVerify
@@ -31,7 +32,7 @@ export async function runVerifyCommands(opts) {
     const verifyEntries = [];
     for (const command of opts.commands) {
         if (!opts.quiet) {
-            process.stdout.write(`$ ${command}\n`);
+            output.line(`$ ${command}`);
         }
         const timestamp = new Date().toISOString();
         const result = await runShellCommand(command, opts.worktreePath);
@@ -56,7 +57,7 @@ export async function runVerifyCommands(opts) {
         });
     }
     if (!opts.quiet) {
-        process.stdout.write(`${successMessage("verify passed", opts.taskId)}\n`);
+        output.success("verify passed", opts.taskId);
     }
     return verifyEntries;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/note.ts"],"names":[],"mappings":"AAUA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKpF,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,MAAM,CAAC,CAkDlB"}
+{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/note.ts"],"names":[],"mappings":"AAUA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKpF,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,MAAM,CAAC,CAmDlB"}

package/dist/commands/pr/note.js

@@ -4,13 +4,14 @@ import { atomicWriteFile } from "@agentplaneorg/core";
 import { mapCoreError } 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 { loadCommandContext } from "../shared/task-backend.js";
 import { resolvePrPaths } from "./internal/pr-paths.js";
 import { appendHandoffNote } from "./internal/review-template.js";
 export async function cmdPrNote(opts) {
     try {
+        const output = createCliEmitter();
         const author = opts.author.trim();
         const body = opts.body.trim();
         if (!author) {
@@ -48,7 +49,7 @@ export async function cmdPrNote(opts) {
         const review = await readFile(reviewPath, "utf8");
         const updated = appendHandoffNote(review, `${author}: ${body}`);
         await atomicWriteFile(reviewPath, updated, "utf8");
-        process.stdout.write(`${successMessage("pr note", opts.taskId)}\n`);
+        output.success("pr note", opts.taskId);
         return 0;
     }
     catch (err) {

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

@@ -1 +1 @@
-{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/open.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AASnC,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0ElB"}
+{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/open.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AASnC,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuElB"}

package/dist/commands/pr/open.js

@@ -4,11 +4,11 @@ import { atomicWriteFile } from "@agentplaneorg/core";
 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 { writeJsonStableIfChanged, writeTextIfChanged } from "../../shared/write-if-changed.js";
 import { gitCurrentBranch } from "../shared/git-ops.js";
-import { parsePrMeta } from "../shared/pr-meta.js";
+import { buildOpenedPrMeta, parsePrMeta } from "../shared/pr-meta.js";
 import { loadBackendTask, loadCommandContext, } from "../shared/task-backend.js";
 import { resolvePrPaths } from "./internal/pr-paths.js";
 import { renderPrReviewTemplate } from "./internal/review-template.js";
@@ -17,6 +17,7 @@ function nowIso() {
 }
 export async function cmdPrOpen(opts) {
     try {
+        const output = createCliEmitter();
         const author = opts.author.trim();
         if (!author) {
             throw new CliError({
@@ -57,16 +58,12 @@ export async function cmdPrOpen(opts) {
             meta = parsePrMeta(raw, task.id);
         }
         const createdAt = meta?.created_at ?? now;
-        const nextMeta = {
-            schema_version: 1,
-            task_id: task.id,
+        const nextMeta = buildOpenedPrMeta({
+            taskId: task.id,
             branch,
-            created_at: createdAt,
-            updated_at: now,
-            last_verified_sha: meta?.last_verified_sha ?? null,
-            last_verified_at: meta?.last_verified_at ?? null,
-            verify: meta?.verify ?? { status: "skipped" },
-        };
+            at: now,
+            previousMeta: meta,
+        });
         await writeJsonStableIfChanged(metaPath, nextMeta);
         await writeTextIfChanged(diffstatPath, "");
         await writeTextIfChanged(verifyLogPath, "");
@@ -74,7 +71,7 @@ export async function cmdPrOpen(opts) {
             const review = renderPrReviewTemplate({ author, createdAt, branch });
             await atomicWriteFile(reviewPath, review, "utf8");
         }
-        process.stdout.write(`${successMessage("pr open", path.relative(resolved.gitRoot, prDir))}\n`);
+        output.success("pr open", path.relative(resolved.gitRoot, prDir));
         return 0;
     }
     catch (err) {

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

@@ -1,8 +1,7 @@
 import type { CommandCtx, CommandHandler, CommandSpec } from "../../cli/spec/spec.js";
+import { type GroupCommandParsed } from "../../cli/group-command.js";
 import type { CommandContext } from "../shared/task-backend.js";
-type PrGroupParsed = {
-    cmd: string[];
-};
+type PrGroupParsed = GroupCommandParsed;
 export declare const prSpec: CommandSpec<PrGroupParsed>;
 export type PrOpenParsed = {
     taskId: string;
@@ -24,7 +23,7 @@ export type PrNoteParsed = {
     body: string;
 };
 export declare const prNoteSpec: CommandSpec<PrNoteParsed>;
-export declare function makeRunPrHandler(_getCtx: (cmd: string) => Promise<CommandContext>): CommandHandler<PrGroupParsed>;
+export declare function makeRunPrHandler(_getCtx: (cmd: string) => Promise<CommandContext>): CommandHandler<GroupCommandParsed>;
 export declare function makeRunPrOpenHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: PrOpenParsed) => Promise<number>;
 export declare function makeRunPrUpdateHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: PrUpdateParsed) => Promise<number>;
 export declare function makeRunPrCheckHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: PrCheckParsed) => Promise<number>;

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

@@ -1 +1 @@
-{"version":3,"file":"pr.command.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/pr.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,KAAK,aAAa,GAAG;IAAE,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvC,eAAO,MAAM,MAAM,EAAE,WAAW,CAAC,aAAa,CAgB7C,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAErF,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,YAAY,CAgChD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhD,eAAO,MAAM,YAAY,EAAE,WAAW,CAAC,cAAc,CAOpD,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/C,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,aAAa,CAOlD,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,YAAY,CA0ChD,CAAC;AAgBF,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,GAChD,cAAc,CAAC,aAAa,CAAC,CAE/B;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACrE,KAAK,UAAU,EAAE,GAAG,YAAY,KAAG,OAAO,CAAC,MAAM,CAAC,CAUjE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACvE,KAAK,UAAU,EAAE,GAAG,cAAc,KAAG,OAAO,CAAC,MAAM,CAAC,CAQnE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACtE,KAAK,UAAU,EAAE,GAAG,aAAa,KAAG,OAAO,CAAC,MAAM,CAAC,CAQlE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACrE,KAAK,UAAU,EAAE,GAAG,YAAY,KAAG,OAAO,CAAC,MAAM,CAAC,CAUjE"}
+{"version":3,"file":"pr.command.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/pr.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,KAAK,aAAa,GAAG,kBAAkB,CAAC;AAExC,eAAO,MAAM,MAAM,EAAE,WAAW,CAAC,aAAa,CAgB7C,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAErF,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,YAAY,CAgChD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhD,eAAO,MAAM,YAAY,EAAE,WAAW,CAAC,cAAc,CAOpD,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/C,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,aAAa,CAOlD,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,YAAY,CA0ChD,CAAC;AAWF,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,GAChD,cAAc,CAAC,kBAAkB,CAAC,CAEpC;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACrE,KAAK,UAAU,EAAE,GAAG,YAAY,KAAG,OAAO,CAAC,MAAM,CAAC,CAUjE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACvE,KAAK,UAAU,EAAE,GAAG,cAAc,KAAG,OAAO,CAAC,MAAM,CAAC,CAQnE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACtE,KAAK,UAAU,EAAE,GAAG,aAAa,KAAG,OAAO,CAAC,MAAM,CAAC,CAQlE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACrE,KAAK,UAAU,EAAE,GAAG,YAAY,KAAG,OAAO,CAAC,MAAM,CAAC,CAUjE"}

package/dist/commands/pr/pr.command.js

@@ -1,5 +1,5 @@
+import { loadDirectSubcommandNames, parseGroupCommand, throwGroupCommandUsage, } from "../../cli/group-command.js";
 import { usageError } from "../../cli/spec/errors.js";
-import { suggestOne } from "../../cli/spec/suggest.js";
 import { cmdPrCheck, cmdPrNote, cmdPrOpen, cmdPrUpdate } from "./index.js";
 export const prSpec = {
     id: ["pr"],
@@ -16,7 +16,7 @@ export const prSpec = {
             why: "Append a handoff note.",
         },
     ],
-    parse: (raw) => ({ cmd: (raw.args.cmd ?? []) }),
+    parse: (raw) => parseGroupCommand(raw),
 };
 export const prOpenSpec = {
     id: ["pr", "open"],
@@ -110,17 +110,12 @@ export const prNoteSpec = {
         body: String(raw.opts.body),
     }),
 };
-function runPrRootGroup(_ctx, p) {
-    const input = p.cmd.join(" ");
-    const candidates = ["open", "update", "check", "note"];
-    const suggestion = suggestOne(input, candidates);
-    const suffix = suggestion ? ` Did you mean: ${suggestion}?` : "";
-    const msg = p.cmd.length === 0 ? "Missing subcommand." : `Unknown subcommand: ${p.cmd[0]}.`;
-    throw usageError({
+async function runPrRootGroup(_ctx, p) {
+    throwGroupCommandUsage({
         spec: prSpec,
+        cmd: p.cmd,
+        subcommands: await loadDirectSubcommandNames(["pr"]),
         command: "pr",
-        message: `${msg}${suffix}`,
-        context: { command: "pr" },
     });
 }
 export function makeRunPrHandler(_getCtx) {

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

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/update.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AASnC,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,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,CA+FlB"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/update.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AASnC,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,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,CAwFlB"}

package/dist/commands/pr/update.js

@@ -3,12 +3,12 @@ import path from "node:path";
 import { resolveBaseBranch } from "@agentplaneorg/core";
 import { mapBackendError } from "../../cli/error-map.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 { writeJsonStableIfChanged, writeTextIfChanged } from "../../shared/write-if-changed.js";
 import { execFileAsync, gitEnv } from "../shared/git.js";
 import { gitCurrentBranch } from "../shared/git-ops.js";
-import { parsePrMeta } from "../shared/pr-meta.js";
+import { buildUpdatedPrMeta, parsePrMeta } from "../shared/pr-meta.js";
 import { loadBackendTask, loadCommandContext, } from "../shared/task-backend.js";
 import { resolvePrPaths } from "./internal/pr-paths.js";
 import { updateAutoSummaryBlock } from "./internal/review-template.js";
@@ -17,6 +17,7 @@ function nowIso() {
 }
 export async function cmdPrUpdate(opts) {
     try {
+        const output = createCliEmitter();
         const ctx = opts.ctx ??
             (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
         await loadBackendTask({
@@ -84,15 +85,9 @@ export async function cmdPrUpdate(opts) {
         await writeTextIfChanged(reviewPath, nextReview);
         const rawMeta = await readFile(metaPath, "utf8");
         const meta = parsePrMeta(rawMeta, opts.taskId);
-        const nextMeta = {
-            ...meta,
-            branch,
-            updated_at: nowIso(),
-            last_verified_sha: meta.last_verified_sha ?? null,
-            last_verified_at: meta.last_verified_at ?? null,
-        };
+        const nextMeta = buildUpdatedPrMeta({ meta, branch, at: nowIso() });
         await writeJsonStableIfChanged(metaPath, nextMeta);
-        process.stdout.write(`${successMessage("pr update", path.relative(resolved.gitRoot, prDir))}\n`);
+        output.success("pr update", path.relative(resolved.gitRoot, prDir));
         return 0;
     }
     catch (err) {

package/dist/commands/recipes/cache.command.d.ts

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

package/dist/commands/recipes/cache.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.command.d.ts","sourceRoot":"","sources":["../../../src/commands/recipes/cache.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAc,MAAM,wBAAwB,CAAC;AAItF,KAAK,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAIhD,eAAO,MAAM,gBAAgB,EAAE,WAAW,CAAC,kBAAkB,CAyB5D,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,cAAc,CAAC,kBAAkB,CAS9D,CAAC"}
+{"version":3,"file":"cache.command.d.ts","sourceRoot":"","sources":["../../../src/commands/recipes/cache.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAc,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,eAAO,MAAM,gBAAgB,EAAE,WAAW,CAAC,kBAAkB,CAO5D,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,cAAc,CAAC,kBAAkB,CAS9D,CAAC"}

package/dist/commands/recipes/cache.command.js

@@ -1,37 +1,19 @@
-import { usageError } from "../../cli/spec/errors.js";
-import { suggestOne } from "../../cli/spec/suggest.js";
-const RECIPES_CACHE_SUBCOMMANDS = ["prune"];
+import { loadDirectSubcommandNames, parseGroupCommand, throwGroupCommandUsage, } from "../../cli/group-command.js";
 export const recipesCacheSpec = {
     id: ["recipes", "cache"],
     group: "Recipes",
     summary: "Manage recipes cache.",
     synopsis: ["agentplane recipes cache <subcommand> [options]"],
     args: [{ name: "subcommand", required: false, variadic: true, valueHint: "<subcommand>" }],
-    parse: () => ({}),
-    validateRaw: (raw) => {
-        const rest = Array.isArray(raw.args.subcommand) ? raw.args.subcommand : [];
-        const sub = rest[0];
-        if (!sub) {
-            throw usageError({
-                spec: recipesCacheSpec,
-                command: "recipes cache",
-                message: "Missing recipes cache subcommand.",
-            });
-        }
-        const suggestion = suggestOne(String(sub), [...RECIPES_CACHE_SUBCOMMANDS]);
-        const suffix = suggestion ? ` Did you mean: ${suggestion}?` : "";
-        throw usageError({
-            spec: recipesCacheSpec,
-            command: "recipes cache",
-            message: `Unknown recipes cache subcommand: ${String(sub)}.${suffix}`,
-        });
-    },
+    parse: (raw) => parseGroupCommand(raw, "subcommand"),
 };
-export const runRecipesCache = (_ctx) => {
-    // Should be unreachable because validateRaw always throws.
-    throw usageError({
+export const runRecipesCache = async (_ctx, p) => {
+    throwGroupCommandUsage({
         spec: recipesCacheSpec,
+        cmd: p.cmd,
+        subcommands: await loadDirectSubcommandNames(["recipes", "cache"]),
         command: "recipes cache",
-        message: "Missing recipes cache subcommand.",
+        missingMessage: "Missing recipes cache subcommand.",
+        unknownMessage: (subcommand) => `Unknown recipes cache subcommand: ${subcommand}.`,
     });
 };